From: tokul Date: Sun, 14 May 2006 14:58:10 +0000 (+0000) Subject: moving error message to class constructor function. Prevents X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6d429ce658ba6b8feb83d082f51977733c8e7399;p=squirrelmail.git moving error message to class constructor function. Prevents output when functions/abook_database.php is loaded. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11132 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/abook_database.php b/functions/abook_database.php index db7e1a00..03dae3a1 100644 --- a/functions/abook_database.php +++ b/functions/abook_database.php @@ -10,16 +10,11 @@ * @subpackage addressbook */ -/** Needs the DB functions */ -if (!include_once('DB.php')) { - // same error also in db_prefs.php - $error = _("Could not include PEAR database functions required for the database backend.") . "
\n"; - $error .= sprintf(_("Is PEAR installed, and is the include path set correctly to find %s?"), - 'DB.php') . "
\n"; - $error .= _("Please contact your system administrator and report this error."); - error_box($error, $color); - exit; -} +/** + * Needs the DB functions + * Don't display errors here. Error will be set in class constructor function. + */ +@include_once('DB.php'); /** * Address book in a database backend @@ -103,6 +98,16 @@ class abook_database extends addressbook_backend { function abook_database($param) { $this->sname = _("Personal address book"); + /* test if Pear DB class is available and freak out if it is not */ + if (! class_exists('DB')) { + // same error also in db_prefs.php + $error = _("Could not include PEAR database functions required for the database backend.") . "
\n"; + $error .= sprintf(_("Is PEAR installed, and is the include path set correctly to find %s?"), + 'DB.php') . "
\n"; + $error .= _("Please contact your system administrator and report this error."); + return $this->set_error($error); + } + if (is_array($param)) { if (empty($param['dsn']) || empty($param['table']) ||