From 45cfc1247b2a15a60d24f0af7a5303e8a4ae0edf Mon Sep 17 00:00:00 2001 From: philippe_mingo Date: Sun, 28 Oct 2001 00:37:47 +0000 Subject: [PATCH] Fixed options_display to use functions/options. Fixed load prefs to use default parm. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1629 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/db_prefs.php | 2 +- src/load_prefs.php | 128 ++++++------------ src/options_display.php | 290 +++++++++------------------------------- 3 files changed, 101 insertions(+), 319 deletions(-) diff --git a/functions/db_prefs.php b/functions/db_prefs.php index 3d478cf3..6a606db7 100644 --- a/functions/db_prefs.php +++ b/functions/db_prefs.php @@ -183,7 +183,7 @@ /** returns the value for the pref $string **/ - function getPref($data_dir, $username, $string) { + function getPref($data_dir, $username, $string, $default ) { $db = new dbPrefs; if(isset($db->error)) { printf(_("Preference database error (%s). Exiting abnormally"), diff --git a/src/load_prefs.php b/src/load_prefs.php index 404bf532..01f25663 100644 --- a/src/load_prefs.php +++ b/src/load_prefs.php @@ -75,74 +75,52 @@ session_register("theme_css"); global $use_javascript_addr_book; - $use_javascript_addr_book = getPref($data_dir, $username, "use_javascript_addr_book"); - if ($use_javascript_addr_book == "") - $use_javascript_addr_book = $default_use_javascript_addr_book; + $use_javascript_addr_book = getPref($data_dir, $username, 'use_javascript_addr_book', $default_use_javascript_addr_book); - /** Load the user's sent folder preferences **/ global $move_to_sent, $move_to_trash; - $move_to_sent = getPref($data_dir, $username, "move_to_sent"); - if ($move_to_sent == "") - $move_to_sent = $default_move_to_sent; + $move_to_sent = getPref($data_dir, $username, 'move_to_sent', $default_move_to_sent); /** 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; - + $move_to_trash = getPref($data_dir, $username, 'move_to_trash', $default_move_to_trash); global $unseen_type, $unseen_notify; - $unseen_type = getPref($data_dir, $username, "unseen_type"); - if ($default_unseen_type == "") + if ($default_unseen_type == '') $default_unseen_type = 1; - if ($unseen_type == "") - $unseen_type = $default_unseen_type; - - $unseen_notify = getPref($data_dir, $username, "unseen_notify"); - if ($default_unseen_notify == "") + $unseen_type = getPref($data_dir, $username, 'unseen_type', $default_unseen_type); + if ($default_unseen_notify == '') $default_unseen_notify = 2; - if ($unseen_notify == "") - $unseen_notify = $default_unseen_notify; - + $unseen_notify = getPref($data_dir, $username, 'unseen_notify', $default_unseen_notify); global $folder_prefix; - $folder_prefix = getPref($data_dir, $username, "folder_prefix"); - if ($folder_prefix == "") { - $folder_prefix = $default_folder_prefix; - } + $folder_prefix = getPref($data_dir, $username, 'folder_prefix', $default_folder_prefix); /** Load special folders **/ global $trash_folder, $sent_folder; - $new_trash_folder = getPref($data_dir, $username, "trash_folder"); - if (($new_trash_folder == "") && ($move_to_trash == true)) { + $new_trash_folder = getPref($data_dir, $username, 'trash_folder'); + if ( ( $new_trash_folder == '' ) && ( $move_to_trash ) ) { $trash_folder = $folder_prefix . $trash_folder; } else { $trash_folder = $new_trash_folder; } /** Load special folders **/ - $new_sent_folder = getPref($data_dir, $username, "sent_folder"); - if (($new_sent_folder == "") && ($move_to_sent == true)) { + $new_sent_folder = getPref($data_dir, $username, 'sent_folder'); + if ( ( $new_sent_folder == '' ) && ( $move_to_sent ) ) { $sent_folder = $folder_prefix . $sent_folder; } else { $sent_folder = $new_sent_folder; } global $show_num, $wrap_at, $left_size; - $show_num = getPref($data_dir, $username, "show_num"); - if ($show_num == "") { - $show_num = 25; - } - - $wrap_at = getPref($data_dir, $username, "wrap_at"); - if ($wrap_at == "") { - $wrap_at = 86; - } else if ($wrap_at < 15) { + $show_num = getPref($data_dir, $username, 'show_num', 15 ); + + $wrap_at = getPref( $data_dir, $username, 'wrap_at', 86 ); + if ($wrap_at < 15) { $wrap_at = 15; } - $left_size = getPref($data_dir, $username, "left_size"); + $left_size = getPref($data_dir, $username, 'left_size'); if ($left_size == "") { if (isset($default_left_size)) { $left_size = $default_left_size; @@ -152,44 +130,27 @@ } global $editor_size, $use_signature, $prefix_sig; - $editor_size = getPref($data_dir, $username, "editor_size"); - if ($editor_size == "") { - $editor_size = 76; - } + $editor_size = getPref($data_dir, $username, "editor_size", 76 ); - - $use_signature = getPref($data_dir, $username, "use_signature"); - if ($use_signature == "") { - $use_signature = false; - } + $use_signature = getPref($data_dir, $username, 'use_signature', FALSE ); $prefix_sig = getPref($data_dir, $username, "prefix_sig"); /* Load preferences for reply citation style. */ global $reply_citation_style, $reply_citation_start, $reply_citation_end; - $reply_citation_style = getPref($data_dir, $username, 'reply_citation_style'); - if ($reply_citation_style == '') { - $reply_citation_style = 'none'; - } + $reply_citation_style = getPref($data_dir, $username, 'reply_citation_style', 'none' ); $reply_citation_start = getPref($data_dir, $username, 'reply_citation_start'); $reply_citation_end = getPref($data_dir, $username, 'reply_citation_end'); global $left_refresh, $sort; - $left_refresh = getPref($data_dir, $username, "left_refresh"); - if ($left_refresh == "") { - $left_refresh = false; - } + $left_refresh = getPref($data_dir, $username, 'left_refresh', 'None' ); + $sort = getPref($data_dir, $username, 'sort', 6 ); - $sort = getPref($data_dir, $username, "sort"); - if ($sort == "") { - $sort = 6; - } - /** Load up the Signature file **/ global $signature_abs; - if ($use_signature == true) { + if ($use_signature) { $signature_abs = $signature = getSig($data_dir, $username); } else { $signature_abs = getSig($data_dir, $username); @@ -200,19 +161,19 @@ global $message_highlight_list; for ($i=0; $hlt = getPref($data_dir, $username, "highlight$i"); $i++) { $ary = explode(",", $hlt); - $message_highlight_list[$i]["name"] = $ary[0]; - $message_highlight_list[$i]["color"] = $ary[1]; - $message_highlight_list[$i]["value"] = $ary[2]; - $message_highlight_list[$i]["match_type"] = $ary[3]; + $message_highlight_list[$i]['name'] = $ary[0]; + $message_highlight_list[$i]['color'] = $ary[1]; + $message_highlight_list[$i]['value'] = $ary[2]; + $message_highlight_list[$i]['match_type'] = $ary[3]; } #index order lets you change the order of the message index global $index_order; - $order = getPref($data_dir, $username, "order1"); + $order = getPref($data_dir, $username, 'order1'); for ($i=1; $order; $i++) { $index_order[$i] = $order; - $order = getPref($data_dir, $username, "order".($i+1)); + $order = getPref($data_dir, $username, 'order'.($i+1)); } if (!isset($index_order)) { $index_order[1] = 1; @@ -221,31 +182,20 @@ $index_order[4] = 5; $index_order[5] = 4; } - + global $alt_index_colors; - $alt_index_colors = getPref($data_dir, $username, 'alt_index_colors'); - if ($alt_index_colors == 0) { - $alt_index_colors = false; - } else { - $alt_index_colors = true; - } - + $alt_index_colors = getPref($data_dir, $username, 'alt_index_colors', FALSE ); + global $location_of_bar, $location_of_buttons; - $location_of_bar = getPref($data_dir, $username, 'location_of_bar'); - if ($location_of_bar == '') - $location_of_bar = 'left'; - - $location_of_buttons = getPref($data_dir, $username, 'location_of_buttons'); - if ($location_of_buttons == '') { - $location_of_buttons = 'between'; - } - + $location_of_bar = getPref($data_dir, $username, 'location_of_bar', 'left'); + $location_of_buttons = getPref($data_dir, $username, 'location_of_buttons', 'between' ); + global $collapse_folders, $show_html_default; $collapse_folders = getPref($data_dir, $username, 'collapse_folders'); - - // show_html_default is a int value - $show_html_default = intval(getPref($data_dir, $username, 'show_html_default')); + + // show_html_default is a int value + $show_html_default = intval(getPref($data_dir, $username, 'show_html_default'), 1 ); do_hook("loading_prefs"); -?> +?> \ No newline at end of file diff --git a/src/options_display.php b/src/options_display.php index 2ee032b0..e3ee45a7 100644 --- a/src/options_display.php +++ b/src/options_display.php @@ -15,9 +15,10 @@ require_once('../functions/imap.php'); require_once('../functions/array.php'); require_once('../functions/plugin.php'); - + require_once('../functions/options.php'); + displayPageHeader($color, 'None'); - $chosen_language = getPref($data_dir, $username, 'language'); + $chosen_language = getPref($data_dir, $username, 'language'); ?>
@@ -30,237 +31,68 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + do_hook('options_display_inside'); ?>
: - -'; -?> -
: - -'; - if (! $use_gettext) - echo '
This system doesn\'t support multiple languages'; - -?> -
  - '; - if ($use_javascript_addr_book == true) { - echo ' ' . _("JavaScript") . '    '; - echo ' ' . _("HTML"); - } else { - echo ' ' . _("JavaScript") . '    '; - echo ' ' . _("HTML"); - } - ?> -
: - -
'; - else - echo '
'; -?> -
: - -
'; - else - echo '
'; -?> -
: - -= 10 && $editor_size <= 255) - echo '
'; - else - echo '
'; -?> -
: -
: -
: - ' . "\n"; - for ($i = 100; $i <= 300; $i += 10) - { - if ($left_size >= $i && $left_size < $i + 10) - echo "
: - - _("Never"), + 30 => '30 '. _("Seconds"), + 60 => '1 ' . _("Minute"), + 120 => "2 $minutes_str", + 180 => "3 $minutes_str", + 300 => "5 $minutes_str", + 600 => "10 $minutes_str" ), + $left_refresh ); + OptionRadio( _("Use alternating row colors?"), + 'altIndexColors', + array( 1 => _("Yes"), + 0 => _("No") ), + $alt_index_colors ); + OptionCheck( _("Show HTML version by default"), + 'showhtmldefault', + $show_html_default, + _("Yes, show me the HTML version of a mail message, if it is available.") ); + OptionCheck( _("Include Self"), + 'includeselfreplyall', + getPref($data_dir, $username, 'include_self_reply_all', FALSE ), + _("Don't remove me from the CC addresses when I use \"Reply All\"") ); + $psw = getPref($data_dir, $username, 'page_selector_max', 10 ); + OptionCheck( _("Page Selector"), + 'pageselector', + !getPref($data_dir, $username, 'page_selector', FALSE ), + _("Show page selector") . + "  " . + _("pages max") ); - echo ' '; -?> -
- - - - >    - >
-
- : - - > - -
- : - - ' . _("Don't remove me from the CC addresses when I use \"Reply All\""); - ?> -
- '; - echo ' ' . _("Show page selector") . ' '; - $psw = getPref($data_dir, $username, 'page_selector_max', 10 ); - echo ""; - echo ' ' . _("pages max"); - ?> -
  -- 2.25.1