From f3585c1a86ebc025dbe52c82b78af3610e3aa675 Mon Sep 17 00:00:00 2001
From: gustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 29 Feb 2000 14:40:04 +0000
Subject: [PATCH] Added configuration option: E-mail address.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@253 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/options.php        | 30 ++++++++++++++++++++++--------
 src/options_submit.php |  1 +
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/options.php b/src/options.php
index 600ab71e..39ce5680 100644
--- a/src/options.php
+++ b/src/options.php
@@ -18,7 +18,8 @@
 
    /** load up some of the values from the pref file **/
    $fullname = getPref($data_dir, $username, "full_name");
-   $replyto  = getPref($data_dir, $username, "reply_to");
+   $replyto = getPref($data_dir, $username, "reply_to");
+   $email_address  = getPref($data_dir, $username, "email_address");
 
    echo "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
    echo "   <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>\n";
@@ -34,7 +35,7 @@
    echo "   <TR>";
    echo "      <TD WIDTH=20% ALIGN=RIGHT>";
    echo "         <FONT FACE=\"Arial,Helvetica\">";
-   echo _("         Full Name:");
+   echo           _("Full Name:");
    echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=80% ALIGN=LEFT>";
@@ -43,11 +44,24 @@
    echo "         </FONT>";
    echo "      </TD>";
    echo "   </TR>";
+   // FROM-ADDRESS
+   echo "   <TR>";
+   echo "      <TD WIDTH=20% ALIGN=RIGHT>";
+   echo "         <FONT FACE=\"Arial,Helvetica\">";
+   echo           _("E-mail address:");
+   echo "         </FONT>";
+   echo "      </TD>";
+   echo "      <TD WIDTH=80% ALIGN=LEFT>";
+   echo "         <FONT FACE=\"Arial,Helvetica\">";
+   echo "         <INPUT TYPE=TEXT NAME=email_address VALUE=\"$email_address\" SIZE=50><BR>";
+   echo "         </FONT>";
+   echo "      </TD>";
+   echo "   </TR>";
    // REPLY-TO
    echo "   <TR>";
    echo "      <TD WIDTH=20% ALIGN=RIGHT>";
    echo "         <FONT FACE=\"Arial,Helvetica\">";
-   echo _("         Reply-to:");
+   echo           _("Reply-to:");
    echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=80% ALIGN=LEFT>";
@@ -60,7 +74,7 @@
    echo "   <TR>";
    echo "      <TD WIDTH=20% ALIGN=RIGHT>";
    echo "         <FONT FACE=\"Arial,Helvetica\">";
-   echo _("         Theme:");
+   echo           _("Theme:");
    echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=80% ALIGN=LEFT>";
@@ -84,7 +98,7 @@
    echo "   <TR>";
    echo "      <TD WIDTH=60% ALIGN=RIGHT>";
    echo "         <FONT FACE=\"Arial,Helvetica\">";
-   echo _("         Move deleted messages to ");
+   echo           _("Move deleted messages to ");
    echo "\"$trash_folder\"?";
    echo "         </FONT>";
    echo "      </TD>";
@@ -108,7 +122,7 @@
    echo "   <TR>";
    echo "      <TD WIDTH=60% ALIGN=RIGHT>";
    echo "         <FONT FACE=\"Arial,Helvetica\">";
-   echo _("         Wrap incoming text at:");
+   echo           _("Wrap incoming text at:");
    echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=40% ALIGN=LEFT>";
@@ -125,7 +139,7 @@
    echo "   <TR>";
    echo "      <TD WIDTH=60% ALIGN=RIGHT>";
    echo "         <FONT FACE=\"Arial,Helvetica\">";
-   echo _("         Size of editor window (in characters):");
+   echo           _("Size of editor window (in characters):");
    echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=40% ALIGN=LEFT>";
@@ -142,7 +156,7 @@
    echo "   <TR>";
    echo "      <TD WIDTH=60% ALIGN=RIGHT>";
    echo "         <FONT FACE=\"Arial,Helvetica\">";
-   echo _("         Time between auto refresh of folder list:");
+   echo           _("Time between auto refresh of folder list:");
    echo "         </FONT>";
    echo "      </TD>";
    echo "      <TD WIDTH=40% ALIGN=LEFT>";
diff --git a/src/options_submit.php b/src/options_submit.php
index 242a7c53..58cb15ec 100644
--- a/src/options_submit.php
+++ b/src/options_submit.php
@@ -10,6 +10,7 @@
 
 
    setPref($data_dir, $username, "full_name", stripslashes($full_name));
+   setPref($data_dir, $username, "email_address", stripslashes($email_address));
    setPref($data_dir, $username, "reply_to", stripslashes($reply_to));
    setPref($data_dir, $username, "chosen_theme", $chosentheme);
    setPref($data_dir, $username, "move_to_trash", $movetotrash);
-- 
2.25.1