X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Fload_prefs.php;h=337efc1dda8a18cd6ee8274ce25af3697385bebd;hp=12be9826262bdc3b3d97f67c9ce288393196ef01;hb=2999753577cd5fb23d7a88e2978c60d8bade44a6;hpb=bb7173fa78e0dc070a57ceaef0bc454aec61bb60

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 12be9826..337efc1d 100644
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -3,21 +3,20 @@
 /**
  * load_prefs.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Loads preferences from the $username.pref file used by almost
  * every other script in the source directory and alswhere.
  *
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
 
 /** SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/prefs.php');
-require_once(SM_PATH . 'functions/plugin.php');
-require_once(SM_PATH . 'functions/constants.php');
+include_once(SM_PATH . 'functions/constants.php');
+include_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'functions/plugin.php');
+
 
 if( ! sqgetGlobalVar('username', $username, SQ_SESSION) ) {
     $username = '';
@@ -27,8 +26,33 @@ $custom_css = getPref($data_dir, $username, 'custom_css', 'none' );
 
 $theme = ( !isset($theme) ? array() : $theme );
 $color = ( !isset($color) ? array() : $color );
+$aTemplateSet = ( !isset($aTemplateSet) ? array() : $aTemplateSet );
+$templateset_default = ( !isset($templateset_default) ? 0 : $templateset_default );
 
 $chosen_theme = getPref($data_dir, $username, 'chosen_theme');
+$sTplDir = getPref($data_dir, $username, 'sTplDir', SM_PATH . 'templates/default/');
+$found_templateset = false;
+
+/* need to adjust $chosen_template path with SM_PATH */
+$sTplDir = preg_replace("/(\.\.\/){1,}/", SM_PATH, $sTplDir);
+
+for ($i = 0; $i < count($aTemplateSet); ++$i){
+    if ($aTemplateSet[$i]['PATH'] == $sTplDir) {
+        $found_templateset = true;
+        break;
+    }
+}
+$sTplDir = ($found_templateset ? $sTplDir : '');
+if (!$found_templateset) {
+    if (isset($aTemplateSet) && isset($aTemplateSet[$templateset_default]) && file_exists($aTemplateSet[$templateset_default]['PATH'])) {
+       $sTplDir = $aTemplateSet[$templateset_default]['PATH'];
+    } else {
+       $sTplDir = SM_PATH.'templates/default/';
+    }
+} else if (!file_exists($sTplDir)) {
+    $sTplDir = SM_PATH.'templates/default/';
+}
+
 $found_theme = false;
 
 /* need to adjust $chosen_theme path with SM_PATH */
@@ -42,6 +66,7 @@ for ($i = 0; $i < count($theme); ++$i){
 }
 $chosen_theme = (!$found_theme ? '' : $chosen_theme);
 
+
 /**
 * This theme as a failsafe if no themes were found. It makes
 * no sense to cause the whole thing to exit just because themes
@@ -78,10 +103,17 @@ if (!defined('download_php')) {
 }
 
 // user's icon theme, if using icons
-$icon_theme = getPref($data_dir, $username, 'icon_theme', 'none' );
+$icon_theme = getPref($data_dir, $username, 'icon_theme', 'images/themes/xp/' );
+
+/*
+ * NOTE: The $icon_theme_path var should contain the path to the icon 
+ *       theme to use.  If the admin has disabled icons, or the user has
+ *       set the icon theme to "None," no icons will be used.
+ */
+$icon_theme_path = (!$use_icons || $icon_theme=='none') ? NULL : $icon_theme;
 
 // show (or not) flag and unflag buttons on mailbox list screen
-$show_flag_buttons = getPref($data_dir, $username, 'show_flag_buttons', SMPREF_OFF );
+$show_flag_buttons = getPref($data_dir, $username, 'show_flag_buttons', SMPREF_ON );
 
 /* Load the user's special folder preferences */
 $move_to_sent =
@@ -157,7 +189,7 @@ $timezone = getPref($data_dir, $username, 'timezone', SMPREF_NONE );
 /* Load preferences for reply citation style. */
 
 $reply_citation_style =
-    getPref($data_dir, $username, 'reply_citation_style', SMPREF_NONE );
+    getPref($data_dir, $username, 'reply_citation_style', 'date_time_author' );
 $reply_citation_start = getPref($data_dir, $username, 'reply_citation_start');
 $reply_citation_end = getPref($data_dir, $username, 'reply_citation_end');
 
@@ -171,7 +203,7 @@ if ($body_quote == 'NONE') $body_quote = '';
 $reply_focus = getPref($data_dir, $username, 'reply_focus', '');
 
 /* left refresh rate, strtolower makes 1.0.6 prefs compatible */
-$left_refresh = getPref($data_dir, $username, 'left_refresh', SMPREF_NONE );
+$left_refresh = getPref($data_dir, $username, 'left_refresh', 600 );
 $left_refresh = strtolower($left_refresh);
 
 /* Load up the Signature file */
@@ -197,23 +229,75 @@ if( $ser = getPref($data_dir, $username, 'hililist') ) {
     setPref($data_dir, $username, 'hililist', serialize($message_highlight_list));
 }
 
+/* use the internal date of the message for sorting instead of the supplied header date */
+/* OBSOLETE */
+
+$internal_date_sort = getPref($data_dir, $username, 'internal_date_sort', SMPREF_ON);
+
 /* Index order lets you change the order of the message index */
 $order = getPref($data_dir, $username, 'order1');
-for ($i = 1; $order; ++$i) {
-    $index_order[$i] = $order;
-    $order = getPref($data_dir, $username, 'order'.($i+1));
+if (isset($order1)) {
+    removePref($data_dir, $username, 'order1');
+    for ($i = 1; $order; ++$i) {
+        $index_order[$i-1] = $order -1;
+        $order = getPref($data_dir, $username, 'order'.($i+1));
+        removePref($data_dir, $username, 'order'.($i+1));
+    }
+    if (isset($internal_date_sort) && $internal_date_sort) {
+        if (in_array(SQM_COL_DATE,$index_order)) {
+            $k = array_search(SQM_COL_DATE,$index_order,true);
+            $index_order[$k] = SQM_COL_INT_DATE;
+        }
+    }
+    setPref($data_dir, $username, 'index_order', serialize($index_order));
 }
-if (!isset($index_order)) {
-    $index_order[1] = 1;
-    $index_order[2] = 2;
-    $index_order[3] = 3;
-    $index_order[4] = 5;
-    $index_order[5] = 4;
+$index_order = getPref($data_dir, $username, 'index_order');
+if (is_string($index_order)) {
+    $index_order = unserialize($index_order);
 }
 
+
+// new Index order handling
+//$default_mailbox_pref = unserialize(getPref($data_dir, $username, 'default_mailbox_pref'));
+
+if (!$index_order) {
+    if (isset($internal_date_sort) && $internal_date_sort == false) {
+        $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ);
+    } else {
+        $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_INT_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ);
+    }
+    setPref($data_dir, $username, 'index_order', serialize($index_order));
+}
+
+
+
+if (!isset($default_mailbox_pref)) {
+    $show_num = (isset($show_num)) ? $show_num : 15;
+
+    $default_mailbox_pref = array (
+        MBX_PREF_SORT => 0,
+        MBX_PREF_LIMIT => $show_num,
+        MBX_PREF_AUTO_EXPUNGE => $auto_expunge,
+        MBX_PREF_COLUMNS => $index_order);
+    // setPref($data_dir, $username, 'default_mailbox_pref', serialize($default_mailbox_pref));
+    // clean up the old prefs
+//    if (isset($prefs_cache['internal_date_sort'])) {
+//        unset($prefs_cache['internal_date_sort']);
+//        removePref($data_dir,$username,'internal_date_sort');
+//    }
+//    if (isset($prefs_cache['show_num'])) {
+//        unset($prefs_cache['show_num']);
+//        removePref($data_dir,$username,'show_num');
+//    }
+}
+
+
 $alt_index_colors =
     getPref($data_dir, $username, 'alt_index_colors', SMPREF_ON );
 
+$fancy_index_highlite =
+    getPref($data_dir, $username, 'fancy_index_highlite', SMPREF_ON );
+
 /* Folder List Display Format */
 $location_of_bar =
     getPref($data_dir, $username, 'location_of_bar', SMPREF_LOC_LEFT);
@@ -224,7 +308,7 @@ $collapse_folders =
     getPref($data_dir, $username, 'collapse_folders', SMPREF_ON);
 
 $show_html_default =
-   getPref($data_dir, $username, 'show_html_default', SMPREF_OFF);
+   getPref($data_dir, $username, 'show_html_default', SMPREF_ON);
 
 $enable_forward_as_attachment =
    getPref($data_dir, $username, 'enable_forward_as_attachment', SMPREF_ON);
@@ -232,7 +316,7 @@ $enable_forward_as_attachment =
 $show_xmailer_default =
     getPref($data_dir, $username, 'show_xmailer_default', SMPREF_OFF );
 $attachment_common_show_images = getPref($data_dir, $username, 'attachment_common_show_images', SMPREF_OFF );
-$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay', SMPREF_OFF);
+
 
 /* message disposition notification support setting */
 $mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', SMPREF_ON);
@@ -240,30 +324,32 @@ $mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', SMPREF_ON)
 $include_self_reply_all =
     getPref($data_dir, $username, 'include_self_reply_all', SMPREF_ON);
 
+/* Page selector options */
 $page_selector = getPref($data_dir, $username, 'page_selector', SMPREF_ON);
+$compact_paginator = getPref($data_dir, $username, 'compact_paginator', SMPREF_OFF);
 $page_selector_max = getPref($data_dir, $username, 'page_selector_max', 10);
 
 /* SqClock now in the core */
 $date_format = getPref($data_dir, $username, 'date_format', 3);
-$hour_format = getPref($data_dir, $username, 'hour_format', 2);
+$hour_format = getPref($data_dir, $username, 'hour_format', SMPREF_TIME_12HR);
 
 /*  compose in new window setting */
-$compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
+$compose_new_win = getPref($data_dir, $username, 'compose_new_win', SMPREF_OFF);
 $compose_height = getPref($data_dir, $username, 'compose_height', 550);
 $compose_width = getPref($data_dir, $username, 'compose_width', 640);
 
 
 /* signature placement settings */
-$sig_first = getPref($data_dir, $username, 'sig_first', 0);
+$sig_first = getPref($data_dir, $username, 'sig_first', SMPREF_OFF);
 
 /* Strip signature when replying */
-$strip_sigs = getPref($data_dir, $username, 'strip_sigs', 0);
+$strip_sigs = getPref($data_dir, $username, 'strip_sigs', SMPREF_ON);
 
 /* use the internal date of the message for sorting instead of the supplied header date */
 $internal_date_sort = getPref($data_dir, $username, 'internal_date_sort', SMPREF_ON);
 
 /* if server sorting is enabled/disabled */
-$sort_by_ref = getPref($data_dir, $username, 'sort_by_ref', 1);
+$sort_by_ref = getPref($data_dir, $username, 'sort_by_ref', SMPREF_ON);
 
 /* Load the javascript settings. */
 $javascript_setting = getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
@@ -276,25 +362,42 @@ if ( checkForJavascript() )
   $use_javascript_addr_book = false;
 }
 
-$search_memory = getPref($data_dir, $username, 'search_memory', 0);
+$search_memory = getPref($data_dir, $username, 'search_memory', SMPREF_OFF);
+
+$show_only_subscribed_folders =
+    getPref($data_dir, $username, 'show_only_subscribed_folders', SMPREF_ON);
+
 
-$forward_cc = getPref($data_dir, $username, 'forward_cc', 0);
+$forward_cc = getPref($data_dir, $username, 'forward_cc', SMPREF_OFF);
 
-$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', 0);
+/* How are mailbox select lists displayed: 0. full names, 1. indented (default),
+ * 3. delimited) */
+$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_ON);
 
 /* Allow user to customize, and display the full date, instead of day, or time based
    on time distance from date of message */
-$show_full_date = getPref($data_dir, $username, 'show_full_date', 0);
+$show_full_date = getPref($data_dir, $username, 'show_full_date', SMPREF_OFF);
 
 /* Allow user to customize length of from field */
-$truncate_sender = getPref($data_dir, $username, 'truncate_sender', 0);
+$truncate_sender = getPref($data_dir, $username, 'truncate_sender', 50);
 /* Allow user to customize length of subject field */
 $truncate_subject = getPref($data_dir, $username, 'truncate_subject', 50);
 /* Allow user to show recipient name if the message is from default identity */
-$show_recipient_instead = getPref($data_dir, $username, 'show_recipient_instead', 0);
+$show_recipient_instead = getPref($data_dir, $username, 'show_recipient_instead', SMPREF_OFF);
+
+$delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_display', SMPREF_ON);
+
+/**
+ * Height of iframe that displays html formated emails
+ * @since 1.5.1
+ */
+$iframe_height = getPref($data_dir, $username, 'iframe_height', '300');
 
-$delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_display', 1);
+if (! isset($default_fontset)) $default_fontset=SMPREF_NONE;
+$chosen_fontset = getPref($data_dir, $username, 'chosen_fontset', $default_fontset);
+if (! isset($default_fontsize)) $default_fontsize=SMPREF_NONE;
+$chosen_fontsize = getPref($data_dir, $username, 'chosen_fontsize', $default_fontsize);
 
 do_hook('loading_prefs');
 
-?>
\ No newline at end of file
+?>