From b5efadfa18aae0a9730fa1fe597b9745bdcc3238 Mon Sep 17 00:00:00 2001 From: thomppj Date: Sun, 11 Nov 2001 03:11:45 +0000 Subject: [PATCH] Last options commit for the evening. This one is dedicated to my wife and her colorful blanket. Time to go to bed! Woohoo! git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1723 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/load_prefs.php | 18 ++--- src/options.php | 38 ++++++----- src/options_display.php | 6 +- src/options_folder.php | 144 ++++++++++++++++------------------------ 4 files changed, 92 insertions(+), 114 deletions(-) diff --git a/src/load_prefs.php b/src/load_prefs.php index 55ebfc07..a28d18dc 100644 --- a/src/load_prefs.php +++ b/src/load_prefs.php @@ -92,27 +92,27 @@ global $trash_folder, $sent_folder, $draft_folder; /** Load special folder - trash **/ - $new_trash_folder = getPref($data_dir, $username, 'trash_folder'); - if (($new_trash_folder == '') && ($move_to_trash)) { + $load_trash_folder = getPref($data_dir, $username, 'trash_folder'); + if (($load_trash_folder == '') && ($move_to_trash)) { $trash_folder = $folder_prefix . $trash_folder; } else { - $trash_folder = $new_trash_folder; + $trash_folder = $load_trash_folder; } /** Load special folder - sent **/ - $new_sent_folder = getPref($data_dir, $username, 'sent_folder'); - if (($new_sent_folder == '') && ($move_to_sent)) { + $load_sent_folder = getPref($data_dir, $username, 'sent_folder'); + if (($load_sent_folder == '') && ($move_to_sent)) { $sent_folder = $folder_prefix . $sent_folder; } else { - $sent_folder = $new_sent_folder; + $sent_folder = $load_sent_folder; } /** Load special folder - draft **/ - $new_draft_folder = getPref($data_dir, $username, 'draft_folder'); - if (($new_draft_folder == '') && ($save_as_draft)) { + $load_draft_folder = getPref($data_dir, $username, 'draft_folder'); + if (($load_draft_folder == '') && ($save_as_draft)) { $draft_folder = $folder_prefix . $draft_folder; } else { - $draft_folder = $new_draft_folder; + $draft_folder = $load_draft_folder; } global $show_num, $wrap_at, $left_size; diff --git a/src/options.php b/src/options.php index 8b78c491..d60d4eaf 100644 --- a/src/options.php +++ b/src/options.php @@ -112,28 +112,34 @@ echo '
'._("Successfully saved display preferences!").'
'; echo '' . _("Refresh Page") . '
'; } else if (isset($submit_folder)) { - /* Save folder preferences. */ - if ($trash != 'none') { - setPref($data_dir, $username, 'move_to_trash', true); - setPref($data_dir, $username, 'trash_folder', $trash); + /* Save trash folder preferences. */ + if ($new_trash_folder != SMPREF_NONE) { + setPref($data_dir, $username, 'move_to_trash', SMPREF_ON); + setPref($data_dir, $username, 'trash_folder', $new_trash_folder); } else { - setPref($data_dir, $username, 'move_to_trash', '0'); - setPref($data_dir, $username, 'trash_folder', 'none'); + setPref($data_dir, $username, 'move_to_trash', SMPREF_OFF); + setPref($data_dir, $username, 'trash_folder', SMPREF_NONE); } - if ($sent != 'none') { - setPref($data_dir, $username, 'move_to_sent', true); - setPref($data_dir, $username, 'sent_folder', $sent); + + /* Save sent folder preferences. */ + if ($new_sent_folder != SMPREF_NONE) { + setPref($data_dir, $username, 'move_to_sent', SMPREF_ON); + setPref($data_dir, $username, 'sent_folder', $new_sent_folder); } else { - setPref($data_dir, $username, 'move_to_sent', '0'); - setPref($data_dir, $username, 'sent_folder', 'none'); + setPref($data_dir, $username, 'move_to_sent', SMPREF_OFF); + setPref($data_dir, $username, 'sent_folder', SMPREF_NONE); } - if ($draft != 'none') { - setPref($data_dir, $username, 'save_as_draft', true); - setPref($data_dir, $username, 'draft_folder', $draft); + + /* Save draft folder preferences. */ + if ($new_draft_folder != SMPREF_NONE) { + setPref($data_dir, $username, 'save_as_draft', SMPREF_ON); + setPref($data_dir, $username, 'draft_folder', $new_draft_folder); } else { - setPref($data_dir, $username, 'save_as_draft', '0'); - setPref($data_dir, $username, 'draft_folder', 'none'); + setPref($data_dir, $username, 'save_as_draft', SMPREF_OFF); + setPref($data_dir, $username, 'draft_folder', SMPREF_NONE); } + + /* Save folder prefix preferences. */ if (isset($folderprefix)) { setPref($data_dir, $username, 'folder_prefix', $folderprefix); } else { diff --git a/src/options_display.php b/src/options_display.php index 87029187..f1ab70bf 100644 --- a/src/options_display.php +++ b/src/options_display.php @@ -203,8 +203,8 @@ foreach ($options as $option) { if ($option->type != SMOPT_TYPE_HIDDEN) { echo "\n"; - echo ' ' - . $option->caption . ":\n"; + echo ' ' + . $option->caption . ":\n"; echo ' ' . $option->createHTMLWidget() . "\n"; echo "\n"; } else { @@ -212,8 +212,6 @@ } } - /*** NOT YET CONVERTED TO OPTION OBJECTS ***/ - echo '
'; do_hook('options_display_inside'); OptionSubmit( 'submit_display' ); diff --git a/src/options_folder.php b/src/options_folder.php index 1562fbdd..3e86c5bb 100644 --- a/src/options_folder.php +++ b/src/options_folder.php @@ -49,90 +49,64 @@ '; - echo _("Trash Folder:"); - echo ''; - echo "\n"; - echo ''; - - - /* SENT FOLDER */ - echo ''; - echo _("Sent Folder:"); - echo ''; - echo '\n"; - echo ''; - - /* Drafts Folder. */ - echo ''; - echo _("Drafts Folder:"); - echo ''; - echo '\n"; - echo ''; + /* Build a simple array into which we will build options. */ + $optvals = array(); + + $special_folder_values = array(); + foreach ($boxes as $folder) { + if (strtolower($folder['unformatted']) != 'inbox') { + $real_value = $folder['unformatted-dm']; + $disp_value = str_replace(' ', ' ', $folder['formatted']); + $special_folder_values[$real_value] = $disp_value; + } + } + + $trash_none = array(SMPREF_NONE => _("Do not use Trash")); + $trash_folder_values = array_merge($trash_none, $special_folder_values); + $optvals[] = array( + 'name' => 'trash_folder', + 'caption' => _("Trash Folder"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_FOLDERLIST, + 'posvals' => $trash_folder_values + ); + + $sent_none = array(SMPREF_NONE => _("Do not use Sent")); + $sent_folder_values = array_merge($sent_none, $special_folder_values); + $optvals[] = array( + 'name' => 'sent_folder', + 'caption' => _("Sent Folder"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_FOLDERLIST, + 'posvals' => $sent_folder_values + ); + + $drafts_none = array(SMPREF_NONE => _("Do not use Drafts")); + $draft_folder_values = array_merge($draft_none, $special_folder_values); + $optvals[] = array( + 'name' => 'draft_folder', + 'caption' => _("Draft Folder"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_FOLDERLIST, + 'posvals' => $draft_folder_values + ); + + /* Build all these values into an array of SquirrelOptions objects. */ + $options = createOptionArray($optvals); + + /* Print the row for each option. */ + foreach ($options as $option) { + if ($option->type != SMOPT_TYPE_HIDDEN) { + echo "\n"; + echo ' ' + . $option->caption . ":\n"; + echo ' ' . $option->createHTMLWidget() . "\n"; + echo "\n"; + } else { + echo $option->createHTMLWidget(); + } + } + // if( $unseen_notify == '' ) // $unseen_notify = '2'; OptionRadio( _("Unseen message notification"), @@ -182,4 +156,4 @@ - \ No newline at end of file + -- 2.25.1