improved email parsing in body of message a little bit (handles more exceptions)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@732 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/i18n.php b/functions/i18n.php
index 0ec1dfb2b07394d551216bedc5ab359fd61ccc6c..4c9d912dd6f5a90e05a04272a5f098eeea536078 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -35,6 +35,8 @@
    $languages["it"]["CHARSET"] = "iso-8859-1";
    $languages["cs"]["NAME"]    = "Czech";
    $languages["cs"]["CHARSET"] = "iso-8859-2";
+   $languages["es"]["NAME"]    = "Spanish";
+   $languages["es"]["CHARSET"] = "iso-8859-1";
 
    // Decodes a string to the internal encoding from the given charset
    function charset_decode ($charset, $string) {

diff --git a/functions/url_parser.php b/functions/url_parser.php
index 6d76750695d2039b488d1f77b098acf771bb55b1..29de29332f9f3fcd976b71fa70eda15844864cc5 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -27,7 +27,7 @@
          $body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_|-)+(\.([a-z]|[0-9]|_|-)+)*", "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body);
       }
       */
-      $body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_|-)+\.(\.|[a-z]|[0-9]|_|-)+", "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body); 
+      $body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_|-)+(\.([a-z]|[A-Z])|[a-z]|[0-9]|_|-)+", "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body); 
       return $body;
    }