X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fprefs.php;h=67dbd445152ad76475e266df0019d4db87dc27d6;hb=cb850f18ebe1712284fdd77dbad78f4e0c059193;hp=b4b2d9db9366cf6de851a4a98b83ec17c6960c3e;hpb=93b2364f4a322f031cadb1e3cfa6ab4a1242bed7;p=squirrelmail.git
diff --git a/functions/prefs.php b/functions/prefs.php
index b4b2d9db..67dbd445 100644
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -15,194 +15,19 @@ global $prefs_are_cached, $prefs_cache;
if ( !session_is_registered('prefs_are_cached') ||
!isset( $prefs_cache) ||
- !is_array( 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;
- }
-
- /* Calculate the filename for the user's preference file */
- $filename = getHashedFile($username, $data_dir, "$username.pref");
-
- /* 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, $filename);
-
- /* Make sure that the preference file now DOES exist. */
- if (!file_exists($filename)) {
- echo sprintf (_("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename) . "
\n";
- 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);
-}
-
-/**
- * Check for a preferences file. If one can not be found, create it.
- */
-function checkForPrefs($data_dir, $username, $filename = '') {
- /* First, make sure we have the filename. */
- if ($filename == '') {
- $filename = getHashedFile($username, $data_dir, '$username.pref');
- }
-
- /* 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 it is not there, check the internal data directory. */
- if (!@file_exists($default_pref)) {
- $default_pref = '../data/default_pref';
- }
-
- /* Otherwise, report an error. */
- if (!file_exists($default_pref)) {
- echo _("Error opening ") . $default_pref . "
\n";
- echo _("Default preference file not found!") . "
\n";
- echo _("Please contact your system administrator and report this error.") . "
\n";
- exit;
- } else if (!@copy($default_pref, $filename)) {
- echo _("Error opening ") . $default_pref . '
';
- echo _("Could not create initial preference file!") . "
\n";
- echo _("Please contact your system administrator and report this error.") . "
\n";
- 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);
+if (isset($prefs_dsn) && !empty($prefs_dsn)) {
+ require_once('../functions/db_prefs.php');
+} else {
+ require_once('../functions/file_prefs.php');
}
-/**
- * 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;
@@ -263,9 +88,9 @@ function getHashedDir($username, $dir, $hash_dirs = '') {
$real_hash_dir .= '/' . $hash_dirs[$h];
if (!@is_dir($real_hash_dir)) {
if (!@mkdir($real_hash_dir, 0770)) {
- echo sprintf(_("Error creating directory %s."), $real_hash_dir) . '
';
- echo _("Could not create hashed directory structure!") . "
\n";
- echo _("Please contact your system administrator and report this error.") . "
\n";
+ 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;
}
}