X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Ffile_prefs.php;h=692b6c0411bfdaa0ef7b28cf48d1b883904ca39d;hb=0e3b9a5a28f98305251f2ac392924b6bc1021cbc;hp=ed2face7dc678f2d44b1917eca37d4c77dddc780;hpb=491696a82ef78b134758fc56089d25fc3f70edff;p=squirrelmail.git

diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index ed2face7..692b6c04 100644
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -3,15 +3,16 @@
 /**
  * file_prefs.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This contains functions for manipulating user preferences in files
  *
  * $Id$
+ * @package squirrelmail
  */
 
-/* include this for error messages */
+/** include this for error messages */
 include_once(SM_PATH . 'functions/display_messages.php');
 
 /**
@@ -131,7 +132,8 @@ function savePrefValues($data_dir, $username) {
         exit;
     }
     @unlink($filename . '.tmp');
-    chmod($filename, 0600);
+    @chmod($filename, 0600);
+    sqsession_register($prefs_cache , 'prefs_cache');
 }
 
 /**
@@ -181,7 +183,10 @@ function checkForPrefs($data_dir, $username, $filename = '') {
     /* Then, check if the file exists. */
     if (!@file_exists($filename) ) {
         /* First, check the $data_dir for the default preference file. */
-        $default_pref = $data_dir . '/default_pref';
+        if(substr($data_dir,-1) != '/') {
+            $data_dir .= '/';
+        }
+        $default_pref = $data_dir . 'default_pref';
 
         /* If it is not there, check the internal data directory. */
         if (!@file_exists($default_pref)) {
@@ -232,7 +237,7 @@ function setSig($data_dir, $username, $number, $value) {
        exit;
     }
     @unlink($filename . '.tmp');
-    chmod($filename, 0600);
+    @chmod($filename, 0600);
 
 }