X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_display.php;h=f92b017023ef39d13a0bb28b8a1259802e9d9b42;hp=69cba54bea73de561481ddf1d78e3ac8ea3fb278;hb=a440e68fce61ad2cd09fe0bc2bb89972b788a92f;hpb=23d6bd09c631285eae8c45af3a37aa7c86be3cfa diff --git a/src/options_display.php b/src/options_display.php index 69cba54b..f92b0170 100644 --- a/src/options_display.php +++ b/src/options_display.php @@ -18,7 +18,7 @@ require_once('../functions/options.php'); displayPageHeader($color, 'None'); - $chosen_language = getPref($data_dir, $username, 'language'); + $language = getPref($data_dir, $username, 'language'); ?>
@@ -32,71 +32,152 @@
_("JavaScript"), - '0' => _("HTML") ), - $use_javascript_addr_book ); - OptionSelect( _("Use Javascript"), 'new_javascript_setting', - array(SMPREF_JS_AUTODETECT => _("Autodetect"), - SMPREF_JS_ON => _("Always"), - SMPREF_JS_OFF => _("Never") ), - $javascript_setting ); - OptionHidden('js_autodetect_results', SMPREF_JS_OFF); - OptionText( _("Number of Messages to Index"), 'shownum', $show_num, 5 ); - OptionText( _("Wrap incoming text at"), 'wrapat', $wrap_at, 5 ); - OptionText( _("Size of editor window"), 'editorsize', $editor_size, 5 ); - OptionSelect( _("Location of buttons when composing"), - 'button_new_location', - array( 'top' => _("Before headers"), - 'between' => _("Between headers and message body"), - 'bottom' => _("After message body") ), - $location_of_buttons ); - OptionSelect( _("Location of folder list"), - 'folder_new_location', - array( '' => _("Left"), - 'right' => _("Right") ), - $location_of_bar ); - for ($i = 100; $i <= 300; $i += 10) { - $res[$i] = $i . _("pixels"); - } - OptionSelect( _("Width of folder list"), - 'leftsize', - $res, - $left_size ); - $minutes_str = _("Minutes"); - OptionSelect( _("Auto refresh folder list"), - 'leftrefresh', - array( 'None' => _("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") ); + + /* Build a simple array into which we will build options. */ + $optvals = array(); + + $theme_values = array(); + foreach ($theme as $theme_key => $theme_attributes) { + $theme_values[$theme_attributes['PATH']] = $theme_attributes['NAME']; + } + $optvals[] = array( + 'name' => 'chosen_theme', + 'caption' => _("Theme"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_ALL, + 'posvals' => $theme_values + ); + + $language_values = array(); + foreach ($languages as $lang_key => $lang_attributes) { + if (isset($lang_attributes['NAME'])) { + $language_values[$lang_key] = $lang_attributes['NAME']; + } + } + $optvals[] = array( + 'name' => 'language', + 'caption' => _("Language"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_ALL, + 'posvals' => $language_values + ); + + /* Set values for the "use javascript" option. */ + $optvals[] = array( + 'name' => 'javascript_setting', + 'caption' => _("Use Javascript"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_ALL, + 'posvals' => array(SMPREF_JS_AUTODETECT => _("Autodetect"), + SMPREF_JS_ON => _("Always"), + SMPREF_JS_OFF => _("Never")) + ); + + $js_autodetect_results = SMPREF_JS_OFF; + $optvals[] = array( + 'name' => 'js_autodetect_results', + 'caption' => '', + 'type' => SMOPT_TYPE_HIDDEN, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[] = array( + 'name' => 'show_num', + 'caption' => _("Number of Messages to Index"), + 'type' => SMOPT_TYPE_INTEGER, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[] = array( + 'name' => 'alt_index_colors', + 'caption' => _("Enable Alternating Row Colors"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[] = array( + 'name' => 'page_selector', + 'caption' => _("Enable Page Selector"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[] = array( + 'name' => 'page_selector_max', + 'caption' => _("Maximum Number of Pages to Show"), + 'type' => SMOPT_TYPE_INTEGER, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[] = array( + 'name' => 'wrap_at', + 'caption' => _("Wrap Incoming Text At"), + 'type' => SMOPT_TYPE_INTEGER, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[] = array( + 'name' => 'editor_size', + 'caption' => _("Size of Editor Window"), + 'type' => SMOPT_TYPE_INTEGER, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[] = array( + 'name' => 'location_of_buttons', + 'caption' => _("Location of Buttons when Composing"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_NONE, + 'posvals' => array(SMPREF_LOC_TOP => _("Before headers"), + SMPREF_LOC_BETWEEN => _("Between headers and message body"), + SMPREF_LOC_BOTTOM => _("After message body")) + ); + + $optvals[] = array( + 'name' => 'use_javascript_addr_book', + 'caption' => _("Addressbook Display Format"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_NONE, + 'posvals' => array('1' => _("Javascript"), + '0' => _("HTML")) + ); + + $optvals[] = array( + 'name' => 'show_html_default', + 'caption' => _("Show HTML Version by Default"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[] = array( + 'name' => 'include_self_reply_all', + 'caption' => _("Remove Me from CC when I Reply All"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[] = array( + 'name' => 'show_xmailer_default', + 'caption' => _("Enable Mailer Display"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + + /* 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 ' \n"; + echo ' \n"; + echo "\n"; + } else { + echo $option->createHTMLWidget(); + } + } echo ''; do_hook('options_display_inside'); @@ -112,7 +193,7 @@
' + . $option->caption . ":' . $option->createHTMLWidget() . "