25 سال پیش · 1566b86bc7
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -26,6 +26,7 @@
 
				       $from_addr = "$username@$domain";
			
 
				       $reply_to = getPref($data_dir, $username, "reply_to");
			
 
				       $from = getPref($data_dir, $username, "full_name");
			
 
				+
			
 
				       if ($from == "")
			
 
				          $from = "<$from_addr>";
			
 
				       else
			
@@ -83,9 +84,10 @@
 
				          fputs($smtpConnection, "Cc: <$cc_list>\n"); // Who the CCs are
			
 
				       }
			
 
				       fputs($smtpConnection, "X-Mailer: SquirrelMail (version $version)\n"); // Identify SquirrelMail
			
 
				-      fputs($smtpConnection, "Reply-To: $reply_to\n");
			
 
				       fputs($smtpConnection, "MIME-Version: 1.0\n");
			
 
				       fputs($smtpConnection, "Content-Type: text/plain\n");
			
 
				+      if ($reply_to != "")
			
 
				+         fputs($smtpConnection, "Reply-To: $reply_to\n");
			
 
				 
			
 
				       fputs($smtpConnection, "$body\n"); // send the body of the message
			
 
				 
			
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -70,7 +70,6 @@
 
				 
			
 
				    /** If it was a successful login, lets load their preferences **/
			
 
				    include("../src/load_prefs.php");
			
 
				-   checkForPrefs($data_dir, $username);
			
 
				    echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\">";
			
 
				    echo "<FONT FACE=\"Arial,Helvetica\">";
			
 
				 
			
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -2,6 +2,8 @@
 
				    include("../config/config.php");
			
 
				    include("../functions/prefs.php");
			
 
				 
			
 
				+   checkForPrefs($data_dir, $username);
			
 
				+
			
 
				    $chosen_theme = getPref($data_dir, $username, "chosen_theme");
			
 
				 
			
 
				    if ((isset($chosen_theme)) && (file_exists($chosen_theme))) {
			
--- a/src/options.php
+++ b/src/options.php
@@ -16,8 +16,6 @@
 
				    /** load up some of the values from the pref file **/
			
 
				    $fullname = getPref($data_dir, $username, "full_name");
			
 
				    $replyto  = getPref($data_dir, $username, "reply_to");
			
 
				-   if ($replyto == "")
			
 
				-      $replyto = "$username@$domain";
			
 
				 
			
 
				    echo "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
			
 
				    echo "   <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>\n";
			
@@ -36,7 +34,7 @@
 
				    echo "      </TD>";
			
 
				    echo "      <TD WIDTH=80% ALIGN=LEFT>";
			
 
				    echo "         <FONT FACE=\"Arial,Helvetica\">";
			
 
				-   echo "         <INPUT TYPE=TEXT NAME=full_name VALUE=\"$fullname\" SIZE=50>";
			
 
				+   echo "         <INPUT TYPE=TEXT NAME=full_name VALUE=\"$fullname\" SIZE=50><BR>";
			
 
				    echo "         </FONT>";
			
 
				    echo "      </TD>";
			
 
				    echo "   </TR>";
			
@@ -49,7 +47,7 @@
 
				    echo "      </TD>";
			
 
				    echo "      <TD WIDTH=80% ALIGN=LEFT>";
			
 
				    echo "         <FONT FACE=\"Arial,Helvetica\">";
			
 
				-   echo "         <INPUT TYPE=TEXT NAME=reply_to VALUE=\"$replyto\" SIZE=50>";
			
 
				+   echo "         <INPUT TYPE=TEXT NAME=reply_to VALUE=\"$replyto\" SIZE=50><BR>";
			
 
				    echo "         </FONT>";
			
 
				    echo "      </TD>";
			
 
				    echo "   </TR>";
			
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -49,7 +49,6 @@
 
				 
			
 
				    /** If it was a successful login, lets load their preferences **/
			
 
				    include("../src/load_prefs.php");
			
 
				-   checkForPrefs($data_dir, $username);
			
 
				    echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
			
 
				    echo "<FONT FACE=\"Arial,Helvetica\">";