X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Ffile_prefs.php;h=0ae47bac77a7f60b6ac99cc193efb0bfac52b604;hb=83feb57ae0869996d6ae0c78511017e1872c589a;hp=d52560a83fb4210c79c62c6b7e2ebba4295e57f7;hpb=01265fbab60e51c5d97f55cfefe5888abb383ae9;p=squirrelmail.git

diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index d52560a8..0ae47bac 100644
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -35,11 +35,18 @@ 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) . "<br>\n";
+        include_once( '../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( '../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;
@@ -93,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");
@@ -144,7 +158,7 @@ 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. */
@@ -158,15 +172,26 @@ function checkForPrefs($data_dir, $username, $filename = '') {
         }
 
         /* Otherwise, report an error. */
+        $errTitle = sprintf( _("Error opening %s"), $default_pref );
         if (!file_exists($default_pref)) {
-            echo _("Error opening ") . $default_pref . "<br>\n";
-            echo _("Default preference file not found!") . "<br>\n";
-            echo _("Please contact your system administrator and report this error.") . "<br>\n";
+            $errString = $errTitle . "<br>\n" .
+                         _("Default preference file not found!") . "<br>\n" .
+                         _("Please contact your system administrator and report this error.") . "<br>\n";
+            include_once( '../functions/display_messages.php' );
+            logout_error( $errString, $errTitle );
             exit;
         } else if (!@copy($default_pref, $filename)) {
-            echo _("Error opening ") . $default_pref . '<br>';
-            echo _("Could not create initial preference file!") . "<br>\n";
-            echo _("Please contact your system administrator and report this error.") . "<br>\n";
+            $uid = 'httpd';
+            if (function_exists('posix_getuid')){
+                $user_data = posix_getpwuid(posix_getuid());
+                $uid = $user_data['name'];
+            }
+            $errString = $errTitle . '<br>' .
+                       _("Could not create initial preference file!") . "<br>\n" .
+                       sprintf( _("%s should be writable by user %s"), $data_dir, $uid ) .
+                       "<br>\n" . _("Please contact your system administrator and report this error.") . "<br>\n";
+            include_once( '../functions/display_messages.php' );
+            logout_error( $errString, $errTitle );
             exit;
         }
     }
@@ -177,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);
 }
@@ -186,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);
         }