Remove duplicated javascript function definition

[squirrelmail.git] / functions / db_prefs.php

diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index f116c83762f41fbfef8455fe1db6dea5cc9552ed..0c203840809bb31f4cb0013583e07dbd3b05ee30 100644 (file)
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -21,7 +21,7 @@
  * Configuration of databasename, username and password is done
  * by using conf.pl or the administrator plugin
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -39,16 +39,11 @@ define('SMDB_MYSQL', 1);
 /** PostgreSQL */
 define('SMDB_PGSQL', 2);
 
-
-if (!include_once('DB.php')) {
-    // same error also in abook_database.php
-    $error  = _("Could not include PEAR database functions required for the database backend.") . "<br />\n";
-    $error .= sprintf(_("Is PEAR installed, and is the include path set correctly to find %s?"),
-                        '<tt>DB.php</tt>') . "<br />\n";
-    $error .= _("Please contact your system administrator and report this error.");
-    error_box($error, $color);
-    exit;
-}
+/**
+ * don't display errors (no code execution in functions/*.php).
+ * will handle error in dbPrefs class.
+ */
+@include_once('DB.php');
 
 global $prefs_are_cached, $prefs_cache;
 
@@ -167,6 +162,16 @@ class dbPrefs {
         global $prefs_user_field, $prefs_key_field, $prefs_val_field;
         global $prefs_user_size, $prefs_key_size, $prefs_val_size;
 
+        /* test if Pear DB class is available and freak out if it is not */
+        if (! class_exists('DB')) {
+            // same error also in abook_database.php
+            $this->error  = _("Could not include PEAR database functions required for the database backend.") . "<br />\n";
+            $this->error .= sprintf(_("Is PEAR installed, and is the include path set correctly to find %s?"),
+                              '<tt>DB.php</tt>') . "<br />\n";
+            $this->error .= _("Please contact your system administrator and report this error.");
+            return false;
+        }
+
         if(isset($this->dbh)) {
             return true;
         }
@@ -294,7 +299,7 @@ class dbPrefs {
         if (strlen($user) > $this->user_size) {
             $this->error = "Oversized username value."
                 ." Your preferences can't be saved."
-                ." See doc/db-backend.txt or contact your system administrator.";
+                ." See the administrator's manual or contact your system administrator.";
 
             /**
              * Debugging function. Can be used to log all issues that trigger
@@ -312,7 +317,7 @@ class dbPrefs {
         if (strlen($key) > $this->key_size) {
             $err_msg = "Oversized user's preference key."
                 ." Some preferences were not saved."
-                ." See doc/db-backend.txt or contact your system administrator.";
+                ." See the administrator's manual or contact your system administrator.";
             // error is not fatal. Only some preference is not saved.
             trigger_error($err_msg,E_USER_WARNING);
             return false;
@@ -323,7 +328,7 @@ class dbPrefs {
         if (strlen($value) > $this->val_size) {
             $err_msg = "Oversized user's preference value."
                 ." Some preferences were not saved."
-                ." See doc/db-backend.txt or contact your system administrator.";
+                ." See the administrator's manual or contact your system administrator.";
             // error is not fatal. Only some preference is not saved.
             trigger_error($err_msg,E_USER_WARNING);
             return false;
@@ -536,6 +541,3 @@ function getSig($data_dir, $username, $number) {
     }
     return getPref($data_dir, $username, $key);
 }
-
-// vim: et ts=4
-?>
\ No newline at end of file