** -> *

[squirrelmail.git] / functions / prefs.php

diff --git a/functions/prefs.php b/functions/prefs.php
index aadbcb3f68a6ab6a4358401cc51396d5af181363..5ecf530f94476e64b9e831386f583201b8a36184 100644 (file)
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -1,19 +1,23 @@
 <?php
+
    /**
-    **  prefs.php
-    **
-    **  This contains functions for manipulating user preferences
-    **
-    **  $Id$
-    **/
-
-   $prefs_php = true;
-   
-   $prefs_are_cached = false;
-   $prefs_cache = array();
+    *   prefs.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *   This contains functions for manipulating user preferences
+    *
+    *   $Id$
+    */
+
+   global $prefs_are_cached, $prefs_cache;
+   if (!session_is_registered('prefs_are_cached')) {
+      $prefs_are_cached = false;
+      $prefs_cache = array();
+   }
 
-   function cachePrefValues($data_dir, $username)
-   {
+   function cachePrefValues($data_dir, $username) {
        global $prefs_are_cached, $prefs_cache;
        
        if ($prefs_are_cached)
@@ -22,58 +26,62 @@
        $filename = $data_dir . $username . '.pref';
        
        if (!file_exists($filename)) {
-          printf (_("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename);
+           printf (_("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename);
            exit;
        }
 
-       $file = fopen($filename, "r");
+       $file = fopen($filename, 'r');
 
        /** read in all the preferences **/
        $highlight_num = 0;
        while (! feof($file)) {
           $pref = trim(fgets($file, 1024));
-         $equalsAt = strpos($pref, '=');
-         if ($equalsAt > 0)
-         {
-             $Key = substr($pref, 0, $equalsAt);
-             $Value = substr($pref, $equalsAt + 1);
-             if (substr($Key, 0, 9) == 'highlight')
-             {
-                 $Key = 'highlight' . $highlight_num;
-                 $highlight_num ++;
+          $equalsAt = strpos($pref, '=');
+          if ($equalsAt > 0) {
+              $Key = substr($pref, 0, $equalsAt);
+              $Value = substr($pref, $equalsAt + 1);
+              if (substr($Key, 0, 9) == 'highlight') {
+                  $Key = 'highlight' . $highlight_num;
+                  $highlight_num ++;
               }
 
-              if ($Value != '')
-                 $prefs_cache[$Key] = $Value;
-         }
+              if ($Value != '') {
+                  $prefs_cache[$Key] = $Value;
+              }
+          }
        }
        fclose($file);
+
+       session_unregister('prefs_cache');
+       session_register('prefs_cache');
        
        $prefs_are_cached = true;
+       session_unregister('prefs_are_cached');
+       session_register('prefs_are_cached');
    }
    
    
    /** returns the value for $string **/
-   function getPref($data_dir, $username, $string) {
+   function getPref($data_dir, $username, $string, $default = '') {
       global $prefs_cache;
-      
+
       cachePrefValues($data_dir, $username);
-      
+
       if (isset($prefs_cache[$string]))
           return $prefs_cache[$string];
-      return '';
+      else
+        return $default;
    }
 
 
-   function savePrefValues($data_dir, $username)
-   {
+   function savePrefValues($data_dir, $username) {
       global $prefs_cache;
       
-      $file = fopen($data_dir . $username . '.pref', "w");
-      foreach ($prefs_cache as $Key => $Value)
-      {
-          if (isset($Value))
+      $file = fopen($data_dir . $username . '.pref', 'w');
+      foreach ($prefs_cache as $Key => $Value) {
+          if (isset($Value)) {
               fwrite($file, $Key . '=' . $Value . "\n");
+          }
       }
       fclose($file);
    }
@@ -84,9 +92,10 @@
       
       cachePrefValues($data_dir, $username);
       
-      if (isset($prefs_cache[$string]))
+      if (isset($prefs_cache[$string])) {
           unset($prefs_cache[$string]);
-         
+      }
+          
       savePrefValues($data_dir, $username);
    }
    
@@ -95,9 +104,13 @@
       global $prefs_cache;
       
       cachePrefValues($data_dir, $username);
-      
+      if (isset($prefs_cache[$string]) && $prefs_cache[$string] == $set_to)
+         return;
+      if ($set_to === '') {
+         removePref($data_dir, $username, $string);
+        return;
+      }
       $prefs_cache[$string] = $set_to;
-
       savePrefValues($data_dir, $username);
    }
 
@@ -105,10 +118,10 @@
    /** This checks if there is a pref file, if there isn't, it will
        create it. **/
    function checkForPrefs($data_dir, $username) {
-      $filename = "$data_dir$username.pref";
+      $filename = $data_dir . $username . '.pref';
       if (!file_exists($filename)) {
-         if (!copy("$data_dir" . "default_pref", $filename)) {
-            echo _("Error opening ") ."$filename";
+         if (!copy($data_dir . 'default_pref', $filename)) {
+            echo _("Error opening ") . $filename;
             exit;
          }
       }
@@ -117,8 +130,7 @@
 
    /** Writes the Signature **/
    function setSig($data_dir, $username, $string) {
-      $filename = "$data_dir$username.sig";
-      $file = fopen($filename, "w");
+      $file = fopen($data_dir . $username . '.sig', 'w');
       fwrite($file, $string);
       fclose($file);
    }
@@ -127,10 +139,10 @@
 
    /** Gets the signature **/
    function getSig($data_dir, $username) {
-      $filename = "$data_dir$username.sig";
-      $sig = "";
+      $filename = $data_dir . $username . '.sig';
+      $sig = '';
       if (file_exists($filename)) {
-         $file = fopen($filename, "r");
+         $file = fopen($filename, 'r');
          while (!feof($file)) {
             $sig .= fgets($file, 1024);
          }