X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fprefs.php;h=047e1de68d3cbad607e9053553ace507afee0e1a;hb=8c93309a4be5b11573246c41af7e6cbfe15d598e;hp=10e29f4aae41dbd7fe0bcd73b1e6b5626edd56f9;hpb=a2a7852b9cb91f7935238f59aaf33aaaf6989a73;p=squirrelmail.git

diff --git a/functions/prefs.php b/functions/prefs.php
index 10e29f4a..047e1de6 100644
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -12,173 +12,23 @@
  */
 
 global $prefs_are_cached, $prefs_cache;
-if (!session_is_registered('prefs_are_cached')) {
+
+if ( !session_is_registered('prefs_are_cached') ||
+     !isset( $prefs_cache) ||
+     !is_array( $prefs_cache) ||
+     substr( phpversion(), 0, 3 ) == '4.1' ||
+     substr( phpversion(), 0, 3 ) == '4.2' ) {
     $prefs_are_cached = false;
     $prefs_cache = array();
 }
 
-/**
- * Check the preferences into the session cache.
- */
-function cachePrefValues($data_dir, $username) {
-    global $prefs_are_cached, $prefs_cache;
-       
-    if ($prefs_are_cached) {
-        return;
-    }
-
-    /* A call to checkForPrefs here should take eliminate the need for
-    /* this to be called throughout the rest of the SquirrelMail code. 
-    checkForPrefs($data_dir, $username);
-
-    /* Calculate the filename for the user's preference file */
-    $filename = getHashedFile($username, $data_dir, "$username.pref");
-
-    checkForPrefs($data_dir, $username);º
-    if (!file_exists($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');
-
-    /* Read in 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 ++;
-            }
-
-            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');
-}
-   
-/**
- * Return the value for the prefernce given by $string.
- */
-function getPref($data_dir, $username, $string, $default = '') {
-    global $prefs_cache;
-    $result = '';
-
-    cachePrefValues($data_dir, $username);
-
-    if (isset($prefs_cache[$string])) {
-        $result = $prefs_cache[$string];
-    } else {
-        $result = $default;
-    }
-
-    return ($result);
-}
-
-/**
- * Save the preferences for this user.
- */
-function savePrefValues($data_dir, $username) {
-    global $prefs_cache;
-   
-    $filename = getHashedFile($username, $data_dir, "$username.pref");
-
-    $file = fopen($filename, 'w');
-    foreach ($prefs_cache as $Key => $Value) {
-        if (isset($Value)) {
-            fwrite($file, $Key . '=' . $Value . "\n");
-        }
-    }
-    fclose($file);
-}
-
-/**
- * Remove a preference for the current user.
- */
-function removePref($data_dir, $username, $string) {
-    global $prefs_cache;
-
-    cachePrefValues($data_dir, $username);
- 
-    if (isset($prefs_cache[$string])) {
-        unset($prefs_cache[$string]);
-    }
- 
-    savePrefValues($data_dir, $username);
-}
-
-/**
- * Set a there preference $string to $value.
- */
-function setPref($data_dir, $username, $string, $value) {
-    global $prefs_cache;
-
-    cachePrefValues($data_dir, $username);
-    if (isset($prefs_cache[$string]) && ($prefs_cache[$string] == $value)) {
-        return;
-    }
-
-    if ($value === '') {
-        removePref($data_dir, $username, $string);
-        return;
-    }
-
-    $prefs_cache[$string] = $value;
-    savePrefValues($data_dir, $username);
+if (isset($prefs_dsn) && !empty($prefs_dsn)) {
+    require_once('../functions/db_prefs.php');
+} else {
+    require_once('../functions/file_prefs.php');
 }
 
-/**
- * Check for a preferences file. If one can not be found, create it.
- */
-function checkForPrefs($data_dir, $username) {
-    $filename = getHashedFile($username, $data_dir, "$username.pref");
-    if (!file_exists($filename) ) {
-        if (!copy($data_dir . 'default_pref', $filename)) {
-            echo _("Error opening ") . $filename;
-            exit;
-        }
-    }
-}
-
-/**
- * Write the User Signature.
- */
-function setSig($data_dir, $username, $value) {
-    $filename = getHashedFile($username, $data_dir, "$username.sig");
-    $file = fopen($filename, 'w');
-    fwrite($file, $value);
-    fclose($file);
-}
-
-/**
- * Get the signature.
- */
-function getSig($data_dir, $username) {
-    #$filename = $data_dir . $username . '.sig';
-    $filename = getHashedFile($username, $data_dir, "$username.sig");
-    $sig = '';
-    if (file_exists($filename)) {
-        $file = fopen($filename, 'r');
-        while (!feof($file)) {
-            $sig .= fgets($file, 1024);
-        }
-        fclose($file);
-    }
-    return $sig;
-}
+/* Hashing functions */
 
 function getHashedFile($username, $dir, $datafile, $hash_search = true) {
     global $dir_hash_level;
@@ -198,9 +48,9 @@ function getHashedFile($username, $dir, $datafile, $hash_search = true) {
     $result = "$real_hash_dir/$datafile";
 
     /* Check for this file in the real hash directory. */
-    if ($hash_search && !file_exists($result)) {
+    if ($hash_search && !@file_exists($result)) {
         /* First check the base directory, the most common location. */
-        if (file_exists("$dir/$datafile")) {
+        if (@file_exists("$dir/$datafile")) {
             rename("$dir/$datafile", $result);
 
         /* Then check the full range of possible hash directories. */
@@ -223,6 +73,11 @@ function getHashedFile($username, $dir, $datafile, $hash_search = true) {
 function getHashedDir($username, $dir, $hash_dirs = '') {
     global $dir_hash_level;
 
+    /* Remove trailing slash from $dir if found */
+    if (substr($dir, -1) == '/') {
+        $dir = substr($dir, 0, strlen($dir) - 1);
+    }
+    
     /* If necessary, populate the hash dir variable. */
     if ($hash_dirs == '') {
         $hash_dirs = computeHashDirs($username);
@@ -232,8 +87,13 @@ function getHashedDir($username, $dir, $hash_dirs = '') {
     $real_hash_dir = $dir;
     for ($h = 0; $h < $dir_hash_level; ++$h) {
         $real_hash_dir .= '/' . $hash_dirs[$h];
-        if (!is_dir($real_hash_dir)) {
-            mkdir($real_hash_dir, 0770);
+        if (!@is_dir($real_hash_dir)) {
+            if (!@mkdir($real_hash_dir, 0770)) {
+                echo sprintf(_("Error creating directory %s."), $real_hash_dir) . '<br>' .
+                     _("Could not create hashed directory structure!") . "<br>\n" .
+                     _("Please contact your system administrator and report this error.") . "<br>\n";
+                exit;
+            }
         }
     }