Some updates to last version of ADOdb.

11 files changed, 2674 insertions, 2575 deletions

diff --git a/libraries/adodb/adodb-csvlib.inc.php b/libraries/adodb/adodb-csvlib.inc.php
index a031d985..1e34d39e 100644
--- a/libraries/adodb/adodb-csvlib.inc.php
+++ b/libraries/adodb/adodb-csvlib.inc.php
@@ -8,7 +8,7 @@ $ADODB_INCLUDED_CSV = 1;
 
 /* 
 
-  V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 
diff --git a/libraries/adodb/adodb-error.inc.php b/libraries/adodb/adodb-error.inc.php
index 8c959dc8..e60976b0 100755
--- a/libraries/adodb/adodb-error.inc.php
+++ b/libraries/adodb/adodb-error.inc.php
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 
diff --git a/libraries/adodb/adodb-iterator.inc.php b/libraries/adodb/adodb-iterator.inc.php
index 031c963d..d291e78a 100755
--- a/libraries/adodb/adodb-iterator.inc.php
+++ b/libraries/adodb/adodb-iterator.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
diff --git a/libraries/adodb/adodb-perf.inc.php b/libraries/adodb/adodb-perf.inc.php
index 3a1fa4d8..e00359fc 100755
--- a/libraries/adodb/adodb-perf.inc.php
+++ b/libraries/adodb/adodb-perf.inc.php
@@ -1,1053 +1,1068 @@
-<?php

-/* 

-V4.65 22 July 2005  (c) 2000-2005 John Lim ([email protected]). All rights reserved.

-  Released under both BSD license and Lesser GPL library license. 

-  Whenever there is any discrepancy between the two licenses, 

-  the BSD license will take precedence. See License.txt. 

-  Set tabs to 4 for best viewing.

-  

-  Latest version is available at http://adodb.sourceforge.net

-  

-  Library for basic performance monitoring and tuning.

-  

-  My apologies if you see code mixed with presentation. The presentation suits

-  my needs. If you want to separate code from presentation, be my guest. Patches

-  are welcome.

-  

-*/

-

-if (!defined(ADODB_DIR)) include_once(dirname(__FILE__).'/adodb.inc.php');

-include_once(ADODB_DIR.'/tohtml.inc.php');

-

-define( 'ADODB_OPT_HIGH', 2);

-define( 'ADODB_OPT_LOW', 1);

-

-// returns in K the memory of current process, or 0 if not known

-function adodb_getmem()

-{

-	if (function_exists('memory_get_usage'))

-		return (integer) ((memory_get_usage()+512)/1024);

-	

-	$pid = getmypid();

-	

-	if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0) {

-		$output = array();

-	

-		exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output); 

-		return substr($output[5], strpos($output[5], ':') + 1);

-	} 

-	

-	/* Hopefully UNIX */

-	exec("ps --pid $pid --no-headers -o%mem,size", $output);

-	if (sizeof($output) == 0) return 0;

-	

-	$memarr = explode(' ',$output[0]);

-	if (sizeof($memarr)>=2) return (integer) $memarr[1];

-	

-	return 0;

-}

-

-// avoids localization problems where , is used instead of .

-function adodb_round($n,$prec)

-{

-	return number_format($n, $prec, '.', '');

-}

-

-/* return microtime value as a float */

-function adodb_microtime()

-{

-	$t = microtime();

-	$t = explode(' ',$t);

-	return (float)$t[1]+ (float)$t[0];

-}

-

-/* sql code timing */

-function& adodb_log_sql(&$conn,$sql,$inputarr)

-{

-	

-    $perf_table = adodb_perf::table();

-	$conn->fnExecute = false;

-	$t0 = microtime();

-	$rs =& $conn->Execute($sql,$inputarr);

-	$t1 = microtime();

-

-	if (!empty($conn->_logsql)) {

-		$conn->_logsql = false; // disable logsql error simulation

-		$dbT = $conn->databaseType;

-		

-		$a0 = split(' ',$t0);

-		$a0 = (float)$a0[1]+(float)$a0[0];

-		

-		$a1 = split(' ',$t1);

-		$a1 = (float)$a1[1]+(float)$a1[0];

-		

-		$time = $a1 - $a0;

-	

-		if (!$rs) {

-			$errM = $conn->ErrorMsg();

-			$errN = $conn->ErrorNo();

-			$conn->lastInsID = 0;

-			$tracer = substr('ERROR: '.htmlspecialchars($errM),0,250);

-		} else {

-			$tracer = '';

-			$errM = '';

-			$errN = 0;

-			$dbg = $conn->debug;

-			$conn->debug = false;

-			if (!is_object($rs) || $rs->dataProvider == 'empty') 

-				$conn->_affected = $conn->affected_rows(true);

-			$conn->lastInsID = @$conn->Insert_ID();

-			$conn->debug = $dbg;

-		}

-		if (isset($_SERVER['HTTP_HOST'])) {

-			$tracer .= '<br>'.$_SERVER['HTTP_HOST'];

-			if (isset($_SERVER['PHP_SELF'])) $tracer .= $_SERVER['PHP_SELF'];

-		} else 

-			if (isset($_SERVER['PHP_SELF'])) $tracer .= '<br>'.$_SERVER['PHP_SELF'];

-		//$tracer .= (string) adodb_backtrace(false);

-		

-		$tracer = (string) substr($tracer,0,500);

-		

-		if (is_array($inputarr)) {

-			if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr);

-			else {

-				// Quote string parameters so we can see them in the

-				// performance stats. This helps spot disabled indexes.

-				$xar_params = $inputarr;

-				foreach ($xar_params as $xar_param_key => $xar_param) {

-					if (gettype($xar_param) == 'string')

-					$xar_params[$xar_param_key] = '"' . $xar_param . '"';

-				}

-				$params = implode(', ', $xar_params);

-				if (strlen($params) >= 3000) $params = substr($params, 0, 3000);

-			}

-		} else {

-			$params = '';

-		}

-		

-		if (is_array($sql)) $sql = $sql[0];

-		$arr = array('b'=>strlen($sql).'.'.crc32($sql),

-					'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6));

-		//var_dump($arr);

-		$saved = $conn->debug;

-		$conn->debug = 0;

-		

-		$d = $conn->sysTimeStamp;

-		if (empty($d)) $d = date("'Y-m-d H:i:s'");

-		if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {

-			$isql = "insert into $perf_table values($d,:b,:c,:d,:e,:f)";

-		} else if ($dbT == 'odbc_mssql' || $dbT == 'informix') {

-			$timer = $arr['f'];

-			if ($dbT == 'informix') $sql2 = substr($sql2,0,230);

-

-			$sql1 = $conn->qstr($arr['b']);

-			$sql2 = $conn->qstr($arr['c']);

-			$params = $conn->qstr($arr['d']);

-			$tracer = $conn->qstr($arr['e']);

-			

-			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($d,$sql1,$sql2,$params,$tracer,$timer)";

-			if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql);

-			$arr = false;

-		} else {

-			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)";

-		}

-

-		$ok = $conn->Execute($isql,$arr);

-		$conn->debug = $saved;

-		

-		if ($ok) {

-			$conn->_logsql = true; 

-		} else {

-			$err2 = $conn->ErrorMsg();

-			$conn->_logsql = true; // enable logsql error simulation

-			$perf =& NewPerfMonitor($conn);

-			if ($perf) {

-				if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr);

-			} else {

-				$ok = $conn->Execute("create table $perf_table (

-				created varchar(50),

-				sql0 varchar(250), 

-				sql1 varchar(4000),

-				params varchar(3000),

-				tracer varchar(500),

-				timer decimal(16,6))");

-			}

-			if (!$ok) {

-				ADOConnection::outp( "<p><b>LOGSQL Insert Failed</b>: $isql<br>$err2</p>");

-				$conn->_logsql = false;

-			}

-		}

-		$conn->_errorMsg = $errM;

-		$conn->_errorCode = $errN;

-	} 

-	$conn->fnExecute = 'adodb_log_sql';

-	return $rs;

-}

-

-	

-/*

-The settings data structure is an associative array that database parameter per element.

-

-Each database parameter element in the array is itself an array consisting of:

-

-0: category code, used to group related db parameters

-1: either

-	a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", 

-	b. array holding sql string and field to look for, e.g. array('show variables','table_cache'),

-	c. a string prefixed by =, then a PHP method of the class is invoked, 

-		e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue',

-2: description of the database parameter

-*/

-

-class adodb_perf {

-	var $conn;

-	var $color = '#F0F0F0';

-	var $table = '<table border=1 bgcolor=white>';

-	var $titles = '<tr><td><b>Parameter</b></td><td><b>Value</b></td><td><b>Description</b></td></tr>';

-	var $warnRatio = 90;

-	var $tablesSQL = false;

-	var $cliFormat = "%32s => %s \r\n";

-	var $sql1 = 'sql1';  // used for casting sql1 to text for mssql

-	var $explain = true;

-	var $helpurl = "<a href=http://phplens.com/adodb/reference.functions.fnexecute.and.fncacheexecute.properties.html#logsql>LogSQL help</a>";

-	var $createTableSQL = false;

-	var $maxLength = 2000;

-	

-    // Sets the tablename to be used            

-    function table($newtable = false)

-    {

-        static $_table;

-

-        if (!empty($newtable))  $_table = $newtable;

-		if (empty($_table)) $_table = 'adodb_logsql';

-        return $_table;

-    }

-

-	// returns array with info to calculate CPU Load

-	function _CPULoad()

-	{

-/*

-

-cpu  524152 2662 2515228 336057010

-cpu0 264339 1408 1257951 168025827

-cpu1 259813 1254 1257277 168031181

-page 622307 25475680

-swap 24 1891

-intr 890153570 868093576 6 0 4 4 0 6 1 2 0 0 0 124 0 8098760 2 13961053 0 0 0 0 0 0 0 0 0 0 0 0 0 16 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

-disk_io: (3,0):(3144904,54369,610378,3090535,50936192) (3,1):(3630212,54097,633016,3576115,50951320)

-ctxt 66155838

-btime 1062315585

-processes 69293

-

-*/

-		// Algorithm is taken from

-		// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp

-		if (strncmp(PHP_OS,'WIN',3)==0) {

-			if (PHP_VERSION == '5.0.0') return false;

-			if (PHP_VERSION == '5.0.1') return false;

-			if (PHP_VERSION == '5.0.2') return false;

-			if (PHP_VERSION == '5.0.3') return false;

-			if (PHP_VERSION == '4.3.10') return false; # see http://bugs.php.net/bug.php?id=31737

-			

-			@$c = new COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'");

-			if (!$c) return false;

-			

-			$info[0] = $c->PercentProcessorTime;

-			$info[1] = 0;

-			$info[2] = 0;

-			$info[3] = $c->TimeStamp_Sys100NS;

-			//print_r($info);

-			return $info;

-		}

-		

-		// Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com)

-		$statfile = '/proc/stat';

-		if (!file_exists($statfile)) return false;

-		

-		$fd = fopen($statfile,"r");

-		if (!$fd) return false;

-		

-		$statinfo = explode("\n",fgets($fd, 1024));

-		fclose($fd);

-		foreach($statinfo as $line) {

-			$info = explode(" ",$line);

-			if($info[0]=="cpu") {

-				array_shift($info);  // pop off "cpu"

-				if(!$info[0]) array_shift($info); // pop off blank space (if any)

-				return $info;

-			}

-		}

-		

-		return false;

-		

-	}

-	

-	/* NOT IMPLEMENTED */

-	function MemInfo()

-	{

-		/*

-

-        total:    used:    free:  shared: buffers:  cached:

-Mem:  1055289344 917299200 137990144        0 165437440 599773184

-Swap: 2146775040 11055104 2135719936

-MemTotal:      1030556 kB

-MemFree:        134756 kB

-MemShared:           0 kB

-Buffers:        161560 kB

-Cached:         581384 kB

-SwapCached:       4332 kB

-Active:         494468 kB

-Inact_dirty:    322856 kB

-Inact_clean:     24256 kB

-Inact_target:   168316 kB

-HighTotal:      131064 kB

-HighFree:         1024 kB

-LowTotal:       899492 kB

-LowFree:        133732 kB

-SwapTotal:     2096460 kB

-SwapFree:      2085664 kB

-Committed_AS:   348732 kB

-		*/

-	}

-	

-	

-	/*

-		Remember that this is client load, not db server load!

-	*/

-	var $_lastLoad;

-	function CPULoad()

-	{

-		$info = $this->_CPULoad();

-		if (!$info) return false;

-			

-		if (empty($this->_lastLoad)) {

-			sleep(1);

-			$this->_lastLoad = $info;

-			$info = $this->_CPULoad();

-		}

-		

-		$last = $this->_lastLoad;

-		$this->_lastLoad = $info;

-		

-		$d_user = $info[0] - $last[0];

-		$d_nice = $info[1] - $last[1];

-		$d_system = $info[2] - $last[2];

-		$d_idle = $info[3] - $last[3];

-		

-		//printf("Delta - User: %f  Nice: %f  System: %f  Idle: %f<br>",$d_user,$d_nice,$d_system,$d_idle);

-

-		if (strncmp(PHP_OS,'WIN',3)==0) {

-			if ($d_idle < 1) $d_idle = 1;

-			return 100*(1-$d_user/$d_idle);

-		}else {

-			$total=$d_user+$d_nice+$d_system+$d_idle;

-			if ($total<1) $total=1;

-			return 100*($d_user+$d_nice+$d_system)/$total; 

-		}

-	}

-	

-	function Tracer($sql)

-	{

-        $perf_table = adodb_perf::table();

-		$saveE = $this->conn->fnExecute;

-		$this->conn->fnExecute = false;

-		

-		global $ADODB_FETCH_MODE;

-		$save = $ADODB_FETCH_MODE;

-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;

-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);

-				

-		$sqlq = $this->conn->qstr($sql);

-		$arr = $this->conn->GetArray(

-"select count(*),tracer 

-	from $perf_table where sql1=$sqlq 

-	group by tracer

-	order by 1 desc");

-		$s = '';

-		if ($arr) {

-			$s .= '<h3>Scripts Affected</h3>';

-			foreach($arr as $k) {

-				$s .= sprintf("%4d",$k[0]).' &nbsp; '.strip_tags($k[1]).'<br>';

-			}

-		}

-		

-		if (isset($savem)) $this->conn->SetFetchMode($savem);

-		$ADODB_CACHE_MODE = $save;

-		$this->conn->fnExecute = $saveE;

-		return $s;

-	}

-

-	/* 

-		Explain Plan for $sql.

-		If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the 

-			actual sql.

-	*/

-	function Explain($sql,$partial=false)

-	{	

-		return false;

-	}

-	

-	function InvalidSQL($numsql = 10)

-	{

-	

-		if (isset($_GET['sql'])) return;

-		$s = '<h3>Invalid SQL</h3>';

-		$saveE = $this->conn->fnExecute;

-		$this->conn->fnExecute = false;

-        $perf_table = adodb_perf::table();

-		$rs =& $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql);

-		$this->conn->fnExecute = $saveE;

-		if ($rs) {

-			$s .= rs2html($rs,false,false,false,false);

-		} else

-			return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";

-		

-		return $s;

-	}

-

-	

-	/*

-		This script identifies the longest running SQL

-	*/	

-	function _SuspiciousSQL($numsql = 10)

-	{

-		global $ADODB_FETCH_MODE;

-		

-            $perf_table = adodb_perf::table();

-			$saveE = $this->conn->fnExecute;

-			$this->conn->fnExecute = false;

-			

-			if (isset($_GET['exps']) && isset($_GET['sql'])) {

-				$partial = !empty($_GET['part']);

-				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";

-			}

-			

-			if (isset($_GET['sql'])) return;

-			$sql1 = $this->sql1;

-			

-			$save = $ADODB_FETCH_MODE;

-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;

-			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);

-			//$this->conn->debug=1;

-			$rs =& $this->conn->SelectLimit(

-			"select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer

-				from $perf_table

-				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT')

-				and (tracer is null or tracer not like 'ERROR:%')

-				group by sql1

-				order by 1 desc",$numsql);

-			if (isset($savem)) $this->conn->SetFetchMode($savem);

-			$ADODB_FETCH_MODE = $save;

-			$this->conn->fnExecute = $saveE;

-			

-			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";

-			$s = "<h3>Suspicious SQL</h3>

-<font size=1>The following SQL have high average execution times</font><br>

-<table border=1 bgcolor=white><tr><td><b>Avg Time</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";

-			$max = $this->maxLength;

-			while (!$rs->EOF) {

-				$sql = $rs->fields[1];

-				$raw = urlencode($sql);

-				if (strlen($raw)>$max-100) {

-					$sql2 = substr($sql,0,$max-500);

-					$raw = urlencode($sql2).'&part='.crc32($sql);

-				}

-				$prefix = "<a target=sql".rand()." href=\"?hidem=1&exps=1&sql=".$raw."&x#explain\">";

-				$suffix = "</a>";

-				if ($this->explain == false || strlen($prefix)>$max) {

-					$suffix = ' ... <i>String too long for GET parameter: '.strlen($prefix).'</i>';

-					$prefix = '';

-				}

-				$s .= "<tr><td>".adodb_round($rs->fields[0],6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".

-					"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";

-				$rs->MoveNext();

-			}

-			return $s."</table>";

-		

-	}

-	

-	function CheckMemory()

-	{

-		return '';

-	}

-	

-	

-	function SuspiciousSQL($numsql=10)

-	{

-		return adodb_perf::_SuspiciousSQL($numsql);

-	}

-

-	function ExpensiveSQL($numsql=10)

-	{

-		return adodb_perf::_ExpensiveSQL($numsql);

-	}

-

-	

-	/*

-		This reports the percentage of load on the instance due to the most 

-		expensive few SQL statements. Tuning these statements can often 

-		make huge improvements in overall system performance. 

-	*/

-	function _ExpensiveSQL($numsql = 10)

-	{

-		global $ADODB_FETCH_MODE;

-		

-            $perf_table = adodb_perf::table();

-			$saveE = $this->conn->fnExecute;

-			$this->conn->fnExecute = false;

-			

-			if (isset($_GET['expe']) && isset($_GET['sql'])) {

-				$partial = !empty($_GET['part']);

-				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";

-			}

-			

-			if (isset($_GET['sql'])) return;

-			

-			$sql1 = $this->sql1;

-			$save = $ADODB_FETCH_MODE;

-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;

-			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);

-			

-			$rs =& $this->conn->SelectLimit(

-			"select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer

-				from $perf_table

-				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5))  not in ('DROP ','INSER','COMMI','CREAT')

-				and (tracer is null or tracer not like 'ERROR:%')

-				group by sql1

-				having count(*)>1

-				order by 1 desc",$numsql);

-			if (isset($savem)) $this->conn->SetFetchMode($savem);

-			$this->conn->fnExecute = $saveE;

-			$ADODB_FETCH_MODE = $save;

-			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";

-			$s = "<h3>Expensive SQL</h3>

-<font size=1>Tuning the following SQL could reduce the server load substantially</font><br>

-<table border=1 bgcolor=white><tr><td><b>Load</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";

-			$max = $this->maxLength;

-			while (!$rs->EOF) {

-				$sql = $rs->fields[1];

-				$raw = urlencode($sql);

-				if (strlen($raw)>$max-100) {

-					$sql2 = substr($sql,0,$max-500);

-					$raw = urlencode($sql2).'&part='.crc32($sql);

-				}

-				$prefix = "<a target=sqle".rand()." href=\"?hidem=1&expe=1&sql=".$raw."&x#explain\">";

-				$suffix = "</a>";

-				if($this->explain == false || strlen($prefix>$max)) {

-					$prefix = '';

-					$suffix = '';

-				}

-				$s .= "<tr><td>".adodb_round($rs->fields[0],6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".

-					"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";

-				$rs->MoveNext();

-			}

-			return $s."</table>";

-	}

-	

-	/*

-		Raw function to return parameter value from $settings.

-	*/

-	function DBParameter($param)

-	{

-		if (empty($this->settings[$param])) return false;

-		$sql = $this->settings[$param][1];

-		return $this->_DBParameter($sql);

-	}

-	

-	/*

-		Raw function returning array of poll paramters

-	*/

-	function &PollParameters()

-	{

-		$arr[0] = (float)$this->DBParameter('data cache hit ratio');

-		$arr[1] = (float)$this->DBParameter('data reads');

-		$arr[2] = (float)$this->DBParameter('data writes');

-		$arr[3] = (integer) $this->DBParameter('current connections');

-		return $arr;

-	}

-	

-	/*

-		Low-level Get Database Parameter

-	*/

-	function _DBParameter($sql)

-	{

-		$savelog = $this->conn->LogSQL(false);

-		if (is_array($sql)) {

-		global $ADODB_FETCH_MODE;

-		

-			$sql1 = $sql[0];

-			$key = $sql[1];

-			if (sizeof($sql)>2) $pos = $sql[2];

-			else $pos = 1;

-			if (sizeof($sql)>3) $coef = $sql[3];

-			else $coef = false;

-			$ret = false;

-			$save = $ADODB_FETCH_MODE;

-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;

-			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);

-			

-			$rs = $this->conn->Execute($sql1);

-			

-			if (isset($savem)) $this->SetFetchMode($savem);

-			$ADODB_FETCH_MODE = $save;

-			if ($rs) {

-				while (!$rs->EOF) {

-					$keyf = reset($rs->fields);

-					if (trim($keyf) == $key) {

-						$ret = $rs->fields[$pos];

-						if ($coef) $ret *= $coef;

-						break;

-					}

-					$rs->MoveNext();

-				}

-				$rs->Close();

-			}

-			$this->conn->LogSQL($savelog);

-			return $ret;

-		} else {

-			if (strncmp($sql,'=',1) == 0) {

-				$fn = substr($sql,1);

-				return $this->$fn();

-			}

-			$sql = str_replace('$DATABASE',$this->conn->database,$sql);

-			$ret = $this->conn->GetOne($sql);

-			$this->conn->LogSQL($savelog);

-			

-			return $ret;

-		}

-	}

-	

-	/*

-		Warn if cache ratio falls below threshold. Displayed in "Description" column.

-	*/

-	function WarnCacheRatio($val)

-	{

-		if ($val < $this->warnRatio) 

-			 return '<font color=red><b>Cache ratio should be at least '.$this->warnRatio.'%</b></font>';

-		else return '';

-	}

-	

-	/***********************************************************************************************/

-	//                                    HIGH LEVEL UI FUNCTIONS

-	/***********************************************************************************************/

-

-	

-	function UI($pollsecs=5)

-	{

-	

-    $perf_table = adodb_perf::table();

-	$conn = $this->conn;

-	

-	$app = $conn->host;

-	if ($conn->host && $conn->database) $app .= ', db=';

-	$app .= $conn->database;

-	

-	if ($app) $app .= ', ';

-	$savelog = $this->conn->LogSQL(false);	

-	$info = $conn->ServerInfo();

-	if (isset($_GET['clearsql'])) {

-		$this->conn->Execute("delete from $perf_table");

-	}

-	$this->conn->LogSQL($savelog);

-	

-	// magic quotes

-	

-	if (isset($_GET['sql']) && get_magic_quotes_gpc()) {

-		$_GET['sql'] = $_GET['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']);

-	}

-	

-	if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10;

-	else  $nsql = $_SESSION['ADODB_PERF_SQL'];

-	

-	$app .= $info['description'];

-	

-	

-	if (isset($_GET['do'])) $do = $_GET['do'];

-	else if (isset($_POST['do'])) $do = $_POST['do'];

-	 else if (isset($_GET['sql'])) $do = 'viewsql';

-	 else $do = 'stats';

-	 

-	if (isset($_GET['nsql'])) {

-		if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql'];

-	}

-	echo "<title>ADOdb Performance Monitor on $app</title><body bgcolor=white>";

-	if ($do == 'viewsql') $form = "<td><form># SQL:<input type=hidden value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input type=submit value=Go></td></form>";

-	else $form = "<td>&nbsp;</td>";

-	

-	$allowsql = !defined('ADODB_PERF_NO_RUN_SQL');

-	

-	if  (empty($_GET['hidem']))

-	echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>

-	<b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>

-	<a href=?do=stats><b>Performance Stats</b></a> &nbsp; <a href=?do=viewsql><b>View SQL</b></a>

-	 &nbsp; <a href=?do=tables><b>View Tables</b></a> &nbsp; <a href=?do=poll><b>Poll Stats</b></a>",

-	 $allowsql ? ' &nbsp; <a href=?do=dosql><b>Run SQL</b></a>' : '',

-	 "$form",

-	 "</tr></table>";

-

-	 

-	 	switch ($do) {

-		default:

-		case 'stats':

-			echo $this->HealthCheck();

-			//$this->conn->debug=1;

-			echo $this->CheckMemory();

-			break;

-		case 'poll':

-			echo "<iframe width=720 height=80% 

-				src=\"{$_SERVER['PHP_SELF']}?do=poll2&hidem=1\"></iframe>";

-			break;

-		case 'poll2':

-			echo "<pre>";

-			$this->Poll($pollsecs);

-			break;

-		

-		case 'dosql':

-			if (!$allowsql) break;

-			

-			$this->DoSQLForm();

-			break;

-		case 'viewsql':

-			if (empty($_GET['hidem']))

-				echo "&nbsp; <a href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";

-			echo($this->SuspiciousSQL($nsql));

-			echo($this->ExpensiveSQL($nsql));

-			echo($this->InvalidSQL($nsql));

-			break;

-		case 'tables': 

-			echo $this->Tables(); break;

-		}

-		global $ADODB_vers;

-		echo "<p><div align=center><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";

-	}

-	

-	/*

-		Runs in infinite loop, returning real-time statistics

-	*/

-	function Poll($secs=5)

-	{

-		$this->conn->fnExecute = false;

-		//$this->conn->debug=1;

-		if ($secs <= 1) $secs = 1;

-		echo "Accumulating statistics, every $secs seconds...\n";flush();

-		$arro =& $this->PollParameters();

-		$cnt = 0;

-		set_time_limit(0);

-		sleep($secs);

-		while (1) {

-

-			$arr =& $this->PollParameters();

-			

-			$hits   = sprintf('%2.2f',$arr[0]);

-			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);

-			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);

-			$sess = sprintf('%5d',$arr[3]);

-			

-			$load = $this->CPULoad();

-			if ($load !== false) {

-				$oslabel = 'WS-CPU%';

-				$osval = sprintf(" %2.1f  ",(float) $load);

-			}else {

-				$oslabel = '';

-				$osval = '';

-			}

-			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 

-			$cnt += 1;

-			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";

-			flush();

-			

-			if (connection_aborted()) return;

-			

-			sleep($secs);

-			$arro = $arr;

-		}

-	}

-	

-	/*

-		Returns basic health check in a command line interface

-	*/

-	function HealthCheckCLI()

-	{

-		return $this->HealthCheck(true);

-	}

-	

-		

-	/*

-		Returns basic health check as HTML

-	*/

-	function HealthCheck($cli=false)

-	{

-		$saveE = $this->conn->fnExecute;

-		$this->conn->fnExecute = false;	

-		if ($cli) $html = '';

-		else $html = $this->table.'<tr><td colspan=3><h3>'.$this->conn->databaseType.'</h3></td></tr>'.$this->titles;

-		

-		$oldc = false;

-		$bgc = '';

-		foreach($this->settings as $name => $arr) {

-			if ($arr === false) break;

-			

-			if (!is_string($name)) {

-				if ($cli) $html .= " -- $arr -- \n";

-				else $html .= "<tr bgcolor=$this->color><td colspan=3><i>$arr</i> &nbsp;</td></tr>";

-				continue;

-			}

-			

-			if (!is_array($arr)) break;

-			$category = $arr[0];

-			$how = $arr[1];

-			if (sizeof($arr)>2) $desc = $arr[2];

-			else $desc = ' &nbsp; ';

-			

-			

-			if ($category == 'HIDE') continue;

-			

-			$val = $this->_DBParameter($how);

-			

-			if ($desc && strncmp($desc,"=",1) === 0) {

-				$fn = substr($desc,1);

-				$desc = $this->$fn($val);

-			}

-			

-			if ($val === false) {

-				$m = $this->conn->ErrorMsg();

-				$val = "Error: $m"; 

-			} else {

-				if (is_numeric($val) && $val >= 256*1024) {

-					if ($val % (1024*1024) == 0) {

-						$val /= (1024*1024);

-						$val .= 'M';

-					} else if ($val % 1024 == 0) {

-						$val /= 1024;

-						$val .= 'K';

-					}

-					//$val = htmlspecialchars($val);

-				}

-			}

-			if ($category != $oldc) {

-				$oldc = $category;

-				//$bgc = ($bgc == ' bgcolor='.$this->color) ? ' bgcolor=white' : ' bgcolor='.$this->color;

-			}

-			if (strlen($desc)==0) $desc = '&nbsp;';

-			if (strlen($val)==0) $val = '&nbsp;';

-			if ($cli) {

-				$html  .= str_replace('&nbsp;','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));

-				

-			}else {

-				$html .= "<tr$bgc><td>".$name.'</td><td>'.$val.'</td><td>'.$desc."</td></tr>\n";

-			}

-		}

-		

-		if (!$cli) $html .= "</table>\n";

-		$this->conn->fnExecute = $saveE;

-			

-		return $html;	

-	}

-	

-	function Tables($orderby='1')

-	{

-		if (!$this->tablesSQL) return false;

-		

-		$savelog = $this->conn->LogSQL(false);

-		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);

-		$this->conn->LogSQL($savelog);

-		$html = rs2html($rs,false,false,false,false);

-		return $html;

-	}

-	

-

-	function CreateLogTable()

-	{

-		if (!$this->createTableSQL) return false;

-		

-		$savelog = $this->conn->LogSQL(false);

-		$ok = $this->conn->Execute($this->createTableSQL);

-		$this->conn->LogSQL($savelog);

-		return ($ok) ? true : false;

-	}

-	

-	function DoSQLForm()

-	{

-	

-		

-		$PHP_SELF = $_SERVER['PHP_SELF'];

-		$sql = isset($_REQUEST['sql']) ? $_REQUEST['sql'] : '';

-

-		if (isset($_SESSION['phplens_sqlrows'])) $rows = $_SESSION['phplens_sqlrows'];

-		else $rows = 3;

-		

-		if (isset($_REQUEST['SMALLER'])) {

-			$rows /= 2;

-			if ($rows < 3) $rows = 3;

-			$_SESSION['phplens_sqlrows'] = $rows;

-		}

-		if (isset($_REQUEST['BIGGER'])) {

-			$rows *= 2;

-			$_SESSION['phplens_sqlrows'] = $rows;

-		}

-		

-?>

-

-<form method="POST" action="<?php echo $PHP_SELF ?>">

-<table><tr>

-<td> Form size: <input type="submit" value=" &lt; " name="SMALLER"><input type="submit" value=" &gt; &gt; " name="BIGGER">

-</td>

-<td align=right>

-<input type="submit" value=" Run SQL Below " name="RUN"><input type=hidden name=do value=dosql>

-</td></tr>

-  <tr>

-  <td colspan=2><textarea rows=<?php print $rows; ?> name="sql" cols="80"><?php print htmlspecialchars($sql) ?></textarea>

-  </td>

-  </tr>

- </table>

-</form>

-

-<?php

-		if (!isset($_REQUEST['sql'])) return;

-		

-		$sql = $this->undomq(trim($sql));

-		if (substr($sql,strlen($sql)-1) === ';') {

-			$print = true;

-			$sqla = $this->SplitSQL($sql);

-		} else  {

-			$print = false;

-			$sqla = array($sql);

-		}

-		foreach($sqla as $sqls) {

-

-			if (!$sqls) continue;

-			

-			if ($print) {

-				print "<p>".htmlspecialchars($sqls)."</p>";

-				flush();

-			}

-			$savelog = $this->conn->LogSQL(false);

-			$rs = $this->conn->Execute($sqls);

-			$this->conn->LogSQL($savelog);

-			if ($rs && is_object($rs) && !$rs->EOF) {

-				rs2html($rs);

-				while ($rs->NextRecordSet()) {

-					print "<table width=98% bgcolor=#C0C0FF><tr><td>&nbsp;</td></tr></table>";

-					rs2html($rs);

-				}

-			} else {

-				$e1 = (integer) $this->conn->ErrorNo();

-				$e2 = $this->conn->ErrorMsg();

-				if (($e1) || ($e2)) {

-					if (empty($e1)) $e1 = '-1'; // postgresql fix

-					print ' &nbsp; '.$e1.': '.$e2;

-				} else {

-					print "<p>No Recordset returned<br></p>";

-				}

-			}

-		} // foreach

-	}

-	

-	function SplitSQL($sql)

-	{

-		$arr = explode(';',$sql);

-		return $arr;

-	}

-	

-	function undomq(&$m) 

-	{

-	if (get_magic_quotes_gpc()) {

-		// undo the damage

-		$m = str_replace('\\\\','\\',$m);

-		$m = str_replace('\"','"',$m);

-		$m = str_replace('\\\'','\'',$m);

-	}

-	return $m;

-}

-

-    

-   /************************************************************************/

-   

-    /** 

-     * Reorganise multiple table-indices/statistics/..

-     * OptimizeMode could be given by last Parameter

-     * 

-     * @example

-     *      <pre>

-     *          optimizeTables( 'tableA');

-     *      </pre>

-     *      <pre>

-     *          optimizeTables( 'tableA', 'tableB', 'tableC');

-     *      </pre>

-     *      <pre>

-     *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);

-     *      </pre>

-     * 

-     * @param string table name of the table to optimize

-     * @param int mode optimization-mode

-     *      <code>ADODB_OPT_HIGH</code> for full optimization 

-     *      <code>ADODB_OPT_LOW</code> for CPU-less optimization

-     *      Default is LOW <code>ADODB_OPT_LOW</code> 

-     * @author Markus Staab

-     * @return Returns <code>true</code> on success and <code>false</code> on error

-     */

-    function OptimizeTables()

-    {

-        $args = func_get_args();

-        $numArgs = func_num_args();

-        

-        if ( $numArgs == 0) return false;

-        

-        $mode = ADODB_OPT_LOW; 

-        $lastArg = $args[ $numArgs - 1];

-        if ( !is_string($lastArg)) {

-            $mode = $lastArg;

-            unset( $args[ $numArgs - 1]);

-        }

-        

-        foreach( $args as $table) {

-            $this->optimizeTable( $table, $mode);

-        }

-	}

-

-    /** 

-     * Reorganise the table-indices/statistics/.. depending on the given mode.

-     * Default Implementation throws an error.

-     * 

-     * @param string table name of the table to optimize

-     * @param int mode optimization-mode

-     *      <code>ADODB_OPT_HIGH</code> for full optimization 

-     *      <code>ADODB_OPT_LOW</code> for CPU-less optimization

-     *      Default is LOW <code>ADODB_OPT_LOW</code> 

-     * @author Markus Staab

-     * @return Returns <code>true</code> on success and <code>false</code> on error

-     */

-    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 

-    {

-        ADOConnection::outp( sprintf( "<p>%s: '%s' not implemented for driver '%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));

-        return false;

-    }

-    

-    /** 

-     * Reorganise current database.

-     * Default implementation loops over all <code>MetaTables()</code> and 

-     * optimize each using <code>optmizeTable()</code>

-     * 

-     * @author Markus Staab

-     * @return Returns <code>true</code> on success and <code>false</code> on error

-     */

-    function optimizeDatabase() 

-    {

-        $conn = $this->conn;

-        if ( !$conn) return false;

-        

-        $tables = $conn->MetaTables( 'TABLES');

-        if ( !$tables ) return false;

-

-        foreach( $tables as $table) {

-            if ( !$this->optimizeTable( $table)) {

-                return false;

-            }

-        }

-      

-        return true;

-    }

-    // end hack 

-}

-

+<?php
+/* 
+V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Library for basic performance monitoring and tuning.
+  
+  My apologies if you see code mixed with presentation. The presentation suits
+  my needs. If you want to separate code from presentation, be my guest. Patches
+  are welcome.
+  
+*/
+
+if (!defined('ADODB_DIR')) include_once(dirname(__FILE__).'/adodb.inc.php');
+include_once(ADODB_DIR.'/tohtml.inc.php');
+
+define( 'ADODB_OPT_HIGH', 2);
+define( 'ADODB_OPT_LOW', 1);
+
+// returns in K the memory of current process, or 0 if not known
+function adodb_getmem()
+{
+	if (function_exists('memory_get_usage'))
+		return (integer) ((memory_get_usage()+512)/1024);
+	
+	$pid = getmypid();
+	
+	if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0) {
+		$output = array();
+	
+		exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output); 
+		return substr($output[5], strpos($output[5], ':') + 1);
+	} 
+	
+	/* Hopefully UNIX */
+	exec("ps --pid $pid --no-headers -o%mem,size", $output);
+	if (sizeof($output) == 0) return 0;
+	
+	$memarr = explode(' ',$output[0]);
+	if (sizeof($memarr)>=2) return (integer) $memarr[1];
+	
+	return 0;
+}
+
+// avoids localization problems where , is used instead of .
+function adodb_round($n,$prec)
+{
+	return number_format($n, $prec, '.', '');
+}
+
+/* return microtime value as a float */
+function adodb_microtime()
+{
+	$t = microtime();
+	$t = explode(' ',$t);
+	return (float)$t[1]+ (float)$t[0];
+}
+
+/* sql code timing */
+function& adodb_log_sql(&$connx,$sql,$inputarr)
+{
+    $perf_table = adodb_perf::table();
+	$connx->fnExecute = false;
+	$t0 = microtime();
+	$rs =& $connx->Execute($sql,$inputarr);
+	$t1 = microtime();
+
+	if (!empty($connx->_logsql) && (empty($connx->_logsqlErrors) || !$rs)) {
+	global $ADODB_LOG_CONN;
+	
+		if (!empty($ADODB_LOG_CONN)) {
+			$conn = &$ADODB_LOG_CONN;
+			if ($conn->databaseType != $connx->databaseType)
+				$prefix = '/*dbx='.$connx->databaseType .'*/ ';
+			else
+				$prefix = '';
+		} else {
+			$conn =& $connx;
+			$prefix = '';
+		}
+		
+		$conn->_logsql = false; // disable logsql error simulation
+		$dbT = $conn->databaseType;
+		
+		$a0 = split(' ',$t0);
+		$a0 = (float)$a0[1]+(float)$a0[0];
+		
+		$a1 = split(' ',$t1);
+		$a1 = (float)$a1[1]+(float)$a1[0];
+		
+		$time = $a1 - $a0;
+	
+		if (!$rs) {
+			$errM = $connx->ErrorMsg();
+			$errN = $connx->ErrorNo();
+			$conn->lastInsID = 0;
+			$tracer = substr('ERROR: '.htmlspecialchars($errM),0,250);
+		} else {
+			$tracer = '';
+			$errM = '';
+			$errN = 0;
+			$dbg = $conn->debug;
+			$conn->debug = false;
+			if (!is_object($rs) || $rs->dataProvider == 'empty') 
+				$conn->_affected = $conn->affected_rows(true);
+			$conn->lastInsID = @$conn->Insert_ID();
+			$conn->debug = $dbg;
+		}
+		if (isset($_SERVER['HTTP_HOST'])) {
+			$tracer .= '<br>'.$_SERVER['HTTP_HOST'];
+			if (isset($_SERVER['PHP_SELF'])) $tracer .= $_SERVER['PHP_SELF'];
+		} else 
+			if (isset($_SERVER['PHP_SELF'])) $tracer .= '<br>'.$_SERVER['PHP_SELF'];
+		//$tracer .= (string) adodb_backtrace(false);
+		
+		$tracer = (string) substr($tracer,0,500);
+		
+		if (is_array($inputarr)) {
+			if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr);
+			else {
+				// Quote string parameters so we can see them in the
+				// performance stats. This helps spot disabled indexes.
+				$xar_params = $inputarr;
+				foreach ($xar_params as $xar_param_key => $xar_param) {
+					if (gettype($xar_param) == 'string')
+					$xar_params[$xar_param_key] = '"' . $xar_param . '"';
+				}
+				$params = implode(', ', $xar_params);
+				if (strlen($params) >= 3000) $params = substr($params, 0, 3000);
+			}
+		} else {
+			$params = '';
+		}
+		
+		if (is_array($sql)) $sql = $sql[0];
+		if ($prefix) $sql = $prefix.$sql;
+		$arr = array('b'=>strlen($sql).'.'.crc32($sql),
+					'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6));
+		//var_dump($arr);
+		$saved = $conn->debug;
+		$conn->debug = 0;
+		
+		$d = $conn->sysTimeStamp;
+		if (empty($d)) $d = date("'Y-m-d H:i:s'");
+		if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
+			$isql = "insert into $perf_table values($d,:b,:c,:d,:e,:f)";
+		} else if ($dbT == 'odbc_mssql' || $dbT == 'informix' || strncmp($dbT,'odbtp',4)==0) {
+			$timer = $arr['f'];
+			if ($dbT == 'informix') $sql2 = substr($sql2,0,230);
+
+			$sql1 = $conn->qstr($arr['b']);
+			$sql2 = $conn->qstr($arr['c']);
+			$params = $conn->qstr($arr['d']);
+			$tracer = $conn->qstr($arr['e']);
+			
+			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($d,$sql1,$sql2,$params,$tracer,$timer)";
+			if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql);
+			$arr = false;
+		} else {
+			if ($dbT == 'db2') $arr['f'] = (float) $arr['f'];
+			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)";
+		}
+		$ok = $conn->Execute($isql,$arr);
+		$conn->debug = $saved;
+		
+		if ($ok) {
+			$conn->_logsql = true; 
+		} else {
+			$err2 = $conn->ErrorMsg();
+			$conn->_logsql = true; // enable logsql error simulation
+			$perf =& NewPerfMonitor($conn);
+			if ($perf) {
+				if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr);
+			} else {
+				$ok = $conn->Execute("create table $perf_table (
+				created varchar(50),
+				sql0 varchar(250), 
+				sql1 varchar(4000),
+				params varchar(3000),
+				tracer varchar(500),
+				timer decimal(16,6))");
+			}
+			if (!$ok) {
+				ADOConnection::outp( "<p><b>LOGSQL Insert Failed</b>: $isql<br>$err2</p>");
+				$conn->_logsql = false;
+			}
+		}
+		$connx->_errorMsg = $errM;
+		$connx->_errorCode = $errN;
+	} 
+	$connx->fnExecute = 'adodb_log_sql';
+	return $rs;
+}
+
+	
+/*
+The settings data structure is an associative array that database parameter per element.
+
+Each database parameter element in the array is itself an array consisting of:
+
+0: category code, used to group related db parameters
+1: either
+	a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", 
+	b. array holding sql string and field to look for, e.g. array('show variables','table_cache'),
+	c. a string prefixed by =, then a PHP method of the class is invoked, 
+		e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue',
+2: description of the database parameter
+*/
+
+class adodb_perf {
+	var $conn;
+	var $color = '#F0F0F0';
+	var $table = '<table border=1 bgcolor=white>';
+	var $titles = '<tr><td><b>Parameter</b></td><td><b>Value</b></td><td><b>Description</b></td></tr>';
+	var $warnRatio = 90;
+	var $tablesSQL = false;
+	var $cliFormat = "%32s => %s \r\n";
+	var $sql1 = 'sql1';  // used for casting sql1 to text for mssql
+	var $explain = true;
+	var $helpurl = "<a href=http://phplens.com/adodb/reference.functions.fnexecute.and.fncacheexecute.properties.html#logsql>LogSQL help</a>";
+	var $createTableSQL = false;
+	var $maxLength = 2000;
+	
+    // Sets the tablename to be used            
+    function table($newtable = false)
+    {
+        static $_table;
+
+        if (!empty($newtable))  $_table = $newtable;
+		if (empty($_table)) $_table = 'adodb_logsql';
+        return $_table;
+    }
+
+	// returns array with info to calculate CPU Load
+	function _CPULoad()
+	{
+/*
+
+cpu  524152 2662 2515228 336057010
+cpu0 264339 1408 1257951 168025827
+cpu1 259813 1254 1257277 168031181
+page 622307 25475680
+swap 24 1891
+intr 890153570 868093576 6 0 4 4 0 6 1 2 0 0 0 124 0 8098760 2 13961053 0 0 0 0 0 0 0 0 0 0 0 0 0 16 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+disk_io: (3,0):(3144904,54369,610378,3090535,50936192) (3,1):(3630212,54097,633016,3576115,50951320)
+ctxt 66155838
+btime 1062315585
+processes 69293
+
+*/
+		// Algorithm is taken from
+		// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp
+		if (strncmp(PHP_OS,'WIN',3)==0) {
+			if (PHP_VERSION == '5.0.0') return false;
+			if (PHP_VERSION == '5.0.1') return false;
+			if (PHP_VERSION == '5.0.2') return false;
+			if (PHP_VERSION == '5.0.3') return false;
+			if (PHP_VERSION == '4.3.10') return false; # see http://bugs.php.net/bug.php?id=31737
+			
+			@$c = new COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'");
+			if (!$c) return false;
+			
+			$info[0] = $c->PercentProcessorTime;
+			$info[1] = 0;
+			$info[2] = 0;
+			$info[3] = $c->TimeStamp_Sys100NS;
+			//print_r($info);
+			return $info;
+		}
+		
+		// Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com)
+		$statfile = '/proc/stat';
+		if (!file_exists($statfile)) return false;
+		
+		$fd = fopen($statfile,"r");
+		if (!$fd) return false;
+		
+		$statinfo = explode("\n",fgets($fd, 1024));
+		fclose($fd);
+		foreach($statinfo as $line) {
+			$info = explode(" ",$line);
+			if($info[0]=="cpu") {
+				array_shift($info);  // pop off "cpu"
+				if(!$info[0]) array_shift($info); // pop off blank space (if any)
+				return $info;
+			}
+		}
+		
+		return false;
+		
+	}
+	
+	/* NOT IMPLEMENTED */
+	function MemInfo()
+	{
+		/*
+
+        total:    used:    free:  shared: buffers:  cached:
+Mem:  1055289344 917299200 137990144        0 165437440 599773184
+Swap: 2146775040 11055104 2135719936
+MemTotal:      1030556 kB
+MemFree:        134756 kB
+MemShared:           0 kB
+Buffers:        161560 kB
+Cached:         581384 kB
+SwapCached:       4332 kB
+Active:         494468 kB
+Inact_dirty:    322856 kB
+Inact_clean:     24256 kB
+Inact_target:   168316 kB
+HighTotal:      131064 kB
+HighFree:         1024 kB
+LowTotal:       899492 kB
+LowFree:        133732 kB
+SwapTotal:     2096460 kB
+SwapFree:      2085664 kB
+Committed_AS:   348732 kB
+		*/
+	}
+	
+	
+	/*
+		Remember that this is client load, not db server load!
+	*/
+	var $_lastLoad;
+	function CPULoad()
+	{
+		$info = $this->_CPULoad();
+		if (!$info) return false;
+			
+		if (empty($this->_lastLoad)) {
+			sleep(1);
+			$this->_lastLoad = $info;
+			$info = $this->_CPULoad();
+		}
+		
+		$last = $this->_lastLoad;
+		$this->_lastLoad = $info;
+		
+		$d_user = $info[0] - $last[0];
+		$d_nice = $info[1] - $last[1];
+		$d_system = $info[2] - $last[2];
+		$d_idle = $info[3] - $last[3];
+		
+		//printf("Delta - User: %f  Nice: %f  System: %f  Idle: %f<br>",$d_user,$d_nice,$d_system,$d_idle);
+
+		if (strncmp(PHP_OS,'WIN',3)==0) {
+			if ($d_idle < 1) $d_idle = 1;
+			return 100*(1-$d_user/$d_idle);
+		}else {
+			$total=$d_user+$d_nice+$d_system+$d_idle;
+			if ($total<1) $total=1;
+			return 100*($d_user+$d_nice+$d_system)/$total; 
+		}
+	}
+	
+	function Tracer($sql)
+	{
+        $perf_table = adodb_perf::table();
+		$saveE = $this->conn->fnExecute;
+		$this->conn->fnExecute = false;
+		
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+				
+		$sqlq = $this->conn->qstr($sql);
+		$arr = $this->conn->GetArray(
+"select count(*),tracer 
+	from $perf_table where sql1=$sqlq 
+	group by tracer
+	order by 1 desc");
+		$s = '';
+		if ($arr) {
+			$s .= '<h3>Scripts Affected</h3>';
+			foreach($arr as $k) {
+				$s .= sprintf("%4d",$k[0]).' &nbsp; '.strip_tags($k[1]).'<br>';
+			}
+		}
+		
+		if (isset($savem)) $this->conn->SetFetchMode($savem);
+		$ADODB_CACHE_MODE = $save;
+		$this->conn->fnExecute = $saveE;
+		return $s;
+	}
+
+	/* 
+		Explain Plan for $sql.
+		If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the 
+			actual sql.
+	*/
+	function Explain($sql,$partial=false)
+	{	
+		return false;
+	}
+	
+	function InvalidSQL($numsql = 10)
+	{
+	
+		if (isset($_GET['sql'])) return;
+		$s = '<h3>Invalid SQL</h3>';
+		$saveE = $this->conn->fnExecute;
+		$this->conn->fnExecute = false;
+        $perf_table = adodb_perf::table();
+		$rs =& $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
+		$this->conn->fnExecute = $saveE;
+		if ($rs) {
+			$s .= rs2html($rs,false,false,false,false);
+		} else
+			return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
+		
+		return $s;
+	}
+
+	
+	/*
+		This script identifies the longest running SQL
+	*/	
+	function _SuspiciousSQL($numsql = 10)
+	{
+		global $ADODB_FETCH_MODE;
+		
+            $perf_table = adodb_perf::table();
+			$saveE = $this->conn->fnExecute;
+			$this->conn->fnExecute = false;
+			
+			if (isset($_GET['exps']) && isset($_GET['sql'])) {
+				$partial = !empty($_GET['part']);
+				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
+			}
+			
+			if (isset($_GET['sql'])) return;
+			$sql1 = $this->sql1;
+			
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+			//$this->conn->debug=1;
+			$rs =& $this->conn->SelectLimit(
+			"select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
+				from $perf_table
+				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT')
+				and (tracer is null or tracer not like 'ERROR:%')
+				group by sql1
+				order by 1 desc",$numsql);
+			if (isset($savem)) $this->conn->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			$this->conn->fnExecute = $saveE;
+			
+			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
+			$s = "<h3>Suspicious SQL</h3>
+<font size=1>The following SQL have high average execution times</font><br>
+<table border=1 bgcolor=white><tr><td><b>Avg Time</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
+			$max = $this->maxLength;
+			while (!$rs->EOF) {
+				$sql = $rs->fields[1];
+				$raw = urlencode($sql);
+				if (strlen($raw)>$max-100) {
+					$sql2 = substr($sql,0,$max-500);
+					$raw = urlencode($sql2).'&part='.crc32($sql);
+				}
+				$prefix = "<a target=sql".rand()." href=\"?hidem=1&exps=1&sql=".$raw."&x#explain\">";
+				$suffix = "</a>";
+				if ($this->explain == false || strlen($prefix)>$max) {
+					$suffix = ' ... <i>String too long for GET parameter: '.strlen($prefix).'</i>';
+					$prefix = '';
+				}
+				$s .= "<tr><td>".adodb_round($rs->fields[0],6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
+					"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
+				$rs->MoveNext();
+			}
+			return $s."</table>";
+		
+	}
+	
+	function CheckMemory()
+	{
+		return '';
+	}
+	
+	
+	function SuspiciousSQL($numsql=10)
+	{
+		return adodb_perf::_SuspiciousSQL($numsql);
+	}
+
+	function ExpensiveSQL($numsql=10)
+	{
+		return adodb_perf::_ExpensiveSQL($numsql);
+	}
+
+	
+	/*
+		This reports the percentage of load on the instance due to the most 
+		expensive few SQL statements. Tuning these statements can often 
+		make huge improvements in overall system performance. 
+	*/
+	function _ExpensiveSQL($numsql = 10)
+	{
+		global $ADODB_FETCH_MODE;
+		
+            $perf_table = adodb_perf::table();
+			$saveE = $this->conn->fnExecute;
+			$this->conn->fnExecute = false;
+			
+			if (isset($_GET['expe']) && isset($_GET['sql'])) {
+				$partial = !empty($_GET['part']);
+				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
+			}
+			
+			if (isset($_GET['sql'])) return;
+			
+			$sql1 = $this->sql1;
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+			
+			$rs =& $this->conn->SelectLimit(
+			"select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
+				from $perf_table
+				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5))  not in ('DROP ','INSER','COMMI','CREAT')
+				and (tracer is null or tracer not like 'ERROR:%')
+				group by sql1
+				having count(*)>1
+				order by 1 desc",$numsql);
+			if (isset($savem)) $this->conn->SetFetchMode($savem);
+			$this->conn->fnExecute = $saveE;
+			$ADODB_FETCH_MODE = $save;
+			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
+			$s = "<h3>Expensive SQL</h3>
+<font size=1>Tuning the following SQL could reduce the server load substantially</font><br>
+<table border=1 bgcolor=white><tr><td><b>Load</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
+			$max = $this->maxLength;
+			while (!$rs->EOF) {
+				$sql = $rs->fields[1];
+				$raw = urlencode($sql);
+				if (strlen($raw)>$max-100) {
+					$sql2 = substr($sql,0,$max-500);
+					$raw = urlencode($sql2).'&part='.crc32($sql);
+				}
+				$prefix = "<a target=sqle".rand()." href=\"?hidem=1&expe=1&sql=".$raw."&x#explain\">";
+				$suffix = "</a>";
+				if($this->explain == false || strlen($prefix>$max)) {
+					$prefix = '';
+					$suffix = '';
+				}
+				$s .= "<tr><td>".adodb_round($rs->fields[0],6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
+					"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
+				$rs->MoveNext();
+			}
+			return $s."</table>";
+	}
+	
+	/*
+		Raw function to return parameter value from $settings.
+	*/
+	function DBParameter($param)
+	{
+		if (empty($this->settings[$param])) return false;
+		$sql = $this->settings[$param][1];
+		return $this->_DBParameter($sql);
+	}
+	
+	/*
+		Raw function returning array of poll paramters
+	*/
+	function &PollParameters()
+	{
+		$arr[0] = (float)$this->DBParameter('data cache hit ratio');
+		$arr[1] = (float)$this->DBParameter('data reads');
+		$arr[2] = (float)$this->DBParameter('data writes');
+		$arr[3] = (integer) $this->DBParameter('current connections');
+		return $arr;
+	}
+	
+	/*
+		Low-level Get Database Parameter
+	*/
+	function _DBParameter($sql)
+	{
+		$savelog = $this->conn->LogSQL(false);
+		if (is_array($sql)) {
+		global $ADODB_FETCH_MODE;
+		
+			$sql1 = $sql[0];
+			$key = $sql[1];
+			if (sizeof($sql)>2) $pos = $sql[2];
+			else $pos = 1;
+			if (sizeof($sql)>3) $coef = $sql[3];
+			else $coef = false;
+			$ret = false;
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+			
+			$rs = $this->conn->Execute($sql1);
+			
+			if (isset($savem)) $this->conn->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			if ($rs) {
+				while (!$rs->EOF) {
+					$keyf = reset($rs->fields);
+					if (trim($keyf) == $key) {
+						$ret = $rs->fields[$pos];
+						if ($coef) $ret *= $coef;
+						break;
+					}
+					$rs->MoveNext();
+				}
+				$rs->Close();
+			}
+			$this->conn->LogSQL($savelog);
+			return $ret;
+		} else {
+			if (strncmp($sql,'=',1) == 0) {
+				$fn = substr($sql,1);
+				return $this->$fn();
+			}
+			$sql = str_replace('$DATABASE',$this->conn->database,$sql);
+			$ret = $this->conn->GetOne($sql);
+			$this->conn->LogSQL($savelog);
+			
+			return $ret;
+		}
+	}
+	
+	/*
+		Warn if cache ratio falls below threshold. Displayed in "Description" column.
+	*/
+	function WarnCacheRatio($val)
+	{
+		if ($val < $this->warnRatio) 
+			 return '<font color=red><b>Cache ratio should be at least '.$this->warnRatio.'%</b></font>';
+		else return '';
+	}
+	
+	/***********************************************************************************************/
+	//                                    HIGH LEVEL UI FUNCTIONS
+	/***********************************************************************************************/
+
+	
+	function UI($pollsecs=5)
+	{
+	
+    $perf_table = adodb_perf::table();
+	$conn = $this->conn;
+	
+	$app = $conn->host;
+	if ($conn->host && $conn->database) $app .= ', db=';
+	$app .= $conn->database;
+	
+	if ($app) $app .= ', ';
+	$savelog = $this->conn->LogSQL(false);	
+	$info = $conn->ServerInfo();
+	if (isset($_GET['clearsql'])) {
+		$this->conn->Execute("delete from $perf_table");
+	}
+	$this->conn->LogSQL($savelog);
+	
+	// magic quotes
+	
+	if (isset($_GET['sql']) && get_magic_quotes_gpc()) {
+		$_GET['sql'] = $_GET['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']);
+	}
+	
+	if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10;
+	else  $nsql = $_SESSION['ADODB_PERF_SQL'];
+	
+	$app .= $info['description'];
+	
+	
+	if (isset($_GET['do'])) $do = $_GET['do'];
+	else if (isset($_POST['do'])) $do = $_POST['do'];
+	 else if (isset($_GET['sql'])) $do = 'viewsql';
+	 else $do = 'stats';
+	 
+	if (isset($_GET['nsql'])) {
+		if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql'];
+	}
+	echo "<title>ADOdb Performance Monitor on $app</title><body bgcolor=white>";
+	if ($do == 'viewsql') $form = "<td><form># SQL:<input type=hidden value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input type=submit value=Go></td></form>";
+	else $form = "<td>&nbsp;</td>";
+	
+	$allowsql = !defined('ADODB_PERF_NO_RUN_SQL');
+	
+	if  (empty($_GET['hidem']))
+	echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
+	<b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
+	<a href=?do=stats><b>Performance Stats</b></a> &nbsp; <a href=?do=viewsql><b>View SQL</b></a>
+	 &nbsp; <a href=?do=tables><b>View Tables</b></a> &nbsp; <a href=?do=poll><b>Poll Stats</b></a>",
+	 $allowsql ? ' &nbsp; <a href=?do=dosql><b>Run SQL</b></a>' : '',
+	 "$form",
+	 "</tr></table>";
+
+	 
+	 	switch ($do) {
+		default:
+		case 'stats':
+			echo $this->HealthCheck();
+			//$this->conn->debug=1;
+			echo $this->CheckMemory();
+			break;
+		case 'poll':
+			echo "<iframe width=720 height=80% 
+				src=\"{$_SERVER['PHP_SELF']}?do=poll2&hidem=1\"></iframe>";
+			break;
+		case 'poll2':
+			echo "<pre>";
+			$this->Poll($pollsecs);
+			break;
+		
+		case 'dosql':
+			if (!$allowsql) break;
+			
+			$this->DoSQLForm();
+			break;
+		case 'viewsql':
+			if (empty($_GET['hidem']))
+				echo "&nbsp; <a href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";
+			echo($this->SuspiciousSQL($nsql));
+			echo($this->ExpensiveSQL($nsql));
+			echo($this->InvalidSQL($nsql));
+			break;
+		case 'tables': 
+			echo $this->Tables(); break;
+		}
+		global $ADODB_vers;
+		echo "<p><div align=center><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
+	}
+	
+	/*
+		Runs in infinite loop, returning real-time statistics
+	*/
+	function Poll($secs=5)
+	{
+		$this->conn->fnExecute = false;
+		//$this->conn->debug=1;
+		if ($secs <= 1) $secs = 1;
+		echo "Accumulating statistics, every $secs seconds...\n";flush();
+		$arro =& $this->PollParameters();
+		$cnt = 0;
+		set_time_limit(0);
+		sleep($secs);
+		while (1) {
+
+			$arr =& $this->PollParameters();
+			
+			$hits   = sprintf('%2.2f',$arr[0]);
+			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
+			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
+			$sess = sprintf('%5d',$arr[3]);
+			
+			$load = $this->CPULoad();
+			if ($load !== false) {
+				$oslabel = 'WS-CPU%';
+				$osval = sprintf(" %2.1f  ",(float) $load);
+			}else {
+				$oslabel = '';
+				$osval = '';
+			}
+			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 
+			$cnt += 1;
+			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";
+			flush();
+			
+			if (connection_aborted()) return;
+			
+			sleep($secs);
+			$arro = $arr;
+		}
+	}
+	
+	/*
+		Returns basic health check in a command line interface
+	*/
+	function HealthCheckCLI()
+	{
+		return $this->HealthCheck(true);
+	}
+	
+		
+	/*
+		Returns basic health check as HTML
+	*/
+	function HealthCheck($cli=false)
+	{
+		$saveE = $this->conn->fnExecute;
+		$this->conn->fnExecute = false;	
+		if ($cli) $html = '';
+		else $html = $this->table.'<tr><td colspan=3><h3>'.$this->conn->databaseType.'</h3></td></tr>'.$this->titles;
+		
+		$oldc = false;
+		$bgc = '';
+		foreach($this->settings as $name => $arr) {
+			if ($arr === false) break;
+			
+			if (!is_string($name)) {
+				if ($cli) $html .= " -- $arr -- \n";
+				else $html .= "<tr bgcolor=$this->color><td colspan=3><i>$arr</i> &nbsp;</td></tr>";
+				continue;
+			}
+			
+			if (!is_array($arr)) break;
+			$category = $arr[0];
+			$how = $arr[1];
+			if (sizeof($arr)>2) $desc = $arr[2];
+			else $desc = ' &nbsp; ';
+			
+			
+			if ($category == 'HIDE') continue;
+			
+			$val = $this->_DBParameter($how);
+			
+			if ($desc && strncmp($desc,"=",1) === 0) {
+				$fn = substr($desc,1);
+				$desc = $this->$fn($val);
+			}
+			
+			if ($val === false) {
+				$m = $this->conn->ErrorMsg();
+				$val = "Error: $m"; 
+			} else {
+				if (is_numeric($val) && $val >= 256*1024) {
+					if ($val % (1024*1024) == 0) {
+						$val /= (1024*1024);
+						$val .= 'M';
+					} else if ($val % 1024 == 0) {
+						$val /= 1024;
+						$val .= 'K';
+					}
+					//$val = htmlspecialchars($val);
+				}
+			}
+			if ($category != $oldc) {
+				$oldc = $category;
+				//$bgc = ($bgc == ' bgcolor='.$this->color) ? ' bgcolor=white' : ' bgcolor='.$this->color;
+			}
+			if (strlen($desc)==0) $desc = '&nbsp;';
+			if (strlen($val)==0) $val = '&nbsp;';
+			if ($cli) {
+				$html  .= str_replace('&nbsp;','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
+				
+			}else {
+				$html .= "<tr$bgc><td>".$name.'</td><td>'.$val.'</td><td>'.$desc."</td></tr>\n";
+			}
+		}
+		
+		if (!$cli) $html .= "</table>\n";
+		$this->conn->fnExecute = $saveE;
+			
+		return $html;	
+	}
+	
+	function Tables($orderby='1')
+	{
+		if (!$this->tablesSQL) return false;
+		
+		$savelog = $this->conn->LogSQL(false);
+		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
+		$this->conn->LogSQL($savelog);
+		$html = rs2html($rs,false,false,false,false);
+		return $html;
+	}
+	
+
+	function CreateLogTable()
+	{
+		if (!$this->createTableSQL) return false;
+		
+		$table = $this->table();
+		$sql = str_replace('adodb_logsql',$table,$this->createTableSQL);
+		$savelog = $this->conn->LogSQL(false);
+		$ok = $this->conn->Execute($sql);
+		$this->conn->LogSQL($savelog);
+		return ($ok) ? true : false;
+	}
+	
+	function DoSQLForm()
+	{
+	
+		
+		$PHP_SELF = $_SERVER['PHP_SELF'];
+		$sql = isset($_REQUEST['sql']) ? $_REQUEST['sql'] : '';
+
+		if (isset($_SESSION['phplens_sqlrows'])) $rows = $_SESSION['phplens_sqlrows'];
+		else $rows = 3;
+		
+		if (isset($_REQUEST['SMALLER'])) {
+			$rows /= 2;
+			if ($rows < 3) $rows = 3;
+			$_SESSION['phplens_sqlrows'] = $rows;
+		}
+		if (isset($_REQUEST['BIGGER'])) {
+			$rows *= 2;
+			$_SESSION['phplens_sqlrows'] = $rows;
+		}
+		
+?>
+
+<form method="POST" action="<?php echo $PHP_SELF ?>">
+<table><tr>
+<td> Form size: <input type="submit" value=" &lt; " name="SMALLER"><input type="submit" value=" &gt; &gt; " name="BIGGER">
+</td>
+<td align=right>
+<input type="submit" value=" Run SQL Below " name="RUN"><input type=hidden name=do value=dosql>
+</td></tr>
+  <tr>
+  <td colspan=2><textarea rows=<?php print $rows; ?> name="sql" cols="80"><?php print htmlspecialchars($sql) ?></textarea>
+  </td>
+  </tr>
+ </table>
+</form>
+
+<?php
+		if (!isset($_REQUEST['sql'])) return;
+		
+		$sql = $this->undomq(trim($sql));
+		if (substr($sql,strlen($sql)-1) === ';') {
+			$print = true;
+			$sqla = $this->SplitSQL($sql);
+		} else  {
+			$print = false;
+			$sqla = array($sql);
+		}
+		foreach($sqla as $sqls) {
+
+			if (!$sqls) continue;
+			
+			if ($print) {
+				print "<p>".htmlspecialchars($sqls)."</p>";
+				flush();
+			}
+			$savelog = $this->conn->LogSQL(false);
+			$rs = $this->conn->Execute($sqls);
+			$this->conn->LogSQL($savelog);
+			if ($rs && is_object($rs) && !$rs->EOF) {
+				rs2html($rs);
+				while ($rs->NextRecordSet()) {
+					print "<table width=98% bgcolor=#C0C0FF><tr><td>&nbsp;</td></tr></table>";
+					rs2html($rs);
+				}
+			} else {
+				$e1 = (integer) $this->conn->ErrorNo();
+				$e2 = $this->conn->ErrorMsg();
+				if (($e1) || ($e2)) {
+					if (empty($e1)) $e1 = '-1'; // postgresql fix
+					print ' &nbsp; '.$e1.': '.$e2;
+				} else {
+					print "<p>No Recordset returned<br></p>";
+				}
+			}
+		} // foreach
+	}
+	
+	function SplitSQL($sql)
+	{
+		$arr = explode(';',$sql);
+		return $arr;
+	}
+	
+	function undomq($m) 
+	{
+	if (get_magic_quotes_gpc()) {
+		// undo the damage
+		$m = str_replace('\\\\','\\',$m);
+		$m = str_replace('\"','"',$m);
+		$m = str_replace('\\\'','\'',$m);
+	}
+	return $m;
+}
+
+    
+   /************************************************************************/
+   
+    /** 
+     * Reorganise multiple table-indices/statistics/..
+     * OptimizeMode could be given by last Parameter
+     * 
+     * @example
+     *      <pre>
+     *          optimizeTables( 'tableA');
+     *      </pre>
+     *      <pre>
+     *          optimizeTables( 'tableA', 'tableB', 'tableC');
+     *      </pre>
+     *      <pre>
+     *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
+     *      </pre>
+     * 
+     * @param string table name of the table to optimize
+     * @param int mode optimization-mode
+     *      <code>ADODB_OPT_HIGH</code> for full optimization 
+     *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
+     *      Default is LOW <code>ADODB_OPT_LOW</code> 
+     * @author Markus Staab
+     * @return Returns <code>true</code> on success and <code>false</code> on error
+     */
+    function OptimizeTables()
+    {
+        $args = func_get_args();
+        $numArgs = func_num_args();
+        
+        if ( $numArgs == 0) return false;
+        
+        $mode = ADODB_OPT_LOW; 
+        $lastArg = $args[ $numArgs - 1];
+        if ( !is_string($lastArg)) {
+            $mode = $lastArg;
+            unset( $args[ $numArgs - 1]);
+        }
+        
+        foreach( $args as $table) {
+            $this->optimizeTable( $table, $mode);
+        }
+	}
+
+    /** 
+     * Reorganise the table-indices/statistics/.. depending on the given mode.
+     * Default Implementation throws an error.
+     * 
+     * @param string table name of the table to optimize
+     * @param int mode optimization-mode
+     *      <code>ADODB_OPT_HIGH</code> for full optimization 
+     *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
+     *      Default is LOW <code>ADODB_OPT_LOW</code> 
+     * @author Markus Staab
+     * @return Returns <code>true</code> on success and <code>false</code> on error
+     */
+    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
+    {
+        ADOConnection::outp( sprintf( "<p>%s: '%s' not implemented for driver '%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));
+        return false;
+    }
+    
+    /** 
+     * Reorganise current database.
+     * Default implementation loops over all <code>MetaTables()</code> and 
+     * optimize each using <code>optmizeTable()</code>
+     * 
+     * @author Markus Staab
+     * @return Returns <code>true</code> on success and <code>false</code> on error
+     */
+    function optimizeDatabase() 
+    {
+        $conn = $this->conn;
+        if ( !$conn) return false;
+        
+        $tables = $conn->MetaTables( 'TABLES');
+        if ( !$tables ) return false;
+
+        foreach( $tables as $table) {
+            if ( !$this->optimizeTable( $table)) {
+                return false;
+            }
+        }
+      
+        return true;
+    }
+    // end hack 
+}
+
 ?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-php4.inc.php b/libraries/adodb/adodb-php4.inc.php
index a23dc170..99fda176 100755
--- a/libraries/adodb/adodb-php4.inc.php
+++ b/libraries/adodb/adodb-php4.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
diff --git a/libraries/adodb/adodb-time.inc.php b/libraries/adodb/adodb-time.inc.php
index 43854090..51f69f76 100644
--- a/libraries/adodb/adodb-time.inc.php
+++ b/libraries/adodb/adodb-time.inc.php
@@ -1,1287 +1,1337 @@
-<?php

-/**

-ADOdb Date Library, part of the ADOdb abstraction library

-Download: http://php.weblogs.com/adodb_date_time_library

-

-PHP native date functions use integer timestamps for computations.

-Because of this, dates are restricted to the years 1901-2038 on Unix 

-and 1970-2038 on Windows due to integer overflow for dates beyond 

-those years. This library overcomes these limitations by replacing the 

-native function's signed integers (normally 32-bits) with PHP floating 

-point numbers (normally 64-bits).

-

-Dates from 100 A.D. to 3000 A.D. and later

-have been tested. The minimum is 100 A.D. as <100 will invoke the

-2 => 4 digit year conversion. The maximum is billions of years in the 

-future, but this is a theoretical limit as the computation of that year 

-would take too long with the current implementation of adodb_mktime().

-

-This library replaces native functions as follows:

-

-<pre>	

-	getdate()  with  adodb_getdate()

-	date()     with  adodb_date() 

-	gmdate()   with  adodb_gmdate()

-	mktime()   with  adodb_mktime()

-	gmmktime() with  adodb_gmmktime()

-	strftime() with  adodb_strftime()

-	strftime() with  adodb_gmstrftime()

-</pre>

-	

-The parameters are identical, except that adodb_date() accepts a subset

-of date()'s field formats. Mktime() will convert from local time to GMT, 

-and date() will convert from GMT to local time, but daylight savings is 

-not handled currently.

-

-This library is independant of the rest of ADOdb, and can be used

-as standalone code.

-

-PERFORMANCE

-

-For high speed, this library uses the native date functions where

-possible, and only switches to PHP code when the dates fall outside 

-the 32-bit signed integer range.

-

-GREGORIAN CORRECTION

-

-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, 

-October 4, 1582 (Julian) was followed immediately by Friday, October 15, 

-1582 (Gregorian). 

-

-Since 0.06, we handle this correctly, so:

-

-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) 

-	== 24 * 3600 (1 day)

-

-=============================================================================

-

-COPYRIGHT

-

-(c) 2003-2005 John Lim and released under BSD-style license except for code by 

-jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year

-and originally found at http://www.php.net/manual/en/function.mktime.php

-

-=============================================================================

-

-BUG REPORTS

-

-These should be posted to the ADOdb forums at

-

-	http://phplens.com/lens/lensforum/topics.php?id=4

-

-=============================================================================

-

-FUNCTION DESCRIPTIONS

-

-

-** FUNCTION adodb_getdate($date=false)

-

-Returns an array containing date information, as getdate(), but supports

-dates greater than 1901 to 2038. The local date/time format is derived from a 

-heuristic the first time adodb_getdate is called. 

-	 

-	 

-** FUNCTION adodb_date($fmt, $timestamp = false)

-

-Convert a timestamp to a formatted local date. If $timestamp is not defined, the

-current timestamp is used. Unlike the function date(), it supports dates

-outside the 1901 to 2038 range.

-

-The format fields that adodb_date supports:

-

-<pre>

-	a - "am" or "pm" 

-	A - "AM" or "PM" 

-	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 

-	D - day of the week, textual, 3 letters; e.g. "Fri" 

-	F - month, textual, long; e.g. "January" 

-	g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 

-	G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 

-	h - hour, 12-hour format; i.e. "01" to "12" 

-	H - hour, 24-hour format; i.e. "00" to "23" 

-	i - minutes; i.e. "00" to "59" 

-	j - day of the month without leading zeros; i.e. "1" to "31" 

-	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  

-	L - boolean for whether it is a leap year; i.e. "0" or "1" 

-	m - month; i.e. "01" to "12" 

-	M - month, textual, 3 letters; e.g. "Jan" 

-	n - month without leading zeros; i.e. "1" to "12" 

-	O - Difference to Greenwich time in hours; e.g. "+0200" 

-	Q - Quarter, as in 1, 2, 3, 4 

-	r - RFC 822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 

-	s - seconds; i.e. "00" to "59" 

-	S - English ordinal suffix for the day of the month, 2 characters; 

-	   			i.e. "st", "nd", "rd" or "th" 

-	t - number of days in the given month; i.e. "28" to "31"

-	T - Timezone setting of this machine; e.g. "EST" or "MDT" 

-	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  

-	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 

-	Y - year, 4 digits; e.g. "1999" 

-	y - year, 2 digits; e.g. "99" 

-	z - day of the year; i.e. "0" to "365" 

-	Z - timezone offset in seconds (i.e. "-43200" to "43200"). 

-	   			The offset for timezones west of UTC is always negative, 

-				and for those east of UTC is always positive. 

-</pre>

-

-Unsupported:

-<pre>

-	B - Swatch Internet time 

-	I (capital i) - "1" if Daylight Savings Time, "0" otherwise.

-	W - ISO-8601 week number of year, weeks starting on Monday 

-

-</pre>

-

-

-** FUNCTION adodb_date2($fmt, $isoDateString = false)

-Same as adodb_date, but 2nd parameter accepts iso date, eg.

-

-  adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');

-

-  

-** FUNCTION adodb_gmdate($fmt, $timestamp = false)

-

-Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the

-current timestamp is used. Unlike the function date(), it supports dates

-outside the 1901 to 2038 range.

-

-

-** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year])

-

-Converts a local date to a unix timestamp.  Unlike the function mktime(), it supports

-dates outside the 1901 to 2038 range. All parameters are optional.

-

-

-** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])

-

-Converts a gmt date to a unix timestamp.  Unlike the function gmmktime(), it supports

-dates outside the 1901 to 2038 range. Differs from gmmktime() in that all parameters

-are currently compulsory.

-

-** FUNCTION adodb_gmstrftime($fmt, $timestamp = false)

-Convert a timestamp to a formatted GMT date.

-

-** FUNCTION adodb_strftime($fmt, $timestamp = false)

-

-Convert a timestamp to a formatted local date. Internally converts $fmt into 

-adodb_date format, then echo result.

-

-For best results, you can define the local date format yourself. Define a global

-variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using

-adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.

-

-    eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');

-	

-	Supported format codes:

-

-<pre>

-	%a - abbreviated weekday name according to the current locale 

-	%A - full weekday name according to the current locale 

-	%b - abbreviated month name according to the current locale 

-	%B - full month name according to the current locale 

-	%c - preferred date and time representation for the current locale 

-	%d - day of the month as a decimal number (range 01 to 31) 

-	%D - same as %m/%d/%y 

-	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31') 

-	%h - same as %b

-	%H - hour as a decimal number using a 24-hour clock (range 00 to 23) 

-	%I - hour as a decimal number using a 12-hour clock (range 01 to 12) 

-	%m - month as a decimal number (range 01 to 12) 

-	%M - minute as a decimal number 

-	%n - newline character 

-	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale 

-	%r - time in a.m. and p.m. notation 

-	%R - time in 24 hour notation 

-	%S - second as a decimal number 

-	%t - tab character 

-	%T - current time, equal to %H:%M:%S 

-	%x - preferred date representation for the current locale without the time 

-	%X - preferred time representation for the current locale without the date 

-	%y - year as a decimal number without a century (range 00 to 99) 

-	%Y - year as a decimal number including the century 

-	%Z - time zone or name or abbreviation 

-	%% - a literal `%' character 

-</pre>	

-

-	Unsupported codes:

-<pre>

-	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99) 

-	%g - like %G, but without the century. 

-	%G - The 4-digit year corresponding to the ISO week number (see %V). 

-	     This has the same format and value as %Y, except that if the ISO week number belongs 

-		 to the previous or next year, that year is used instead. 

-	%j - day of the year as a decimal number (range 001 to 366) 

-	%u - weekday as a decimal number [1,7], with 1 representing Monday 

-	%U - week number of the current year as a decimal number, starting 

-	    with the first Sunday as the first day of the first week 

-	%V - The ISO 8601:1988 week number of the current year as a decimal number, 

-	     range 01 to 53, where week 1 is the first week that has at least 4 days in the 

-		 current year, and with Monday as the first day of the week. (Use %G or %g for 

-		 the year component that corresponds to the week number for the specified timestamp.) 

-	%w - day of the week as a decimal, Sunday being 0 

-	%W - week number of the current year as a decimal number, starting with the 

-	     first Monday as the first day of the first week 

-</pre>

-

-=============================================================================

-

-NOTES

-

-Useful url for generating test timestamps:

-	http://www.4webhelp.net/us/timestamp.php

-

-Possible future optimizations include 

-

-a. Using an algorithm similar to Plauger's in "The Standard C Library" 

-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 

-work outside 32-bit signed range, so i decided not to implement it.

-

-b. Implement daylight savings, which looks awfully complicated, see

-	http://webexhibits.org/daylightsaving/

-

-

-CHANGELOG

-

-- 18 July  2005  0.21

-- In PHP 4.3.11, the 'r' format has changed. Leading 0 in day is added. Changed for compat.

-- Added support for negative months in adodb_mktime().

-

-- 24 Feb 2005 0.20

-Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().

-

-- 21 Dec 2004 0.17

-In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false. 

-Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.

-

-- 17 Nov 2004 0.16

-Removed intval typecast in adodb_mktime() for secs, allowing:

-	 adodb_mktime(0,0,0 + 2236672153,1,1,1934);

-Suggested by Ryan.

-

-- 18 July 2004 0.15

-All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory. 

-This brings it more in line with mktime (still not identical).

-

-- 23 June 2004 0.14

-

-Allow you to define your own daylights savings function, adodb_daylight_sv.

-If the function is defined (somewhere in an include), then you can correct for daylights savings.

-

-In this example, we apply daylights savings in June or July, adding one hour. This is extremely

-unrealistic as it does not take into account time-zone, geographic location, current year.

-

-function adodb_daylight_sv(&$arr, $is_gmt)

-{

-	if ($is_gmt) return;

-	$m = $arr['mon'];

-	if ($m == 6 || $m == 7) $arr['hours'] += 1;

-}

-

-This is only called by adodb_date() and not by adodb_mktime(). 

-

-The format of $arr is

-Array ( 

-   [seconds] => 0 

-   [minutes] => 0 

-   [hours] => 0 

-   [mday] => 1      # day of month, eg 1st day of the month

-   [mon] => 2       # month (eg. Feb)

-   [year] => 2102 

-   [yday] => 31     # days in current year

-   [leap] =>        # true if leap year

-   [ndays] => 28    # no of days in current month

-   ) 

-   

-

-- 28 Apr 2004 0.13

-Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.

-

-- 20 Mar 2004 0.12

-Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.

-

-- 26 Oct 2003 0.11

-Because of daylight savings problems (some systems apply daylight savings to 

-January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.

-

-- 9 Aug 2003 0.10

-Fixed bug with dates after 2038. 

-See http://phplens.com/lens/lensforum/msgs.php?id=6980

-

-- 1 July 2003 0.09

-Added support for Q (Quarter).

-Added adodb_date2(), which accepts ISO date in 2nd param

-

-- 3 March 2003 0.08

-Added support for 'S' adodb_date() format char. Added constant ADODB_ALLOW_NEGATIVE_TS

-if you want PHP to handle negative timestamps between 1901 to 1969.

-

-- 27 Feb 2003 0.07

-All negative numbers handled by adodb now because of RH 7.3+ problems.

-See http://bugs.php.net/bug.php?id=20048&edit=2

-

-- 4 Feb 2003 0.06

-Fixed a typo, 1852 changed to 1582! This means that pre-1852 dates

-are now correctly handled.

-

-- 29 Jan 2003 0.05

-

-Leap year checking differs under Julian calendar (pre 1582). Also

-leap year code optimized by checking for most common case first.

-

-We also handle month overflow correctly in mktime (eg month set to 13).

-

-Day overflow for less than one month's days is supported.

-

-- 28 Jan 2003 0.04

-

-Gregorian correction handled. In PHP5, we might throw an error if 

-mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.

-Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.

-

-- 27 Jan 2003 0.03

-

-Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.

-Fixed calculation of days since start of year for <1970. 

-

-- 27 Jan 2003 0.02

-

-Changed _adodb_getdate() to inline leap year checking for better performance.

-Fixed problem with time-zones west of GMT +0000.

-

-- 24 Jan 2003 0.01

-

-First implementation.

-*/

-

-

-/* Initialization */

-

-/*

-	Version Number

-*/

-define('ADODB_DATE_VERSION',0.21);

-

-/*

-	This code was originally for windows. But apparently this problem happens 

-	also with Linux, RH 7.3 and later!

-	

-	glibc-2.2.5-34 and greater has been changed to return -1 for dates <

-	1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0

-	echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1

-	

-	References:

-	 http://bugs.php.net/bug.php?id=20048&edit=2

-	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html

-*/

-

-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);

-

-function adodb_date_test_date($y1,$m,$d=13)

-{

-	$t = adodb_mktime(0,0,0,$m,$d,$y1);

-	$rez = adodb_date('Y-n-j H:i:s',$t);

-	if ("$y1-$m-$d 00:00:00" != $rez) {

-		print "<b>$y1 error, expected=$y1-$m-$d 00:00:00, adodb=$rez</b><br>";

-		return false;

-	}

-	return true;

-}

-

-function adodb_date_test_strftime($fmt)

-{

-	$s1 = strftime($fmt);

-	$s2 = adodb_strftime($fmt);

-	

-	if ($s1 == $s2) return true;

-	

-	echo "error for $fmt,  strftime=$s1, $adodb=$s2<br>";

-	return false;

-}

-

-/**

-	 Test Suite

-*/

-function adodb_date_test()

-{

-	

-	error_reporting(E_ALL);

-	print "<h4>Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."</h4>";

-	@set_time_limit(0);

-	$fail = false;

-	

-	// This flag disables calling of PHP native functions, so we can properly test the code

-	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);

-	

-	adodb_date_test_strftime('%Y %m %x %X');

-	adodb_date_test_strftime("%A %d %B %Y");

-	adodb_date_test_strftime("%H %M S");

-	

-	$t = adodb_mktime(0,0,0);

-	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'<br>';

-	

-	$t = adodb_mktime(0,0,0,6,1,2102);

-	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';

-	

-	$t = adodb_mktime(0,0,0,2,1,2102);

-	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';

-	

-	

-	print "<p>Testing gregorian <=> julian conversion<p>";

-	$t = adodb_mktime(0,0,0,10,11,1492);

-	//http://www.holidayorigins.com/html/columbus_day.html - Friday check

-	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing<br>';

-	

-	$t = adodb_mktime(0,0,0,2,29,1500);

-	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years<br>';

-	

-	$t = adodb_mktime(0,0,0,2,29,1700);

-	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years<br>';

-	

-	print  adodb_mktime(0,0,0,10,4,1582).' ';

-	print adodb_mktime(0,0,0,10,15,1582);

-	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));

-	if ($diff != 3600*24) print " <b>Error in gregorian correction = ".($diff/3600/24)." days </b><br>";

-		

-	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : '<b>Error</b>')."<br>";

-	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : '<b>Error</b>')."<br>";

-	

-	print "<p>Testing overflow<p>";

-	

-	$t = adodb_mktime(0,0,0,3,33,1965);

-	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 <br>';

-	$t = adodb_mktime(0,0,0,4,33,1971);

-	if (!(adodb_date('Y-m-d',$t) == '1971-05-03')) print 'Error in day overflow 2 <br>';

-	$t = adodb_mktime(0,0,0,1,60,1965);

-	if (!(adodb_date('Y-m-d',$t) == '1965-03-01')) print 'Error in day overflow 3 '.adodb_date('Y-m-d',$t).' <br>';

-	$t = adodb_mktime(0,0,0,12,32,1965);

-	if (!(adodb_date('Y-m-d',$t) == '1966-01-01')) print 'Error in day overflow 4 '.adodb_date('Y-m-d',$t).' <br>';

-	$t = adodb_mktime(0,0,0,12,63,1965);

-	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' <br>';

-	$t = adodb_mktime(0,0,0,13,3,1965);

-	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 <br>';

-	

-	print "Testing 2-digit => 4-digit year conversion<p>";

-	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";

-	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010<br>";

-	if (adodb_year_digit_check(20) != 2020) print "Err 2-digit 2020<br>";

-	if (adodb_year_digit_check(30) != 2030) print "Err 2-digit 2030<br>";

-	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940<br>";

-	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>";

-	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>";

-	

-	// Test string formating

-	print "<p>Testing date formating</p>";

-	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C822 r s t U w y Y z Z 2003';

-	$s1 = date($fmt,0);

-	$s2 = adodb_date($fmt,0);

-	if ($s1 != $s2) {

-		print " date() 0 failed<br>$s1<br>$s2<br>";

-	}

-	flush();

-	for ($i=100; --$i > 0; ) {

-

-		$ts = 3600.0*((rand()%60000)+(rand()%60000))+(rand()%60000);

-		$s1 = date($fmt,$ts);

-		$s2 = adodb_date($fmt,$ts);

-		//print "$s1 <br>$s2 <p>";

-		$pos = strcmp($s1,$s2);

-

-		if (($s1) != ($s2)) {

-			for ($j=0,$k=strlen($s1); $j < $k; $j++) {

-				if ($s1[$j] != $s2[$j]) {

-					print substr($s1,$j).' ';

-					break;

-				}

-			}

-			print "<b>Error date(): $ts<br><pre> 

-&nbsp; \"$s1\" (date len=".strlen($s1).")

-&nbsp; \"$s2\" (adodb_date len=".strlen($s2).")</b></pre><br>";

-			$fail = true;

-		}

-		

-		$a1 = getdate($ts);

-		$a2 = adodb_getdate($ts);

-		$rez = array_diff($a1,$a2);

-		if (sizeof($rez)>0) {

-			print "<b>Error getdate() $ts</b><br>";

-				print_r($a1);

-			print "<br>";

-				print_r($a2);

-			print "<p>";

-			$fail = true;

-		}

-	}

-	

-	// Test generation of dates outside 1901-2038

-	print "<p>Testing random dates between 100 and 4000</p>";

-	adodb_date_test_date(100,1);

-	for ($i=100; --$i >= 0;) {

-		$y1 = 100+rand(0,1970-100);

-		$m = rand(1,12);

-		adodb_date_test_date($y1,$m);

-		

-		$y1 = 3000-rand(0,3000-1970);

-		adodb_date_test_date($y1,$m);

-	}

-	print '<p>';

-	$start = 1960+rand(0,10);

-	$yrs = 12;

-	$i = 365.25*86400*($start-1970);

-	$offset = 36000+rand(10000,60000);

-	$max = 365*$yrs*86400;

-	$lastyear = 0;

-	

-	// we generate a timestamp, convert it to a date, and convert it back to a timestamp

-	// and check if the roundtrip broke the original timestamp value.

-	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";

-	$cnt = 0;

-	for ($max += $i; $i < $max; $i += $offset) {

-		$ret = adodb_date('m,d,Y,H,i,s',$i);

-		$arr = explode(',',$ret);

-		if ($lastyear != $arr[2]) {

-			$lastyear = $arr[2];

-			print " $lastyear ";

-			flush();

-		}

-		$newi = adodb_mktime($arr[3],$arr[4],$arr[5],$arr[0],$arr[1],$arr[2]);

-		if ($i != $newi) {

-			print "Error at $i, adodb_mktime returned $newi ($ret)";

-			$fail = true;

-			break;

-		}

-		$cnt += 1;

-	}

-	echo "Tested $cnt dates<br>";

-	if (!$fail) print "<p>Passed !</p>";

-	else print "<p><b>Failed</b> :-(</p>";

-}

-

-/**

-	Returns day of week, 0 = Sunday,... 6=Saturday. 

-	Algorithm from PEAR::Date_Calc

-*/

-function adodb_dow($year, $month, $day)

-{

-/*

-Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and 

-proclaimed that from that time onwards 3 days would be dropped from the calendar 

-every 400 years.

-

-Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian). 

-*/

-	if ($year <= 1582) {

-		if ($year < 1582 || 

-			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;

-		 else

-			$greg_correction = 0;

-	} else

-		$greg_correction = 0;

-	

-	if($month > 2)

-	    $month -= 2;

-	else {

-	    $month += 10;

-	    $year--;

-	}

-	

-	$day =  floor((13 * $month - 1) / 5) +

-	        $day + ($year % 100) +

-	        floor(($year % 100) / 4) +

-	        floor(($year / 100) / 4) - 2 *

-	        floor($year / 100) + 77 + $greg_correction;

-	

-	return $day - 7 * floor($day / 7);

-}

-

-

-/**

- Checks for leap year, returns true if it is. No 2-digit year check. Also 

- handles julian calendar correctly.

-*/

-function _adodb_is_leap_year($year) 

-{

-	if ($year % 4 != 0) return false;

-	

-	if ($year % 400 == 0) {

-		return true;

-	// if gregorian calendar (>1582), century not-divisible by 400 is not leap

-	} else if ($year > 1582 && $year % 100 == 0 ) {

-		return false;

-	} 

-	

-	return true;

-}

-

-

-/**

- checks for leap year, returns true if it is. Has 2-digit year check

-*/

-function adodb_is_leap_year($year) 

-{

-	return  _adodb_is_leap_year(adodb_year_digit_check($year));

-}

-

-/**

-	Fix 2-digit years. Works for any century.

- 	Assumes that if 2-digit is more than 30 years in future, then previous century.

-*/

-function adodb_year_digit_check($y) 

-{

-	if ($y < 100) {

-	

-		$yr = (integer) date("Y");

-		$century = (integer) ($yr /100);

-		

-		if ($yr%100 > 50) {

-			$c1 = $century + 1;

-			$c0 = $century;

-		} else {

-			$c1 = $century;

-			$c0 = $century - 1;

-		}

-		$c1 *= 100;

-		// if 2-digit year is less than 30 years in future, set it to this century

-		// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.

-		if (($y + $c1) < $yr+30) $y = $y + $c1;

-		else $y = $y + $c0*100;

-	}

-	return $y;

-}

-

-/**

- get local time zone offset from GMT

-*/

-function adodb_get_gmt_diff() 

-{

-static $TZ;

-	if (isset($TZ)) return $TZ;

-	

-	$TZ = mktime(0,0,0,1,2,1970,0) - gmmktime(0,0,0,1,2,1970,0);

-	return $TZ;

-}

-

-/**

-	Returns an array with date info.

-*/

-function adodb_getdate($d=false,$fast=false)

-{

-	if ($d === false) return getdate();

-	if (!defined('ADODB_TEST_DATES')) {

-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range

-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer

-				return @getdate($d);

-		}

-	}

-	return _adodb_getdate($d);

-}

-

-/*

-// generate $YRS table for _adodb_getdate()

-function adodb_date_gentable($out=true)

-{

-

-	for ($i=1970; $i >= 1600; $i-=10) {

-		$s = adodb_gmmktime(0,0,0,1,1,$i);

-		echo "$i => $s,<br>";	

-	}

-}

-adodb_date_gentable();

-

-for ($i=1970; $i > 1500; $i--) {

-

-echo "<hr>$i ";

-	adodb_date_test_date($i,1,1);

-}

-

-*/

-

-/**

-	Low-level function that returns the getdate() array. We have a special

-	$fast flag, which if set to true, will return fewer array values,

-	and is much faster as it does not calculate dow, etc.

-*/

-function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)

-{

-static $YRS;

-

-	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff());

-	

-	$_day_power = 86400;

-	$_hour_power = 3600;

-	$_min_power = 60;

-	

-	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 

-	

-	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);

-	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);

-	

-	$d366 = $_day_power * 366;

-	$d365 = $_day_power * 365;

-	

-	if ($d < 0) {

-		

-		if (empty($YRS)) $YRS = array(

-			1970 => 0,

-			1960 => -315619200,

-			1950 => -631152000,

-			1940 => -946771200,

-			1930 => -1262304000,

-			1920 => -1577923200,

-			1910 => -1893456000,

-			1900 => -2208988800,

-			1890 => -2524521600,

-			1880 => -2840140800,

-			1870 => -3155673600,

-			1860 => -3471292800,

-			1850 => -3786825600,

-			1840 => -4102444800,

-			1830 => -4417977600,

-			1820 => -4733596800,

-			1810 => -5049129600,

-			1800 => -5364662400,

-			1790 => -5680195200,

-			1780 => -5995814400,

-			1770 => -6311347200,

-			1760 => -6626966400,

-			1750 => -6942499200,

-			1740 => -7258118400,

-			1730 => -7573651200,

-			1720 => -7889270400,

-			1710 => -8204803200,

-			1700 => -8520336000,

-			1690 => -8835868800,

-			1680 => -9151488000,

-			1670 => -9467020800,

-			1660 => -9782640000,

-			1650 => -10098172800,

-			1640 => -10413792000,

-			1630 => -10729324800,

-			1620 => -11044944000,

-			1610 => -11360476800,

-			1600 => -11676096000);

-

-		if ($is_gmt) $origd = $d;

-		// The valid range of a 32bit signed timestamp is typically from 

-		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT

-		//

-		

-		# old algorithm iterates through all years. new algorithm does it in

-		# 10 year blocks

-		

-		/*

-		# old algo

-		for ($a = 1970 ; --$a >= 0;) {

-			$lastd = $d;

-			

-			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;

-			else $d += $d365;

-			

-			if ($d >= 0) {

-				$year = $a;

-				break;

-			}

-		}

-		*/

-		

-		$lastsecs = 0;

-		$lastyear = 1970;

-		foreach($YRS as $year => $secs) {

-			if ($d >= $secs) {

-				$a = $lastyear;

-				break;

-			}

-			$lastsecs = $secs;

-			$lastyear = $year;

-		}

-		

-		$d -= $lastsecs;

-		if (!isset($a)) $a = $lastyear;

-		

-		//echo ' yr=',$a,' ', $d,'.';

-		

-		for (; --$a >= 0;) {

-			$lastd = $d;

-			

-			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;

-			else $d += $d365;

-			

-			if ($d >= 0) {

-				$year = $a;

-				break;

-			}

-		}

-		/**/

-		

-		$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;

-		

-		$d = $lastd;

-		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;

-		for ($a = 13 ; --$a > 0;) {

-			$lastd = $d;

-			$d += $mtab[$a] * $_day_power;

-			if ($d >= 0) {

-				$month = $a;

-				$ndays = $mtab[$a];

-				break;

-			}

-		}

-		

-		$d = $lastd;

-		$day = $ndays + ceil(($d+1) / ($_day_power));

-

-		$d += ($ndays - $day+1)* $_day_power;

-		$hour = floor($d/$_hour_power);

-	

-	} else {

-		for ($a = 1970 ;; $a++) {

-			$lastd = $d;

-			

-			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;

-			else $d -= $d365;

-			if ($d < 0) {

-				$year = $a;

-				break;

-			}

-		}

-		$secsInYear = $lastd;

-		$d = $lastd;

-		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;

-		for ($a = 1 ; $a <= 12; $a++) {

-			$lastd = $d;

-			$d -= $mtab[$a] * $_day_power;

-			if ($d < 0) {

-				$month = $a;

-				$ndays = $mtab[$a];

-				break;

-			}

-		}

-		$d = $lastd;

-		$day = ceil(($d+1) / $_day_power);

-		$d = $d - ($day-1) * $_day_power;

-		$hour = floor($d /$_hour_power);

-	}

-	

-	$d -= $hour * $_hour_power;

-	$min = floor($d/$_min_power);

-	$secs = $d - $min * $_min_power;

-	if ($fast) {

-		return array(

-		'seconds' => $secs,

-		'minutes' => $min,

-		'hours' => $hour,

-		'mday' => $day,

-		'mon' => $month,

-		'year' => $year,

-		'yday' => floor($secsInYear/$_day_power),

-		'leap' => $leaf,

-		'ndays' => $ndays

-		);

-	}

-	

-	

-	$dow = adodb_dow($year,$month,$day);

-

-	return array(

-		'seconds' => $secs,

-		'minutes' => $min,

-		'hours' => $hour,

-		'mday' => $day,

-		'wday' => $dow,

-		'mon' => $month,

-		'year' => $year,

-		'yday' => floor($secsInYear/$_day_power),

-		'weekday' => gmdate('l',$_day_power*(3+$dow)),

-		'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),

-		0 => $origd

-	);

-}

-

-function adodb_gmdate($fmt,$d=false)

-{

-	return adodb_date($fmt,$d,true);

-}

-

-// accepts unix timestamp and iso date format in $d

-function adodb_date2($fmt, $d=false, $is_gmt=false)

-{

-	if ($d !== false) {

-		if (!preg_match( 

-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 

-			($d), $rr)) return adodb_date($fmt,false,$is_gmt);

-

-		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);

-	

-		// h-m-s-MM-DD-YY

-		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);

-		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);

-	}

-	

-	return adodb_date($fmt,$d,$is_gmt);

-}

-

-

-/**

-	Return formatted date based on timestamp $d

-*/

-function adodb_date($fmt,$d=false,$is_gmt=false)

-{

-static $daylight;

-

-	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);

-	if (!defined('ADODB_TEST_DATES')) {

-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range

-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer

-				return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);

-

-		}

-	}

-	$_day_power = 86400;

-	

-	$arr = _adodb_getdate($d,true,$is_gmt);

-	

-	if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');

-	if ($daylight) adodb_daylight_sv($arr, $is_gmt);

-	

-	$year = $arr['year'];

-	$month = $arr['mon'];

-	$day = $arr['mday'];

-	$hour = $arr['hours'];

-	$min = $arr['minutes'];

-	$secs = $arr['seconds'];

-	

-	$max = strlen($fmt);

-	$dates = '';

-	

-	/*

-		at this point, we have the following integer vars to manipulate:

-		$year, $month, $day, $hour, $min, $secs

-	*/

-	for ($i=0; $i < $max; $i++) {

-		switch($fmt[$i]) {

-		case 'T': $dates .= date('T');break;

-		// YEAR

-		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;

-		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200

-		

-			// 4.3.11 uses '04 Jun 2004'

-			// 4.3.8 uses  ' 4 Jun 2004'

-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		

-				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';

-			

-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 

-			

-			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;

-			

-			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;

-			

-			$gmt = adodb_get_gmt_diff();

-			$dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;

-				

-		case 'Y': $dates .= $year; break;

-		case 'y': $dates .= substr($year,strlen($year)-2,2); break;

-		// MONTH

-		case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;

-		case 'Q': $dates .= ($month+3)>>2; break;

-		case 'n': $dates .= $month; break;

-		case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;

-		case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;

-		// DAY

-		case 't': $dates .= $arr['ndays']; break;

-		case 'z': $dates .= $arr['yday']; break;

-		case 'w': $dates .= adodb_dow($year,$month,$day); break;

-		case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;

-		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;

-		case 'j': $dates .= $day; break;

-		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;

-		case 'S': 

-			$d10 = $day % 10;

-			if ($d10 == 1) $dates .= 'st';

-			else if ($d10 == 2 && $day != 12) $dates .= 'nd';

-			else if ($d10 == 3) $dates .= 'rd';

-			else $dates .= 'th';

-			break;

-			

-		// HOUR

-		case 'Z':

-			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;

-		case 'O': 

-			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();

-			$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;

-			

-		case 'H': 

-			if ($hour < 10) $dates .= '0'.$hour; 

-			else $dates .= $hour; 

-			break;

-		case 'h': 

-			if ($hour > 12) $hh = $hour - 12; 

-			else {

-				if ($hour == 0) $hh = '12'; 

-				else $hh = $hour;

-			}

-			

-			if ($hh < 10) $dates .= '0'.$hh;

-			else $dates .= $hh;

-			break;

-			

-		case 'G': 

-			$dates .= $hour;

-			break;

-			

-		case 'g':

-			if ($hour > 12) $hh = $hour - 12; 

-			else {

-				if ($hour == 0) $hh = '12'; 

-				else $hh = $hour; 

-			}

-			$dates .= $hh;

-			break;

-		// MINUTES

-		case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;

-		// SECONDS

-		case 'U': $dates .= $d; break;

-		case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;

-		// AM/PM

-		// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM

-		case 'a':

-			if ($hour>=12) $dates .= 'pm';

-			else $dates .= 'am';

-			break;

-		case 'A':

-			if ($hour>=12) $dates .= 'PM';

-			else $dates .= 'AM';

-			break;

-		default:

-			$dates .= $fmt[$i]; break;

-		// ESCAPE

-		case "\\": 

-			$i++;

-			if ($i < $max) $dates .= $fmt[$i];

-			break;

-		}

-	}

-	return $dates;

-}

-

-/**

-	Returns a timestamp given a GMT/UTC time. 

-	Note that $is_dst is not implemented and is ignored.

-*/

-function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)

-{

-	return adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst,true);

-}

-

-/**

-	Return a timestamp given a local time. Originally by jackbbs.

-	Note that $is_dst is not implemented and is ignored.

-	

-	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).

-*/

-function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) 

-{

-	if (!defined('ADODB_TEST_DATES')) {

-

-		if ($mon === false) {

-			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);

-		}

-		

-		// for windows, we don't check 1970 because with timezone differences, 

-		// 1 Jan 1970 could generate negative timestamp, which is illegal

-		if (1971 < $year && $year < 2038

-			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)

-			) {

-				return $is_gmt ?

-					@gmmktime($hr,$min,$sec,$mon,$day,$year):

-					@mktime($hr,$min,$sec,$mon,$day,$year);

-			}

-	}

-	

-	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff();

-

-	/*

-	# disabled because some people place large values in $sec.

-	# however we need it for $mon because we use an array...

-	$hr = intval($hr);

-	$min = intval($min);

-	$sec = intval($sec);

-	*/

-	$mon = intval($mon);

-	$day = intval($day);

-	$year = intval($year);

-	

-	

-	$year = adodb_year_digit_check($year);

-

-	if ($mon > 12) {

-		$y = floor($mon / 12);

-		$year += $y;

-		$mon -= $y*12;

-	} else if ($mon < 1) {

-		$y = ceil((1-$mon) / 12);

-		$year -= $y;

-		$mon += $y*12;

-	}

-	

-	$_day_power = 86400;

-	$_hour_power = 3600;

-	$_min_power = 60;

-	

-	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);

-	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);

-	

-	$_total_date = 0;

-	if ($year >= 1970) {

-		for ($a = 1970 ; $a <= $year; $a++) {

-			$leaf = _adodb_is_leap_year($a);

-			if ($leaf == true) {

-				$loop_table = $_month_table_leaf;

-				$_add_date = 366;

-			} else {

-				$loop_table = $_month_table_normal;

-				$_add_date = 365;

-			}

-			if ($a < $year) { 

-				$_total_date += $_add_date;

-			} else {

-				for($b=1;$b<$mon;$b++) {

-					$_total_date += $loop_table[$b];

-				}

-			}

-		}

-		$_total_date +=$day-1;

-		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;

-	

-	} else {

-		for ($a = 1969 ; $a >= $year; $a--) {

-			$leaf = _adodb_is_leap_year($a);

-			if ($leaf == true) {

-				$loop_table = $_month_table_leaf;

-				$_add_date = 366;

-			} else {

-				$loop_table = $_month_table_normal;

-				$_add_date = 365;

-			}

-			if ($a > $year) { $_total_date += $_add_date;

-			} else {

-				for($b=12;$b>$mon;$b--) {

-					$_total_date += $loop_table[$b];

-				}

-			}

-		}

-		$_total_date += $loop_table[$mon] - $day;

-		

-		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;

-		$_day_time = $_day_power - $_day_time;

-		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);

-		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction

-		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.

-	} 

-	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;

-	return $ret;

-}

-

-function adodb_gmstrftime($fmt, $ts=false)

-{

-	return adodb_strftime($fmt,$ts,true);

-}

-

-// hack - convert to adodb_date

-function adodb_strftime($fmt, $ts=false,$is_gmt=false)

-{

-global $ADODB_DATE_LOCALE;

-

-	if (!defined('ADODB_TEST_DATES')) {

-		if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range

-			if (!defined('ADODB_NO_NEGATIVE_TS') || $ts >= 0) // if windows, must be +ve integer

-				return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);

-

-		}

-	}

-	

-	if (empty($ADODB_DATE_LOCALE)) {

-		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am

-		$sep = substr($tstr,2,1);

-		$hasAM = strrpos($tstr,'M') !== false;

-		

-		$ADODB_DATE_LOCALE = array();

-		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	

-		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';

-			

-	}

-	$inpct = false;

-	$fmtdate = '';

-	for ($i=0,$max = strlen($fmt); $i < $max; $i++) {

-		$ch = $fmt[$i];

-		if ($ch == '%') {

-			if ($inpct) {

-				$fmtdate .= '%';

-				$inpct = false;

-			} else

-				$inpct = true;

-		} else if ($inpct) {

-		

-			$inpct = false;

-			switch($ch) {

-			case '0':

-			case '1':

-			case '2':

-			case '3':

-			case '4':

-			case '5':

-			case '6':

-			case '7':

-			case '8':

-			case '9':

-			case 'E':

-			case 'O':

-				/* ignore format modifiers */

-				$inpct = true; 

-				break;

-				

-			case 'a': $fmtdate .= 'D'; break;

-			case 'A': $fmtdate .= 'l'; break;

-			case 'h':

-			case 'b': $fmtdate .= 'M'; break;

-			case 'B': $fmtdate .= 'F'; break;

-			case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;

-			case 'C': $fmtdate .= '\C?'; break; // century

-			case 'd': $fmtdate .= 'd'; break;

-			case 'D': $fmtdate .= 'm/d/y'; break;

-			case 'e': $fmtdate .= 'j'; break;

-			case 'g': $fmtdate .= '\g?'; break; //?

-			case 'G': $fmtdate .= '\G?'; break; //?

-			case 'H': $fmtdate .= 'H'; break;

-			case 'I': $fmtdate .= 'h'; break;

-			case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd

-			case 'm': $fmtdate .= 'm'; break;

-			case 'M': $fmtdate .= 'i'; break;

-			case 'n': $fmtdate .= "\n"; break;

-			case 'p': $fmtdate .= 'a'; break;

-			case 'r': $fmtdate .= 'h:i:s a'; break;

-			case 'R': $fmtdate .= 'H:i:s'; break;

-			case 'S': $fmtdate .= 's'; break;

-			case 't': $fmtdate .= "\t"; break;

-			case 'T': $fmtdate .= 'H:i:s'; break;

-			case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-basde

-			case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based

-			case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;

-			case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;

-			case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-basde

-			case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based

-			case 'y': $fmtdate .= 'y'; break;

-			case 'Y': $fmtdate .= 'Y'; break;

-			case 'Z': $fmtdate .= 'T'; break;

-			}

-		} else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))

-			$fmtdate .= "\\".$ch;

-		else

-			$fmtdate .= $ch;

-	}

-	//echo "fmt=",$fmtdate,"<br>";

-	if ($ts === false) $ts = time();

-	$ret = adodb_date($fmtdate, $ts, $is_gmt);

-	return $ret;

-}

-

-

+<?php
+/**
+ADOdb Date Library, part of the ADOdb abstraction library
+Download: http://phplens.com/phpeverywhere/
+
+PHP native date functions use integer timestamps for computations.
+Because of this, dates are restricted to the years 1901-2038 on Unix 
+and 1970-2038 on Windows due to integer overflow for dates beyond 
+those years. This library overcomes these limitations by replacing the 
+native function's signed integers (normally 32-bits) with PHP floating 
+point numbers (normally 64-bits).
+
+Dates from 100 A.D. to 3000 A.D. and later
+have been tested. The minimum is 100 A.D. as <100 will invoke the
+2 => 4 digit year conversion. The maximum is billions of years in the 
+future, but this is a theoretical limit as the computation of that year 
+would take too long with the current implementation of adodb_mktime().
+
+This library replaces native functions as follows:
+
+<pre>	
+	getdate()  with  adodb_getdate()
+	date()     with  adodb_date() 
+	gmdate()   with  adodb_gmdate()
+	mktime()   with  adodb_mktime()
+	gmmktime() with  adodb_gmmktime()
+	strftime() with  adodb_strftime()
+	strftime() with  adodb_gmstrftime()
+</pre>
+	
+The parameters are identical, except that adodb_date() accepts a subset
+of date()'s field formats. Mktime() will convert from local time to GMT, 
+and date() will convert from GMT to local time, but daylight savings is 
+not handled currently.
+
+This library is independant of the rest of ADOdb, and can be used
+as standalone code.
+
+PERFORMANCE
+
+For high speed, this library uses the native date functions where
+possible, and only switches to PHP code when the dates fall outside 
+the 32-bit signed integer range.
+
+GREGORIAN CORRECTION
+
+Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, 
+October 4, 1582 (Julian) was followed immediately by Friday, October 15, 
+1582 (Gregorian). 
+
+Since 0.06, we handle this correctly, so:
+
+adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) 
+	== 24 * 3600 (1 day)
+
+=============================================================================
+
+COPYRIGHT
+
+(c) 2003-2005 John Lim and released under BSD-style license except for code by 
+jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
+and originally found at http://www.php.net/manual/en/function.mktime.php
+
+=============================================================================
+
+BUG REPORTS
+
+These should be posted to the ADOdb forums at
+
+	http://phplens.com/lens/lensforum/topics.php?id=4
+
+=============================================================================
+
+FUNCTION DESCRIPTIONS
+
+
+** FUNCTION adodb_getdate($date=false)
+
+Returns an array containing date information, as getdate(), but supports
+dates greater than 1901 to 2038. The local date/time format is derived from a 
+heuristic the first time adodb_getdate is called. 
+	 
+	 
+** FUNCTION adodb_date($fmt, $timestamp = false)
+
+Convert a timestamp to a formatted local date. If $timestamp is not defined, the
+current timestamp is used. Unlike the function date(), it supports dates
+outside the 1901 to 2038 range.
+
+The format fields that adodb_date supports:
+
+<pre>
+	a - "am" or "pm" 
+	A - "AM" or "PM" 
+	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
+	D - day of the week, textual, 3 letters; e.g. "Fri" 
+	F - month, textual, long; e.g. "January" 
+	g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
+	G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
+	h - hour, 12-hour format; i.e. "01" to "12" 
+	H - hour, 24-hour format; i.e. "00" to "23" 
+	i - minutes; i.e. "00" to "59" 
+	j - day of the month without leading zeros; i.e. "1" to "31" 
+	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  
+	L - boolean for whether it is a leap year; i.e. "0" or "1" 
+	m - month; i.e. "01" to "12" 
+	M - month, textual, 3 letters; e.g. "Jan" 
+	n - month without leading zeros; i.e. "1" to "12" 
+	O - Difference to Greenwich time in hours; e.g. "+0200" 
+	Q - Quarter, as in 1, 2, 3, 4 
+	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 
+	s - seconds; i.e. "00" to "59" 
+	S - English ordinal suffix for the day of the month, 2 characters; 
+	   			i.e. "st", "nd", "rd" or "th" 
+	t - number of days in the given month; i.e. "28" to "31"
+	T - Timezone setting of this machine; e.g. "EST" or "MDT" 
+	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  
+	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
+	Y - year, 4 digits; e.g. "1999" 
+	y - year, 2 digits; e.g. "99" 
+	z - day of the year; i.e. "0" to "365" 
+	Z - timezone offset in seconds (i.e. "-43200" to "43200"). 
+	   			The offset for timezones west of UTC is always negative, 
+				and for those east of UTC is always positive. 
+</pre>
+
+Unsupported:
+<pre>
+	B - Swatch Internet time 
+	I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
+	W - ISO-8601 week number of year, weeks starting on Monday 
+
+</pre>
+
+
+** FUNCTION adodb_date2($fmt, $isoDateString = false)
+Same as adodb_date, but 2nd parameter accepts iso date, eg.
+
+  adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
+
+  
+** FUNCTION adodb_gmdate($fmt, $timestamp = false)
+
+Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
+current timestamp is used. Unlike the function date(), it supports dates
+outside the 1901 to 2038 range.
+
+
+** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year])
+
+Converts a local date to a unix timestamp.  Unlike the function mktime(), it supports
+dates outside the 1901 to 2038 range. All parameters are optional.
+
+
+** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])
+
+Converts a gmt date to a unix timestamp.  Unlike the function gmmktime(), it supports
+dates outside the 1901 to 2038 range. Differs from gmmktime() in that all parameters
+are currently compulsory.
+
+** FUNCTION adodb_gmstrftime($fmt, $timestamp = false)
+Convert a timestamp to a formatted GMT date.
+
+** FUNCTION adodb_strftime($fmt, $timestamp = false)
+
+Convert a timestamp to a formatted local date. Internally converts $fmt into 
+adodb_date format, then echo result.
+
+For best results, you can define the local date format yourself. Define a global
+variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
+adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
+
+    eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
+	
+	Supported format codes:
+
+<pre>
+	%a - abbreviated weekday name according to the current locale 
+	%A - full weekday name according to the current locale 
+	%b - abbreviated month name according to the current locale 
+	%B - full month name according to the current locale 
+	%c - preferred date and time representation for the current locale 
+	%d - day of the month as a decimal number (range 01 to 31) 
+	%D - same as %m/%d/%y 
+	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31') 
+	%h - same as %b
+	%H - hour as a decimal number using a 24-hour clock (range 00 to 23) 
+	%I - hour as a decimal number using a 12-hour clock (range 01 to 12) 
+	%m - month as a decimal number (range 01 to 12) 
+	%M - minute as a decimal number 
+	%n - newline character 
+	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale 
+	%r - time in a.m. and p.m. notation 
+	%R - time in 24 hour notation 
+	%S - second as a decimal number 
+	%t - tab character 
+	%T - current time, equal to %H:%M:%S 
+	%x - preferred date representation for the current locale without the time 
+	%X - preferred time representation for the current locale without the date 
+	%y - year as a decimal number without a century (range 00 to 99) 
+	%Y - year as a decimal number including the century 
+	%Z - time zone or name or abbreviation 
+	%% - a literal `%' character 
+</pre>	
+
+	Unsupported codes:
+<pre>
+	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99) 
+	%g - like %G, but without the century. 
+	%G - The 4-digit year corresponding to the ISO week number (see %V). 
+	     This has the same format and value as %Y, except that if the ISO week number belongs 
+		 to the previous or next year, that year is used instead. 
+	%j - day of the year as a decimal number (range 001 to 366) 
+	%u - weekday as a decimal number [1,7], with 1 representing Monday 
+	%U - week number of the current year as a decimal number, starting 
+	    with the first Sunday as the first day of the first week 
+	%V - The ISO 8601:1988 week number of the current year as a decimal number, 
+	     range 01 to 53, where week 1 is the first week that has at least 4 days in the 
+		 current year, and with Monday as the first day of the week. (Use %G or %g for 
+		 the year component that corresponds to the week number for the specified timestamp.) 
+	%w - day of the week as a decimal, Sunday being 0 
+	%W - week number of the current year as a decimal number, starting with the 
+	     first Monday as the first day of the first week 
+</pre>
+
+=============================================================================
+
+NOTES
+
+Useful url for generating test timestamps:
+	http://www.4webhelp.net/us/timestamp.php
+
+Possible future optimizations include 
+
+a. Using an algorithm similar to Plauger's in "The Standard C Library" 
+(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 
+work outside 32-bit signed range, so i decided not to implement it.
+
+b. Implement daylight savings, which looks awfully complicated, see
+	http://webexhibits.org/daylightsaving/
+
+
+CHANGELOG
+- 19 March 2006 0.24
+Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
+
+- 10 Feb 2006 0.23
+PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000. 
+	In PHP4, we will still use -0000 for 100% compat with PHP4.
+
+- 08 Sept 2005 0.22
+In adodb_date2(), $is_gmt not supported properly. Fixed.
+
+- 18 July  2005 0.21
+In PHP 4.3.11, the 'r' format has changed. Leading 0 in day is added. Changed for compat.
+Added support for negative months in adodb_mktime().
+
+- 24 Feb 2005 0.20
+Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
+
+- 21 Dec 2004 0.17
+In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false. 
+Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
+
+- 17 Nov 2004 0.16
+Removed intval typecast in adodb_mktime() for secs, allowing:
+	 adodb_mktime(0,0,0 + 2236672153,1,1,1934);
+Suggested by Ryan.
+
+- 18 July 2004 0.15
+All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory. 
+This brings it more in line with mktime (still not identical).
+
+- 23 June 2004 0.14
+
+Allow you to define your own daylights savings function, adodb_daylight_sv.
+If the function is defined (somewhere in an include), then you can correct for daylights savings.
+
+In this example, we apply daylights savings in June or July, adding one hour. This is extremely
+unrealistic as it does not take into account time-zone, geographic location, current year.
+
+function adodb_daylight_sv(&$arr, $is_gmt)
+{
+	if ($is_gmt) return;
+	$m = $arr['mon'];
+	if ($m == 6 || $m == 7) $arr['hours'] += 1;
+}
+
+This is only called by adodb_date() and not by adodb_mktime(). 
+
+The format of $arr is
+Array ( 
+   [seconds] => 0 
+   [minutes] => 0 
+   [hours] => 0 
+   [mday] => 1      # day of month, eg 1st day of the month
+   [mon] => 2       # month (eg. Feb)
+   [year] => 2102 
+   [yday] => 31     # days in current year
+   [leap] =>        # true if leap year
+   [ndays] => 28    # no of days in current month
+   ) 
+   
+
+- 28 Apr 2004 0.13
+Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
+
+- 20 Mar 2004 0.12
+Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
+
+- 26 Oct 2003 0.11
+Because of daylight savings problems (some systems apply daylight savings to 
+January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
+
+- 9 Aug 2003 0.10
+Fixed bug with dates after 2038. 
+See http://phplens.com/lens/lensforum/msgs.php?id=6980
+
+- 1 July 2003 0.09
+Added support for Q (Quarter).
+Added adodb_date2(), which accepts ISO date in 2nd param
+
+- 3 March 2003 0.08
+Added support for 'S' adodb_date() format char. Added constant ADODB_ALLOW_NEGATIVE_TS
+if you want PHP to handle negative timestamps between 1901 to 1969.
+
+- 27 Feb 2003 0.07
+All negative numbers handled by adodb now because of RH 7.3+ problems.
+See http://bugs.php.net/bug.php?id=20048&edit=2
+
+- 4 Feb 2003 0.06
+Fixed a typo, 1852 changed to 1582! This means that pre-1852 dates
+are now correctly handled.
+
+- 29 Jan 2003 0.05
+
+Leap year checking differs under Julian calendar (pre 1582). Also
+leap year code optimized by checking for most common case first.
+
+We also handle month overflow correctly in mktime (eg month set to 13).
+
+Day overflow for less than one month's days is supported.
+
+- 28 Jan 2003 0.04
+
+Gregorian correction handled. In PHP5, we might throw an error if 
+mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
+Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
+
+- 27 Jan 2003 0.03
+
+Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
+Fixed calculation of days since start of year for <1970. 
+
+- 27 Jan 2003 0.02
+
+Changed _adodb_getdate() to inline leap year checking for better performance.
+Fixed problem with time-zones west of GMT +0000.
+
+- 24 Jan 2003 0.01
+
+First implementation.
+*/
+
+
+/* Initialization */
+
+/*
+	Version Number
+*/
+define('ADODB_DATE_VERSION',0.24);
+
+/*
+	This code was originally for windows. But apparently this problem happens 
+	also with Linux, RH 7.3 and later!
+	
+	glibc-2.2.5-34 and greater has been changed to return -1 for dates <
+	1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
+	echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
+	
+	References:
+	 http://bugs.php.net/bug.php?id=20048&edit=2
+	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
+*/
+
+if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
+
+function adodb_date_test_date($y1,$m,$d=13)
+{
+	$t = adodb_mktime(0,0,0,$m,$d,$y1);
+	$rez = adodb_date('Y-n-j H:i:s',$t);
+	if ("$y1-$m-$d 00:00:00" != $rez) {
+		print "<b>$y1 error, expected=$y1-$m-$d 00:00:00, adodb=$rez</b><br>";
+		return false;
+	}
+	return true;
+}
+
+function adodb_date_test_strftime($fmt)
+{
+	$s1 = strftime($fmt);
+	$s2 = adodb_strftime($fmt);
+	
+	if ($s1 == $s2) return true;
+	
+	echo "error for $fmt,  strftime=$s1, $adodb=$s2<br>";
+	return false;
+}
+
+/**
+	 Test Suite
+*/
+function adodb_date_test()
+{
+	
+	error_reporting(E_ALL);
+	print "<h4>Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."</h4>";
+	@set_time_limit(0);
+	$fail = false;
+	
+	// This flag disables calling of PHP native functions, so we can properly test the code
+	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
+	
+	adodb_date_test_strftime('%Y %m %x %X');
+	adodb_date_test_strftime("%A %d %B %Y");
+	adodb_date_test_strftime("%H %M S");
+	
+	$t = adodb_mktime(0,0,0);
+	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'<br>';
+	
+	$t = adodb_mktime(0,0,0,6,1,2102);
+	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
+	
+	$t = adodb_mktime(0,0,0,2,1,2102);
+	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
+	
+	
+	print "<p>Testing gregorian <=> julian conversion<p>";
+	$t = adodb_mktime(0,0,0,10,11,1492);
+	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
+	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing<br>';
+	
+	$t = adodb_mktime(0,0,0,2,29,1500);
+	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years<br>';
+	
+	$t = adodb_mktime(0,0,0,2,29,1700);
+	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years<br>';
+	
+	print  adodb_mktime(0,0,0,10,4,1582).' ';
+	print adodb_mktime(0,0,0,10,15,1582);
+	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
+	if ($diff != 3600*24) print " <b>Error in gregorian correction = ".($diff/3600/24)." days </b><br>";
+		
+	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : '<b>Error</b>')."<br>";
+	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : '<b>Error</b>')."<br>";
+	
+	print "<p>Testing overflow<p>";
+	
+	$t = adodb_mktime(0,0,0,3,33,1965);
+	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 <br>';
+	$t = adodb_mktime(0,0,0,4,33,1971);
+	if (!(adodb_date('Y-m-d',$t) == '1971-05-03')) print 'Error in day overflow 2 <br>';
+	$t = adodb_mktime(0,0,0,1,60,1965);
+	if (!(adodb_date('Y-m-d',$t) == '1965-03-01')) print 'Error in day overflow 3 '.adodb_date('Y-m-d',$t).' <br>';
+	$t = adodb_mktime(0,0,0,12,32,1965);
+	if (!(adodb_date('Y-m-d',$t) == '1966-01-01')) print 'Error in day overflow 4 '.adodb_date('Y-m-d',$t).' <br>';
+	$t = adodb_mktime(0,0,0,12,63,1965);
+	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' <br>';
+	$t = adodb_mktime(0,0,0,13,3,1965);
+	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 <br>';
+	
+	print "Testing 2-digit => 4-digit year conversion<p>";
+	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";
+	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010<br>";
+	if (adodb_year_digit_check(20) != 2020) print "Err 2-digit 2020<br>";
+	if (adodb_year_digit_check(30) != 2030) print "Err 2-digit 2030<br>";
+	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940<br>";
+	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>";
+	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>";
+	
+	// Test string formating
+	print "<p>Testing date formating</p>";
+	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
+	$s1 = date($fmt,0);
+	$s2 = adodb_date($fmt,0);
+	if ($s1 != $s2) {
+		print " date() 0 failed<br>$s1<br>$s2<br>";
+	}
+	flush();
+	for ($i=100; --$i > 0; ) {
+
+		$ts = 3600.0*((rand()%60000)+(rand()%60000))+(rand()%60000);
+		$s1 = date($fmt,$ts);
+		$s2 = adodb_date($fmt,$ts);
+		//print "$s1 <br>$s2 <p>";
+		$pos = strcmp($s1,$s2);
+
+		if (($s1) != ($s2)) {
+			for ($j=0,$k=strlen($s1); $j < $k; $j++) {
+				if ($s1[$j] != $s2[$j]) {
+					print substr($s1,$j).' ';
+					break;
+				}
+			}
+			print "<b>Error date(): $ts<br><pre> 
+&nbsp; \"$s1\" (date len=".strlen($s1).")
+&nbsp; \"$s2\" (adodb_date len=".strlen($s2).")</b></pre><br>";
+			$fail = true;
+		}
+		
+		$a1 = getdate($ts);
+		$a2 = adodb_getdate($ts);
+		$rez = array_diff($a1,$a2);
+		if (sizeof($rez)>0) {
+			print "<b>Error getdate() $ts</b><br>";
+				print_r($a1);
+			print "<br>";
+				print_r($a2);
+			print "<p>";
+			$fail = true;
+		}
+	}
+	
+	// Test generation of dates outside 1901-2038
+	print "<p>Testing random dates between 100 and 4000</p>";
+	adodb_date_test_date(100,1);
+	for ($i=100; --$i >= 0;) {
+		$y1 = 100+rand(0,1970-100);
+		$m = rand(1,12);
+		adodb_date_test_date($y1,$m);
+		
+		$y1 = 3000-rand(0,3000-1970);
+		adodb_date_test_date($y1,$m);
+	}
+	print '<p>';
+	$start = 1960+rand(0,10);
+	$yrs = 12;
+	$i = 365.25*86400*($start-1970);
+	$offset = 36000+rand(10000,60000);
+	$max = 365*$yrs*86400;
+	$lastyear = 0;
+	
+	// we generate a timestamp, convert it to a date, and convert it back to a timestamp
+	// and check if the roundtrip broke the original timestamp value.
+	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
+	$cnt = 0;
+	for ($max += $i; $i < $max; $i += $offset) {
+		$ret = adodb_date('m,d,Y,H,i,s',$i);
+		$arr = explode(',',$ret);
+		if ($lastyear != $arr[2]) {
+			$lastyear = $arr[2];
+			print " $lastyear ";
+			flush();
+		}
+		$newi = adodb_mktime($arr[3],$arr[4],$arr[5],$arr[0],$arr[1],$arr[2]);
+		if ($i != $newi) {
+			print "Error at $i, adodb_mktime returned $newi ($ret)";
+			$fail = true;
+			break;
+		}
+		$cnt += 1;
+	}
+	echo "Tested $cnt dates<br>";
+	if (!$fail) print "<p>Passed !</p>";
+	else print "<p><b>Failed</b> :-(</p>";
+}
+
+/**
+	Returns day of week, 0 = Sunday,... 6=Saturday. 
+	Algorithm from PEAR::Date_Calc
+*/
+function adodb_dow($year, $month, $day)
+{
+/*
+Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and 
+proclaimed that from that time onwards 3 days would be dropped from the calendar 
+every 400 years.
+
+Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian). 
+*/
+	if ($year <= 1582) {
+		if ($year < 1582 || 
+			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
+		 else
+			$greg_correction = 0;
+	} else
+		$greg_correction = 0;
+	
+	if($month > 2)
+	    $month -= 2;
+	else {
+	    $month += 10;
+	    $year--;
+	}
+	
+	$day =  floor((13 * $month - 1) / 5) +
+	        $day + ($year % 100) +
+	        floor(($year % 100) / 4) +
+	        floor(($year / 100) / 4) - 2 *
+	        floor($year / 100) + 77 + $greg_correction;
+	
+	return $day - 7 * floor($day / 7);
+}
+
+
+/**
+ Checks for leap year, returns true if it is. No 2-digit year check. Also 
+ handles julian calendar correctly.
+*/
+function _adodb_is_leap_year($year) 
+{
+	if ($year % 4 != 0) return false;
+	
+	if ($year % 400 == 0) {
+		return true;
+	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
+	} else if ($year > 1582 && $year % 100 == 0 ) {
+		return false;
+	} 
+	
+	return true;
+}
+
+
+/**
+ checks for leap year, returns true if it is. Has 2-digit year check
+*/
+function adodb_is_leap_year($year) 
+{
+	return  _adodb_is_leap_year(adodb_year_digit_check($year));
+}
+
+/**
+	Fix 2-digit years. Works for any century.
+ 	Assumes that if 2-digit is more than 30 years in future, then previous century.
+*/
+function adodb_year_digit_check($y) 
+{
+	if ($y < 100) {
+	
+		$yr = (integer) date("Y");
+		$century = (integer) ($yr /100);
+		
+		if ($yr%100 > 50) {
+			$c1 = $century + 1;
+			$c0 = $century;
+		} else {
+			$c1 = $century;
+			$c0 = $century - 1;
+		}
+		$c1 *= 100;
+		// if 2-digit year is less than 30 years in future, set it to this century
+		// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
+		if (($y + $c1) < $yr+30) $y = $y + $c1;
+		else $y = $y + $c0*100;
+	}
+	return $y;
+}
+
+/**
+ get local time zone offset from GMT
+*/
+function adodb_get_gmt_diff() 
+{
+static $TZ;
+	if (isset($TZ)) return $TZ;
+	
+	$TZ = mktime(0,0,0,1,2,1970,0) - gmmktime(0,0,0,1,2,1970,0);
+	return $TZ;
+}
+
+/**
+	Returns an array with date info.
+*/
+function adodb_getdate($d=false,$fast=false)
+{
+	if ($d === false) return getdate();
+	if (!defined('ADODB_TEST_DATES')) {
+		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
+			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
+				return @getdate($d);
+		}
+	}
+	return _adodb_getdate($d);
+}
+
+/*
+// generate $YRS table for _adodb_getdate()
+function adodb_date_gentable($out=true)
+{
+
+	for ($i=1970; $i >= 1600; $i-=10) {
+		$s = adodb_gmmktime(0,0,0,1,1,$i);
+		echo "$i => $s,<br>";	
+	}
+}
+adodb_date_gentable();
+
+for ($i=1970; $i > 1500; $i--) {
+
+echo "<hr />$i ";
+	adodb_date_test_date($i,1,1);
+}
+
+*/
+
+
+$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
+$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	
+function adodb_validdate($y,$m,$d)
+{
+global $_month_table_normal,$_month_table_leaf;
+
+	if (_adodb_is_leap_year($y)) $marr =& $_month_table_leaf;
+	else $marr =& $_month_table_normal;
+	
+	if ($m > 12 || $m < 1) return false;
+	
+	if ($d > 31 || $d < 1) return false;
+	
+	if ($marr[$m] < $d) return false;
+	
+	if ($y < 1000 && $y > 3000) return false;
+	
+	return true;
+}
+
+/**
+	Low-level function that returns the getdate() array. We have a special
+	$fast flag, which if set to true, will return fewer array values,
+	and is much faster as it does not calculate dow, etc.
+*/
+function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
+{
+static $YRS;
+global $_month_table_normal,$_month_table_leaf;
+
+	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff());
+	
+	$_day_power = 86400;
+	$_hour_power = 3600;
+	$_min_power = 60;
+	
+	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 
+	
+	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
+	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	
+	$d366 = $_day_power * 366;
+	$d365 = $_day_power * 365;
+	
+	if ($d < 0) {
+		
+		if (empty($YRS)) $YRS = array(
+			1970 => 0,
+			1960 => -315619200,
+			1950 => -631152000,
+			1940 => -946771200,
+			1930 => -1262304000,
+			1920 => -1577923200,
+			1910 => -1893456000,
+			1900 => -2208988800,
+			1890 => -2524521600,
+			1880 => -2840140800,
+			1870 => -3155673600,
+			1860 => -3471292800,
+			1850 => -3786825600,
+			1840 => -4102444800,
+			1830 => -4417977600,
+			1820 => -4733596800,
+			1810 => -5049129600,
+			1800 => -5364662400,
+			1790 => -5680195200,
+			1780 => -5995814400,
+			1770 => -6311347200,
+			1760 => -6626966400,
+			1750 => -6942499200,
+			1740 => -7258118400,
+			1730 => -7573651200,
+			1720 => -7889270400,
+			1710 => -8204803200,
+			1700 => -8520336000,
+			1690 => -8835868800,
+			1680 => -9151488000,
+			1670 => -9467020800,
+			1660 => -9782640000,
+			1650 => -10098172800,
+			1640 => -10413792000,
+			1630 => -10729324800,
+			1620 => -11044944000,
+			1610 => -11360476800,
+			1600 => -11676096000);
+
+		if ($is_gmt) $origd = $d;
+		// The valid range of a 32bit signed timestamp is typically from 
+		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
+		//
+		
+		# old algorithm iterates through all years. new algorithm does it in
+		# 10 year blocks
+		
+		/*
+		# old algo
+		for ($a = 1970 ; --$a >= 0;) {
+			$lastd = $d;
+			
+			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
+			else $d += $d365;
+			
+			if ($d >= 0) {
+				$year = $a;
+				break;
+			}
+		}
+		*/
+		
+		$lastsecs = 0;
+		$lastyear = 1970;
+		foreach($YRS as $year => $secs) {
+			if ($d >= $secs) {
+				$a = $lastyear;
+				break;
+			}
+			$lastsecs = $secs;
+			$lastyear = $year;
+		}
+		
+		$d -= $lastsecs;
+		if (!isset($a)) $a = $lastyear;
+		
+		//echo ' yr=',$a,' ', $d,'.';
+		
+		for (; --$a >= 0;) {
+			$lastd = $d;
+			
+			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
+			else $d += $d365;
+			
+			if ($d >= 0) {
+				$year = $a;
+				break;
+			}
+		}
+		/**/
+		
+		$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
+		
+		$d = $lastd;
+		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
+		for ($a = 13 ; --$a > 0;) {
+			$lastd = $d;
+			$d += $mtab[$a] * $_day_power;
+			if ($d >= 0) {
+				$month = $a;
+				$ndays = $mtab[$a];
+				break;
+			}
+		}
+		
+		$d = $lastd;
+		$day = $ndays + ceil(($d+1) / ($_day_power));
+
+		$d += ($ndays - $day+1)* $_day_power;
+		$hour = floor($d/$_hour_power);
+	
+	} else {
+		for ($a = 1970 ;; $a++) {
+			$lastd = $d;
+			
+			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
+			else $d -= $d365;
+			if ($d < 0) {
+				$year = $a;
+				break;
+			}
+		}
+		$secsInYear = $lastd;
+		$d = $lastd;
+		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
+		for ($a = 1 ; $a <= 12; $a++) {
+			$lastd = $d;
+			$d -= $mtab[$a] * $_day_power;
+			if ($d < 0) {
+				$month = $a;
+				$ndays = $mtab[$a];
+				break;
+			}
+		}
+		$d = $lastd;
+		$day = ceil(($d+1) / $_day_power);
+		$d = $d - ($day-1) * $_day_power;
+		$hour = floor($d /$_hour_power);
+	}
+	
+	$d -= $hour * $_hour_power;
+	$min = floor($d/$_min_power);
+	$secs = $d - $min * $_min_power;
+	if ($fast) {
+		return array(
+		'seconds' => $secs,
+		'minutes' => $min,
+		'hours' => $hour,
+		'mday' => $day,
+		'mon' => $month,
+		'year' => $year,
+		'yday' => floor($secsInYear/$_day_power),
+		'leap' => $leaf,
+		'ndays' => $ndays
+		);
+	}
+	
+	
+	$dow = adodb_dow($year,$month,$day);
+
+	return array(
+		'seconds' => $secs,
+		'minutes' => $min,
+		'hours' => $hour,
+		'mday' => $day,
+		'wday' => $dow,
+		'mon' => $month,
+		'year' => $year,
+		'yday' => floor($secsInYear/$_day_power),
+		'weekday' => gmdate('l',$_day_power*(3+$dow)),
+		'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),
+		0 => $origd
+	);
+}
+
+function adodb_gmdate($fmt,$d=false)
+{
+	return adodb_date($fmt,$d,true);
+}
+
+// accepts unix timestamp and iso date format in $d
+function adodb_date2($fmt, $d=false, $is_gmt=false)
+{
+	if ($d !== false) {
+		if (!preg_match( 
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
+
+		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
+	
+		// h-m-s-MM-DD-YY
+		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1],false,$is_gmt);
+		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1],false,$is_gmt);
+	}
+	
+	return adodb_date($fmt,$d,$is_gmt);
+}
+
+
+/**
+	Return formatted date based on timestamp $d
+*/
+function adodb_date($fmt,$d=false,$is_gmt=false)
+{
+static $daylight;
+
+	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
+	if (!defined('ADODB_TEST_DATES')) {
+		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
+			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
+				return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);
+
+		}
+	}
+	$_day_power = 86400;
+	
+	$arr = _adodb_getdate($d,true,$is_gmt);
+	
+	if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
+	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
+	
+	$year = $arr['year'];
+	$month = $arr['mon'];
+	$day = $arr['mday'];
+	$hour = $arr['hours'];
+	$min = $arr['minutes'];
+	$secs = $arr['seconds'];
+	
+	$max = strlen($fmt);
+	$dates = '';
+	
+	$isphp5 = PHP_VERSION >= 5;
+	
+	/*
+		at this point, we have the following integer vars to manipulate:
+		$year, $month, $day, $hour, $min, $secs
+	*/
+	for ($i=0; $i < $max; $i++) {
+		switch($fmt[$i]) {
+		case 'T': $dates .= date('T');break;
+		// YEAR
+		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
+		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
+		
+			// 4.3.11 uses '04 Jun 2004'
+			// 4.3.8 uses  ' 4 Jun 2004'
+			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
+				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
+			
+			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
+			
+			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
+			
+			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
+			
+			$gmt = adodb_get_gmt_diff();
+			if ($isphp5) 
+				$dates .= sprintf(' %s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
+			else
+				$dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+			break;
+				
+		case 'Y': $dates .= $year; break;
+		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
+		// MONTH
+		case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
+		case 'Q': $dates .= ($month+3)>>2; break;
+		case 'n': $dates .= $month; break;
+		case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
+		case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;
+		// DAY
+		case 't': $dates .= $arr['ndays']; break;
+		case 'z': $dates .= $arr['yday']; break;
+		case 'w': $dates .= adodb_dow($year,$month,$day); break;
+		case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+		case 'j': $dates .= $day; break;
+		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
+		case 'S': 
+			$d10 = $day % 10;
+			if ($d10 == 1) $dates .= 'st';
+			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
+			else if ($d10 == 3) $dates .= 'rd';
+			else $dates .= 'th';
+			break;
+			
+		// HOUR
+		case 'Z':
+			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;
+		case 'O': 
+			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();
+			
+			if ($isphp5)
+				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
+			else
+				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+			break;
+			
+		case 'H': 
+			if ($hour < 10) $dates .= '0'.$hour; 
+			else $dates .= $hour; 
+			break;
+		case 'h': 
+			if ($hour > 12) $hh = $hour - 12; 
+			else {
+				if ($hour == 0) $hh = '12'; 
+				else $hh = $hour;
+			}
+			
+			if ($hh < 10) $dates .= '0'.$hh;
+			else $dates .= $hh;
+			break;
+			
+		case 'G': 
+			$dates .= $hour;
+			break;
+			
+		case 'g':
+			if ($hour > 12) $hh = $hour - 12; 
+			else {
+				if ($hour == 0) $hh = '12'; 
+				else $hh = $hour; 
+			}
+			$dates .= $hh;
+			break;
+		// MINUTES
+		case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;
+		// SECONDS
+		case 'U': $dates .= $d; break;
+		case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;
+		// AM/PM
+		// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
+		case 'a':
+			if ($hour>=12) $dates .= 'pm';
+			else $dates .= 'am';
+			break;
+		case 'A':
+			if ($hour>=12) $dates .= 'PM';
+			else $dates .= 'AM';
+			break;
+		default:
+			$dates .= $fmt[$i]; break;
+		// ESCAPE
+		case "\\": 
+			$i++;
+			if ($i < $max) $dates .= $fmt[$i];
+			break;
+		}
+	}
+	return $dates;
+}
+
+/**
+	Returns a timestamp given a GMT/UTC time. 
+	Note that $is_dst is not implemented and is ignored.
+*/
+function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
+{
+	return adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst,true);
+}
+
+/**
+	Return a timestamp given a local time. Originally by jackbbs.
+	Note that $is_dst is not implemented and is ignored.
+	
+	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
+*/
+function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) 
+{
+	if (!defined('ADODB_TEST_DATES')) {
+
+		if ($mon === false) {
+			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
+		}
+		
+		// for windows, we don't check 1970 because with timezone differences, 
+		// 1 Jan 1970 could generate negative timestamp, which is illegal
+		if (1971 < $year && $year < 2038
+			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
+			) {
+				return $is_gmt ?
+					@gmmktime($hr,$min,$sec,$mon,$day,$year):
+					@mktime($hr,$min,$sec,$mon,$day,$year);
+			}
+	}
+	
+	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff();
+
+	/*
+	# disabled because some people place large values in $sec.
+	# however we need it for $mon because we use an array...
+	$hr = intval($hr);
+	$min = intval($min);
+	$sec = intval($sec);
+	*/
+	$mon = intval($mon);
+	$day = intval($day);
+	$year = intval($year);
+	
+	
+	$year = adodb_year_digit_check($year);
+
+	if ($mon > 12) {
+		$y = floor($mon / 12);
+		$year += $y;
+		$mon -= $y*12;
+	} else if ($mon < 1) {
+		$y = ceil((1-$mon) / 12);
+		$year -= $y;
+		$mon += $y*12;
+	}
+	
+	$_day_power = 86400;
+	$_hour_power = 3600;
+	$_min_power = 60;
+	
+	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
+	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	
+	$_total_date = 0;
+	if ($year >= 1970) {
+		for ($a = 1970 ; $a <= $year; $a++) {
+			$leaf = _adodb_is_leap_year($a);
+			if ($leaf == true) {
+				$loop_table = $_month_table_leaf;
+				$_add_date = 366;
+			} else {
+				$loop_table = $_month_table_normal;
+				$_add_date = 365;
+			}
+			if ($a < $year) { 
+				$_total_date += $_add_date;
+			} else {
+				for($b=1;$b<$mon;$b++) {
+					$_total_date += $loop_table[$b];
+				}
+			}
+		}
+		$_total_date +=$day-1;
+		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
+	
+	} else {
+		for ($a = 1969 ; $a >= $year; $a--) {
+			$leaf = _adodb_is_leap_year($a);
+			if ($leaf == true) {
+				$loop_table = $_month_table_leaf;
+				$_add_date = 366;
+			} else {
+				$loop_table = $_month_table_normal;
+				$_add_date = 365;
+			}
+			if ($a > $year) { $_total_date += $_add_date;
+			} else {
+				for($b=12;$b>$mon;$b--) {
+					$_total_date += $loop_table[$b];
+				}
+			}
+		}
+		$_total_date += $loop_table[$mon] - $day;
+		
+		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
+		$_day_time = $_day_power - $_day_time;
+		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
+		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
+		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
+	} 
+	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
+	return $ret;
+}
+
+function adodb_gmstrftime($fmt, $ts=false)
+{
+	return adodb_strftime($fmt,$ts,true);
+}
+
+// hack - convert to adodb_date
+function adodb_strftime($fmt, $ts=false,$is_gmt=false)
+{
+global $ADODB_DATE_LOCALE;
+
+	if (!defined('ADODB_TEST_DATES')) {
+		if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
+			if (!defined('ADODB_NO_NEGATIVE_TS') || $ts >= 0) // if windows, must be +ve integer
+				return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);
+
+		}
+	}
+	
+	if (empty($ADODB_DATE_LOCALE)) {
+	/*
+		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
+		$sep = substr($tstr,2,1);
+		$hasAM = strrpos($tstr,'M') !== false;
+	*/
+		# see http://phplens.com/lens/lensforum/msgs.php?id=14865 for reasoning, and changelog for version 0.24
+		$dstr = gmstrftime('%x',31366800); // 30 Dec 1970, 1 am
+		$sep = substr($dstr,2,1);
+		$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
+		$hasAM = strrpos($tstr,'M') !== false;
+		
+		$ADODB_DATE_LOCALE = array();
+		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	
+		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
+			
+	}
+	$inpct = false;
+	$fmtdate = '';
+	for ($i=0,$max = strlen($fmt); $i < $max; $i++) {
+		$ch = $fmt[$i];
+		if ($ch == '%') {
+			if ($inpct) {
+				$fmtdate .= '%';
+				$inpct = false;
+			} else
+				$inpct = true;
+		} else if ($inpct) {
+		
+			$inpct = false;
+			switch($ch) {
+			case '0':
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9':
+			case 'E':
+			case 'O':
+				/* ignore format modifiers */
+				$inpct = true; 
+				break;
+				
+			case 'a': $fmtdate .= 'D'; break;
+			case 'A': $fmtdate .= 'l'; break;
+			case 'h':
+			case 'b': $fmtdate .= 'M'; break;
+			case 'B': $fmtdate .= 'F'; break;
+			case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;
+			case 'C': $fmtdate .= '\C?'; break; // century
+			case 'd': $fmtdate .= 'd'; break;
+			case 'D': $fmtdate .= 'm/d/y'; break;
+			case 'e': $fmtdate .= 'j'; break;
+			case 'g': $fmtdate .= '\g?'; break; //?
+			case 'G': $fmtdate .= '\G?'; break; //?
+			case 'H': $fmtdate .= 'H'; break;
+			case 'I': $fmtdate .= 'h'; break;
+			case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd
+			case 'm': $fmtdate .= 'm'; break;
+			case 'M': $fmtdate .= 'i'; break;
+			case 'n': $fmtdate .= "\n"; break;
+			case 'p': $fmtdate .= 'a'; break;
+			case 'r': $fmtdate .= 'h:i:s a'; break;
+			case 'R': $fmtdate .= 'H:i:s'; break;
+			case 'S': $fmtdate .= 's'; break;
+			case 't': $fmtdate .= "\t"; break;
+			case 'T': $fmtdate .= 'H:i:s'; break;
+			case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-based
+			case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based
+			case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
+			case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
+			case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-based
+			case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based
+			case 'y': $fmtdate .= 'y'; break;
+			case 'Y': $fmtdate .= 'Y'; break;
+			case 'Z': $fmtdate .= 'T'; break;
+			}
+		} else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))
+			$fmtdate .= "\\".$ch;
+		else
+			$fmtdate .= $ch;
+	}
+	//echo "fmt=",$fmtdate,"<br>";
+	if ($ts === false) $ts = time();
+	$ret = adodb_date($fmtdate, $ts, $is_gmt);
+	return $ret;
+}
+
+
 ?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-postgres.inc.php b/libraries/adodb/drivers/adodb-postgres.inc.php
index 4dd3f82c..5e8ce48e 100644
--- a/libraries/adodb/drivers/adodb-postgres.inc.php
+++ b/libraries/adodb/drivers/adodb-postgres.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
diff --git a/libraries/adodb/drivers/adodb-postgres7.inc.php b/libraries/adodb/drivers/adodb-postgres7.inc.php
index dc0c08e0..5c3d7bb6 100644
--- a/libraries/adodb/drivers/adodb-postgres7.inc.php
+++ b/libraries/adodb/drivers/adodb-postgres7.inc.php
@@ -1,230 +1,264 @@
-<?php

-/*

- V4.65 22 July 2005  (c) 2000-2005 John Lim (jlim#natsoft.com.my). All rights reserved.

-  Released under both BSD license and Lesser GPL library license. 

-  Whenever there is any discrepancy between the two licenses, 

-  the BSD license will take precedence.

-  Set tabs to 4.

-  

-  Postgres7 support.

-  28 Feb 2001: Currently indicate that we support LIMIT

-  01 Dec 2001: dannym added support for default values

-*/

-

-// security - hide paths

-if (!defined('ADODB_DIR')) die();

-

-include_once(ADODB_DIR."/drivers/adodb-postgres64.inc.php");

-

-class ADODB_postgres7 extends ADODB_postgres64 {

-	var $databaseType = 'postgres7';	

-	var $hasLimit = true;	// set to true for pgsql 6.5+ only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10

-	var $ansiOuter = true;

-	var $charSet = true; //set to true for Postgres 7 and above - PG client supports encodings

-	

-	function ADODB_postgres7() 

-	{

-		$this->ADODB_postgres64();

-		if (ADODB_ASSOC_CASE !== 2) {

-			$this->rsPrefix .= 'assoc_';

-		}

-	}

-

-	

-	// the following should be compat with postgresql 7.2, 

-	// which makes obsolete the LIMIT limit,offset syntax

-	 function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 

-	 {

-		 $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';

-		 $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';

-		 if ($secs2cache)

-		  	$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);

-		 else

-		  	$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);

-		

-		return $rs;

-	 }

- 	/*

- 	function Prepare($sql)

-	{

-		$info = $this->ServerInfo();

-		if ($info['version']>=7.3) {

-			return array($sql,false);

-		}

-		return $sql;

-	}

- 	*/

-

-	// from  Edward Jaramilla, improved version - works on pg 7.4

-function MetaForeignKeys($table, $owner=false, $upper=false)

-{

-	$sql = 'SELECT t.tgargs as args

-	FROM

-	pg_trigger t,pg_class c,pg_proc p

-	WHERE

-	t.tgenabled AND

-	t.tgrelid = c.oid AND

-	t.tgfoid = p.oid AND

-	p.proname = \'RI_FKey_check_ins\' AND

-	c.relname = \''.strtolower($table).'\'

-	ORDER BY

-		t.tgrelid';

-	

-	$rs = $this->Execute($sql);

-	

-	if ($rs && !$rs->EOF) {

-		$arr =& $rs->GetArray();

-		$a = array();

-		foreach($arr as $v)

-		{

-			$data = explode(chr(0), $v['args']);

-			if ($upper) {

-				$a[strtoupper($data[2])][] = strtoupper($data[4].'='.$data[5]);

-			} else {

-			$a[$data[2]][] = $data[4].'='.$data[5];

-			}

-		}

-		return $a;

-	}

-	return false;

-}

-

-

-	

- 	 // this is a set of functions for managing client encoding - very important if the encodings

-	// of your database and your output target (i.e. HTML) don't match

-	//for instance, you may have UNICODE database and server it on-site as WIN1251 etc.

-	// GetCharSet - get the name of the character set the client is using now

-	// the functions should work with Postgres 7.0 and above, the set of charsets supported

-	// depends on compile flags of postgres distribution - if no charsets were compiled into the server

-	// it will return 'SQL_ANSI' always

-	function GetCharSet()

-	{

-		//we will use ADO's builtin property charSet

-		$this->charSet = @pg_client_encoding($this->_connectionID);

-		if (!$this->charSet) {

-			return false;

-		} else {

-			return $this->charSet;

-		}

-	}

-	

-	// SetCharSet - switch the client encoding

-	function SetCharSet($charset_name)

-	{

-		$this->GetCharSet();

-		if ($this->charSet !== $charset_name) {

-			$if = pg_set_client_encoding($this->_connectionID, $charset_name);

-			if ($if == "0" & $this->GetCharSet() == $charset_name) {

-				return true;

-			} else return false;

-		} else return true;

-	}

-

-}

-	

-/*--------------------------------------------------------------------------------------

-	 Class Name: Recordset

---------------------------------------------------------------------------------------*/

-

-class ADORecordSet_postgres7 extends ADORecordSet_postgres64{

-

-	var $databaseType = "postgres7";

-	

-	

-	function ADORecordSet_postgres7($queryID,$mode=false) 

-	{

-		$this->ADORecordSet_postgres64($queryID,$mode);

-	}

-	

-	 	// 10% speedup to move MoveNext to child class

-	function MoveNext() 

-	{

-		if (!$this->EOF) {

-			$this->_currentRow++;

-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {

-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);

-			

-				if (is_array($this->fields)) {

-					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();

-					return true;

-				}

-			}

-			$this->fields = false;

-			$this->EOF = true;

-		}

-		return false;

-	}		

-

-}

-

-class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{

-

-	var $databaseType = "postgres7";

-	

-	

-	function ADORecordSet_assoc_postgres7($queryID,$mode=false) 

-	{

-		$this->ADORecordSet_postgres64($queryID,$mode);

-	}

-	

-	function _fetch()

-	{

-		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)

-        	return false;

-

-		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);

-		

-		if ($this->fields) {

-			if (isset($this->_blobArr)) $this->_fixblobs();

-			$this->_updatefields();

-		}

-			

-		return (is_array($this->fields));

-	}

-	

-		// Create associative array

-	function _updatefields()

-	{

-		if (ADODB_ASSOC_CASE == 2) return; // native

-	

-		$arr = array();

-		$lowercase = (ADODB_ASSOC_CASE == 0);

-		

-		foreach($this->fields as $k => $v) {

-			if (is_integer($k)) $arr[$k] = $v;

-			else {

-				if ($lowercase)

-					$arr[strtolower($k)] = $v;

-				else

-					$arr[strtoupper($k)] = $v;

-			}

-		}

-		$this->fields = $arr;

-	}

-	

-	function MoveNext() 

-	{

-		if (!$this->EOF) {

-			$this->_currentRow++;

-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {

-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);

-			

-				if (is_array($this->fields)) {

-					if ($this->fields) {

-						if (isset($this->_blobArr)) $this->_fixblobs();

-					

-						$this->_updatefields();

-					}

-					return true;

-				}

-			}

-			

-			

-			$this->fields = false;

-			$this->EOF = true;

-		}

-		return false;

-	}

-}

+<?php
+/*
+ V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 4.
+  
+  Postgres7 support.
+  28 Feb 2001: Currently indicate that we support LIMIT
+  01 Dec 2001: dannym added support for default values
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-postgres64.inc.php");
+
+class ADODB_postgres7 extends ADODB_postgres64 {
+	var $databaseType = 'postgres7';	
+	var $hasLimit = true;	// set to true for pgsql 6.5+ only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
+	var $ansiOuter = true;
+	var $charSet = true; //set to true for Postgres 7 and above - PG client supports encodings
+	
+	function ADODB_postgres7() 
+	{
+		$this->ADODB_postgres64();
+		if (ADODB_ASSOC_CASE !== 2) {
+			$this->rsPrefix .= 'assoc_';
+		}
+		$this->_bindInputArray = PHP_VERSION >= 5.1;
+	}
+
+	
+	// the following should be compat with postgresql 7.2, 
+	// which makes obsolete the LIMIT limit,offset syntax
+	 function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	 {
+		 $offsetStr = ($offset >= 0) ? " OFFSET ".((integer)$offset) : '';
+		 $limitStr  = ($nrows >= 0)  ? " LIMIT ".((integer)$nrows) : '';
+		 if ($secs2cache)
+		  	$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+		 else
+		  	$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+		
+		return $rs;
+	 }
+ 	/*
+ 	function Prepare($sql)
+	{
+		$info = $this->ServerInfo();
+		if ($info['version']>=7.3) {
+			return array($sql,false);
+		}
+		return $sql;
+	}
+ 	*/
+
+
+	// from  Edward Jaramilla, improved version - works on pg 7.4
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+		$sql = 'SELECT t.tgargs as args
+		FROM
+		pg_trigger t,pg_class c,pg_proc p
+		WHERE
+		t.tgenabled AND
+		t.tgrelid = c.oid AND
+		t.tgfoid = p.oid AND
+		p.proname = \'RI_FKey_check_ins\' AND
+		c.relname = \''.strtolower($table).'\'
+		ORDER BY
+			t.tgrelid';
+		
+		$rs =& $this->Execute($sql);
+		
+		if (!$rs || $rs->EOF) return false;
+		
+		$arr =& $rs->GetArray();
+		$a = array();
+		foreach($arr as $v) {
+			$data = explode(chr(0), $v['args']);
+			$size = count($data)-1; //-1 because the last node is empty
+			for($i = 4; $i < $size; $i++) {
+				if ($upper) 
+					$a[strtoupper($data[2])][] = strtoupper($data[$i].'='.$data[++$i]);
+				else 
+					$a[$data[2]][] = $data[$i].'='.$data[++$i];
+			}
+		}
+		return $a;
+	}
+
+	function _query($sql,$inputarr)
+	{
+		if (! $this->_bindInputArray) {
+			// We don't have native support for parameterized queries, so let's emulate it at the parent
+			return ADODB_postgres64::_query($sql, $inputarr);
+		}
+		$this->_errorMsg = false;
+		// -- added Cristiano da Cunha Duarte
+		if ($inputarr) {
+			$sqlarr = explode('?',trim($sql));
+			$sql = '';
+			$i = 1;
+			$last = sizeof($sqlarr)-1;
+			foreach($sqlarr as $v) {
+				if ($last < $i) $sql .= $v;
+				else $sql .= $v.' $'.$i;
+				$i++;
+			}
+			
+			$rez = pg_query_params($this->_connectionID,$sql, $inputarr);
+		} else {
+			$rez = pg_query($this->_connectionID,$sql);
+		}
+		// check if no data returned, then no need to create real recordset
+		if ($rez && pg_numfields($rez) <= 0) {
+			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
+				pg_freeresult($this->_resultid);
+			}
+			$this->_resultid = $rez;
+			return true;
+		}		
+		return $rez;
+	}
+	
+ 	 // this is a set of functions for managing client encoding - very important if the encodings
+	// of your database and your output target (i.e. HTML) don't match
+	//for instance, you may have UNICODE database and server it on-site as WIN1251 etc.
+	// GetCharSet - get the name of the character set the client is using now
+	// the functions should work with Postgres 7.0 and above, the set of charsets supported
+	// depends on compile flags of postgres distribution - if no charsets were compiled into the server
+	// it will return 'SQL_ANSI' always
+	function GetCharSet()
+	{
+		//we will use ADO's builtin property charSet
+		$this->charSet = @pg_client_encoding($this->_connectionID);
+		if (!$this->charSet) {
+			return false;
+		} else {
+			return $this->charSet;
+		}
+	}
+	
+	// SetCharSet - switch the client encoding
+	function SetCharSet($charset_name)
+	{
+		$this->GetCharSet();
+		if ($this->charSet !== $charset_name) {
+			$if = pg_set_client_encoding($this->_connectionID, $charset_name);
+			if ($if == "0" & $this->GetCharSet() == $charset_name) {
+				return true;
+			} else return false;
+		} else return true;
+	}
+
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
+
+	var $databaseType = "postgres7";
+	
+	
+	function ADORecordSet_postgres7($queryID,$mode=false) 
+	{
+		$this->ADORecordSet_postgres64($queryID,$mode);
+	}
+	
+	 	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+		if (!$this->EOF) {
+			$this->_currentRow++;
+			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
+				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+			
+				if (is_array($this->fields)) {
+					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
+					return true;
+				}
+			}
+			$this->fields = false;
+			$this->EOF = true;
+		}
+		return false;
+	}		
+
+}
+
+class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
+
+	var $databaseType = "postgres7";
+	
+	
+	function ADORecordSet_assoc_postgres7($queryID,$mode=false) 
+	{
+		$this->ADORecordSet_postgres64($queryID,$mode);
+	}
+	
+	function _fetch()
+	{
+		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
+        	return false;
+
+		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+		
+		if ($this->fields) {
+			if (isset($this->_blobArr)) $this->_fixblobs();
+			$this->_updatefields();
+		}
+			
+		return (is_array($this->fields));
+	}
+	
+		// Create associative array
+	function _updatefields()
+	{
+		if (ADODB_ASSOC_CASE == 2) return; // native
+	
+		$arr = array();
+		$lowercase = (ADODB_ASSOC_CASE == 0);
+		
+		foreach($this->fields as $k => $v) {
+			if (is_integer($k)) $arr[$k] = $v;
+			else {
+				if ($lowercase)
+					$arr[strtolower($k)] = $v;
+				else
+					$arr[strtoupper($k)] = $v;
+			}
+		}
+		$this->fields = $arr;
+	}
+	
+	function MoveNext() 
+	{
+		if (!$this->EOF) {
+			$this->_currentRow++;
+			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
+				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+			
+				if (is_array($this->fields)) {
+					if ($this->fields) {
+						if (isset($this->_blobArr)) $this->_fixblobs();
+					
+						$this->_updatefields();
+					}
+					return true;
+				}
+			}
+			
+			
+			$this->fields = false;
+			$this->EOF = true;
+		}
+		return false;
+	}
+}
 ?>
\ No newline at end of file
diff --git a/libraries/adodb/drivers/adodb-postgres8.inc.php b/libraries/adodb/drivers/adodb-postgres8.inc.php
index ab364a71..f3712a39 100755
--- a/libraries/adodb/drivers/adodb-postgres8.inc.php
+++ b/libraries/adodb/drivers/adodb-postgres8.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
diff --git a/libraries/adodb/toexport.inc.php b/libraries/adodb/toexport.inc.php
index 6e0f777d..a7406a03 100644
--- a/libraries/adodb/toexport.inc.php
+++ b/libraries/adodb/toexport.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /** 
- * @version V4.93 10 Oct 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 
diff --git a/libraries/adodb/tohtml.inc.php b/libraries/adodb/tohtml.inc.php
index 5f1071cc..050e9556 100755
--- a/libraries/adodb/tohtml.inc.php
+++ b/libraries/adodb/tohtml.inc.php
@@ -1,6 +1,6 @@
 <?php 
 /*
-  V4.93 10 Oct 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.93 10 Oct 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.