X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Ffile_prefs.php;h=418f05acf2023474d2fd10dbafb3c8cdbd6e63ac;hb=96862638ef65bfd5438320fc30adf6edf5f1429d;hp=d80ba43889bf942fecb81b6fe21b8e851c4ff3b2;hpb=1d44a9374198d7e76e266f7da08a3ec85a1b8374;p=squirrelmail.git diff --git a/functions/file_prefs.php b/functions/file_prefs.php index d80ba438..418f05ac 100644 --- a/functions/file_prefs.php +++ b/functions/file_prefs.php @@ -3,15 +3,16 @@ /** * file_prefs.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team + * Copyright (c) 1999-2004 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 * - * $Id$ + * @version $Id$ + * @package squirrelmail */ -/* include this for error messages */ +/** include this for error messages */ include_once(SM_PATH . 'functions/display_messages.php'); /** @@ -19,14 +20,16 @@ include_once(SM_PATH . 'functions/display_messages.php'); */ function cachePrefValues($data_dir, $username) { global $prefs_are_cached, $prefs_cache; - + + sqgetGlobalVar('prefs_are_cached', $prefs_are_cached, SQ_SESSION ); if ( isset($prefs_are_cached) && $prefs_are_cached) { + sqgetGlobalVar('prefs_cache', $prefs_cache, SQ_SESSION ); return; } - + 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"); @@ -73,15 +76,15 @@ function cachePrefValues($data_dir, $username) { $prefs_cache[$key] = $value; } } - } - fclose($file); + } + fclose($file); $prefs_are_cached = TRUE; sqsession_register($prefs_cache, 'prefs_cache'); sqsession_register($prefs_are_cached, 'prefs_are_cached'); } - + /** * Return the value for the preference given by $string. */ @@ -90,15 +93,15 @@ function getPref($data_dir, $username, $string, $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; - } - } + 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); } @@ -108,7 +111,7 @@ function getPref($data_dir, $username, $string, $default = '') { */ function savePrefValues($data_dir, $username) { global $prefs_cache; - + $filename = getHashedFile($username, $data_dir, "$username.pref"); /* Open the file for writing, or else display an error to the user. */ @@ -119,7 +122,7 @@ function savePrefValues($data_dir, $username) { } foreach ($prefs_cache as $Key => $Value) { if (isset($Value)) { - if ( ! @fwrite($file, $Key . '=' . $Value . "\n") ) { + if ( sq_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; } @@ -131,7 +134,8 @@ function savePrefValues($data_dir, $username) { exit; } @unlink($filename . '.tmp'); - chmod($filename, 0600); + @chmod($filename, 0600); + sqsession_register($prefs_cache , 'prefs_cache'); } /** @@ -141,11 +145,11 @@ 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); } @@ -181,7 +185,10 @@ 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. */ - $default_pref = $data_dir . '/default_pref'; + if(substr($data_dir,-1) != '/') { + $data_dir .= '/'; + } + $default_pref = $data_dir . 'default_pref'; /* If it is not there, check the internal data directory. */ if (!@file_exists($default_pref)) { @@ -191,9 +198,9 @@ function checkForPrefs($data_dir, $username, $filename = '') { /* Otherwise, report an error. */ $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"; + $errString = $errTitle . "
\n" . + _("Default preference file not found or not readable!") . "
\n" . + _("Please contact your system administrator and report this error.") . "
\n"; logout_error( $errString, $errTitle ); exit; } else if (!@copy($default_pref, $filename)) { @@ -202,10 +209,10 @@ function checkForPrefs($data_dir, $username, $filename = '') { $user_data = posix_getpwuid(posix_getuid()); $uid = $user_data['name']; } - $errString = $errTitle . '
' . - _("Could not create initial preference file!") . "
\n" . + $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"; + "
\n" . _("Please contact your system administrator and report this error.") . "
\n"; logout_error( $errString, $errTitle ); exit; } @@ -216,13 +223,18 @@ function checkForPrefs($data_dir, $username, $filename = '') { * Write the User Signature. */ function setSig($data_dir, $username, $number, $value) { + // Limit signature size to 64KB (database BLOB limit) + if (strlen($value)>65536) { + error_option_save(_("Signature is too big.")); + return; + } $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.tmp", 'w')) { logout_error( sprintf( _("Signature file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename . '.tmp') ); exit; } - if (! @fwrite($file, $value) ) { + if ( sq_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; } @@ -232,7 +244,7 @@ function setSig($data_dir, $username, $number, $value) { exit; } @unlink($filename . '.tmp'); - chmod($filename, 0600); + @chmod($filename, 0600); } @@ -256,3 +268,6 @@ function getSig($data_dir, $username, $number) { } return $sig; } + +// vim: et ts=4 +?> \ No newline at end of file