X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fprefs.php;h=67dbd445152ad76475e266df0019d4db87dc27d6;hb=e5ea9327e412368d6a51ee814b1ff7869b2bfd9d;hp=3d3033b8105337153d978aa680bf94fa7084aa51;hpb=311339a06ba650d5491b5fda98d1eca20827d4d2;p=squirrelmail.git
diff --git a/functions/prefs.php b/functions/prefs.php
index 3d3033b8..67dbd445 100644
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -3,7 +3,7 @@
/**
* prefs.php
*
- * Copyright (c) 1999-2001 The SquirrelMail Development Team
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains functions for manipulating user preferences
@@ -12,167 +12,22 @@
*/
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' ) {
$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;
- }
-
- $filename = getHashedFile($username, $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);
- 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;
@@ -192,9 +47,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. */
@@ -217,6 +72,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);
@@ -226,8 +86,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) . '
' .
+ _("Could not create hashed directory structure!") . "
\n" .
+ _("Please contact your system administrator and report this error.") . "
\n";
+ exit;
+ }
}
}