-
-
-
-
+
+
+
+
+
+
'._("Successfully saved personal information!").'
';
- } else if (isset($submit_display)) {
- /* Do checking to make sure $new_theme is in the array. */
- $theme_in_array = false;
- for ($i=0; $i < count($theme); $i++) {
- if ($theme[$i]['PATH'] == $new_chosen_theme) {
- $theme_in_array = true;
- break;
- }
- }
- if (!$theme_in_array) {
- $new_chosen_theme = '';
- }
-
- /* Save display preferences. */
- setPref($data_dir, $username, 'chosen_theme', $new_chosen_theme);
- setPref($data_dir, $username, 'language', $new_language);
- setPref($data_dir, $username, 'use_javascript_addr_book', $new_use_javascript_addr_book);
- setPref($data_dir, $username, 'javascript_setting', $new_javascript_setting);
- setPref($data_dir, $username, 'show_num', $new_show_num);
- setPref($data_dir, $username, 'wrap_at', $new_wrap_at);
- setPref($data_dir, $username, 'editor_size', $new_editor_size);
- setPref($data_dir, $username, 'location_of_buttons', $new_location_of_buttons);
- setPref($data_dir, $username, 'location_of_bar', $new_location_of_bar);
- setPref($data_dir, $username, 'left_size', $new_left_size);
- setPref($data_dir, $username, 'left_refresh', $new_left_refresh);
-
- if (isset($altIndexColors) && $altIndexColors == 1) {
- setPref($data_dir, $username, 'alt_index_colors', 1);
- } else {
- setPref($data_dir, $username, 'alt_index_colors', 0);
- }
- setPref($data_dir, $username, 'show_html_default', ($showhtmldefault?1:0) );
-
- if (isset($includeselfreplyall)) {
- setPref($data_dir, $username, 'include_self_reply_all', 1);
- } else {
- removePref($data_dir, $username, 'include_self_reply_all');
- }
-
- if (isset($pageselectormax)) {
- setPref($data_dir, $username, 'page_selector_max', $pageselectormax);
- } else {
- removePref($data_dir, $username, 'page_selector_max', 0 );
- }
-
- if (isset($pageselector)) {
- removePref($data_dir, $username, 'page_selector');
- } else {
- setPref($data_dir, $username, 'page_selector', 1);
- }
+/*******************************************************************/
+/* DO OLD SAVING OF SUBMITTED OPTIONS. THIS WILL BE REMOVED LATER. */
+/*******************************************************************/
+
+/* If in submit mode, select a save hook name and run it. */
+if ($optmode == SMOPT_MODE_SUBMIT) {
+ /* Select a save hook name. */
+ switch ($optpage) {
+ case SMOPT_PAGE_PERSONAL:
+ $save_hook_name = 'options_personal_save';
+ break;
+ case SMOPT_PAGE_DISPLAY:
+ $save_hook_name = 'options_display_save';
+ break;
+ case SMOPT_PAGE_FOLDER:
+ $save_hook_name = 'options_folder_save';
+ break;
+ default:
+ $save_hook_name = 'options_save';
+ break;
+ }
- $js_autodetect_results = (isset($new_js_autodetect_results) ? $new_js_autodetect_results : SMPREF_JS_OFF);
- if ($new_javascript_setting == SMPREF_JS_AUTODETECT) {
- if ($js_autodetect_results == SMPREF_JS_ON) {
- setPref($data_dir, $username, 'javascript_on', SMPREF_JS_ON);
- } else {
- setPref($data_dir, $username, 'javascript_on', SMPREF_JS_OFF);
- }
- } else {
- setPref($data_dir, $username, 'javascript_on', $new_javascript_setting);
- }
-
- do_hook('options_display_save');
-
- 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);
- } else {
- setPref($data_dir, $username, 'move_to_trash', '0');
- setPref($data_dir, $username, 'trash_folder', 'none');
+ /* Run the options save hook. */
+ do_hook($save_hook_name);
+}
+
+/***************************************************************/
+/* Apply logic to decide what optpage we want to display next. */
+/***************************************************************/
+
+/* If this is the result of an option page being submitted, then */
+/* show the main page. Otherwise, show whatever page was called. */
+
+if ($optmode == SMOPT_MODE_SUBMIT) {
+ $optpage = SMOPT_PAGE_MAIN;
+}
+
+/***************************************************************/
+/* Finally, display whatever page we are supposed to show now. */
+/***************************************************************/
+
+/*
+ * The main option page has a different layout then the rest of the option
+ * pages. Therefore, we create it here first, then the others below.
+ */
+if ($optpage == SMOPT_PAGE_MAIN) {
+ /**********************************************************/
+ /* First, display the results of a submission, if needed. */
+ /**********************************************************/
+ if ($optmode == SMOPT_MODE_SUBMIT) {
+ /* Display a message indicating a successful save. */
+ echo '' . _("Successfully Saved Options") . ": $optpage_name
\n";
+
+ /* If $max_refresh != SMOPT_REFRESH_NONE, provide a refresh link. */
+ if ($max_refresh == SMOPT_REFRESH_FOLDERLIST) {
+ echo '' . _("Refresh Folder List") . '
';
+ } else if ($max_refresh) {
+ echo '' . _("Refresh Page") . '
';
}
- if ($sent != 'none') {
- setPref($data_dir, $username, 'move_to_sent', true);
- setPref($data_dir, $username, 'sent_folder', $sent);
- } else {
- setPref($data_dir, $username, 'move_to_sent', '0');
- setPref($data_dir, $username, 'sent_folder', 'none');
- }
- if ($draft != 'none') {
- setPref($data_dir, $username, 'save_as_draft', true);
- setPref($data_dir, $username, 'draft_folder', $draft);
- } else {
- setPref($data_dir, $username, 'save_as_draft', '0');
- setPref($data_dir, $username, 'draft_folder', 'none');
- }
- if (isset($folderprefix)) {
- setPref($data_dir, $username, 'folder_prefix', $folderprefix);
- } else {
- setPref($data_dir, $username, 'folder_prefix', '');
- }
- setPref($data_dir, $username, 'unseen_notify', $unseennotify);
- setPref($data_dir, $username, 'unseen_type', $unseentype);
- if (isset($collapsefolders))
- setPref($data_dir, $username, 'collapse_folders', $collapsefolders);
- else
- removePref($data_dir, $username, 'collapse_folders');
- setPref($data_dir, $username, 'date_format', $dateformat);
- setPref($data_dir, $username, 'hour_format', $hourformat);
- do_hook('options_folders_save');
- echo '
'._("Successfully saved folder preferences!").'
';
- echo '' . _("Refresh Folder List") . '
';
- } else {
- do_hook('options_save');
}
-
- /****************************************/
- /* Now build our array of option pages. */
- /****************************************/
+ /******************************************/
+ /* Build our array of Option Page Blocks. */
+ /******************************************/
+ $optpage_blocks = array();
/* Build a section for Personal Options. */
- $optionpages[] = array(
+ $optpage_blocks[] = array(
'name' => _("Personal Information"),
- 'url' => 'options_personal.php',
+ 'url' => 'options.php?optpage=' . SMOPT_PAGE_PERSONAL,
'desc' => _("This contains personal information about yourself such as your name, your email address, etc."),
'js' => false
);
/* Build a section for Display Options. */
- $optionpages[] = array(
+ $optpage_blocks[] = array(
'name' => _("Display Preferences"),
- 'url' => 'options_display.php',
+ 'url' => 'options.php?optpage=' . SMOPT_PAGE_DISPLAY,
'desc' => _("You can change the way that SquirrelMail looks and displays information to you, such as the colors, the language, and other settings."),
'js' => false
);
/* Build a section for Message Highlighting Options. */
- $optionpages[] = array(
+ $optpage_blocks[] = array(
'name' =>_("Message Highlighting"),
'url' => 'options_highlight.php',
'desc' =>_("Based upon given criteria, incoming messages can have different background colors in the message list. This helps to easily distinguish who the messages are from, especially for mailing lists."),
@@ -204,40 +267,46 @@
);
/* Build a section for Folder Options. */
- $optionpages[] = array(
+ $optpage_blocks[] = array(
'name' => _("Folder Preferences"),
- 'url' => 'options_folder.php',
+ 'url' => 'options.php?optpage=' . SMOPT_PAGE_FOLDER,
'desc' => _("These settings change the way your folders are displayed and manipulated."),
'js' => false
);
/* Build a section for Index Order Options. */
- $optionpages[] = array(
+ $optpage_blocks[] = array(
'name' => _("Index Order"),
'url' => 'options_order.php',
- 'desc' => _("The order of the message index can be rearanged and changed to contain the headers in any order you want."),
+ 'desc' => _("The order of the message index can be rearranged and changed to contain the headers in any order you want."),
'js' => false
);
+
/* Build a section for plugins wanting to register an optionpage. */
- do_hook('options_register');
+ do_hook('optpage_register_block');
/*****************************************************/
/* Let's sort Javascript Option Pages to the bottom. */
/*****************************************************/
- foreach ($optionpages as $optpage) {
- if (!$optpage['js']) {
- $reg_optionpages[] = $optpage;
+ $js_optpage_blocks = array();
+ $reg_optpage_blocks = array();
+ foreach ($optpage_blocks as $cur_optpage) {
+ if (!$cur_optpage['js']) {
+ $reg_optpage_blocks[] = $cur_optpage;
} else if ($javascript_on == SMPREF_JS_ON) {
- $js_optionpages[] = $optpage;
+ $js_optpage_blocks[] = $cur_optpage;
}
}
- $optionpages = array_merge($reg_optionpages, $js_optionpages);
+ $optpage_blocks = array_merge($reg_optpage_blocks, $js_optpage_blocks);
/********************************************/
/* Now, print out each option page section. */
/********************************************/
$first_optpage = false;
- foreach ($optionpages as $next_optpage) {
+ echo "" .
+ '' .
+ "| ";
+ foreach ($optpage_blocks as $next_optpage) {
if ($first_optpage == false) {
$first_optpage = $next_optpage;
} else {
@@ -250,16 +319,79 @@
print_optionpages_row($first_optpage);
}
+ echo " |
| \n";
+
do_hook('options_link_and_description');
+
+/*************************************************************************/
+/* If we are not looking at the main option page, display the page here. */
+/*************************************************************************/
+} else {
+ echo '';
+
+ /* If it is not empty, trigger the bottom hook. */
+ if ($bottom_hook_name != '') {
+ do_hook($bottom_hook_name);
+ }
+}
+
?>
- |
-
+ |
+
- |
-
+ |
+