Minor code clean up

[squirrelmail.git] / functions / abook_database.php

diff --git a/functions/abook_database.php b/functions/abook_database.php
index 5fdd0d60ffe8bc649fe55f37f8c7c36a12f8edb8..0377691ced45d37f33ccd742de398d2f7c4724c3 100644 (file)
--- a/functions/abook_database.php
+++ b/functions/abook_database.php
@@ -33,7 +33,16 @@
  */
 
 /** 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 .= 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;
+}
 
 /**
  * Undocumented class - stores the addressbook in a sql database
@@ -173,7 +182,7 @@ class abook_database extends addressbook_backend {
             return false;
         }
          
-        $query = sprintf("SELECT * FROM %s WHERE owner='%s' AND nickname='%s'",
+        $query = sprintf("SELECT * FROM %s WHERE owner='%s' AND LOWER(nickname)='%s'",
                          $this->table, $this->owner, $this->dbh->quoteString($alias));
 
         $res = $this->dbh->query($query);
@@ -345,4 +354,6 @@ class abook_database extends addressbook_backend {
     }
 } /* End of class abook_database */
 
+
+// vim: et ts=4
 ?>