[PHP-CVS] cvs: php4 /pear/DB oci8.php

[Stig Bakken]

ssb             Sun Feb 18 08:24:00 2001 EDT

  Modified files:              
    /php4/pear/DB       oci8.php 
  Log:
  * use "hostspec" dsn parameter as SID if specified
  
  
Index: php4/pear/DB/oci8.php
diff -u php4/pear/DB/oci8.php:1.17 php4/pear/DB/oci8.php:1.18
--- php4/pear/DB/oci8.php:1.17  Fri Feb 16 09:14:40 2001
+++ php4/pear/DB/oci8.php       Sun Feb 18 08:24:00 2001
@@ -83,10 +83,11 @@
                $pw = $dsninfo['password'];
                $hostspec = $dsninfo['hostspec'];
 
+        DB::assertExtension("oci8");
                $connect_function = $persistent ? 'OCIPLogon' : 'OCILogon';
-               if ($user && $pw && $hostspec) {
+               if ($hostspec) {
                        $conn = $connect_function($user,$pw,$hostspec);
-               } elseif ($user && $pw) {
+               } elseif ($user || $pw) {
                        $conn = $connect_function($user,$pw);
                } else {
                        $conn = false;
@@ -373,10 +374,10 @@
        function autoCommit($onoff = false)
     {
                if (!$onoff) {
-                       $this->autoCommit=0;
+                       $this->autoCommit = 0;
                }
                else {
-                       $this->autoCommit=1;
+                       $this->autoCommit = 1;
                }
                return DB_OK;
        }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]