Changeset 34 for trunk/phpgwapi/inc/adodb/pear/Auth

Timestamp:

06/29/07 15:17:46 (17 years ago)

Author:

niltonneto

Message:

Versão nova do ADODB (4.5 para 4.95)

File:

• trunk/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php (modified) (5 diffs)

trunk/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php

@@ -18 +18 @@
 // +----------------------------------------------------------------------+
 //
+// $Id$
 //
 
@@ -35 +36 @@
  * @author   Richard Tango-Lowy <richtl@arscognita.com>
  * @package  Auth
+ * @version  $Revision$
  */
 class Auth_Container_ADOdb extends Auth_Container
@@ -81 +83 @@
                 // Extract db_type from dsn string.
             $this->options['dsn'] = $dsn;
-            $this->_parseDsn( $dsn );
         }
     }
@@ -99 +100 @@
         if (is_string($dsn) || is_array($dsn)) {
                 if(!$this->db) {
-                        $this->db = &ADONewConnection($this->options['db_type']);
-                        
+                        $this->db = &ADONewConnection($dsn);
                         if( $err = ADODB_Pear_error() ) {
                                 return PEAR::raiseError($err);
                         }
-                }
-                
-                $dbconnected = $this->db->Connect( 
-                        $this->options['db_host'],
-                        $this->options['db_user'],
-                        $this->options['db_pass'],
-                        $this->options['db_name'] );
-                if( !$dbconnected ) {
-                        PEAR::raiseError('Unable to connect to database' );
                 }
                 
@@ -409 +400 @@
 
     // }}}
-
-        function _parseDsn( $dsn ) 
-        {
-                if( is_string( $dsn )) {
-                        preg_match( '/^(\w*):\/\/(\w*)(:(\w*))?@(\w*)\/(\w*)$/', $dsn, $match );
-                        
-                        $this->options['db_type'] = $match[1];
-                        $this->options['db_user'] = $match[2];
-                        $this->options['db_pass'] = $match[3];
-                        $this->options['db_host'] = $match[5];
-                        $this->options['db_name'] = $match[6];
-                }       
-        }
 }
 
 function showDbg( $string ) {
-        print "<P>$string</P>";
+        print "
+-- $string</P>";
 }
 function dump( $var, $str, $vardump = false ) {