X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fload_prefs.php;h=90745ab1ac2f0ab210a7c2c55c0dbd9eca85ef07;hb=8a2e4d5b2bf13cea37d09a958ed22ae626306df2;hp=b55a4b3091c43899983262571bfa62c0a5d74209;hpb=23d6bd09c631285eae8c45af3a37aa7c86be3cfa;p=squirrelmail.git

diff --git a/src/load_prefs.php b/src/load_prefs.php
index b55a4b30..90745ab1 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;
@@ -133,19 +133,19 @@
     global $editor_size, $use_signature, $prefix_sig;
     $editor_size = getPref($data_dir, $username, "editor_size", 76 );
 
-    $use_signature = getPref($data_dir, $username, 'use_signature', FALSE );
+    $use_signature = getPref($data_dir, $username, 'use_signature', SMPREF_OFF );
 
     $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', 'none' );
+    $reply_citation_style = getPref($data_dir, $username, 'reply_citation_style', SMPREF_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', 'None' );
+    $left_refresh = getPref($data_dir, $username, 'left_refresh', SMPREF_NONE );
     $sort = getPref($data_dir, $username, 'sort', 6 );
 
     /** Load up the Signature file **/
@@ -182,17 +182,26 @@
     }
 
     global $alt_index_colors;
-    $alt_index_colors = getPref($data_dir, $username, 'alt_index_colors', FALSE );
+    $alt_index_colors = getPref($data_dir, $username, 'alt_index_colors', SMPREF_ON );
 
     global $location_of_bar, $location_of_buttons;
-    $location_of_bar = getPref($data_dir, $username, 'location_of_bar', 'left');
-    $location_of_buttons = getPref($data_dir, $username, 'location_of_buttons', 'between' );
+    $location_of_bar = getPref($data_dir, $username, 'location_of_bar', SMPREF_LOC_LEFT);
+    $location_of_buttons = getPref($data_dir, $username, 'location_of_buttons', SMPREF_LOC_BETWEEN);
 
-    global $collapse_folders, $show_html_default;
-    $collapse_folders = getPref($data_dir, $username, 'collapse_folders');
+    global $collapse_folders, $show_html_default, $show_xmailer_default, $attachment_common_show_images;
+    $collapse_folders = getPref($data_dir, $username, 'collapse_folders', SMPREF_ON);
 
     /* show_html_default is a int value. */
-    $show_html_default = intval(getPref($data_dir, $username, 'show_html_default', 1 ) );
+    $show_html_default = intval(getPref($data_dir, $username, 'show_html_default', SMPREF_ON));
+    $show_xmailer_default = intval(getPref($data_dir, $username, 'show_xmailer_default', SMPREF_OFF ) );
+    $attachment_common_show_images = intval(getPref($data_dir, $username, 'attachment_common_show_images', SMPREF_OFF ) );
+
+    global $include_self_reply_all;
+    $include_self_reply_all = getPref($data_dir, $username, 'include_self_reply_all', SMPREF_ON);
+
+    global $page_selector, $page_selector_max;
+    $page_selector = getPref($data_dir, $username, 'page_selector', SMPREF_ON);
+    $page_selector_max = getPref($data_dir, $username, 'page_selector_max', 10);
 
     /* SqClock now in the core */
     global $date_format, $hour_format, $username, $data_dir;
@@ -202,7 +211,7 @@
     /* Load the javascript settings. */
     global $javascript_setting, $javascript_on;
     $javascript_setting = getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
-    $javascript_on = getPref($data_dir, $username, 'javascript_on', true);
+    $javascript_on = getPref($data_dir, $username, 'javascript_on', SMPREF_ON);
 
     do_hook("loading_prefs");
 ?>