Move default_pref from data/ to config/ dir.

We will check the legacy locations first in order to remain backwards compatible
(an upgrade will still use the old location but a new install will use the new).
When not found, do not exit with an error, just create an empty prefs file.
Fix the title of the error message.

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

diff --git a/ChangeLog b/ChangeLog
index e31d94357d626c3dfc5a5f79dc5d2647f861f6da..cdf979f7fb5870d840b8f1701b9e3cdf9bbbfc41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -199,6 +199,9 @@ Version 1.5.1 -- CVS
     issue with a specific IMAP server.
   - In sqgetGlobalVar(), reset $value if the var is not found in the
     specified location.
+  - Move default_pref to the config/ dir, but keep checking legacy locations
+    first for bc. Do not fail with an error when default_pref not found, just
+    create an empty one.
 
 Version 1.5.0
 --------------------

diff --git a/data/default_pref b/config/default_pref
similarity index 100%
rename from data/default_pref
rename to config/default_pref

diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index 4f8f03029273c5a4841b356ab02ac0ebc00123fe..e852387ef90b43f69036ec392dfa12bcfd8c75b7 100644 (file)
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -184,35 +184,42 @@ 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. */
+
+        /* If it does not exist, check for default_prefs */
+        
+        /* First, check legacy locations: data dir */
         if(substr($data_dir,-1) != '/') {
             $data_dir .= '/';
         }
         $default_pref = $data_dir . 'default_pref';
 
-        /* If it is not there, check the internal data directory. */
+        /* or legacy location: internal data dir */
         if (!@file_exists($default_pref)) {
             $default_pref = SM_PATH . 'data/default_pref';
         }
 
-        /* Otherwise, report an error. */
-        $errTitle = sprintf( _("Error opening %s"), $default_pref );
-        if (!is_readable($default_pref)) {
-            $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";
-            logout_error( $errString, $errTitle );
-            exit;
-        } else if (!@copy($default_pref, $filename)) {
+        /* If no legacies, check where we'd expect it to be located:
+         * under config/ */
+        if (!@file_exists($default_pref)) {
+            $default_pref = SM_PATH . 'config/default_pref';
+        }
+        
+        /* If a default_pref file found, try to copy it, if none found,
+         * try to create an empty one. If that fails, report an error.
+         */
+        if (
+            ( is_readable($default_pref) && !@copy($default_pref, $filename) ) ||
+            !@touch($filename)
+        ) {
             $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";
+            $errTitle = _("Could not create initial preference file!");
+            $errString = $errTitle . "<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";
             logout_error( $errString, $errTitle );
             exit;
         }
@@ -270,4 +277,4 @@ function getSig($data_dir, $username, $number) {
 }
 
 // vim: et ts=4
-?>
\ No newline at end of file
+?>