[Phpgroupware-cvs] api/db/adodb.inc.php, 1.1.2.2

[nomail]

Update of /api/db
Modified Files:
        Branch: proposal-branch
          adodb.inc.php

date: 2004/04/16 20:59:49;  author: seek3r;  state: Exp;  lines: +16 -12

Log Message:
bringing savannah cvs back up to date with what we were doing on our private 
cvs server. We will not be doing dev from this cvs tree
=====================================================================
No syntax errors detected in -
=====================================================================
Index: api/db/adodb.inc.php
diff -u api/db/adodb.inc.php:1.1.2.1 api/db/adodb.inc.php:1.1.2.2
--- api/db/adodb.inc.php:1.1.2.1        Sat Feb 28 06:34:11 2004
+++ api/db/adodb.inc.php        Fri Apr 16 20:59:49 2004
@@ -14,7 +14,7 @@
 /**
        \mainpage       
        
-        @version V4.20 22 Feb 2004 (c) 2000-2004 John Lim (address@hidden). 
All rights reserved.
+        @version V4.21 20 Mar 2004 (c) 2000-2004 John Lim (address@hidden). 
All rights reserved.
 
        Released under both BSD license and Lesser GPL library license. You can 
choose which license
        you prefer.
@@ -133,7 +133,7 @@
                $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
                
                if (!isset($ADODB_CACHE_DIR)) {
-                       $ADODB_CACHE_DIR = '/tmp';
+                       $ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? 
$_ENV['TMP'] : '/tmp';
                } else {
                        // do not accept url based paths, eg. http:/ or ftp:/
                        if (strpos($ADODB_CACHE_DIR,'://') !== false) 
@@ -147,7 +147,7 @@
                /**
                 * ADODB version as a string.
                 */
-               $ADODB_vers = 'V4.20 22 Feb 2004 (c) 2000-2004 John Lim 
(jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+               $ADODB_vers = 'V4.21 20 Mar 2004 (c) 2000-2004 John Lim 
(jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
        
                /**
                 * Determines whether recordset->RecordCount() is used. 
@@ -323,12 +323,16 @@
        */
        function outp($msg,$newline=true)
        {
-       global $HTTP_SERVER_VARS,$ADODB_FLUSH;
+       global $HTTP_SERVER_VARS,$ADODB_FLUSH,$ADODB_OUTP;
        
                if (defined('ADODB_OUTP')) {
                        $fn = ADODB_OUTP;
                        $fn($msg,$newline);
                        return;
+               } else if (isset($ADODB_OUTP)) {
+                       $fn = $ADODB_OUTP;
+                       $fn($msg,$newline);
+                       return;
                }
                
                if ($newline) $msg .= "<br>\n";
@@ -474,7 +478,7 @@
         *                      if the database does not support prepare.
         *
         */     
-       function PrepareSP($sql,$param=false)
+       function PrepareSP($sql,$param=true)
        {
                return $this->Prepare($sql,$param);
        }
@@ -2640,7 +2644,7 @@
        *
        * @return false or array containing the current record
        */
-       function FetchRow()
+       function &FetchRow()
        {
                if ($this->EOF) return false;
                $arr = $this->fields;
@@ -3269,12 +3273,12 @@
                 *                      unless paramter $colnames is used.
                 * @param fieldarr      holds an array of ADOFieldObject's.
                 */
-               function InitArrayFields($array,$fieldarr)
+               function InitArrayFields(&$array,&$fieldarr)
                {
-                       $this->_array = $array;
+                       $this->_array =& $array;
                        $this->_skiprow1= false;
                        if ($fieldarr) {
-                               $this->_fieldobjects = $fieldarr;
+                               $this->_fieldobjects =& $fieldarr;
                        } 
                        $this->Init();
                }
@@ -3412,7 +3416,7 @@
                if ($ok) return $db;
                
                $file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
-               if (file_exists($file)) ADOConnection::outp("Missing file: 
$file");
+               if (!file_exists($file)) ADOConnection::outp("Missing file: 
$file");
                else ADOConnection::outp("Syntax error in file: $file");
                return false;
        }
@@ -3437,7 +3441,7 @@
        function &ADONewConnection($db='')
        {
        GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
-               
+
                if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
                $errorfn = (defined('ADODB_ERROR_HANDLER')) ? 
ADODB_ERROR_HANDLER : false;
                
@@ -3448,7 +3452,7 @@
                                return $obj;
                        }
                }
-               
+
                if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
                if (empty($db)) $db = $ADODB_LASTDB;