Small tweaks:

Move include of display messages in file_prefs to the top of the file,
because it wasn't included everywhere correctly ('../functions') or in
some places not at all, better move it to the top so the functions are
available at all times in a consistent manner.
Also throw an error if the tmp pref file could not be copied.
Remove initializing of colors that aren't used in logout_error.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4637 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/display_messages.php b/functions/display_messages.php
index ab003be3c2dc6a38b162fb2ad0bb97ab82551158..a517984af2b2871d07d38f0a705835d5177687f5 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -99,17 +99,9 @@ function logout_error( $errString, $errTitle = '' ) {
         $color[0]  = '#DCDCDC';  /* light gray    TitleBar               */
         $color[1]  = '#800000';  /* red                                  */
         $color[2]  = '#CC0000';  /* light red     Warning/Error Messages */
         $color[0]  = '#DCDCDC';  /* light gray    TitleBar               */
         $color[1]  = '#800000';  /* red                                  */
         $color[2]  = '#CC0000';  /* light red     Warning/Error Messages */

-        $color[3]  = '#A0B8C8';  /* green-blue    Left Bar Background    */

         $color[4]  = '#FFFFFF';  /* white         Normal Background      */
         $color[4]  = '#FFFFFF';  /* white         Normal Background      */

-        $color[5]  = '#FFFFCC';  /* light yellow  Table Headers          */
-        $color[6]  = '#000000';  /* black         Text on left bar       */

         $color[7]  = '#0000CC';  /* blue          Links                  */
         $color[8]  = '#000000';  /* black         Normal text            */
         $color[7]  = '#0000CC';  /* blue          Links                  */
         $color[8]  = '#000000';  /* black         Normal text            */

-        $color[9]  = '#ABABAB';  /* mid-gray      Darker version of #0   */
-        $color[10] = '#666666';  /* dark gray     Darker version of #9   */
-        $color[11] = '#770000';  /* dark red      Special Folders color  */
-        $color[12] = '#EDEDED';
-        $color[15] = '#002266';  /* (dark blue)      Unselectable folders */

     }
 
     if ( $errTitle == '' ) {
     }
 
     if ( $errTitle == '' ) {

diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index 79852012d53f229bb1edebfce15eb422c62ad836..ad596e662bcfe2ce5428701d03638025d38be8de 100644 (file)
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -11,6 +11,9 @@
  * $Id$
  */
 
  * $Id$
  */
 

+/* include this for error messages */
+include_once(SM_PATH . 'functions/display_messages.php');
+

 /**
  * Check the preferences into the session cache.
  */
 /**
  * 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)) {
 
     /* 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;
     }
         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'))
     {
     /* 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;
     }
         logout_error( sprintf( _("Preference file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
         exit;
     }


@@ -82,7 +83,7 @@ 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;
  */
 function getPref($data_dir, $username, $string, $default = '') {
     global $prefs_cache;


@@ -113,7 +114,6 @@ function savePrefValues($data_dir, $username) {
     /* Open the file for writing, or else display an error to the user. */
     if(!$file = @fopen($filename.'.tmp', 'w'))
     {
     /* 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;
     }
         logout_error( sprintf( _("Preference file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename.'.tmp') );
         exit;
     }


@@ -127,7 +127,11 @@ function savePrefValues($data_dir, $username) {
         }
     }
     fclose($file);
         }
     }
     fclose($file);

-    @copy($filename . '.tmp',$filename);
+    $tmpcopy = @copy($filename . '.tmp',$filename);
+    if ($tmpcopy == -1) {
+        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);
 }
     @unlink($filename . '.tmp');
     chmod($filename, 0600);
 }


@@ -192,7 +196,6 @@ function checkForPrefs($data_dir, $username, $filename = '') {
             $errString = $errTitle . "<br>\n" .
                          _("Default preference file not found or not readable!") . "<br>\n" .
                          _("Please contact your system administrator and report this error.") . "<br>\n";
             $errString = $errTitle . "<br>\n" .
                          _("Default preference file not found or not readable!") . "<br>\n" .
                          _("Please contact your system administrator and report this error.") . "<br>\n";

-            include_once(SM_PATH . 'functions/display_messages.php' );

             logout_error( $errString, $errTitle );
             exit;
         } else if (!@copy($default_pref, $filename)) {
             logout_error( $errString, $errTitle );
             exit;
         } else if (!@copy($default_pref, $filename)) {


@@ -205,7 +208,6 @@ function checkForPrefs($data_dir, $username, $filename = '') {
                        _("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";
                        _("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(SM_PATH . 'functions/display_messages.php' );

             logout_error( $errString, $errTitle );
             exit;
         }
             logout_error( $errString, $errTitle );
             exit;
         }


@@ -219,13 +221,11 @@ 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.tmp", 'w')) {
     $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')) {

-        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) {
         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;
     }
        logout_error( sprintf( _("Signature file, %s, could not be written. Contact your system administrator to resolve this issue.") , $filename . '.tmp'));
        exit;
     }


@@ -246,7 +246,6 @@ function getSig($data_dir, $username, $number) {
         /* Open the file, or else display an error to the user. */
         if(!$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;
         }
             logout_error( sprintf( _("Signature file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
             exit;
         }