WebSVN – Applications.papyrus – Diff – //trunk/api/pear/Auth/Container/DB.php

  * @package    Auth
  * @author     Martin Jansen <mj@php.net>
  * @author     Adam Ashley <aashley@php.net>
  * @copyright  2001-2006 The PHP Group
  * @license    http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version    CVS: $Id: DB.php,v 1.2 2006-12-14 15:04:28 jp_milcent Exp $
+ * @version    CVS: $Id: DB.php,v 1.3 2007-11-19 15:11:00 jp_milcent Exp $
  * @link       http://pear.php.net/package/Auth
  */
 /**
  * @package    Auth
  * @author     Martin Jansen <mj@php.net>
  * @author     Adam Ashley <aashley@php.net>
  * @copyright  2001-2006 The PHP Group
  * @license    http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version    Release: 1.4.3  File: $Revision: 1.2 $
+ * @version    Release: 1.5.4  File: $Revision: 1.3 $
  * @link       http://pear.php.net/package/Auth
  */
 class Auth_Container_DB extends Auth_Container
+{
      * @param  string DSN string
      * @return mixed  Object on error, otherwise bool
      */
     function _connect($dsn)
+    {
+        $this->log('Auth_Container_DB::_connect() called.', AUTH_LOG_DEBUG);
         if (is_string($dsn) || is_array($dsn)) {
             $this->db = DB::Connect($dsn, $this->options['db_options']);
         } elseif (is_subclass_of($dsn, 'db_common')) {
             $this->db = $dsn;
         } elseif (DB::isError($dsn)) {
         $this->options['passwordcol'] = 'password';
         $this->options['dsn']         = '';
         $this->options['db_fields']   = '';
         $this->options['cryptType']   = 'md5';
         $this->options['db_options']  = array();
+        $this->options['db_where']    = '';
         $this->options['auto_quote']  = true;
+    }
     // }}}
+            }
+        }
         return '';
     }
     // }}}
     // {{{ fetchData()
      *                  challenge response password authentication
      * @return  mixed  Error object or boolean
      */
     function fetchData($username, $password, $isChallengeResponse=false)
+    {
+        $this->log('Auth_Container_DB::fetchData() called.', AUTH_LOG_DEBUG);
         // Prepare for a database query
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
         $query = "SELECT ".$sql_from.
                 " FROM ".$this->options['final_table'].
+                " WHERE ".$this->options['final_usernamecol']." = ".$this->db->quoteSmart($username);
+        // check if there is an optional parameter db_where
+        if ($this->options['db_where'] != '') {
+            // there is one, so add it to the query
+            $query .= " AND ".$this->options['db_where'];
+        }
-                " WHERE ".$this->options['final_usernamecol']." = ".$this->db->quoteSmart($username);
+        $this->log('Running SQL against DB: '.$query, AUTH_LOG_DEBUG);
         $res = $this->db->getRow($query, null, DB_FETCHMODE_ASSOC);
         // If using Challenge Response md5 the pass with the secret
         if ($isChallengeResponse) {
             $res[$this->options['passwordcol']] = md5($res[$this->options['passwordcol']]
                     .$this->_auth_obj->session['loginchallenege']);
             // UGLY cannot avoid without modifying verifyPassword
             if ($this->options['cryptType'] == 'md5') {
                 $res[$this->options['passwordcol']] = md5($res[$this->options['passwordcol']]);
             }
             //print " Hashed Password [{$res[$this->options['passwordcol']]}]<br/>\n";
+        }
             foreach ($res as $key => $value) {
                 if ($key == $this->options['passwordcol'] ||
                     $key == $this->options['usernamecol']) {
                     continue;
+                }
+                $this->log('Storing additional field: '.$key, AUTH_LOG_DEBUG);
                 // Use reference to the auth object if exists
                 // This is because the auth session variable can change so a
                 // static call to setAuthData does not make sence
                 $this->_auth_obj->setAuthData($key, $value);
+            }
             return true;
+        }
      * @return mixed
      * @access public
      */
     function listUsers()
+    {
+        $this->log('Auth_Container_DB::listUsers() called.', AUTH_LOG_DEBUG);
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
         $query = sprintf("SELECT %s FROM %s",
                          $sql_from,
                          $this->options['final_table']
+                         );
+        // check if there is an optional parameter db_where
+        if ($this->options['db_where'] != '') {
+            // there is one, so add it to the query
+            $query .= " WHERE ".$this->options['db_where'];
+        }
+        $this->log('Running SQL against DB: '.$query, AUTH_LOG_DEBUG);
                          );
         $res = $this->db->getAll($query, null, DB_FETCHMODE_ASSOC);
         if (DB::isError($res)) {
             return PEAR::raiseError($res->getMessage(), $res->getCode());
         } else {
             foreach ($res as $user) {
                 $user['username'] = $user[$this->options['usernamecol']];
                 $retVal[] = $user;
+            }
+        }
         $this->log('Found '.count($retVal).' users.', AUTH_LOG_DEBUG);
         return $retVal;
+    }
+     *
      * @return mixed True on success, otherwise error object
      */
     function addUser($username, $password, $additional = "")
+    {
+        $this->log('Auth_Container_DB::addUser() called.', AUTH_LOG_DEBUG);
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
         if (   isset($this->options['cryptType'])
             && $this->options['cryptType'] == 'none') {
             $cryptFunction = 'strval';
         } elseif (   isset($this->options['cryptType'])
                   && function_exists($this->options['cryptType'])) {
             $cryptFunction = $this->options['cryptType'];
         } else {
             $cryptFunction = 'md5';
                          $this->db->quoteSmart($username),
                          $this->db->quoteSmart($password),
                          $additional_value
                          );
+        $this->log('Running SQL against DB: '.$query, AUTH_LOG_DEBUG);
         $res = $this->query($query);
         if (DB::isError($res)) {
+     *
      * @return mixed True on success, otherwise error object
      */
     function removeUser($username)
+    {
+        $this->log('Auth_Container_DB::removeUser() called.', AUTH_LOG_DEBUG);
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
+        // check if there is an optional parameter db_where
+        if ($this->options['db_where'] != '') {
+            // there is one, so add it to the query
+            $where = " AND ".$this->options['db_where'];
+        } else {
+            $where = '';
+        }
-        $query = sprintf("DELETE FROM %s WHERE %s = %s",
+        $query = sprintf("DELETE FROM %s WHERE %s = %s %s",
                          $this->options['final_table'],
                          $this->options['final_usernamecol'],
+                         $this->db->quoteSmart($username),
-                         $this->db->quoteSmart($username)
+                         $where
+                         );
-                         );
+        $this->log('Running SQL against DB: '.$query, AUTH_LOG_DEBUG);
         $res = $this->query($query);
      * @param string Username
      * @param string The new password (plain text)
      */
     function changePassword($username, $password)
+    {
+        $this->log('Auth_Container_DB::changePassword() called.', AUTH_LOG_DEBUG);
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
         if (   isset($this->options['cryptType'])
             && $this->options['cryptType'] == 'none') {
             $cryptFunction = 'strval';
         } elseif (   isset($this->options['cryptType'])
                   && function_exists($this->options['cryptType'])) {
             $cryptFunction = $this->options['cryptType'];
         } else {
             $cryptFunction = 'md5';
+        }
+        $password = $cryptFunction($password);
+        // check if there is an optional parameter db_where
+        if ($this->options['db_where'] != '') {
+            // there is one, so add it to the query
+            $where = " AND ".$this->options['db_where'];
+        } else {
+            $where = '';
         $password = $cryptFunction($password);
-        $query = sprintf("UPDATE %s SET %s = %s WHERE %s = %s",
+        $query = sprintf("UPDATE %s SET %s = %s WHERE %s = %s %s",
                          $this->options['final_table'],
                          $this->options['final_passwordcol'],
+                         $this->db->quoteSmart($password),
-                         $this->db->quoteSmart($password),
+                         $this->options['final_usernamecol'],
+                         $this->db->quoteSmart($username),
+                         $where
-                         $this->options['final_usernamecol'],
+                         );
                          $this->db->quoteSmart($username)
-                         );
+        $this->log('Running SQL against DB: '.$query, AUTH_LOG_DEBUG);

Subversion Repositories Applications.papyrus

(root)//trunk/api/pear/Auth/Container/DB.php – Rev 1173 → 1713