X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Ffile_prefs.php;h=1cde4c88ffd71b854266878faf6562eccdcc359b;hp=d52560a83fb4210c79c62c6b7e2ebba4295e57f7;hb=c96c32f4259c6774fe17dc0a7bebfb2193bc3ea3;hpb=01265fbab60e51c5d97f55cfefe5888abb383ae9 diff --git a/functions/file_prefs.php b/functions/file_prefs.php index d52560a8..1cde4c88 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,8 +11,6 @@ * $Id$ */ -global $prefs_are_cached, $prefs_cache; - /** * Check the preferences into the session cache. */ @@ -20,11 +18,11 @@ function cachePrefValues($data_dir, $username) { global $prefs_are_cached, $prefs_cache; if ( isset($prefs_are_cached) && $prefs_are_cached) { - return; + return $prefs_cache; } - session_unregister('prefs_cache'); - session_unregister('prefs_are_cached'); + sqsession_unregister('prefs_cache'); + sqsession_unregister('prefs_are_cached'); /* Calculate the filename for the user's preference file */ $filename = getHashedFile($username, $data_dir, "$username.pref"); @@ -35,20 +33,36 @@ function cachePrefValues($data_dir, $username) { /* 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"; + 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; } - $file = fopen($filename, 'r'); + /* 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; + } /* 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 +77,9 @@ function cachePrefValues($data_dir, $username) { $prefs_are_cached = TRUE; - session_register('prefs_cache'); - session_register('prefs_are_cached'); + sqsession_register($prefs_cache, 'prefs_cache'); + sqsession_register($prefs_are_cached, 'prefs_are_cached'); + return $prefs_cache; } /** @@ -72,34 +87,54 @@ function cachePrefValues($data_dir, $username) { */ 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; + $result = do_hook_function('get_pref_override',array($username,$string)); + if (!$result) { + $prefs_cache = 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); } /** * Save the preferences for this user. */ -function savePrefValues($data_dir, $username) { - global $prefs_cache; +function savePrefValues($data_dir, $username, $prefs_cache) { $filename = getHashedFile($username, $data_dir, "$username.pref"); - $file = fopen($filename, 'w'); + if (!is_array($prefs_cache) || count($prefs_cache) == 0) { + include_once(SM_PATH . 'functions/display_messages.php'); + logout_error( _("Houston we have a problem, the preference cache is lost!!!.")); + exit; + } + + /* Open the file for writing, or else display an error to the user. */ + 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.'.tmp') ); + exit; + } foreach ($prefs_cache as $Key => $Value) { if (isset($Value)) { - fwrite($file, $Key . '=' . $Value . "\n"); + $tmpwrite = @fwrite($file, $Key . '=' . $Value . "\n"); + if ($tmpwrite == -1) { + logout_error( sprintf( _("Preference file, %s, could not be written. Contact your system administrator to resolve this issue.") , $filename . '.tmp') ); + exit; + } } } fclose($file); + @copy($filename . '.tmp',$filename); + @unlink($filename . '.tmp'); chmod($filename, 0600); } @@ -109,13 +144,11 @@ function savePrefValues($data_dir, $username) { 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); + savePrefValues($data_dir, $username,$prefs_cache); } /** @@ -124,18 +157,16 @@ function removePref($data_dir, $username, $string) { 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; + unset($prefs_cache[$string]); + } else { + $prefs_cache[$string] = $value; } - - $prefs_cache[$string] = $value; - savePrefValues($data_dir, $username); + savePrefValues($data_dir, $username, $prefs_cache); } /** @@ -144,29 +175,40 @@ function setPref($data_dir, $username, $string, $value) { function checkForPrefs($data_dir, $username, $filename = '') { /* First, make sure we have the filename. */ if ($filename == '') { - $filename = getHashedFile($username, $data_dir, '$username.pref'); + $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'; + $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'; + $default_pref = SM_PATH . '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"; + $errTitle = sprintf( _("Error opening %s"), $default_pref ); + if (!is_readable($default_pref)) { + $errString = $errTitle . "
\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)) { - echo _("Error opening ") . $default_pref . '
'; - echo _("Could not create initial preference file!") . "
\n"; - echo _("Please contact your system administrator and report this error.") . "
\n"; + $uid = 'httpd'; + if (function_exists('posix_getuid')){ + $user_data = posix_getpwuid(posix_getuid()); + $uid = $user_data['name']; + } + $errString = $errTitle . '
' . + _("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; } } @@ -177,20 +219,39 @@ function checkForPrefs($data_dir, $username, $filename = '') { */ function setSig($data_dir, $username, $number, $value) { $filename = getHashedFile($username, $data_dir, "$username.si$number"); - $file = fopen($filename, 'w'); - fwrite($file, $value); + /* Open the file for writing, or else display an error to the user. */ + if(!$file = @fopen("$filename.tmp", 'w')) { + include_once( '../functions/display_messages.php' ); + logout_error( sprintf( _("Signature file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename . '.tmp') ); + exit; + } + $tmpwrite = @fwrite($file, $value); + if ($tmpwrite == -1) { + include_once( '../functions/display_messages.php' ); + logout_error( sprintf( _("Signature file, %s, could not be written. Contact your system administrator to resolve this issue.") , $filename . '.tmp')); + exit; + } fclose($file); + @copy($filename . '.tmp',$filename); + @unlink($filename . '.tmp'); + chmod($filename, 0600); + } /** * Get the signature. */ function getSig($data_dir, $username, $number) { - #$filename = $data_dir . $username . '.si$number'; $filename = getHashedFile($username, $data_dir, "$username.si$number"); $sig = ''; if (file_exists($filename)) { - $file = fopen($filename, 'r'); + /* 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; + } while (!feof($file)) { $sig .= fgets($file, 1024); }