fixed problem with sending subjects with a '.

added a urlencode($mailbox) to a link in download.php

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

diff --git a/AUTHORS b/AUTHORS
index 15fb9feb2d9688db56f9db8c9094f29eeb2906d0..805f18a8b6be1bd935e88211abd437729097bcaa 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,7 +21,3 @@
    Swedish:      Tobias Ekbom (tobias@vallcom.net)     
    Dutch:        Arjan Halma (arjan@halma.nl)
    Portugese (Brazil): Henrique Moura (henriquemoura@hotmail.com)
-
- Help System:
- ------------
-   Lewis Bergman

diff --git a/config/default_theme.php b/config/default_theme.php
deleted file mode 100644 (file)
index cdaa67c..0000000
--- a/config/default_theme.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-   /** Author:       Luke Ehresman
-       Date:         January 2, 2000
-       Theme Name:   "Default Theme"
-
-       This is the default theme that comes standard with SquirrelMail.
-       Most of the colors were taken from mail.yahoo.com's theme on their
-       site.
-
-       To create a new theme, just copy this file, and edit the colors.
-       Be sure to rename the file and keep the original, just in case.
-
-       NOTE:
-       Please email any themes you create to luke@usa.om.org for inclusion
-       in further releases of SquirrelMail and for download from the web
-       page.
-    **/
-
-    $color[0]   = "#DCDCDC"; // (light gray)     TitleBar
-    $color[1]   = "#800000"; // (red)
-    $color[2]   = "#CC0000"; // (light red)      Warning/Error Messages
-    $color[3]   = "#A0B8C8"; // (green-blue)     Left Bar Background
-    $color[4]   = "#FFFFFF"; // (white)          Normal Background
-    $color[5]   = "#FFFFCC"; // (light yellow)   Table Headers
-    $color[6]   = "#000000"; // (black)          Text on left bar
-    $color[7]   = "#0000CC"; // (blue)           Links
-    $color[8]   = "#000000"; // (black)          Normal text
-    $color[9]   = "#ABABAB"; // (mid-gray)       Darker version of #0
-    $color[10]  = "#666666"; // (dark gray)      Darker version of #9
-    $color[11]  = "#770000"; // (dark red)       Special Folders color
-?>

diff --git a/functions/smtp.php b/functions/smtp.php
index fae9ea73445687e2dc1c713a269acd52e03466c0..868c2620e89f63674e5053c715e882df7d1ec50b 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -132,7 +132,7 @@
          $bcc_list = getLineOfAddrs($bcc);
          
          /* Encoding 8-bit characters and making from line */
-         $subject = encodeHeader($subject);
+         $subject = stripslashes(encodeHeader($subject));
          if ($from == "")
             $from = "<$from_addr>";
          else

diff --git a/src/download.php b/src/download.php
index 6f5c4266e92c65d8facc787f2f2b614b311aec4f..c754caf030bd2c9ff1dec353dcc310e3e32fca3a 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -32,7 +32,7 @@
       echo "<BR><TABLE WIDTH=90% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
       echo "<B><CENTER>";
       echo _("Viewing a text attachment") . " - ";
-      echo "<a href=\"read_body.php?mailbox=$mailbox&passed_id=$id\">". _("View message") . "</a>";
+      echo "<a href=\"read_body.php?mailbox=".urlencode($mailbox)."&passed_id=$id&startMessage=$startMessage&show_more=0\">". _("View message") . "</a>";
       echo "</CENTER></B>";
       echo "</TD></TR><TR><TD BGCOLOR=\"$color[4]\">";
       $urlmailbox = urlencode($mailbox);