E_ALL fix

[squirrelmail.git] / include / load_prefs.php

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 7e097a3a0e0277153906d9c63d734706f887bdae..410ec472db83a92c8b958c51976e4c12021079f2 100644 (file)
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -93,6 +93,9 @@ $unseen_type =
 $unseen_notify =
     getPref($data_dir, $username, 'unseen_notify', $default_unseen_notify);
 
 $unseen_notify =
     getPref($data_dir, $username, 'unseen_notify', $default_unseen_notify);
 

+$unseen_cum =
+    getPref($data_dir, $username, 'unseen_cum', false);
+

 $folder_prefix =
     getPref($data_dir, $username, 'folder_prefix', $default_folder_prefix);
 
 $folder_prefix =
     getPref($data_dir, $username, 'folder_prefix', $default_folder_prefix);
 


@@ -155,15 +158,26 @@ $left_refresh = strtolower($left_refresh);
 $sort = getPref($data_dir, $username, 'sort', 6 );
 
 /** Load up the Signature file **/
 $sort = getPref($data_dir, $username, 'sort', 6 );
 
 /** Load up the Signature file **/

-$signature_abs = $signature = getSig($data_dir, $username, "g");
-
-/* Highlight comes in with the form: name, color, header, value. */
-for ($i = 0; $hlt = getPref($data_dir, $username, "highlight$i"); ++$i) {
-    $highlight_array = explode(',', $hlt);
-    $message_highlight_list[$i]['name'] = $highlight_array[0];
-    $message_highlight_list[$i]['color'] = $highlight_array[1];
-    $message_highlight_list[$i]['value'] = $highlight_array[2];
-    $message_highlight_list[$i]['match_type'] = $highlight_array[3];
+$signature_abs = $signature = getSig($data_dir, $username, 'g');
+
+/* Message Highlighting Rules */
+$message_highlight_list = array();
+
+/* use new way of storing highlighting rules */
+if( $ser = getPref($data_dir, $username, 'hililist') ) {
+    $message_highlight_list = unserialize($ser);
+} else {
+    /* use old way */
+    for ($i = 0; $hlt = getPref($data_dir, $username, "highlight$i"); ++$i) {
+        $highlight_array = explode(',', $hlt);
+        $message_highlight_list[$i]['name'] = $highlight_array[0];
+        $message_highlight_list[$i]['color'] = $highlight_array[1];
+        $message_highlight_list[$i]['value'] = $highlight_array[2];
+        $message_highlight_list[$i]['match_type'] = $highlight_array[3];
+        removePref($data_dir, $user_name, "highlight$i");
+    }
+    /* store in new format for the next time */
+    setPref($data_dir, $username, 'hililist', serialize($message_highlight_list));

 }
 
 /* Index order lets you change the order of the message index */
 }
 
 /* Index order lets you change the order of the message index */


@@ -241,6 +255,8 @@ $search_memory = getPref($data_dir, $username, 'search_memory', 0);
 
 $forward_cc = getPref($data_dir, $username, 'forward_cc', 0);
 
 
 $forward_cc = getPref($data_dir, $username, 'forward_cc', 0);
 

+$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', 0);
+

 do_hook('loading_prefs');
 
 ?>
 do_hook('loading_prefs');
 
 ?>