X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fabook_database.php;h=8fcb5170a000d6794bcbb79b8c463ebac1316dc7;hb=49255dcd4fd08bad0ed3eb1e89c6a6284a885fcd;hp=62a2610b44408e5fab1348a0657111cff5d1c9e0;hpb=701c9c6ba2c8723341a19a7e952e0d3d4bfbad77;p=squirrelmail.git

diff --git a/functions/abook_database.php b/functions/abook_database.php
index 62a2610b..8fcb5170 100644
--- a/functions/abook_database.php
+++ b/functions/abook_database.php
@@ -27,15 +27,15 @@
     ** $Id$
     **/
    
-   require_once("DB.php");
+   require_once('DB.php');
    
    class abook_database extends addressbook_backend {
-      var $btype = "local";
-      var $bname = "database";
+      var $btype = 'local';
+      var $bname = 'database';
       
-      var $dsn       = "";
-      var $table     = "";
-      var $owner     = "";
+      var $dsn       = '';
+      var $table     = '';
+      var $owner     = '';
       var $dbh       = false;
       
       var $writeable = true;
@@ -108,13 +108,13 @@
          if(is_array($expr)) return;
 
          // Make regexp from glob'ed expression 
-         $expr = ereg_replace('\?', '_', $expr);
-         $expr = ereg_replace('\*'. '%', $expr);
+         $expr = str_replace('?', '_', $expr);
+         $expr = str_replace('*', '%', $expr);
          $expr = $this->dbh->quoteString($expr);
          $expr = "%$expr%";
 
-         $query = sprintf('SELECT * FROM %s WHERE owner=\'%s\' AND ' .
-                          '(firstname LIKE \'%s\' OR lastname LIKE \'%s\')',
+         $query = sprintf("SELECT * FROM %s WHERE owner='%s' AND " .
+                          "(firstname LIKE '%s' OR lastname LIKE '%s')",
                           $this->table, $this->owner, $expr, $expr);
          $res = $this->dbh->query($query);
 
@@ -145,7 +145,7 @@
          if(!$this->open())
             return false;
          
-         $query = sprintf('SELECT * FROM %s WHERE owner=\'%s\' AND nickname=\'%s\'',
+         $query = sprintf("SELECT * FROM %s WHERE owner='%s' AND nickname='%s'",
                           $this->table, $this->owner, $alias);
 
          $res = $this->dbh->query($query);
@@ -174,7 +174,7 @@
          if(!$this->open())
             return false;
 
-         $query = sprintf(;SELECT * FROM %s WHERE owner=\'%s\';,
+         $query = sprintf("SELECT * FROM %s WHERE owner='%s'",
                           $this->table, $this->owner);
 
          $res = $this->dbh->query($query);
@@ -207,11 +207,11 @@
          // See if user exist already
          $ret = $this->lookup($userdata['nickname']);
          if(!empty($ret))
-            return $this->set_error(sprintf(_((User \'%s\' already exist"),
+            return $this->set_error(sprintf(_("User '%s' already exist"),
                                             $ret['nickname']));
 
          // Create query
-         $query = sprintf('INSERT INTO %s (owner, nickname, firstname, ' .
+         $query = sprintf("INSERT INTO %s (owner, nickname, firstname, " .
                           "lastname, email, label) VALUES('%s','%s','%s'," .
                           "'%s','%s','%s')",
                           $this->table, $this->owner,
@@ -239,12 +239,12 @@
             return false;
          
          // Create query
-         $query = sprintf('DELETE FROM %s WHERE owner=\'%s\' AND (',
+         $query = sprintf("DELETE FROM %s WHERE owner='%s' AND (",
                           $this->table, $this->owner);
 
          $sepstr = '';
          while(list($undef, $nickname) = each($alias)) {
-            $query .= sprintf('%s nickname=\'%s\' ', $sepstr,
+            $query .= sprintf("%s nickname='%s' ", $sepstr,
                               $this->dbh->quoteString($nickname));
             $sepstr = 'OR';
          }