Corrected Line breaks. Main po now work fine.

[squirrelmail.git] / functions / prefs.php

diff --git a/functions/prefs.php b/functions/prefs.php
index 76704e93e5416be5c0dbaa604bca2be60cf61332..1b70943c8d1bb086bce7dede3088981431b7fffb 100644 (file)
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -1,16 +1,16 @@
 <?php
+
    /**
     **  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$
     **/
 
-   if (defined('prefs_php'))
-      return;
-   define('prefs_php', true);
-
    global $prefs_are_cached, $prefs_cache;
    if (!session_is_registered('prefs_are_cached')) {
       $prefs_are_cached = false;
@@ -62,14 +62,15 @@
    
    
    /** 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;
    }
 
 
@@ -103,6 +104,12 @@
       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);
    }