Added basic support for message highlighting. Note that this needs quite

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 6d8dcfb6a628debe63bd7d94ae6a587c14908a62..2a24938cca1926aa9bfb58d34a3bbafc0e79e251 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -24,6 +24,22 @@
       }
    }
 
+   $use_javascript_addr_book = getPref($data_dir, $username, "use_javascript_addr_book");
+   if ($use_javascript_addr_book == "")
+      $use_javascript_addr_book = $default_use_javascript_addr_book;
+
+   
+   /** Load the user's sent folder preferences **/
+   $move_to_sent = getPref($data_dir, $username, "move_to_sent");
+   if ($move_to_sent == "")
+      $move_to_sent = $default_move_to_sent;
+
+   /** Load the user's trash folder preferences **/
+   $move_to_trash = getPref($data_dir, $username, "move_to_trash");
+   if ($move_to_trash == "")
+      $move_to_trash = $default_move_to_trash;
+
+
    $folder_prefix = getPref($data_dir, $username, "folder_prefix");
    if ($folder_prefix == "")
       $folder_prefix = $default_folder_prefix;
@@ -41,16 +57,6 @@
                $sent_folder = $folder_prefix . $sent_folder;
        else
                $sent_folder = $new_sent_folder;
-       
-   /** Load the user's sent folder preferences **/
-   $move_to_sent = getPref($data_dir, $username, "move_to_sent");
-   if ($move_to_sent == "")
-      $move_to_sent = $default_move_to_sent;
-
-   /** Load the user's trash folder preferences **/
-   $move_to_trash = getPref($data_dir, $username, "move_to_trash");
-   if ($move_to_trash == "")
-      $move_to_trash = $default_move_to_trash;
 
    $show_num = getPref($data_dir, $username, "show_num");
    if ($show_num == "")
@@ -85,4 +91,21 @@
       $signature = getSig($data_dir, $username);
    } else {
    }
+
+   /** Load up the Language preference **/
+   $user_language = getPref($data_dir, $username, "language");
+   if ($user_language == "") {
+      if (isset($default_charset))
+         $user_language = $default_charset;
+     else  
+         $user_language = en;
+   }      
+
+   //  highlightX comes in with the form: name,color,header,value
+   for ($i=0; $hlt = getPref($data_dir, $username, "highlight$i"); $i++) {
+      $ary = explode(",", $hlt);
+      $message_highlight_list[$i]["name"] = $ary[0]; 
+      $message_highlight_list[$i]["color"] = $ary[1];
+      $message_highlight_list[$i]["value"] = $ary[2];
+   }
 ?>