From: lkehresman Date: Thu, 6 Jan 2000 21:15:33 +0000 (+0000) Subject: Fixes some bugs in preferences X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=b4da6659a8dca88c270bc959c5ed68793a5319f0 Fixes some bugs in preferences git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@118 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/smtp.php b/functions/smtp.php index 6150e24c..0bfaf935 100644 --- 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 diff --git a/src/left_main.php b/src/left_main.php index db84533b..65589544 100644 --- 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 ""; echo ""; diff --git a/src/load_prefs.php b/src/load_prefs.php index 5b580355..e302658e 100644 --- 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))) { diff --git a/src/options.php b/src/options.php index 17aabaf1..362a22a5 100644 --- 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 "\n"; echo " "; echo " "; echo " "; @@ -49,7 +47,7 @@ echo " "; echo " "; echo " "; diff --git a/src/right_main.php b/src/right_main.php index 288ce90d..d7060443 100644 --- 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 "\n"; echo "";

\n"; @@ -36,7 +34,7 @@ echo "	"; echo " "; - echo " "; + echo " "; echo " "; echo "
"; echo " "; - echo " "; + echo " "; echo " "; echo "