X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions.php;h=e13c771057fbf5d191971467464435884f4f6757;hp=399ca53b20d57c4c6cc71cff91adc1b3d3641371;hb=d068c0ec5447e8f373ebd536b08ed902c00de0f5;hpb=a6668eb2a8216997bf66b5dd0bd288410eb45ca8 diff --git a/src/options.php b/src/options.php index 399ca53b..e13c7710 100644 --- a/src/options.php +++ b/src/options.php @@ -1,17 +1,22 @@ - include("../config/config.php"); - include("../functions/mailbox.php"); - include("../functions/strings.php"); - include("../functions/page_header.php"); - include("../functions/display_messages.php"); - include("../functions/imap.php"); - include("../functions/array.php"); + if (!isset($config_php)) + include("../config/config.php"); + if (!isset($strings_php)) + include("../functions/strings.php"); + if (!isset($page_header_php)) + include("../functions/page_header.php"); + if (!isset($display_messages_php)) + include("../functions/display_messages.php"); + if (!isset($imap_php)) + include("../functions/imap.php"); + if (!isset($array_php)) + include("../functions/array.php"); include("../src/load_prefs.php"); - $imapConnection = loginToImapServer($username, $key, $imapServerAddress); - getFolderList($imapConnection, $boxes); + $imapConnection = sqimap_login($username, $key, $imapServerAddress); + $boxes = sqimap_mailbox_list($imapConnection, $boxes); fputs($imapConnection, "1 logout\n"); echo "
\n"; @@ -19,7 +24,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 "\n"; @@ -35,7 +41,7 @@ echo " | |
"; echo " "; - echo _(" Full Name:"); + echo _("Full Name:"); echo " "; echo " | "; echo ""; @@ -44,11 +50,24 @@ echo " "; echo " | "; echo "
"; + echo " "; + echo _("E-mail address:"); + echo " "; + echo " | "; + echo "";
+ echo " ";
+ echo " "; + echo " "; + echo " | ";
+ echo "
"; echo " "; - echo _(" Reply-to:"); + echo _("Reply-to:"); echo " "; echo " | "; echo ""; @@ -61,7 +80,7 @@ echo " |
"; echo " "; - echo _(" Theme:"); + echo _("Theme:"); echo " "; echo " | "; echo ""; @@ -85,7 +104,7 @@ echo " |
"; echo " "; - echo _(" Move deleted messages to "); + echo _("Move deleted messages to "); echo "\"$trash_folder\"?"; echo " "; echo " | "; @@ -109,7 +128,7 @@ echo "|
"; echo " "; - echo _(" Wrap incoming text at:"); + echo _("Wrap incoming text at:"); echo " "; echo " | "; echo ""; @@ -126,7 +145,7 @@ echo " |
"; echo " "; - echo _(" Size of editor window (in characters):"); + echo _("Size of editor window (in characters):"); echo " "; echo " | "; echo ""; @@ -138,7 +157,102 @@ echo " "; echo " | "; echo "