X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Ffile_prefs.php;h=5ed99124d85beb1d3cdb3d68d27c78a30f7d0f0b;hb=cb104e1dc329188c066b6d6b843fdbd22f9e16de;hp=073b366a30a3ddfb942ee8ac6e898db0971c168f;hpb=397a9d7b0815421a4154b6dfbb1f84bf0fa2d347;p=squirrelmail.git
diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index 073b366a..5ed99124 100644
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -3,7 +3,7 @@
/**
* file_prefs.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 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
@@ -11,6 +11,9 @@
* $Id$
*/
+/* include this for error messages */
+include_once(SM_PATH . 'functions/display_messages.php');
+
/**
* Check the preferences into the session cache.
*/
@@ -33,7 +36,6 @@ function cachePrefValues($data_dir, $username) {
/* Make sure that the preference file now DOES exist. */
if (!file_exists($filename)) {
- include_once(SM_PATH . 'functions/display_messages.php');
logout_error( sprintf( _("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename) );
exit;
}
@@ -41,7 +43,6 @@ function cachePrefValues($data_dir, $username) {
/* Open the file, or else display an error to the user. */
if(!$file = @fopen($filename, 'r'))
{
- include_once(SM_PATH . 'functions/display_messages.php');
logout_error( sprintf( _("Preference file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
exit;
}
@@ -49,11 +50,20 @@ function cachePrefValues($data_dir, $username) {
/* Read in the preferences. */
$highlight_num = 0;
while (! feof($file)) {
- $pref = trim(fgets($file, 1024));
+ $pref = '';
+ /* keep reading a pref until we reach an eol (\n (or \r for macs)) */
+ while($read = fgets($file, 1024))
+ {
+ $pref .= $read;
+ if(strpos($read,"\n") || strpos($read,"\r"))
+ break;
+ }
+ $pref = trim($pref);
$equalsAt = strpos($pref, '=');
if ($equalsAt > 0) {
$key = substr($pref, 0, $equalsAt);
$value = substr($pref, $equalsAt + 1);
+ /* this is to 'rescue' old-style highlighting rules. */
if (substr($key, 0, 9) == 'highlight') {
$key = 'highlight' . $highlight_num;
$highlight_num ++;
@@ -63,8 +73,8 @@ function cachePrefValues($data_dir, $username) {
$prefs_cache[$key] = $value;
}
}
- }
- fclose($file);
+ }
+ fclose($file);
$prefs_are_cached = TRUE;
@@ -73,27 +83,23 @@ function cachePrefValues($data_dir, $username) {
}
/**
- * Return the value for the prefernce given by $string.
+ * Return the value for the preference given by $string.
*/
function getPref($data_dir, $username, $string, $default = '') {
global $prefs_cache;
- $result = '';
-
- $result = do_hook_function('get_pref_override', array($username, $string));
- if ($result == '') {
- cachePrefValues($data_dir, $username);
-
- if (isset($prefs_cache[$string])) {
- $result = $prefs_cache[$string];
- } else {
- $result = do_hook_function('get_pref', array($username, $string));
- if ($result == '') {
- $result = $default;
- }
- }
+ $result = do_hook_function('get_pref_override',array($username,$string));
+ if (!$result) {
+ cachePrefValues($data_dir, $username);
+ if (isset($prefs_cache[$string])) {
+ $result = $prefs_cache[$string];
+ } else {
+ $result = do_hook_function('get_pref', array($username,$string));
+ if (!$result) {
+ $result = $default;
+ }
+ }
}
-
return ($result);
}
@@ -106,20 +112,27 @@ function savePrefValues($data_dir, $username) {
$filename = getHashedFile($username, $data_dir, "$username.pref");
/* Open the file for writing, or else display an error to the user. */
- if(!$file = @fopen($filename, 'w'))
+ if(!$file = @fopen($filename.'.tmp', 'w'))
{
- include_once(SM_PATH . 'functions/display_messages.php');
- logout_error( sprintf( _("Preference file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
+ logout_error( sprintf( _("Preference file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename.'.tmp') );
exit;
}
-
foreach ($prefs_cache as $Key => $Value) {
if (isset($Value)) {
- fwrite($file, $Key . '=' . $Value . "\n");
+ if ( @fwrite($file, $Key . '=' . $Value . "\n") === FALSE ) {
+ logout_error( sprintf( _("Preference file, %s, could not be written. Contact your system administrator to resolve this issue.") , $filename . '.tmp') );
+ exit;
+ }
}
}
fclose($file);
+ if (! @copy($filename . '.tmp',$filename) ) {
+ logout_error( sprintf( _("Preference file, %s, could not be copied from temporary file, %s. Contact your system administrator to resolve this issue."), $filename, $filename . '.tmp') );
+ exit;
+ }
+ @unlink($filename . '.tmp');
chmod($filename, 0600);
+ sqsession_register($prefs_cache , 'prefs_cache');
}
/**
@@ -169,6 +182,9 @@ 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. */
+ if(substr($data_dir,-1) != '/') {
+ $data_dir .= '/';
+ }
$default_pref = $data_dir . 'default_pref';
/* If it is not there, check the internal data directory. */
@@ -178,11 +194,10 @@ function checkForPrefs($data_dir, $username, $filename = '') {
/* Otherwise, report an error. */
$errTitle = sprintf( _("Error opening %s"), $default_pref );
- if (!file_exists($default_pref)) {
+ if (!is_readable($default_pref)) {
$errString = $errTitle . "
\n" .
- _("Default preference file not found!") . "
\n" .
+ _("Default preference file not found or not readable!") . "
\n" .
_("Please contact your system administrator and report this error.") . "
\n";
- include_once(SM_PATH . 'functions/display_messages.php' );
logout_error( $errString, $errTitle );
exit;
} else if (!@copy($default_pref, $filename)) {
@@ -195,7 +210,6 @@ function checkForPrefs($data_dir, $username, $filename = '') {
_("Could not create initial preference file!") . "
\n" .
sprintf( _("%s should be writable by user %s"), $data_dir, $uid ) .
"
\n" . _("Please contact your system administrator and report this error.") . "
\n";
- include_once(SM_PATH . 'functions/display_messages.php' );
logout_error( $errString, $errTitle );
exit;
}
@@ -208,14 +222,22 @@ function checkForPrefs($data_dir, $username, $filename = '') {
function setSig($data_dir, $username, $number, $value) {
$filename = getHashedFile($username, $data_dir, "$username.si$number");
/* Open the file for writing, or else display an error to the user. */
- if(!$file = @fopen($filename, 'w'))
- {
- include_once(SM_PATH . '/functions/display_messages.php' );
- logout_error( sprintf( _("Signature file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
+ if(!$file = @fopen("$filename.tmp", 'w')) {
+ logout_error( sprintf( _("Signature file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename . '.tmp') );
exit;
}
- fwrite($file, $value);
+ if ( @fwrite($file, $value) === FALSE ) {
+ logout_error( sprintf( _("Signature file, %s, could not be written. Contact your system administrator to resolve this issue.") , $filename . '.tmp'));
+ exit;
+ }
fclose($file);
+ if (! @copy($filename . '.tmp',$filename) ) {
+ logout_error( sprintf( _("Signature file, %s, could not be copied from temporary file, %s. Contact your system administrator to resolve this issue."), $filename, $filename . '.tmp') );
+ exit;
+ }
+ @unlink($filename . '.tmp');
+ chmod($filename, 0600);
+
}
/**
@@ -228,7 +250,6 @@ function getSig($data_dir, $username, $number) {
/* Open the file, or else display an error to the user. */
if(!$file = @fopen($filename, 'r'))
{
- include_once(SM_PATH . 'functions/display_messages.php');
logout_error( sprintf( _("Signature file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
exit;
}