projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 26adfcb)
Added email addr parsing, added bugfix for boundary= header
authorlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Mon, 10 Apr 2000 05:33:59 +0000 (05:33 +0000)
committerlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Mon, 10 Apr 2000 05:33:59 +0000 (05:33 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@391 7612ce4b-ef26-0410-bec9-ea0150e637f0

ChangeLog patch | blob | blame | history
functions/display_messages.php patch | blob | blame | history
functions/imap_messages.php patch | blob | blame | history
functions/smtp.php patch | blob | blame | history
functions/strings.php patch | blob | blame | history
functions/url_parser.php patch | blob | blame | history
src/login.php patch | blob | blame | history
src/signout.php patch | blob | blame | history

diff --git a/ChangeLog b/ChangeLog
index d099ec5522d128a3199aa3f9e062945a8c41abbd..46e557b7a822a5d0f7aef1143f31d49a97cea94b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Version 0.4pre1 -- Development
 ------------------------------
-- Parsing the body for URLs and translating them to links
+- Parsing the body for URLs and Email addrs
 - Added option to configure default folder directory. ie: ~/mail
 - Configuration script added: config/conf.pl
 - Addressbook with LDAP support
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 1428d0f3d16fa68923a89660a69b04eeaeef3de6..b07e2ae48fed1ed7a35aa3dd0a1640ff57a65145 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -25,21 +25,21 @@
     function general_info($motd, $org_logo, $version, $org_name, $color) {
       echo "<BR>";
       echo "<TABLE COLS=1 WIDTH=80% CELLSPACING=0 CELLPADDING=2 NOBORDER ALIGN=CENTER><TR><TD BGCOLOR=\"$color[9]\">";
-      echo "<TABLE COLS=1 WIDTH=100% CELLSPACING=0 CELLPADDING=3 NOBORDER BGCOLOR=\"FFFFFF\" ALIGN=CENTER>";
+      echo "<TABLE COLS=1 WIDTH=100% CELLSPACING=0 CELLPADDING=3 NOBORDER BGCOLOR=\"#FFFFFF\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
       echo "         <B><CENTER>". _("Welcome to $org_name's WebMail system") ."</CENTER></B>";
-      echo "   <TR><TD BGCOLOR=\"FFFFFF\">";
+      echo "   <TR><TD BGCOLOR=\"#FFFFFF\">";
       echo "      <TABLE COLS=2 WIDTH=90% CELLSPACING=0 CELLPADDING=3 NOBORDER align=\"center\">";
       echo "         <TR>";
-      echo "            <TD BGCOLOR=\"FFFFFF\"><CENTER>";
+      echo "            <TD BGCOLOR=\"#FFFFFF\"><CENTER>";
       if (strlen($org_logo) > 3)
          echo "               <IMG SRC=\"$org_logo\">";
       else
          echo "               <B>$org_name</B>";
       echo "         <BR><CENTER>". _("Running SquirrelMail version $version (c) 1999-2000.") ."</CENTER><BR>";
       echo "            </CENTER></TD></TR><TR>";
-      echo "            <TD BGCOLOR=\"FFFFFF\">";
+      echo "            <TD BGCOLOR=\"#FFFFFF\">";
       echo "               $motd";
       echo "            </TD>";
       echo "         </TR>";
diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 8604bb876c8707a8ab3121b74d64bb12665639c9..fe3255fa3abb1e3eb65574dcceb68d444d6d1ba2 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -159,16 +159,8 @@
             }
 
             /** Detect the boundary of a multipart message **/
-            if (strpos(strtolower(trim($line)), "boundary=")) {
-               $pos = strpos(strtolower($line), "boundary=") + 9;
-               $bound = trim($line);
-               if (strpos($line, " ", $pos) > 0) {
-                  $bound = substr($bound, $pos, strpos($line, " ", $pos));
-               } else {
-                  $bound = substr($bound, $pos);
-               }
-               $bound = str_replace("\"", "", $bound);
-               $header["BOUNDARY"] = $bound;
+            if (eregi("boundary=\"([^\"]+)\"", $line, $regs)) {                             
+               $header["BOUNDARY"] = $regs[1];                                             
             }
 
             /** Detect the charset **/
diff --git a/functions/smtp.php b/functions/smtp.php
index 2436c824bbc858625e1241c852ff5efd6d0b0be5..b87dc0ca235e3601a3cadec7d10f3116468625df 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -414,7 +414,7 @@
       }
 
       if ($status == 0) {
-         echo "<HTML><BODY BGCOLOR=ffffff>";
+         echo "<HTML><BODY BGCOLOR=#ffffff>";
          echo "<TT>";
          echo "<BR><B>ERROR</B><BR><BR>";
          echo "&nbsp;&nbsp;&nbsp;<B>Error Number: </B>$err_num<BR>";
diff --git a/functions/strings.php b/functions/strings.php
index 44158c56ccf1c3562a0f49fe3ba26aee6244f22d..c9c6b9b29b32124d9343b43a6e998331e0f44804 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -125,6 +125,7 @@
             $line = "<TT><FONT COLOR=000000>$line</FONT></TT><BR>\n";
          }
 
+         $line = parseEmail ($line);
          $line = parseUrl ($line);
          $new_body[$i] = "$line";
       }
diff --git a/functions/url_parser.php b/functions/url_parser.php
index 0a64d65c935f860962aada10f32ec3e2eb9a96a0..560c837d0363ae73abf0ab4471409281a03020ed 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -10,6 +10,11 @@
       return $ret;
    }
 
+   function parseEmail ($body) {
+      $body = eregi_replace ("([a-z]|[0-9]|_|\.)+\@([a-z]|[0-9]|_)+(.([a-z]|[0-9]|_)+)*", "<a href=\"mailto:\\0\">\\0</a>", $body);
+      return $body;
+   }
+
    function parseUrl ($body) {
       #Possible ways a URL could finish.
 
diff --git a/src/login.php b/src/login.php
index 9a00a2d8786908168943cbfbc490e7001da4a3c4..c6f4a10c6b986a853e5947464a8ec68c1cb0b986 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -36,7 +36,7 @@
    echo "<HEAD><TITLE>";
    echo _("SquirrelMail Login");
    echo "</TITLE></HEAD>\n";
-   echo "<BODY TEXT=000000 BGCOLOR=FFFFFF LINK=0000CC VLINK=0000CC ALINK=0000CC>\n";
+   echo "<BODY TEXT=000000 BGCOLOR=#FFFFFF LINK=0000CC VLINK=0000CC ALINK=0000CC>\n";
  
    echo "<FORM ACTION=webmail.php METHOD=\"POST\" NAME=f>\n";
    echo "<CENTER><IMG SRC=\"$org_logo\"</CENTER>\n";
@@ -45,11 +45,11 @@
    echo "<BR></SMALL><CENTER>\n";
    echo "<TABLE COLS=1 WIDTH=350>\n";
    echo "   <TR>\n";
-   echo "      <TD BGCOLOR=DCDCDC>\n";
+   echo "      <TD BGCOLOR=#DCDCDC>\n";
    echo "         <B><CENTER>$org_name Login</CENTER></B>\n";
    echo "      </TD>\n";
    echo "   </TR><TR>\n";
-   echo "      <TD BGCOLOR=FFFFFF>\n";
+   echo "      <TD BGCOLOR=#FFFFFF>\n";
    echo "         <TABLE COLS=2 WIDTH=100%>\n";
    echo "            <TR>\n";
    echo "               <TD WIDTH=30% ALIGN=right>\n";
diff --git a/src/signout.php b/src/signout.php
index 84ec5b5e591bf661f965745a50d58b0908008017..74114c334afe8164a29b5a7a3062792d697bb59c 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -26,16 +26,16 @@
 ?>
 <HTML>
 <?
-   echo "<BODY TEXT=000000 BGCOLOR=FFFFFF LINK=0000CC VLINK=0000CC ALINK=0000CC>\n";
-   echo "<BR><BR><TABLE BGCOLOR=FFFFFF BORDER=0 COLS=1 WIDTH=50% CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>";
-   echo "   <TR BGCOLOR=DCDCDC WIDTH=100%>";
+   echo "<BODY TEXT=000000 BGCOLOR=#FFFFFF LINK=0000CC VLINK=0000CC ALINK=0000CC>\n";
+   echo "<BR><BR><TABLE BGCOLOR=#FFFFFF BORDER=0 COLS=1 WIDTH=50% CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>";
+   echo "   <TR BGCOLOR=#DCDCDC WIDTH=100%>";
    echo "      <TD ALIGN=CENTER>";
    echo "         <B>";
    echo _("Sign Out");
    echo "</B>";
    echo "      </TD>";
    echo "   </TR>";
-   echo "   <TR BGCOLOR=FFFFFF WIDTH=100%>";
+   echo "   <TR BGCOLOR=#FFFFFF WIDTH=100%>";
    echo "      <TD ALIGN=CENTER>";
    echo "         <BR>";
    echo _("You have been successfully signed out.");
@@ -46,7 +46,7 @@
    echo "</A><BR><BR>";
    echo "      </TD>";
    echo "   </TR>";
-   echo "   <TR BGCOLOR=DCDCDC WIDTH=100%>";
+   echo "   <TR BGCOLOR=#DCDCDC WIDTH=100%>";
    echo "      <TD ALIGN=CENTER>";
    echo "         <BR>";
    echo "      </TD>";
Unnamed repository; edit this file 'description' to name the repository.