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

  * the PHP License and are unable to obtain it through the web, please
  * send a note to license@php.net so we can mail you a copy immediately.
+ *
  * @category   Authentication
  * @package    Auth
  * @author     Lorenzo Alberton <l.alberton@quipo.it>
  * @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: MDB.php,v 1.2 2006-12-14 15:04:28 jp_milcent Exp $
+ * @version    CVS: $Id: MDB.php,v 1.3 2007-11-19 15:11:00 jp_milcent Exp $
  * @link       http://pear.php.net/package/Auth
  * @since      File available since Release 1.2.3
  */
  * @package    Auth
  * @author     Lorenzo Alberton <l.alberton@quipo.it>
  * @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
  * @since      Class available since Release 1.2.3
  */
 class Auth_Container_MDB extends Auth_Container
+{
      * @param  mixed DSN string | array | mdb object
      * @return mixed  Object on error, otherwise bool
      */
     function _connect($dsn)
+    {
+        $this->log('Auth_Container_MDB::_connect() called.', AUTH_LOG_DEBUG);
         if (is_string($dsn) || is_array($dsn)) {
             $this->db =& MDB::connect($dsn, $this->options['db_options']);
         } elseif (is_subclass_of($dsn, 'mdb_common')) {
             $this->db = $dsn;
         } elseif (is_object($dsn) && MDB::isError($dsn)) {
      * @return mixed  a MDB_result object or MDB_OK on success, a MDB
      *                or PEAR error on failure
      */
     function query($query)
+    {
+        $this->log('Auth_Container_MDB::query() called.', AUTH_LOG_DEBUG);
         $err = $this->_prepare();
         if ($err !== true) {
             return $err;
+        }
         return $this->db->query($query);
         $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_MDB::fetchData() called.', AUTH_LOG_DEBUG);
         // Prepare for a database query
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
                          $this->options['final_table'],
                          $this->options['final_usernamecol'],
                          $this->db->getTextValue($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'];
+        }
+        $this->log('Running SQL against MDB: '.$query, AUTH_LOG_DEBUG);
         $res = $this->db->getRow($query, null, null, null, MDB_FETCHMODE_ASSOC);
         if (MDB::isError($res) || PEAR::isError($res)) {
+        }
         // Perform trimming here before the hashing
         $password = trim($password, "\r\n");
         $res[$this->options['passwordcol']] = trim($res[$this->options['passwordcol']], "\r\n");
         // 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']]);
+            }
         }
         if ($this->verifyPassword($password,
                                   $res[$this->options['passwordcol']],
                                   $this->options['cryptType'])) {
             // Store additional field values in the session
             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 sense
                 $this->_auth_obj->setAuthData($key, $value);
      * @return mixed array|PEAR_Error
      * @access public
      */
     function listUsers()
+    {
+        $this->log('Auth_Container_MDB::listUsers() called.', AUTH_LOG_DEBUG);
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
             && strstr($this->options['db_fields'], '*')) {
             $sql_from = '*';
         } else {
             $sql_from = $this->options['final_usernamecol']
                 .', '.$this->options['final_passwordcol'];
             if (strlen($fields = $this->_quoteDBFields()) > 0) {
                 $sql_from .= ', '.$fields;
+            }
+        }
         $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 MDB: '.$query, AUTH_LOG_DEBUG);
         $res = $this->db->getAll($query, null, null, null, MDB_FETCHMODE_ASSOC);
         if (MDB::isError($res)) {
             return PEAR::raiseError($res->getMessage(), $res->getCode());
         } else {
             foreach ($res as $user) {
                 $user['username'] = $user[$this->options['usernamecol']];
+                $retVal[] = $user;
                 $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_MDB::addUser() called.', AUTH_LOG_DEBUG);
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
                          $this->db->getTextValue($username),
                          $this->db->getTextValue($password),
                          $additional_value
                          );
+        $this->log('Running SQL against MDB: '.$query, AUTH_LOG_DEBUG);
         $res = $this->query($query);
         if (MDB::isError($res)) {
+     *
      * @return mixed True on success, otherwise error object
      */
     function removeUser($username)
+    {
+        $this->log('Auth_Container_MDB::removeUser() called.', AUTH_LOG_DEBUG);
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
                          $this->options['final_table'],
                          $this->options['final_usernamecol'],
                          $this->db->getTextValue($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'];
+        }
+        $this->log('Running SQL against MDB: '.$query, AUTH_LOG_DEBUG);
         $res = $this->query($query);
         if (MDB::isError($res)) {
      * @param string Username
      * @param string The new password (plain text)
      */
     function changePassword($username, $password)
+    {
+        $this->log('Auth_Container_MDB::changePassword() called.', AUTH_LOG_DEBUG);
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
                          $this->db->getTextValue($password),
                          $this->options['final_usernamecol'],
                          $this->db->getTextValue($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'];
+        }
+        $this->log('Running SQL against MDB: '.$query, AUTH_LOG_DEBUG);
         $res = $this->query($query);
         if (MDB::isError($res)) {

Subversion Repositories Applications.papyrus

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