WebSVN – Applications.papyrus – Diff – /trunk/api/pear/Auth/Container/MDB2.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: MDB2.php,v 1.1 2006-12-14 15:04:28 jp_milcent Exp $
+ * @version    CVS: $Id: MDB2.php,v 1.2 2007-11-19 15:11:00 jp_milcent Exp $
  * @link       http://pear.php.net/package/Auth
  * @since      File available since Release 1.3.0
  */
  * @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.1 $
+ * @version    Release: 1.5.4  File: $Revision: 1.2 $
  * @link       http://pear.php.net/package/Auth
  * @since      Class available since Release 1.3.0
  */
 class Auth_Container_MDB2 extends Auth_Container
+{
      * @param  mixed DSN string | array | mdb object
      * @return mixed  Object on error, otherwise bool
      */
     function _connect($dsn)
+    {
+        $this->log('Auth_Container_MDB2::_connect() called.', AUTH_LOG_DEBUG);
         if (is_string($dsn) || is_array($dsn)) {
             $this->db =& MDB2::connect($dsn, $this->options['db_options']);
         } elseif (is_subclass_of($dsn, 'MDB2_Driver_Common')) {
             $this->db = $dsn;
         } elseif (is_object($dsn) && MDB2::isError($dsn)) {
+        }
         if (MDB2::isError($this->db) || PEAR::isError($this->db)) {
             return PEAR::raiseError($this->db->getMessage(), $this->db->code);
         }
         if ($this->options['auto_quote']) {
             $this->options['final_table'] = $this->db->quoteIdentifier($this->options['table'], true);
             $this->options['final_usernamecol'] = $this->db->quoteIdentifier($this->options['usernamecol'], true);
             $this->options['final_passwordcol'] = $this->db->quoteIdentifier($this->options['passwordcol'], true);
         } else {
             $this->options['final_table'] = $this->options['table'];
             $this->options['final_usernamecol'] = $this->options['usernamecol'];
             $this->options['final_passwordcol'] = $this->options['passwordcol'];
         }
         return true;
+    }
      * @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_MDB2::query() called.', AUTH_LOG_DEBUG);
         $err = $this->_prepare();
         if ($err !== true) {
             return $err;
+        }
         return $this->db->exec($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_MDB2::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->quote($username, 'text')
                          );
+        // 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 MDB2: '.$query, AUTH_LOG_DEBUG);
         $res = $this->db->queryRow($query, null, MDB2_FETCHMODE_ASSOC);
         if (MDB2::isError($res) || PEAR::isError($res)) {
             return PEAR::raiseError($res->getMessage(), $res->getCode());
+        }
             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 true;
      * @return mixed array|PEAR_Error
      * @access public
      */
     function listUsers()
+    {
+        $this->log('Auth_Container_MDB2::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 MDB2: '.$query, AUTH_LOG_DEBUG);
         $res = $this->db->queryAll($query, null, MDB2_FETCHMODE_ASSOC);
         if (MDB2::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_MDB2::addUser() called.', AUTH_LOG_DEBUG);
         // Prepare for a database query
         $err = $this->_prepare();
         if ($err !== true) {
                          $this->db->quote($username, 'text'),
                          $this->db->quote($password, 'text'),
                          $additional_value
                          );
+        $this->log('Running SQL against MDB2: '.$query, AUTH_LOG_DEBUG);
         $res = $this->query($query);
         if (MDB2::isError($res)) {
+     *
      * @return mixed True on success, otherwise error object
      */
     function removeUser($username)
+    {
+        $this->log('Auth_Container_MDB2::removeUser() 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->quote($username, 'text')
                          );
+        // 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 MDB2: '.$query, AUTH_LOG_DEBUG);
         $res = $this->query($query);
         if (MDB2::isError($res)) {
      * @param string Username
      * @param string The new password (plain text)
      */
     function changePassword($username, $password)
+    {
+        $this->log('Auth_Container_MDB2::changePassword() called.', AUTH_LOG_DEBUG);
         // Prepare for a database query
         $err = $this->_prepare();
         if ($err !== true) {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
                          $this->db->quote($password, 'text'),
                          $this->options['final_usernamecol'],
                          $this->db->quote($username, 'text')
                          );
+        // 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 MDB2: '.$query, AUTH_LOG_DEBUG);
         $res = $this->query($query);
         if (MDB2::isError($res)) {

Subversion Repositories Applications.papyrus

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