Update to last adodb version. Use Unix newlines.

9 files changed, 1800 insertions, 1793 deletions

diff --git a/libraries/adodb/adodb-csvlib.inc.php b/libraries/adodb/adodb-csvlib.inc.php
index 9ca9c1b3..a031d985 100644
--- a/libraries/adodb/adodb-csvlib.inc.php
+++ b/libraries/adodb/adodb-csvlib.inc.php
@@ -1,312 +1,312 @@
-<?php

-

-// security - hide paths

-if (!defined('ADODB_DIR')) die();

-

-global $ADODB_INCLUDED_CSV;

-$ADODB_INCLUDED_CSV = 1;

-

-/* 

-

-  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 CSV serialization. This is used by the csv/proxy driver and is the 

-  CacheExecute() serialization format. 

-  

-  ==== NOTE ====

-  Format documented at http://php.weblogs.com/ADODB_CSV

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

-*/

-

-	/**

- 	 * convert a recordset into special format

-	 *

-	 * @param rs	the recordset

-	 *

-	 * @return	the CSV formated data

-	 */

-	function _rs2serialize(&$rs,$conn=false,$sql='')

-	{

-		$max = ($rs) ? $rs->FieldCount() : 0;

-		

-		if ($sql) $sql = urlencode($sql);

-		// metadata setup

-		

-		if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete

-			if (is_object($conn)) {

-				$sql .= ','.$conn->Affected_Rows();

-				$sql .= ','.$conn->Insert_ID();

-			} else

-				$sql .= ',,';

-			

-			$text = "====-1,0,$sql\n";

-			return $text;

-		}

-		$tt = ($rs->timeCreated) ? $rs->timeCreated : time();

-		

-		## changed format from ====0 to ====1

-		$line = "====1,$tt,$sql\n";

-		

-		if ($rs->databaseType == 'array') {

-			$rows =& $rs->_array;

-		} else {

-			$rows = array();

-			while (!$rs->EOF) {	

-				$rows[] = $rs->fields;

-				$rs->MoveNext();

-			} 

-		}

-		

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

-			$o =& $rs->FetchField($i);

-			$flds[] = $o;

-		}

-	

-		$savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;

-		$class = $rs->connection->arrayClass;

-		$rs2 = new $class();

-		$rs2->sql = $rs->sql;

-		$rs2->oldProvider = $rs->dataProvider; 

-		$rs2->InitArrayFields($rows,$flds);

-		$rs2->fetchMode = $savefetch;

-		return $line.serialize($rs2);

-	}

-

-	

-/**

-* Open CSV file and convert it into Data. 

-*

-* @param url  		file/ftp/http url

-* @param err		returns the error message

-* @param timeout	dispose if recordset has been alive for $timeout secs

-*

-* @return		recordset, or false if error occured. If no

-*			error occurred in sql INSERT/UPDATE/DELETE, 

-*			empty recordset is returned

-*/

-	function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array')

-	{

-		$false = false;

-		$err = false;

-		$fp = @fopen($url,'rb');

-		if (!$fp) {

-			$err = $url.' file/URL not found';

-			return $false;

-		}

-		@flock($fp, LOCK_SH);

-		$arr = array();

-		$ttl = 0;

-		

-		if ($meta = fgetcsv($fp, 32000, ",")) {

-			// check if error message

-			if (strncmp($meta[0],'****',4) === 0) {

-				$err = trim(substr($meta[0],4,1024));

-				fclose($fp);

-				return $false;

-			}

-			// check for meta data

-			// $meta[0] is -1 means return an empty recordset

-			// $meta[1] contains a time 

-	

-			if (strncmp($meta[0], '====',4) === 0) {

-			

-				if ($meta[0] == "====-1") {

-					if (sizeof($meta) < 5) {

-						$err = "Corrupt first line for format -1";

-						fclose($fp);

-						return $false;

-					}

-					fclose($fp);

-					

-					if ($timeout > 0) {

-						$err = " Illegal Timeout $timeout ";

-						return $false;

-					}

-					

-					$rs = new $rsclass($val=true);

-					$rs->fields = array();

-					$rs->timeCreated = $meta[1];

-					$rs->EOF = true;

-					$rs->_numOfFields = 0;

-					$rs->sql = urldecode($meta[2]);

-					$rs->affectedrows = (integer)$meta[3];

-					$rs->insertid = $meta[4];	

-					return $rs;

-				} 

-			# Under high volume loads, we want only 1 thread/process to _write_file

-			# so that we don't have 50 processes queueing to write the same data.

-			# We use probabilistic timeout, ahead of time.

-			#

-			# -4 sec before timeout, give processes 1/32 chance of timing out

-			# -2 sec before timeout, give processes 1/16 chance of timing out

-			# -1 sec after timeout give processes 1/4 chance of timing out

-			# +0 sec after timeout, give processes 100% chance of timing out

-				if (sizeof($meta) > 1) {

-					if($timeout >0){ 

-						$tdiff = (integer)( $meta[1]+$timeout - time());

-						if ($tdiff <= 2) {

-							switch($tdiff) {

-							case 4:

-							case 3:

-								if ((rand() & 31) == 0) {

-									fclose($fp);

-									$err = "Timeout 3";

-									return $false;

-								}

-								break;

-							case 2: 

-								if ((rand() & 15) == 0) {

-									fclose($fp);

-									$err = "Timeout 2";

-									return $false;

-								}

-								break;

-							case 1:

-								if ((rand() & 3) == 0) {

-									fclose($fp);

-									$err = "Timeout 1";

-									return $false;

-								}

-								break;

-							default: 

-								fclose($fp);

-								$err = "Timeout 0";

-								return $false;

-							} // switch

-							

-						} // if check flush cache

-					}// (timeout>0)

-					$ttl = $meta[1];

-				}

-				//================================================

-				// new cache format - use serialize extensively...

-				if ($meta[0] === '====1') {

-					// slurp in the data

-					$MAXSIZE = 128000;

-					

-					$text = fread($fp,$MAXSIZE);

-					if (strlen($text)) {

-						while ($txt = fread($fp,$MAXSIZE)) {

-							$text .= $txt;

-						}

-					}

-					fclose($fp);

-					$rs = unserialize($text);

-					if (is_object($rs)) $rs->timeCreated = $ttl;

-					else {

-						$err = "Unable to unserialize recordset";

-						//echo htmlspecialchars($text),' !--END--!<p>';

-					}

-					return $rs;

-				}

-				

-				$meta = false;

-				$meta = fgetcsv($fp, 32000, ",");

-				if (!$meta) {

-					fclose($fp);

-					$err = "Unexpected EOF 1";

-					return $false;

-				}

-			}

-

-			// Get Column definitions

-			$flds = array();

-			foreach($meta as $o) {

-				$o2 = explode(':',$o);

-				if (sizeof($o2)!=3) {

-					$arr[] = $meta;

-					$flds = false;

-					break;

-				}

-				$fld = new ADOFieldObject();

-				$fld->name = urldecode($o2[0]);

-				$fld->type = $o2[1];

-				$fld->max_length = $o2[2];

-				$flds[] = $fld;

-			}

-		} else {

-			fclose($fp);

-			$err = "Recordset had unexpected EOF 2";

-			return $false;

-		}

-		

-		// slurp in the data

-		$MAXSIZE = 128000;

-		

-		$text = '';

-		while ($txt = fread($fp,$MAXSIZE)) {

-			$text .= $txt;

-		}

-			

-		fclose($fp);

-		@$arr = unserialize($text);

-		//var_dump($arr);

-		if (!is_array($arr)) {

-			$err = "Recordset had unexpected EOF (in serialized recordset)";

-			if (get_magic_quotes_runtime()) $err .= ". Magic Quotes Runtime should be disabled!";

-			return $false;

-		}

-		$rs = new $rsclass();

-		$rs->timeCreated = $ttl;

-		$rs->InitArrayFields($arr,$flds);

-		return $rs;

-	}

-	

-

-	/**

-	* Save a file $filename and its $contents (normally for caching) with file locking

-	*/

-	function adodb_write_file($filename, $contents,$debug=false)

-	{ 

-	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows

-	# So to simulate locking, we assume that rename is an atomic operation.

-	# First we delete $filename, then we create a $tempfile write to it and 

-	# rename to the desired $filename. If the rename works, then we successfully 

-	# modified the file exclusively.

-	# What a stupid need - having to simulate locking.

-	# Risks:

-	# 1. $tempfile name is not unique -- very very low

-	# 2. unlink($filename) fails -- ok, rename will fail

-	# 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs

-	# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and  cache updated

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

-			// skip the decimal place

-			$mtime = substr(str_replace(' ','_',microtime()),2); 

-			// getmypid() actually returns 0 on Win98 - never mind!

-			$tmpname = $filename.uniqid($mtime).getmypid();

-			if (!($fd = @fopen($tmpname,'a'))) return false;

-			$ok = ftruncate($fd,0);			

-			if (!fwrite($fd,$contents)) $ok = false;

-			fclose($fd);

-			chmod($tmpname,0644);

-			// the tricky moment

-			@unlink($filename);

-			if (!@rename($tmpname,$filename)) {

-				unlink($tmpname);

-				$ok = false;

-			}

-			if (!$ok) {

-				if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));

-			}

-			return $ok;

-		}

-		if (!($fd = @fopen($filename, 'a'))) return false;

-		if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {

-			$ok = fwrite( $fd, $contents );

-			fclose($fd);

-			chmod($filename,0644);

-		}else {

-			fclose($fd);

-			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename<br>\n");

-			$ok = false;

-		}

-	

-		return $ok;

-	}

+<?php
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+global $ADODB_INCLUDED_CSV;
+$ADODB_INCLUDED_CSV = 1;
+
+/* 
+
+  V4.93 10 Oct 2006  (c) 2000-2006 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 CSV serialization. This is used by the csv/proxy driver and is the 
+  CacheExecute() serialization format. 
+  
+  ==== NOTE ====
+  Format documented at http://php.weblogs.com/ADODB_CSV
+  ==============
+*/
+
+	/**
+ 	 * convert a recordset into special format
+	 *
+	 * @param rs	the recordset
+	 *
+	 * @return	the CSV formated data
+	 */
+	function _rs2serialize(&$rs,$conn=false,$sql='')
+	{
+		$max = ($rs) ? $rs->FieldCount() : 0;
+		
+		if ($sql) $sql = urlencode($sql);
+		// metadata setup
+		
+		if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete
+			if (is_object($conn)) {
+				$sql .= ','.$conn->Affected_Rows();
+				$sql .= ','.$conn->Insert_ID();
+			} else
+				$sql .= ',,';
+			
+			$text = "====-1,0,$sql\n";
+			return $text;
+		}
+		$tt = ($rs->timeCreated) ? $rs->timeCreated : time();
+		
+		## changed format from ====0 to ====1
+		$line = "====1,$tt,$sql\n";
+		
+		if ($rs->databaseType == 'array') {
+			$rows =& $rs->_array;
+		} else {
+			$rows = array();
+			while (!$rs->EOF) {	
+				$rows[] = $rs->fields;
+				$rs->MoveNext();
+			} 
+		}
+		
+		for($i=0; $i < $max; $i++) {
+			$o =& $rs->FetchField($i);
+			$flds[] = $o;
+		}
+	
+		$savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
+		$class = $rs->connection->arrayClass;
+		$rs2 = new $class();
+		$rs2->sql = $rs->sql;
+		$rs2->oldProvider = $rs->dataProvider; 
+		$rs2->InitArrayFields($rows,$flds);
+		$rs2->fetchMode = $savefetch;
+		return $line.serialize($rs2);
+	}
+
+	
+/**
+* Open CSV file and convert it into Data. 
+*
+* @param url  		file/ftp/http url
+* @param err		returns the error message
+* @param timeout	dispose if recordset has been alive for $timeout secs
+*
+* @return		recordset, or false if error occured. If no
+*			error occurred in sql INSERT/UPDATE/DELETE, 
+*			empty recordset is returned
+*/
+	function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array')
+	{
+		$false = false;
+		$err = false;
+		$fp = @fopen($url,'rb');
+		if (!$fp) {
+			$err = $url.' file/URL not found';
+			return $false;
+		}
+		@flock($fp, LOCK_SH);
+		$arr = array();
+		$ttl = 0;
+		
+		if ($meta = fgetcsv($fp, 32000, ",")) {
+			// check if error message
+			if (strncmp($meta[0],'****',4) === 0) {
+				$err = trim(substr($meta[0],4,1024));
+				fclose($fp);
+				return $false;
+			}
+			// check for meta data
+			// $meta[0] is -1 means return an empty recordset
+			// $meta[1] contains a time 
+	
+			if (strncmp($meta[0], '====',4) === 0) {
+			
+				if ($meta[0] == "====-1") {
+					if (sizeof($meta) < 5) {
+						$err = "Corrupt first line for format -1";
+						fclose($fp);
+						return $false;
+					}
+					fclose($fp);
+					
+					if ($timeout > 0) {
+						$err = " Illegal Timeout $timeout ";
+						return $false;
+					}
+					
+					$rs = new $rsclass($val=true);
+					$rs->fields = array();
+					$rs->timeCreated = $meta[1];
+					$rs->EOF = true;
+					$rs->_numOfFields = 0;
+					$rs->sql = urldecode($meta[2]);
+					$rs->affectedrows = (integer)$meta[3];
+					$rs->insertid = $meta[4];	
+					return $rs;
+				} 
+			# Under high volume loads, we want only 1 thread/process to _write_file
+			# so that we don't have 50 processes queueing to write the same data.
+			# We use probabilistic timeout, ahead of time.
+			#
+			# -4 sec before timeout, give processes 1/32 chance of timing out
+			# -2 sec before timeout, give processes 1/16 chance of timing out
+			# -1 sec after timeout give processes 1/4 chance of timing out
+			# +0 sec after timeout, give processes 100% chance of timing out
+				if (sizeof($meta) > 1) {
+					if($timeout >0){ 
+						$tdiff = (integer)( $meta[1]+$timeout - time());
+						if ($tdiff <= 2) {
+							switch($tdiff) {
+							case 4:
+							case 3:
+								if ((rand() & 31) == 0) {
+									fclose($fp);
+									$err = "Timeout 3";
+									return $false;
+								}
+								break;
+							case 2: 
+								if ((rand() & 15) == 0) {
+									fclose($fp);
+									$err = "Timeout 2";
+									return $false;
+								}
+								break;
+							case 1:
+								if ((rand() & 3) == 0) {
+									fclose($fp);
+									$err = "Timeout 1";
+									return $false;
+								}
+								break;
+							default: 
+								fclose($fp);
+								$err = "Timeout 0";
+								return $false;
+							} // switch
+							
+						} // if check flush cache
+					}// (timeout>0)
+					$ttl = $meta[1];
+				}
+				//================================================
+				// new cache format - use serialize extensively...
+				if ($meta[0] === '====1') {
+					// slurp in the data
+					$MAXSIZE = 128000;
+					
+					$text = fread($fp,$MAXSIZE);
+					if (strlen($text)) {
+						while ($txt = fread($fp,$MAXSIZE)) {
+							$text .= $txt;
+						}
+					}
+					fclose($fp);
+					$rs = unserialize($text);
+					if (is_object($rs)) $rs->timeCreated = $ttl;
+					else {
+						$err = "Unable to unserialize recordset";
+						//echo htmlspecialchars($text),' !--END--!<p>';
+					}
+					return $rs;
+				}
+				
+				$meta = false;
+				$meta = fgetcsv($fp, 32000, ",");
+				if (!$meta) {
+					fclose($fp);
+					$err = "Unexpected EOF 1";
+					return $false;
+				}
+			}
+
+			// Get Column definitions
+			$flds = array();
+			foreach($meta as $o) {
+				$o2 = explode(':',$o);
+				if (sizeof($o2)!=3) {
+					$arr[] = $meta;
+					$flds = false;
+					break;
+				}
+				$fld = new ADOFieldObject();
+				$fld->name = urldecode($o2[0]);
+				$fld->type = $o2[1];
+				$fld->max_length = $o2[2];
+				$flds[] = $fld;
+			}
+		} else {
+			fclose($fp);
+			$err = "Recordset had unexpected EOF 2";
+			return $false;
+		}
+		
+		// slurp in the data
+		$MAXSIZE = 128000;
+		
+		$text = '';
+		while ($txt = fread($fp,$MAXSIZE)) {
+			$text .= $txt;
+		}
+			
+		fclose($fp);
+		@$arr = unserialize($text);
+		//var_dump($arr);
+		if (!is_array($arr)) {
+			$err = "Recordset had unexpected EOF (in serialized recordset)";
+			if (get_magic_quotes_runtime()) $err .= ". Magic Quotes Runtime should be disabled!";
+			return $false;
+		}
+		$rs = new $rsclass();
+		$rs->timeCreated = $ttl;
+		$rs->InitArrayFields($arr,$flds);
+		return $rs;
+	}
+	
+
+	/**
+	* Save a file $filename and its $contents (normally for caching) with file locking
+	*/
+	function adodb_write_file($filename, $contents,$debug=false)
+	{ 
+	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
+	# So to simulate locking, we assume that rename is an atomic operation.
+	# First we delete $filename, then we create a $tempfile write to it and 
+	# rename to the desired $filename. If the rename works, then we successfully 
+	# modified the file exclusively.
+	# What a stupid need - having to simulate locking.
+	# Risks:
+	# 1. $tempfile name is not unique -- very very low
+	# 2. unlink($filename) fails -- ok, rename will fail
+	# 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs
+	# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and  cache updated
+		if (strncmp(PHP_OS,'WIN',3) === 0) {
+			// skip the decimal place
+			$mtime = substr(str_replace(' ','_',microtime()),2); 
+			// getmypid() actually returns 0 on Win98 - never mind!
+			$tmpname = $filename.uniqid($mtime).getmypid();
+			if (!($fd = @fopen($tmpname,'a'))) return false;
+			$ok = ftruncate($fd,0);			
+			if (!fwrite($fd,$contents)) $ok = false;
+			fclose($fd);
+			chmod($tmpname,0644);
+			// the tricky moment
+			@unlink($filename);
+			if (!@rename($tmpname,$filename)) {
+				unlink($tmpname);
+				$ok = false;
+			}
+			if (!$ok) {
+				if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
+			}
+			return $ok;
+		}
+		if (!($fd = @fopen($filename, 'a'))) return false;
+		if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
+			$ok = fwrite( $fd, $contents );
+			fclose($fd);
+			chmod($filename,0644);
+		}else {
+			fclose($fd);
+			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename<br>\n");
+			$ok = false;
+		}
+	
+		return $ok;
+	}
 ?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-datadict.inc.php b/libraries/adodb/adodb-datadict.inc.php
index 0c5efcdc..edfa5a65 100644
--- a/libraries/adodb/adodb-datadict.inc.php
+++ b/libraries/adodb/adodb-datadict.inc.php
@@ -1,778 +1,784 @@
-<?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.

-	

-  Set tabs to 4 for best viewing.

- 

- 	DOCUMENTATION:

-	

-		See adodb/tests/test-datadict.php for docs and examples.

-*/

-

-/*

-	Test script for parser

-*/

-

-// security - hide paths

-if (!defined('ADODB_DIR')) die();

-

-function Lens_ParseTest()

-{

-$str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";

-print "<p>$str</p>";

-$a= Lens_ParseArgs($str);

-print "<pre>";

-print_r($a);

-print "</pre>";

-}

-

-

-if (!function_exists('ctype_alnum')) {

-	function ctype_alnum($text) {

-		return preg_match('/^[a-z0-9]*$/i', $text);

-	}

-}

-

-//Lens_ParseTest();

-

-/**

-	Parse arguments, treat "text" (text) and 'text' as quotation marks.

-	To escape, use "" or '' or ))

-	

-	Will read in "abc def" sans quotes, as: abc def

-	Same with 'abc def'.

-	However if `abc def`, then will read in as `abc def`

-	

-	@param endstmtchar    Character that indicates end of statement

-	@param tokenchars     Include the following characters in tokens apart from A-Z and 0-9 

-	@returns 2 dimensional array containing parsed tokens.

-*/

-function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')

-{

-	$pos = 0;

-	$intoken = false;

-	$stmtno = 0;

-	$endquote = false;

-	$tokens = array();

-	$tokens[$stmtno] = array();

-	$max = strlen($args);

-	$quoted = false;

-	

-	while ($pos < $max) {

-		$ch = substr($args,$pos,1);

-		switch($ch) {

-		case ' ':

-		case "\t":

-		case "\n":

-		case "\r":

-			if (!$quoted) {

-				if ($intoken) {

-					$intoken = false;

-					$tokens[$stmtno][] = implode('',$tokarr);

-				}

-				break;

-			}

-			

-			$tokarr[] = $ch;

-			break;

-		

-		case '`':

-			if ($intoken) $tokarr[] = $ch;

-		case '(':

-		case ')':	

-		case '"':

-		case "'":

-			

-			if ($intoken) {

-				if (empty($endquote)) {

-					$tokens[$stmtno][] = implode('',$tokarr);

-					if ($ch == '(') $endquote = ')';

-					else $endquote = $ch;

-					$quoted = true;

-					$intoken = true;

-					$tokarr = array();

-				} else if ($endquote == $ch) {

-					$ch2 = substr($args,$pos+1,1);

-					if ($ch2 == $endquote) {

-						$pos += 1;

-						$tokarr[] = $ch2;

-					} else {

-						$quoted = false;

-						$intoken = false;

-						$tokens[$stmtno][] = implode('',$tokarr);

-						$endquote = '';

-					}

-				} else

-					$tokarr[] = $ch;

-					

-			}else {

-			

-				if ($ch == '(') $endquote = ')';

-				else $endquote = $ch;

-				$quoted = true;

-				$intoken = true;

-				$tokarr = array();

-				if ($ch == '`') $tokarr[] = '`';

-			}

-			break;

-			

-		default:

-			

-			if (!$intoken) {

-				if ($ch == $endstmtchar) {

-					$stmtno += 1;

-					$tokens[$stmtno] = array();

-					break;

-				}

-			

-				$intoken = true;

-				$quoted = false;

-				$endquote = false;

-				$tokarr = array();

-	

-			}

-			

-			if ($quoted) $tokarr[] = $ch;

-			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;

-			else {

-				if ($ch == $endstmtchar) {			

-					$tokens[$stmtno][] = implode('',$tokarr);

-					$stmtno += 1;

-					$tokens[$stmtno] = array();

-					$intoken = false;

-					$tokarr = array();

-					break;

-				}

-				$tokens[$stmtno][] = implode('',$tokarr);

-				$tokens[$stmtno][] = $ch;

-				$intoken = false;

-			}

-		}

-		$pos += 1;

-	}

-	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);

-	

-	return $tokens;

-}

-

-

-class ADODB_DataDict {

-	var $connection;

-	var $debug = false;

-	var $dropTable = 'DROP TABLE %s';

-	var $renameTable = 'RENAME TABLE %s TO %s'; 

-	var $dropIndex = 'DROP INDEX %s';

-	var $addCol = ' ADD';

-	var $alterCol = ' ALTER COLUMN';

-	var $dropCol = ' DROP COLUMN';

-	var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s';	// table, old-column, new-column, column-definitions (not used by default)

-	var $nameRegex = '\w';

-	var $nameRegexBrackets = 'a-zA-Z0-9_\(\)';

-	var $schema = false;

-	var $serverInfo = array();

-	var $autoIncrement = false;

-	var $dataProvider;

-	var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql

-	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob

-							/// in other words, we use a text area for editting.

-	

-	function GetCommentSQL($table,$col)

-	{

-		return false;

-	}

-	

-	function SetCommentSQL($table,$col,$cmt)

-	{

-		return false;

-	}

-	

-	function MetaTables()

-	{

-		if (!$this->connection->IsConnected()) return array();

-		return $this->connection->MetaTables();

-	}

-	

-	function MetaColumns($tab, $upper=true, $schema=false)

-	{

-		if (!$this->connection->IsConnected()) return array();

-		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);

-	}

-	

-	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)

-	{

-		if (!$this->connection->IsConnected()) return array();

-		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);

-	}

-	

-	function MetaIndexes($table, $primary = false, $owner = false)

-	{

-		if (!$this->connection->IsConnected()) return array();

-		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);

-	}

-	

-	function MetaType($t,$len=-1,$fieldobj=false)

-	{

-		return ADORecordSet::MetaType($t,$len,$fieldobj);

-	}

-	

-	function NameQuote($name = NULL,$allowBrackets=false)

-	{

-		if (!is_string($name)) {

-			return FALSE;

-		}

-		

-		$name = trim($name);

-		

-		if ( !is_object($this->connection) ) {

-			return $name;

-		}

-		

-		$quote = $this->connection->nameQuote;

-		

-		// if name is of the form `name`, quote it

-		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {

-			return $quote . $matches[1] . $quote;

-		}

-		

-		// if name contains special characters, quote it

-		$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;

-		

-		if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {

-			return $quote . $name . $quote;

-		}

-		

-		return $name;

-	}

-	

-	function TableName($name)

-	{

-		if ( $this->schema ) {

-			return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name);

-		}

-		return $this->NameQuote($name);

-	}

-	

-	// Executes the sql array returned by GetTableSQL and GetIndexSQL

-	function ExecuteSQLArray($sql, $continueOnError = true)

-	{

-		$rez = 2;

-		$conn = &$this->connection;

-		$saved = $conn->debug;

-		foreach($sql as $line) {

-			

-			if ($this->debug) $conn->debug = true;

-			$ok = $conn->Execute($line);

-			$conn->debug = $saved;

-			if (!$ok) {

-				if ($this->debug) ADOConnection::outp($conn->ErrorMsg());

-				if (!$continueOnError) return 0;

-				$rez = 1;

-			}

-		}

-		return $rez;

-	}

-	

-	/*

-	 	Returns the actual type given a character code.

-		

-		C:  varchar

-		X:  CLOB (character large object) or largest varchar size if CLOB is not supported

-		C2: Multibyte varchar

-		X2: Multibyte CLOB

-		

-		B:  BLOB (binary large object)

-		

-		D:  Date

-		T:  Date-time 

-		L:  Integer field suitable for storing booleans (0 or 1)

-		I:  Integer

-		F:  Floating point number

-		N:  Numeric or decimal number

-	*/

-	

-	function ActualType($meta)

-	{

-		return $meta;

-	}

-	

-	function CreateDatabase($dbname,$options=false)

-	{

-		$options = $this->_Options($options);

-		$sql = array();

-		

-		$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);

-		if (isset($options[$this->upperName]))

-			$s .= ' '.$options[$this->upperName];

-		

-		$sql[] = $s;

-		return $sql;

-	}

-	

-	/*

-	 Generates the SQL to create index. Returns an array of sql strings.

-	*/

-	function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)

-	{

-		if (!is_array($flds)) {

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

-		}

-		

-		foreach($flds as $key => $fld) {

-			# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)

-			$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);

-		}

-		

-		return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));

-	}

-	

-	function DropIndexSQL ($idxname, $tabname = NULL)

-	{

-		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));

-	}

-	

-	function SetSchema($schema)

-	{

-		$this->schema = $schema;

-	}

-	

-	function AddColumnSQL($tabname, $flds)

-	{

-		$tabname = $this->TableName ($tabname);

-		$sql = array();

-		list($lines,$pkey) = $this->_GenFields($flds);

-		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';

-		foreach($lines as $v) {

-			$sql[] = $alter . $v;

-		}

-		return $sql;

-	}

-	

-	/**

-	 * Change the definition of one column

-	 *

-	 * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table,

-	 * to allow, recreating the table and copying the content over to the new table

-	 * @param string $tabname table-name

-	 * @param string $flds column-name and type for the changed column

-	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''

-	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''

-	 * @return array with SQL strings

-	 */

-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')

-	{

-		$tabname = $this->TableName ($tabname);

-		$sql = array();

-		list($lines,$pkey) = $this->_GenFields($flds);

-		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';

-		foreach($lines as $v) {

-			$sql[] = $alter . $v;

-		}

-		return $sql;

-	}

-	

-	/**

-	 * Rename one column

-	 *

-	 * Some DBM's can only do this together with changeing the type of the column (even if that stays the same, eg. mysql)

-	 * @param string $tabname table-name

-	 * @param string $oldcolumn column-name to be renamed

-	 * @param string $newcolumn new column-name

-	 * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default=''

-	 * @return array with SQL strings

-	 */

-	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')

-	{

-		$tabname = $this->TableName ($tabname);

-		if ($flds) {

-			list($lines,$pkey) = $this->_GenFields($flds);

-			list(,$first) = each($lines);

-			list(,$column_def) = split("[\t ]+",$first,2);

-		}

-		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));

-	}

-		

-	/**

-	 * Drop one column

-	 *

-	 * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table,

-	 * to allow, recreating the table and copying the content over to the new table

-	 * @param string $tabname table-name

-	 * @param string $flds column-name and type for the changed column

-	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''

-	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''

-	 * @return array with SQL strings

-	 */

-	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')

-	{

-		$tabname = $this->TableName ($tabname);

-		if (!is_array($flds)) $flds = explode(',',$flds);

-		$sql = array();

-		$alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';

-		foreach($flds as $v) {

-			$sql[] = $alter . $this->NameQuote($v);

-		}

-		return $sql;

-	}

-	

-	function DropTableSQL($tabname)

-	{

-		return array (sprintf($this->dropTable, $this->TableName($tabname)));

-	}

-	

-	function RenameTableSQL($tabname,$newname)

-	{

-		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));

-	}	

-	

-	/*

-	 Generate the SQL to create table. Returns an array of sql strings.

-	*/

-	function CreateTableSQL($tabname, $flds, $tableoptions=false)

-	{

-		if (!$tableoptions) $tableoptions = array();

-		

-		list($lines,$pkey) = $this->_GenFields($flds, true);

-		

-		$taboptions = $this->_Options($tableoptions);

-		$tabname = $this->TableName ($tabname);

-		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);

-		

-		$tsql = $this->_Triggers($tabname,$taboptions);

-		foreach($tsql as $s) $sql[] = $s;

-		

-		return $sql;

-	}

-	

-	function _GenFields($flds,$widespacing=false)

-	{

-		if (is_string($flds)) {

-			$padding = '     ';

-			$txt = $flds.$padding;

-			$flds = array();

-			$flds0 = Lens_ParseArgs($txt,',');

-			$hasparam = false;

-			foreach($flds0 as $f0) {

-				$f1 = array();

-				foreach($f0 as $token) {

-					switch (strtoupper($token)) {

-					case 'CONSTRAINT':

-					case 'DEFAULT': 

-						$hasparam = $token;

-						break;

-					default:

-						if ($hasparam) $f1[$hasparam] = $token;

-						else $f1[] = $token;

-						$hasparam = false;

-						break;

-					}

-				}

-				$flds[] = $f1;

-				

-			}

-		}

-		$this->autoIncrement = false;

-		$lines = array();

-		$pkey = array();

-		foreach($flds as $fld) {

-			$fld = _array_change_key_case($fld);

-		

-			$fname = false;

-			$fdefault = false;

-			$fautoinc = false;

-			$ftype = false;

-			$fsize = false;

-			$fprec = false;

-			$fprimary = false;

-			$fnoquote = false;

-			$fdefts = false;

-			$fdefdate = false;

-			$fconstraint = false;

-			$fnotnull = false;

-			$funsigned = false;

-			

-			//-----------------

-			// Parse attributes

-			foreach($fld as $attr => $v) {

-				if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';

-				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);

-				

-				switch($attr) {

-				case '0':

-				case 'NAME': 	$fname = $v; break;

-				case '1':

-				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;

-				

-				case 'SIZE': 	

-								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');

-								if ($dotat === false) $fsize = $v;

-								else {

-									$fsize = substr($v,0,$dotat);

-									$fprec = substr($v,$dotat+1);

-								}

-								break;

-				case 'UNSIGNED': $funsigned = true; break;

-				case 'AUTOINCREMENT':

-				case 'AUTO':	$fautoinc = true; $fnotnull = true; break;

-				case 'KEY':

-				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;

-				case 'DEF':

-				case 'DEFAULT': $fdefault = $v; break;

-				case 'NOTNULL': $fnotnull = $v; break;

-				case 'NOQUOTE': $fnoquote = $v; break;

-				case 'DEFDATE': $fdefdate = $v; break;

-				case 'DEFTIMESTAMP': $fdefts = $v; break;

-				case 'CONSTRAINT': $fconstraint = $v; break;

-				} //switch

-			} // foreach $fld

-			

-			//--------------------

-			// VALIDATE FIELD INFO

-			if (!strlen($fname)) {

-				if ($this->debug) ADOConnection::outp("Undefined NAME");

-				return false;

-			}

-			

-			$fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname));

-			$fname = $this->NameQuote($fname);

-			

-			if (!strlen($ftype)) {

-				if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'");

-				return false;

-			} else {

-				$ftype = strtoupper($ftype);

-			}

-			

-			$ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);

-			

-			if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls

-			

-			if ($fprimary) $pkey[] = $fname;

-			

-			// some databases do not allow blobs to have defaults

-			if ($ty == 'X') $fdefault = false;

-			

-			//--------------------

-			// CONSTRUCT FIELD SQL

-			if ($fdefts) {

-				if (substr($this->connection->databaseType,0,5) == 'mysql') {

-					$ftype = 'TIMESTAMP';

-				} else {

-					$fdefault = $this->connection->sysTimeStamp;

-				}

-			} else if ($fdefdate) {

-				if (substr($this->connection->databaseType,0,5) == 'mysql') {

-					$ftype = 'TIMESTAMP';

-				} else {

-					$fdefault = $this->connection->sysDate;

-				}

-			} else if ($fdefault !== false && !$fnoquote)

-				if ($ty == 'C' or $ty == 'X' or 

-					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault)))

-					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 

-						$fdefault = trim($fdefault);

-					else if (strtolower($fdefault) != 'null')

-						$fdefault = $this->connection->qstr($fdefault);

-			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);

-			

-			if ($widespacing) $fname = str_pad($fname,24);

-			$lines[$fid] = $fname.' '.$ftype.$suffix;

-			

-			if ($fautoinc) $this->autoIncrement = true;

-		} // foreach $flds

-		

-		return array($lines,$pkey);

-	}

-	/*

-		 GENERATE THE SIZE PART OF THE DATATYPE

-			$ftype is the actual type

-			$ty is the type defined originally in the DDL

-	*/

-	function _GetSize($ftype, $ty, $fsize, $fprec)

-	{

-		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) {

-			$ftype .= "(".$fsize;

-			if (strlen($fprec)) $ftype .= ",".$fprec;

-			$ftype .= ')';

-		}

-		return $ftype;

-	}

-	

-	

-	// return string must begin with space

-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)

-	{	

-		$suffix = '';

-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";

-		if ($fnotnull) $suffix .= ' NOT NULL';

-		if ($fconstraint) $suffix .= ' '.$fconstraint;

-		return $suffix;

-	}

-	

-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)

-	{

-		$sql = array();

-		

-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {

-			$sql[] = sprintf ($this->dropIndex, $idxname);

-			if ( isset($idxoptions['DROP']) )

-				return $sql;

-		}

-		

-		if ( empty ($flds) ) {

-			return $sql;

-		}

-		

-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';

-	

-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';

-		

-		if ( isset($idxoptions[$this->upperName]) )

-			$s .= $idxoptions[$this->upperName];

-		

-		if ( is_array($flds) )

-			$flds = implode(', ',$flds);

-		$s .= '(' . $flds . ')';

-		$sql[] = $s;

-		

-		return $sql;

-	}

-	

-	function _DropAutoIncrement($tabname)

-	{

-		return false;

-	}

-	

-	function _TableSQL($tabname,$lines,$pkey,$tableoptions)

-	{

-		$sql = array();

-		

-		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {

-			$sql[] = sprintf($this->dropTable,$tabname);

-			if ($this->autoIncrement) {

-				$sInc = $this->_DropAutoIncrement($tabname);

-				if ($sInc) $sql[] = $sInc;

-			}

-			if ( isset ($tableoptions['DROP']) ) {

-				return $sql;

-			}

-		}

-		$s = "CREATE TABLE $tabname (\n";

-		$s .= implode(",\n", $lines);

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

-			$s .= ",\n                 PRIMARY KEY (";

-			$s .= implode(", ",$pkey).")";

-		}

-		if (isset($tableoptions['CONSTRAINTS'])) 

-			$s .= "\n".$tableoptions['CONSTRAINTS'];

-		

-		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 

-			$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];

-		

-		$s .= "\n)";

-		if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName];

-		$sql[] = $s;

-		

-		return $sql;

-	}

-	

-	/*

-		GENERATE TRIGGERS IF NEEDED

-		used when table has auto-incrementing field that is emulated using triggers

-	*/

-	function _Triggers($tabname,$taboptions)

-	{

-		return array();

-	}

-	

-	/*

-		Sanitize options, so that array elements with no keys are promoted to keys

-	*/

-	function _Options($opts)

-	{

-		if (!is_array($opts)) return array();

-		$newopts = array();

-		foreach($opts as $k => $v) {

-			if (is_numeric($k)) $newopts[strtoupper($v)] = $v;

-			else $newopts[strtoupper($k)] = $v;

-		}

-		return $newopts;

-	}

-	

-	/*

-	"Florian Buzin [ easywe ]" <florian.buzin#easywe.de>

-	

-	This function changes/adds new fields to your table. You don't

-	have to know if the col is new or not. It will check on its own.

-	*/

-	function ChangeTableSQL($tablename, $flds, $tableoptions = false)

-	{

-	global $ADODB_FETCH_MODE;

-	

-		$save = $ADODB_FETCH_MODE;

-		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;

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

-		

-		// check table exists

-		$save_handler = $this->connection->raiseErrorFn;

-		$this->connection->raiseErrorFn = '';

-		$cols = $this->MetaColumns($tablename);

-		$this->connection->raiseErrorFn = $save_handler;

-		

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

-		$ADODB_FETCH_MODE = $save;

-		

-		if ( empty($cols)) { 

-			return $this->CreateTableSQL($tablename, $flds, $tableoptions);

-		}

-		

-		if (is_array($flds)) {

-		// Cycle through the update fields, comparing

-		// existing fields to fields to update.

-		// if the Metatype and size is exactly the

-		// same, ignore - by Mark Newham

-			$holdflds = array();

-			foreach($flds as $k=>$v) {

-				if ( isset($cols[$k]) && is_object($cols[$k]) ) {

-					$c = $cols[$k];

-					$ml = $c->max_length;

-					$mt = &$this->MetaType($c->type,$ml);

-					if ($ml == -1) $ml = '';

-					if ($mt == 'X') $ml = $v['SIZE'];

-					if (($mt != $v['TYPE']) ||  $ml != $v['SIZE']) {

-						$holdflds[$k] = $v;

-					}

-				} else {

-					$holdflds[$k] = $v;

-				}		

-			}

-			$flds = $holdflds;

-		}

-	

-

-		// already exists, alter table instead

-		list($lines,$pkey) = $this->_GenFields($flds);

-		$alter = 'ALTER TABLE ' . $this->TableName($tablename);

-		$sql = array();

-

-		foreach ( $lines as $id => $v ) {

-			if ( isset($cols[$id]) && is_object($cols[$id]) ) {

-			

-				$flds = Lens_ParseArgs($v,',');

-				

-				//  We are trying to change the size of the field, if not allowed, simply ignore the request.

-				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue;	 

-	 		

-				$sql[] = $alter . $this->alterCol . ' ' . $v;

-			} else {

-				$sql[] = $alter . $this->addCol . ' ' . $v;

-			}

-		}

-		

-		return $sql;

-	}

-} // class

+<?php
+
+/**
+  V4.93 10 Oct 2006  (c) 2000-2006 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 for best viewing.
+ 
+ 	DOCUMENTATION:
+	
+		See adodb/tests/test-datadict.php for docs and examples.
+*/
+
+/*
+	Test script for parser
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+function Lens_ParseTest()
+{
+$str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";
+print "<p>$str</p>";
+$a= Lens_ParseArgs($str);
+print "<pre>";
+print_r($a);
+print "</pre>";
+}
+
+
+if (!function_exists('ctype_alnum')) {
+	function ctype_alnum($text) {
+		return preg_match('/^[a-z0-9]*$/i', $text);
+	}
+}
+
+//Lens_ParseTest();
+
+/**
+	Parse arguments, treat "text" (text) and 'text' as quotation marks.
+	To escape, use "" or '' or ))
+	
+	Will read in "abc def" sans quotes, as: abc def
+	Same with 'abc def'.
+	However if `abc def`, then will read in as `abc def`
+	
+	@param endstmtchar    Character that indicates end of statement
+	@param tokenchars     Include the following characters in tokens apart from A-Z and 0-9 
+	@returns 2 dimensional array containing parsed tokens.
+*/
+function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
+{
+	$pos = 0;
+	$intoken = false;
+	$stmtno = 0;
+	$endquote = false;
+	$tokens = array();
+	$tokens[$stmtno] = array();
+	$max = strlen($args);
+	$quoted = false;
+	$tokarr = array();
+	
+	while ($pos < $max) {
+		$ch = substr($args,$pos,1);
+		switch($ch) {
+		case ' ':
+		case "\t":
+		case "\n":
+		case "\r":
+			if (!$quoted) {
+				if ($intoken) {
+					$intoken = false;
+					$tokens[$stmtno][] = implode('',$tokarr);
+				}
+				break;
+			}
+			
+			$tokarr[] = $ch;
+			break;
+		
+		case '`':
+			if ($intoken) $tokarr[] = $ch;
+		case '(':
+		case ')':	
+		case '"':
+		case "'":
+			
+			if ($intoken) {
+				if (empty($endquote)) {
+					$tokens[$stmtno][] = implode('',$tokarr);
+					if ($ch == '(') $endquote = ')';
+					else $endquote = $ch;
+					$quoted = true;
+					$intoken = true;
+					$tokarr = array();
+				} else if ($endquote == $ch) {
+					$ch2 = substr($args,$pos+1,1);
+					if ($ch2 == $endquote) {
+						$pos += 1;
+						$tokarr[] = $ch2;
+					} else {
+						$quoted = false;
+						$intoken = false;
+						$tokens[$stmtno][] = implode('',$tokarr);
+						$endquote = '';
+					}
+				} else
+					$tokarr[] = $ch;
+					
+			}else {
+			
+				if ($ch == '(') $endquote = ')';
+				else $endquote = $ch;
+				$quoted = true;
+				$intoken = true;
+				$tokarr = array();
+				if ($ch == '`') $tokarr[] = '`';
+			}
+			break;
+			
+		default:
+			
+			if (!$intoken) {
+				if ($ch == $endstmtchar) {
+					$stmtno += 1;
+					$tokens[$stmtno] = array();
+					break;
+				}
+			
+				$intoken = true;
+				$quoted = false;
+				$endquote = false;
+				$tokarr = array();
+	
+			}
+			
+			if ($quoted) $tokarr[] = $ch;
+			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
+			else {
+				if ($ch == $endstmtchar) {			
+					$tokens[$stmtno][] = implode('',$tokarr);
+					$stmtno += 1;
+					$tokens[$stmtno] = array();
+					$intoken = false;
+					$tokarr = array();
+					break;
+				}
+				$tokens[$stmtno][] = implode('',$tokarr);
+				$tokens[$stmtno][] = $ch;
+				$intoken = false;
+			}
+		}
+		$pos += 1;
+	}
+	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
+	
+	return $tokens;
+}
+
+
+class ADODB_DataDict {
+	var $connection;
+	var $debug = false;
+	var $dropTable = 'DROP TABLE %s';
+	var $renameTable = 'RENAME TABLE %s TO %s'; 
+	var $dropIndex = 'DROP INDEX %s';
+	var $addCol = ' ADD';
+	var $alterCol = ' ALTER COLUMN';
+	var $dropCol = ' DROP COLUMN';
+	var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s';	// table, old-column, new-column, column-definitions (not used by default)
+	var $nameRegex = '\w';
+	var $nameRegexBrackets = 'a-zA-Z0-9_\(\)';
+	var $schema = false;
+	var $serverInfo = array();
+	var $autoIncrement = false;
+	var $dataProvider;
+	var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql
+	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
+							/// in other words, we use a text area for editting.
+	
+	function GetCommentSQL($table,$col)
+	{
+		return false;
+	}
+	
+	function SetCommentSQL($table,$col,$cmt)
+	{
+		return false;
+	}
+	
+	function MetaTables()
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaTables();
+	}
+	
+	function MetaColumns($tab, $upper=true, $schema=false)
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
+	}
+	
+	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
+	}
+	
+	function MetaIndexes($table, $primary = false, $owner = false)
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
+	}
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		return ADORecordSet::MetaType($t,$len,$fieldobj);
+	}
+	
+	function NameQuote($name = NULL,$allowBrackets=false)
+	{
+		if (!is_string($name)) {
+			return FALSE;
+		}
+		
+		$name = trim($name);
+		
+		if ( !is_object($this->connection) ) {
+			return $name;
+		}
+		
+		$quote = $this->connection->nameQuote;
+		
+		// if name is of the form `name`, quote it
+		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
+			return $quote . $matches[1] . $quote;
+		}
+		
+		// if name contains special characters, quote it
+		$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;
+		
+		if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
+			return $quote . $name . $quote;
+		}
+		
+		return $name;
+	}
+	
+	function TableName($name)
+	{
+		if ( $this->schema ) {
+			return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name);
+		}
+		return $this->NameQuote($name);
+	}
+	
+	// Executes the sql array returned by GetTableSQL and GetIndexSQL
+	function ExecuteSQLArray($sql, $continueOnError = true)
+	{
+		$rez = 2;
+		$conn = &$this->connection;
+		$saved = $conn->debug;
+		foreach($sql as $line) {
+			
+			if ($this->debug) $conn->debug = true;
+			$ok = $conn->Execute($line);
+			$conn->debug = $saved;
+			if (!$ok) {
+				if ($this->debug) ADOConnection::outp($conn->ErrorMsg());
+				if (!$continueOnError) return 0;
+				$rez = 1;
+			}
+		}
+		return $rez;
+	}
+	
+	/*
+	 	Returns the actual type given a character code.
+		
+		C:  varchar
+		X:  CLOB (character large object) or largest varchar size if CLOB is not supported
+		C2: Multibyte varchar
+		X2: Multibyte CLOB
+		
+		B:  BLOB (binary large object)
+		
+		D:  Date
+		T:  Date-time 
+		L:  Integer field suitable for storing booleans (0 or 1)
+		I:  Integer
+		F:  Floating point number
+		N:  Numeric or decimal number
+	*/
+	
+	function ActualType($meta)
+	{
+		return $meta;
+	}
+	
+	function CreateDatabase($dbname,$options=false)
+	{
+		$options = $this->_Options($options);
+		$sql = array();
+		
+		$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
+		if (isset($options[$this->upperName]))
+			$s .= ' '.$options[$this->upperName];
+		
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	/*
+	 Generates the SQL to create index. Returns an array of sql strings.
+	*/
+	function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
+	{
+		if (!is_array($flds)) {
+			$flds = explode(',',$flds);
+		}
+		
+		foreach($flds as $key => $fld) {
+			# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)
+			$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);
+		}
+		
+		return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));
+	}
+	
+	function DropIndexSQL ($idxname, $tabname = NULL)
+	{
+		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
+	}
+	
+	function SetSchema($schema)
+	{
+		$this->schema = $schema;
+	}
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
+		foreach($lines as $v) {
+			$sql[] = $alter . $v;
+		}
+		return $sql;
+	}
+	
+	/**
+	 * Change the definition of one column
+	 *
+	 * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
+	 * to allow, recreating the table and copying the content over to the new table
+	 * @param string $tabname table-name
+	 * @param string $flds column-name and type for the changed column
+	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
+	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+		foreach($lines as $v) {
+			$sql[] = $alter . $v;
+		}
+		return $sql;
+	}
+	
+	/**
+	 * Rename one column
+	 *
+	 * Some DBM's can only do this together with changeing the type of the column (even if that stays the same, eg. mysql)
+	 * @param string $tabname table-name
+	 * @param string $oldcolumn column-name to be renamed
+	 * @param string $newcolumn new column-name
+	 * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default=''
+	 * @return array with SQL strings
+	 */
+	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
+	{
+		$tabname = $this->TableName ($tabname);
+		if ($flds) {
+			list($lines,$pkey) = $this->_GenFields($flds);
+			list(,$first) = each($lines);
+			list(,$column_def) = split("[\t ]+",$first,2);
+		}
+		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
+	}
+		
+	/**
+	 * Drop one column
+	 *
+	 * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
+	 * to allow, recreating the table and copying the content over to the new table
+	 * @param string $tabname table-name
+	 * @param string $flds column-name and type for the changed column
+	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
+	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds)) $flds = explode(',',$flds);
+		$sql = array();
+		$alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';
+		foreach($flds as $v) {
+			$sql[] = $alter . $this->NameQuote($v);
+		}
+		return $sql;
+	}
+	
+	function DropTableSQL($tabname)
+	{
+		return array (sprintf($this->dropTable, $this->TableName($tabname)));
+	}
+	
+	function RenameTableSQL($tabname,$newname)
+	{
+		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
+	}	
+	
+	/*
+	 Generate the SQL to create table. Returns an array of sql strings.
+	*/
+	function CreateTableSQL($tabname, $flds, $tableoptions=false)
+	{
+		if (!$tableoptions) $tableoptions = array();
+		
+		list($lines,$pkey) = $this->_GenFields($flds, true);
+		
+		$taboptions = $this->_Options($tableoptions);
+		$tabname = $this->TableName ($tabname);
+		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
+		
+		$tsql = $this->_Triggers($tabname,$taboptions);
+		foreach($tsql as $s) $sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function _GenFields($flds,$widespacing=false)
+	{
+		if (is_string($flds)) {
+			$padding = '     ';
+			$txt = $flds.$padding;
+			$flds = array();
+			$flds0 = Lens_ParseArgs($txt,',');
+			$hasparam = false;
+			foreach($flds0 as $f0) {
+				$f1 = array();
+				foreach($f0 as $token) {
+					switch (strtoupper($token)) {
+					case 'CONSTRAINT':
+					case 'DEFAULT': 
+						$hasparam = $token;
+						break;
+					default:
+						if ($hasparam) $f1[$hasparam] = $token;
+						else $f1[] = $token;
+						$hasparam = false;
+						break;
+					}
+				}
+				$flds[] = $f1;
+				
+			}
+		}
+		$this->autoIncrement = false;
+		$lines = array();
+		$pkey = array();
+		foreach($flds as $fld) {
+			$fld = _array_change_key_case($fld);
+		
+			$fname = false;
+			$fdefault = false;
+			$fautoinc = false;
+			$ftype = false;
+			$fsize = false;
+			$fprec = false;
+			$fprimary = false;
+			$fnoquote = false;
+			$fdefts = false;
+			$fdefdate = false;
+			$fconstraint = false;
+			$fnotnull = false;
+			$funsigned = false;
+			
+			//-----------------
+			// Parse attributes
+			foreach($fld as $attr => $v) {
+				if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';
+				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
+				
+				switch($attr) {
+				case '0':
+				case 'NAME': 	$fname = $v; break;
+				case '1':
+				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
+				
+				case 'SIZE': 	
+								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
+								if ($dotat === false) $fsize = $v;
+								else {
+									$fsize = substr($v,0,$dotat);
+									$fprec = substr($v,$dotat+1);
+								}
+								break;
+				case 'UNSIGNED': $funsigned = true; break;
+				case 'AUTOINCREMENT':
+				case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
+				case 'KEY':
+				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;
+				case 'DEF':
+				case 'DEFAULT': $fdefault = $v; break;
+				case 'NOTNULL': $fnotnull = $v; break;
+				case 'NOQUOTE': $fnoquote = $v; break;
+				case 'DEFDATE': $fdefdate = $v; break;
+				case 'DEFTIMESTAMP': $fdefts = $v; break;
+				case 'CONSTRAINT': $fconstraint = $v; break;
+				} //switch
+			} // foreach $fld
+			
+			//--------------------
+			// VALIDATE FIELD INFO
+			if (!strlen($fname)) {
+				if ($this->debug) ADOConnection::outp("Undefined NAME");
+				return false;
+			}
+			
+			$fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname));
+			$fname = $this->NameQuote($fname);
+			
+			if (!strlen($ftype)) {
+				if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'");
+				return false;
+			} else {
+				$ftype = strtoupper($ftype);
+			}
+			
+			$ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
+			
+			if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls
+			
+			if ($fprimary) $pkey[] = $fname;
+			
+			// some databases do not allow blobs to have defaults
+			if ($ty == 'X') $fdefault = false;
+			
+			//--------------------
+			// CONSTRUCT FIELD SQL
+			if ($fdefts) {
+				if (substr($this->connection->databaseType,0,5) == 'mysql') {
+					$ftype = 'TIMESTAMP';
+				} else {
+					$fdefault = $this->connection->sysTimeStamp;
+				}
+			} else if ($fdefdate) {
+				if (substr($this->connection->databaseType,0,5) == 'mysql') {
+					$ftype = 'TIMESTAMP';
+				} else {
+					$fdefault = $this->connection->sysDate;
+				}
+			} else if ($fdefault !== false && !$fnoquote)
+				if ($ty == 'C' or $ty == 'X' or 
+					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault)))
+					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
+						$fdefault = trim($fdefault);
+					else if (strtolower($fdefault) != 'null')
+						$fdefault = $this->connection->qstr($fdefault);
+			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
+			
+			if ($widespacing) $fname = str_pad($fname,24);
+			$lines[$fid] = $fname.' '.$ftype.$suffix;
+			
+			if ($fautoinc) $this->autoIncrement = true;
+		} // foreach $flds
+		
+		return array($lines,$pkey);
+	}
+	/*
+		 GENERATE THE SIZE PART OF THE DATATYPE
+			$ftype is the actual type
+			$ty is the type defined originally in the DDL
+	*/
+	function _GetSize($ftype, $ty, $fsize, $fprec)
+	{
+		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) {
+			$ftype .= "(".$fsize;
+			if (strlen($fprec)) $ftype .= ",".$fprec;
+			$ftype .= ')';
+		}
+		return $ftype;
+	}
+	
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+	
+		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s .= '(' . $flds . ')';
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function _DropAutoIncrement($tabname)
+	{
+		return false;
+	}
+	
+	function _TableSQL($tabname,$lines,$pkey,$tableoptions)
+	{
+		$sql = array();
+		
+		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {
+			$sql[] = sprintf($this->dropTable,$tabname);
+			if ($this->autoIncrement) {
+				$sInc = $this->_DropAutoIncrement($tabname);
+				if ($sInc) $sql[] = $sInc;
+			}
+			if ( isset ($tableoptions['DROP']) ) {
+				return $sql;
+			}
+		}
+		$s = "CREATE TABLE $tabname (\n";
+		$s .= implode(",\n", $lines);
+		if (sizeof($pkey)>0) {
+			$s .= ",\n                 PRIMARY KEY (";
+			$s .= implode(", ",$pkey).")";
+		}
+		if (isset($tableoptions['CONSTRAINTS'])) 
+			$s .= "\n".$tableoptions['CONSTRAINTS'];
+		
+		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
+			$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
+		
+		$s .= "\n)";
+		if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName];
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	/*
+		GENERATE TRIGGERS IF NEEDED
+		used when table has auto-incrementing field that is emulated using triggers
+	*/
+	function _Triggers($tabname,$taboptions)
+	{
+		return array();
+	}
+	
+	/*
+		Sanitize options, so that array elements with no keys are promoted to keys
+	*/
+	function _Options($opts)
+	{
+		if (!is_array($opts)) return array();
+		$newopts = array();
+		foreach($opts as $k => $v) {
+			if (is_numeric($k)) $newopts[strtoupper($v)] = $v;
+			else $newopts[strtoupper($k)] = $v;
+		}
+		return $newopts;
+	}
+	
+	/*
+	"Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
+	
+	This function changes/adds new fields to your table. You don't
+	have to know if the col is new or not. It will check on its own.
+	*/
+	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false);
+		
+		// check table exists
+		$save_handler = $this->connection->raiseErrorFn;
+		$this->connection->raiseErrorFn = '';
+		$cols = $this->MetaColumns($tablename);
+		$this->connection->raiseErrorFn = $save_handler;
+		
+		if (isset($savem)) $this->connection->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if ( empty($cols)) { 
+			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
+		}
+		
+		if (is_array($flds)) {
+		// Cycle through the update fields, comparing
+		// existing fields to fields to update.
+		// if the Metatype and size is exactly the
+		// same, ignore - by Mark Newham
+			$holdflds = array();
+			foreach($flds as $k=>$v) {
+				if ( isset($cols[$k]) && is_object($cols[$k]) ) {
+					// If already not allowing nulls, then don't change
+					$obj = $cols[$k];
+					if (isset($obj->not_null) && $obj->not_null)
+						$v = str_replace('NOT NULL','',$v);
+
+					$c = $cols[$k];
+					$ml = $c->max_length;
+					$mt = $this->MetaType($c->type,$ml);
+					if ($ml == -1) $ml = '';
+					if ($mt == 'X') $ml = $v['SIZE'];
+					if (($mt != $v['TYPE']) ||  $ml != $v['SIZE']) {
+						$holdflds[$k] = $v;
+					}
+				} else {
+					$holdflds[$k] = $v;
+				}		
+			}
+			$flds = $holdflds;
+		}
+	
+
+		// already exists, alter table instead
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
+		$sql = array();
+
+		foreach ( $lines as $id => $v ) {
+			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+			
+				$flds = Lens_ParseArgs($v,',');
+				
+				//  We are trying to change the size of the field, if not allowed, simply ignore the request.
+				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue;	 
+	 		
+				$sql[] = $alter . $this->alterCol . ' ' . $v;
+			} else {
+				$sql[] = $alter . $this->addCol . ' ' . $v;
+			}
+		}
+		
+		return $sql;
+	}
+} // class
 ?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-error.inc.php b/libraries/adodb/adodb-error.inc.php
index 8d6e5aed..8c959dc8 100755
--- a/libraries/adodb/adodb-error.inc.php
+++ b/libraries/adodb/adodb-error.inc.php
@@ -1,258 +1,258 @@
-<?php

-/** 

- * @version 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. 

- *

- * Set tabs to 4 for best viewing.

- * 

- * The following code is adapted from the PEAR DB error handling code.

- * Portions (c)1997-2002 The PHP Group.

- */

-

-

-if (!defined("DB_ERROR")) define("DB_ERROR",-1);

-

-if (!defined("DB_ERROR_SYNTAX")) {

-	define("DB_ERROR_SYNTAX",              -2);

-	define("DB_ERROR_CONSTRAINT",          -3);

-	define("DB_ERROR_NOT_FOUND",           -4);

-	define("DB_ERROR_ALREADY_EXISTS",      -5);

-	define("DB_ERROR_UNSUPPORTED",         -6);

-	define("DB_ERROR_MISMATCH",            -7);

-	define("DB_ERROR_INVALID",             -8);

-	define("DB_ERROR_NOT_CAPABLE",         -9);

-	define("DB_ERROR_TRUNCATED",          -10);

-	define("DB_ERROR_INVALID_NUMBER",     -11);

-	define("DB_ERROR_INVALID_DATE",       -12);

-	define("DB_ERROR_DIVZERO",            -13);

-	define("DB_ERROR_NODBSELECTED",       -14);

-	define("DB_ERROR_CANNOT_CREATE",      -15);

-	define("DB_ERROR_CANNOT_DELETE",      -16);

-	define("DB_ERROR_CANNOT_DROP",        -17);

-	define("DB_ERROR_NOSUCHTABLE",        -18);

-	define("DB_ERROR_NOSUCHFIELD",        -19);

-	define("DB_ERROR_NEED_MORE_DATA",     -20);

-	define("DB_ERROR_NOT_LOCKED",         -21);

-	define("DB_ERROR_VALUE_COUNT_ON_ROW", -22);

-	define("DB_ERROR_INVALID_DSN",        -23);

-	define("DB_ERROR_CONNECT_FAILED",     -24);

-	define("DB_ERROR_EXTENSION_NOT_FOUND",-25);

-	define("DB_ERROR_NOSUCHDB",           -25);

-	define("DB_ERROR_ACCESS_VIOLATION",   -26);

-}

-

-function adodb_errormsg($value)

-{

-global $ADODB_LANG,$ADODB_LANG_ARRAY;

-

-	if (empty($ADODB_LANG)) $ADODB_LANG = 'en';

-	if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == $ADODB_LANG) ;

-	else {

-		include_once(ADODB_DIR."/lang/adodb-$ADODB_LANG.inc.php");

-    }

-	return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : $ADODB_LANG_ARRAY[DB_ERROR];

-}

-

-function adodb_error($provider,$dbType,$errno)

-{

-	//var_dump($errno);

-	if (is_numeric($errno) && $errno == 0) return 0;

-	switch($provider) { 

-	case 'mysql': $map = adodb_error_mysql(); break;

-	

-	case 'oracle':

-	case 'oci8': $map = adodb_error_oci8(); break;

-	

-	case 'ibase': $map = adodb_error_ibase(); break;

-	

-	case 'odbc': $map = adodb_error_odbc(); break;

-	

-	case 'mssql':

-	case 'sybase': $map = adodb_error_mssql(); break;

-	

-	case 'informix': $map = adodb_error_ifx(); break;

-	

-	case 'postgres': return adodb_error_pg($errno); break;

-	

-	case 'sqlite': return $map = adodb_error_sqlite(); break;

-	default:

-		return DB_ERROR;

-	}	

-	//print_r($map);

-	//var_dump($errno);

-	if (isset($map[$errno])) return $map[$errno];

-	return DB_ERROR;

-}

-

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

-

-function adodb_error_pg($errormsg)

-{

-	if (is_numeric($errormsg)) return (integer) $errormsg;

-    static $error_regexps = array(

-            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,

-            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,

-            '/divide by zero$/'                     => DB_ERROR_DIVZERO,

-            '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER,

-            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD,

-            '/parser: parse error at or near \"/'   => DB_ERROR_SYNTAX,

-            '/referential integrity violation/'     => DB_ERROR_CONSTRAINT,

-			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/'     

-			 	 => DB_ERROR_ALREADY_EXISTS

-        );

-	reset($error_regexps);

-    while (list($regexp,$code) = each($error_regexps)) {

-        if (preg_match($regexp, $errormsg)) {

-            return $code;

-        }

-    }

-    // Fall back to DB_ERROR if there was no mapping.

-    return DB_ERROR;

-}

-	

-function adodb_error_odbc()

-{

-static $MAP = array(

-            '01004' => DB_ERROR_TRUNCATED,

-            '07001' => DB_ERROR_MISMATCH,

-            '21S01' => DB_ERROR_MISMATCH,

-            '21S02' => DB_ERROR_MISMATCH,

-            '22003' => DB_ERROR_INVALID_NUMBER,

-            '22008' => DB_ERROR_INVALID_DATE,

-            '22012' => DB_ERROR_DIVZERO,

-            '23000' => DB_ERROR_CONSTRAINT,

-            '24000' => DB_ERROR_INVALID,

-            '34000' => DB_ERROR_INVALID,

-            '37000' => DB_ERROR_SYNTAX,

-            '42000' => DB_ERROR_SYNTAX,

-            'IM001' => DB_ERROR_UNSUPPORTED,

-            'S0000' => DB_ERROR_NOSUCHTABLE,

-            'S0001' => DB_ERROR_NOT_FOUND,

-            'S0002' => DB_ERROR_NOSUCHTABLE,

-            'S0011' => DB_ERROR_ALREADY_EXISTS,

-            'S0012' => DB_ERROR_NOT_FOUND,

-            'S0021' => DB_ERROR_ALREADY_EXISTS,

-            'S0022' => DB_ERROR_NOT_FOUND,

-			'S1000' => DB_ERROR_NOSUCHTABLE,

-            'S1009' => DB_ERROR_INVALID,

-            'S1090' => DB_ERROR_INVALID,

-            'S1C00' => DB_ERROR_NOT_CAPABLE

-        );

-		return $MAP;

-}

-

-function adodb_error_ibase()

-{

-static $MAP = array(

-            -104 => DB_ERROR_SYNTAX,

-            -150 => DB_ERROR_ACCESS_VIOLATION,

-            -151 => DB_ERROR_ACCESS_VIOLATION,

-            -155 => DB_ERROR_NOSUCHTABLE,

-            -157 => DB_ERROR_NOSUCHFIELD,

-            -158 => DB_ERROR_VALUE_COUNT_ON_ROW,

-            -170 => DB_ERROR_MISMATCH,

-            -171 => DB_ERROR_MISMATCH,

-            -172 => DB_ERROR_INVALID,

-            -204 => DB_ERROR_INVALID,

-            -205 => DB_ERROR_NOSUCHFIELD,

-            -206 => DB_ERROR_NOSUCHFIELD,

-            -208 => DB_ERROR_INVALID,

-            -219 => DB_ERROR_NOSUCHTABLE,

-            -297 => DB_ERROR_CONSTRAINT,

-            -530 => DB_ERROR_CONSTRAINT,

-            -803 => DB_ERROR_CONSTRAINT,

-            -551 => DB_ERROR_ACCESS_VIOLATION,

-            -552 => DB_ERROR_ACCESS_VIOLATION,

-            -922 => DB_ERROR_NOSUCHDB,

-            -923 => DB_ERROR_CONNECT_FAILED,

-            -924 => DB_ERROR_CONNECT_FAILED

-        );

-		

-		return $MAP;

-}

-

-function adodb_error_ifx()

-{

-static $MAP = array(

-            '-201'    => DB_ERROR_SYNTAX,

-            '-206'    => DB_ERROR_NOSUCHTABLE,

-            '-217'    => DB_ERROR_NOSUCHFIELD,

-            '-329'    => DB_ERROR_NODBSELECTED,

-            '-1204'   => DB_ERROR_INVALID_DATE,

-            '-1205'   => DB_ERROR_INVALID_DATE,

-            '-1206'   => DB_ERROR_INVALID_DATE,

-            '-1209'   => DB_ERROR_INVALID_DATE,

-            '-1210'   => DB_ERROR_INVALID_DATE,

-            '-1212'   => DB_ERROR_INVALID_DATE

-       );

-	   

-	   return $MAP;

-}

-

-function adodb_error_oci8()

-{

-static $MAP = array(

-			 1 => DB_ERROR_ALREADY_EXISTS,

-            900 => DB_ERROR_SYNTAX,

-            904 => DB_ERROR_NOSUCHFIELD,

-            923 => DB_ERROR_SYNTAX,

-            942 => DB_ERROR_NOSUCHTABLE,

-            955 => DB_ERROR_ALREADY_EXISTS,

-            1476 => DB_ERROR_DIVZERO,

-            1722 => DB_ERROR_INVALID_NUMBER,

-            2289 => DB_ERROR_NOSUCHTABLE,

-            2291 => DB_ERROR_CONSTRAINT,

-            2449 => DB_ERROR_CONSTRAINT

-        );

-	   

-	return $MAP;

-}

-

-function adodb_error_mssql()

-{

-static $MAP = array(

-		  208 => DB_ERROR_NOSUCHTABLE,

-          2601 => DB_ERROR_ALREADY_EXISTS

-       );

-	   

-	return $MAP;

-}

-

-function adodb_error_sqlite()

-{

-static $MAP = array(

-		  1 => DB_ERROR_SYNTAX

-       );

-	   

-	return $MAP;

-}

-

-function adodb_error_mysql()

-{

-static $MAP = array(

-           1004 => DB_ERROR_CANNOT_CREATE,

-           1005 => DB_ERROR_CANNOT_CREATE,

-           1006 => DB_ERROR_CANNOT_CREATE,

-           1007 => DB_ERROR_ALREADY_EXISTS,

-           1008 => DB_ERROR_CANNOT_DROP,

-		   1045 => DB_ERROR_ACCESS_VIOLATION,

-           1046 => DB_ERROR_NODBSELECTED,

-		   1049 => DB_ERROR_NOSUCHDB,

-           1050 => DB_ERROR_ALREADY_EXISTS,

-           1051 => DB_ERROR_NOSUCHTABLE,

-           1054 => DB_ERROR_NOSUCHFIELD,

-           1062 => DB_ERROR_ALREADY_EXISTS,

-           1064 => DB_ERROR_SYNTAX,

-           1100 => DB_ERROR_NOT_LOCKED,

-           1136 => DB_ERROR_VALUE_COUNT_ON_ROW,

-           1146 => DB_ERROR_NOSUCHTABLE,

-           1048 => DB_ERROR_CONSTRAINT,

-		    2002 => DB_ERROR_CONNECT_FAILED,

-			2005 => DB_ERROR_CONNECT_FAILED

-       );

-	   

-	return $MAP;

-}

+<?php
+/** 
+ * @version V4.93 10 Oct 2006 (c) 2000-2006 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 for best viewing.
+ * 
+ * The following code is adapted from the PEAR DB error handling code.
+ * Portions (c)1997-2002 The PHP Group.
+ */
+
+
+if (!defined("DB_ERROR")) define("DB_ERROR",-1);
+
+if (!defined("DB_ERROR_SYNTAX")) {
+	define("DB_ERROR_SYNTAX",              -2);
+	define("DB_ERROR_CONSTRAINT",          -3);
+	define("DB_ERROR_NOT_FOUND",           -4);
+	define("DB_ERROR_ALREADY_EXISTS",      -5);
+	define("DB_ERROR_UNSUPPORTED",         -6);
+	define("DB_ERROR_MISMATCH",            -7);
+	define("DB_ERROR_INVALID",             -8);
+	define("DB_ERROR_NOT_CAPABLE",         -9);
+	define("DB_ERROR_TRUNCATED",          -10);
+	define("DB_ERROR_INVALID_NUMBER",     -11);
+	define("DB_ERROR_INVALID_DATE",       -12);
+	define("DB_ERROR_DIVZERO",            -13);
+	define("DB_ERROR_NODBSELECTED",       -14);
+	define("DB_ERROR_CANNOT_CREATE",      -15);
+	define("DB_ERROR_CANNOT_DELETE",      -16);
+	define("DB_ERROR_CANNOT_DROP",        -17);
+	define("DB_ERROR_NOSUCHTABLE",        -18);
+	define("DB_ERROR_NOSUCHFIELD",        -19);
+	define("DB_ERROR_NEED_MORE_DATA",     -20);
+	define("DB_ERROR_NOT_LOCKED",         -21);
+	define("DB_ERROR_VALUE_COUNT_ON_ROW", -22);
+	define("DB_ERROR_INVALID_DSN",        -23);
+	define("DB_ERROR_CONNECT_FAILED",     -24);
+	define("DB_ERROR_EXTENSION_NOT_FOUND",-25);
+	define("DB_ERROR_NOSUCHDB",           -25);
+	define("DB_ERROR_ACCESS_VIOLATION",   -26);
+}
+
+function adodb_errormsg($value)
+{
+global $ADODB_LANG,$ADODB_LANG_ARRAY;
+
+	if (empty($ADODB_LANG)) $ADODB_LANG = 'en';
+	if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == $ADODB_LANG) ;
+	else {
+		include_once(ADODB_DIR."/lang/adodb-$ADODB_LANG.inc.php");
+    }
+	return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : $ADODB_LANG_ARRAY[DB_ERROR];
+}
+
+function adodb_error($provider,$dbType,$errno)
+{
+	//var_dump($errno);
+	if (is_numeric($errno) && $errno == 0) return 0;
+	switch($provider) { 
+	case 'mysql': $map = adodb_error_mysql(); break;
+	
+	case 'oracle':
+	case 'oci8': $map = adodb_error_oci8(); break;
+	
+	case 'ibase': $map = adodb_error_ibase(); break;
+	
+	case 'odbc': $map = adodb_error_odbc(); break;
+	
+	case 'mssql':
+	case 'sybase': $map = adodb_error_mssql(); break;
+	
+	case 'informix': $map = adodb_error_ifx(); break;
+	
+	case 'postgres': return adodb_error_pg($errno); break;
+	
+	case 'sqlite': return $map = adodb_error_sqlite(); break;
+	default:
+		return DB_ERROR;
+	}	
+	//print_r($map);
+	//var_dump($errno);
+	if (isset($map[$errno])) return $map[$errno];
+	return DB_ERROR;
+}
+
+//**************************************************************************************
+
+function adodb_error_pg($errormsg)
+{
+	if (is_numeric($errormsg)) return (integer) $errormsg;
+    static $error_regexps = array(
+            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
+            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
+            '/divide by zero$/'                     => DB_ERROR_DIVZERO,
+            '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER,
+            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD,
+            '/parser: parse error at or near \"/'   => DB_ERROR_SYNTAX,
+            '/referential integrity violation/'     => DB_ERROR_CONSTRAINT,
+			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/'     
+			 	 => DB_ERROR_ALREADY_EXISTS
+        );
+	reset($error_regexps);
+    while (list($regexp,$code) = each($error_regexps)) {
+        if (preg_match($regexp, $errormsg)) {
+            return $code;
+        }
+    }
+    // Fall back to DB_ERROR if there was no mapping.
+    return DB_ERROR;
+}
+	
+function adodb_error_odbc()
+{
+static $MAP = array(
+            '01004' => DB_ERROR_TRUNCATED,
+            '07001' => DB_ERROR_MISMATCH,
+            '21S01' => DB_ERROR_MISMATCH,
+            '21S02' => DB_ERROR_MISMATCH,
+            '22003' => DB_ERROR_INVALID_NUMBER,
+            '22008' => DB_ERROR_INVALID_DATE,
+            '22012' => DB_ERROR_DIVZERO,
+            '23000' => DB_ERROR_CONSTRAINT,
+            '24000' => DB_ERROR_INVALID,
+            '34000' => DB_ERROR_INVALID,
+            '37000' => DB_ERROR_SYNTAX,
+            '42000' => DB_ERROR_SYNTAX,
+            'IM001' => DB_ERROR_UNSUPPORTED,
+            'S0000' => DB_ERROR_NOSUCHTABLE,
+            'S0001' => DB_ERROR_NOT_FOUND,
+            'S0002' => DB_ERROR_NOSUCHTABLE,
+            'S0011' => DB_ERROR_ALREADY_EXISTS,
+            'S0012' => DB_ERROR_NOT_FOUND,
+            'S0021' => DB_ERROR_ALREADY_EXISTS,
+            'S0022' => DB_ERROR_NOT_FOUND,
+			'S1000' => DB_ERROR_NOSUCHTABLE,
+            'S1009' => DB_ERROR_INVALID,
+            'S1090' => DB_ERROR_INVALID,
+            'S1C00' => DB_ERROR_NOT_CAPABLE
+        );
+		return $MAP;
+}
+
+function adodb_error_ibase()
+{
+static $MAP = array(
+            -104 => DB_ERROR_SYNTAX,
+            -150 => DB_ERROR_ACCESS_VIOLATION,
+            -151 => DB_ERROR_ACCESS_VIOLATION,
+            -155 => DB_ERROR_NOSUCHTABLE,
+            -157 => DB_ERROR_NOSUCHFIELD,
+            -158 => DB_ERROR_VALUE_COUNT_ON_ROW,
+            -170 => DB_ERROR_MISMATCH,
+            -171 => DB_ERROR_MISMATCH,
+            -172 => DB_ERROR_INVALID,
+            -204 => DB_ERROR_INVALID,
+            -205 => DB_ERROR_NOSUCHFIELD,
+            -206 => DB_ERROR_NOSUCHFIELD,
+            -208 => DB_ERROR_INVALID,
+            -219 => DB_ERROR_NOSUCHTABLE,
+            -297 => DB_ERROR_CONSTRAINT,
+            -530 => DB_ERROR_CONSTRAINT,
+            -803 => DB_ERROR_CONSTRAINT,
+            -551 => DB_ERROR_ACCESS_VIOLATION,
+            -552 => DB_ERROR_ACCESS_VIOLATION,
+            -922 => DB_ERROR_NOSUCHDB,
+            -923 => DB_ERROR_CONNECT_FAILED,
+            -924 => DB_ERROR_CONNECT_FAILED
+        );
+		
+		return $MAP;
+}
+
+function adodb_error_ifx()
+{
+static $MAP = array(
+            '-201'    => DB_ERROR_SYNTAX,
+            '-206'    => DB_ERROR_NOSUCHTABLE,
+            '-217'    => DB_ERROR_NOSUCHFIELD,
+            '-329'    => DB_ERROR_NODBSELECTED,
+            '-1204'   => DB_ERROR_INVALID_DATE,
+            '-1205'   => DB_ERROR_INVALID_DATE,
+            '-1206'   => DB_ERROR_INVALID_DATE,
+            '-1209'   => DB_ERROR_INVALID_DATE,
+            '-1210'   => DB_ERROR_INVALID_DATE,
+            '-1212'   => DB_ERROR_INVALID_DATE
+       );
+	   
+	   return $MAP;
+}
+
+function adodb_error_oci8()
+{
+static $MAP = array(
+			 1 => DB_ERROR_ALREADY_EXISTS,
+            900 => DB_ERROR_SYNTAX,
+            904 => DB_ERROR_NOSUCHFIELD,
+            923 => DB_ERROR_SYNTAX,
+            942 => DB_ERROR_NOSUCHTABLE,
+            955 => DB_ERROR_ALREADY_EXISTS,
+            1476 => DB_ERROR_DIVZERO,
+            1722 => DB_ERROR_INVALID_NUMBER,
+            2289 => DB_ERROR_NOSUCHTABLE,
+            2291 => DB_ERROR_CONSTRAINT,
+            2449 => DB_ERROR_CONSTRAINT
+        );
+	   
+	return $MAP;
+}
+
+function adodb_error_mssql()
+{
+static $MAP = array(
+		  208 => DB_ERROR_NOSUCHTABLE,
+          2601 => DB_ERROR_ALREADY_EXISTS
+       );
+	   
+	return $MAP;
+}
+
+function adodb_error_sqlite()
+{
+static $MAP = array(
+		  1 => DB_ERROR_SYNTAX
+       );
+	   
+	return $MAP;
+}
+
+function adodb_error_mysql()
+{
+static $MAP = array(
+           1004 => DB_ERROR_CANNOT_CREATE,
+           1005 => DB_ERROR_CANNOT_CREATE,
+           1006 => DB_ERROR_CANNOT_CREATE,
+           1007 => DB_ERROR_ALREADY_EXISTS,
+           1008 => DB_ERROR_CANNOT_DROP,
+		   1045 => DB_ERROR_ACCESS_VIOLATION,
+           1046 => DB_ERROR_NODBSELECTED,
+		   1049 => DB_ERROR_NOSUCHDB,
+           1050 => DB_ERROR_ALREADY_EXISTS,
+           1051 => DB_ERROR_NOSUCHTABLE,
+           1054 => DB_ERROR_NOSUCHFIELD,
+           1062 => DB_ERROR_ALREADY_EXISTS,
+           1064 => DB_ERROR_SYNTAX,
+           1100 => DB_ERROR_NOT_LOCKED,
+           1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
+           1146 => DB_ERROR_NOSUCHTABLE,
+           1048 => DB_ERROR_CONSTRAINT,
+		    2002 => DB_ERROR_CONNECT_FAILED,
+			2005 => DB_ERROR_CONNECT_FAILED
+       );
+	   
+	return $MAP;
+}
 ?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-iterator.inc.php b/libraries/adodb/adodb-iterator.inc.php
index a7126dd7..031c963d 100755
--- a/libraries/adodb/adodb-iterator.inc.php
+++ b/libraries/adodb/adodb-iterator.inc.php
@@ -1,84 +1,85 @@
-<?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.

-  

-  Set tabs to 4.

-  

-  Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports iteration with 

-  the ADODB_Iterator class.

-  

-  		$rs = $db->Execute("select * from adoxyz");

-		foreach($rs as $k => $v) {

-			echo $k; print_r($v); echo "<br>";

-		}

-		

-		

-	Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2

- */

- 

-

- class ADODB_Iterator implements Iterator {

-

-    private $rs;

-

-    function __construct($rs) 

-	{

-        $this->rs = $rs;

-    }

-    function rewind() 

-	{

-        $this->rs->MoveFirst();

-    }

-

-	function valid() 

-	{

-        return !$this->rs->EOF;

-    }

-	

-    function key() 

-	{

-        return $this->rs->_currentRow;

-    }

-	

-    function current() 

-	{

-        return $this->rs->fields;

-    }

-	

-    function next() 

-	{

-        $this->rs->MoveNext();

-    }

-	

-	function __call($func, $params)

-	{

-		return call_user_func_array(array($this->rs, $func), $params);

-	}

-

-	

-	function hasMore()

-	{

-		return !$this->rs->EOF;

-	}

-

-}

-

-

-class ADODB_BASE_RS implements IteratorAggregate {

-    function getIterator() {

-        return new ADODB_Iterator($this);

-    }

-	

-	/* this is experimental - i don't really know what to return... */

-	function __toString()

-	{

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

-		return _adodb_export($this,',',',',false,true);

-	}

-} 

-

+<?php
+
+/*
+  V4.93 10 Oct 2006  (c) 2000-2006 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.
+  
+  Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports iteration with 
+  the ADODB_Iterator class.
+  
+  		$rs = $db->Execute("select * from adoxyz");
+		foreach($rs as $k => $v) {
+			echo $k; print_r($v); echo "<br>";
+		}
+		
+		
+	Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
+ */
+ 
+
+ class ADODB_Iterator implements Iterator {
+
+    private $rs;
+
+    function __construct($rs) 
+	{
+        $this->rs = $rs;
+    }
+    function rewind() 
+	{
+        $this->rs->MoveFirst();
+    }
+
+	function valid() 
+	{
+        return !$this->rs->EOF;
+    }
+	
+    function key() 
+	{
+        return $this->rs->_currentRow;
+    }
+	
+    function current() 
+	{
+        return $this->rs->fields;
+    }
+	
+    function next() 
+	{
+        $this->rs->MoveNext();
+    }
+	
+	function __call($func, $params)
+	{
+		return call_user_func_array(array($this->rs, $func), $params);
+	}
+
+	
+	function hasMore()
+	{
+		return !$this->rs->EOF;
+	}
+
+}
+
+
+class ADODB_BASE_RS implements IteratorAggregate {
+    function getIterator() {
+        return new ADODB_Iterator($this);
+    }
+	
+	/* this is experimental - i don't really know what to return... */
+	function __toString()
+	{
+		include_once(ADODB_DIR.'/toexport.inc.php');
+		return _adodb_export($this,',',',',false,true);
+	}
+} 
+
+
 ?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-php4.inc.php b/libraries/adodb/adodb-php4.inc.php
index 6059347f..a23dc170 100755
--- a/libraries/adodb/adodb-php4.inc.php
+++ b/libraries/adodb/adodb-php4.inc.php
@@ -1,16 +1,16 @@
-<?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.

-  

-  Set tabs to 4.

-*/

-

-

-class ADODB_BASE_RS {

-}

-

+<?php
+
+/*
+  V4.93 10 Oct 2006  (c) 2000-2006 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.
+*/
+
+
+class ADODB_BASE_RS {
+}
+
 ?>
\ 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 5b36d554..4dd3f82c 100644
--- a/libraries/adodb/drivers/adodb-postgres.inc.php
+++ b/libraries/adodb/drivers/adodb-postgres.inc.php
@@ -1,14 +1,14 @@
-<?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.

-  Set tabs to 4.

-  

-  NOTE: Since 3.31, this file is no longer used, and the "postgres" driver is

-  remapped to "postgres7". Maintaining multiple postgres drivers is no easy

-  job, so hopefully this will ensure greater consistency and fewer bugs.

-*/

-

+<?php
+/*
+ V4.93 10 Oct 2006  (c) 2000-2006 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.
+  
+  NOTE: Since 3.31, this file is no longer used, and the "postgres" driver is
+  remapped to "postgres7". Maintaining multiple postgres drivers is no easy
+  job, so hopefully this will ensure greater consistency and fewer bugs.
+*/
+
 ?>
\ 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 9e3d060a..ab364a71 100755
--- a/libraries/adodb/drivers/adodb-postgres8.inc.php
+++ b/libraries/adodb/drivers/adodb-postgres8.inc.php
@@ -1,12 +1,12 @@
-<?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.

-  Set tabs to 4.

-  

-  NOTE: The "postgres8" driver is remapped to "postgres7". 

-*/

-

+<?php
+/*
+ V4.93 10 Oct 2006  (c) 2000-2006 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.
+  
+  NOTE: The "postgres8" driver is remapped to "postgres7". 
+*/
+
 ?>
\ No newline at end of file
diff --git a/libraries/adodb/toexport.inc.php b/libraries/adodb/toexport.inc.php
index e0d6127e..6e0f777d 100644
--- a/libraries/adodb/toexport.inc.php
+++ b/libraries/adodb/toexport.inc.php
@@ -1,133 +1,133 @@
-<?php

-

-/** 

- * @version 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. 

- *

- * Code to export recordsets in several formats:

- *

- * AS VARIABLE

- * $s = rs2csv($rs); # comma-separated values

- * $s = rs2tab($rs); # tab delimited

- * 

- * TO A FILE

- * $f = fopen($path,'w');

- * rs2csvfile($rs,$f);

- * fclose($f);

- *

- * TO STDOUT

- * rs2csvout($rs);

- */

- 

-// returns a recordset as a csv string

-function rs2csv(&$rs,$addtitles=true)

-{

-	return _adodb_export($rs,',',',',false,$addtitles);

-}

-

-// writes recordset to csv file 

-function rs2csvfile(&$rs,$fp,$addtitles=true)

-{

-	_adodb_export($rs,',',',',$fp,$addtitles);

-}

-

-// write recordset as csv string to stdout

-function rs2csvout(&$rs,$addtitles=true)

-{

-	$fp = fopen('php://stdout','wb');

-	_adodb_export($rs,',',',',true,$addtitles);

-	fclose($fp);

-}

-

-function rs2tab(&$rs,$addtitles=true)

-{

-	return _adodb_export($rs,"\t",',',false,$addtitles);

-}

-

-// to file pointer

-function rs2tabfile(&$rs,$fp,$addtitles=true)

-{

-	_adodb_export($rs,"\t",',',$fp,$addtitles);

-}

-

-// to stdout

-function rs2tabout(&$rs,$addtitles=true)

-{

-	$fp = fopen('php://stdout','wb');

-	_adodb_export($rs,"\t",' ',true,$addtitles);

-	if ($fp) fclose($fp);

-}

-

-function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote = '"',$escquote = '"',$replaceNewLine = ' ')

-{

-	if (!$rs) return '';

-	//----------

-	// CONSTANTS

-	$NEWLINE = "\r\n";

-	$BUFLINES = 100;

-	$escquotequote = $escquote.$quote;

-	$s = '';

-	

-	if ($addtitles) {

-		$fieldTypes = $rs->FieldTypesArray();

-		reset($fieldTypes);

-		while(list(,$o) = each($fieldTypes)) {

-			

-			$v = $o->name;

-			if ($escquote) $v = str_replace($quote,$escquotequote,$v);

-			$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));

-			$elements[] = $v;

-			

-		}

-		$s .= implode($sep, $elements).$NEWLINE;

-	}

-	$hasNumIndex = isset($rs->fields[0]);

-	

-	$line = 0;

-	$max = $rs->FieldCount();

-	

-	while (!$rs->EOF) {

-		$elements = array();

-		$i = 0;

-		

-		if ($hasNumIndex) {

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

-				$v = $rs->fields[$j];

-				if (!is_object($v)) $v = trim($v);

-				else $v = 'Object';

-				if ($escquote) $v = str_replace($quote,$escquotequote,$v);

-				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));

-				

-				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";

-				else $elements[] = $v;

-			}

-		} else { // ASSOCIATIVE ARRAY

-			foreach($rs->fields as $v) {

-				if ($escquote) $v = str_replace($quote,$escquotequote,trim($v));

-				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));

-				

-				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";

-				else $elements[] = $v;

-			}

-		}

-		$s .= implode($sep, $elements).$NEWLINE;

-		$rs->MoveNext();

-		$line += 1;

-		if ($fp && ($line % $BUFLINES) == 0) {

-			if ($fp === true) echo $s;

-			else fwrite($fp,$s);

-			$s = '';

-		}

-	}

-	

-	if ($fp) {

-		if ($fp === true) echo $s;

-		else fwrite($fp,$s);

-		$s = '';

-	}

-	

-	return $s;

-}

+<?php
+
+/** 
+ * @version V4.93 10 Oct 2006 (c) 2000-2006 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. 
+ *
+ * Code to export recordsets in several formats:
+ *
+ * AS VARIABLE
+ * $s = rs2csv($rs); # comma-separated values
+ * $s = rs2tab($rs); # tab delimited
+ * 
+ * TO A FILE
+ * $f = fopen($path,'w');
+ * rs2csvfile($rs,$f);
+ * fclose($f);
+ *
+ * TO STDOUT
+ * rs2csvout($rs);
+ */
+ 
+// returns a recordset as a csv string
+function rs2csv(&$rs,$addtitles=true)
+{
+	return _adodb_export($rs,',',',',false,$addtitles);
+}
+
+// writes recordset to csv file 
+function rs2csvfile(&$rs,$fp,$addtitles=true)
+{
+	_adodb_export($rs,',',',',$fp,$addtitles);
+}
+
+// write recordset as csv string to stdout
+function rs2csvout(&$rs,$addtitles=true)
+{
+	$fp = fopen('php://stdout','wb');
+	_adodb_export($rs,',',',',true,$addtitles);
+	fclose($fp);
+}
+
+function rs2tab(&$rs,$addtitles=true)
+{
+	return _adodb_export($rs,"\t",',',false,$addtitles);
+}
+
+// to file pointer
+function rs2tabfile(&$rs,$fp,$addtitles=true)
+{
+	_adodb_export($rs,"\t",',',$fp,$addtitles);
+}
+
+// to stdout
+function rs2tabout(&$rs,$addtitles=true)
+{
+	$fp = fopen('php://stdout','wb');
+	_adodb_export($rs,"\t",' ',true,$addtitles);
+	if ($fp) fclose($fp);
+}
+
+function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote = '"',$escquote = '"',$replaceNewLine = ' ')
+{
+	if (!$rs) return '';
+	//----------
+	// CONSTANTS
+	$NEWLINE = "\r\n";
+	$BUFLINES = 100;
+	$escquotequote = $escquote.$quote;
+	$s = '';
+	
+	if ($addtitles) {
+		$fieldTypes = $rs->FieldTypesArray();
+		reset($fieldTypes);
+		while(list(,$o) = each($fieldTypes)) {
+			
+			$v = $o->name;
+			if ($escquote) $v = str_replace($quote,$escquotequote,$v);
+			$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+			$elements[] = $v;
+			
+		}
+		$s .= implode($sep, $elements).$NEWLINE;
+	}
+	$hasNumIndex = isset($rs->fields[0]);
+	
+	$line = 0;
+	$max = $rs->FieldCount();
+	
+	while (!$rs->EOF) {
+		$elements = array();
+		$i = 0;
+		
+		if ($hasNumIndex) {
+			for ($j=0; $j < $max; $j++) {
+				$v = $rs->fields[$j];
+				if (!is_object($v)) $v = trim($v);
+				else $v = 'Object';
+				if ($escquote) $v = str_replace($quote,$escquotequote,$v);
+				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+				
+				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
+				else $elements[] = $v;
+			}
+		} else { // ASSOCIATIVE ARRAY
+			foreach($rs->fields as $v) {
+				if ($escquote) $v = str_replace($quote,$escquotequote,trim($v));
+				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+				
+				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
+				else $elements[] = $v;
+			}
+		}
+		$s .= implode($sep, $elements).$NEWLINE;
+		$rs->MoveNext();
+		$line += 1;
+		if ($fp && ($line % $BUFLINES) == 0) {
+			if ($fp === true) echo $s;
+			else fwrite($fp,$s);
+			$s = '';
+		}
+	}
+	
+	if ($fp) {
+		if ($fp === true) echo $s;
+		else fwrite($fp,$s);
+		$s = '';
+	}
+	
+	return $s;
+}
 ?>
\ No newline at end of file
diff --git a/libraries/adodb/tohtml.inc.php b/libraries/adodb/tohtml.inc.php
index 4e68f579..5f1071cc 100755
--- a/libraries/adodb/tohtml.inc.php
+++ b/libraries/adodb/tohtml.inc.php
@@ -1,195 +1,195 @@
-<?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.

-  

-  Some pretty-printing by Chris Oxenreider <[email protected]>

-*/ 

-  

-// specific code for tohtml

-GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;

-

-$ADODB_ROUND=4; // rounding

-$gSQLMaxRows = 1000; // max no of rows to download

-$gSQLBlockRows=20; // max no of rows per table block

-

-// RecordSet to HTML Table

-//------------------------------------------------------------

-// Convert a recordset to a html table. Multiple tables are generated

-// if the number of rows is > $gSQLBlockRows. This is because

-// web browsers normally require the whole table to be downloaded

-// before it can be rendered, so we break the output into several

-// smaller faster rendering tables.

-//

-// $rs: the recordset

-// $ztabhtml: the table tag attributes (optional)

-// $zheaderarray: contains the replacement strings for the headers (optional)

-//

-//  USAGE:

-//	include('adodb.inc.php');

-//	$db = ADONewConnection('mysql');

-//	$db->Connect('mysql','userid','password','database');

-//	$rs = $db->Execute('select col1,col2,col3 from table');

-//	rs2html($rs, 'BORDER=2', array('Title1', 'Title2', 'Title3'));

-//	$rs->Close();

-//

-// RETURNS: number of rows displayed

-

-

-function rs2html(&$rs,$ztabhtml=false,$zheaderarray=false,$htmlspecialchars=true,$echo = true)

-{

-$s ='';$rows=0;$docnt = false;

-GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;

-

-	if (!$rs) {

-		printf(ADODB_BAD_RS,'rs2html');

-		return false;

-	}

-	

-	if (! $ztabhtml) $ztabhtml = "BORDER='1' WIDTH='98%'";

-	//else $docnt = true;

-	$typearr = array();

-	$ncols = $rs->FieldCount();

-	$hdr = "<TABLE COLS=$ncols $ztabhtml><tr>\n\n";

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

-		$field = $rs->FetchField($i);

-		if ($field) {

-			if ($zheaderarray) $fname = $zheaderarray[$i];

-			else $fname = htmlspecialchars($field->name);	

-			$typearr[$i] = $rs->MetaType($field->type,$field->max_length);

- 			//print " $field->name $field->type $typearr[$i] ";

-		} else {

-			$fname = 'Field '.($i+1);

-			$typearr[$i] = 'C';

-		}

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

-		$hdr .= "<TH>$fname</TH>";

-	}

-	$hdr .= "\n</tr>";

-	if ($echo) print $hdr."\n\n";

-	else $html = $hdr;

-	

-	// smart algorithm - handles ADODB_FETCH_MODE's correctly by probing...

-	$numoffset = isset($rs->fields[0]) ||isset($rs->fields[1]) || isset($rs->fields[2]);

-	while (!$rs->EOF) {

-		

-		$s .= "<TR valign=top>\n";

-		

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

-			if ($i===0) $v=($numoffset) ? $rs->fields[0] : reset($rs->fields);

-			else $v = ($numoffset) ? $rs->fields[$i] : next($rs->fields);

-			

-			$type = $typearr[$i];

-			switch($type) {

-			case 'D':

-				if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";

-				else if (!strpos($v,':')) {

-					$s .= "	<TD>".$rs->UserDate($v,"D d, M Y") ."&nbsp;</TD>\n";

-				}

-				break;

-			case 'T':

-				if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";

-				else $s .= "	<TD>".$rs->UserTimeStamp($v,"D d, M Y, h:i:s") ."&nbsp;</TD>\n";

-			break;

-			

-			case 'N':

-				if (abs($v) - round($v,0) < 0.00000001)

-					$v = round($v);

-				else

-					$v = round($v,$ADODB_ROUND);

-			case 'I':

-				$s .= "	<TD align=right>".stripslashes((trim($v))) ."&nbsp;</TD>\n";

-			   	

-			break;

-			/*

-			case 'B':

-				if (substr($v,8,2)=="BM" ) $v = substr($v,8);

-				$mtime = substr(str_replace(' ','_',microtime()),2);

-				$tmpname = "tmp/".uniqid($mtime).getmypid();

-				$fd = @fopen($tmpname,'a');

-				@ftruncate($fd,0);

-				@fwrite($fd,$v);

-				@fclose($fd);

-				if (!function_exists ("mime_content_type")) {

-				  function mime_content_type ($file) {

-				    return exec("file -bi ".escapeshellarg($file));

-				  }

-				}

-				$t = mime_content_type($tmpname);

-				$s .= (substr($t,0,5)=="image") ? " <td><img src='$tmpname' alt='$t'></td>\\n" : " <td><a

-				href='$tmpname'>$t</a></td>\\n";

-				break;

-			*/

-

-			default:

-				if ($htmlspecialchars) $v = htmlspecialchars(trim($v));

-				$v = trim($v);

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

-				$s .= "	<TD>". str_replace("\n",'<br>',stripslashes($v)) ."</TD>\n";

-			  

-			}

-		} // for

-		$s .= "</TR>\n\n";

-			  

-		$rows += 1;

-		if ($rows >= $gSQLMaxRows) {

-			$rows = "<p>Truncated at $gSQLMaxRows</p>";

-			break;

-		} // switch

-

-		$rs->MoveNext();

-	

-	// additional EOF check to prevent a widow header

-		if (!$rs->EOF && $rows % $gSQLBlockRows == 0) {

-	

-		//if (connection_aborted()) break;// not needed as PHP aborts script, unlike ASP

-			if ($echo) print $s . "</TABLE>\n\n";

-			else $html .= $s ."</TABLE>\n\n";

-			$s = $hdr;

-		}

-	} // while

-

-	if ($echo) print $s."</TABLE>\n\n";

-	else $html .= $s."</TABLE>\n\n";

-	

-	if ($docnt) if ($echo) print "<H2>".$rows." Rows</H2>";

-	

-	return ($echo) ? $rows : $html;

- }

- 

-// pass in 2 dimensional array

-function arr2html(&$arr,$ztabhtml='',$zheaderarray='')

-{

-	if (!$ztabhtml) $ztabhtml = 'BORDER=1';

-	

-	$s = "<TABLE $ztabhtml>";//';print_r($arr);

-

-	if ($zheaderarray) {

-		$s .= '<TR>';

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

-			$s .= "	<TH>{$zheaderarray[$i]}</TH>\n";

-		}

-		$s .= "\n</TR>";

-	}

-	

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

-		$s .= '<TR>';

-		$a = &$arr[$i];

-		if (is_array($a)) 

-			for ($j=0; $j<sizeof($a); $j++) {

-				$val = $a[$j];

-				if (empty($val)) $val = '&nbsp;';

-				$s .= "	<TD>$val</TD>\n";

-			}

-		else if ($a) {

-			$s .=  '	<TD>'.$a."</TD>\n";

-		} else $s .= "	<TD>&nbsp;</TD>\n";

-		$s .= "\n</TR>\n";

-	}

-	$s .= '</TABLE>';

-	print $s;

-}

-

+<?php 
+/*
+  V4.93 10 Oct 2006  (c) 2000-2006 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.
+  
+  Some pretty-printing by Chris Oxenreider <[email protected]>
+*/ 
+  
+// specific code for tohtml
+GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
+
+$ADODB_ROUND=4; // rounding
+$gSQLMaxRows = 1000; // max no of rows to download
+$gSQLBlockRows=20; // max no of rows per table block
+
+// RecordSet to HTML Table
+//------------------------------------------------------------
+// Convert a recordset to a html table. Multiple tables are generated
+// if the number of rows is > $gSQLBlockRows. This is because
+// web browsers normally require the whole table to be downloaded
+// before it can be rendered, so we break the output into several
+// smaller faster rendering tables.
+//
+// $rs: the recordset
+// $ztabhtml: the table tag attributes (optional)
+// $zheaderarray: contains the replacement strings for the headers (optional)
+//
+//  USAGE:
+//	include('adodb.inc.php');
+//	$db = ADONewConnection('mysql');
+//	$db->Connect('mysql','userid','password','database');
+//	$rs = $db->Execute('select col1,col2,col3 from table');
+//	rs2html($rs, 'BORDER=2', array('Title1', 'Title2', 'Title3'));
+//	$rs->Close();
+//
+// RETURNS: number of rows displayed
+
+
+function rs2html(&$rs,$ztabhtml=false,$zheaderarray=false,$htmlspecialchars=true,$echo = true)
+{
+$s ='';$rows=0;$docnt = false;
+GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
+
+	if (!$rs) {
+		printf(ADODB_BAD_RS,'rs2html');
+		return false;
+	}
+	
+	if (! $ztabhtml) $ztabhtml = "BORDER='1' WIDTH='98%'";
+	//else $docnt = true;
+	$typearr = array();
+	$ncols = $rs->FieldCount();
+	$hdr = "<TABLE COLS=$ncols $ztabhtml><tr>\n\n";
+	for ($i=0; $i < $ncols; $i++) {	
+		$field = $rs->FetchField($i);
+		if ($field) {
+			if ($zheaderarray) $fname = $zheaderarray[$i];
+			else $fname = htmlspecialchars($field->name);	
+			$typearr[$i] = $rs->MetaType($field->type,$field->max_length);
+ 			//print " $field->name $field->type $typearr[$i] ";
+		} else {
+			$fname = 'Field '.($i+1);
+			$typearr[$i] = 'C';
+		}
+		if (strlen($fname)==0) $fname = '&nbsp;';
+		$hdr .= "<TH>$fname</TH>";
+	}
+	$hdr .= "\n</tr>";
+	if ($echo) print $hdr."\n\n";
+	else $html = $hdr;
+	
+	// smart algorithm - handles ADODB_FETCH_MODE's correctly by probing...
+	$numoffset = isset($rs->fields[0]) ||isset($rs->fields[1]) || isset($rs->fields[2]);
+	while (!$rs->EOF) {
+		
+		$s .= "<TR valign=top>\n";
+		
+		for ($i=0; $i < $ncols; $i++) {
+			if ($i===0) $v=($numoffset) ? $rs->fields[0] : reset($rs->fields);
+			else $v = ($numoffset) ? $rs->fields[$i] : next($rs->fields);
+			
+			$type = $typearr[$i];
+			switch($type) {
+			case 'D':
+				if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
+				else if (!strpos($v,':')) {
+					$s .= "	<TD>".$rs->UserDate($v,"D d, M Y") ."&nbsp;</TD>\n";
+				}
+				break;
+			case 'T':
+				if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
+				else $s .= "	<TD>".$rs->UserTimeStamp($v,"D d, M Y, h:i:s") ."&nbsp;</TD>\n";
+			break;
+			
+			case 'N':
+				if (abs(abs($v) - round($v,0)) < 0.00000001)
+					$v = round($v);
+				else
+					$v = round($v,$ADODB_ROUND);
+			case 'I':
+				$s .= "	<TD align=right>".stripslashes((trim($v))) ."&nbsp;</TD>\n";
+			   	
+			break;
+			/*
+			case 'B':
+				if (substr($v,8,2)=="BM" ) $v = substr($v,8);
+				$mtime = substr(str_replace(' ','_',microtime()),2);
+				$tmpname = "tmp/".uniqid($mtime).getmypid();
+				$fd = @fopen($tmpname,'a');
+				@ftruncate($fd,0);
+				@fwrite($fd,$v);
+				@fclose($fd);
+				if (!function_exists ("mime_content_type")) {
+				  function mime_content_type ($file) {
+				    return exec("file -bi ".escapeshellarg($file));
+				  }
+				}
+				$t = mime_content_type($tmpname);
+				$s .= (substr($t,0,5)=="image") ? " <td><img src='$tmpname' alt='$t'></td>\\n" : " <td><a
+				href='$tmpname'>$t</a></td>\\n";
+				break;
+			*/
+
+			default:
+				if ($htmlspecialchars) $v = htmlspecialchars(trim($v));
+				$v = trim($v);
+				if (strlen($v) == 0) $v = '&nbsp;';
+				$s .= "	<TD>". str_replace("\n",'<br>',stripslashes($v)) ."</TD>\n";
+			  
+			}
+		} // for
+		$s .= "</TR>\n\n";
+			  
+		$rows += 1;
+		if ($rows >= $gSQLMaxRows) {
+			$rows = "<p>Truncated at $gSQLMaxRows</p>";
+			break;
+		} // switch
+
+		$rs->MoveNext();
+	
+	// additional EOF check to prevent a widow header
+		if (!$rs->EOF && $rows % $gSQLBlockRows == 0) {
+	
+		//if (connection_aborted()) break;// not needed as PHP aborts script, unlike ASP
+			if ($echo) print $s . "</TABLE>\n\n";
+			else $html .= $s ."</TABLE>\n\n";
+			$s = $hdr;
+		}
+	} // while
+
+	if ($echo) print $s."</TABLE>\n\n";
+	else $html .= $s."</TABLE>\n\n";
+	
+	if ($docnt) if ($echo) print "<H2>".$rows." Rows</H2>";
+	
+	return ($echo) ? $rows : $html;
+ }
+ 
+// pass in 2 dimensional array
+function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
+{
+	if (!$ztabhtml) $ztabhtml = 'BORDER=1';
+	
+	$s = "<TABLE $ztabhtml>";//';print_r($arr);
+
+	if ($zheaderarray) {
+		$s .= '<TR>';
+		for ($i=0; $i<sizeof($zheaderarray); $i++) {
+			$s .= "	<TH>{$zheaderarray[$i]}</TH>\n";
+		}
+		$s .= "\n</TR>";
+	}
+	
+	for ($i=0; $i<sizeof($arr); $i++) {
+		$s .= '<TR>';
+		$a = &$arr[$i];
+		if (is_array($a)) 
+			for ($j=0; $j<sizeof($a); $j++) {
+				$val = $a[$j];
+				if (empty($val)) $val = '&nbsp;';
+				$s .= "	<TD>$val</TD>\n";
+			}
+		else if ($a) {
+			$s .=  '	<TD>'.$a."</TD>\n";
+		} else $s .= "	<TD>&nbsp;</TD>\n";
+		$s .= "\n</TR>\n";
+	}
+	$s .= '</TABLE>';
+	print $s;
+}
+
 ?>
\ No newline at end of file