X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Ffile_prefs.php;h=0ae47bac77a7f60b6ac99cc193efb0bfac52b604;hp=a4bfeace80d83102d2c94d999c9231970878ab1b;hb=35b5fa1362017c76255ea8a99222818d7caec5a3;hpb=9be8198db452ada405ad990214d7a3b26d129a33
diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index a4bfeace..0ae47bac 100644
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -40,7 +40,13 @@ function cachePrefValues($data_dir, $username) {
exit;
}
- $file = fopen($filename, 'r');
+ /* Open the file, or else display an error to the user. */
+ if(!$file = @fopen($filename, 'r'))
+ {
+ include_once( '../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;
@@ -94,7 +100,14 @@ function savePrefValues($data_dir, $username) {
$filename = getHashedFile($username, $data_dir, "$username.pref");
- $file = fopen($filename, 'w');
+ /* Open the file for writing, or else display an error to the user. */
+ if(!$file = @fopen($filename, 'w'))
+ {
+ include_once( '../functions/display_messages.php' );
+ logout_error( sprintf( _("Preference file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
+ exit;
+ }
+
foreach ($prefs_cache as $Key => $Value) {
if (isset($Value)) {
fwrite($file, $Key . '=' . $Value . "\n");
@@ -168,8 +181,11 @@ function checkForPrefs($data_dir, $username, $filename = '') {
logout_error( $errString, $errTitle );
exit;
} else if (!@copy($default_pref, $filename)) {
- $user_data = posix_getpwuid(posix_getuid());
- $uid = $user_data['name'];
+ $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 ) .
@@ -186,7 +202,13 @@ 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');
+ /* Open the file for writing, or else display an error to the user. */
+ if(!$file = @fopen($filename, '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) );
+ exit;
+ }
fwrite($file, $value);
fclose($file);
}
@@ -195,11 +217,16 @@ function setSig($data_dir, $username, $number, $value) {
* 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( '../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);
}