In stead of just crashing, give a proper error when PEAR DB functions could

not be included.

Also, from now on I will add a vim comment to the foot of each file I commit
to make sure everyone that edits the file with vim will automatically use the
correct 4-spaces-indentation.

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

diff --git a/ChangeLog b/ChangeLog
index eb7b6c42a05c313b6937952c28a3fb465264ec5e..5a1f8eefa0fc75edb2f2bac89dfd191a7ea96e08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,7 @@ Version 1.5.1 -- CVS
   - Fixed XSS vulnerability in content-type display in the attachment area
     of read_body.php discovered by Roman Medina.
   - Get alternating row colors of addressbook in sync with mailbox list.
+  - Give proper error when PEAR DB not found.
 
 Version 1.5.0
 --------------------

diff --git a/functions/abook_database.php b/functions/abook_database.php
index 94a9180e7dcffe25d4f05e2624b93317c0981a00..f7b79a38e8e454d3d8ce801778161932dffb6c48 100644 (file)
--- a/functions/abook_database.php
+++ b/functions/abook_database.php
@@ -33,7 +33,13 @@
  */
 
 /** Needs the DB functions */   
-require_once('DB.php');
+if (!include_once('DB.php')) {
+    // same error also in db_prefs.php
+    require_once(SM_PATH . 'functions/display_messages.php');
+    $error  = _("Could not include PEAR database functions required for the database backend.") . "<br />\n";
+    $error .= _("Please contact your system administrator and report this error.");
+    error_box($error, $color);
+}
 
 /**
  * Undocumented class - stores the addressbook in a sql database
@@ -345,4 +351,6 @@ class abook_database extends addressbook_backend {
     }
 } /* End of class abook_database */
 
+
+// vim: et ts=4
 ?>

diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index e9493aeaaa528607f7c79f7bd376294a58f6ebfa..981177b8feec1796590a015421a7837bb25077de 100644 (file)
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -36,8 +36,14 @@ define('SMDB_MYSQL', 1);
 /** PostgreSQL */
 define('SMDB_PGSQL', 2);
 
-require_once('DB.php');
 require_once(SM_PATH . 'config/config.php');
+if (!include_once('DB.php')) {
+    // same error also in abook_database.php
+    require_once(SM_PATH . 'functions/display_messages.php');
+    $error  = _("Could not include PEAR database functions required for the database backend.") . "<br />\n";
+    $error .= _("Please contact your system administrator and report this error.");
+    error_box($error, $color);
+}
 
 global $prefs_are_cached, $prefs_cache;
 
@@ -385,4 +391,5 @@ function getSig($data_dir, $username, $number) {
     return getPref($data_dir, $username, $key);
 }
 
-?>
\ No newline at end of file
+// vim: et ts=4
+?>