fixed bug so it doesn't add slashes before apostrophies

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

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 27afddf5c2be0d292e1c93cf8bca6ea1e8fc43df..4353fac2c9f7e087e29fee047c219efe6f82738b 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -22,7 +22,7 @@
 
     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[10]\">";
+      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 "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";

diff --git a/functions/smtp.php b/functions/smtp.php
index a15f4af5ee53d5f47b4cc1458143c6c46ce537a8..9265afeb8b085dab5ed0dbf2744707ed4cb10606 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -90,13 +90,6 @@
          fputs($smtpConnection, "Reply-To: $reply_to\n");
 
 
-      $body_ary = explode("\n", trim($body));
-      $body = "";
-      for ($i = 0; $i < count($body_ary); $i++) {
-         if ($body_ary[$i] == ".")
-            $body_ary[$i] = ".";
-         $body .= $body_ary[$i] . "\n";
-      }
       fputs($smtpConnection, "$body\n"); // send the body of the message
 
       fputs($smtpConnection, ".\n"); // end the DATA part