Allow database based preferences to read in default settings from the

default_pref file next to hardcoding them into the DB class, thanks
Thierry Godefroy.

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

diff --git a/ChangeLog b/ChangeLog
index 4a0ead584486040eb39d63678236d65e4df773dc..b28d887752702a6335d15542d91c74ef106d0a68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -244,7 +244,9 @@ Version 1.5.2 - SVN
   - Added "Secured Configuration" mode.
   - Added edit list, checkbox, radio group, multiple-select folder list
     and multiple-select string list option widget types.
-
+  - Allow database based preferences to read in default settings from the
+    default_pref file next to hardcoding them into the DB class, thanks
+    Thierry Godefroy.
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index 9756fc88195dfde3e5519f104033824b9b322191..d78606974a0846a28258cecffb721b4fdc0fe03a 100644 (file)
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -164,6 +164,27 @@ class dbPrefs {
 
 
 
+    /**
+     * initialize the default preferences array.
+     *
+     */
+    function dbPrefs() {
+        // Try and read the default preferences file.
+        $default_pref = SM_PATH . 'config/default_pref';
+        if (@file_exists($default_pref)) {
+            if ($file = @fopen($default_pref, 'r')) {
+                while (!feof($file)) {
+                    $pref = fgets($file, 1024);
+                    $i = strpos($pref, '=');
+                    if ($i > 0) {
+                        $this->default[trim(substr($pref, 0, $i))] = trim(substr($pref, $i + 1));
+                    }
+                }
+                fclose($file);
+            }
+        }
+    }
+
     /**
      * initialize DB connection object
      *