From 11307a4c707a22ef7dc2530b0e33c2afa5329e58 Mon Sep 17 00:00:00 2001 From: lkehresman Date: Fri, 7 Jan 2000 15:55:39 +0000 Subject: [PATCH] added some preferences, and squashed soem bugs git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@122 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/compose.php | 2 +- src/download.php | 10 +++---- src/left_main.php | 6 ++-- src/load_prefs.php | 17 ++++++++++- src/options.php | 68 ++++++++++++++++++++++++++++++++++++++---- src/options_submit.php | 3 ++ src/read_body.php | 2 +- 7 files changed, 91 insertions(+), 17 deletions(-) diff --git a/src/compose.php b/src/compose.php index ec97c741..d0a6cc31 100644 --- a/src/compose.php +++ b/src/compose.php @@ -147,7 +147,7 @@ echo " \n"; echo " \n"; echo " \n"; - echo "
"; + echo "
"; echo " "; echo " \n"; echo "\n"; diff --git a/src/download.php b/src/download.php index 480b694c..b89fced1 100644 --- a/src/download.php +++ b/src/download.php @@ -9,7 +9,7 @@ include("../src/load_prefs.php"); - function viewText($color, $body, $id, $entid, $mailbox, $type1) { + function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) { echo "\n"; displayPageHeader($color, "None"); @@ -19,9 +19,9 @@ $urlmailbox = urlencode($mailbox); echo "Download this as a file

"; if ($type1 == "html") - echo nl2br(trim($body)); + echo $body; else - echo nl2br(trim(htmlspecialchars($body))); + echo translateText($body, $wrap_at); echo ""; } @@ -60,11 +60,11 @@ switch ($type0) { case "text": $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]); - viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1); + viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); break; case "message": $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]); - viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1); + viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); break; default: $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]); diff --git a/src/left_main.php b/src/left_main.php index 65589544..642717b1 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -20,7 +20,7 @@ include("../functions/imap.php"); include("../functions/mailbox.php"); - function formatMailboxName($imapConnection, $mailbox, $delimeter, $color) { + function formatMailboxName($imapConnection, $mailbox, $delimeter, $color, $move_to_trash) { require ("../config/config.php"); $mailboxURL = urlencode($mailbox); @@ -104,10 +104,10 @@ $line .= readShortMailboxName($mailbox, $delimeter); $line .= ""; } else { - $line .= formatMailboxName($imapConnection, $mailbox, $delimeter, $color); + $line .= formatMailboxName($imapConnection, $mailbox, $delimeter, $color, $move_to_trash); } } else { - $line .= formatMailboxName($imapConnection, $mailbox, $delimeter, $color); + $line .= formatMailboxName($imapConnection, $mailbox, $delimeter, $color, $move_to_trash); } echo "$line
"; } diff --git a/src/load_prefs.php b/src/load_prefs.php index e302658e..e36482ad 100644 --- a/src/load_prefs.php +++ b/src/load_prefs.php @@ -17,4 +17,19 @@ exit; } } -?> \ No newline at end of file + + + /** Load the user's trash folder preferences **/ + $move_to_trash = getPref($data_dir, $username, "move_to_trash"); + if ($move_to_trash == "") + $move_to_trash = $default_move_to_trash; + + $wrap_at = getPref($data_dir, $username, "wrap_at"); + if ($wrap_at == "") + $wrap_at = 86; + + $editor_size = getPref($data_dir, $username, "editor_size"); + if ($editor_size == "") + $editor_size = 76; +?> + diff --git a/src/options.php b/src/options.php index 362a22a5..af6cd873 100644 --- a/src/options.php +++ b/src/options.php @@ -10,6 +10,10 @@ include("../src/load_prefs.php"); + $imapConnection = loginToImapServer($username, $key, $imapServerAddress); + getFolderList($imapConnection, $boxes); + fputs($imapConnection, "1 logout\n"); + echo "\n"; displayPageHeader($color, "None"); @@ -70,20 +74,72 @@ echo " "; echo " "; echo " "; + echo ""; - echo "\n"; - // SUBMIT BUTTON + echo "\n"; + // MOVE_TO_TRASH echo " "; - echo " "; - echo " "; echo " "; - echo "

"; + echo "

"; + echo " "; + echo " Move deleted messages to \"$trash_folder\"?"; + echo " "; echo "

"; - echo "
\n"; + echo "

"; + echo " "; + if ($move_to_trash == true) + echo " True
"; + else + echo " True
"; + + if ($move_to_trash == false) + echo " False"; + else + echo " False"; + + echo " "; echo "

\n"; + // WRAP_AT + echo " "; + echo " "; + echo " "; + echo " Wrap incoming text at:"; + echo " "; + echo " "; + echo " "; + echo " "; + if (isset($wrap_at)) + echo "
"; + else + echo "
"; + echo " "; + echo " "; + echo " "; + + // EDITOR_SIZE + echo " "; + echo " "; + echo " "; + echo " Size of editor window (in characters):"; + echo " "; + echo " "; + echo " "; + echo " "; + if (isset($editor_size)) + echo "
"; + else + echo "
"; + echo " "; + echo " "; + echo " "; + echo ""; + + + // SUBMIT BUTTON + echo "
\n"; echo ""; echo ""; diff --git a/src/options_submit.php b/src/options_submit.php index 65b8c202..cbddf1f5 100644 --- a/src/options_submit.php +++ b/src/options_submit.php @@ -16,6 +16,9 @@ setPref($data_dir, $username, "full_name", $full_name); setPref($data_dir, $username, "reply_to", $reply_to); setPref($data_dir, $username, "chosen_theme", $chosentheme); + setPref($data_dir, $username, "move_to_trash", $movetotrash); + setPref($data_dir, $username, "wrap_at", $wrapat); + setPref($data_dir, $username, "editor_size", $editorsize); echo ""; echo "

Options Saved!

"; diff --git a/src/read_body.php b/src/read_body.php index 61c31d27..c20a4550 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -146,7 +146,7 @@ echo " "; echo " \n"; - $body = formatBody($message, $color); + $body = formatBody($message, $color, $wrap_at); echo "
"; echo "$body"; -- 2.25.1