[Fusionforge-commits] FusionForge branch master updated. 695eb1ddd058a440b1d57b3de8909ccc8bd4eb55

Marc-Etienne VARGENAU vargenau at fusionforge.org
Mon Jul 21 14:40:44 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  695eb1ddd058a440b1d57b3de8909ccc8bd4eb55 (commit)
      from  f2c85d95ce89f75bfdc148f3d6ab8066a0ccef2d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 695eb1ddd058a440b1d57b3de8909ccc8bd4eb55
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Mon Jul 21 14:40:09 2014 +0200

    wiki: update adodb to adodb519

diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/README.md b/src/plugins/wiki/www/lib/WikiDB/adodb/README.md
new file mode 100644
index 0000000..cc6e640
--- /dev/null
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/README.md
@@ -0,0 +1,94 @@
+ADODB Library for PHP5
+======================
+
+(c) 2000-2014 John Lim (jlim at natsoft.com)
+
+Released under both BSD and GNU Lesser GPL library license.
+This means you can use it in proprietary products.
+
+Home page: http://adodb.sourceforge.net/
+
+
+Introduction
+============
+
+PHP's database access functions are not standardized. This creates a
+need for a database class library to hide the differences between the
+different databases (encapsulate the differences) so we can easily
+switch databases.
+
+The library currently supports MySQL, Interbase, Sybase, PostgreSQL, Oracle,
+Microsoft SQL server,  Foxpro ODBC, Access ODBC, Informix, DB2,
+Sybase SQL Anywhere, generic ODBC and Microsoft's ADO.
+
+We hope more people will contribute drivers to support other databases.
+
+
+Installation
+============
+
+Unpack all the files into a directory accessible by your web server.
+
+To test, try modifying some of the tutorial examples.
+Make sure you customize the connection settings correctly.
+
+You can debug using:
+
+``` php
+<?php
+include('adodb/adodb.inc.php');
+
+$db = ADONewConnection($driver); # eg. 'mysql' or 'oci8'
+$db->debug = true;
+$db->Connect($server, $user, $password, $database);
+$rs = $db->Execute('select * from some_small_table');
+print "<pre>";
+print_r($rs->GetRows());
+print "</pre>";
+```
+
+
+Documentation and Examples
+==========================
+
+Refer to the `docs` directory for library documentation and examples.
+
+- Main documentation: `docs-adodb.htm`.
+  Query, update and insert records using a portable API.
+- Data dictionary docs: `docs-datadict.htm`.
+  Describes how to create database tables and indexes in a portable manner.
+- Database performance monitoring docs: `docs-perf.htm`.
+  Allows you to perform health checks, tune and monitor your database.
+- Database-backed session docs: `docs-session.htm`.
+
+There is also a tutorial `tute.htm` that contrasts ADOdb code with
+mysql code.
+
+
+Files
+=====
+
+- `adodb.inc.php` is the library's main file. You only need to include this file.
+- `adodb-*.inc.php` are the database specific driver code.
+- `adodb-session.php` is the PHP4 session handling code.
+- `test.php` contains a list of test commands to exercise the class library.
+- `testdatabases.inc.php` contains the list of databases to apply the tests on.
+- `Benchmark.php` is a simple benchmark to test the throughput of a SELECT
+statement for databases described in testdatabases.inc.php. The benchmark
+tables are created in test.php.
+
+
+Feature Requests and Bug Reports
+================================
+
+Please report bugs, issues and feature requests on Github:
+
+https://github.com/ADOdb/ADOdb/issues
+
+You may also find legacy issues in
+
+- the old [ADOdb forums](http://phplens.com/lens/lensforum/topics.php?id=4) on phplens.com
+- the [SourceForge tickets section](http://sourceforge.net/p/adodb/_list/tickets)
+
+However, please note that they are not actively monitored and should
+only be used as reference.
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-active-record.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-active-record.inc.php
index ad5d0b9..607fa94 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-active-record.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-active-record.inc.php
@@ -1,18 +1,18 @@
 <?php
 /*
 
- at version V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
+ at version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
- 
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+
+  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.
-  
+
   Active Record implementation. Superset of Zend Framework's.
-  
+
   Version 0.92
-  
-  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
+
+  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord
   	for info on Ruby on Rails Active Record implementation
 */
 
@@ -44,30 +44,30 @@ class ADODB_Active_Table {
 
 // $db = database connection
 // $index = name of index - can be associative, for an example see
-//    http://phplens.com/lens/lensforum/msgs.php?id=17790 
+//    http://phplens.com/lens/lensforum/msgs.php?id=17790
 // returns index into $_ADODB_ACTIVE_DBS
 function ADODB_SetDatabaseAdapter(&$db, $index=false)
 {
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		foreach($_ADODB_ACTIVE_DBS as $k => $d) {
 			if (PHP_VERSION >= 5) {
 				if ($d->db === $db) return $k;
 			} else {
-				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) 
+				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database)
 					return $k;
 			}
 		}
-		
+
 		$obj = new ADODB_Active_DB();
 		$obj->db = $db;
 		$obj->tables = array();
-		
+
 		if ($index == false) $index = sizeof($_ADODB_ACTIVE_DBS);
 
-		
+
 		$_ADODB_ACTIVE_DBS[$index] = $obj;
-		
+
 		return sizeof($_ADODB_ACTIVE_DBS)-1;
 }
 
@@ -75,8 +75,8 @@ function ADODB_SetDatabaseAdapter(&$db, $index=false)
 class ADODB_Active_Record {
 	static $_changeNames = true; // dynamically pluralize table names
 	static $_quoteNames = false;
-	
-	static $_foreignSuffix = '_id'; // 
+
+	static $_foreignSuffix = '_id'; //
 	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
 	var $_table; // tablename, if set in class definition then use it as table name
 	var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat]
@@ -87,8 +87,8 @@ class ADODB_Active_Record {
 
 	var $foreignName; // CFR: class name when in a relationship
 
-	var $lockMode = ' for update '; // you might want to change to 
-	
+	var $lockMode = ' for update '; // you might want to change to
+
 	static function UseDefaultValues($bool=null)
 	{
 	global $ADODB_ACTIVE_DEFVALS;
@@ -97,29 +97,29 @@ class ADODB_Active_Record {
 	}
 
 	// should be static
-	static function SetDatabaseAdapter(&$db, $index=false) 
+	static function SetDatabaseAdapter(&$db, $index=false)
 	{
 		return ADODB_SetDatabaseAdapter($db, $index);
 	}
-	
-	
+
+
 	public function __set($name, $value)
 	{
 		$name = str_replace(' ', '_', $name);
 		$this->$name = $value;
 	}
-	
+
 	// php5 constructor
 	function __construct($table = false, $pkeyarr=false, $db=false)
 	{
 	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
-	
+
 		if ($db == false && is_object($pkeyarr)) {
 			$db = $pkeyarr;
 			$pkeyarr = false;
 		}
-		
-		if (!$table) { 
+
+		if (!$table) {
 			if (!empty($this->_table)) $table = $this->_table;
 			else $table = $this->_pluralize(get_class($this));
 		}
@@ -137,13 +137,13 @@ class ADODB_Active_Record {
 
 		$this->UpdateActiveTable($pkeyarr);
 	}
-	
+
 	function __wakeup()
 	{
   		$class = get_class($this);
   		new $class;
 	}
-	
+
 	function _pluralize($table)
 	{
 		if (!ADODB_Active_Record::$_changeNames) return $table;
@@ -154,26 +154,26 @@ class ADODB_Active_Record {
 		$lastc2 = substr($ut,$len-2);
 		switch ($lastc) {
 		case 'S':
-			return $table.'es';	
+			return $table.'es';
 		case 'Y':
 			return substr($table,0,$len-1).'ies';
-		case 'X':	
+		case 'X':
 			return $table.'es';
-		case 'H': 
+		case 'H':
 			if ($lastc2 == 'CH' || $lastc2 == 'SH')
 				return $table.'es';
 		default:
 			return $table.'s';
 		}
 	}
-	
+
 	// CFR Lamest singular inflector ever - @todo Make it real!
 	// Note: There is an assumption here...and it is that the argument's length >= 4
 	function _singularize($tables)
 	{
-	
+
 		if (!ADODB_Active_Record::$_changeNames) return $table;
-	
+
 		$ut = strtoupper($tables);
 		$len = strlen($tables);
 		if($ut[$len-1] != 'S')
@@ -205,14 +205,14 @@ class ADODB_Active_Record {
 		$table->_hasMany[$foreignRef] = $ar;
 	#	$this->$foreignRef = $this->_hasMany[$foreignRef]; // WATCHME Removed assignment by ref. to please __get()
 	}
-	
+
 	// use when you don't want ADOdb to auto-pluralize tablename
 	static function TableHasMany($table, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
 	{
 		$ar = new ADODB_Active_Record($table);
 		$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
 	}
-	
+
 	// use when you don't want ADOdb to auto-pluralize tablename
 	static function TableKeyHasMany($table, $tablePKey, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
 	{
@@ -220,8 +220,8 @@ class ADODB_Active_Record {
 		$ar = new ADODB_Active_Record($table,$tablePKey);
 		$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
 	}
-	
-	
+
+
 	// use when you want ADOdb to auto-pluralize tablename for you. Note that the class must already be defined.
 	// e.g. class Person will generate relationship for table Persons
 	static function ClassHasMany($parentclass, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record')
@@ -229,7 +229,7 @@ class ADODB_Active_Record {
 		$ar = new $parentclass();
 		$ar->hasMany($foreignRef, $foreignKey, $foreignClass);
 	}
-	
+
 
 	function belongsTo($foreignRef,$foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
 	{
@@ -240,24 +240,24 @@ class ADODB_Active_Record {
 		$ar->parentKey = $parentKey;
 		$ar->UpdateActiveTable();
 		$ar->foreignKey = ($foreignKey) ? $foreignKey : $foreignRef.ADODB_Active_Record::$_foreignSuffix;
-		
+
 		$table =& $this->TableInfo();
 		$table->_belongsTo[$foreignRef] = $ar;
 	#	$this->$foreignRef = $this->_belongsTo[$foreignRef];
 	}
-	
+
 	static function ClassBelongsTo($class, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
 	{
 		$ar = new $class();
 		$ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass);
 	}
-	
+
 	static function TableBelongsTo($table, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
 	{
 		$ar = new ADOdb_Active_Record($table);
 		$ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass);
 	}
-	
+
 	static function TableKeyBelongsTo($table, $tablePKey, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record')
 	{
 		if (!is_array($tablePKey)) $tablePKey = array($tablePKey);
@@ -268,8 +268,8 @@ class ADODB_Active_Record {
 
 	/**
 	 * __get Access properties - used for lazy loading
-	 * 
-	 * @param mixed $name 
+	 *
+	 * @param mixed $name
 	 * @access protected
 	 * @return mixed
 	 */
@@ -277,9 +277,9 @@ class ADODB_Active_Record {
 	{
 		return $this->LoadRelations($name, '', -1, -1);
 	}
-	
+
 	/**
-	 * @param string $name 
+	 * @param string $name
 	 * @param string $whereOrderBy : eg. ' AND field1 = value ORDER BY field2'
 	 * @param offset
 	 * @param limit
@@ -291,12 +291,12 @@ class ADODB_Active_Record {
 		$table = $this->TableInfo();
 		if ($limit >= 0) $extras['limit'] = $limit;
 		if ($offset >= 0) $extras['offset'] = $offset;
-		
-		if (strlen($whereOrderBy)) 
+
+		if (strlen($whereOrderBy))
 			if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy))
 				if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy))
 					$whereOrderBy = 'AND '.$whereOrderBy;
-				
+
 		if(!empty($table->_belongsTo[$name]))
 		{
 			$obj = $table->_belongsTo[$name];
@@ -307,7 +307,7 @@ class ADODB_Active_Record {
 			{
 				if ($obj->parentKey) $key = $obj->parentKey;
 				else $key = reset($table->keys);
-				
+
 				$arrayOfOne = $obj->Find($key.'='.$this->$columnName.' '.$whereOrderBy,false,false,$extras);
 				if ($arrayOfOne) {
 					$this->$name = $arrayOfOne[0];
@@ -316,7 +316,7 @@ class ADODB_Active_Record {
 			}
 		}
 		if(!empty($table->_hasMany[$name]))
-		{	
+		{
 			$obj = $table->_hasMany[$name];
 			$key = reset($table->keys);
 			$id = @$this->$key;
@@ -329,11 +329,11 @@ class ADODB_Active_Record {
 			$this->$name = $objs;
 			return $objs;
 		}
-		
+
 		return array();
 	}
 	//////////////////////////////////
-	
+
 	// update metadata
 	function UpdateActiveTable($pkeys=false,$forceUpdate=false)
 	{
@@ -349,7 +349,7 @@ class ADODB_Active_Record {
 
 			$acttab = $tables[$tableat];
 			foreach($acttab->flds as $name => $fld) {
-			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) 
+			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value))
 				$this->$name = $fld->default_value;
 			else
 				$this->$name = null;
@@ -363,19 +363,19 @@ class ADODB_Active_Record {
 			@flock($fp, LOCK_SH);
 			$acttab = unserialize(fread($fp,100000));
 			fclose($fp);
-			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { 
+			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) {
 				// abs(rand()) randomizes deletion, reducing contention to delete/refresh file
 				// ideally, you should cache at least 32 secs
-				
+
 				foreach($acttab->flds as $name => $fld) {
-					if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) 
+					if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value))
 						$this->$name = $fld->default_value;
 					else
 						$this->$name = null;
 				}
-	
+
 				$activedb->tables[$table] = $acttab;
-				
+
 				//if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname");
 			  	return;
 			} else if ($db->debug) {
@@ -384,18 +384,18 @@ class ADODB_Active_Record {
 		}
 		$activetab = new ADODB_Active_Table();
 		$activetab->name = $table;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
-		
+
 		$cols = $db->MetaColumns($table);
-		
+
 		if (isset($savem)) $db->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$cols) {
-			$this->Error("Invalid table name: $table",'UpdateActiveTable'); 
+			$this->Error("Invalid table name: $table",'UpdateActiveTable');
 			return false;
 		}
 		$fld = reset($cols);
@@ -405,17 +405,17 @@ class ADODB_Active_Record {
 				foreach($cols as $name => $fld) {
 					if (!empty($fld->primary_key)) $pkeys[] = $name;
 				}
-			} else	
+			} else
 				$pkeys = $this->GetPrimaryKeys($db, $table);
 		}
 		if (empty($pkeys)) {
 			$this->Error("No primary key found for table $table",'UpdateActiveTable');
 			return false;
 		}
-		
+
 		$attr = array();
 		$keys = array();
-		
+
 		switch($ADODB_ASSOC_CASE) {
 		case 0:
 			foreach($cols as $name => $fldobj) {
@@ -430,18 +430,18 @@ class ADODB_Active_Record {
 				$keys[strtolower($name)] = strtolower($name);
 			}
 			break;
-			
-		case 1: 
+
+		case 1:
 			foreach($cols as $name => $fldobj) {
 				$name = strtoupper($name);
-               
+
                 if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
                     $this->$name = $fldobj->default_value;
                 else
 					$this->$name = null;
 				$attr[$name] = $fldobj;
 			}
-			
+
 			foreach($pkeys as $k => $name) {
 				$keys[strtoupper($name)] = strtoupper($name);
 			}
@@ -449,7 +449,7 @@ class ADODB_Active_Record {
 		default:
 			foreach($cols as $name => $fldobj) {
 				$name = ($fldobj->name);
-                
+
                 if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
                     $this->$name = $fldobj->default_value;
                 else
@@ -461,7 +461,7 @@ class ADODB_Active_Record {
 			}
 			break;
 		}
-		
+
 		$activetab->keys = $keys;
 		$activetab->flds = $attr;
 
@@ -473,58 +473,58 @@ class ADODB_Active_Record {
 		}
 		if (isset($activedb->tables[$table])) {
 			$oldtab = $activedb->tables[$table];
-		
+
 			if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo;
 			if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany;
 		}
 		$activedb->tables[$table] = $activetab;
 	}
-	
+
 	function GetPrimaryKeys(&$db, $table)
 	{
 		return $db->MetaPrimaryKeys($table);
 	}
-	
-	// error handler for both PHP4+5. 
+
+	// error handler for both PHP4+5.
 	function Error($err,$fn)
 	{
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		$fn = get_class($this).'::'.$fn;
 		$this->_lasterr = $fn.': '.$err;
-		
+
 		if ($this->_dbat < 0) $db = false;
 		else {
 			$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
 			$db = $activedb->db;
 		}
-		
-		if (function_exists('adodb_throw')) {	
+
+		if (function_exists('adodb_throw')) {
 			if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
 			else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
 		} else
 			if (!$db || $db->debug) ADOConnection::outp($this->_lasterr);
-		
+
 	}
-	
+
 	// return last error message
 	function ErrorMsg()
 	{
 		if (!function_exists('adodb_throw')) {
 			if ($this->_dbat < 0) $db = false;
 			else $db = $this->DB();
-		
+
 			// last error could be database error too
 			if ($db && $db->ErrorMsg()) return $db->ErrorMsg();
 		}
 		return $this->_lasterr;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		if ($this->_dbat < 0) return -9999; // no database connection...
 		$db = $this->DB();
-		
+
 		return (int) $db->ErrorNo();
 	}
 
@@ -533,7 +533,7 @@ class ADODB_Active_Record {
 	function DB()
 	{
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		if ($this->_dbat < 0) {
 			$false = false;
 			$this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB");
@@ -543,7 +543,7 @@ class ADODB_Active_Record {
 		$db = $activedb->db;
 		return $db;
 	}
-	
+
 	// retrieve ADODB_Active_Table
 	function &TableInfo()
 	{
@@ -552,8 +552,8 @@ class ADODB_Active_Record {
 		$table = $activedb->tables[$this->_tableat];
 		return $table;
 	}
-	
-	
+
+
 	// I have an ON INSERT trigger on a table that sets other columns in the table.
 	// So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook
 	function Reload()
@@ -564,21 +564,21 @@ class ADODB_Active_Record {
 		return($this->Load($where));
 	}
 
-	
+
 	// set a numeric array (using natural table field ordering) as object properties
 	function Set(&$row)
 	{
 	global $ACTIVE_RECORD_SAFETY;
-	
+
 		$db = $this->DB();
-		
+
 		if (!$row) {
-			$this->_saved = false;		
+			$this->_saved = false;
 			return false;
 		}
-		
+
 		$this->_saved = true;
-		
+
 		$table = $this->TableInfo();
 		if ($ACTIVE_RECORD_SAFETY && sizeof($table->flds) != sizeof($row)) {
             # <AP>
@@ -597,7 +597,7 @@ class ADODB_Active_Record {
 		}
         else
 			$keys = array_keys($row);
-			
+
         # <AP>
         reset($keys);
         $this->_original = array();
@@ -611,7 +611,7 @@ class ADODB_Active_Record {
         # </AP>
 		return true;
 	}
-	
+
 	// get last inserted id for INSERT
 	function LastInsertID(&$db,$fieldname)
 	{
@@ -619,32 +619,32 @@ class ADODB_Active_Record {
 			$val = $db->Insert_ID($this->_table,$fieldname);
 		else
 			$val = false;
-			
+
 		if (is_null($val) || $val === false) {
 			// this might not work reliably in multi-user environment
 			return $db->GetOne("select max(".$fieldname.") from ".$this->_table);
 		}
 		return $val;
 	}
-	
+
 	// quote data in where clause
 	function doquote(&$db, $val,$t)
 	{
 		switch($t) {
 		case 'L':
 			if (strpos($db->databaseType,'postgres') !== false) return $db->qstr($val);
-		case 'D':	
+		case 'D':
 		case 'T':
 			if (empty($val)) return 'null';
-		
-		case 'B':	
+
+		case 'B':
 		case 'N':
 		case 'C':
 		case 'X':
 			if (is_null($val)) return 'null';
-			
-			if (strlen($val)>0 && 
-				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { 
+
+			if (strlen($val)>0 &&
+				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) {
 				return $db->qstr($val);
 				break;
 			}
@@ -653,13 +653,13 @@ class ADODB_Active_Record {
 			break;
 		}
 	}
-	
+
 	// generate where clause for an UPDATE/SELECT
 	function GenWhere(&$db, &$table)
 	{
 		$keys = $table->keys;
 		$parr = array();
-		
+
 		foreach($keys as $k) {
 			$f = $table->flds[$k];
 			if ($f) {
@@ -668,55 +668,55 @@ class ADODB_Active_Record {
 		}
 		return implode(' and ', $parr);
 	}
-	
-	
+
+
 	function _QName($n,$db=false)
 	{
 		if (!ADODB_Active_Record::$_quoteNames) return $n;
 		if (!$db) $db = $this->DB(); if (!$db) return false;
 		return $db->nameQuote.$n.$db->nameQuote;
 	}
-	
+
 	//------------------------------------------------------------ Public functions below
-	
+
 	function Load($where=null,$bindarr=false, $lock = false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$db = $this->DB(); if (!$db) return false;
 		$this->_where = $where;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
-		
+
 		$qry = "select * from ".$this->_table;
-		
+
 		if($where) {
 			$qry .= ' WHERE '.$where;
 		}
 		if ($lock) $qry .= $this->lockMode;
-		
+
 		$row = $db->GetRow($qry,$bindarr);
-		
+
 		if (isset($savem)) $db->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		return $this->Set($row);
 	}
-	
+
 	function LoadLocked($where=null, $bindarr=false)
 	{
 		$this->Load($where,$bindarr,true);
 	}
-	
+
 	# useful for multiple record inserts
 	# see http://phplens.com/lens/lensforum/msgs.php?id=17795
 	function Reset()
 	{
         $this->_where=null;
-        $this->_saved = false; 
-        $this->_lasterr = false; 
+        $this->_saved = false;
+        $this->_lasterr = false;
         $this->_original = false;
         $vars=get_object_vars($this);
         foreach($vars as $k=>$v){
@@ -727,24 +727,24 @@ class ADODB_Active_Record {
         $this->foreignName=strtolower(get_class($this));
         return true;
     }
-	
+
 	// false on error
 	function Save()
 	{
 		if ($this->_saved) $ok = $this->Update();
 		else $ok = $this->Insert();
-		
+
 		return $ok;
 	}
-	
-	
+
+
 	// false on error
 	function Insert()
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$cnt = 0;
 		$table = $this->TableInfo();
-		
+
 		$valarr = array();
 		$names = array();
 		$valstr = array();
@@ -758,7 +758,7 @@ class ADODB_Active_Record {
 				$cnt += 1;
 			}
 		}
-		
+
 		if (empty($names)){
 			foreach($table->flds as $name=>$fld) {
 				$valarr[] = null;
@@ -769,7 +769,7 @@ class ADODB_Active_Record {
 		}
 		$sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')';
 		$ok = $db->Execute($sql,$valarr);
-		
+
 		if ($ok) {
 			$this->_saved = true;
 			$autoinc = false;
@@ -784,23 +784,23 @@ class ADODB_Active_Record {
 				$this->$k = $this->LastInsertID($db,$k);
 			}
 		}
-		
+
 		$this->_original = $valarr;
 		return !empty($ok);
 	}
-	
+
 	function Delete()
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$where = $this->GenWhere($db,$table);
 		$sql = 'DELETE FROM '.$this->_table.' WHERE '.$where;
 		$ok = $db->Execute($sql);
-		
+
 		return $ok ? true : false;
 	}
-	
+
 	// returns an array of active record objects
 	function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array())
 	{
@@ -808,17 +808,17 @@ class ADODB_Active_Record {
 		$arr = $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr,$extra);
 		return $arr;
 	}
-	
+
 	// returns 0 on error, 1 on update, 2 on insert
 	function Replace()
 	{
 	global $ADODB_ASSOC_CASE;
-		
+
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$pkey = $table->keys;
-		
+
 		foreach($table->flds as $name=>$fld) {
 			$val = $this->$name;
 			/*
@@ -834,24 +834,24 @@ class ADODB_Active_Record {
 			if (is_null($val) && !empty($fld->auto_increment)) {
             	continue;
             }
-			
+
 			if (is_array($val)) continue;
-			
+
 			$t = $db->MetaType($fld->type);
 			$arr[$name] = $this->doquote($db,$val,$t);
 			$valarr[] = $val;
 		}
-		
+
 		if (!is_array($pkey)) $pkey = array($pkey);
-		
-		
-		if ($ADODB_ASSOC_CASE == 0) 
+
+
+		if ($ADODB_ASSOC_CASE == 0)
 			foreach($pkey as $k => $v)
 				$pkey[$k] = strtolower($v);
-		elseif ($ADODB_ASSOC_CASE == 1) 
+		elseif ($ADODB_ASSOC_CASE == 1)
 			foreach($pkey as $k => $v)
 				$pkey[$k] = strtoupper($v);
-				
+
 		$ok = $db->Replace($this->_table,$arr,$pkey);
 		if ($ok) {
 			$this->_saved = true; // 1= update 2=insert
@@ -868,9 +868,9 @@ class ADODB_Active_Record {
 					$this->$k = $this->LastInsertID($db,$k);
 				}
 			}
-			
+
 			$this->_original = $valarr;
-		} 
+		}
 		return $ok;
 	}
 
@@ -879,14 +879,14 @@ class ADODB_Active_Record {
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$where = $this->GenWhere($db, $table);
-		
+
 		if (!$where) {
 			$this->error("Where missing for table $table", "Update");
 			return false;
 		}
-		$valarr = array(); 
+		$valarr = array();
 		$neworig = array();
 		$pairs = array();
 		$i = -1;
@@ -895,10 +895,10 @@ class ADODB_Active_Record {
 			$i += 1;
 			$val = $this->$name;
 			$neworig[] = $val;
-			
-			if (isset($table->keys[$name]) || is_array($val)) 
+
+			if (isset($table->keys[$name]) || is_array($val))
 				continue;
-			
+
 			if (is_null($val)) {
 				if (isset($fld->not_null) && $fld->not_null) {
 					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
@@ -910,15 +910,15 @@ class ADODB_Active_Record {
 			}
 
 			if (isset($this->_original[$i]) && strcmp($val,$this->_original[$i]) == 0) continue;
-			
+
 			if (is_null($this->_original[$i]) && is_null($val)) continue;
-			
+
 			$valarr[] = $val;
 			$pairs[] = $this->_QName($name,$db).'='.$db->Param($cnt);
 			$cnt += 1;
 		}
-		
-		
+
+
 		if (!$cnt) return -1;
 		$sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where;
 		$ok = $db->Execute($sql,$valarr);
@@ -928,14 +928,14 @@ class ADODB_Active_Record {
 		}
 		return 0;
 	}
-	
+
 	function GetAttributeNames()
 	{
 		$table = $this->TableInfo();
 		if (!$table) return false;
 		return array_keys($table->flds);
 	}
-	
+
 };
 
 function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr, $primkeyArr,
@@ -943,10 +943,10 @@ function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr
 {
 global $_ADODB_ACTIVE_DBS;
 
-	
+
 	$save = $db->SetFetchMode(ADODB_FETCH_NUM);
 	$qry = "select * from ".$table;
-	
+
 	if (!empty($whereOrderBy))
 		$qry .= ' WHERE '.$whereOrderBy;
 	if(isset($extra['limit']))
@@ -967,13 +967,13 @@ global $_ADODB_ACTIVE_DBS;
 		$rows = $db->GetAll($qry,$bindarr);
 
 	$db->SetFetchMode($save);
-	
+
 	$false = false;
-	
-	if ($rows === false) {	
+
+	if ($rows === false) {
 		return $false;
 	}
-	
+
 
 	if (!class_exists($class)) {
 		$db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass');
@@ -987,7 +987,7 @@ global $_ADODB_ACTIVE_DBS;
 	$arrRef = array();
 	$bTos = array(); // Will store belongTo's indices if any
 	foreach($rows as $row) {
-	
+
 		$obj = new $class($table,$primkeyArr,$db);
 		if ($obj->ErrorNo()){
 			$db->_errorMsg = $obj->ErrorMsg();
@@ -995,8 +995,7 @@ global $_ADODB_ACTIVE_DBS;
 		}
 		$obj->Set($row);
 		$arr[] = $obj;
-	} // foreach($rows as $row) 
+	} // foreach($rows as $row)
 
 	return $arr;
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-active-recordx.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-active-recordx.inc.php
index fd80749..e820144 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-active-recordx.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-active-recordx.inc.php
@@ -1,20 +1,20 @@
 <?php
 /*
 
- at version V5.06 29 Sept 2008   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
+ at version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
- 
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+
+  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.
-  
+
   Active Record implementation. Superset of Zend Framework's.
-  
-  This is "Active Record eXtended" to support JOIN, WORK and LAZY mode by Chris Ravenscroft  chris#voilaweb.com 
-  
+
+  This is "Active Record eXtended" to support JOIN, WORK and LAZY mode by Chris Ravenscroft  chris#voilaweb.com
+
   Version 0.9
-  
-  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
+
+  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord
   	for info on Ruby on Rails Active Record implementation
 */
 
@@ -63,29 +63,29 @@ class ADODB_Active_Table {
 function ADODB_SetDatabaseAdapter(&$db)
 {
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		foreach($_ADODB_ACTIVE_DBS as $k => $d) {
 			if (PHP_VERSION >= 5) {
 				if ($d->db === $db) return $k;
 			} else {
-				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) 
+				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database)
 					return $k;
 			}
 		}
-		
+
 		$obj = new ADODB_Active_DB();
 		$obj->db = $db;
 		$obj->tables = array();
-		
+
 		$_ADODB_ACTIVE_DBS[] = $obj;
-		
+
 		return sizeof($_ADODB_ACTIVE_DBS)-1;
 }
 
 
 class ADODB_Active_Record {
 	static $_changeNames = true; // dynamically pluralize table names
-	static $_foreignSuffix = '_id'; // 
+	static $_foreignSuffix = '_id'; //
 	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
 	var $_table; // tablename, if set in class definition then use it as table name
 	var $_sTable; // singularized table name
@@ -106,18 +106,18 @@ class ADODB_Active_Record {
 	}
 
 	// should be static
-	static function SetDatabaseAdapter(&$db) 
+	static function SetDatabaseAdapter(&$db)
 	{
 		return ADODB_SetDatabaseAdapter($db);
 	}
-	
-	
+
+
 	public function __set($name, $value)
 	{
 		$name = str_replace(' ', '_', $name);
 		$this->$name = $value;
 	}
-	
+
 	// php5 constructor
 	// Note: if $table is defined, then we will use it as our table name
 	// Otherwise we will use our classname...
@@ -131,12 +131,12 @@ class ADODB_Active_Record {
 	function __construct($table = false, $pkeyarr=false, $db=false, $options=array())
 	{
 	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
-	
+
 		if ($db == false && is_object($pkeyarr)) {
 			$db = $pkeyarr;
 			$pkeyarr = false;
 		}
-		
+
 		if($table)
 		{
 			// table argument exists. It is expected to be
@@ -159,10 +159,10 @@ class ADODB_Active_Record {
 			$this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db);
 		} else
 			$this->_dbat = sizeof($_ADODB_ACTIVE_DBS)-1;
-		
-		
+
+
 		if ($this->_dbat < 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor');
-		
+
 		$this->_tableat = $this->_table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future
 
 		// CFR: Just added this option because UpdateActiveTable() can refresh its information
@@ -178,13 +178,13 @@ class ADODB_Active_Record {
 			$table->_belongsTo = array();
 		}
 	}
-	
+
 	function __wakeup()
 	{
   		$class = get_class($this);
   		new $class;
 	}
-	
+
 	// CFR: Constants found in Rails
 	static $IrregularP = array(
 		'PERSON'    => 'people',
@@ -231,26 +231,26 @@ class ADODB_Active_Record {
 		$lastc2 = substr($ut,$len-2);
 		switch ($lastc) {
 		case 'S':
-			return $table.'es';	
+			return $table.'es';
 		case 'Y':
 			return substr($table,0,$len-1).'ies';
-		case 'X':	
+		case 'X':
 			return $table.'es';
-		case 'H': 
+		case 'H':
 			if ($lastc2 == 'CH' || $lastc2 == 'SH')
 				return $table.'es';
 		default:
 			return $table.'s';
 		}
 	}
-	
+
 	// CFR Lamest singular inflector ever - @todo Make it real!
 	// Note: There is an assumption here...and it is that the argument's length >= 4
 	function _singularize($table)
 	{
-	
+
 		if (!ADODB_Active_Record::$_changeNames) return $table;
-	
+
 		$ut = strtoupper($table);
 		if(isset(self::$WeIsI[$ut]))
 		{
@@ -320,7 +320,7 @@ class ADODB_Active_Record {
 		$ar->foreignName = $foreignRef;
 		$ar->UpdateActiveTable();
 		$ar->foreignKey = ($foreignKey) ? $foreignKey : $ar->foreignName . self::$_foreignSuffix;
-		
+
 		$table =& $this->TableInfo();
 		if(!isset($table->_belongsTo[$foreignRef]))
 		{
@@ -332,8 +332,8 @@ class ADODB_Active_Record {
 
 	/**
 	 * __get Access properties - used for lazy loading
-	 * 
-	 * @param mixed $name 
+	 *
+	 * @param mixed $name
 	 * @access protected
 	 * @return void
 	 */
@@ -348,12 +348,12 @@ class ADODB_Active_Record {
 		if($offset >= 0) $extras['offset'] = $offset;
 		if($limit >= 0) $extras['limit'] = $limit;
 		$table =& $this->TableInfo();
-		
-		if (strlen($whereOrderBy)) 
+
+		if (strlen($whereOrderBy))
 			if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy))
 				if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy))
 					$whereOrderBy = 'AND '.$whereOrderBy;
-					
+
 		if(!empty($table->_belongsTo[$name]))
 		{
 			$obj = $table->_belongsTo[$name];
@@ -366,7 +366,7 @@ class ADODB_Active_Record {
 					$belongsToId = $k;
 				else
 					$belongsToId = 'id';
-				
+
 				$arrayOfOne =
 					$obj->Find(
 						$belongsToId.'='.$this->$columnName.' '.$whereOrderBy, false, false, $extras);
@@ -380,7 +380,7 @@ class ADODB_Active_Record {
 			if(($k = reset($table->keys)))
 				$hasManyId   = $k;
 			else
-				$hasManyId   = 'id';			
+				$hasManyId   = 'id';
 
 			$this->$name =
 				$obj->Find(
@@ -389,7 +389,7 @@ class ADODB_Active_Record {
 		}
 	}
 	//////////////////////////////////
-	
+
 	// update metadata
 	function UpdateActiveTable($pkeys=false,$forceUpdate=false)
 	{
@@ -405,14 +405,14 @@ class ADODB_Active_Record {
 
 			$tobj = $tables[$tableat];
 			foreach($tobj->flds as $name => $fld) {
-			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) 
+			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value))
 				$this->$name = $fld->default_value;
 			else
 				$this->$name = null;
 			}
 			return;
 		}
-		
+
 		$db = $activedb->db;
 		$fname = $ADODB_CACHE_DIR . '/adodb_' . $db->databaseType . '_active_'. $table . '.cache';
 		if (!$forceUpdate && $ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR && file_exists($fname)) {
@@ -420,11 +420,11 @@ class ADODB_Active_Record {
 			@flock($fp, LOCK_SH);
 			$acttab = unserialize(fread($fp,100000));
 			fclose($fp);
-			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { 
+			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) {
 				// abs(rand()) randomizes deletion, reducing contention to delete/refresh file
 				// ideally, you should cache at least 32 secs
 				$activedb->tables[$table] = $acttab;
-				
+
 				//if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname");
 			  	return;
 			} else if ($db->debug) {
@@ -433,18 +433,18 @@ class ADODB_Active_Record {
 		}
 		$activetab = new ADODB_Active_Table();
 		$activetab->name = $table;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
-		
+
 		$cols = $db->MetaColumns($table);
-		
+
 		if (isset($savem)) $db->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
-		
+
 		if (!$cols) {
-			$this->Error("Invalid table name: $table",'UpdateActiveTable'); 
+			$this->Error("Invalid table name: $table",'UpdateActiveTable');
 			return false;
 		}
 		$fld = reset($cols);
@@ -454,17 +454,17 @@ class ADODB_Active_Record {
 				foreach($cols as $name => $fld) {
 					if (!empty($fld->primary_key)) $pkeys[] = $name;
 				}
-			} else	
+			} else
 				$pkeys = $this->GetPrimaryKeys($db, $table);
 		}
 		if (empty($pkeys)) {
 			$this->Error("No primary key found for table $table",'UpdateActiveTable');
 			return false;
 		}
-		
+
 		$attr = array();
 		$keys = array();
-		
+
 		switch($ADODB_ASSOC_CASE) {
 		case 0:
 			foreach($cols as $name => $fldobj) {
@@ -479,18 +479,18 @@ class ADODB_Active_Record {
 				$keys[strtolower($name)] = strtolower($name);
 			}
 			break;
-			
-		case 1: 
+
+		case 1:
 			foreach($cols as $name => $fldobj) {
 				$name = strtoupper($name);
-               
+
                 if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
                     $this->$name = $fldobj->default_value;
                 else
 					$this->$name = null;
 				$attr[$name] = $fldobj;
 			}
-			
+
 			foreach($pkeys as $k => $name) {
 				$keys[strtoupper($name)] = strtoupper($name);
 			}
@@ -498,7 +498,7 @@ class ADODB_Active_Record {
 		default:
 			foreach($cols as $name => $fldobj) {
 				$name = ($fldobj->name);
-                
+
                 if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
                     $this->$name = $fldobj->default_value;
                 else
@@ -510,7 +510,7 @@ class ADODB_Active_Record {
 			}
 			break;
 		}
-		
+
 		$activetab->keys = $keys;
 		$activetab->flds = $attr;
 		$activetab->updateColsCount();
@@ -523,58 +523,58 @@ class ADODB_Active_Record {
 		}
 		if (isset($activedb->tables[$table])) {
 			$oldtab = $activedb->tables[$table];
-		
+
 			if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo;
 			if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany;
 		}
 		$activedb->tables[$table] = $activetab;
 	}
-	
+
 	function GetPrimaryKeys(&$db, $table)
 	{
 		return $db->MetaPrimaryKeys($table);
 	}
-	
-	// error handler for both PHP4+5. 
+
+	// error handler for both PHP4+5.
 	function Error($err,$fn)
 	{
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		$fn = get_class($this).'::'.$fn;
 		$this->_lasterr = $fn.': '.$err;
-		
+
 		if ($this->_dbat < 0) $db = false;
 		else {
 			$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
 			$db = $activedb->db;
 		}
-		
-		if (function_exists('adodb_throw')) {	
+
+		if (function_exists('adodb_throw')) {
 			if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
 			else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
 		} else
 			if (!$db || $db->debug) ADOConnection::outp($this->_lasterr);
-		
+
 	}
-	
+
 	// return last error message
 	function ErrorMsg()
 	{
 		if (!function_exists('adodb_throw')) {
 			if ($this->_dbat < 0) $db = false;
 			else $db = $this->DB();
-		
+
 			// last error could be database error too
 			if ($db && $db->ErrorMsg()) return $db->ErrorMsg();
 		}
 		return $this->_lasterr;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		if ($this->_dbat < 0) return -9999; // no database connection...
 		$db = $this->DB();
-		
+
 		return (int) $db->ErrorNo();
 	}
 
@@ -583,7 +583,7 @@ class ADODB_Active_Record {
 	function DB()
 	{
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		if ($this->_dbat < 0) {
 			$false = false;
 			$this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB");
@@ -593,18 +593,18 @@ class ADODB_Active_Record {
 		$db = $activedb->db;
 		return $db;
 	}
-	
+
 	// retrieve ADODB_Active_Table
 	function &TableInfo()
 	{
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
 		$table = $activedb->tables[$this->_tableat];
 		return $table;
 	}
-	
-	
+
+
 	// I have an ON INSERT trigger on a table that sets other columns in the table.
 	// So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook
 	function Reload()
@@ -615,21 +615,21 @@ class ADODB_Active_Record {
 		return($this->Load($where));
 	}
 
-	
+
 	// set a numeric array (using natural table field ordering) as object properties
 	function Set(&$row)
 	{
 	global $ACTIVE_RECORD_SAFETY;
-	
+
 		$db = $this->DB();
-		
+
 		if (!$row) {
-			$this->_saved = false;		
+			$this->_saved = false;
 			return false;
 		}
-		
+
 		$this->_saved = true;
-		
+
 		$table = $this->TableInfo();
 		$sizeofFlds = sizeof($table->flds);
 		$sizeofRow  = sizeof($row);
@@ -687,7 +687,7 @@ class ADODB_Active_Record {
         # </AP>
 		return true;
 	}
-	
+
 	// get last inserted id for INSERT
 	function LastInsertID(&$db,$fieldname)
 	{
@@ -695,14 +695,14 @@ class ADODB_Active_Record {
 			$val = $db->Insert_ID($this->_table,$fieldname);
 		else
 			$val = false;
-			
+
 		if (is_null($val) || $val === false) {
 			// this might not work reliably in multi-user environment
 			return $db->GetOne("select max(".$fieldname.") from ".$this->_table);
 		}
 		return $val;
 	}
-	
+
 	// quote data in where clause
 	function doquote(&$db, $val,$t)
 	{
@@ -710,13 +710,13 @@ class ADODB_Active_Record {
 		case 'D':
 		case 'T':
 			if (empty($val)) return 'null';
-			
+
 		case 'C':
 		case 'X':
 			if (is_null($val)) return 'null';
-			
-			if (strlen($val)>0 && 
-				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { 
+
+			if (strlen($val)>0 &&
+				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) {
 				return $db->qstr($val);
 				break;
 			}
@@ -725,13 +725,13 @@ class ADODB_Active_Record {
 			break;
 		}
 	}
-	
+
 	// generate where clause for an UPDATE/SELECT
 	function GenWhere(&$db, &$table)
 	{
 		$keys = $table->keys;
 		$parr = array();
-		
+
 		foreach($keys as $k) {
 			$f = $table->flds[$k];
 			if ($f) {
@@ -740,15 +740,15 @@ class ADODB_Active_Record {
 		}
 		return implode(' and ', $parr);
 	}
-	
-	
+
+
 	//------------------------------------------------------------ Public functions below
-	
+
 	function Load($where=null,$bindarr=false)
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$this->_where = $where;
-		
+
 		$save = $db->SetFetchMode(ADODB_FETCH_NUM);
 		$qry = "select * from ".$this->_table;
 		$table =& $this->TableInfo();
@@ -757,7 +757,7 @@ class ADODB_Active_Record {
 			$hasManyId   = $k;
 		else
 			$hasManyId   = 'id';
-		
+
 		foreach($table->_belongsTo as $foreignTable)
 		{
 			if(($k = reset($foreignTable->TableInfo()->keys)))
@@ -780,7 +780,7 @@ class ADODB_Active_Record {
 		}
 		if($where)
 			$qry .= ' WHERE '.$where;
-		
+
 		// Simple case: no relations. Load row and return.
 		if((count($table->_hasMany) + count($table->_belongsTo)) < 1)
 		{
@@ -790,7 +790,7 @@ class ADODB_Active_Record {
 			$db->SetFetchMode($save);
 			return $this->Set($row);
 		}
-		
+
 		// More complex case when relations have to be collated
 		$rows = $db->GetAll($qry,$bindarr);
 		if(!$rows)
@@ -800,7 +800,7 @@ class ADODB_Active_Record {
 			return false;
 		$class = get_class($this);
 		$isFirstRow = true;
-		
+
 		if(($k = reset($this->TableInfo()->keys)))
 			$myId   = $k;
 		else
@@ -819,7 +819,7 @@ class ADODB_Active_Record {
 		}
 		if(!$found)
 			$this->outp_throw("Unable to locate key $myId for $class in Load()",'Load');
-		
+
 		foreach($rows as $row)
 		{
 			$rowId = intval($row[$index]);
@@ -873,21 +873,21 @@ class ADODB_Active_Record {
 							}
 						}
 					}
-				}				
+				}
 			}
 		}
 		return true;
 	}
-	
+
 	// false on error
 	function Save()
 	{
 		if ($this->_saved) $ok = $this->Update();
 		else $ok = $this->Insert();
-		
+
 		return $ok;
 	}
-	
+
 	// CFR: Sometimes we may wish to consider that an object is not to be replaced but inserted.
 	// Sample use case: an 'undo' command object (after a delete())
 	function Dirty()
@@ -901,7 +901,7 @@ class ADODB_Active_Record {
 		$db = $this->DB(); if (!$db) return false;
 		$cnt = 0;
 		$table = $this->TableInfo();
-		
+
 		$valarr = array();
 		$names = array();
 		$valstr = array();
@@ -915,7 +915,7 @@ class ADODB_Active_Record {
 				$cnt += 1;
 			}
 		}
-		
+
 		if (empty($names)){
 			foreach($table->flds as $name=>$fld) {
 				$valarr[] = null;
@@ -926,7 +926,7 @@ class ADODB_Active_Record {
 		}
 		$sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')';
 		$ok = $db->Execute($sql,$valarr);
-		
+
 		if ($ok) {
 			$this->_saved = true;
 			$autoinc = false;
@@ -941,23 +941,23 @@ class ADODB_Active_Record {
 				$this->$k = $this->LastInsertID($db,$k);
 			}
 		}
-		
+
 		$this->_original = $valarr;
 		return !empty($ok);
 	}
-	
+
 	function Delete()
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$where = $this->GenWhere($db,$table);
 		$sql = 'DELETE FROM '.$this->_table.' WHERE '.$where;
 		$ok = $db->Execute($sql);
-		
+
 		return $ok ? true : false;
 	}
-	
+
 	// returns an array of active record objects
 	function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array())
 	{
@@ -967,7 +967,7 @@ class ADODB_Active_Record {
 			array('foreignName'=>$this->foreignName, 'belongsTo'=>$table->_belongsTo, 'hasMany'=>$table->_hasMany));
 		return $arr;
 	}
-	
+
 	// CFR: In introduced this method to ensure that inner workings are not disturbed by
 	// subclasses...for instance when GetActiveRecordsClass invokes Find()
 	// Why am I not invoking parent::Find?
@@ -985,12 +985,12 @@ class ADODB_Active_Record {
 	function Replace()
 	{
 	global $ADODB_ASSOC_CASE;
-		
+
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$pkey = $table->keys;
-		
+
 		foreach($table->flds as $name=>$fld) {
 			$val = $this->$name;
 			/*
@@ -1010,17 +1010,17 @@ class ADODB_Active_Record {
 			$arr[$name] = $this->doquote($db,$val,$t);
 			$valarr[] = $val;
 		}
-		
+
 		if (!is_array($pkey)) $pkey = array($pkey);
-		
-		
-		if ($ADODB_ASSOC_CASE == 0) 
+
+
+		if ($ADODB_ASSOC_CASE == 0)
 			foreach($pkey as $k => $v)
 				$pkey[$k] = strtolower($v);
-		elseif ($ADODB_ASSOC_CASE == 1) 
+		elseif ($ADODB_ASSOC_CASE == 1)
 			foreach($pkey as $k => $v)
 				$pkey[$k] = strtoupper($v);
-				
+
 		$ok = $db->Replace($this->_table,$arr,$pkey);
 		if ($ok) {
 			$this->_saved = true; // 1= update 2=insert
@@ -1037,9 +1037,9 @@ class ADODB_Active_Record {
 					$this->$k = $this->LastInsertID($db,$k);
 				}
 			}
-			
+
 			$this->_original = $valarr;
-		} 
+		}
 		return $ok;
 	}
 
@@ -1048,14 +1048,14 @@ class ADODB_Active_Record {
 	{
 		$db = $this->DB(); if (!$db) return false;
 		$table = $this->TableInfo();
-		
+
 		$where = $this->GenWhere($db, $table);
-		
+
 		if (!$where) {
 			$this->error("Where missing for table $table", "Update");
 			return false;
 		}
-		$valarr = array(); 
+		$valarr = array();
 		$neworig = array();
 		$pairs = array();
 		$i = -1;
@@ -1064,11 +1064,11 @@ class ADODB_Active_Record {
 			$i += 1;
 			$val = $this->$name;
 			$neworig[] = $val;
-			
+
 			if (isset($table->keys[$name])) {
 				continue;
 			}
-			
+
 			if (is_null($val)) {
 				if (isset($fld->not_null) && $fld->not_null) {
 					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
@@ -1078,16 +1078,16 @@ class ADODB_Active_Record {
 					}
 				}
 			}
-			
+
 			if (isset($this->_original[$i]) && $val == $this->_original[$i]) {
 				continue;
-			}			
+			}
 			$valarr[] = $val;
 			$pairs[] = $name.'='.$db->Param($cnt);
 			$cnt += 1;
 		}
-		
-		
+
+
 		if (!$cnt) return -1;
 		$sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where;
 		$ok = $db->Execute($sql,$valarr);
@@ -1097,23 +1097,23 @@ class ADODB_Active_Record {
 		}
 		return 0;
 	}
-	
+
 	function GetAttributeNames()
 	{
 		$table = $this->TableInfo();
 		if (!$table) return false;
 		return array_keys($table->flds);
 	}
-	
+
 };
 
 function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bindarr, $primkeyArr,
 			$extra, $relations)
 {
 	global $_ADODB_ACTIVE_DBS;
-	
+
 		if (empty($extra['loading'])) $extra['loading'] = ADODB_LAZY_AR;
-		
+
 		$save = $db->SetFetchMode(ADODB_FETCH_NUM);
 		$table = &$tableObj->_table;
 		$tableInfo =& $tableObj->TableInfo();
@@ -1135,7 +1135,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 		}
 		if(!$found)
 			$db->outp_throw("Unable to locate key $myId for $class in GetActiveRecordsClass()",'GetActiveRecordsClass');
-		
+
 		$qry = "select * from ".$table;
 		if(ADODB_JOIN_AR == $extra['loading'])
 		{
@@ -1192,19 +1192,19 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 			}
 		} else
 			$rows = $db->GetAll($qry,$bindarr);
-			
+
 		$db->SetFetchMode($save);
-		
+
 		$false = false;
-		
-		if ($rows === false) {	
+
+		if ($rows === false) {
 			return $false;
 		}
-		
-		
+
+
 		if (!isset($_ADODB_ACTIVE_DBS)) {
 			include(ADODB_DIR.'/adodb-active-record.inc.php');
-		}	
+		}
 		if (!class_exists($class)) {
 			$db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass');
 			return $false;
@@ -1218,7 +1218,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 		$arrRef = array();
 		$bTos = array(); // Will store belongTo's indices if any
 		foreach($rows as $row) {
-		
+
 			$obj = new $class($table,$primkeyArr,$db);
 			if ($obj->ErrorNo()){
 				$db->_errorMsg = $obj->ErrorMsg();
@@ -1268,7 +1268,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 			{
 				if(ADODB_JOIN_AR == $extra['loading'])
 				{
-					$isNewObj = !isset($uniqArr['_'.$row[0]]); 
+					$isNewObj = !isset($uniqArr['_'.$row[0]]);
 					if($isNewObj)
 						$uniqArr['_'.$row[0]] = $obj;
 
@@ -1322,7 +1322,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 						}
 					}
 					if(!$isNewObj)
-						unset($obj); // We do not need this object itself anymore and do not want it re-added to the main array					
+						unset($obj); // We do not need this object itself anymore and do not want it re-added to the main array
 				}
 				else if(ADODB_LAZY_AR == $extra['loading'])
 				{
@@ -1382,7 +1382,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 						array_push($arrRef[$obj->$dbClassRef]->$foreignName, $obj);
 					}
 				}
-				
+
 			}
 			if(!empty($relations['belongsTo']))
 			{
@@ -1398,7 +1398,7 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 					else
 					{
 						$belongsToId = 'id';
-					}						
+					}
 					$origObjsArr = $bTos[$foreignTableRef];
 					$bTosString = implode(',', array_keys($bTos[$foreignTableRef]));
 					$foreignName = $foreignTable->foreignName;
@@ -1418,4 +1418,3 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 
 		return $arr;
 }
-?>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-csvlib.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-csvlib.inc.php
index 26618ab..d70c16f 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-csvlib.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-csvlib.inc.php
@@ -6,19 +6,19 @@ if (!defined('ADODB_DIR')) die();
 global $ADODB_INCLUDED_CSV;
 $ADODB_INCLUDED_CSV = 1;
 
-/* 
+/*
 
-  V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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. 
-  
+
+  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
   ==============
@@ -34,61 +34,61 @@ $ADODB_INCLUDED_CSV = 1;
 	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) {	
+			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->timeCreated = $rs->timeCreated; # memcache fix
 		$rs2->sql = $rs->sql;
-		$rs2->oldProvider = $rs->dataProvider; 
+		$rs2->oldProvider = $rs->dataProvider;
 		$rs2->InitArrayFields($rows,$flds);
 		$rs2->fetchMode = $savefetch;
 		return $line.serialize($rs2);
 	}
 
-	
+
 /**
-* Open CSV file and convert it into Data. 
+* 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, 
+*			error occurred in sql INSERT/UPDATE/DELETE,
 *			empty recordset is returned
 */
 	function csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array')
@@ -103,7 +103,7 @@ $ADODB_INCLUDED_CSV = 1;
 		@flock($fp, LOCK_SH);
 		$arr = array();
 		$ttl = 0;
-		
+
 		if ($meta = fgetcsv($fp, 32000, ",")) {
 			// check if error message
 			if (strncmp($meta[0],'****',4) === 0) {
@@ -113,10 +113,10 @@ $ADODB_INCLUDED_CSV = 1;
 			}
 			// check for meta data
 			// $meta[0] is -1 means return an empty recordset
-			// $meta[1] contains a time 
-	
+			// $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";
@@ -124,12 +124,12 @@ $ADODB_INCLUDED_CSV = 1;
 						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];
@@ -137,9 +137,9 @@ $ADODB_INCLUDED_CSV = 1;
 					$rs->_numOfFields = 0;
 					$rs->sql = urldecode($meta[2]);
 					$rs->affectedrows = (integer)$meta[3];
-					$rs->insertid = $meta[4];	
+					$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.
@@ -149,7 +149,7 @@ $ADODB_INCLUDED_CSV = 1;
 			# -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){ 
+					if($timeout >0){
 						$tdiff = (integer)( $meta[1]+$timeout - time());
 						if ($tdiff <= 2) {
 							switch($tdiff) {
@@ -161,7 +161,7 @@ $ADODB_INCLUDED_CSV = 1;
 									return $false;
 								}
 								break;
-							case 2: 
+							case 2:
 								if ((rand() & 15) == 0) {
 									fclose($fp);
 									$err = "Timeout 2";
@@ -175,12 +175,12 @@ $ADODB_INCLUDED_CSV = 1;
 									return $false;
 								}
 								break;
-							default: 
+							default:
 								fclose($fp);
 								$err = "Timeout 0";
 								return $false;
 							} // switch
-							
+
 						} // if check flush cache
 					}// (timeout>0)
 					$ttl = $meta[1];
@@ -190,7 +190,7 @@ $ADODB_INCLUDED_CSV = 1;
 				if ($meta[0] === '====1') {
 					// slurp in the data
 					$MAXSIZE = 128000;
-					
+
 					$text = fread($fp,$MAXSIZE);
 					if (strlen($text)) {
 						while ($txt = fread($fp,$MAXSIZE)) {
@@ -206,7 +206,7 @@ $ADODB_INCLUDED_CSV = 1;
 					}
 					return $rs;
 				}
-				
+
 				$meta = false;
 				$meta = fgetcsv($fp, 32000, ",");
 				if (!$meta) {
@@ -236,15 +236,15 @@ $ADODB_INCLUDED_CSV = 1;
 			$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);
@@ -258,18 +258,18 @@ $ADODB_INCLUDED_CSV = 1;
 		$rs->InitArrayFields($arr,$flds);
 		return $rs;
 	}
-	
+
 
 	/**
 	* Save a file $filename and its $contents (normally for caching) with file locking
 	* Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked)
 	*/
 	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 
+	# 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:
@@ -279,14 +279,14 @@ $ADODB_INCLUDED_CSV = 1;
 	# 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); 
+			$mtime = substr(str_replace(' ','_',microtime()),2);
 			// getmypid() actually returns 0 on Win98 - never mind!
 			$tmpname = $filename.uniqid($mtime).getmypid();
 			if (!($fd = @fopen($tmpname,'w'))) return false;
 			if (fwrite($fd,$contents)) $ok = true;
 			else $ok = false;
 			fclose($fd);
-			
+
 			if ($ok) {
 				@chmod($tmpname,0644);
 				// the tricky moment
@@ -312,7 +312,6 @@ $ADODB_INCLUDED_CSV = 1;
 			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename<br>\n");
 			$ok = false;
 		}
-	
+
 		return $ok;
 	}
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-datadict.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-datadict.inc.php
index 3820d7d..b8b881e 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-datadict.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-datadict.inc.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
 */
 
@@ -42,13 +42,13 @@ if (!function_exists('ctype_alnum')) {
 /**
 	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 
+	@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='_.-')
@@ -62,7 +62,7 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
 	$max = strlen($args);
 	$quoted = false;
 	$tokarr = array();
-	
+
 	while ($pos < $max) {
 		$ch = substr($args,$pos,1);
 		switch($ch) {
@@ -77,17 +77,17 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
 				}
 				break;
 			}
-			
+
 			$tokarr[] = $ch;
 			break;
-		
+
 		case '`':
 			if ($intoken) $tokarr[] = $ch;
 		case '(':
-		case ')':	
+		case ')':
 		case '"':
 		case "'":
-			
+
 			if ($intoken) {
 				if (empty($endquote)) {
 					$tokens[$stmtno][] = implode('',$tokarr);
@@ -109,9 +109,9 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
 					}
 				} else
 					$tokarr[] = $ch;
-					
+
 			}else {
-			
+
 				if ($ch == '(') $endquote = ')';
 				else $endquote = $ch;
 				$quoted = true;
@@ -120,27 +120,27 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
 				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) {			
+				if ($ch == $endstmtchar) {
 					$tokens[$stmtno][] = implode('',$tokarr);
 					$stmtno += 1;
 					$tokens[$stmtno] = array();
@@ -156,7 +156,7 @@ function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
 		$pos += 1;
 	}
 	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
-	
+
 	return $tokens;
 }
 
@@ -165,7 +165,7 @@ class ADODB_DataDict {
 	var $connection;
 	var $debug = false;
 	var $dropTable = 'DROP TABLE %s';
-	var $renameTable = 'RENAME TABLE %s TO %s'; 
+	var $renameTable = 'RENAME TABLE %s TO %s';
 	var $dropIndex = 'DROP INDEX %s';
 	var $addCol = ' ADD';
 	var $alterCol = ' ALTER COLUMN';
@@ -180,43 +180,43 @@ class ADODB_DataDict {
 	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)
-	{		
+	{
 		static $typeMap = array(
 		'VARCHAR' => 'C',
 		'VARCHAR2' => 'C',
@@ -263,7 +263,7 @@ class ADODB_DataDict {
 		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
 		##
 		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
+		'BOOLEAN' => 'L',
 		'BIT' => 'L',
 		'L' => 'L',
 		##
@@ -296,21 +296,21 @@ class ADODB_DataDict {
 		'NUM' => 'N',
 		'NUMERIC' => 'N',
 		'MONEY' => 'N',
-		
+
 		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
+		'SQLINT' => 'I',
+		'SQLSERIAL' => 'I',
+		'SQLSMINT' => 'I',
+		'SQLSMFLOAT' => 'N',
+		'SQLFLOAT' => 'N',
+		'SQLMONEY' => 'N',
+		'SQLDECIMAL' => 'N',
+		'SQLDATE' => 'D',
+		'SQLVCHAR' => 'C',
+		'SQLCHAR' => 'C',
+		'SQLDTIME' => 'T',
+		'SQLINTERVAL' => 'N',
+		'SQLBYTES' => 'B',
 		'SQLTEXT' => 'X',
 		 ## informix 10
 		"SQLINT8" => 'I8',
@@ -320,7 +320,7 @@ class ADODB_DataDict {
 		"SQLLVARCHAR" => 'X',
 		"SQLBOOL" => 'L'
 		);
-		
+
 		if (!$this->connection->IsConnected()) {
 			$t = strtoupper($t);
 			if (isset($typeMap[$t])) return $typeMap[$t];
@@ -328,36 +328,36 @@ class ADODB_DataDict {
 		}
 		return $this->connection->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 ) {
@@ -365,7 +365,7 @@ class ADODB_DataDict {
 		}
 		return $this->NameQuote($name);
 	}
-	
+
 	// Executes the sql array returned by GetTableSQL and GetIndexSQL
 	function ExecuteSQLArray($sql, $continueOnError = true)
 	{
@@ -373,7 +373,7 @@ class ADODB_DataDict {
 		$conn = $this->connection;
 		$saved = $conn->debug;
 		foreach($sql as $line) {
-			
+
 			if ($this->debug) $conn->debug = true;
 			$ok = $conn->Execute($line);
 			$conn->debug = $saved;
@@ -385,43 +385,43 @@ class ADODB_DataDict {
 		}
 		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 
+		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.
 	*/
@@ -430,25 +430,25 @@ class ADODB_DataDict {
 		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);
@@ -468,7 +468,7 @@ class ADODB_DataDict {
 		}
 		return $sql;
 	}
-	
+
 	/**
 	 * Change the definition of one column
 	 *
@@ -500,7 +500,7 @@ class ADODB_DataDict {
 		}
 		return $sql;
 	}
-	
+
 	/**
 	 * Rename one column
 	 *
@@ -523,7 +523,7 @@ class ADODB_DataDict {
 		}
 		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
 	}
-		
+
 	/**
 	 * Drop one column
 	 *
@@ -546,17 +546,17 @@ class ADODB_DataDict {
 		}
 		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.
 	*/
@@ -565,11 +565,11 @@ class ADODB_DataDict {
 		list($lines,$pkey,$idxs) = $this->_GenFields($flds, true);
 		// genfields can return FALSE at times
 		if ($lines == null) $lines = array();
-		
+
 		$taboptions = $this->_Options($tableoptions);
 		$tabname = $this->TableName ($tabname);
 		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
-		
+
 		// ggiunta - 2006/10/12 - KLUDGE:
         // if we are on autoincrement, and table options includes REPLACE, the
         // autoincrement sequence has already been dropped on table creation sql, so
@@ -579,7 +579,7 @@ class ADODB_DataDict {
         	unset($taboptions['REPLACE']);
 		$tsql = $this->_Triggers($tabname,$taboptions);
 		foreach($tsql as $s) $sql[] = $s;
-		
+
 		if (is_array($idxs)) {
 			foreach($idxs as $idx => $idxdef) {
 				$sql_idxs = $this->CreateIndexSql($idx, $tabname,  $idxdef['cols'], $idxdef['opts']);
@@ -589,9 +589,9 @@ class ADODB_DataDict {
 
 		return $sql;
 	}
-		
-	
-	
+
+
+
 	function _GenFields($flds,$widespacing=false)
 	{
 		if (is_string($flds)) {
@@ -608,7 +608,7 @@ class ADODB_DataDict {
 						$f1['INDEX'] = '';
 						// fall through intentionally
 					case 'CONSTRAINT':
-					case 'DEFAULT': 
+					case 'DEFAULT':
 						$hasparam = $token;
 						break;
 					default:
@@ -633,7 +633,7 @@ class ADODB_DataDict {
 				$hasparam = false;
 
 				$flds[] = $f1;
-				
+
 			}
 		}
 		$this->autoIncrement = false;
@@ -642,7 +642,7 @@ class ADODB_DataDict {
 		$idxs = array();
 		foreach($flds as $fld) {
 			$fld = _array_change_key_case($fld);
-			
+
 			$fname = false;
 			$fdefault = false;
 			$fautoinc = false;
@@ -658,20 +658,20 @@ class ADODB_DataDict {
 			$funsigned = false;
 			$findex = '';
 			$funiqueindex = 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': 	
+
+				case 'SIZE':
 								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
 								if ($dotat === false) $fsize = $v;
 								else {
@@ -697,33 +697,33 @@ class ADODB_DataDict {
 				case 'UNIQUE': $funiqueindex = true; 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;
-			
+
 			// build list of indexes
 			if ($findex != '') {
 				if (array_key_exists($findex, $idxs)) {
@@ -760,7 +760,7 @@ class ADODB_DataDict {
 					$fdefault = $this->connection->sysDate;
 				}
 			} else if ($fdefault !== false && !$fnoquote) {
-				if ($ty == 'C' or $ty == 'X' or 
+				if ($ty == 'C' or $ty == 'X' or
 					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) {
 
 					if (($ty == 'D' || $ty == 'T') && strtolower($fdefault) != 'null') {
@@ -775,27 +775,27 @@ class ADODB_DataDict {
 						}
 					}
 					else
-					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
+					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);
-			
+
 			// add index creation
 			if ($widespacing) $fname = str_pad($fname,24);
-			
+
 			 // check for field names appearing twice
             if (array_key_exists($fid, $lines)) {
             	 ADOConnection::outp("Field '$fname' defined twice");
             }
-			
+
 			$lines[$fid] = $fname.' '.$ftype.$suffix;
-			
+
 			if ($fautoinc) $this->autoIncrement = true;
 		} // foreach $flds
-		
+
 		return array($lines,$pkey,$idxs);
 	}
 
@@ -813,56 +813,56 @@ class ADODB_DataDict {
 		}
 		return $ftype;
 	}
-	
-	
+
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$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) {
@@ -879,19 +879,19 @@ class ADODB_DataDict {
 			$s .= ",\n                 PRIMARY KEY (";
 			$s .= implode(", ",$pkey).")";
 		}
-		if (isset($tableoptions['CONSTRAINTS'])) 
+		if (isset($tableoptions['CONSTRAINTS']))
 			$s .= "\n".$tableoptions['CONSTRAINTS'];
-		
-		if (isset($tableoptions[$this->upperName.'_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
@@ -900,7 +900,7 @@ class ADODB_DataDict {
 	{
 		return array();
 	}
-	
+
 	/**
 		Sanitize options, so that array elements with no keys are promoted to keys
 	*/
@@ -914,8 +914,8 @@ class ADODB_DataDict {
 		}
 		return $newopts;
 	}
-	
-	
+
+
 	function _getSizePrec($size)
 	{
 		$fsize = false;
@@ -929,34 +929,34 @@ class ADODB_DataDict {
 		}
 		return array($fsize, $fprec);
 	}
-	
+
 	/**
 	"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, $dropOldFlds=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)) { 
+
+		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.
@@ -969,16 +969,16 @@ class ADODB_DataDict {
 					$obj = $cols[$k];
 					if (isset($obj->not_null) && $obj->not_null)
 						$v = str_replace('NOT NULL','',$v);
-					if (isset($obj->auto_increment) && $obj->auto_increment && empty($v['AUTOINCREMENT'])) 
+					if (isset($obj->auto_increment) && $obj->auto_increment && empty($v['AUTOINCREMENT']))
 					    $v = str_replace('AUTOINCREMENT','',$v);
-					
+
 					$c = $cols[$k];
 					$ml = $c->max_length;
 					$mt = $this->MetaType($c->type,$ml);
-					
+
 					if (isset($c->scale)) $sc = $c->scale;
 					else $sc = 99; // always force change if scale not known.
-					
+
 					if ($sc == -1) $sc = false;
 					list($fsize, $fprec) = $this->_getSizePrec($v['SIZE']);
 
@@ -989,11 +989,11 @@ class ADODB_DataDict {
 					}
 				} else {
 					$holdflds[$k] = $v;
-				}		
+				}
 			}
 			$flds = $holdflds;
 		}
-	
+
 
 		// already exists, alter table instead
 		list($lines,$pkey,$idxs) = $this->_GenFields($flds);
@@ -1004,29 +1004,28 @@ class ADODB_DataDict {
 
 		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.
 				// $flds[1] holds the type, $flds[2] holds the size -postnuke addition
 				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)
 				 && (isset($flds[0][2]) && is_numeric($flds[0][2]))) {
 					if ($this->debug) ADOConnection::outp(sprintf("<h3>%s cannot be changed to %s currently</h3>", $flds[0][0], $flds[0][1]));
 					#echo "<h3>$this->alterCol cannot be changed to $flds currently</h3>";
-					continue;	 
+					continue;
 	 			}
 				$sql[] = $alter . $this->alterCol . ' ' . $v;
 			} else {
 				$sql[] = $alter . $this->addCol . ' ' . $v;
 			}
 		}
-		
+
 		if ($dropOldFlds) {
 			foreach ( $cols as $id => $v )
-			    if ( !isset($lines[$id]) ) 
+			    if ( !isset($lines[$id]) )
 					$sql[] = $alter . $this->dropCol . ' ' . $v->name;
 		}
 		return $sql;
 	}
 } // class
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-error.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-error.inc.php
index 67c16d6..29c6a9c 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-error.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-error.inc.php
@@ -1,12 +1,12 @@
 <?php
-/** 
- * @version V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/**
+ * @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
  */
@@ -62,27 +62,27 @@ function adodb_error($provider,$dbType,$errno)
 {
 	//var_dump($errno);
 	if (is_numeric($errno) && $errno == 0) return 0;
-	switch($provider) { 
+	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];
@@ -95,29 +95,29 @@ function adodb_error_pg($errormsg)
 {
 	if (is_numeric($errormsg)) return (integer) $errormsg;
 	// Postgres has no lock-wait timeout.  The best we could do would be to set a statement timeout.
-    static $error_regexps = array(
-            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/i' => DB_ERROR_NOSUCHTABLE,
-            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key.*violates unique constraint/i'     => DB_ERROR_ALREADY_EXISTS,
-            '/database ".+" does not exist$/i'       => DB_ERROR_NOSUCHDB,
-            '/(divide|division) by zero$/i'          => DB_ERROR_DIVZERO,
-            '/pg_atoi: error in .*: can\'t parse /i' => DB_ERROR_INVALID_NUMBER,
-            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/i' => DB_ERROR_NOSUCHFIELD,
-            '/(parser: parse|syntax) error at or near \"/i'   => DB_ERROR_SYNTAX,
-            '/referential integrity violation/i'     => DB_ERROR_CONSTRAINT,
-            '/deadlock detected$/i'                  => DB_ERROR_DEADLOCK,
-            '/canceling statement due to statement timeout$/i' => DB_ERROR_STATEMENT_TIMEOUT,
-            '/could not serialize access due to/i'   => DB_ERROR_SERIALIZATION_FAILURE
-        );
+	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.*|duplicate key.*violates unique constraint'     => DB_ERROR_ALREADY_EXISTS,
+			'database ".+" does not exist$'       => DB_ERROR_NOSUCHDB,
+			'(divide|division) 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|syntax) error at or near \"'   => DB_ERROR_SYNTAX,
+			'referential integrity violation'     => DB_ERROR_CONSTRAINT,
+			'deadlock detected$'                  => DB_ERROR_DEADLOCK,
+			'canceling statement due to statement timeout$' => DB_ERROR_STATEMENT_TIMEOUT,
+			'could not serialize access due to'   => DB_ERROR_SERIALIZATION_FAILURE
+		);
 	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;
+	while (list($regexp,$code) = each($error_regexps)) {
+		if (preg_match("/$regexp/mi", $errormsg)) {
+			return $code;
+		}
+	}
+	// Fall back to DB_ERROR if there was no mapping.
+	return DB_ERROR;
 }
-	
+
 function adodb_error_odbc()
 {
 static $MAP = array(
@@ -175,7 +175,7 @@ static $MAP = array(
             -923 => DB_ERROR_CONNECT_FAILED,
             -924 => DB_ERROR_CONNECT_FAILED
         );
-		
+
 		return $MAP;
 }
 
@@ -193,7 +193,7 @@ static $MAP = array(
             '-1210'   => DB_ERROR_INVALID_DATE,
             '-1212'   => DB_ERROR_INVALID_DATE
        );
-	   
+
 	   return $MAP;
 }
 
@@ -212,7 +212,7 @@ static $MAP = array(
             2291 => DB_ERROR_CONSTRAINT,
             2449 => DB_ERROR_CONSTRAINT
         );
-	   
+
 	return $MAP;
 }
 
@@ -222,7 +222,7 @@ static $MAP = array(
 		  208 => DB_ERROR_NOSUCHTABLE,
           2601 => DB_ERROR_ALREADY_EXISTS
        );
-	   
+
 	return $MAP;
 }
 
@@ -231,7 +231,7 @@ function adodb_error_sqlite()
 static $MAP = array(
 		  1 => DB_ERROR_SYNTAX
        );
-	   
+
 	return $MAP;
 }
 
@@ -258,7 +258,6 @@ static $MAP = array(
 		    2002 => DB_ERROR_CONNECT_FAILED,
 			2005 => DB_ERROR_CONNECT_FAILED
        );
-	   
+
 	return $MAP;
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-errorhandler.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-errorhandler.inc.php
index 7099f03..680e76d 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-errorhandler.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-errorhandler.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
@@ -13,7 +13,7 @@
 
 
 // added Claudio Bustos  clbustos#entelchile.net
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
 
 if (!defined('ADODB_ERROR_HANDLER')) define('ADODB_ERROR_HANDLER','ADODB_Error_Handler');
 
@@ -74,6 +74,5 @@ function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnec
 
 
 	//print "<p>$s</p>";
-	trigger_error($s,ADODB_ERROR_HANDLER_TYPE); 
+	trigger_error($s,ADODB_ERROR_HANDLER_TYPE);
 }
-?>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-errorpear.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-errorpear.inc.php
index 8340a84..10dbb97 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-errorpear.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-errorpear.inc.php
@@ -1,14 +1,14 @@
 <?php
-/** 
- * @version V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/**
+ * @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- * 
+ *
  * Latest version is available at http://php.weblogs.com
- * 
+ *
 */
 include_once('PEAR.php');
 
@@ -34,7 +34,7 @@ global $ADODB_Last_PEAR_Error; $ADODB_Last_PEAR_Error = false;
 *
 * @param $dbms		the RDBMS you are connecting to
 * @param $fn		the name of the calling function (in uppercase)
-* @param $errno		the native error number from the database 
+* @param $errno		the native error number from the database
 * @param $errmsg	the native error msg from the database
 * @param $p1		$fn specific parameter - see below
 * @param $P2		$fn specific parameter - see below
@@ -42,35 +42,35 @@ global $ADODB_Last_PEAR_Error; $ADODB_Last_PEAR_Error = false;
 function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
 {
 global $ADODB_Last_PEAR_Error;
-	
+
 	if (error_reporting() == 0) return; // obey @ protocol
 	switch($fn) {
 	case 'EXECUTE':
 		$sql = $p1;
 		$inputparams = $p2;
-		
+
 		$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
 		break;
-		
+
 	case 'PCONNECT':
 	case 'CONNECT':
 		$host = $p1;
 		$database = $p2;
-		
+
 		$s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')";
 		break;
-		
+
 	default:
 		$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
 		break;
 	}
-	
+
 	$class = ADODB_PEAR_ERROR_CLASS;
 	$ADODB_Last_PEAR_Error = new $class($s, $errno,
 		$GLOBALS['_PEAR_default_error_mode'],
-		$GLOBALS['_PEAR_default_error_options'], 
+		$GLOBALS['_PEAR_default_error_options'],
 		$errmsg);
-		
+
 	//print "<p>!$s</p>";
 }
 
@@ -84,5 +84,3 @@ global $ADODB_Last_PEAR_Error;
 
 	return $ADODB_Last_PEAR_Error;
 }
-		
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-exceptions.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-exceptions.inc.php
index 98bf160..2300f11 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-exceptions.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-exceptions.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @version V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
@@ -14,7 +14,7 @@
  */
 
 
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
 define('ADODB_ERROR_HANDLER','adodb_throw');
 
 class ADODB_Exception extends Exception {
@@ -24,7 +24,7 @@ var $sql = '';
 var $params = '';
 var $host = '';
 var $database = '';
-	
+
 	function __construct($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
 	{
 		switch($fn) {
@@ -33,7 +33,7 @@ var $database = '';
 			$this->params = $p2;
 			$s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n";
 			break;
-	
+
 		case 'PCONNECT':
 		case 'CONNECT':
 			$user = $thisConnection->user;
@@ -43,7 +43,7 @@ var $database = '';
 			$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
 			break;
 		}
-	
+
 		$this->dbms = $dbms;
 		if ($thisConnection) {
 			$this->host = $thisConnection->host;
@@ -51,7 +51,7 @@ var $database = '';
 		}
 		$this->fn = $fn;
 		$this->msg = $errmsg;
-				
+
 		if (!is_numeric($errno)) $errno = -1;
 		parent::__construct($s,$errno);
 	}
@@ -71,12 +71,9 @@ var $database = '';
 function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
 {
 global $ADODB_EXCEPTION;
-	
+
 	if (error_reporting() == 0) return; // obey @ protocol
 	if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION;
 	else $errfn = 'ADODB_EXCEPTION';
 	throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection);
 }
-
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-iterator.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-iterator.inc.php
index 38957ad..2d26326 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-iterator.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-iterator.inc.php
@@ -1,30 +1,24 @@
 <?php
 
 /*
-  V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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 
+
+  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
-	
-	
-	Moved to adodb.inc.php to improve performance.
- */
- 
 
 
+	Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
 
 
-?>
\ No newline at end of file
+	Moved to adodb.inc.php to improve performance.
+ */
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-lib.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-lib.inc.php
index e3e6782..de35bc9 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-lib.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-lib.inc.php
@@ -5,22 +5,22 @@ if (!defined('ADODB_DIR')) die();
 global $ADODB_INCLUDED_LIB;
 $ADODB_INCLUDED_LIB = 1;
 
-/* 
-  @version V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+  @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
-  
-  Less commonly used functions are placed here to reduce size of adodb.inc.php. 
-*/ 
+
+  Less commonly used functions are placed here to reduce size of adodb.inc.php.
+*/
 
 function adodb_strip_order_by($sql)
 {
-	$rez = preg_match('/(\sORDER\s+BY\s[^)]*)/is',$sql,$arr);
+	$rez = preg_match('/(\sORDER\s+BY\s(?:[^)](?!limit))*)(?:\sLIMIT\s+[0-9]+)?/is', $sql, $arr);
 	if ($arr)
-		if (strpos($arr[0],'(') !== false) {
-			$at = strpos($sql,$arr[0]);
+		if (strpos($arr[1], '(') !== false) {
+			$at = strpos($sql, $arr[1]);
 			$cntin = 0;
 			for ($i=$at, $max=strlen($sql); $i < $max; $i++) {
 				$ch = $sql[$i];
@@ -34,8 +34,9 @@ function adodb_strip_order_by($sql)
 				}
 			}
 			$sql = substr($sql,0,$at).substr($sql,$i);
-		} else
-			$sql = str_replace($arr[0], '', $sql); 
+		} else {
+			$sql = str_replace($arr[1], '', $sql);
+		}
 	return $sql;
  }
 
@@ -51,8 +52,8 @@ function adodb_probetypes(&$array,&$types,$probe=8)
 	$types = array();
 	if ($probe > sizeof($array)) $max = sizeof($array);
 	else $max = $probe;
-	
-	
+
+
 	for ($j=0;$j < $max; $j++) {
 		$row = $array[$j];
 		if (!$row) break;
@@ -61,16 +62,16 @@ function adodb_probetypes(&$array,&$types,$probe=8)
 			$i += 1;
 
 			if (isset($types[$i]) && $types[$i]=='C') continue;
-			
+
 			//print " ($i ".$types[$i]. "$v) ";
 			$v = trim($v);
-			
+
 			if (!preg_match('/^[+-]{0,1}[0-9\.]+$/',$v)) {
 				$types[$i] = 'C'; // once C, always C
-				
+
 				continue;
 			}
-			if ($j == 0) { 
+			if ($j == 0) {
 			// If empty string, we presume is character
 			// test for integer for 1st row only
 			// after that it is up to testing other rows to prove
@@ -80,19 +81,19 @@ function adodb_probetypes(&$array,&$types,$probe=8)
 				else  $types[$i] = 'I';
 				continue;
 			}
-			
+
 			if (strpos($v,'.') !== false) $types[$i] = 'N';
-			
+
 		}
 	}
-	
+
 }
 
 function  adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs)
 {
 	$oldX = sizeof(reset($arr));
-	$oldY = sizeof($arr);	
-	
+	$oldY = sizeof($arr);
+
 	if ($hdr) {
 		$startx = 1;
 		$hdr = array('Fields');
@@ -108,14 +109,14 @@ function  adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs)
 			$newarr[] = array($o->name);
 		} else
 			$newarr[] = array();
-			
+
 		for ($y = 0; $y < $oldY; $y++) {
 			$newarr[$x-$startx][] = $arr[$y][$x];
 		}
 	}
 }
 
-// Force key to upper. 
+// Force key to upper.
 // See also http://www.php.net/manual/en/function.array-change-key-case.php
 function _array_change_key_case($an_array)
 {
@@ -135,7 +136,7 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_
 		if (count($fieldArray) == 0) return 0;
 		$first = true;
 		$uSet = '';
-		
+
 		if (!is_array($keyCol)) {
 			$keyCol = array($keyCol);
 		}
@@ -148,14 +149,14 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_
 				$fieldArray[$k] = $v;
 			}
 			if (in_array($k,$keyCol)) continue; // skip UPDATE if is key
-			
+
 			if ($first) {
-				$first = false;			
+				$first = false;
 				$uSet = "$k=$v";
 			} else
 				$uSet .= ",$k=$v";
 		}
-		
+
 		$where = false;
 		foreach ($keyCol as $v) {
 			if (isset($fieldArray[$v])) {
@@ -163,24 +164,24 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_
 				else $where = $v.'='.$fieldArray[$v];
 			}
 		}
-		
+
 		if ($uSet && $where) {
 			$update = "UPDATE $table SET $uSet WHERE $where";
 
 			$rs = $zthis->Execute($update);
-			
-			
+
+
 			if ($rs) {
 				if ($zthis->poorAffectedRows) {
 				/*
-				 The Select count(*) wipes out any errors that the update would have returned. 
+				 The Select count(*) wipes out any errors that the update would have returned.
 				http://phplens.com/lens/lensforum/msgs.php?id=5696
 				*/
 					if ($zthis->ErrorNo()<>0) return 0;
-					
+
 				# affected_rows == 0 if update field values identical to old values
-				# for mysql - which is silly. 
-			
+				# for mysql - which is silly.
+
 					$cnt = $zthis->GetOne("select count(*) from $table where $where");
 					if ($cnt > 0) return 1; // record already exists
 				} else {
@@ -189,22 +190,22 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_
 			} else
 				return 0;
 		}
-		
+
 	//	print "<p>Error=".$this->ErrorNo().'<p>';
 		$first = true;
 		foreach($fieldArray as $k => $v) {
 			if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col
-			
+
 			if ($first) {
-				$first = false;			
+				$first = false;
 				$iCols = "$k";
 				$iVals = "$v";
 			} else {
 				$iCols .= ",$k";
 				$iVals .= ",$v";
-			}				
+			}
 		}
-		$insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; 
+		$insert = "INSERT INTO $table ($iCols) VALUES ($iVals)";
 		$rs = $zthis->Execute($insert);
 		return ($rs) ? 2 : 0;
 }
@@ -221,9 +222,9 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f
 		if (!strpos($name,'[]')) $name .= '[]';
 	} else if ($size) $attr = ' size="'.$size.'"';
 	else $attr ='';
-	
+
 	$s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
-	if ($blank1stItem) 
+	if ($blank1stItem)
 		if (is_string($blank1stItem))  {
 			$barr = explode(':',$blank1stItem);
 			if (sizeof($barr) == 1) $barr[] = '';
@@ -232,7 +233,7 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f
 
 	if ($zthis->FieldCount() > 1) $hasvalue=true;
 	else $compareFields0 = true;
-	
+
 	$value = '';
     $optgroup = null;
     $firstgroup = true;
@@ -252,12 +253,12 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f
 				$zval2 = rtrim(next($zthis->fields));
 		}
 		$selected = ($compareFields0) ? $zval : $zval2;
-		
+
         $group = '';
 		if ($fieldsize > 2) {
             $group = rtrim($zthis->fields[2]);
         }
-/* 
+/*
         if ($optgroup != $group) {
             $optgroup = $group;
             if ($firstgroup) {
@@ -269,25 +270,25 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f
             }
 		}
 */
-		if ($hasvalue) 
+		if ($hasvalue)
 			$value = " value='".htmlspecialchars($zval2)."'";
-		
+
 		if (is_array($defstr))  {
-			
-			if (in_array($selected,$defstr)) 
+
+			if (in_array($selected,$defstr))
 				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else 
+			else
 				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
 		}
 		else {
-			if (strcasecmp($selected,$defstr)==0) 
+			if (strcasecmp($selected,$defstr)==0)
 				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
 			else
 				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
 		}
 		$zthis->MoveNext();
 	} // while
-	
+
     // closing last optgroup
     if($optgroup != null) {
         $s .= "\n</optgroup>";
@@ -307,9 +308,9 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl
 		if (!strpos($name,'[]')) $name .= '[]';
 	} else if ($size) $attr = ' size="'.$size.'"';
 	else $attr ='';
-	
+
 	$s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
-	if ($blank1stItem) 
+	if ($blank1stItem)
 		if (is_string($blank1stItem))  {
 			$barr = explode(':',$blank1stItem);
 			if (sizeof($barr) == 1) $barr[] = '';
@@ -318,7 +319,7 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl
 
 	if ($zthis->FieldCount() > 1) $hasvalue=true;
 	else $compareFields0 = true;
-	
+
 	$value = '';
     $optgroup = null;
     $firstgroup = true;
@@ -338,12 +339,12 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl
 				$zval2 = rtrim(next($zthis->fields));
 		}
 		$selected = ($compareFields0) ? $zval : $zval2;
-		
+
         $group = '';
 		if (isset($zthis->fields[2])) {
             $group = rtrim($zthis->fields[2]);
         }
- 
+
         if ($optgroup != $group) {
             $optgroup = $group;
             if ($firstgroup) {
@@ -354,26 +355,26 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl
                 $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
             }
 		}
-	
-		if ($hasvalue) 
+
+		if ($hasvalue)
 			$value = " value='".htmlspecialchars($zval2)."'";
-		
+
 		if (is_array($defstr))  {
-			
-			if (in_array($selected,$defstr)) 
+
+			if (in_array($selected,$defstr))
 				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else 
+			else
 				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
 		}
 		else {
-			if (strcasecmp($selected,$defstr)==0) 
+			if (strcasecmp($selected,$defstr)==0)
 				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
 			else
 				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
 		}
 		$zthis->MoveNext();
 	} // while
-	
+
     // closing last optgroup
     if($optgroup != null) {
         $s .= "\n</optgroup>";
@@ -385,34 +386,34 @@ function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multipl
 /*
 	Count the number of records this sql statement will return by using
 	query rewriting heuristics...
-	
+
 	Does not work with UNIONs, except with postgresql and oracle.
-	
+
 	Usage:
-	
+
 	$conn->Connect(...);
 	$cnt = _adodb_getcount($conn, $sql);
-	
+
 */
-function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) 
+function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
 {
 	$qryRecs = 0;
-	
-	 if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || 
-	 	preg_match('/\s+GROUP\s+BY\s+/is',$sql) || 
+
+	 if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) ||
+	 	preg_match('/\s+GROUP\s+BY\s+/is',$sql) ||
 		preg_match('/\s+UNION\s+/is',$sql)) {
-		
+
 		$rewritesql = adodb_strip_order_by($sql);
-		
+
 		// ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias
 		// but this is only supported by oracle and postgresql...
 		if ($zthis->dataProvider == 'oci8') {
 			// Allow Oracle hints to be used for query optimization, Chris Wrye
 			if (preg_match('#/\\*+.*?\\*\\/#', $sql, $hint)) {
-				$rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")"; 
+				$rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")";
 			} else
-				$rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")"; 
-			
+				$rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")";
+
 		} else if (strncmp($zthis->databaseType,'postgres',8) == 0 || strncmp($zthis->databaseType,'mysql',5) == 0)  {
 			$rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_";
 		} else {
@@ -422,20 +423,20 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
 		// now replace SELECT ... FROM with SELECT COUNT(*) FROM
 		$rewritesql = preg_replace(
 					'/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
-		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails 
+		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails
 		// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
 		// also see http://phplens.com/lens/lensforum/msgs.php?id=12752
 		$rewritesql = adodb_strip_order_by($rewritesql);
 	}
-	
+
 	if (isset($rewritesql) && $rewritesql != $sql) {
 		if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
-		 
+
 		if ($secs2cache) {
 			// we only use half the time of secs2cache because the count can quickly
 			// become inaccurate if new records are added
 			$qryRecs = $zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr);
-			
+
 		} else {
 			$qryRecs = $zthis->GetOne($rewritesql,$inputarr);
 	  	}
@@ -443,14 +444,14 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
 	}
 	//--------------------------------------------
 	// query rewrite failed - so try slower way...
-	
-	
+
+
 	// strip off unneeded ORDER BY if no UNION
 	if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
-	else $rewritesql = $rewritesql = adodb_strip_order_by($sql); 
-	
+	else $rewritesql = $rewritesql = adodb_strip_order_by($sql);
+
 	if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
-		
+
 	if ($secs2cache) {
 		$rstest = $zthis->CacheExecute($secs2cache,$rewritesql,$inputarr);
 		if (!$rstest) $rstest = $zthis->CacheExecute($secs2cache,$sql,$inputarr);
@@ -460,7 +461,7 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
 	}
 	if ($rstest) {
 	  		$qryRecs = $rstest->RecordCount();
-		if ($qryRecs == -1) { 
+		if ($qryRecs == -1) {
 		global $ADODB_EXTENSION;
 		// some databases will return -1 on MoveLast() - change to MoveNext()
 			if ($ADODB_EXTENSION) {
@@ -483,53 +484,53 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
 /*
  	Code originally from "Cornel G" <conyg at fx.ro>
 
-	This code might not work with SQL that has UNION in it	
-	
+	This code might not work with SQL that has UNION in it
+
 	Also if you are using CachePageExecute(), there is a strong possibility that
 	data will get out of synch. use CachePageExecute() only with tables that
 	rarely change.
 */
-function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, 
-						$inputarr=false, $secs2cache=0) 
+function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page,
+						$inputarr=false, $secs2cache=0)
 {
 	$atfirstpage = false;
 	$atlastpage = false;
 	$lastpageno=1;
 
-	// If an invalid nrows is supplied, 
+	// If an invalid nrows is supplied,
 	// we assume a default value of 10 rows per page
 	if (!isset($nrows) || $nrows <= 0) $nrows = 10;
 
 	$qryRecs = false; //count records for no offset
-	
+
 	$qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache);
 	$lastpageno = (int) ceil($qryRecs / $nrows);
 	$zthis->_maxRecordCount = $qryRecs;
-	
 
 
-	// ***** Here we check whether $page is the last page or 
-	// whether we are trying to retrieve 
+
+	// ***** Here we check whether $page is the last page or
+	// whether we are trying to retrieve
 	// a page number greater than the last page number.
 	if ($page >= $lastpageno) {
 		$page = $lastpageno;
 		$atlastpage = true;
 	}
-	
+
 	// If page number <= 1, then we are at the first page
-	if (empty($page) || $page <= 1) {	
+	if (empty($page) || $page <= 1) {
 		$page = 1;
 		$atfirstpage = true;
 	}
-	
+
 	// We get the data we want
 	$offset = $nrows * ($page-1);
-	if ($secs2cache > 0) 
+	if ($secs2cache > 0)
 		$rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr);
-	else 
+	else
 		$rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
 
-	
+
 	// Before returning the RecordSet, we set the pagination properties we need
 	if ($rsreturn) {
 		$rsreturn->_maxRecordCount = $qryRecs;
@@ -542,20 +543,20 @@ function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page,
 	return $rsreturn;
 }
 
-// Iván Oliva version
-function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
+// Iván Oliva version
+function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0)
 {
 
 	$atfirstpage = false;
 	$atlastpage = false;
-	
+
 	if (!isset($page) || $page <= 1) {	// If page number <= 1, then we are at the first page
 		$page = 1;
 		$atfirstpage = true;
 	}
 	if ($nrows <= 0) $nrows = 10;	// If an invalid nrows is supplied, we assume a default value of 10 rows per page
-	
-	// ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than 
+
+	// ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than
 	// the last page number.
 	$pagecounter = $page + 1;
 	$pagecounteroffset = ($pagecounter * $nrows) - $nrows;
@@ -577,12 +578,12 @@ function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr
 		if ($page == 1) $atfirstpage = true;	// We have to do this again in case the last page is the same as the first
 			//... page, that is, the recordset has only 1 page.
 	}
-	
+
 	// We get the data we want
 	$offset = $nrows * ($page-1);
 	if ($secs2cache > 0) $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr);
 	else $rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
-	
+
 	// Before returning the RecordSet, we set the pagination properties we need
 	if ($rsreturn) {
 		$rsreturn->rowsPerPage = $nrows;
@@ -601,13 +602,13 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
 			printf(ADODB_BAD_RS,'GetUpdateSQL');
 			return false;
 		}
-	
+
 		$fieldUpdatedCount = 0;
 		$arrFields = _array_change_key_case($arrFields);
 
 		$hasnumeric = isset($rs->fields[0]);
 		$setFields = '';
-		
+
 		// Loop through all of the fields in the recordset
 		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
 			// Get the field from the recordset
@@ -617,19 +618,19 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
 			// of the fields passed in then process.
 			$upperfname = strtoupper($field->name);
 			if (adodb_key_exists($upperfname,$arrFields,$force)) {
-				
+
 				// If the existing field value in the recordset
 				// is different from the value passed in then
 				// go ahead and append the field name and new value to
 				// the update query.
-				
+
 				if ($hasnumeric) $val = $rs->fields[$i];
 				else if (isset($rs->fields[$upperfname])) $val = $rs->fields[$upperfname];
 				else if (isset($rs->fields[$field->name])) $val =  $rs->fields[$field->name];
 				else if (isset($rs->fields[strtolower($upperfname)])) $val =  $rs->fields[strtolower($upperfname)];
 				else $val = '';
-				
-			
+
+
 				if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) {
 					// Set the counter for the number of fields that will be updated.
 					$fieldUpdatedCount++;
@@ -637,14 +638,14 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
 					// Based on the datatype of the field
 					// Format the value properly for the database
 					$type = $rs->MetaType($field->type);
-						
+
 
 					if ($type == 'null') {
 						$type = 'C';
 					}
-					
+
 					if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) {
-						switch (ADODB_QUOTE_FIELDNAMES) {
+						switch ($ADODB_QUOTE_FIELDNAMES) {
 						case 'LOWER':
 							$fnameq = $zthis->nameQuote.strtolower($field->name).$zthis->nameQuote;break;
 						case 'NATIVE':
@@ -655,9 +656,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
 						}
 					} else
 						$fnameq = $upperfname;
-					
-					
-                // is_null requires php 4.0.4
+
                 //********************************************************//
                 if (is_null($arrFields[$upperfname])
 					|| (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0)
@@ -674,7 +673,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
                             //Set null
                             $setFields .= $field->name . " = null, ";
                         break;
-							
+
                         case 2:
                             //Set empty
                             $arrFields[$upperfname] = "";
@@ -693,7 +692,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
                 //********************************************************//
                 } else {
 						//we do this so each driver can customize the sql for
-						//DB specific column types. 
+						//DB specific column types.
 						//Oracle needs BLOB types to be handled with a returning clause
 						//postgres has special needs as well
 						$setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,
@@ -714,7 +713,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
 			// Get the full where clause excluding the word "WHERE" from
 			// the existing query.
 			preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause);
-			
+
 			$discard = false;
 			// not a good hack, improvements?
 			if ($whereClause) {
@@ -725,12 +724,12 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
 				else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976
 			} else
 				$whereClause = array(false,false);
-				
+
 			if ($discard)
 				$whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1]));
-			
+
 			$sql = 'UPDATE '.$tableName.' SET '.substr($setFields, 0, -2);
-			if (strlen($whereClause[1]) > 0) 
+			if (strlen($whereClause[1]) > 0)
 				$sql .= ' WHERE '.$whereClause[1];
 
 			return $sql;
@@ -757,8 +756,8 @@ function adodb_key_exists($key, &$arr,$force=2)
  * There is a special case of this function for the oci8 driver.
  * The proper way to handle an insert w/ a blob in oracle requires
  * a returning clause with bind variables and a descriptor blob.
- * 
- * 
+ *
+ *
  */
 function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2)
 {
@@ -773,19 +772,19 @@ static $cacheCols;
 	$recordSet = null;
 	$arrFields = _array_change_key_case($arrFields);
 	$fieldInsertedCount = 0;
-	
+
 	if (is_string($rs)) {
 		//ok we have a table name
 		//try and get the column info ourself.
-		$tableName = $rs;			
-	
+		$tableName = $rs;
+
 		//we need an object for the recordSet
 		//because we have to call MetaType.
 		//php can't do a $rsclass::MetaType()
 		$rsclass = $zthis->rsPrefix.$zthis->databaseType;
 		$recordSet = new $rsclass(-1,$zthis->fetchMode);
 		$recordSet->connection = $zthis;
-		
+
 		if (is_string($cacheRS) && $cacheRS == $rs) {
 			$columns = $cacheCols;
 		} else {
@@ -797,26 +796,26 @@ static $cacheCols;
 		if (isset($rs->insertSig) && is_integer($cacheRS) && $cacheRS == $rs->insertSig) {
 			$columns = $cacheCols;
 		} else {
-			for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) 
+			for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++)
 				$columns[] = $rs->FetchField($i);
 			$cacheRS = $cacheSig;
 			$cacheCols = $columns;
 			$rs->insertSig = $cacheSig++;
 		}
 		$recordSet = $rs;
-	
+
 	} else {
 		printf(ADODB_BAD_RS,'GetInsertSQL');
 		return false;
 	}
 
 	// Loop through all of the fields in the recordset
-	foreach( $columns as $field ) { 
+	foreach( $columns as $field ) {
 		$upperfname = strtoupper($field->name);
 		if (adodb_key_exists($upperfname,$arrFields,$force)) {
 			$bad = false;
 			if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) {
-				switch (ADODB_QUOTE_FIELDNAMES) {
+				switch ($ADODB_QUOTE_FIELDNAMES) {
 				case 'LOWER':
 					$fnameq = $zthis->nameQuote.strtolower($field->name).$zthis->nameQuote;break;
 				case 'NATIVE':
@@ -827,9 +826,9 @@ static $cacheCols;
 				}
 			} else
 				$fnameq = $upperfname;
-			
+
 			$type = $recordSet->MetaType($field->type);
-			
+
             /********************************************************/
             if (is_null($arrFields[$upperfname])
                 || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0)
@@ -841,11 +840,11 @@ static $cacheCols;
                         case 0: // we must always set null if missing
 							$bad = true;
 							break;
-							
+
                         case 1:
                             $values  .= "null, ";
                         break;
-		
+
                         case 2:
                             //Set empty
                             $arrFields[$upperfname] = "";
@@ -855,7 +854,7 @@ static $cacheCols;
 						default:
                         case 3:
                             //Set the value that was given in array, so you can give both null and empty values
-							if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) { 
+							if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) {
 								$values  .= "null, ";
 							} else {
                         		$values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq);
@@ -866,18 +865,18 @@ static $cacheCols;
             /*********************************************************/
 			} else {
 				//we do this so each driver can customize the sql for
-				//DB specific column types. 
+				//DB specific column types.
 				//Oracle needs BLOB types to be handled with a returning clause
 				//postgres has special needs as well
 				$values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq,
 											   $arrFields, $magicq);
 			}
-			
+
 			if ($bad) continue;
 			// Set the counter for the number of fields that will be inserted.
 			$fieldInsertedCount++;
-			
-			
+
+
 			// Get the name of the fields to insert
 			$fields .= $fnameq . ", ";
 		}
@@ -886,15 +885,15 @@ static $cacheCols;
 
 	// If there were any inserted fields then build the rest of the insert query.
 	if ($fieldInsertedCount <= 0)  return false;
-	
+
 	// Get the table name from the existing query.
 	if (!$tableName) {
 		if (!empty($rs->tableName)) $tableName = $rs->tableName;
 		else if (preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName))
 			$tableName = $tableName[1];
-		else 
+		else
 			return false;
-	}		
+	}
 
 	// Strip off the comma and space on the end of both the fields
 	// and their values.
@@ -911,20 +910,20 @@ static $cacheCols;
  * the update/sql which is generated by GetInsertSQL and GetUpdateSQL.
  * It handles the string construction of 1 column -> sql string based on
  * the column type.  We want to do 'safe' handling of BLOBs
- * 
+ *
  * @param string the type of sql we are trying to create
- *                'I' or 'U'. 
- * @param string column data type from the db::MetaType() method  
+ *                'I' or 'U'.
+ * @param string column data type from the db::MetaType() method
  * @param string the column name
  * @param array the column value
- * 
+ *
  * @return string
- * 
+ *
  */
-function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq) 
+function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq)
 {
     $sql = '';
-    
+
     // Based on the datatype of the field
     // Format the value properly for the database
     switch($type) {
@@ -932,7 +931,7 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie
         //in order to handle Blobs correctly, we need
         //to do some magic for Oracle
 
-        //we need to create a new descriptor to handle 
+        //we need to create a new descriptor to handle
         //this properly
         if (!empty($zthis->hasReturningInto)) {
             if ($action == 'I') {
@@ -949,7 +948,7 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie
                 $sql = 'empty_blob(), ';
             } else {
                 $sql = $fnameq. '=empty_blob(), ';
-            }            
+            }
         } else {
             //this is to maintain compatibility
             //with older adodb versions.
@@ -965,7 +964,7 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie
         //to avoid conflicts w/ dupes.
        if (!empty($zthis->hasReturningInto)) {
             if ($action == 'I') {
-                $sql = ':xx'.$fname.'xx, ';                
+                $sql = ':xx'.$fname.'xx, ';
             } else {
                 $sql = $fnameq.'=:xx'.$fname.'xx, ';
             }
@@ -977,18 +976,18 @@ function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFie
             //this is to maintain compatibility
             //with older adodb versions.
             $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false);
-        }            
+        }
         break;
-        
+
     default:
         $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq,  $arrFields, $magicq,false);
         break;
     }
-    
+
     return $sql;
-}    
-	
-function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true) 
+}
+
+function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true)
 {
 
 	if ($recurse) {
@@ -998,10 +997,10 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields,
 			break;
 		case 'oci8':
 			return _adodb_column_sql_oci8($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq);
-			
+
 		}
 	}
-		
+
 	switch($type) {
 		case "C":
 		case "X":
@@ -1016,7 +1015,7 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields,
 		case "T":
 			$val = $zthis->DBTimeStamp($arrFields[$fname]);
 			break;
-			
+
 		case "N":
 		    $val = $arrFields[$fname];
 			if (!is_numeric($val)) $val = str_replace(',', '.', (float)$val);
@@ -1035,10 +1034,10 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields,
 	}
 
 	if ($action == 'I') return $val . ", ";
-	
-	
+
+
 	return $fnameq . "=" . $val  . ", ";
-	
+
 }
 
 
@@ -1061,7 +1060,7 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr)
 	*/
 	// check if running from browser or command-line
 	$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
-	
+
 	$dbt = $zthis->databaseType;
 	if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType;
 	if ($inBrowser) {
@@ -1079,31 +1078,31 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr)
 	}
 
 	$qID = $zthis->_query($sql,$inputarr);
-	
-	/* 
+
+	/*
 		Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql
 		because ErrorNo() calls Execute('SELECT @ERROR'), causing recursion
 	*/
-	if ($zthis->databaseType == 'mssql') { 
+	if ($zthis->databaseType == 'mssql') {
 	// ErrorNo is a slow function call in mssql, and not reliable in PHP 4.0.6
-	
+
 		if($emsg = $zthis->ErrorMsg()) {
 			if ($err = $zthis->ErrorNo()) {
-				if ($zthis->debug === -99) 
+				if ($zthis->debug === -99)
 					ADOConnection::outp( "<hr>\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n<hr>\n",false);
-		
+
 				ADOConnection::outp($err.': '.$emsg);
 			}
 		}
 	} else if (!$qID) {
-	
-		if ($zthis->debug === -99) 
+
+		if ($zthis->debug === -99)
 				if ($inBrowser) ADOConnection::outp( "<hr>\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n<hr>\n",false);
 				else ADOConnection::outp("-----<hr>\n($dbt): ".$sqlTxt."$ss\n-----<hr>\n",false);
-				
+
 		ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg());
 	}
-	
+
 	if ($zthis->debug === 99) _adodb_backtrace(true,9999,2);
 	return $qID;
 }
@@ -1112,27 +1111,27 @@ function _adodb_debug_execute(&$zthis, $sql, $inputarr)
 function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0,$ishtml=null)
 {
 	if (!function_exists('debug_backtrace')) return '';
-	 
+
 	if ($ishtml === null) $html =  (isset($_SERVER['HTTP_USER_AGENT']));
 	else $html = $ishtml;
-	
+
 	$fmt =  ($html) ? "</font><font color=#808080 size=-1> %% line %4d, file: <a href=\"file:/%s\">%s</a></font>" : "%% line %4d, file: %s";
 
 	$MAXSTRLEN = 128;
 
 	$s = ($html) ? '<pre align=left>' : '';
-	
+
 	if (is_array($printOrArr)) $traceArr = $printOrArr;
 	else $traceArr = debug_backtrace();
 	array_shift($traceArr);
 	array_shift($traceArr);
 	$tabs = sizeof($traceArr)-2;
-	
+
 	foreach ($traceArr as $arr) {
 		if ($skippy) {$skippy -= 1; continue;}
 		$levels -= 1;
 		if ($levels < 0) break;
-		
+
 		$args = array();
 		for ($i=0; $i < $tabs; $i++) $s .=  ($html) ? '   ' : "\t";
 		$tabs -= 1;
@@ -1152,30 +1151,30 @@ function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0,$ishtml=null)
 			}
 		}
 		$s .= $arr['function'].'('.implode(', ',$args).')';
-		
-		
+
+
 		$s .= @sprintf($fmt, $arr['line'],$arr['file'],basename($arr['file']));
-			
+
 		$s .= "\n";
-	}	
+	}
 	if ($html) $s .= '</pre>';
 	if ($printOrArr) print $s;
-	
+
 	return $s;
 }
 /*
-function _adodb_find_from($sql) 
+function _adodb_find_from($sql)
 {
 
 	$sql = str_replace(array("\n","\r"), ' ', $sql);
 	$charCount = strlen($sql);
-	
+
 	$inString = false;
 	$quote = '';
 	$parentheseCount = 0;
 	$prevChars = '';
 	$nextChars = '';
-	
+
 
 	for($i = 0; $i < $charCount; $i++) {
 
@@ -1205,5 +1204,3 @@ function _adodb_find_from($sql)
 	}
 }
 */
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-memcache.lib.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
index 23b18fc..6e0040d 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
@@ -9,18 +9,18 @@ $ADODB_INCLUDED_MEMCACHE = 1;
 global $ADODB_INCLUDED_CSV;
 if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
 
-/* 
+/*
 
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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
 
 Usage:
-  
+
 $db = NewADOConnection($driver);
 $db->memCache = true; /// should we use memCache instead of caching in files
 $db->memCacheHost = array($ip1, $ip2, $ip3);
@@ -29,32 +29,32 @@ $db->memCacheCompress = false; /// Use 'true' to store the item compressed (uses
 
 $db->Connect(...);
 $db->CacheExecute($sql);
-  
+
   Note the memcache class is shared by all connections, is created during the first call to Connect/PConnect.
-  
+
   Class instance is stored in $ADODB_CACHE
 */
 
 	class ADODB_Cache_MemCache {
 		var $createdir = false; // create caching directory structure?
-		
+
 		//-----------------------------
 		// memcache specific variables
-		
+
 		var $hosts;	// array of hosts
 		var $port = 11211;
 		var $compress = false; // memcache compression with zlib
-		
+
 		var $_connected = false;
 		var $_memcache = false;
-		
+
 		function ADODB_Cache_MemCache(&$obj)
 		{
 			$this->hosts = $obj->memCacheHost;
 			$this->port = $obj->memCachePort;
 			$this->compress = $obj->memCacheCompress;
 		}
-		
+
 		// implement as lazy connection. The connection only occurs on CacheExecute call
 		function connect(&$err)
 		{
@@ -64,9 +64,9 @@ $db->CacheExecute($sql);
 			}
 
 			$memcache = new MemCache;
-			
+
 			if (!is_array($this->hosts)) $this->hosts = array($this->hosts);
-		
+
 			$failcnt = 0;
 			foreach($this->hosts as $host) {
 				if (!@$memcache->addServer($host,$this->port,true)) {
@@ -81,7 +81,7 @@ $db->CacheExecute($sql);
 			$this->_memcache = $memcache;
 			return true;
 		}
-		
+
 		// returns true or false. true if successful save
 		function writecache($filename, $contents, $debug, $secs2cache)
 		{
@@ -90,43 +90,43 @@ $db->CacheExecute($sql);
 				if (!$this->connect($err) && $debug) ADOConnection::outp($err);
 			}
 			if (!$this->_memcache) return false;
-			
+
 			if (!$this->_memcache->set($filename, $contents, $this->compress ? MEMCACHE_COMPRESSED : 0, $secs2cache)) {
 				if ($debug) ADOConnection::outp(" Failed to save data at the memcached server!<br>\n");
 				return false;
 			}
-			
+
 			return true;
 		}
-		
+
 		// returns a recordset
 		function readcache($filename, &$err, $secs2cache, $rsClass)
 		{
 			$false = false;
 			if (!$this->_connected) $this->connect($err);
 			if (!$this->_memcache) return $false;
-			
+
 			$rs = $this->_memcache->get($filename);
 			if (!$rs) {
 				$err = 'Item with such key doesn\'t exists on the memcached server.';
 				return $false;
 			}
-			
+
 			// hack, should actually use _csv2rs
 			$rs = explode("\n", $rs);
             unset($rs[0]);
             $rs = join("\n", $rs);
  			$rs = unserialize($rs);
 			if (! is_object($rs)) {
-				$err = 'Unable to unserialize $rs';		
+				$err = 'Unable to unserialize $rs';
 				return $false;
 			}
 			if ($rs->timeCreated == 0) return $rs; // apparently have been reports that timeCreated was set to 0 somewhere
-			
+
 			$tdiff = intval($rs->timeCreated+$secs2cache - time());
 			if ($tdiff <= 2) {
 				switch($tdiff) {
-					case 2: 
+					case 2:
 						if ((rand() & 15) == 0) {
 							$err = "Timeout 2";
 							return $false;
@@ -138,14 +138,14 @@ $db->CacheExecute($sql);
 							return $false;
 						}
 						break;
-					default: 
+					default:
 						$err = "Timeout 0";
 						return $false;
 				}
 			}
 			return $rs;
 		}
-		
+
 		function flushall($debug=false)
 		{
 			if (!$this->_connected) {
@@ -153,38 +153,36 @@ $db->CacheExecute($sql);
 				if (!$this->connect($err) && $debug) ADOConnection::outp($err);
 			}
 			if (!$this->_memcache) return false;
-			
+
 			$del = $this->_memcache->flush();
-			
-			if ($debug) 
+
+			if ($debug)
 				if (!$del) ADOConnection::outp("flushall: failed!<br>\n");
 				else ADOConnection::outp("flushall: succeeded!<br>\n");
-				
+
 			return $del;
 		}
-		
+
 		function flushcache($filename, $debug=false)
 		{
 			if (!$this->_connected) {
   				$err = '';
-  				if (!$this->connect($err) && $debug) ADOConnection::outp($err); 
-			} 
+  				if (!$this->connect($err) && $debug) ADOConnection::outp($err);
+			}
 			if (!$this->_memcache) return false;
-  
+
 			$del = $this->_memcache->delete($filename);
-			
-			if ($debug) 
+
+			if ($debug)
 				if (!$del) ADOConnection::outp("flushcache: $key entry doesn't exist on memcached server!<br>\n");
 				else ADOConnection::outp("flushcache: $key entry flushed from memcached server!<br>\n");
-				
+
 			return $del;
 		}
-		
+
 		// not used for memcache
-		function createdir($dir, $hash) 
+		function createdir($dir, $hash)
 		{
 			return true;
 		}
 	}
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-pager.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-pager.inc.php
index 317d573..a08ced4 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-pager.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-pager.inc.php
@@ -1,22 +1,22 @@
 <?php
 
 /*
-	V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+	V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
 
-  	This class provides recordset pagination with 
-	First/Prev/Next/Last links. 
-	
+  	This class provides recordset pagination with
+	First/Prev/Next/Last links.
+
 	Feel free to modify this class for your own use as
-	it is very basic. To learn how to use it, see the 
+	it is very basic. To learn how to use it, see the
 	example in adodb/tests/testpaging.php.
-	
+
 	"Pablo Costa" <pablo at cbsp.com.br> implemented Render_PageLinks().
-	
-	Please note, this class is entirely unsupported, 
+
+	Please note, this class is entirely unsupported,
 	and no free support requests except for bug reports
 	will be entertained by the author.
 
@@ -29,10 +29,10 @@ class ADODB_Pager {
 	var $curr_page;	// current page number before Render() called, calculated in constructor
 	var $rows;		// number of rows per page
     var $linksPerPage=10; // number of links per page in navigation bar
-    var $showPageLinks; 
+    var $showPageLinks;
 
 	var $gridAttributes = 'width=100% border=1 bgcolor=white';
-	
+
 	// Localize text strings here
 	var $first = '<code>|<</code>';
 	var $prev = '<code><<</code>';
@@ -45,39 +45,39 @@ class ADODB_Pager {
 	var $page = 'Page';
 	var $linkSelectedColor = 'red';
 	var $cache = 0;  #secs to cache with CachePageExecute()
-	
+
 	//----------------------------------------------
 	// constructor
 	//
 	// $db	adodb connection object
 	// $sql	sql statement
-	// $id	optional id to identify which pager, 
-	//		if you have multiple on 1 page. 
+	// $id	optional id to identify which pager,
+	//		if you have multiple on 1 page.
 	//		$id should be only be [a-z0-9]*
 	//
 	function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false)
 	{
 	global $PHP_SELF;
-	
+
 		$curr_page = $id.'_curr_page';
 		if (!empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks
-		
+
 		$this->sql = $sql;
 		$this->id = $id;
 		$this->db = $db;
 		$this->showPageLinks = $showPageLinks;
-		
-		$next_page = $id.'_next_page';	
-		
+
+		$next_page = $id.'_next_page';
+
 		if (isset($_GET[$next_page])) {
 			$_SESSION[$curr_page] = (integer) $_GET[$next_page];
 		}
 		if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page
-		
+
 		$this->curr_page = $_SESSION[$curr_page];
-		
+
 	}
-	
+
 	//---------------------------
 	// Display link to first page
 	function Render_First($anchor=true)
@@ -85,51 +85,51 @@ class ADODB_Pager {
 	global $PHP_SELF;
 		if ($anchor) {
 	?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a>   
+		<a href="<?php echo $PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a>  
 	<?php
 		} else {
 			print "$this->first   ";
 		}
 	}
-	
+
 	//--------------------------
 	// Display link to next page
 	function render_next($anchor=true)
 	{
 	global $PHP_SELF;
-	
+
 		if ($anchor) {
 		?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next;?></a>   
+		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next;?></a>  
 		<?php
 		} else {
 			print "$this->next   ";
 		}
 	}
-	
+
 	//------------------
 	// Link to last page
-	// 
+	//
 	// for better performance with large recordsets, you can set
 	// $this->db->pageExecuteCountRows = false, which disables
 	// last page counting.
 	function render_last($anchor=true)
 	{
 	global $PHP_SELF;
-	
+
 		if (!$this->db->pageExecuteCountRows) return;
-		
+
 		if ($anchor) {
 		?>
-			<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo $this->last;?></a>   
+			<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo $this->last;?></a>  
 		<?php
 		} else {
 			print "$this->last   ";
 		}
 	}
-	
+
 	//---------------------------------------------------
-	// original code by "Pablo Costa" <pablo at cbsp.com.br> 
+	// original code by "Pablo Costa" <pablo at cbsp.com.br>
         function render_pagelinks()
         {
         global $PHP_SELF;
@@ -146,21 +146,21 @@ class ADODB_Pager {
             $end = $start+$linksperpage-1;
 			$link = $this->id . "_next_page";
             if($end > $pages) $end = $pages;
-			
-			
+
+
 			if ($this->startLinks && $start > 1) {
 				$pos = $start - 1;
 				$numbers .= "<a href=$PHP_SELF?$link=$pos>$this->startLinks</a>  ";
-            } 
-			
+            }
+
 			for($i=$start; $i <= $end; $i++) {
                 if ($this->rs->AbsolutePage() == $i)
                     $numbers .= "<font color=$this->linkSelectedColor><b>$i</b></font>  ";
-                else 
+                else
                      $numbers .= "<a href=$PHP_SELF?$link=$i>$i</a>  ";
-            
+
             }
-			if ($this->moreLinks && $end < $pages) 
+			if ($this->moreLinks && $end < $pages)
 				$numbers .= "<a href=$PHP_SELF?$link=$i>$this->moreLinks</a>  ";
             print $numbers . '   ';
         }
@@ -170,13 +170,13 @@ class ADODB_Pager {
 	global $PHP_SELF;
 		if ($anchor) {
 	?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev;?></a>   
-	<?php 
+		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev;?></a>  
+	<?php
 		} else {
 			print "$this->prev   ";
 		}
 	}
-	
+
 	//--------------------------------------------------------
 	// Simply rendering of grid. You should override this for
 	// better control over the format of the grid
@@ -193,7 +193,7 @@ class ADODB_Pager {
 		ob_end_clean();
 		return $s;
 	}
-	
+
 	//-------------------------------------------------------
 	// Navigation bar
 	//
@@ -222,7 +222,7 @@ class ADODB_Pager {
 		ob_end_clean();
 		return $s;
 	}
-	
+
 	//-------------------
 	// This is the footer
 	function RenderPageCount()
@@ -233,17 +233,17 @@ class ADODB_Pager {
 		if ($this->curr_page > $lastPage) $this->curr_page = 1;
 		return "<font size=-1>$this->page ".$this->curr_page."/".$lastPage."</font>";
 	}
-	
+
 	//-----------------------------------
 	// Call this class to draw everything.
 	function Render($rows=10)
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		$this->rows = $rows;
-		
+
 		if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
 		if ($this->cache)
@@ -251,27 +251,27 @@ class ADODB_Pager {
 		else
 			$rs = $this->db->PageExecute($this->sql,$rows,$this->curr_page);
 		$ADODB_COUNTRECS = $savec;
-		
+
 		$this->rs = $rs;
 		if (!$rs) {
 			print "<h3>Query failed: $this->sql</h3>";
 			return;
 		}
-		
-		if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) 
+
+		if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage()))
 			$header = $this->RenderNav();
 		else
 			$header = " ";
-		
+
 		$grid = $this->RenderGrid();
 		$footer = $this->RenderPageCount();
-		
+
 		$this->RenderLayout($header,$grid,$footer);
-		
+
 		$rs->Close();
 		$this->rs = false;
 	}
-	
+
 	//------------------------------------------------------
 	// override this to control overall layout and formating
 	function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige')
@@ -285,6 +285,3 @@ class ADODB_Pager {
 			"</td></tr></table>";
 	}
 }
-
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-pear.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-pear.inc.php
index 59bbce5..49ba936 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-pear.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-pear.inc.php
@@ -1,12 +1,12 @@
 <?php
-/** 
- * @version V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/**
+ * @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- * 
+ *
  * PEAR DB Emulation Layer for ADODB.
  *
  * The following code is modelled on PEAR DB code by Stig Bakken <ssb at fast.no>								   |
@@ -15,7 +15,7 @@
 
  /*
  We support:
- 
+
  DB_Common
  ---------
  	query - returns PEAR_Error on error
@@ -27,13 +27,13 @@
 	quote
 	nextID
 	disconnect
-	
+
 	getOne
 	getAssoc
 	getRow
 	getCol
 	getAll
-	
+
  DB_Result
  ---------
  	numRows - returns -1 if not supported
@@ -42,7 +42,7 @@
 	fetchRows - does not support passing of fetchmode
 	free
  */
- 
+
 define('ADODB_PEAR',dirname(__FILE__));
 include_once "PEAR.php";
 include_once ADODB_PEAR."/adodb-errorpear.inc.php";
@@ -183,10 +183,10 @@ class DB
 
 		if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= ':'.$dsninfo['socket'];
 		else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= ':'.$dsninfo['port'];
-		
+
 		if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
 		else  $ok = $obj->Connect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
-		
+
 		if (!$ok) $obj = ADODB_PEAR_Error();
 		return $obj;
 	}
@@ -212,7 +212,7 @@ class DB
 	{
 		if (!is_object($value)) return false;
 		$class = strtolower(get_class($value));
-		return $class == 'pear_error' || is_subclass_of($value, 'pear_error') || 
+		return $class == 'pear_error' || is_subclass_of($value, 'pear_error') ||
 				$class == 'db_error' || is_subclass_of($value, 'db_error');
 	}
 
@@ -370,5 +370,3 @@ class DB
 		return true;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-perf.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-perf.inc.php
index e1930f7..8e6e6cc 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-perf.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-perf.inc.php
@@ -1,19 +1,19 @@
 <?php
-/* 
-V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Library for basic performance monitoring and tuning.
-  
+
   My apologies if you see code mixed with presentation. The presentation suits
   my needs. If you want to separate code from presentation, be my guest. Patches
   are welcome.
-  
+
 */
 
 if (!defined('ADODB_DIR')) include_once(dirname(__FILE__).'/adodb.inc.php');
@@ -31,23 +31,23 @@ function adodb_getmem()
 {
 	if (function_exists('memory_get_usage'))
 		return (integer) ((memory_get_usage()+512)/1024);
-	
+
 	$pid = getmypid();
-	
+
 	if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0) {
 		$output = array();
-	
-		exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output); 
+
+		exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output);
 		return substr($output[5], strpos($output[5], ':') + 1);
-	} 
-	
+	}
+
 	/* Hopefully UNIX */
 	exec("ps --pid $pid --no-headers -o%mem,size", $output);
 	if (sizeof($output) == 0) return 0;
-	
+
 	$memarr = explode(' ',$output[0]);
 	if (sizeof($memarr)>=2) return (integer) $memarr[1];
-	
+
 	return 0;
 }
 
@@ -74,7 +74,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr)
 
 	if (!empty($connx->_logsql) && (empty($connx->_logsqlErrors) || !$rs)) {
 	global $ADODB_LOG_CONN;
-	
+
 		if (!empty($ADODB_LOG_CONN)) {
 			$conn = $ADODB_LOG_CONN;
 			if ($conn->databaseType != $connx->databaseType)
@@ -85,12 +85,12 @@ function adodb_log_sql(&$connx,$sql,$inputarr)
 			$conn = $connx;
 			$prefix = '';
 		}
-		
+
 		$conn->_logsql = false; // disable logsql error simulation
 		$dbT = $conn->databaseType;
-		
+
 		$time = $a1 - $a0;
-	
+
 		if (!$rs) {
 			$errM = $connx->ErrorMsg();
 			$errN = $connx->ErrorNo();
@@ -102,7 +102,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr)
 			$errN = 0;
 			$dbg = $conn->debug;
 			$conn->debug = false;
-			if (!is_object($rs) || $rs->dataProvider == 'empty') 
+			if (!is_object($rs) || $rs->dataProvider == 'empty')
 				$conn->_affected = $conn->affected_rows(true);
 			$conn->lastInsID = @$conn->Insert_ID();
 			$conn->debug = $dbg;
@@ -110,12 +110,12 @@ function adodb_log_sql(&$connx,$sql,$inputarr)
 		if (isset($_SERVER['HTTP_HOST'])) {
 			$tracer .= '<br>'.$_SERVER['HTTP_HOST'];
 			if (isset($_SERVER['PHP_SELF'])) $tracer .= htmlspecialchars($_SERVER['PHP_SELF']);
-		} else 
+		} else
 			if (isset($_SERVER['PHP_SELF'])) $tracer .= '<br>'.htmlspecialchars($_SERVER['PHP_SELF']);
 		//$tracer .= (string) adodb_backtrace(false);
-		
+
 		$tracer = (string) substr($tracer,0,500);
-		
+
 		if (is_array($inputarr)) {
 			if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr);
 			else {
@@ -132,7 +132,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr)
 		} else {
 			$params = '';
 		}
-		
+
 		if (is_array($sql)) $sql = $sql[0];
 		if ($prefix) $sql = $prefix.$sql;
 		$arr = array('b'=>strlen($sql).'.'.crc32($sql),
@@ -140,7 +140,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr)
 		//var_dump($arr);
 		$saved = $conn->debug;
 		$conn->debug = 0;
-		
+
 		$d = $conn->sysTimeStamp;
 		if (empty($d)) $d = date("'Y-m-d H:i:s'");
 		if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
@@ -153,7 +153,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr)
 			$sql2 = $conn->qstr($arr['c']);
 			$params = $conn->qstr($arr['d']);
 			$tracer = $conn->qstr($arr['e']);
-			
+
 			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($d,$sql1,$sql2,$params,$tracer,$timer)";
 			if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql);
 			$arr = false;
@@ -161,17 +161,17 @@ function adodb_log_sql(&$connx,$sql,$inputarr)
 			if ($dbT == 'db2') $arr['f'] = (float) $arr['f'];
 			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)";
 		}
-		
+
 		global $ADODB_PERF_MIN;
 		if ($errN != 0 || $time >= $ADODB_PERF_MIN) {
 			$ok = $conn->Execute($isql,$arr);
 		} else
 			$ok = true;
-		
+
 		$conn->debug = $saved;
-		
+
 		if ($ok) {
-			$conn->_logsql = true; 
+			$conn->_logsql = true;
 		} else {
 			$err2 = $conn->ErrorMsg();
 			$conn->_logsql = true; // enable logsql error simulation
@@ -181,7 +181,7 @@ function adodb_log_sql(&$connx,$sql,$inputarr)
 			} else {
 				$ok = $conn->Execute("create table $perf_table (
 				created varchar(50),
-				sql0 varchar(250), 
+				sql0 varchar(250),
 				sql1 varchar(4000),
 				params varchar(3000),
 				tracer varchar(500),
@@ -194,12 +194,12 @@ function adodb_log_sql(&$connx,$sql,$inputarr)
 		}
 		$connx->_errorMsg = $errM;
 		$connx->_errorCode = $errN;
-	} 
+	}
 	$connx->fnExecute = 'adodb_log_sql';
 	return $rs;
 }
 
-	
+
 /*
 The settings data structure is an associative array that database parameter per element.
 
@@ -207,9 +207,9 @@ Each database parameter element in the array is itself an array consisting of:
 
 0: category code, used to group related db parameters
 1: either
-	a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", 
+	a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'",
 	b. array holding sql string and field to look for, e.g. array('show variables','table_cache'),
-	c. a string prefixed by =, then a PHP method of the class is invoked, 
+	c. a string prefixed by =, then a PHP method of the class is invoked,
 		e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue',
 2: description of the database parameter
 */
@@ -227,8 +227,8 @@ class adodb_perf {
 	var $helpurl = "<a href=http://phplens.com/adodb/reference.functions.fnexecute.and.fncacheexecute.properties.html#logsql>LogSQL help</a>";
 	var $createTableSQL = false;
 	var $maxLength = 2000;
-	
-    // Sets the tablename to be used            
+
+    // Sets the tablename to be used
     static function table($newtable = false)
     {
         static $_table;
@@ -263,20 +263,20 @@ processes 69293
 			if (PHP_VERSION == '5.0.2') return false;
 			if (PHP_VERSION == '5.0.3') return false;
 			if (PHP_VERSION == '4.3.10') return false; # see http://bugs.php.net/bug.php?id=31737
-			
+
 			static $FAIL = false;
 			if ($FAIL) return false;
-			
-			$objName = "winmgmts:{impersonationLevel=impersonate}!\\\\.\\root\\CIMV2";	
+
+			$objName = "winmgmts:{impersonationLevel=impersonate}!\\\\.\\root\\CIMV2";
 			$myQuery = "SELECT * FROM Win32_PerfFormattedData_PerfOS_Processor WHERE Name = '_Total'";
-			
+
 			try {
 				@$objWMIService = new COM($objName);
 				if (!$objWMIService) {
 					$FAIL = true;
 					return false;
 				}
-		
+
 				$info[0] = -1;
 				$info[1] = 0;
 				$info[2] = 0;
@@ -284,23 +284,23 @@ processes 69293
 				foreach($objWMIService->ExecQuery($myQuery) as $objItem)  {
 						$info[0] = $objItem->PercentProcessorTime();
 				}
-			
+
 			} catch(Exception $e) {
 				$FAIL = true;
 				echo $e->getMessage();
 				return false;
 			}
-			
+
 			return $info;
 		}
-		
+
 		// Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com)
 		$statfile = '/proc/stat';
 		if (!file_exists($statfile)) return false;
-		
+
 		$fd = fopen($statfile,"r");
 		if (!$fd) return false;
-		
+
 		$statinfo = explode("\n",fgets($fd, 1024));
 		fclose($fd);
 		foreach($statinfo as $line) {
@@ -311,11 +311,11 @@ processes 69293
 				return $info;
 			}
 		}
-		
+
 		return false;
-		
+
 	}
-	
+
 	/* NOT IMPLEMENTED */
 	function MemInfo()
 	{
@@ -343,8 +343,8 @@ SwapFree:      2085664 kB
 Committed_AS:   348732 kB
 		*/
 	}
-	
-	
+
+
 	/*
 		Remember that this is client load, not db server load!
 	*/
@@ -353,7 +353,7 @@ Committed_AS:   348732 kB
 	{
 		$info = $this->_CPULoad();
 		if (!$info) return false;
-		
+
 		if (strncmp(PHP_OS,'WIN',3)==0) {
 			return (integer) $info[0];
 		}else {
@@ -362,38 +362,38 @@ Committed_AS:   348732 kB
 				$this->_lastLoad = $info;
 				$info = $this->_CPULoad();
 			}
-			
+
 			$last = $this->_lastLoad;
 			$this->_lastLoad = $info;
-			
+
 			$d_user = $info[0] - $last[0];
 			$d_nice = $info[1] - $last[1];
 			$d_system = $info[2] - $last[2];
 			$d_idle = $info[3] - $last[3];
-			
+
 			//printf("Delta - User: %f  Nice: %f  System: %f  Idle: %f<br>",$d_user,$d_nice,$d_system,$d_idle);
-		
+
 			$total=$d_user+$d_nice+$d_system+$d_idle;
 			if ($total<1) $total=1;
-			return 100*($d_user+$d_nice+$d_system)/$total; 
+			return 100*($d_user+$d_nice+$d_system)/$total;
 		}
 	}
-	
+
 	function Tracer($sql)
 	{
         $perf_table = adodb_perf::table();
 		$saveE = $this->conn->fnExecute;
 		$this->conn->fnExecute = false;
-		
+
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-				
+
 		$sqlq = $this->conn->qstr($sql);
 		$arr = $this->conn->GetArray(
-"select count(*),tracer 
-	from $perf_table where sql1=$sqlq 
+"select count(*),tracer
+	from $perf_table where sql1=$sqlq
 	group by tracer
 	order by 1 desc");
 		$s = '';
@@ -403,26 +403,26 @@ Committed_AS:   348732 kB
 				$s .= sprintf("%4d",$k[0]).'   '.strip_tags($k[1]).'<br>';
 			}
 		}
-		
+
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_CACHE_MODE = $save;
 		$this->conn->fnExecute = $saveE;
 		return $s;
 	}
 
-	/* 
+	/*
 		Explain Plan for $sql.
-		If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the 
+		If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the
 			actual sql.
 	*/
 	function Explain($sql,$partial=false)
-	{	
+	{
 		return false;
 	}
-	
+
 	function InvalidSQL($numsql = 10)
 	{
-	
+
 		if (isset($_GET['sql'])) return;
 		$s = '<h3>Invalid SQL</h3>';
 		$saveE = $this->conn->fnExecute;
@@ -434,30 +434,30 @@ Committed_AS:   348732 kB
 			$s .= rs2html($rs,false,false,false,false);
 		} else
 			return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
-		
+
 		return $s;
 	}
 
-	
+
 	/*
 		This script identifies the longest running SQL
-	*/	
+	*/
 	function _SuspiciousSQL($numsql = 10)
 	{
 		global $ADODB_FETCH_MODE;
-		
+
             $perf_table = adodb_perf::table();
 			$saveE = $this->conn->fnExecute;
 			$this->conn->fnExecute = false;
-			
+
 			if (isset($_GET['exps']) && isset($_GET['sql'])) {
 				$partial = !empty($_GET['part']);
 				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
 			}
-			
+
 			if (isset($_GET['sql'])) return;
 			$sql1 = $this->sql1;
-			
+
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
@@ -472,7 +472,7 @@ Committed_AS:   348732 kB
 			if (isset($savem)) $this->conn->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 			$this->conn->fnExecute = $saveE;
-			
+
 			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
 			$s = "<h3>Suspicious SQL</h3>
 <font size=1>The following SQL have high average execution times</font><br>
@@ -496,15 +496,15 @@ Committed_AS:   348732 kB
 				$rs->MoveNext();
 			}
 			return $s."</table>";
-		
+
 	}
-	
+
 	function CheckMemory()
 	{
 		return '';
 	}
-	
-	
+
+
 	function SuspiciousSQL($numsql=10)
 	{
 		return adodb_perf::_SuspiciousSQL($numsql);
@@ -515,32 +515,32 @@ Committed_AS:   348732 kB
 		return adodb_perf::_ExpensiveSQL($numsql);
 	}
 
-	
+
 	/*
-		This reports the percentage of load on the instance due to the most 
-		expensive few SQL statements. Tuning these statements can often 
-		make huge improvements in overall system performance. 
+		This reports the percentage of load on the instance due to the most
+		expensive few SQL statements. Tuning these statements can often
+		make huge improvements in overall system performance.
 	*/
 	function _ExpensiveSQL($numsql = 10)
 	{
 		global $ADODB_FETCH_MODE;
-		
+
             $perf_table = adodb_perf::table();
 			$saveE = $this->conn->fnExecute;
 			$this->conn->fnExecute = false;
-			
+
 			if (isset($_GET['expe']) && isset($_GET['sql'])) {
 				$partial = !empty($_GET['part']);
 				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
 			}
-			
+
 			if (isset($_GET['sql'])) return;
-			
+
 			$sql1 = $this->sql1;
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-			
+
 			$rs = $this->conn->SelectLimit(
 			"select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
 				from $perf_table
@@ -576,7 +576,7 @@ Committed_AS:   348732 kB
 			}
 			return $s."</table>";
 	}
-	
+
 	/*
 		Raw function to return parameter value from $settings.
 	*/
@@ -586,7 +586,7 @@ Committed_AS:   348732 kB
 		$sql = $this->settings[$param][1];
 		return $this->_DBParameter($sql);
 	}
-	
+
 	/*
 		Raw function returning array of poll paramters
 	*/
@@ -598,7 +598,7 @@ Committed_AS:   348732 kB
 		$arr[3] = (integer) $this->DBParameter('current connections');
 		return $arr;
 	}
-	
+
 	/*
 		Low-level Get Database Parameter
 	*/
@@ -607,7 +607,7 @@ Committed_AS:   348732 kB
 		$savelog = $this->conn->LogSQL(false);
 		if (is_array($sql)) {
 		global $ADODB_FETCH_MODE;
-		
+
 			$sql1 = $sql[0];
 			$key = $sql[1];
 			if (sizeof($sql)>2) $pos = $sql[2];
@@ -618,9 +618,9 @@ Committed_AS:   348732 kB
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-			
+
 			$rs = $this->conn->Execute($sql1);
-			
+
 			if (isset($savem)) $this->conn->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 			if ($rs) {
@@ -645,21 +645,21 @@ Committed_AS:   348732 kB
 			$sql = str_replace('$DATABASE',$this->conn->database,$sql);
 			$ret = $this->conn->GetOne($sql);
 			$this->conn->LogSQL($savelog);
-			
+
 			return $ret;
 		}
 	}
-	
+
 	/*
 		Warn if cache ratio falls below threshold. Displayed in "Description" column.
 	*/
 	function WarnCacheRatio($val)
 	{
-		if ($val < $this->warnRatio) 
+		if ($val < $this->warnRatio)
 			 return '<font color=red><b>Cache ratio should be at least '.$this->warnRatio.'%</b></font>';
 		else return '';
 	}
-	
+
 	function clearsql()
 	{
 		$perf_table = adodb_perf::table();
@@ -669,54 +669,54 @@ Committed_AS:   348732 kB
 	//                                    HIGH LEVEL UI FUNCTIONS
 	/***********************************************************************************************/
 
-	
+
 	function UI($pollsecs=5)
 	{
 	global $ADODB_LOG_CONN;
-	
+
     $perf_table = adodb_perf::table();
 	$conn = $this->conn;
-	
+
 	$app = $conn->host;
 	if ($conn->host && $conn->database) $app .= ', db=';
 	$app .= $conn->database;
-	
+
 	if ($app) $app .= ', ';
-	$savelog = $this->conn->LogSQL(false);	
+	$savelog = $this->conn->LogSQL(false);
 	$info = $conn->ServerInfo();
 	if (isset($_GET['clearsql'])) {
 		$this->clearsql();
 	}
 	$this->conn->LogSQL($savelog);
-	
+
 	// magic quotes
-	
+
 	if (isset($_GET['sql']) && get_magic_quotes_gpc()) {
 		$_GET['sql'] = $_GET['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']);
 	}
-	
+
 	if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10;
 	else  $nsql = $_SESSION['ADODB_PERF_SQL'];
-	
+
 	$app .= $info['description'];
-	
-	
+
+
 	if (isset($_GET['do'])) $do = $_GET['do'];
 	else if (isset($_POST['do'])) $do = $_POST['do'];
 	 else if (isset($_GET['sql'])) $do = 'viewsql';
 	 else $do = 'stats';
-	 
+
 	if (isset($_GET['nsql'])) {
 		if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql'];
 	}
 	echo "<title>ADOdb Performance Monitor on $app</title><body bgcolor=white>";
 	if ($do == 'viewsql') $form = "<td><form># SQL:<input type=hidden value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input type=submit value=Go></td></form>";
 	else $form = "<td> </td>";
-	
+
 	$allowsql = !defined('ADODB_PERF_NO_RUN_SQL');
 	global $ADODB_PERF_MIN;
 	$app .= " (Min sql timing \$ADODB_PERF_MIN=$ADODB_PERF_MIN secs)";
-	
+
 	if  (empty($_GET['hidem']))
 	echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
 	<b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
@@ -726,7 +726,7 @@ Committed_AS:   348732 kB
 	 "$form",
 	 "</tr></table>";
 
-	 
+
 	 	switch ($do) {
 		default:
 		case 'stats':
@@ -734,21 +734,21 @@ Committed_AS:   348732 kB
 				echo "<p>  <a href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";
 			echo $this->HealthCheck();
 			//$this->conn->debug=1;
-			echo $this->CheckMemory();		
+			echo $this->CheckMemory();
 			break;
 		case 'poll':
 			$self = htmlspecialchars($_SERVER['PHP_SELF']);
-			echo "<iframe width=720 height=80% 
+			echo "<iframe width=720 height=80%
 				src=\"{$self}?do=poll2&hidem=1\"></iframe>";
 			break;
 		case 'poll2':
 			echo "<pre>";
 			$this->Poll($pollsecs);
 			break;
-		
+
 		case 'dosql':
 			if (!$allowsql) break;
-			
+
 			$this->DoSQLForm();
 			break;
 		case 'viewsql':
@@ -758,13 +758,13 @@ Committed_AS:   348732 kB
 			echo($this->ExpensiveSQL($nsql));
 			echo($this->InvalidSQL($nsql));
 			break;
-		case 'tables': 
+		case 'tables':
 			echo $this->Tables(); break;
 		}
 		global $ADODB_vers;
 		echo "<p><div align=center><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
 	}
-	
+
 	/*
 		Runs in infinite loop, returning real-time statistics
 	*/
@@ -781,12 +781,12 @@ Committed_AS:   348732 kB
 		while (1) {
 
 			$arr = $this->PollParameters();
-			
+
 			$hits   = sprintf('%2.2f',$arr[0]);
 			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
 			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
 			$sess = sprintf('%5d',$arr[3]);
-			
+
 			$load = $this->CPULoad();
 			if ($load !== false) {
 				$oslabel = 'WS-CPU%';
@@ -795,18 +795,18 @@ Committed_AS:   348732 kB
 				$oslabel = '';
 				$osval = '';
 			}
-			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 
+			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n";
 			$cnt += 1;
 			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";
 			flush();
-			
+
 			if (connection_aborted()) return;
-			
+
 			sleep($secs);
 			$arro = $arr;
 		}
 	}
-	
+
 	/*
 		Returns basic health check in a command line interface
 	*/
@@ -814,48 +814,48 @@ Committed_AS:   348732 kB
 	{
 		return $this->HealthCheck(true);
 	}
-	
-		
+
+
 	/*
 		Returns basic health check as HTML
 	*/
 	function HealthCheck($cli=false)
 	{
 		$saveE = $this->conn->fnExecute;
-		$this->conn->fnExecute = false;	
+		$this->conn->fnExecute = false;
 		if ($cli) $html = '';
 		else $html = $this->table.'<tr><td colspan=3><h3>'.$this->conn->databaseType.'</h3></td></tr>'.$this->titles;
-		
+
 		$oldc = false;
 		$bgc = '';
 		foreach($this->settings as $name => $arr) {
 			if ($arr === false) break;
-			
+
 			if (!is_string($name)) {
 				if ($cli) $html .= " -- $arr -- \n";
 				else $html .= "<tr bgcolor=$this->color><td colspan=3><i>$arr</i>  </td></tr>";
 				continue;
 			}
-			
+
 			if (!is_array($arr)) break;
 			$category = $arr[0];
 			$how = $arr[1];
 			if (sizeof($arr)>2) $desc = $arr[2];
 			else $desc = '   ';
-			
-			
+
+
 			if ($category == 'HIDE') continue;
-			
+
 			$val = $this->_DBParameter($how);
-			
+
 			if ($desc && strncmp($desc,"=",1) === 0) {
 				$fn = substr($desc,1);
 				$desc = $this->$fn($val);
 			}
-			
+
 			if ($val === false) {
 				$m = $this->conn->ErrorMsg();
-				$val = "Error: $m"; 
+				$val = "Error: $m";
 			} else {
 				if (is_numeric($val) && $val >= 256*1024) {
 					if ($val % (1024*1024) == 0) {
@@ -876,34 +876,34 @@ Committed_AS:   348732 kB
 			if (strlen($val)==0) $val = ' ';
 			if ($cli) {
 				$html  .= str_replace(' ','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
-				
+
 			}else {
 				$html .= "<tr$bgc><td>".$name.'</td><td>'.$val.'</td><td>'.$desc."</td></tr>\n";
 			}
 		}
-		
+
 		if (!$cli) $html .= "</table>\n";
 		$this->conn->fnExecute = $saveE;
-			
-		return $html;	
+
+		return $html;
 	}
-	
+
 	function Tables($orderby='1')
 	{
 		if (!$this->tablesSQL) return false;
-		
+
 		$savelog = $this->conn->LogSQL(false);
 		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
 		$this->conn->LogSQL($savelog);
 		$html = rs2html($rs,false,false,false,false);
 		return $html;
 	}
-	
+
 
 	function CreateLogTable()
 	{
 		if (!$this->createTableSQL) return false;
-		
+
 		$table = $this->table();
 		$sql = str_replace('adodb_logsql',$table,$this->createTableSQL);
 		$savelog = $this->conn->LogSQL(false);
@@ -911,17 +911,17 @@ Committed_AS:   348732 kB
 		$this->conn->LogSQL($savelog);
 		return ($ok) ? true : false;
 	}
-	
+
 	function DoSQLForm()
 	{
-	
-		
+
+
 		$PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']);
 		$sql = isset($_REQUEST['sql']) ? $_REQUEST['sql'] : '';
 
 		if (isset($_SESSION['phplens_sqlrows'])) $rows = $_SESSION['phplens_sqlrows'];
 		else $rows = 3;
-		
+
 		if (isset($_REQUEST['SMALLER'])) {
 			$rows /= 2;
 			if ($rows < 3) $rows = 3;
@@ -931,7 +931,7 @@ Committed_AS:   348732 kB
 			$rows *= 2;
 			$_SESSION['phplens_sqlrows'] = $rows;
 		}
-		
+
 ?>
 
 <form method="POST" action="<?php echo $PHP_SELF ?>">
@@ -950,7 +950,7 @@ Committed_AS:   348732 kB
 
 <?php
 		if (!isset($_REQUEST['sql'])) return;
-		
+
 		$sql = $this->undomq(trim($sql));
 		if (substr($sql,strlen($sql)-1) === ';') {
 			$print = true;
@@ -962,7 +962,7 @@ Committed_AS:   348732 kB
 		foreach($sqla as $sqls) {
 
 			if (!$sqls) continue;
-			
+
 			if ($print) {
 				print "<p>".htmlspecialchars($sqls)."</p>";
 				flush();
@@ -988,14 +988,14 @@ Committed_AS:   348732 kB
 			}
 		} // foreach
 	}
-	
+
 	function SplitSQL($sql)
 	{
 		$arr = explode(';',$sql);
 		return $arr;
 	}
-	
-	function undomq($m) 
+
+	function undomq($m)
 	{
 	if (get_magic_quotes_gpc()) {
 		// undo the damage
@@ -1006,13 +1006,13 @@ Committed_AS:   348732 kB
 	return $m;
 }
 
-    
+
    /************************************************************************/
-   
-    /** 
+
+    /**
      * Reorganise multiple table-indices/statistics/..
      * OptimizeMode could be given by last Parameter
-     * 
+     *
      * @example
      *      <pre>
      *          optimizeTables( 'tableA');
@@ -1023,12 +1023,12 @@ Committed_AS:   348732 kB
      *      <pre>
      *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
      *      </pre>
-     * 
+     *
      * @param string table name of the table to optimize
      * @param int mode optimization-mode
-     *      <code>ADODB_OPT_HIGH</code> for full optimization 
+     *      <code>ADODB_OPT_HIGH</code> for full optimization
      *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
-     *      Default is LOW <code>ADODB_OPT_LOW</code> 
+     *      Default is LOW <code>ADODB_OPT_LOW</code>
      * @author Markus Staab
      * @return Returns <code>true</code> on success and <code>false</code> on error
      */
@@ -1036,52 +1036,52 @@ Committed_AS:   348732 kB
     {
         $args = func_get_args();
         $numArgs = func_num_args();
-        
+
         if ( $numArgs == 0) return false;
-        
-        $mode = ADODB_OPT_LOW; 
+
+        $mode = ADODB_OPT_LOW;
         $lastArg = $args[ $numArgs - 1];
         if ( !is_string($lastArg)) {
             $mode = $lastArg;
             unset( $args[ $numArgs - 1]);
         }
-        
+
         foreach( $args as $table) {
             $this->optimizeTable( $table, $mode);
         }
 	}
 
-    /** 
+    /**
      * Reorganise the table-indices/statistics/.. depending on the given mode.
      * Default Implementation throws an error.
-     * 
+     *
      * @param string table name of the table to optimize
      * @param int mode optimization-mode
-     *      <code>ADODB_OPT_HIGH</code> for full optimization 
+     *      <code>ADODB_OPT_HIGH</code> for full optimization
      *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
-     *      Default is LOW <code>ADODB_OPT_LOW</code> 
+     *      Default is LOW <code>ADODB_OPT_LOW</code>
      * @author Markus Staab
      * @return Returns <code>true</code> on success and <code>false</code> on error
      */
-    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
+    function OptimizeTable( $table, $mode = ADODB_OPT_LOW)
     {
         ADOConnection::outp( sprintf( "<p>%s: '%s' not implemented for driver '%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));
         return false;
     }
-    
-    /** 
+
+    /**
      * Reorganise current database.
-     * Default implementation loops over all <code>MetaTables()</code> and 
+     * Default implementation loops over all <code>MetaTables()</code> and
      * optimize each using <code>optmizeTable()</code>
-     * 
+     *
      * @author Markus Staab
      * @return Returns <code>true</code> on success and <code>false</code> on error
      */
-    function optimizeDatabase() 
+    function optimizeDatabase()
     {
         $conn = $this->conn;
         if ( !$conn) return false;
-        
+
         $tables = $conn->MetaTables( 'TABLES');
         if ( !$tables ) return false;
 
@@ -1090,10 +1090,8 @@ Committed_AS:   348732 kB
                 return false;
             }
         }
-      
+
         return true;
     }
-    // end hack 
+    // end hack
 }
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-php4.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-php4.inc.php
index 283c517..e999983 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-php4.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-php4.inc.php
@@ -1,16 +1,14 @@
 <?php
 
 /*
-  V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-time.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-time.inc.php
index e346dd7..c74778b 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-time.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-time.inc.php
@@ -4,33 +4,33 @@ ADOdb Date Library, part of the ADOdb abstraction library
 Download: http://phplens.com/phpeverywhere/
 
 PHP native date functions use integer timestamps for computations.
-Because of this, dates are restricted to the years 1901-2038 on Unix 
-and 1970-2038 on Windows due to integer overflow for dates beyond 
-those years. This library overcomes these limitations by replacing the 
-native function's signed integers (normally 32-bits) with PHP floating 
+Because of this, dates are restricted to the years 1901-2038 on Unix
+and 1970-2038 on Windows due to integer overflow for dates beyond
+those years. This library overcomes these limitations by replacing the
+native function's signed integers (normally 32-bits) with PHP floating
 point numbers (normally 64-bits).
 
 Dates from 100 A.D. to 3000 A.D. and later
 have been tested. The minimum is 100 A.D. as <100 will invoke the
-2 => 4 digit year conversion. The maximum is billions of years in the 
-future, but this is a theoretical limit as the computation of that year 
+2 => 4 digit year conversion. The maximum is billions of years in the
+future, but this is a theoretical limit as the computation of that year
 would take too long with the current implementation of adodb_mktime().
 
 This library replaces native functions as follows:
 
-<pre>	
+<pre>
 	getdate()  with  adodb_getdate()
-	date()     with  adodb_date() 
+	date()     with  adodb_date()
 	gmdate()   with  adodb_gmdate()
 	mktime()   with  adodb_mktime()
 	gmmktime() with  adodb_gmmktime()
 	strftime() with  adodb_strftime()
 	strftime() with  adodb_gmstrftime()
 </pre>
-	
+
 The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT, 
-and date() will convert from GMT to local time, but daylight savings is 
+of date()'s field formats. Mktime() will convert from local time to GMT,
+and date() will convert from GMT to local time, but daylight savings is
 not handled currently.
 
 This library is independant of the rest of ADOdb, and can be used
@@ -39,25 +39,25 @@ as standalone code.
 PERFORMANCE
 
 For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside 
+possible, and only switches to PHP code when the dates fall outside
 the 32-bit signed integer range.
 
 GREGORIAN CORRECTION
 
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, 
-October 4, 1582 (Julian) was followed immediately by Friday, October 15, 
-1582 (Gregorian). 
+Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
+October 4, 1582 (Julian) was followed immediately by Friday, October 15,
+1582 (Gregorian).
 
 Since 0.06, we handle this correctly, so:
 
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) 
+adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582)
 	== 24 * 3600 (1 day)
 
 =============================================================================
 
 COPYRIGHT
 
-(c) 2003-2005 John Lim and released under BSD-style license except for code by 
+(c) 2003-2014 John Lim and released under BSD-style license except for code by
 jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
 and originally found at http://www.php.net/manual/en/function.mktime.php
 
@@ -80,10 +80,10 @@ Returns the current time measured in the number of seconds since the Unix Epoch
 ** FUNCTION adodb_getdate($date=false)
 
 Returns an array containing date information, as getdate(), but supports
-dates greater than 1901 to 2038. The local date/time format is derived from a 
-heuristic the first time adodb_getdate is called. 
-	 
-	 
+dates greater than 1901 to 2038. The local date/time format is derived from a
+heuristic the first time adodb_getdate is called.
+
+
 ** FUNCTION adodb_date($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted local date. If $timestamp is not defined, the
@@ -93,45 +93,45 @@ outside the 1901 to 2038 range.
 The format fields that adodb_date supports:
 
 <pre>
-	a - "am" or "pm" 
-	A - "AM" or "PM" 
-	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
-	D - day of the week, textual, 3 letters; e.g. "Fri" 
-	F - month, textual, long; e.g. "January" 
-	g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
-	G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
-	h - hour, 12-hour format; i.e. "01" to "12" 
-	H - hour, 24-hour format; i.e. "00" to "23" 
-	i - minutes; i.e. "00" to "59" 
-	j - day of the month without leading zeros; i.e. "1" to "31" 
-	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  
-	L - boolean for whether it is a leap year; i.e. "0" or "1" 
-	m - month; i.e. "01" to "12" 
-	M - month, textual, 3 letters; e.g. "Jan" 
-	n - month without leading zeros; i.e. "1" to "12" 
-	O - Difference to Greenwich time in hours; e.g. "+0200" 
-	Q - Quarter, as in 1, 2, 3, 4 
-	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 
-	s - seconds; i.e. "00" to "59" 
-	S - English ordinal suffix for the day of the month, 2 characters; 
-	   			i.e. "st", "nd", "rd" or "th" 
+	a - "am" or "pm"
+	A - "AM" or "PM"
+	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
+	D - day of the week, textual, 3 letters; e.g. "Fri"
+	F - month, textual, long; e.g. "January"
+	g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
+	G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
+	h - hour, 12-hour format; i.e. "01" to "12"
+	H - hour, 24-hour format; i.e. "00" to "23"
+	i - minutes; i.e. "00" to "59"
+	j - day of the month without leading zeros; i.e. "1" to "31"
+	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"
+	L - boolean for whether it is a leap year; i.e. "0" or "1"
+	m - month; i.e. "01" to "12"
+	M - month, textual, 3 letters; e.g. "Jan"
+	n - month without leading zeros; i.e. "1" to "12"
+	O - Difference to Greenwich time in hours; e.g. "+0200"
+	Q - Quarter, as in 1, 2, 3, 4
+	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200"
+	s - seconds; i.e. "00" to "59"
+	S - English ordinal suffix for the day of the month, 2 characters;
+	   			i.e. "st", "nd", "rd" or "th"
 	t - number of days in the given month; i.e. "28" to "31"
-	T - Timezone setting of this machine; e.g. "EST" or "MDT" 
-	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  
-	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
-	Y - year, 4 digits; e.g. "1999" 
-	y - year, 2 digits; e.g. "99" 
-	z - day of the year; i.e. "0" to "365" 
-	Z - timezone offset in seconds (i.e. "-43200" to "43200"). 
-	   			The offset for timezones west of UTC is always negative, 
-				and for those east of UTC is always positive. 
+	T - Timezone setting of this machine; e.g. "EST" or "MDT"
+	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
+	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
+	Y - year, 4 digits; e.g. "1999"
+	y - year, 2 digits; e.g. "99"
+	z - day of the year; i.e. "0" to "365"
+	Z - timezone offset in seconds (i.e. "-43200" to "43200").
+	   			The offset for timezones west of UTC is always negative,
+				and for those east of UTC is always positive.
 </pre>
 
 Unsupported:
 <pre>
-	B - Swatch Internet time 
+	B - Swatch Internet time
 	I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
-	W - ISO-8601 week number of year, weeks starting on Monday 
+	W - ISO-8601 week number of year, weeks starting on Monday
 
 </pre>
 
@@ -141,7 +141,7 @@ Same as adodb_date, but 2nd parameter accepts iso date, eg.
 
   adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
 
-  
+
 ** FUNCTION adodb_gmdate($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
@@ -166,7 +166,7 @@ Convert a timestamp to a formatted GMT date.
 
 ** FUNCTION adodb_strftime($fmt, $timestamp = false)
 
-Convert a timestamp to a formatted local date. Internally converts $fmt into 
+Convert a timestamp to a formatted local date. Internally converts $fmt into
 adodb_date format, then echo result.
 
 For best results, you can define the local date format yourself. Define a global
@@ -174,56 +174,56 @@ variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
 adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
 
     eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
-	
+
 	Supported format codes:
 
 <pre>
-	%a - abbreviated weekday name according to the current locale 
-	%A - full weekday name according to the current locale 
-	%b - abbreviated month name according to the current locale 
-	%B - full month name according to the current locale 
-	%c - preferred date and time representation for the current locale 
-	%d - day of the month as a decimal number (range 01 to 31) 
-	%D - same as %m/%d/%y 
-	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31') 
+	%a - abbreviated weekday name according to the current locale
+	%A - full weekday name according to the current locale
+	%b - abbreviated month name according to the current locale
+	%B - full month name according to the current locale
+	%c - preferred date and time representation for the current locale
+	%d - day of the month as a decimal number (range 01 to 31)
+	%D - same as %m/%d/%y
+	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31')
 	%h - same as %b
-	%H - hour as a decimal number using a 24-hour clock (range 00 to 23) 
-	%I - hour as a decimal number using a 12-hour clock (range 01 to 12) 
-	%m - month as a decimal number (range 01 to 12) 
-	%M - minute as a decimal number 
-	%n - newline character 
-	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale 
-	%r - time in a.m. and p.m. notation 
-	%R - time in 24 hour notation 
-	%S - second as a decimal number 
-	%t - tab character 
-	%T - current time, equal to %H:%M:%S 
-	%x - preferred date representation for the current locale without the time 
-	%X - preferred time representation for the current locale without the date 
-	%y - year as a decimal number without a century (range 00 to 99) 
-	%Y - year as a decimal number including the century 
-	%Z - time zone or name or abbreviation 
-	%% - a literal `%' character 
-</pre>	
+	%H - hour as a decimal number using a 24-hour clock (range 00 to 23)
+	%I - hour as a decimal number using a 12-hour clock (range 01 to 12)
+	%m - month as a decimal number (range 01 to 12)
+	%M - minute as a decimal number
+	%n - newline character
+	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale
+	%r - time in a.m. and p.m. notation
+	%R - time in 24 hour notation
+	%S - second as a decimal number
+	%t - tab character
+	%T - current time, equal to %H:%M:%S
+	%x - preferred date representation for the current locale without the time
+	%X - preferred time representation for the current locale without the date
+	%y - year as a decimal number without a century (range 00 to 99)
+	%Y - year as a decimal number including the century
+	%Z - time zone or name or abbreviation
+	%% - a literal `%' character
+</pre>
 
 	Unsupported codes:
 <pre>
-	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99) 
-	%g - like %G, but without the century. 
-	%G - The 4-digit year corresponding to the ISO week number (see %V). 
-	     This has the same format and value as %Y, except that if the ISO week number belongs 
-		 to the previous or next year, that year is used instead. 
-	%j - day of the year as a decimal number (range 001 to 366) 
-	%u - weekday as a decimal number [1,7], with 1 representing Monday 
-	%U - week number of the current year as a decimal number, starting 
-	    with the first Sunday as the first day of the first week 
-	%V - The ISO 8601:1988 week number of the current year as a decimal number, 
-	     range 01 to 53, where week 1 is the first week that has at least 4 days in the 
-		 current year, and with Monday as the first day of the week. (Use %G or %g for 
-		 the year component that corresponds to the week number for the specified timestamp.) 
-	%w - day of the week as a decimal, Sunday being 0 
-	%W - week number of the current year as a decimal number, starting with the 
-	     first Monday as the first day of the first week 
+	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99)
+	%g - like %G, but without the century.
+	%G - The 4-digit year corresponding to the ISO week number (see %V).
+	     This has the same format and value as %Y, except that if the ISO week number belongs
+		 to the previous or next year, that year is used instead.
+	%j - day of the year as a decimal number (range 001 to 366)
+	%u - weekday as a decimal number [1,7], with 1 representing Monday
+	%U - week number of the current year as a decimal number, starting
+	    with the first Sunday as the first day of the first week
+	%V - The ISO 8601:1988 week number of the current year as a decimal number,
+	     range 01 to 53, where week 1 is the first week that has at least 4 days in the
+		 current year, and with Monday as the first day of the week. (Use %G or %g for
+		 the year component that corresponds to the week number for the specified timestamp.)
+	%w - day of the week as a decimal, Sunday being 0
+	%W - week number of the current year as a decimal number, starting with the
+	     first Monday as the first day of the first week
 </pre>
 
 =============================================================================
@@ -233,10 +233,10 @@ NOTES
 Useful url for generating test timestamps:
 	http://www.4webhelp.net/us/timestamp.php
 
-Possible future optimizations include 
+Possible future optimizations include
 
-a. Using an algorithm similar to Plauger's in "The Standard C Library" 
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 
+a. Using an algorithm similar to Plauger's in "The Standard C Library"
+(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not
 work outside 32-bit signed range, so i decided not to implement it.
 
 b. Implement daylight savings, which looks awfully complicated, see
@@ -248,7 +248,7 @@ CHANGELOG
 Added adodb_time() which returns current time. If > 2038, will return as float
 
 - 7 Feb 2011 0.35
-Changed adodb_date to be symmetric with adodb_mktime. See $jan1_71. fix for bc. 
+Changed adodb_date to be symmetric with adodb_mktime. See $jan1_71. fix for bc.
 
 - 13 July 2010 0.34
 Changed adodb_get_gm_diff to use DateTimeZone().
@@ -257,24 +257,24 @@ Changed adodb_get_gm_diff to use DateTimeZone().
 * Bug in 0.32 fix for hour handling. Fixed.
 
 - 1 Feb 2008 0.32
-* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly. 
+* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly.
 
 - 10 Jan 2008 0.31
 * Now adodb_mktime(0,0,0,24,1,2037) works correctly.
 
 - 15 July 2007 0.30
-Added PHP 5.2.0 compatability fixes. 
+Added PHP 5.2.0 compatability fixes.
  * gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the
  * timezone, otherwise we use the current year as the baseline to retrieve the timezone.
- * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but 
+ * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but
    in 1970 it was +7:30, then php 5.2 return +7:30, while this library will use +8.
- * 
- 
+ *
+
 - 19 March 2006 0.24
 Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
 
 - 10 Feb 2006 0.23
-PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000. 
+PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000.
 	In PHP4, we will still use -0000 for 100% compat with PHP4.
 
 - 08 Sept 2005 0.22
@@ -288,7 +288,7 @@ Added support for negative months in adodb_mktime().
 Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
 
 - 21 Dec 2004 0.17
-In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false. 
+In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false.
 Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
 
 - 17 Nov 2004 0.16
@@ -297,7 +297,7 @@ Removed intval typecast in adodb_mktime() for secs, allowing:
 Suggested by Ryan.
 
 - 18 July 2004 0.15
-All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory. 
+All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory.
 This brings it more in line with mktime (still not identical).
 
 - 23 June 2004 0.14
@@ -315,21 +315,21 @@ function adodb_daylight_sv(&$arr, $is_gmt)
 	if ($m == 6 || $m == 7) $arr['hours'] += 1;
 }
 
-This is only called by adodb_date() and not by adodb_mktime(). 
+This is only called by adodb_date() and not by adodb_mktime().
 
 The format of $arr is
-Array ( 
-   [seconds] => 0 
-   [minutes] => 0 
-   [hours] => 0 
+Array (
+   [seconds] => 0
+   [minutes] => 0
+   [hours] => 0
    [mday] => 1      # day of month, eg 1st day of the month
    [mon] => 2       # month (eg. Feb)
-   [year] => 2102 
+   [year] => 2102
    [yday] => 31     # days in current year
    [leap] =>        # true if leap year
    [ndays] => 28    # no of days in current month
-   ) 
-   
+   )
+
 
 - 28 Apr 2004 0.13
 Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
@@ -338,11 +338,11 @@ Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
 Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
 
 - 26 Oct 2003 0.11
-Because of daylight savings problems (some systems apply daylight savings to 
+Because of daylight savings problems (some systems apply daylight savings to
 January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
 
 - 9 Aug 2003 0.10
-Fixed bug with dates after 2038. 
+Fixed bug with dates after 2038.
 See http://phplens.com/lens/lensforum/msgs.php?id=6980
 
 - 1 July 2003 0.09
@@ -372,14 +372,14 @@ Day overflow for less than one month's days is supported.
 
 - 28 Jan 2003 0.04
 
-Gregorian correction handled. In PHP5, we might throw an error if 
+Gregorian correction handled. In PHP5, we might throw an error if
 mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
 Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
 
 - 27 Jan 2003 0.03
 
 Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
-Fixed calculation of days since start of year for <1970. 
+Fixed calculation of days since start of year for <1970.
 
 - 27 Jan 2003 0.02
 
@@ -402,13 +402,13 @@ define('ADODB_DATE_VERSION',0.35);
 $ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2);
 
 /*
-	This code was originally for windows. But apparently this problem happens 
+	This code was originally for windows. But apparently this problem happens
 	also with Linux, RH 7.3 and later!
-	
+
 	glibc-2.2.5-34 and greater has been changed to return -1 for dates <
 	1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
 	echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
-	
+
 	References:
 	 http://bugs.php.net/bug.php?id=20048&edit=2
 	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
@@ -434,74 +434,74 @@ function adodb_date_test_strftime($fmt)
 {
 	$s1 = strftime($fmt);
 	$s2 = adodb_strftime($fmt);
-	
+
 	if ($s1 == $s2) return true;
-	
+
 	echo "error for $fmt,  strftime=$s1, adodb=$s2<br>";
 	return false;
 }
 
 /**
 	 Test Suite
-*/	
+*/
 function adodb_date_test()
 {
-	
+
 	for ($m=-24; $m<=24; $m++)
 		echo "$m :",adodb_date('d-m-Y',adodb_mktime(0,0,0,1+$m,20,2040)),"<br>";
-	
+
 	error_reporting(E_ALL);
 	print "<h4>Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."</h4>";
 	@set_time_limit(0);
 	$fail = false;
-	
+
 	// This flag disables calling of PHP native functions, so we can properly test the code
 	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
-	
+
 	$t = time();
-	
-	
+
+
 	$fmt = 'Y-m-d H:i:s';
 	echo '<pre>';
 	echo 'adodb: ',adodb_date($fmt,$t),'<br>';
 	echo 'php  : ',date($fmt,$t),'<br>';
 	echo '</pre>';
-	
+
 	adodb_date_test_strftime('%Y %m %x %X');
 	adodb_date_test_strftime("%A %d %B %Y");
 	adodb_date_test_strftime("%H %M S");
-	
+
 	$t = adodb_mktime(0,0,0);
 	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'<br>';
-	
+
 	$t = adodb_mktime(0,0,0,6,1,2102);
 	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
-	
+
 	$t = adodb_mktime(0,0,0,2,1,2102);
 	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
-	
-	
+
+
 	print "<p>Testing gregorian <=> julian conversion<p>";
 	$t = adodb_mktime(0,0,0,10,11,1492);
 	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
 	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing<br>';
-	
+
 	$t = adodb_mktime(0,0,0,2,29,1500);
 	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years<br>';
-	
+
 	$t = adodb_mktime(0,0,0,2,29,1700);
 	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years<br>';
-	
+
 	print  adodb_mktime(0,0,0,10,4,1582).' ';
 	print adodb_mktime(0,0,0,10,15,1582);
 	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
 	if ($diff != 3600*24) print " <b>Error in gregorian correction = ".($diff/3600/24)." days </b><br>";
-		
+
 	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : '<b>Error</b>')."<br>";
 	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : '<b>Error</b>')."<br>";
-	
+
 	print "<p>Testing overflow<p>";
-	
+
 	$t = adodb_mktime(0,0,0,3,33,1965);
 	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 <br>';
 	$t = adodb_mktime(0,0,0,4,33,1971);
@@ -514,7 +514,7 @@ function adodb_date_test()
 	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' <br>';
 	$t = adodb_mktime(0,0,0,13,3,1965);
 	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 <br>';
-	
+
 	print "Testing 2-digit => 4-digit year conversion<p>";
 	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";
 	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010<br>";
@@ -523,10 +523,10 @@ function adodb_date_test()
 	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940<br>";
 	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>";
 	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>";
-	
+
 	// Test string formating
 	print "<p>Testing date formating</p>";
-	
+
 	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
 	$s1 = date($fmt,0);
 	$s2 = adodb_date($fmt,0);
@@ -549,12 +549,12 @@ function adodb_date_test()
 					break;
 				}
 			}
-			print "<b>Error date(): $ts<br><pre> 
+			print "<b>Error date(): $ts<br><pre>
   \"$s1\" (date len=".strlen($s1).")
   \"$s2\" (adodb_date len=".strlen($s2).")</b></pre><br>";
 			$fail = true;
 		}
-		
+
 		$a1 = getdate($ts);
 		$a2 = adodb_getdate($ts);
 		$rez = array_diff($a1,$a2);
@@ -567,7 +567,7 @@ function adodb_date_test()
 			$fail = true;
 		}
 	}
-	
+
 	// Test generation of dates outside 1901-2038
 	print "<p>Testing random dates between 100 and 4000</p>";
 	adodb_date_test_date(100,1);
@@ -575,7 +575,7 @@ function adodb_date_test()
 		$y1 = 100+rand(0,1970-100);
 		$m = rand(1,12);
 		adodb_date_test_date($y1,$m);
-		
+
 		$y1 = 3000-rand(0,3000-1970);
 		adodb_date_test_date($y1,$m);
 	}
@@ -586,7 +586,7 @@ function adodb_date_test()
 	$offset = 36000+rand(10000,60000);
 	$max = 365*$yrs*86400;
 	$lastyear = 0;
-	
+
 	// we generate a timestamp, convert it to a date, and convert it back to a timestamp
 	// and check if the roundtrip broke the original timestamp value.
 	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
@@ -619,58 +619,58 @@ function adodb_time()
 }
 
 /**
-	Returns day of week, 0 = Sunday,... 6=Saturday. 
+	Returns day of week, 0 = Sunday,... 6=Saturday.
 	Algorithm from PEAR::Date_Calc
 */
 function adodb_dow($year, $month, $day)
 {
 /*
-Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and 
-proclaimed that from that time onwards 3 days would be dropped from the calendar 
+Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and
+proclaimed that from that time onwards 3 days would be dropped from the calendar
 every 400 years.
 
-Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian). 
+Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian).
 */
 	if ($year <= 1582) {
-		if ($year < 1582 || 
+		if ($year < 1582 ||
 			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
 		 else
 			$greg_correction = 0;
 	} else
 		$greg_correction = 0;
-	
+
 	if($month > 2)
 	    $month -= 2;
 	else {
 	    $month += 10;
 	    $year--;
 	}
-	
+
 	$day =  floor((13 * $month - 1) / 5) +
 	        $day + ($year % 100) +
 	        floor(($year % 100) / 4) +
 	        floor(($year / 100) / 4) - 2 *
 	        floor($year / 100) + 77 + $greg_correction;
-	
+
 	return $day - 7 * floor($day / 7);
 }
 
 
 /**
- Checks for leap year, returns true if it is. No 2-digit year check. Also 
+ Checks for leap year, returns true if it is. No 2-digit year check. Also
  handles julian calendar correctly.
 */
-function _adodb_is_leap_year($year) 
+function _adodb_is_leap_year($year)
 {
 	if ($year % 4 != 0) return false;
-	
+
 	if ($year % 400 == 0) {
 		return true;
 	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
 	} else if ($year > 1582 && $year % 100 == 0 ) {
 		return false;
-	} 
-	
+	}
+
 	return true;
 }
 
@@ -678,7 +678,7 @@ function _adodb_is_leap_year($year)
 /**
  checks for leap year, returns true if it is. Has 2-digit year check
 */
-function adodb_is_leap_year($year) 
+function adodb_is_leap_year($year)
 {
 	return  _adodb_is_leap_year(adodb_year_digit_check($year));
 }
@@ -687,13 +687,13 @@ function adodb_is_leap_year($year)
 	Fix 2-digit years. Works for any century.
  	Assumes that if 2-digit is more than 30 years in future, then previous century.
 */
-function adodb_year_digit_check($y) 
+function adodb_year_digit_check($y)
 {
 	if ($y < 100) {
-	
+
 		$yr = (integer) date("Y");
 		$century = (integer) ($yr /100);
-		
+
 		if ($yr%100 > 50) {
 			$c1 = $century + 1;
 			$c0 = $century;
@@ -710,24 +710,24 @@ function adodb_year_digit_check($y)
 	return $y;
 }
 
-function adodb_get_gmt_diff_ts($ts) 
+function adodb_get_gmt_diff_ts($ts)
 {
 	if (0 <= $ts && $ts <= 0x7FFFFFFF) { // check if number in 32-bit signed range) {
 		$arr = getdate($ts);
 		$y = $arr['year'];
 		$m = $arr['mon'];
 		$d = $arr['mday'];
-		return adodb_get_gmt_diff($y,$m,$d);	
+		return adodb_get_gmt_diff($y,$m,$d);
 	} else {
 		return adodb_get_gmt_diff(false,false,false);
 	}
-	
+
 }
 
 /**
  get local time zone offset from GMT. Does not handle historical timezones before 1970.
 */
-function adodb_get_gmt_diff($y,$m,$d) 
+function adodb_get_gmt_diff($y,$m,$d)
 {
 static $TZ,$tzo;
 global $ADODB_DATETIME_CLASS;
@@ -753,7 +753,7 @@ global $ADODB_DATETIME_CLASS;
 				$tobj = new DateTimeZone($tzonename);
 				$TZ = -timezone_offset_get($tobj,new DateTime("now",$tzo));
 			}
-		} 
+		}
 		*/
 		if (empty($TZ)) $TZ = mktime(0,0,0,12,2,$y) - gmmktime(0,0,0,12,2,$y);
 	}
@@ -782,7 +782,7 @@ function adodb_date_gentable($out=true)
 
 	for ($i=1970; $i >= 1600; $i-=10) {
 		$s = adodb_gmmktime(0,0,0,1,1,$i);
-		echo "$i => $s,<br>";	
+		echo "$i => $s,<br>";
 	}
 }
 adodb_date_gentable();
@@ -798,22 +798,22 @@ echo "<hr />$i ";
 
 $_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 $_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 function adodb_validdate($y,$m,$d)
 {
 global $_month_table_normal,$_month_table_leaf;
 
 	if (_adodb_is_leap_year($y)) $marr = $_month_table_leaf;
 	else $marr = $_month_table_normal;
-	
+
 	if ($m > 12 || $m < 1) return false;
-	
+
 	if ($d > 31 || $d < 1) return false;
-	
+
 	if ($marr[$m] < $d) return false;
-	
+
 	if ($y < 1000 && $y > 3000) return false;
-	
+
 	return true;
 }
 
@@ -831,17 +831,17 @@ global $_month_table_normal,$_month_table_leaf;
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
-	
-	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 
-	
+
+	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction
+
 	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 	$d366 = $_day_power * 366;
 	$d365 = $_day_power * 365;
-	
+
 	if ($d < 0) {
-		
+
 		if (empty($YRS)) $YRS = array(
 			1970 => 0,
 			1960 => -315619200,
@@ -883,28 +883,28 @@ global $_month_table_normal,$_month_table_leaf;
 			1600 => -11676096000);
 
 		if ($is_gmt) $origd = $d;
-		// The valid range of a 32bit signed timestamp is typically from 
+		// The valid range of a 32bit signed timestamp is typically from
 		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
 		//
-		
+
 		# old algorithm iterates through all years. new algorithm does it in
 		# 10 year blocks
-		
+
 		/*
 		# old algo
 		for ($a = 1970 ; --$a >= 0;) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
 			else $d += $d365;
-			
+
 			if ($d >= 0) {
 				$year = $a;
 				break;
 			}
 		}
 		*/
-		
+
 		$lastsecs = 0;
 		$lastyear = 1970;
 		foreach($YRS as $year => $secs) {
@@ -915,27 +915,27 @@ global $_month_table_normal,$_month_table_leaf;
 			$lastsecs = $secs;
 			$lastyear = $year;
 		}
-		
+
 		$d -= $lastsecs;
 		if (!isset($a)) $a = $lastyear;
-		
+
 		//echo ' yr=',$a,' ', $d,'.';
-		
+
 		for (; --$a >= 0;) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
 			else $d += $d365;
-			
+
 			if ($d >= 0) {
 				$year = $a;
 				break;
 			}
 		}
 		/**/
-		
+
 		$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
-		
+
 		$d = $lastd;
 		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
 		for ($a = 13 ; --$a > 0;) {
@@ -947,17 +947,17 @@ global $_month_table_normal,$_month_table_leaf;
 				break;
 			}
 		}
-		
+
 		$d = $lastd;
 		$day = $ndays + ceil(($d+1) / ($_day_power));
 
 		$d += ($ndays - $day+1)* $_day_power;
 		$hour = floor($d/$_hour_power);
-	
+
 	} else {
 		for ($a = 1970 ;; $a++) {
 			$lastd = $d;
-			
+
 			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
 			else $d -= $d365;
 			if ($d < 0) {
@@ -982,7 +982,7 @@ global $_month_table_normal,$_month_table_leaf;
 		$d = $d - ($day-1) * $_day_power;
 		$hour = floor($d /$_hour_power);
 	}
-	
+
 	$d -= $hour * $_hour_power;
 	$min = floor($d/$_min_power);
 	$secs = $d - $min * $_min_power;
@@ -999,8 +999,8 @@ global $_month_table_normal,$_month_table_leaf;
 		'ndays' => $ndays
 		);
 	}
-	
-	
+
+
 	$dow = adodb_dow($year,$month,$day);
 
 	return array(
@@ -1019,18 +1019,18 @@ global $_month_table_normal,$_month_table_leaf;
 }
 /*
 		if ($isphp5)
-				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
+				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36);
 			else
-				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36);
 			break;*/
 function adodb_tz_offset($gmt,$isphp5)
 {
 	$zhrs = abs($gmt)/3600;
 	$hrs = floor($zhrs);
-	if ($isphp5) 
-		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+	if ($isphp5)
+		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
 	else
-		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
 }
 
 
@@ -1043,17 +1043,17 @@ function adodb_gmdate($fmt,$d=false)
 function adodb_date2($fmt, $d=false, $is_gmt=false)
 {
 	if ($d !== false) {
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+		if (!preg_match(
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
 			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
 
 		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
-	
+
 		// h-m-s-MM-DD-YY
 		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1],false,$is_gmt);
 		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1],false,$is_gmt);
 	}
-	
+
 	return adodb_date($fmt,$d,$is_gmt);
 }
 
@@ -1072,34 +1072,34 @@ static $jan1_1971;
 		$daylight = function_exists('adodb_daylight_sv');
 		if (empty($jan1_1971)) $jan1_1971 = mktime(0,0,0,1,1,1971); // we only use date() when > 1970 as adodb_mktime() only uses mktime() when > 1970
 	}
-	
+
 	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
 	if (!defined('ADODB_TEST_DATES')) {
 		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-		
+
 			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= $jan1_1971) // if windows, must be +ve integer
 				return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);
 
 		}
 	}
 	$_day_power = 86400;
-	
+
 	$arr = _adodb_getdate($d,true,$is_gmt);
-	
+
 	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
-	
+
 	$year = $arr['year'];
 	$month = $arr['mon'];
 	$day = $arr['mday'];
 	$hour = $arr['hours'];
 	$min = $arr['minutes'];
 	$secs = $arr['seconds'];
-	
+
 	$max = strlen($fmt);
 	$dates = '';
-	
+
 	$isphp5 = PHP_VERSION >= 5;
-	
+
 	/*
 		at this point, we have the following integer vars to manipulate:
 		$year, $month, $day, $hour, $min, $secs
@@ -1109,7 +1109,7 @@ static $jan1_1971;
 		case 'e':
 			$dates .= date('e');
 			break;
-		case 'T': 
+		case 'T':
 			if ($ADODB_DATETIME_CLASS) {
 				$dt = new DateTime();
 				$dt->SetDate($year,$month,$day);
@@ -1120,23 +1120,23 @@ static $jan1_1971;
 		// YEAR
 		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
 		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
-		
+
 			// 4.3.11 uses '04 Jun 2004'
 			// 4.3.8 uses  ' 4 Jun 2004'
-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
+			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '
 				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
-			
-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
-			
+
+			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour;
+
 			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
-			
+
 			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
-			
+
 			$gmt = adodb_get_gmt_diff($year,$month,$day);
-			
+
 			$dates .= ' '.adodb_tz_offset($gmt,$isphp5);
 			break;
-			
+
 		case 'Y': $dates .= $year; break;
 		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
 		// MONTH
@@ -1153,47 +1153,47 @@ static $jan1_1971;
 		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
 		case 'j': $dates .= $day; break;
 		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
-		case 'S': 
+		case 'S':
 			$d10 = $day % 10;
 			if ($d10 == 1) $dates .= 'st';
 			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
 			else if ($d10 == 3) $dates .= 'rd';
 			else $dates .= 'th';
 			break;
-			
+
 		// HOUR
 		case 'Z':
 			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
-		case 'O': 
+		case 'O':
 			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
-			
+
 			$dates .= adodb_tz_offset($gmt,$isphp5);
 			break;
-			
-		case 'H': 
-			if ($hour < 10) $dates .= '0'.$hour; 
-			else $dates .= $hour; 
+
+		case 'H':
+			if ($hour < 10) $dates .= '0'.$hour;
+			else $dates .= $hour;
 			break;
-		case 'h': 
-			if ($hour > 12) $hh = $hour - 12; 
+		case 'h':
+			if ($hour > 12) $hh = $hour - 12;
 			else {
-				if ($hour == 0) $hh = '12'; 
+				if ($hour == 0) $hh = '12';
 				else $hh = $hour;
 			}
-			
+
 			if ($hh < 10) $dates .= '0'.$hh;
 			else $dates .= $hh;
 			break;
-			
-		case 'G': 
+
+		case 'G':
 			$dates .= $hour;
 			break;
-			
+
 		case 'g':
-			if ($hour > 12) $hh = $hour - 12; 
+			if ($hour > 12) $hh = $hour - 12;
 			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour; 
+				if ($hour == 0) $hh = '12';
+				else $hh = $hour;
 			}
 			$dates .= $hh;
 			break;
@@ -1215,7 +1215,7 @@ static $jan1_1971;
 		default:
 			$dates .= $fmt[$i]; break;
 		// ESCAPE
-		case "\\": 
+		case "\\":
 			$i++;
 			if ($i < $max) $dates .= $fmt[$i];
 			break;
@@ -1225,7 +1225,7 @@ static $jan1_1971;
 }
 
 /**
-	Returns a timestamp given a GMT/UTC time. 
+	Returns a timestamp given a GMT/UTC time.
 	Note that $is_dst is not implemented and is ignored.
 */
 function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
@@ -1236,33 +1236,33 @@ function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=
 /**
 	Return a timestamp given a local time. Originally by jackbbs.
 	Note that $is_dst is not implemented and is ignored.
-	
+
 	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
 */
-function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) 
+function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false)
 {
 	if (!defined('ADODB_TEST_DATES')) {
 
 		if ($mon === false) {
 			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
 		}
-		
-		// for windows, we don't check 1970 because with timezone differences, 
+
+		// for windows, we don't check 1970 because with timezone differences,
 		// 1 Jan 1970 could generate negative timestamp, which is illegal
 		$usephpfns = (1970 < $year && $year < 2038
 			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
-			); 
-			
-		
+			);
+
+
 		if ($usephpfns && ($year + $mon/12+$day/365.25+$hr/(24*365.25) >= 2038)) $usephpfns = false;
-			
+
 		if ($usephpfns) {
 				return $is_gmt ?
 					@gmmktime($hr,$min,$sec,$mon,$day,$year):
 					@mktime($hr,$min,$sec,$mon,$day,$year);
 		}
 	}
-	
+
 	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$mon,$day);
 
 	/*
@@ -1275,8 +1275,8 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 	$mon = intval($mon);
 	$day = intval($day);
 	$year = intval($year);
-	
-	
+
+
 	$year = adodb_year_digit_check($year);
 
 	if ($mon > 12) {
@@ -1288,14 +1288,14 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 		$year -= $y;
 		$mon += $y*12;
 	}
-	
+
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
-	
+
 	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
+
 	$_total_date = 0;
 	if ($year >= 1970) {
 		for ($a = 1970 ; $a <= $year; $a++) {
@@ -1307,7 +1307,7 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 				$loop_table = $_month_table_normal;
 				$_add_date = 365;
 			}
-			if ($a < $year) { 
+			if ($a < $year) {
 				$_total_date += $_add_date;
 			} else {
 				for($b=1;$b<$mon;$b++) {
@@ -1317,7 +1317,7 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 		}
 		$_total_date +=$day-1;
 		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
-	
+
 	} else {
 		for ($a = 1969 ; $a >= $year; $a--) {
 			$leaf = _adodb_is_leap_year($a);
@@ -1336,13 +1336,13 @@ function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=fa
 			}
 		}
 		$_total_date += $loop_table[$mon] - $day;
-		
+
 		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
 		$_day_time = $_day_power - $_day_time;
 		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
 		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
 		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
-	} 
+	}
 	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
 	return $ret;
 }
@@ -1364,7 +1364,7 @@ global $ADODB_DATE_LOCALE;
 
 		}
 	}
-	
+
 	if (empty($ADODB_DATE_LOCALE)) {
 	/*
 		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
@@ -1376,11 +1376,11 @@ global $ADODB_DATE_LOCALE;
 		$sep = substr($dstr,2,1);
 		$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
 		$hasAM = strrpos($tstr,'M') !== false;
-		
+
 		$ADODB_DATE_LOCALE = array();
-		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	
+		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';
 		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
-			
+
 	}
 	$inpct = false;
 	$fmtdate = '';
@@ -1393,7 +1393,7 @@ global $ADODB_DATE_LOCALE;
 			} else
 				$inpct = true;
 		} else if ($inpct) {
-		
+
 			$inpct = false;
 			switch($ch) {
 			case '0':
@@ -1409,9 +1409,9 @@ global $ADODB_DATE_LOCALE;
 			case 'E':
 			case 'O':
 				/* ignore format modifiers */
-				$inpct = true; 
+				$inpct = true;
 				break;
-				
+
 			case 'a': $fmtdate .= 'D'; break;
 			case 'A': $fmtdate .= 'l'; break;
 			case 'h':
@@ -1456,6 +1456,3 @@ global $ADODB_DATE_LOCALE;
 	$ret = adodb_date($fmtdate, $ts, $is_gmt);
 	return $ret;
 }
-
-
-?>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-xmlschema.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-xmlschema.inc.php
index 706126e..72a9f9b 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-xmlschema.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-xmlschema.inc.php
@@ -1,9 +1,9 @@
 <?php
 // Copyright (c) 2004 ars Cognita Inc., 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. 
+    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.
 *******************************************************************************/
 /**
  * xmlschema is a class that allows the user to quickly and easily
@@ -17,15 +17,15 @@
  * @package axmls
  * @tutorial getting_started.pkg
  */
- 
-function _file_get_contents($file) 
+
+function _file_get_contents($file)
 {
  	if (function_exists('file_get_contents')) return file_get_contents($file);
-	
+
 	$f = fopen($file,'r');
 	if (!$f) return '';
 	$t = '';
-	
+
 	while ($s = fread($f,100000)) $t .= $s;
 	fclose($f);
 	return $t;
@@ -104,62 +104,62 @@ if( !defined( '_ADODB_LAYER' ) ) {
 * @access private
 */
 class dbObject {
-	
+
 	/**
 	* var object Parent
 	*/
 	var $parent;
-	
+
 	/**
 	* var string current element
 	*/
 	var $currentElement;
-	
+
 	/**
 	* NOP
 	*/
 	function dbObject( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
 	* @access private
 	*/
 	function _tag_cdata( &$parser, $cdata ) {
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	*/
 	function _tag_close( &$parser, $tag ) {
-		
+
 	}
-	
+
 	function create(&$xmls) {
 		return array();
 	}
-	
+
 	/**
 	* Destroys the object
 	*/
 	function destroy() {
 		unset( $this );
 	}
-	
+
 	/**
 	* Checks whether the specified RDBMS is supported by the current
 	* database object or its ranking ancestor.
@@ -170,7 +170,7 @@ class dbObject {
 	function supportedPlatform( $platform = NULL ) {
 		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
 	}
-	
+
 	/**
 	* Returns the prefix set by the ranking ancestor of the database object.
 	*
@@ -180,7 +180,7 @@ class dbObject {
 	function prefix( $name = '' ) {
 		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
 	}
-	
+
 	/**
 	* Extracts a field ID from the specified field.
 	*
@@ -204,44 +204,44 @@ class dbObject {
 * @access private
 */
 class dbTable extends dbObject {
-	
+
 	/**
 	* @var string Table name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array Field specifier: Meta-information about each field
 	*/
 	var $fields = array();
-	
+
 	/**
 	* @var array List of table indexes.
 	*/
 	var $indexes = array();
-	
+
 	/**
 	* @var array Table options: Table-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var string Field index: Keeps track of which field is currently being processed
 	*/
 	var $current_field;
-	
+
 	/**
 	* @var boolean Mark table for destruction
 	* @access private
 	*/
 	var $drop_table;
-	
+
 	/**
 	* @var boolean Mark field for destruction (not yet implemented)
 	* @access private
 	*/
 	var $drop_field = array();
-	
+
 	/**
 	* Iniitializes a new table object.
 	*
@@ -252,16 +252,16 @@ class dbTable extends dbObject {
 		$this->parent = $parent;
 		$this->name = $this->prefix($attributes['NAME']);
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'INDEX':
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
@@ -282,7 +282,7 @@ class dbTable extends dbObject {
 				$fieldType = $attributes['TYPE'];
 				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
 				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
+
 				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
 				break;
 			case 'KEY':
@@ -293,12 +293,12 @@ class dbTable extends dbObject {
 				break;
 			case 'DEFAULT':
 				// Add a field option to the table object
-				
+
 				// Work around ADOdb datadict issue that misinterprets empty strings.
 				if( $attributes['VALUE'] == '' ) {
 					$attributes['VALUE'] = " '' ";
 				}
-				
+
 				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
 				break;
 			case 'DEFDATE':
@@ -310,7 +310,7 @@ class dbTable extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -331,10 +331,10 @@ class dbTable extends dbObject {
 				$this->addTableOpt( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -342,7 +342,7 @@ class dbTable extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'TABLE':
 				$this->parent->addSQL( $this->create( $this->parent ) );
@@ -355,7 +355,7 @@ class dbTable extends dbObject {
 
 		}
 	}
-	
+
 	/**
 	* Adds an index to a table object
 	*
@@ -367,7 +367,7 @@ class dbTable extends dbObject {
 		$this->indexes[$name] = new dbIndex( $this, $attributes );
 		return $this->indexes[$name];
 	}
-	
+
 	/**
 	* Adds data to a table object
 	*
@@ -380,11 +380,11 @@ class dbTable extends dbObject {
 		}
 		return $this->data;
 	}
-	
+
 	/**
 	* Adds a field to a table object
 	*
-	* $name is the name of the table to which the field should be added. 
+	* $name is the name of the table to which the field should be added.
 	* $type is an ADODB datadict field type. The following field types
 	* are supported as of ADODB 3.40:
 	* 	- C:  varchar
@@ -412,31 +412,31 @@ class dbTable extends dbObject {
 	*/
 	function addField( $name, $type, $size = NULL, $opts = NULL ) {
 		$field_id = $this->FieldID( $name );
-		
+
 		// Set the field index so we know where we are
 		$this->current_field = $field_id;
-		
+
 		// Set the field name (required)
 		$this->fields[$field_id]['NAME'] = $name;
-		
+
 		// Set the field type (required)
 		$this->fields[$field_id]['TYPE'] = $type;
-		
+
 		// Set the field size (optional)
 		if( isset( $size ) ) {
 			$this->fields[$field_id]['SIZE'] = $size;
 		}
-		
+
 		// Set the field options
 		if( isset( $opts ) ) {
 			$this->fields[$field_id]['OPTS'][] = $opts;
 		}
 	}
-	
+
 	/**
 	* Adds a field option to the current field specifier
 	*
-	* This method adds a field option allowed by the ADOdb datadict 
+	* This method adds a field option allowed by the ADOdb datadict
 	* and appends it to the given field.
 	*
 	* @param string $field	Field name
@@ -452,7 +452,7 @@ class dbTable extends dbObject {
 			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
 		}
 	}
-	
+
 	/**
 	* Adds an option to the table
 	*
@@ -469,7 +469,7 @@ class dbTable extends dbObject {
 		return $this->opts;
 	}
 
-	
+
 	/**
 	* Generates the SQL that will create the table in the database
 	*
@@ -478,28 +478,28 @@ class dbTable extends dbObject {
 	*/
 	function create( &$xmls ) {
 		$sql = array();
-		
+
 		// drop any existing indexes
 		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
 			foreach( $legacy_indexes as $index => $index_details ) {
 				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
 			}
 		}
-		
+
 		// remove fields to be dropped from table object
 		foreach( $this->drop_field as $field ) {
 			unset( $this->fields[$field] );
 		}
-		
+
 		// if table exists
 		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
 			// drop table
 			if( $this->drop_table ) {
 				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
+
 				return $sql;
 			}
-			
+
 			// drop any existing fields not in schema
 			foreach( $legacy_fields as $field_id => $field ) {
 				if( !isset( $this->fields[$field_id] ) ) {
@@ -511,27 +511,27 @@ class dbTable extends dbObject {
 			if( $this->drop_table ) {
 				return $sql;
 			}
-			
+
 			$legacy_fields = array();
 		}
-		
+
 		// Loop through the field specifier array, building the associative array for the field options
 		$fldarray = array();
-		
+
 		foreach( $this->fields as $field_id => $finfo ) {
 			// Set an empty size if it isn't supplied
 			if( !isset( $finfo['SIZE'] ) ) {
 				$finfo['SIZE'] = '';
 			}
-			
+
 			// Initialize the field array with the type and size
 			$fldarray[$field_id] = array(
 				'NAME' => $finfo['NAME'],
 				'TYPE' => $finfo['TYPE'],
 				'SIZE' => $finfo['SIZE']
 			);
-			
-			// Loop through the options array and add the field options. 
+
+			// Loop through the options array and add the field options.
 			if( isset( $finfo['OPTS'] ) ) {
 				foreach( $finfo['OPTS'] as $opt ) {
 					// Option has an argument.
@@ -546,7 +546,7 @@ class dbTable extends dbObject {
 				}
 			}
 		}
-		
+
 		if( empty( $legacy_fields ) ) {
 			// Create the new table
 			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
@@ -570,18 +570,18 @@ class dbTable extends dbObject {
 					return array();
 			}
 		}
-		
+
 		foreach( $this->indexes as $index ) {
 			$sql[] = $index->create( $xmls );
 		}
-		
+
 		if( isset( $this->data ) ) {
 			$sql[] = $this->data->create( $xmls );
 		}
-		
+
 		return $sql;
 	}
-	
+
 	/**
 	* Marks a field or table for destruction
 	*/
@@ -612,28 +612,28 @@ class dbTable extends dbObject {
 * @access private
 */
 class dbIndex extends dbObject {
-	
+
 	/**
 	* @var string	Index name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array	Index options: Index-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var array	Indexed fields: Table columns included in this index
 	*/
 	var $columns = array();
-	
+
 	/**
 	* @var boolean Mark index for destruction
 	* @access private
 	*/
 	var $drop = FALSE;
-	
+
 	/**
 	* Initializes the new dbIndex object.
 	*
@@ -644,21 +644,21 @@ class dbIndex extends dbObject {
 	*/
 	function dbIndex( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
-		
+
 		$this->name = $this->prefix ($attributes['NAME']);
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	* Processes XML opening tags.
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'DROP':
 				$this->drop();
@@ -675,7 +675,7 @@ class dbIndex extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -690,10 +690,10 @@ class dbIndex extends dbObject {
 				$this->addField( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -701,14 +701,14 @@ class dbIndex extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'INDEX':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the index
 	*
@@ -717,11 +717,11 @@ class dbIndex extends dbObject {
 	*/
 	function addField( $name ) {
 		$this->columns[$this->FieldID( $name )] = $name;
-		
+
 		// Return the field list
 		return $this->columns;
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -730,11 +730,11 @@ class dbIndex extends dbObject {
 	*/
 	function addIndexOpt( $opt ) {
 		$this->opts[] = $opt;
-		
+
 		// Return the options list
 		return $this->opts;
 	}
-	
+
 	/**
 	* Generates the SQL that will create the index in the database
 	*
@@ -745,17 +745,17 @@ class dbIndex extends dbObject {
 		if( $this->drop ) {
 			return NULL;
 		}
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->columns as $id => $col ) {
 			if( !isset( $this->parent->fields[$id] ) ) {
 				unset( $this->columns[$id] );
 			}
 		}
-		
+
 		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
 	}
-	
+
 	/**
 	* Marks an index for destruction
 	*/
@@ -773,11 +773,11 @@ class dbIndex extends dbObject {
 * @access private
 */
 class dbData extends dbObject {
-	
+
 	var $data = array();
-	
+
 	var $row;
-	
+
 	/**
 	* Initializes the new dbIndex object.
 	*
@@ -789,18 +789,18 @@ class dbData extends dbObject {
 	function dbData( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	* Processes XML opening tags.
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'ROW':
 				$this->row = count( $this->data );
@@ -812,7 +812,7 @@ class dbData extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -827,10 +827,10 @@ class dbData extends dbObject {
 				$this->addData( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -838,14 +838,14 @@ class dbData extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'DATA':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the index
 	*
@@ -858,11 +858,11 @@ class dbData extends dbObject {
 		} else {
 			$name = count($this->data[$this->row]);
 		}
-		
+
 		// Set the field index so we know where we are
 		$this->current_field = $this->FieldID( $name );
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -873,14 +873,14 @@ class dbData extends dbObject {
 		if( !isset( $this->data[$this->row] ) ) {
 			$this->data[$this->row] = array();
 		}
-		
+
 		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
 			$this->data[$this->row][$this->current_field] = '';
 		}
-		
+
 		$this->data[$this->row][$this->current_field] .= $cdata;
 	}
-	
+
 	/**
 	* Generates the SQL that will create the index in the database
 	*
@@ -891,12 +891,12 @@ class dbData extends dbObject {
 		$table = $xmls->dict->TableName($this->parent->name);
 		$table_field_count = count($this->parent->fields);
 		$sql = array();
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->data as $row ) {
 			$table_fields = $this->parent->fields;
 			$fields = array();
-			
+
 			foreach( $row as $field_id => $field_data ) {
 				if( !array_key_exists( $field_id, $table_fields ) ) {
 					if( is_numeric( $field_id ) ) {
@@ -905,9 +905,9 @@ class dbData extends dbObject {
 						continue;
 					}
 				}
-				
+
 				$name = $table_fields[$field_id]['NAME'];
-				
+
 				switch( $table_fields[$field_id]['TYPE'] ) {
 					case 'C':
 					case 'C2':
@@ -925,15 +925,15 @@ class dbData extends dbObject {
 					default:
 						$fields[$name] = $field_data;
 				}
-				
+
 				unset($table_fields[$field_id]);
 			}
-			
+
 			// check that at least 1 column is specified
 			if( empty( $fields ) ) {
 				continue;
 			}
-			
+
 			// check that no required columns are missing
 			if( count( $fields ) < $table_field_count ) {
 				foreach( $table_fields as $field ) {
@@ -943,10 +943,10 @@ class dbData extends dbObject {
 						}
 				}
 			}
-			
+
 			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
 		}
-		
+
 		return $sql;
 	}
 }
@@ -958,27 +958,27 @@ class dbData extends dbObject {
 * @access private
 */
 class dbQuerySet extends dbObject {
-	
+
 	/**
 	* @var array	List of SQL queries
 	*/
 	var $queries = array();
-	
+
 	/**
 	* @var string	String used to build of a query line by line
 	*/
 	var $query;
-	
+
 	/**
 	* @var string	Query prefix key
 	*/
 	var $prefixKey = '';
-	
+
 	/**
 	* @var boolean	Auto prefix enable (TRUE)
 	*/
 	var $prefixMethod = 'AUTO';
-	
+
 	/**
 	* Initializes the query set.
 	*
@@ -987,14 +987,14 @@ class dbQuerySet extends dbObject {
 	*/
 	function dbQuerySet( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
-			
+
 		// Overrides the manual prefix key
 		if( isset( $attributes['KEY'] ) ) {
 			$this->prefixKey = $attributes['KEY'];
 		}
-		
+
 		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
+
 		// Enables or disables automatic prefix prepending
 		switch( $prefixMethod ) {
 			case 'AUTO':
@@ -1008,20 +1008,20 @@ class dbQuerySet extends dbObject {
 				break;
 		}
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: QUERY.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'QUERY':
 				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
+				// Ignore this query set if a platform is specified and it's different than the
 				// current connection platform.
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
 					$this->newQuery();
@@ -1033,7 +1033,7 @@ class dbQuerySet extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*/
@@ -1044,10 +1044,10 @@ class dbQuerySet extends dbObject {
 				$this->buildQuery( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -1055,7 +1055,7 @@ class dbQuerySet extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'QUERY':
 				// Add the finished query to the open query set.
@@ -1067,10 +1067,10 @@ class dbQuerySet extends dbObject {
 				$this->destroy();
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* Re-initializes the query.
 	*
@@ -1078,10 +1078,10 @@ class dbQuerySet extends dbObject {
 	*/
 	function newQuery() {
 		$this->query = '';
-		
+
 		return TRUE;
 	}
-	
+
 	/**
 	* Discards the existing query.
 	*
@@ -1089,11 +1089,11 @@ class dbQuerySet extends dbObject {
 	*/
 	function discardQuery() {
 		unset( $this->query );
-		
+
 		return TRUE;
 	}
-	
-	/** 
+
+	/**
 	* Appends a line to a query that is being built line by line
 	*
 	* @param string $data Line of SQL data or NULL to initialize a new query
@@ -1103,12 +1103,12 @@ class dbQuerySet extends dbObject {
 		if( !isset( $this->query ) OR empty( $sql ) ) {
 			return FALSE;
 		}
-		
+
 		$this->query .= $sql;
-		
+
 		return $this->query;
 	}
-	
+
 	/**
 	* Adds a completed query to the query list
 	*
@@ -1118,14 +1118,14 @@ class dbQuerySet extends dbObject {
 		if( !isset( $this->query ) ) {
 			return FALSE;
 		}
-		
+
 		$this->queries[] = $return = trim($this->query);
-		
+
 		unset( $this->query );
-		
+
 		return $return;
 	}
-	
+
 	/**
 	* Creates and returns the current query set
 	*
@@ -1137,16 +1137,16 @@ class dbQuerySet extends dbObject {
 			switch( $this->prefixMethod ) {
 				case 'AUTO':
 					// Enable auto prefix replacement
-					
+
 					// Process object prefix.
 					// Evaluate SQL statements to prepend prefix to objects
 					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
 					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
 					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					
+
 					// SELECT statements aren't working yet
 					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-					
+
 				case 'MANUAL':
 					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
 					// If prefixKey is not set, we use the default constant XMLS_PREFIX
@@ -1158,14 +1158,14 @@ class dbQuerySet extends dbObject {
 						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
 					}
 			}
-			
+
 			$this->queries[$id] = trim( $query );
 		}
-		
+
 		// Return the query set array
 		return $this->queries;
 	}
-	
+
 	/**
 	* Rebuilds the query with the prefix attached to any objects
 	*
@@ -1178,33 +1178,33 @@ class dbQuerySet extends dbObject {
 		if( !isset( $prefix ) ) {
 			return $query;
 		}
-		
+
 		if( preg_match( $regex, $query, $match ) ) {
 			$preamble = $match[1];
 			$postamble = $match[5];
 			$objectList = explode( ',', $match[3] );
 			// $prefix = $prefix . '_';
-			
+
 			$prefixedList = '';
-			
+
 			foreach( $objectList as $object ) {
 				if( $prefixedList !== '' ) {
 					$prefixedList .= ', ';
 				}
-				
+
 				$prefixedList .= $prefix . trim( $object );
 			}
-			
+
 			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
 		}
-		
+
 		return $query;
 	}
 }
 
 /**
 * Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
+*
 * This class is used to load and parse the XML file, to create an array of SQL statements
 * that can be used to build a database, and to build the database using the SQL array.
 *
@@ -1216,82 +1216,82 @@ class dbQuerySet extends dbObject {
 * @package axmls
 */
 class adoSchema {
-	
+
 	/**
 	* @var array	Array containing SQL queries to generate all objects
 	* @access private
 	*/
 	var $sqlArray;
-	
+
 	/**
 	* @var object	ADOdb connection object
 	* @access private
 	*/
 	var $db;
-	
+
 	/**
 	* @var object	ADOdb Data Dictionary
 	* @access private
 	*/
 	var $dict;
-	
+
 	/**
 	* @var string Current XML element
 	* @access private
 	*/
 	var $currentElement = '';
-	
+
 	/**
 	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
 	* @access private
 	*/
 	var $upgrade = '';
-	
+
 	/**
 	* @var string Optional object prefix
 	* @access private
 	*/
 	var $objectPrefix = '';
-	
+
 	/**
 	* @var long	Original Magic Quotes Runtime value
 	* @access private
 	*/
 	var $mgq;
-	
+
 	/**
 	* @var long	System debug
 	* @access private
 	*/
 	var $debug;
-	
+
 	/**
 	* @var string Regular expression to find schema version
 	* @access private
 	*/
 	var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
-	
+
 	/**
 	* @var string Current schema version
 	* @access private
 	*/
 	var $schemaVersion;
-	
+
 	/**
 	* @var int	Success of last Schema execution
 	*/
 	var $success;
-	
+
 	/**
 	* @var bool	Execute SQL inline as it is generated
 	*/
 	var $executeInline;
-	
+
 	/**
 	* @var bool	Continue SQL execution if errors occur
 	*/
 	var $continueOnError;
-	
+
 	/**
 	* Creates an adoSchema object
 	*
@@ -1306,7 +1306,7 @@ class adoSchema {
 		$this->mgq = get_magic_quotes_runtime();
 		ini_set("magic_quotes_runtime", 0);
 		#set_magic_quotes_runtime(0);
-		
+
 		$this->db = $db;
 		$this->debug = $this->db->debug;
 		$this->dict = NewDataDictionary( $this->db );
@@ -1316,7 +1316,7 @@ class adoSchema {
 		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
 		$this->setUpgradeMethod();
 	}
-	
+
 	/**
 	* Sets the method to be used for upgrading an existing database
 	*
@@ -1337,9 +1337,9 @@ class adoSchema {
 		if( !is_string( $method ) ) {
 			return FALSE;
 		}
-		
+
 		$method = strtoupper( $method );
-		
+
 		// Handle the upgrade methods
 		switch( $method ) {
 			case 'ALTER':
@@ -1358,10 +1358,10 @@ class adoSchema {
 				// Use default if no legitimate method is passed.
 				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
 		}
-		
+
 		return $this->upgrade;
 	}
-	
+
 	/**
 	* Enables/disables inline SQL execution.
 	*
@@ -1379,10 +1379,10 @@ class adoSchema {
 		if( is_bool( $mode ) ) {
 			$this->executeInline = $mode;
 		}
-		
+
 		return $this->executeInline;
 	}
-	
+
 	/**
 	* Enables/disables SQL continue on error.
 	*
@@ -1400,15 +1400,15 @@ class adoSchema {
 		if( is_bool( $mode ) ) {
 			$this->continueOnError = $mode;
 		}
-		
+
 		return $this->continueOnError;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
 	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to create the database described. 
+	* the filesystem and generate the SQL necessary to create the database described.
 	* @see ParseSchemaString()
 	*
 	* @param string $file Name of XML schema file.
@@ -1418,11 +1418,11 @@ class adoSchema {
 	function ParseSchema( $filename, $returnSchema = FALSE ) {
 		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
-	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
+	* Call this method to load the specified schema from a file (see the DTD for the proper format)
 	* and generate the SQL necessary to create the database described by the schema.
 	*
 	* @param string $file Name of XML schema file.
@@ -1438,12 +1438,12 @@ class adoSchema {
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
 			return FALSE;
 		}
-		
+
 		if ( $returnSchema )
 		{
 			$xmlstring = '';
@@ -1452,11 +1452,11 @@ class adoSchema {
 			}
 			return $xmlstring;
 		}
-		
+
 		$this->success = 2;
-		
+
 		$xmlParser = $this->create_parser();
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
@@ -1467,17 +1467,17 @@ class adoSchema {
 				) );
 			}
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Converts an XML schema string to SQL.
 	*
 	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
+	* and generate the SQL necessary to create the database described by the schema.
 	* @see ParseSchema()
 	*
 	* @param string $xmlstring XML schema string.
@@ -1488,21 +1488,21 @@ class adoSchema {
 		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
 			return FALSE;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
 			return FALSE;
 		}
-		
+
 		if ( $returnSchema )
 		{
 			return $xmlstring;
 		}
-		
+
 		$this->success = 2;
-		
+
 		$xmlParser = $this->create_parser();
-		
+
 		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
 			die( sprintf(
 				"XML error: %s at line %d",
@@ -1510,12 +1510,12 @@ class adoSchema {
 				xml_get_current_line_number( $xmlParser)
 			) );
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to uninstallation SQL.
 	*
@@ -1530,12 +1530,12 @@ class adoSchema {
 	function RemoveSchema( $filename, $returnSchema = FALSE ) {
 		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
-	
+
 	/**
 	* Converts an XML schema string to uninstallation SQL.
 	*
 	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
+	* and generate the SQL necessary to uninstall the database described by the schema.
 	* @see RemoveSchema()
 	*
 	* @param string $schema XML schema string.
@@ -1543,20 +1543,20 @@ class adoSchema {
 	* @return array Array of SQL queries, ready to execute.
 	*/
 	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
 			return FALSE;
 		}
-		
+
 		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
 	}
-	
+
 	/**
 	* Applies the current XML schema to the database (post execution).
 	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	* Call this method to apply the current schema (generally created by calling
+	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes,
 	* and executing other SQL specified in the schema) after parsing.
 	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
 	*
@@ -1569,25 +1569,25 @@ class adoSchema {
 		if( !is_bool( $continueOnErr ) ) {
 			$continueOnErr = $this->ContinueOnError();
 		}
-		
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			$this->success = 0;
 		} else {
 			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
 		}
-		
+
 		return $this->success;
 	}
-	
+
 	/**
-	* Returns the current SQL array. 
+	* Returns the current SQL array.
 	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
+	* Call this method to fetch the array of SQL queries resulting from
+	* ParseSchema() or ParseSchemaString().
 	*
 	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
 	* @return array Array of SQL statements or FALSE if an error occurs
@@ -1596,7 +1596,7 @@ class adoSchema {
 		$sqlArray = null;
 		return $this->getSQL( $format, $sqlArray );
 	}
-	
+
 	/**
 	* Saves the current SQL array to the local filesystem as a list of SQL queries.
 	*
@@ -1604,25 +1604,25 @@ class adoSchema {
 	* parsed XML schema) to the filesystem.
 	*
 	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
+	* @return boolean TRUE if save is successful, else FALSE.
 	*/
 	function SaveSQL( $filename = './schema.sql' ) {
-		
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
 		if( !isset( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		$fp = fopen( $filename, "w" );
-		
+
 		foreach( $sqlArray as $key => $query ) {
 			fwrite( $fp, $query . ";\n" );
 		}
 		fclose( $fp );
 	}
-	
+
 	/**
 	* Create an xml parser
 	*
@@ -1634,14 +1634,14 @@ class adoSchema {
 		// Create the parser
 		$xmlParser = xml_parser_create();
 		xml_set_object( $xmlParser, $this );
-		
+
 		// Initialize the XML callback functions
 		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
 		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
+
 		return $xmlParser;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
@@ -1662,9 +1662,9 @@ class adoSchema {
 			default:
 				// print_r( array( $tag, $attributes ) );
 		}
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -1672,7 +1672,7 @@ class adoSchema {
 	*/
 	function _tag_cdata( &$parser, $cdata ) {
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -1680,16 +1680,16 @@ class adoSchema {
 	* @internal
 	*/
 	function _tag_close( &$parser, $tag ) {
-		
+
 	}
-	
+
 	/**
 	* Converts an XML schema string to the specified DTD version.
 	*
 	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
 	* @see ConvertSchemaFile()
@@ -1700,44 +1700,44 @@ class adoSchema {
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
 	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
 			return FALSE;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = $schema;
 		} else {
 			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
 		}
-		
+
 		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
-		
+
 		return $result;
 	}
-	
+
 	// compat for pre-4.3 - jlim
 	function _file_get_contents($path)
 	{
 		if (function_exists('file_get_contents')) return file_get_contents($path);
 		return join('',file($path));
 	}
-	
+
 	/**
 	* Converts an XML schema file to the specified DTD version.
 	*
 	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
 	* @see ConvertSchemaString()
@@ -1748,19 +1748,19 @@ class adoSchema {
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
 	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
 			return FALSE;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = _file_get_contents( $filename );
-			
+
 			// remove unicode BOM if present
 			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
 				$result = substr( $result, 3 );
@@ -1768,36 +1768,36 @@ class adoSchema {
 		} else {
 			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
 		}
-		
+
 		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
-		
+
 		return $result;
 	}
-	
+
 	function TransformSchema( $schema, $xsl, $schematype='string' )
 	{
 		// Fail if XSLT extension is not available
 		if( ! function_exists( 'xslt_create' ) ) {
 			return FALSE;
 		}
-		
+
 		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-		
+
 		// look for xsl
 		if( !is_readable( $xsl_file ) ) {
 			return FALSE;
 		}
-		
+
 		switch( $schematype )
 		{
 			case 'file':
 				if( !is_readable( $schema ) ) {
 					return FALSE;
 				}
-				
+
 				$schema = _file_get_contents( $schema );
 				break;
 			case 'string':
@@ -1806,26 +1806,26 @@ class adoSchema {
 					return FALSE;
 				}
 		}
-		
+
 		$arguments = array (
 			'/_xml' => $schema,
 			'/_xsl' => _file_get_contents( $xsl_file )
 		);
-		
+
 		// create an XSLT processor
 		$xh = xslt_create ();
-		
+
 		// set error handler
 		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-		
+
 		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
-		
+		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments);
+
 		xslt_free ($xh);
-		
+
 		return $result;
 	}
-	
+
 	/**
 	* Processes XSLT transformation errors
 	*
@@ -1845,7 +1845,7 @@ class adoSchema {
 				'Error Number' => $errno,
 				'Level' => $level
 			);
-			
+
 			switch( $fields['URI'] ) {
 				case 'arg:/_xml':
 					$msg['Input'] = 'XML';
@@ -1856,7 +1856,7 @@ class adoSchema {
 				default:
 					$msg['Input'] = $fields['URI'];
 			}
-			
+
 			$msg['Line'] = $fields['line'];
 		} else {
 			$msg = array(
@@ -1866,19 +1866,19 @@ class adoSchema {
 				'Fields' => var_export( $fields, TRUE )
 			);
 		}
-		
+
 		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
 					   . '<table>' . "\n";
-		
+
 		foreach( $msg as $label => $details ) {
 			$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
 		}
-		
+
 		$error_details .= '</table>';
-		
+
 		trigger_error( $error_details, E_USER_ERROR );
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the requested XML schema file.
 	*
@@ -1894,17 +1894,17 @@ class adoSchema {
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( preg_match( $this->versionRegex, $data, $matches ) ) {
 				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 			}
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the provided XML schema string.
 	*
@@ -1918,125 +1918,125 @@ class adoSchema {
 		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
 			return FALSE;
 		}
-		
+
 		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
 			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Extracts an XML schema from an existing database.
 	*
 	* Call this method to create an XML schema string from an existing database.
 	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
+	* in the schema.
 	*
 	* @param boolean $data Include data in schema dump
 	* @return string Generated XML schema
 	*/
 	function ExtractSchema( $data = FALSE ) {
 		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
+
 		$schema = '<?xml version="1.0"?>' . "\n"
 				. '<schema version="' . $this->schemaVersion . '">' . "\n";
-		
+
 		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
 			foreach( $tables as $table ) {
 				$schema .= '	<table name="' . $table . '">' . "\n";
-				
+
 				// grab details from database
 				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
 				$fields = $this->db->MetaColumns( $table );
 				$indexes = $this->db->MetaIndexes( $table );
-				
+
 				if( is_array( $fields ) ) {
 					foreach( $fields as $details ) {
 						$extra = '';
 						$content = array();
-						
+
 						if( $details->max_length > 0 ) {
 							$extra .= ' size="' . $details->max_length . '"';
 						}
-						
+
 						if( $details->primary_key ) {
 							$content[] = '<KEY/>';
 						} elseif( $details->not_null ) {
 							$content[] = '<NOTNULL/>';
 						}
-						
+
 						if( $details->has_default ) {
 							$content[] = '<DEFAULT value="' . $details->default_value . '"/>';
 						}
-						
+
 						if( $details->auto_increment ) {
 							$content[] = '<AUTOINCREMENT/>';
 						}
-						
+
 						// this stops the creation of 'R' columns,
 						// AUTOINCREMENT is used to create auto columns
 						$details->primary_key = 0;
 						$type = $rs->MetaType( $details );
-						
+
 						$schema .= '		<field name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
-						
+
 						if( !empty( $content ) ) {
 							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
 						}
-						
+
 						$schema .= '</field>' . "\n";
 					}
 				}
-				
+
 				if( is_array( $indexes ) ) {
 					foreach( $indexes as $index => $details ) {
 						$schema .= '		<index name="' . $index . '">' . "\n";
-						
+
 						if( $details['unique'] ) {
 							$schema .= '			<UNIQUE/>' . "\n";
 						}
-						
+
 						foreach( $details['columns'] as $column ) {
 							$schema .= '			<col>' . $column . '</col>' . "\n";
 						}
-						
+
 						$schema .= '		</index>' . "\n";
 					}
 				}
-				
+
 				if( $data ) {
 					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
+
 					if( is_object( $rs ) ) {
 						$schema .= '		<data>' . "\n";
-						
+
 						while( $row = $rs->FetchRow() ) {
 							foreach( $row as $key => $val ) {
 								$row[$key] = htmlentities($val);
 							}
-							
+
 							$schema .= '			<row><f>' . implode( '</f><f>', $row ) . '</f></row>' . "\n";
 						}
-						
+
 						$schema .= '		</data>' . "\n";
 					}
 				}
-				
+
 				$schema .= '	</table>' . "\n";
 			}
 		}
-		
+
 		$this->db->SetFetchMode( $old_mode );
-		
+
 		$schema .= '</schema>';
 		return $schema;
 	}
-	
+
 	/**
 	* Sets a prefix for database objects
 	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* Call this method to set a standard prefix that will be prepended to all database tables
 	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
 	*
 	* @param string $prefix Prefix that will be prepended.
@@ -2057,17 +2057,17 @@ class adoSchema {
 				logMsg( 'Invalid prefix: ' . $prefix );
 				return FALSE;
 		}
-		
+
 		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
 			$prefix .= '_';
 		}
-		
+
 		// prefix valid
 		logMsg( 'Set prefix: ' . $prefix );
 		$this->objectPrefix = $prefix;
 		return TRUE;
 	}
-	
+
 	/**
 	* Returns an object name with the current prefix prepended.
 	*
@@ -2083,11 +2083,11 @@ class adoSchema {
 			// prepend after quote if used
 			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
 		}
-		
+
 		// No prefix set. Use name provided.
 		return $name;
 	}
-	
+
 	/**
 	* Checks if element references a specific platform
 	*
@@ -2098,7 +2098,7 @@ class adoSchema {
 	*/
 	function supportedPlatform( $platform = NULL ) {
 		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
-		
+
 		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
 			logMsg( "Platform $platform is supported" );
 			return TRUE;
@@ -2107,7 +2107,7 @@ class adoSchema {
 			return FALSE;
 		}
 	}
-	
+
 	/**
 	* Clears the array of generated SQL.
 	*
@@ -2116,7 +2116,7 @@ class adoSchema {
 	function clearSQL() {
 		$this->sqlArray = array();
 	}
-	
+
 	/**
 	* Adds SQL into the SQL array.
 	*
@@ -2124,58 +2124,58 @@ class adoSchema {
 	* @return boolean TRUE if successful, else FALSE.
 	*
 	* @access private
-	*/	
+	*/
 	function addSQL( $sql = NULL ) {
 		if( is_array( $sql ) ) {
 			foreach( $sql as $line ) {
 				$this->addSQL( $line );
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		if( is_string( $sql ) ) {
 			$this->sqlArray[] = $sql;
-			
+
 			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
 			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
 				$saved = $this->db->debug;
 				$this->db->debug = $this->debug;
 				$ok = $this->db->Execute( $sql );
 				$this->db->debug = $saved;
-				
+
 				if( !$ok ) {
 					if( $this->debug ) {
 						ADOConnection::outp( $this->db->ErrorMsg() );
 					}
-					
+
 					$this->success = 1;
 				}
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Gets the SQL array in the specified format.
 	*
 	* @param string $format Format
 	* @return mixed SQL
-	*	
+	*
 	* @access private
 	*/
 	function getSQL( $format = NULL, $sqlArray = NULL ) {
 		if( !is_array( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		switch( strtolower( $format ) ) {
 			case 'string':
 			case 'text':
@@ -2183,10 +2183,10 @@ class adoSchema {
 			case'html':
 				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
 		}
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Destroys an adoSchema object.
 	*
@@ -2208,18 +2208,17 @@ class adoSchema {
 function logMsg( $msg, $title = NULL, $force = FALSE ) {
 	if( XMLS_DEBUG or $force ) {
 		echo '<pre>';
-		
+
 		if( isset( $title ) ) {
 			echo '<h3>' . htmlentities( $title ) . '</h3>';
 		}
-		
+
 		if( is_object( $this ) ) {
 			echo '[' . get_class( $this ) . '] ';
 		}
-		
+
 		print_r( $msg );
-		
+
 		echo '</pre>';
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-xmlschema03.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
index 6e9ff35..3ed5aec 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb-xmlschema03.inc.php
@@ -1,9 +1,9 @@
 <?php
 // Copyright (c) 2004-2005 ars Cognita Inc., 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. 
+    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.
 *******************************************************************************/
 /**
  * xmlschema is a class that allows the user to quickly and easily
@@ -17,15 +17,15 @@
  * @package axmls
  * @tutorial getting_started.pkg
  */
- 
-function _file_get_contents($file) 
+
+function _file_get_contents($file)
 {
  	if (function_exists('file_get_contents')) return file_get_contents($file);
-	
+
 	$f = fopen($file,'r');
 	if (!$f) return '';
 	$t = '';
-	
+
 	while ($s = fread($f,100000)) $t .= $s;
 	fclose($f);
 	return $t;
@@ -122,62 +122,62 @@ if( !defined( '_ADODB_LAYER' ) ) {
 * @access private
 */
 class dbObject {
-	
+
 	/**
 	* var object Parent
 	*/
 	var $parent;
-	
+
 	/**
 	* var string current element
 	*/
 	var $currentElement;
-	
+
 	/**
 	* NOP
 	*/
 	function dbObject( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
 	* @access private
 	*/
 	function _tag_cdata( &$parser, $cdata ) {
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
 	* @access private
 	*/
 	function _tag_close( &$parser, $tag ) {
-		
+
 	}
-	
+
 	function create(&$xmls) {
 		return array();
 	}
-	
+
 	/**
 	* Destroys the object
 	*/
 	function destroy() {
 		unset( $this );
 	}
-	
+
 	/**
 	* Checks whether the specified RDBMS is supported by the current
 	* database object or its ranking ancestor.
@@ -188,7 +188,7 @@ class dbObject {
 	function supportedPlatform( $platform = NULL ) {
 		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
 	}
-	
+
 	/**
 	* Returns the prefix set by the ranking ancestor of the database object.
 	*
@@ -198,7 +198,7 @@ class dbObject {
 	function prefix( $name = '' ) {
 		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
 	}
-	
+
 	/**
 	* Extracts a field ID from the specified field.
 	*
@@ -222,51 +222,51 @@ class dbObject {
 * @access private
 */
 class dbTable extends dbObject {
-	
+
 	/**
 	* @var string Table name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array Field specifier: Meta-information about each field
 	*/
 	var $fields = array();
-	
+
 	/**
 	* @var array List of table indexes.
 	*/
 	var $indexes = array();
-	
+
 	/**
 	* @var array Table options: Table-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var string Field index: Keeps track of which field is currently being processed
 	*/
 	var $current_field;
-	
+
 	/**
 	* @var boolean Mark table for destruction
 	* @access private
 	*/
 	var $drop_table;
-	
+
 	/**
 	* @var boolean Mark field for destruction (not yet implemented)
 	* @access private
 	*/
 	var $drop_field = array();
-	
+
 	/**
 	* @var array Platform-specific options
 	* @access private
 	*/
 	var $currentPlatform = true;
-	
-	
+
+
 	/**
 	* Iniitializes a new table object.
 	*
@@ -277,16 +277,16 @@ class dbTable extends dbObject {
 		$this->parent = $parent;
 		$this->name = $this->prefix($attributes['NAME']);
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'INDEX':
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
@@ -307,7 +307,7 @@ class dbTable extends dbObject {
 				$fieldType = $attributes['TYPE'];
 				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
 				$fieldOpts = !empty( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
+
 				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
 				break;
 			case 'KEY':
@@ -321,12 +321,12 @@ class dbTable extends dbObject {
 				break;
 			case 'DEFAULT':
 				// Add a field option to the table object
-				
+
 				// Work around ADOdb datadict issue that misinterprets empty strings.
 				if( $attributes['VALUE'] == '' ) {
 					$attributes['VALUE'] = " '' ";
 				}
-				
+
 				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
 				break;
 			case 'OPT':
@@ -338,7 +338,7 @@ class dbTable extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -363,10 +363,10 @@ class dbTable extends dbObject {
 				}
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -374,7 +374,7 @@ class dbTable extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'TABLE':
 				$this->parent->addSQL( $this->create( $this->parent ) );
@@ -392,7 +392,7 @@ class dbTable extends dbObject {
 
 		}
 	}
-	
+
 	/**
 	* Adds an index to a table object
 	*
@@ -404,7 +404,7 @@ class dbTable extends dbObject {
 		$this->indexes[$name] = new dbIndex( $this, $attributes );
 		return $this->indexes[$name];
 	}
-	
+
 	/**
 	* Adds data to a table object
 	*
@@ -417,11 +417,11 @@ class dbTable extends dbObject {
 		}
 		return $this->data;
 	}
-	
+
 	/**
 	* Adds a field to a table object
 	*
-	* $name is the name of the table to which the field should be added. 
+	* $name is the name of the table to which the field should be added.
 	* $type is an ADODB datadict field type. The following field types
 	* are supported as of ADODB 3.40:
 	* 	- C:  varchar
@@ -449,21 +449,21 @@ class dbTable extends dbObject {
 	*/
 	function addField( $name, $type, $size = NULL, $opts = NULL ) {
 		$field_id = $this->FieldID( $name );
-		
+
 		// Set the field index so we know where we are
 		$this->current_field = $field_id;
-		
+
 		// Set the field name (required)
 		$this->fields[$field_id]['NAME'] = $name;
-		
+
 		// Set the field type (required)
 		$this->fields[$field_id]['TYPE'] = $type;
-		
+
 		// Set the field size (optional)
 		if( isset( $size ) ) {
 			$this->fields[$field_id]['SIZE'] = $size;
 		}
-		
+
 		// Set the field options
 		if( isset( $opts ) ) {
 			$this->fields[$field_id]['OPTS'] = array($opts);
@@ -471,11 +471,11 @@ class dbTable extends dbObject {
 			$this->fields[$field_id]['OPTS'] = array();
 		}
 	}
-	
+
 	/**
 	* Adds a field option to the current field specifier
 	*
-	* This method adds a field option allowed by the ADOdb datadict 
+	* This method adds a field option allowed by the ADOdb datadict
 	* and appends it to the given field.
 	*
 	* @param string $field	Field name
@@ -493,7 +493,7 @@ class dbTable extends dbObject {
 		}
 	}
 	}
-	
+
 	/**
 	* Adds an option to the table
 	*
@@ -510,7 +510,7 @@ class dbTable extends dbObject {
 		return $this->opts;
 	}
 
-	
+
 	/**
 	* Generates the SQL that will create the table in the database
 	*
@@ -519,28 +519,28 @@ class dbTable extends dbObject {
 	*/
 	function create( &$xmls ) {
 		$sql = array();
-		
+
 		// drop any existing indexes
 		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
 			foreach( $legacy_indexes as $index => $index_details ) {
 				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
 			}
 		}
-		
+
 		// remove fields to be dropped from table object
 		foreach( $this->drop_field as $field ) {
 			unset( $this->fields[$field] );
 		}
-		
+
 		// if table exists
 		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
 			// drop table
 			if( $this->drop_table ) {
 				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
+
 				return $sql;
 			}
-			
+
 			// drop any existing fields not in schema
 			foreach( $legacy_fields as $field_id => $field ) {
 				if( !isset( $this->fields[$field_id] ) ) {
@@ -552,27 +552,27 @@ class dbTable extends dbObject {
 			if( $this->drop_table ) {
 				return $sql;
 			}
-			
+
 			$legacy_fields = array();
 		}
-		
+
 		// Loop through the field specifier array, building the associative array for the field options
 		$fldarray = array();
-		
+
 		foreach( $this->fields as $field_id => $finfo ) {
 			// Set an empty size if it isn't supplied
 			if( !isset( $finfo['SIZE'] ) ) {
 				$finfo['SIZE'] = '';
 			}
-			
+
 			// Initialize the field array with the type and size
 			$fldarray[$field_id] = array(
 				'NAME' => $finfo['NAME'],
 				'TYPE' => $finfo['TYPE'],
 				'SIZE' => $finfo['SIZE']
 			);
-			
-			// Loop through the options array and add the field options. 
+
+			// Loop through the options array and add the field options.
 			if( isset( $finfo['OPTS'] ) ) {
 				foreach( $finfo['OPTS'] as $opt ) {
 					// Option has an argument.
@@ -587,7 +587,7 @@ class dbTable extends dbObject {
 				}
 			}
 		}
-		
+
 		if( empty( $legacy_fields ) ) {
 			// Create the new table
 			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
@@ -611,18 +611,18 @@ class dbTable extends dbObject {
 					return array();
 			}
 		}
-		
+
 		foreach( $this->indexes as $index ) {
 			$sql[] = $index->create( $xmls );
 		}
-		
+
 		if( isset( $this->data ) ) {
 			$sql[] = $this->data->create( $xmls );
 		}
-		
+
 		return $sql;
 	}
-	
+
 	/**
 	* Marks a field or table for destruction
 	*/
@@ -653,28 +653,28 @@ class dbTable extends dbObject {
 * @access private
 */
 class dbIndex extends dbObject {
-	
+
 	/**
 	* @var string	Index name
 	*/
 	var $name;
-	
+
 	/**
 	* @var array	Index options: Index-level options
 	*/
 	var $opts = array();
-	
+
 	/**
 	* @var array	Indexed fields: Table columns included in this index
 	*/
 	var $columns = array();
-	
+
 	/**
 	* @var boolean Mark index for destruction
 	* @access private
 	*/
 	var $drop = FALSE;
-	
+
 	/**
 	* Initializes the new dbIndex object.
 	*
@@ -685,21 +685,21 @@ class dbIndex extends dbObject {
 	*/
 	function dbIndex( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
-		
+
 		$this->name = $this->prefix ($attributes['NAME']);
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	* Processes XML opening tags.
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'DROP':
 				$this->drop();
@@ -716,7 +716,7 @@ class dbIndex extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -731,10 +731,10 @@ class dbIndex extends dbObject {
 				$this->addField( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -742,14 +742,14 @@ class dbIndex extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'INDEX':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the index
 	*
@@ -758,11 +758,11 @@ class dbIndex extends dbObject {
 	*/
 	function addField( $name ) {
 		$this->columns[$this->FieldID( $name )] = $name;
-		
+
 		// Return the field list
 		return $this->columns;
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -771,11 +771,11 @@ class dbIndex extends dbObject {
 	*/
 	function addIndexOpt( $opt ) {
 		$this->opts[] = $opt;
-		
+
 		// Return the options list
 		return $this->opts;
 	}
-	
+
 	/**
 	* Generates the SQL that will create the index in the database
 	*
@@ -786,17 +786,17 @@ class dbIndex extends dbObject {
 		if( $this->drop ) {
 			return NULL;
 		}
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->columns as $id => $col ) {
 			if( !isset( $this->parent->fields[$id] ) ) {
 				unset( $this->columns[$id] );
 			}
 		}
-		
+
 		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
 	}
-	
+
 	/**
 	* Marks an index for destruction
 	*/
@@ -815,11 +815,11 @@ class dbIndex extends dbObject {
 * @access private
 */
 class dbData extends dbObject {
-	
+
 	var $data = array();
-	
+
 	var $row;
-	
+
 	/**
 	* Initializes the new dbData object.
 	*
@@ -831,18 +831,18 @@ class dbData extends dbObject {
 	function dbData( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: ROW and F (field). 
+	* Processes XML opening tags.
+	* Elements currently processed are: ROW and F (field).
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'ROW':
 				$this->row = count( $this->data );
@@ -854,7 +854,7 @@ class dbData extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -869,10 +869,10 @@ class dbData extends dbObject {
 				$this->addData( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -880,14 +880,14 @@ class dbData extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'DATA':
 				xml_set_object( $parser, $this->parent );
 				break;
 		}
 	}
-	
+
 	/**
 	* Adds a field to the insert
 	*
@@ -899,20 +899,20 @@ class dbData extends dbObject {
 		if( !isset( $this->row ) || !isset( $this->data[$this->row] ) ) {
 			return;
 		}
-		
+
 		// Set the field index so we know where we are
 		if( isset( $attributes['NAME'] ) ) {
 			$this->current_field = $this->FieldID( $attributes['NAME'] );
 		} else {
 			$this->current_field = count( $this->data[$this->row] );
 		}
-		
+
 		// initialise data
 		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
 			$this->data[$this->row][$this->current_field] = '';
 		}
 	}
-	
+
 	/**
 	* Adds options to the index
 	*
@@ -926,7 +926,7 @@ class dbData extends dbObject {
 			$this->data[$this->row][$this->current_field] .= $cdata;
 		}
 	}
-	
+
 	/**
 	* Generates the SQL that will add/update the data in the database
 	*
@@ -936,22 +936,22 @@ class dbData extends dbObject {
 	function create( &$xmls ) {
 		$table = $xmls->dict->TableName($this->parent->name);
 		$table_field_count = count($this->parent->fields);
-		$tables = $xmls->db->MetaTables(); 
+		$tables = $xmls->db->MetaTables();
 		$sql = array();
-		
+
 		$ukeys = $xmls->db->MetaPrimaryKeys( $table );
 		if( !empty( $this->parent->indexes ) and !empty( $ukeys ) ) {
 			foreach( $this->parent->indexes as $indexObj ) {
 				if( !in_array( $indexObj->name, $ukeys ) ) $ukeys[] = $indexObj->name;
 			}
 		}
-		
+
 		// eliminate any columns that aren't in the table
 		foreach( $this->data as $row ) {
 			$table_fields = $this->parent->fields;
 			$fields = array();
 			$rawfields = array(); // Need to keep some of the unprocessed data on hand.
-			
+
 			foreach( $row as $field_id => $field_data ) {
 				if( !array_key_exists( $field_id, $table_fields ) ) {
 					if( is_numeric( $field_id ) ) {
@@ -960,9 +960,9 @@ class dbData extends dbObject {
 						continue;
 					}
 				}
-				
+
 				$name = $table_fields[$field_id]['NAME'];
-				
+
 				switch( $table_fields[$field_id]['TYPE'] ) {
 					case 'I':
 					case 'I1':
@@ -979,16 +979,16 @@ class dbData extends dbObject {
 						$fields[$name] = $xmls->db->qstr( $field_data );
 						$rawfields[$name] = $field_data;
 				}
-				
+
 				unset($table_fields[$field_id]);
-				
+
 			}
-			
+
 			// check that at least 1 column is specified
 			if( empty( $fields ) ) {
 				continue;
 			}
-			
+
 			// check that no required columns are missing
 			if( count( $fields ) < $table_field_count ) {
 				foreach( $table_fields as $field ) {
@@ -997,27 +997,27 @@ class dbData extends dbObject {
 						}
 				}
 			}
-			
+
 			// The rest of this method deals with updating existing data records.
-			
+
 			if( !in_array( $table, $tables ) or ( $mode = $xmls->existingData() ) == XMLS_MODE_INSERT ) {
 				// Table doesn't yet exist, so it's safe to insert.
 				logMsg( "$table doesn't exist, inserting or mode is INSERT" );
 			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
 				continue;
 		}
-		
+
 			// Prepare to test for potential violations. Get primary keys and unique indexes
 			$mfields = array_merge( $fields, $rawfields );
 			$keyFields = array_intersect( $ukeys, array_keys( $mfields ) );
-			
+
 			if( empty( $ukeys ) or count( $keyFields ) == 0 ) {
 				// No unique keys in schema, so safe to insert
 				logMsg( "Either schema or data has no unique keys, so safe to insert" );
 				$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
 				continue;
 			}
-			
+
 			// Select record containing matching unique keys.
 			$where = '';
 			foreach( $ukeys as $key ) {
@@ -1057,27 +1057,27 @@ class dbData extends dbObject {
 * @access private
 */
 class dbQuerySet extends dbObject {
-	
+
 	/**
 	* @var array	List of SQL queries
 	*/
 	var $queries = array();
-	
+
 	/**
 	* @var string	String used to build of a query line by line
 	*/
 	var $query;
-	
+
 	/**
 	* @var string	Query prefix key
 	*/
 	var $prefixKey = '';
-	
+
 	/**
 	* @var boolean	Auto prefix enable (TRUE)
 	*/
 	var $prefixMethod = 'AUTO';
-	
+
 	/**
 	* Initializes the query set.
 	*
@@ -1086,14 +1086,14 @@ class dbQuerySet extends dbObject {
 	*/
 	function dbQuerySet( &$parent, $attributes = NULL ) {
 		$this->parent = $parent;
-			
+
 		// Overrides the manual prefix key
 		if( isset( $attributes['KEY'] ) ) {
 			$this->prefixKey = $attributes['KEY'];
 		}
-		
+
 		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
+
 		// Enables or disables automatic prefix prepending
 		switch( $prefixMethod ) {
 			case 'AUTO':
@@ -1107,20 +1107,20 @@ class dbQuerySet extends dbObject {
 				break;
 		}
 	}
-	
+
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
+	* XML Callback to process start elements. Elements currently
+	* processed are: QUERY.
 	*
 	* @access private
 	*/
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
-		
+
 		switch( $this->currentElement ) {
 			case 'QUERY':
 				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
+				// Ignore this query set if a platform is specified and it's different than the
 				// current connection platform.
 				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
 					$this->newQuery();
@@ -1132,7 +1132,7 @@ class dbQuerySet extends dbObject {
 				// print_r( array( $tag, $attributes ) );
 		}
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*/
@@ -1143,10 +1143,10 @@ class dbQuerySet extends dbObject {
 				$this->buildQuery( $cdata );
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -1154,7 +1154,7 @@ class dbQuerySet extends dbObject {
 	*/
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
-		
+
 		switch( strtoupper( $tag ) ) {
 			case 'QUERY':
 				// Add the finished query to the open query set.
@@ -1166,10 +1166,10 @@ class dbQuerySet extends dbObject {
 				$this->destroy();
 				break;
 			default:
-				
+
 		}
 	}
-	
+
 	/**
 	* Re-initializes the query.
 	*
@@ -1177,10 +1177,10 @@ class dbQuerySet extends dbObject {
 	*/
 	function newQuery() {
 		$this->query = '';
-		
+
 		return TRUE;
 	}
-	
+
 	/**
 	* Discards the existing query.
 	*
@@ -1188,11 +1188,11 @@ class dbQuerySet extends dbObject {
 	*/
 	function discardQuery() {
 		unset( $this->query );
-		
+
 		return TRUE;
 	}
-	
-	/** 
+
+	/**
 	* Appends a line to a query that is being built line by line
 	*
 	* @param string $data Line of SQL data or NULL to initialize a new query
@@ -1202,12 +1202,12 @@ class dbQuerySet extends dbObject {
 		if( !isset( $this->query ) OR empty( $sql ) ) {
 			return FALSE;
 		}
-		
+
 		$this->query .= $sql;
-		
+
 		return $this->query;
 	}
-	
+
 	/**
 	* Adds a completed query to the query list
 	*
@@ -1217,14 +1217,14 @@ class dbQuerySet extends dbObject {
 		if( !isset( $this->query ) ) {
 			return FALSE;
 		}
-		
+
 		$this->queries[] = $return = trim($this->query);
-		
+
 		unset( $this->query );
-		
+
 		return $return;
 	}
-	
+
 	/**
 	* Creates and returns the current query set
 	*
@@ -1236,16 +1236,16 @@ class dbQuerySet extends dbObject {
 			switch( $this->prefixMethod ) {
 				case 'AUTO':
 					// Enable auto prefix replacement
-					
+
 					// Process object prefix.
 					// Evaluate SQL statements to prepend prefix to objects
 					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
 					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
 					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					
+
 					// SELECT statements aren't working yet
 					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-					
+
 				case 'MANUAL':
 					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
 					// If prefixKey is not set, we use the default constant XMLS_PREFIX
@@ -1257,14 +1257,14 @@ class dbQuerySet extends dbObject {
 						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
 					}
 			}
-			
+
 			$this->queries[$id] = trim( $query );
 		}
-		
+
 		// Return the query set array
 		return $this->queries;
 	}
-	
+
 	/**
 	* Rebuilds the query with the prefix attached to any objects
 	*
@@ -1277,33 +1277,33 @@ class dbQuerySet extends dbObject {
 		if( !isset( $prefix ) ) {
 			return $query;
 		}
-		
+
 		if( preg_match( $regex, $query, $match ) ) {
 			$preamble = $match[1];
 			$postamble = $match[5];
 			$objectList = explode( ',', $match[3] );
 			// $prefix = $prefix . '_';
-			
+
 			$prefixedList = '';
-			
+
 			foreach( $objectList as $object ) {
 				if( $prefixedList !== '' ) {
 					$prefixedList .= ', ';
 				}
-				
+
 				$prefixedList .= $prefix . trim( $object );
 			}
-			
+
 			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
 		}
-		
+
 		return $query;
 	}
 }
 
 /**
 * Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
+*
 * This class is used to load and parse the XML file, to create an array of SQL statements
 * that can be used to build a database, and to build the database using the SQL array.
 *
@@ -1315,87 +1315,87 @@ class dbQuerySet extends dbObject {
 * @package axmls
 */
 class adoSchema {
-	
+
 	/**
 	* @var array	Array containing SQL queries to generate all objects
 	* @access private
 	*/
 	var $sqlArray;
-	
+
 	/**
 	* @var object	ADOdb connection object
 	* @access private
 	*/
 	var $db;
-	
+
 	/**
 	* @var object	ADOdb Data Dictionary
 	* @access private
 	*/
 	var $dict;
-	
+
 	/**
 	* @var string Current XML element
 	* @access private
 	*/
 	var $currentElement = '';
-	
+
 	/**
 	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
 	* @access private
 	*/
 	var $upgrade = '';
-	
+
 	/**
 	* @var string Optional object prefix
 	* @access private
 	*/
 	var $objectPrefix = '';
-	
+
 	/**
 	* @var long	Original Magic Quotes Runtime value
 	* @access private
 	*/
 	var $mgq;
-	
+
 	/**
 	* @var long	System debug
 	* @access private
 	*/
 	var $debug;
-	
+
 	/**
 	* @var string Regular expression to find schema version
 	* @access private
 	*/
 	var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
-	
+
 	/**
 	* @var string Current schema version
 	* @access private
 	*/
 	var $schemaVersion;
-	
+
 	/**
 	* @var int	Success of last Schema execution
 	*/
 	var $success;
-	
+
 	/**
 	* @var bool	Execute SQL inline as it is generated
 	*/
 	var $executeInline;
-	
+
 	/**
 	* @var bool	Continue SQL execution if errors occur
 	*/
 	var $continueOnError;
-	
+
 	/**
 	* @var int	How to handle existing data rows (insert, update, or ignore)
 	*/
 	var $existingData;
-	
+
 	/**
 	* Creates an adoSchema object
 	*
@@ -1410,7 +1410,7 @@ class adoSchema {
 		$this->mgq = get_magic_quotes_runtime();
 		#set_magic_quotes_runtime(0);
 		ini_set("magic_quotes_runtime", 0);
-		
+
 		$this->db = $db;
 		$this->debug = $this->db->debug;
 		$this->dict = NewDataDictionary( $this->db );
@@ -1421,7 +1421,7 @@ class adoSchema {
 		$this->existingData( XMLS_EXISTING_DATA );
 		$this->setUpgradeMethod();
 	}
-	
+
 	/**
 	* Sets the method to be used for upgrading an existing database
 	*
@@ -1442,9 +1442,9 @@ class adoSchema {
 		if( !is_string( $method ) ) {
 			return FALSE;
 		}
-		
+
 		$method = strtoupper( $method );
-		
+
 		// Handle the upgrade methods
 		switch( $method ) {
 			case 'ALTER':
@@ -1463,10 +1463,10 @@ class adoSchema {
 				// Use default if no legitimate method is passed.
 				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
 		}
-		
+
 		return $this->upgrade;
 	}
-	
+
 	/**
 	* Specifies how to handle existing data row when there is a unique key conflict.
 	*
@@ -1475,7 +1475,7 @@ class adoSchema {
 	* data into an existing table with one or more primary keys or unique indexes.
 	* The existingData method takes one of three options: XMLS_MODE_INSERT attempts
 	* to always insert the data as a new row. In the event of a unique key violation,
-	* the database will generate an error.  XMLS_MODE_UPDATE attempts to update the 
+	* the database will generate an error.  XMLS_MODE_UPDATE attempts to update the
 	* any existing rows with the new data based upon primary or unique key fields in
 	* the schema. If the data row in the schema specifies no unique fields, the row
 	* data will be inserted as a new row. XMLS_MODE_IGNORE specifies that any data rows
@@ -1504,10 +1504,10 @@ class adoSchema {
 			}
 			$this->existingData = $mode;
 		}
-		
+
 		return $this->existingData;
 	}
-	
+
 	/**
 	* Enables/disables inline SQL execution.
 	*
@@ -1525,10 +1525,10 @@ class adoSchema {
 		if( is_bool( $mode ) ) {
 			$this->executeInline = $mode;
 		}
-		
+
 		return $this->executeInline;
 	}
-	
+
 	/**
 	* Enables/disables SQL continue on error.
 	*
@@ -1546,10 +1546,10 @@ class adoSchema {
 		if( is_bool( $mode ) ) {
 			$this->continueOnError = $mode;
 		}
-		
+
 		return $this->continueOnError;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
@@ -1566,7 +1566,7 @@ class adoSchema {
 	function ParseSchema( $filename, $returnSchema = FALSE ) {
 		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to SQL.
 	*
@@ -1594,13 +1594,13 @@ class adoSchema {
 			logMsg( 'Unable to open file' );
 			return FALSE;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
 			logMsg( 'Invalid Schema Version' );
 			return FALSE;
 		}
-		
+
 		if( $returnSchema ) {
 			$xmlstring = '';
 			while( $data = fread( $fp, 4096 ) ) {
@@ -1608,11 +1608,11 @@ class adoSchema {
 			}
 			return $xmlstring;
 		}
-		
+
 		$this->success = 2;
-		
+
 		$xmlParser = $this->create_parser();
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
@@ -1623,17 +1623,17 @@ class adoSchema {
 				) );
 			}
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Converts an XML schema string to SQL.
 	*
 	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
+	* and generate the SQL necessary to create the database described by the schema.
 	* @see ParseSchema()
 	*
 	* @param string $xmlstring XML schema string.
@@ -1645,21 +1645,21 @@ class adoSchema {
 			logMsg( 'Empty or Invalid Schema' );
 			return FALSE;
 		}
-		
+
 		// do version detection here
 		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
 			logMsg( 'Invalid Schema Version' );
 			return FALSE;
 		}
-		
+
 		if( $returnSchema ) {
 			return $xmlstring;
 		}
-		
+
 		$this->success = 2;
-		
+
 		$xmlParser = $this->create_parser();
-		
+
 		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
 			die( sprintf(
 				"XML error: %s at line %d",
@@ -1667,12 +1667,12 @@ class adoSchema {
 				xml_get_current_line_number( $xmlParser)
 			) );
 		}
-		
+
 		xml_parser_free( $xmlParser );
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Loads an XML schema from a file and converts it to uninstallation SQL.
 	*
@@ -1687,12 +1687,12 @@ class adoSchema {
 	function RemoveSchema( $filename, $returnSchema = FALSE ) {
 		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
-	
+
 	/**
 	* Converts an XML schema string to uninstallation SQL.
 	*
 	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
+	* and generate the SQL necessary to uninstall the database described by the schema.
 	* @see RemoveSchema()
 	*
 	* @param string $schema XML schema string.
@@ -1700,20 +1700,20 @@ class adoSchema {
 	* @return array Array of SQL queries, ready to execute.
 	*/
 	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
 			return FALSE;
 		}
-		
+
 		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
 	}
-	
+
 	/**
 	* Applies the current XML schema to the database (post execution).
 	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	* Call this method to apply the current schema (generally created by calling
+	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes,
 	* and executing other SQL specified in the schema) after parsing.
 	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
 	*
@@ -1726,25 +1726,25 @@ class adoSchema {
 		if( !is_bool( $continueOnErr ) ) {
 			$continueOnErr = $this->ContinueOnError();
 		}
-		
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			$this->success = 0;
 		} else {
 			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
 		}
-		
+
 		return $this->success;
 	}
-	
+
 	/**
-	* Returns the current SQL array. 
+	* Returns the current SQL array.
 	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
+	* Call this method to fetch the array of SQL queries resulting from
+	* ParseSchema() or ParseSchemaString().
 	*
 	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
 	* @return array Array of SQL statements or FALSE if an error occurs
@@ -1753,7 +1753,7 @@ class adoSchema {
 		$sqlArray = null;
 		return $this->getSQL( $format, $sqlArray );
 	}
-	
+
 	/**
 	* Saves the current SQL array to the local filesystem as a list of SQL queries.
 	*
@@ -1761,25 +1761,25 @@ class adoSchema {
 	* parsed XML schema) to the filesystem.
 	*
 	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
+	* @return boolean TRUE if save is successful, else FALSE.
 	*/
 	function SaveSQL( $filename = './schema.sql' ) {
-		
+
 		if( !isset( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
 		if( !isset( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		$fp = fopen( $filename, "w" );
-		
+
 		foreach( $sqlArray as $key => $query ) {
 			fwrite( $fp, $query . ";\n" );
 		}
 		fclose( $fp );
 	}
-	
+
 	/**
 	* Create an xml parser
 	*
@@ -1791,14 +1791,14 @@ class adoSchema {
 		// Create the parser
 		$xmlParser = xml_parser_create();
 		xml_set_object( $xmlParser, $this );
-		
+
 		// Initialize the XML callback functions
 		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
 		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
+
 		return $xmlParser;
 	}
-	
+
 	/**
 	* XML Callback to process start elements
 	*
@@ -1821,9 +1821,9 @@ class adoSchema {
 			default:
 				// print_r( array( $tag, $attributes ) );
 		}
-		
+
 	}
-	
+
 	/**
 	* XML Callback to process CDATA elements
 	*
@@ -1831,7 +1831,7 @@ class adoSchema {
 	*/
 	function _tag_cdata( &$parser, $cdata ) {
 	}
-	
+
 	/**
 	* XML Callback to process end elements
 	*
@@ -1839,16 +1839,16 @@ class adoSchema {
 	* @internal
 	*/
 	function _tag_close( &$parser, $tag ) {
-		
+
 	}
-	
+
 	/**
 	* Converts an XML schema string to the specified DTD version.
 	*
 	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
 	* @see ConvertSchemaFile()
@@ -1859,27 +1859,27 @@ class adoSchema {
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
 	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
 			return FALSE;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = $schema;
 		} else {
 			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
 		}
-		
+
 		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
-		
+
 		return $result;
 	}
 
@@ -1890,14 +1890,14 @@ class adoSchema {
 		if (function_exists('file_get_contents')) return file_get_contents($path);
 		return join('',file($path));
 	}*/
-	
+
 	/**
 	* Converts an XML schema file to the specified DTD version.
 	*
 	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version
+	* parameter is specified, the schema will be converted to the current DTD version.
 	* If the newFile parameter is provided, the converted schema will be written to the specified
 	* file.
 	* @see ConvertSchemaString()
@@ -1908,19 +1908,19 @@ class adoSchema {
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
 	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
+
 		// grab current version
 		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
 			return FALSE;
 		}
-		
+
 		if( !isset ($newVersion) ) {
 			$newVersion = $this->schemaVersion;
 		}
-		
+
 		if( $version == $newVersion ) {
 			$result = _file_get_contents( $filename );
-			
+
 			// remove unicode BOM if present
 			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
 				$result = substr( $result, 3 );
@@ -1928,36 +1928,36 @@ class adoSchema {
 		} else {
 			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
 		}
-		
+
 		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
-		
+
 		return $result;
 	}
-	
+
 	function TransformSchema( $schema, $xsl, $schematype='string' )
 	{
 		// Fail if XSLT extension is not available
 		if( ! function_exists( 'xslt_create' ) ) {
 			return FALSE;
 		}
-		
+
 		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-		
+
 		// look for xsl
 		if( !is_readable( $xsl_file ) ) {
 			return FALSE;
 		}
-		
+
 		switch( $schematype )
 		{
 			case 'file':
 				if( !is_readable( $schema ) ) {
 					return FALSE;
 				}
-				
+
 				$schema = _file_get_contents( $schema );
 				break;
 			case 'string':
@@ -1966,26 +1966,26 @@ class adoSchema {
 					return FALSE;
 				}
 		}
-		
+
 		$arguments = array (
 			'/_xml' => $schema,
 			'/_xsl' => _file_get_contents( $xsl_file )
 		);
-		
+
 		// create an XSLT processor
 		$xh = xslt_create ();
-		
+
 		// set error handler
 		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-		
+
 		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
-		
+		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments);
+
 		xslt_free ($xh);
-		
+
 		return $result;
 	}
-	
+
 	/**
 	* Processes XSLT transformation errors
 	*
@@ -2005,7 +2005,7 @@ class adoSchema {
 				'Error Number' => $errno,
 				'Level' => $level
 			);
-			
+
 			switch( $fields['URI'] ) {
 				case 'arg:/_xml':
 					$msg['Input'] = 'XML';
@@ -2016,7 +2016,7 @@ class adoSchema {
 				default:
 					$msg['Input'] = $fields['URI'];
 			}
-			
+
 			$msg['Line'] = $fields['line'];
 		} else {
 			$msg = array(
@@ -2026,19 +2026,19 @@ class adoSchema {
 				'Fields' => var_export( $fields, TRUE )
 			);
 		}
-		
+
 		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
 					   . '<table>' . "\n";
-		
+
 		foreach( $msg as $label => $details ) {
 			$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
 		}
-		
+
 		$error_details .= '</table>';
-		
+
 		trigger_error( $error_details, E_USER_ERROR );
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the requested XML schema file.
 	*
@@ -2054,17 +2054,17 @@ class adoSchema {
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
-		
+
 		// Process the file
 		while( $data = fread( $fp, 4096 ) ) {
 			if( preg_match( $this->versionRegex, $data, $matches ) ) {
 				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 			}
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Returns the AXMLS Schema Version of the provided XML schema string.
 	*
@@ -2078,20 +2078,20 @@ class adoSchema {
 		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
 			return FALSE;
 		}
-		
+
 		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
 			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Extracts an XML schema from an existing database.
 	*
 	* Call this method to create an XML schema string from an existing database.
 	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
+	* in the schema.
 	*
 	* @param boolean $data Include data in schema dump
 	* @indent string indentation to use
@@ -2101,54 +2101,54 @@ class adoSchema {
 	*/
 	function ExtractSchema( $data = FALSE, $indent = '  ', $prefix = '' , $stripprefix=false) {
 		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
+
 		$schema = '<?xml version="1.0"?>' . "\n"
 				. '<schema version="' . $this->schemaVersion . '">' . "\n";
-		
+
 		if( is_array( $tables = $this->db->MetaTables( 'TABLES' , ($prefix) ? $prefix.'%' : '') ) ) {
 			foreach( $tables as $table ) {
 				if ($stripprefix) $table = str_replace(str_replace('\\_', '_', $pfx ), '', $table);
 				$schema .= $indent . '<table name="' . htmlentities( $table ) . '">' . "\n";
-				
+
 				// grab details from database
 				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE -1' );
 				$fields = $this->db->MetaColumns( $table );
 				$indexes = $this->db->MetaIndexes( $table );
-				
+
 				if( is_array( $fields ) ) {
 					foreach( $fields as $details ) {
 						$extra = '';
 						$content = array();
-						
+
 						if( isset($details->max_length) && $details->max_length > 0 ) {
 							$extra .= ' size="' . $details->max_length . '"';
 						}
-						
+
 						if( isset($details->primary_key) && $details->primary_key ) {
 							$content[] = '<KEY/>';
 						} elseif( isset($details->not_null) && $details->not_null ) {
 							$content[] = '<NOTNULL/>';
 						}
-						
+
 						if( isset($details->has_default) && $details->has_default ) {
 							$content[] = '<DEFAULT value="' . htmlentities( $details->default_value ) . '"/>';
 						}
-						
+
 						if( isset($details->auto_increment) && $details->auto_increment ) {
 							$content[] = '<AUTOINCREMENT/>';
 						}
-						
+
 						if( isset($details->unsigned) && $details->unsigned ) {
 							$content[] = '<UNSIGNED/>';
 						}
-						
+
 						// this stops the creation of 'R' columns,
 						// AUTOINCREMENT is used to create auto columns
 						$details->primary_key = 0;
 						$type = $rs->MetaType( $details );
-						
+
 						$schema .= str_repeat( $indent, 2 ) . '<field name="' . htmlentities( $details->name ) . '" type="' . $type . '"' . $extra;
-						
+
 						if( !empty( $content ) ) {
 							$schema .= ">\n" . str_repeat( $indent, 3 )
 									 . implode( "\n" . str_repeat( $indent, 3 ), $content ) . "\n"
@@ -2158,57 +2158,57 @@ class adoSchema {
 						}
 					}
 				}
-				
+
 				if( is_array( $indexes ) ) {
 					foreach( $indexes as $index => $details ) {
 						$schema .= str_repeat( $indent, 2 ) . '<index name="' . $index . '">' . "\n";
-						
+
 						if( $details['unique'] ) {
 							$schema .= str_repeat( $indent, 3 ) . '<UNIQUE/>' . "\n";
 						}
-						
+
 						foreach( $details['columns'] as $column ) {
 							$schema .= str_repeat( $indent, 3 ) . '<col>' . htmlentities( $column ) . '</col>' . "\n";
 						}
-						
+
 						$schema .= str_repeat( $indent, 2 ) . '</index>' . "\n";
 					}
 				}
-				
+
 				if( $data ) {
 					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
+
 					if( is_object( $rs ) && !$rs->EOF ) {
 						$schema .= str_repeat( $indent, 2 ) . "<data>\n";
-						
+
 						while( $row = $rs->FetchRow() ) {
 							foreach( $row as $key => $val ) {
 								if ( $val != htmlentities( $val ) ) {
 									$row[$key] = '<![CDATA[' . $val . ']]>';
 								}
 							}
-							
+
 							$schema .= str_repeat( $indent, 3 ) . '<row><f>' . implode( '</f><f>', $row ) . "</f></row>\n";
 						}
-						
+
 						$schema .= str_repeat( $indent, 2 ) . "</data>\n";
 					}
 				}
-				
+
 				$schema .= $indent . "</table>\n";
 			}
 		}
-		
+
 		$this->db->SetFetchMode( $old_mode );
-		
+
 		$schema .= '</schema>';
 		return $schema;
 	}
-	
+
 	/**
 	* Sets a prefix for database objects
 	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* Call this method to set a standard prefix that will be prepended to all database tables
 	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
 	*
 	* @param string $prefix Prefix that will be prepended.
@@ -2229,17 +2229,17 @@ class adoSchema {
 				logMsg( 'Invalid prefix: ' . $prefix );
 				return FALSE;
 		}
-		
+
 		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
 			$prefix .= '_';
 		}
-		
+
 		// prefix valid
 		logMsg( 'Set prefix: ' . $prefix );
 		$this->objectPrefix = $prefix;
 		return TRUE;
 	}
-	
+
 	/**
 	* Returns an object name with the current prefix prepended.
 	*
@@ -2255,11 +2255,11 @@ class adoSchema {
 			// prepend after quote if used
 			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
 		}
-		
+
 		// No prefix set. Use name provided.
 		return $name;
 	}
-	
+
 	/**
 	* Checks if element references a specific platform
 	*
@@ -2271,7 +2271,7 @@ class adoSchema {
 	function supportedPlatform( $platform = NULL ) {
 		if( !empty( $platform ) ) {
 			$regex = '/(^|\|)' . $this->db->databaseType . '(\||$)/i';
-		
+
 			if( preg_match( '/^- /', $platform ) ) {
 				if (preg_match ( $regex, substr( $platform, 2 ) ) ) {
 					logMsg( 'Platform ' . $platform . ' is NOT supported' );
@@ -2284,11 +2284,11 @@ class adoSchema {
 		}
 	}
 		}
-		
+
 		logMsg( 'Platform ' . $platform . ' is supported' );
 		return TRUE;
 	}
-	
+
 	/**
 	* Clears the array of generated SQL.
 	*
@@ -2297,7 +2297,7 @@ class adoSchema {
 	function clearSQL() {
 		$this->sqlArray = array();
 	}
-	
+
 	/**
 	* Adds SQL into the SQL array.
 	*
@@ -2305,58 +2305,58 @@ class adoSchema {
 	* @return boolean TRUE if successful, else FALSE.
 	*
 	* @access private
-	*/	
+	*/
 	function addSQL( $sql = NULL ) {
 		if( is_array( $sql ) ) {
 			foreach( $sql as $line ) {
 				$this->addSQL( $line );
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		if( is_string( $sql ) ) {
 			$this->sqlArray[] = $sql;
-			
+
 			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
 			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
 				$saved = $this->db->debug;
 				$this->db->debug = $this->debug;
 				$ok = $this->db->Execute( $sql );
 				$this->db->debug = $saved;
-				
+
 				if( !$ok ) {
 					if( $this->debug ) {
 						ADOConnection::outp( $this->db->ErrorMsg() );
 					}
-					
+
 					$this->success = 1;
 				}
 			}
-			
+
 			return TRUE;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Gets the SQL array in the specified format.
 	*
 	* @param string $format Format
 	* @return mixed SQL
-	*	
+	*
 	* @access private
 	*/
 	function getSQL( $format = NULL, $sqlArray = NULL ) {
 		if( !is_array( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
 		}
-		
+
 		if( !is_array( $sqlArray ) ) {
 			return FALSE;
 		}
-		
+
 		switch( strtolower( $format ) ) {
 			case 'string':
 			case 'text':
@@ -2364,10 +2364,10 @@ class adoSchema {
 			case'html':
 				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
 		}
-		
+
 		return $this->sqlArray;
 	}
-	
+
 	/**
 	* Destroys an adoSchema object.
 	*
@@ -2389,18 +2389,17 @@ class adoSchema {
 function logMsg( $msg, $title = NULL, $force = FALSE ) {
 	if( XMLS_DEBUG or $force ) {
 		echo '<pre>';
-		
+
 		if( isset( $title ) ) {
 			echo '<h3>' . htmlentities( $title ) . '</h3>';
 		}
-		
+
 		if( @is_object( $this ) ) {
 			echo '[' . get_class( $this ) . '] ';
 		}
-		
+
 		print_r( $msg );
-		
+
 		echo '</pre>';
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb.inc.php
index 64a7454..e9011e9 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/adodb.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/adodb.inc.php
@@ -1,9 +1,9 @@
-<?php 
+<?php
 /*
  * Set tabs to 4 for best viewing.
- * 
+ *
  * Latest version is available at http://adodb.sourceforge.net
- * 
+ *
  * This is the main include file for ADOdb.
  * Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
  *
@@ -13,14 +13,14 @@
 
 /**
 	\mainpage
-	
-	 @version V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
+
+	 @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
 
 	Released under both BSD license and Lesser GPL library license. You can choose which license
 	you prefer.
-	
-	PHP's database access functions are not standardised. This creates a need for a database 
-	class library to hide the differences between the different database API's (encapsulate 
+
+	PHP's database access functions are not standardised. This creates a need for a database
+	class library to hide the differences between the different database API's (encapsulate
 	the differences) so we can easily switch databases.
 
 	We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, DB2,
@@ -29,28 +29,28 @@
 	other databases via ODBC.
 
 	Latest Download at http://adodb.sourceforge.net/
-	  
+
  */
- 
- if (!defined('_ADODB_LAYER')) {
- 	define('_ADODB_LAYER',1);
-	
-	//==============================================================================================	
+
+if (!defined('_ADODB_LAYER')) {
+	define('_ADODB_LAYER',1);
+
+	//==============================================================================================
 	// CONSTANT DEFINITIONS
-	//==============================================================================================	
+	//==============================================================================================
 
 
-	/** 
+	/**
 	 * Set ADODB_DIR to the directory where this file resides...
 	 * This constant was formerly called $ADODB_RootPath
 	 */
 	if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__));
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// GLOBAL VARIABLES
-	//==============================================================================================	
+	//==============================================================================================
 
-	GLOBAL 
+	GLOBAL
 		$ADODB_vers, 		// database version
 		$ADODB_COUNTRECS,	// count number of records returned - slows down query
 		$ADODB_CACHE_DIR,	// directory to cache recordsets
@@ -60,79 +60,81 @@
 		$ADODB_COMPAT_FETCH, // If $ADODB_COUNTRECS and this is true, $rs->fields is available on EOF
 	 	$ADODB_FETCH_MODE,	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
 		$ADODB_GETONE_EOF,
-		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.	
-	
-	//==============================================================================================	
+		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.
+
+	//==============================================================================================
 	// GLOBAL SETUP
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	$ADODB_EXTENSION = defined('ADODB_EXTENSION');
-	
-	//********************************************************//
-	/*
-	Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
-	Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, nuko#mbnet.fi
 
- 		0 = ignore empty fields. All empty fields in array are ignored.
-		1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.
-		2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
-		3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and empty fields '' are set to empty '' sql values.
-	*/
-        define('ADODB_FORCE_IGNORE',0);
-        define('ADODB_FORCE_NULL',1);
-        define('ADODB_FORCE_EMPTY',2);
-        define('ADODB_FORCE_VALUE',3);
-    //********************************************************//
+	// ********************************************************
+	// Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
+	// Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, nuko#mbnet.fi
+	//
+	// 0 = ignore empty fields. All empty fields in array are ignored.
+	// 1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.
+	// 2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
+	// 3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and empty fields '' are set to empty '' sql values.
+
+		define('ADODB_FORCE_IGNORE',0);
+		define('ADODB_FORCE_NULL',1);
+		define('ADODB_FORCE_EMPTY',2);
+		define('ADODB_FORCE_VALUE',3);
+	// ********************************************************
 
 
 	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
-		
+
 		define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;</p>');
-	
+
 	// allow [ ] @ ` " and . in table names
 		define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
-	
+
 	// prefetching used by oracle
 		if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
-	
-	
+
+
 	/*
 	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
 	This currently works only with mssql, odbc, oci8po and ibase derived drivers.
-	
- 		0 = assoc lowercase field names. $rs->fields['orderid']
+
+		0 = assoc lowercase field names. $rs->fields['orderid']
 		1 = assoc uppercase field names. $rs->fields['ORDERID']
 		2 = use native-case field names. $rs->fields['OrderID']
 	*/
-	
+		define('ADODB_ASSOC_CASE_LOWER', 0);
+		define('ADODB_ASSOC_CASE_UPPER', 1);
+		define('ADODB_ASSOC_CASE_NATIVE', 2);
+
 		define('ADODB_FETCH_DEFAULT',0);
 		define('ADODB_FETCH_NUM',1);
 		define('ADODB_FETCH_ASSOC',2);
 		define('ADODB_FETCH_BOTH',3);
-		
+
 		if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
-	
+
 		// PHP's version scheme makes converting to numbers difficult - workaround
 		$_adodb_ver = (float) PHP_VERSION;
 		if ($_adodb_ver >= 5.2) {
 			define('ADODB_PHPVER',0x5200);
 		} else if ($_adodb_ver >= 5.0) {
 			define('ADODB_PHPVER',0x5000);
-		} else 
+		} else
 			die("PHP5 or later required. You are running ".PHP_VERSION);
 	}
-	
-	
+
+
 	//if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 
-	
+
 	/**
 	 	Accepts $src and $dest arrays, replacing string $data
 	*/
 	function ADODB_str_replace($src, $dest, $data)
 	{
 		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
-		
+
 		$s = reset($src);
 		$d = reset($dest);
 		while ($s !== false) {
@@ -142,10 +144,10 @@
 		}
 		return $data;
 	}
-	
+
 	function ADODB_Setup()
 	{
-	GLOBAL 
+	GLOBAL
 		$ADODB_vers, 		// database version
 		$ADODB_COUNTRECS,	// count number of records returned - slows down query
 		$ADODB_CACHE_DIR,	// directory to cache recordsets
@@ -155,7 +157,7 @@
 		$ADODB_FORCE_TYPE,
 		$ADODB_GETONE_EOF,
 		$ADODB_QUOTE_FIELDNAMES;
-		
+
 		if (empty($ADODB_CACHE_CLASS)) $ADODB_CACHE_CLASS =  'ADODB_Cache_File' ;
 		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
 		$ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
@@ -165,58 +167,58 @@
 			$ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp';
 		} else {
 			// do not accept url based paths, eg. http:/ or ftp:/
-			if (strpos($ADODB_CACHE_DIR,'://') !== false) 
+			if (strpos($ADODB_CACHE_DIR,'://') !== false)
 				die("Illegal path http:// or ftp://");
 		}
-		
-			
+
+
 		// Initialize random number generator for randomizing cache flushes
 		// -- note Since PHP 4.2.0, the seed  becomes optional and defaults to a random value if omitted.
 		 srand(((double)microtime())*1000000);
-		
+
 		/**
 		 * ADODB version as a string.
 		 */
-		$ADODB_vers = 'V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
-	
+		$ADODB_vers = 'V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
+
 		/**
-		 * Determines whether recordset->RecordCount() is used. 
+		 * Determines whether recordset->RecordCount() is used.
 		 * Set to false for highest performance -- RecordCount() will always return -1 then
 		 * for databases that provide "virtual" recordcounts...
 		 */
-		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
+		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true;
 	}
-	
-	
-	//==============================================================================================	
+
+
+	//==============================================================================================
 	// CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	ADODB_Setup();
 
-	//==============================================================================================	
+	//==============================================================================================
 	// CLASS ADOFieldObject
-	//==============================================================================================	
+	//==============================================================================================
 	/**
 	 * Helper class for FetchFields -- holds info on a column
 	 */
-	class ADOFieldObject { 
+	class ADOFieldObject {
 		var $name = '';
 		var $max_length=0;
 		var $type="";
 /*
 		// additional fields by dannym... (danny_milo at yahoo.com)
-		var $not_null = false; 
+		var $not_null = false;
 		// actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^
 		// so we can as well make not_null standard (leaving it at "false" does not harm anyways)
 
-		var $has_default = false; // this one I have done only in mysql and postgres for now ... 
+		var $has_default = false; // this one I have done only in mysql and postgres for now ...
 			// others to come (dannym)
 		var $default_value; // default, if any, and supported. Check has_default first.
 */
 	}
-	
-	
+
+
 	function _adodb_safedate($s)
 	{
 		return str_replace(array("'", '\\'), '', $s);
@@ -238,16 +240,16 @@
 				$s2 .= $ch;
 				break;
 			}
-			
+
 			$s2 .= $ch;
 		}
-		
+
 		return strlen($s2) == 0 ? 'null' : $s2;
 	}
 
-	
+
 	// for transaction handling
-	
+
 	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
 	{
 		//print "Errorno ($fn errno=$errno m=$errmsg) ";
@@ -257,46 +259,46 @@
 			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
 		}
 	}
-	
+
 	//------------------
 	// class for caching
 	class ADODB_Cache_File {
-	
+
 		var $createdir = true; // requires creation of temp dirs
-		
+
 		function ADODB_Cache_File()
 		{
 		global $ADODB_INCLUDED_CSV;
 			if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
 		}
-		
+
 		// write serialised recordset to cache item/file
 		function writecache($filename, $contents,  $debug, $secs2cache)
 		{
 			return adodb_write_file($filename, $contents,$debug);
 		}
-		
+
 		// load serialised recordset and unserialise it
 		function &readcache($filename, &$err, $secs2cache, $rsClass)
 		{
 			$rs = csv2rs($filename,$err,$secs2cache,$rsClass);
 			return $rs;
 		}
-		
+
 		// flush all items in cache
 		function flushall($debug=false)
 		{
 		global $ADODB_CACHE_DIR;
 
 		$rez = false;
-		
+
 			if (strlen($ADODB_CACHE_DIR) > 1) {
 				$rez = $this->_dirFlush($ADODB_CACHE_DIR);
 	         	if ($debug) ADOConnection::outp( "flushall: $dir<br><pre>\n". $rez."</pre>");
 	   		}
 			return $rez;
 		}
-		
+
 		// flush one file in cache
 		function flushcache($f, $debug=false)
 		{
@@ -304,43 +306,43 @@
 		   		if ($debug) ADOConnection::outp( "flushcache: failed for $f");
 			}
 		}
-		
+
 		function getdirname($hash)
 		{
 		global $ADODB_CACHE_DIR;
 			if (!isset($this->notSafeMode)) $this->notSafeMode = !ini_get('safe_mode');
 			return ($this->notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($hash,0,2) : $ADODB_CACHE_DIR;
 		}
-		
+
 		// create temp directories
 		function createdir($hash, $debug)
 		{
 		global $ADODB_CACHE_PERMS;
-		
+
 			$dir = $this->getdirname($hash);
 			if ($this->notSafeMode && !file_exists($dir)) {
 				$oldu = umask(0);
 				if (!@mkdir($dir, empty($ADODB_CACHE_PERMS) ? 0771 : $ADODB_CACHE_PERMS)) if(!is_dir($dir) && $debug) ADOConnection::outp("Cannot create $dir");
 				umask($oldu);
 			}
-		
+
 			return $dir;
 		}
-		
+
 		/**
 		* Private function to erase all of the files and subdirectories in a directory.
 		*
 		* Just specify the directory, and tell it if you want to delete the directory or just clear it out.
 		* Note: $kill_top_level is used internally in the function to flush subdirectories.
 		*/
-		function _dirFlush($dir, $kill_top_level = false) 
+		function _dirFlush($dir, $kill_top_level = false)
 		{
 		   if(!$dh = @opendir($dir)) return;
-		   
+
 		   while (($obj = readdir($dh))) {
 		   		if($obj=='.' || $obj=='..') continue;
 				$f = $dir.'/'.$obj;
-		
+
 				if (strpos($obj,'.cache')) @unlink($f);
 				if (is_dir($f)) $this->_dirFlush($f, true);
 		   }
@@ -348,27 +350,27 @@
 		   return true;
 		}
 	}
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADOConnection
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	 * Connection object. For connecting to databases, and executing queries.
-	 */ 
-	class ADOConnection {
+	 */
+	abstract class ADOConnection {
 	//
-	// PUBLIC VARS 
+	// PUBLIC VARS
 	//
 	var $dataProvider = 'native';
-	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql					
-	var $database = '';			/// Name of database to be used.	
-	var $host = ''; 			/// The hostname of the database server	
-	var $user = ''; 			/// The username which is used to connect to the database server. 
+	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql
+	var $database = '';			/// Name of database to be used.
+	var $host = ''; 			/// The hostname of the database server
+	var $user = ''; 			/// The username which is used to connect to the database server.
 	var $password = ''; 		/// Password for the username. For security, we no longer store it.
 	var $debug = false; 		/// if set to true will output sql statements
 	var $maxblobsize = 262144; 	/// maximum size of blobs or large text fields (262144 = 256K)-- some db's die otherwise like foxpro
-	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase	
+	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase
 	var $substr = 'substr';		/// substring operator
 	var $length = 'length';		/// string length ofperator
 	var $random = 'rand()';		/// random function
@@ -411,9 +413,9 @@
 	var $sysTimeStamp = false; /// name of function that returns the current timestamp
 	var $sysUTimeStamp = false; // name of function that returns the current timestamp accurate to the microsecond or nearest fraction
 	var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets
-	
+
 	var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' '
-	var $numCacheHits = 0; 
+	var $numCacheHits = 0;
 	var $numCacheMisses = 0;
 	var $pageExecuteCountRows = true;
 	var $uniqueSort = false; /// indicates that all fields in order by must be unique
@@ -422,18 +424,18 @@
 	var $ansiOuter = false; /// whether ansi outer join syntax supported
 	var $autoRollback = false; // autoRollback on PConnect().
 	var $poorAffectedRows = false; // affectedRows not working or unreliable
-	
+
 	var $fnExecute = false;
 	var $fnCacheExecute = false;
 	var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char
 	var $rsPrefix = "ADORecordSet_";
-	
+
 	var $autoCommit = true; 	/// do not modify this yourself - actually private
 	var $transOff = 0; 			/// temporarily disable transactions
 	var $transCnt = 0; 			/// count of nested transactions
-	
+
 	var $fetchMode=false;
-	
+
 	var $null2null = 'null'; // in autoexecute/getinsertsql/getupdatesql, this value will be converted to a null
 	var $bulkBind = false; // enable 2D Execute array
 	 //
@@ -441,60 +443,51 @@
 	 //
 	var $_oldRaiseFn =  false;
 	var $_transOK = null;
-	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.	
+	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.
 	var $_errorMsg = false;		/// A variable which was used to keep the returned last error message.  The value will
-								/// then returned by the errorMsg() function	
-	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8					
+								/// then returned by the errorMsg() function
+	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8
 	var $_queryID = false;		/// This variable keeps the last created result link identifier
-	
+
 	var $_isPersistentConnection = false;	/// A boolean variable to state whether its a persistent connection or normal connection.	*/
 	var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
 	var $_evalAll = false;
 	var $_affected = false;
 	var $_logsql = false;
 	var $_transmode = ''; // transaction mode
-	
 
-	
-	/**
-	 * Constructor
-	 */
-	function ADOConnection()			
-	{
-		die('Virtual Class -- cannot instantiate');
-	}
-	
+
 	static function Version()
 	{
 	global $ADODB_vers;
-	
-		$ok = preg_match( '/^[Vv]([0-9\.]+)/', $ADODB_vers, $matches );
+
+		$ok = preg_match( '/^[Vv]?([0-9]\.[0-9]+(dev|[a-z]))?/', $ADODB_vers, $matches );
 		if (!$ok) return (float) substr($ADODB_vers,1);
 		else return $matches[1];
 	}
-	
+
 	/**
 		Get server version info...
-		
-		@returns An array with 2 elements: $arr['string'] is the description string, 
+
+		@returns An array with 2 elements: $arr['string'] is the description string,
 			and $arr[version] is the version (also a string).
 	*/
 	function ServerInfo()
 	{
 		return array('description' => '', 'version' => '');
 	}
-	
+
 	function IsConnected()
 	{
-    	return !empty($this->_connectionID);
+		return !empty($this->_connectionID);
 	}
-	
+
 	function _findvers($str)
 	{
 		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
 		else return '';
 	}
-	
+
 	/**
 	* All error messages go through this bottleneck function.
 	* You can define your own handler by defining the function name in ADODB_OUTP.
@@ -502,7 +495,7 @@
 	static function outp($msg,$newline=true)
 	{
 	global $ADODB_FLUSH,$ADODB_OUTP;
-	
+
 		if (defined('ADODB_OUTP')) {
 			$fn = ADODB_OUTP;
 			$fn($msg,$newline);
@@ -512,25 +505,25 @@
 			$fn($msg,$newline);
 			return;
 		}
-		
+
 		if ($newline) $msg .= "<br>\n";
-		
+
 		if (isset($_SERVER['HTTP_USER_AGENT']) || !$newline) echo $msg;
 		else echo strip_tags($msg);
-	
-		
-		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan 
-		
+
+
+		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan
+
 	}
-	
+
 	function Time()
 	{
 		$rs = $this->_Execute("select $this->sysTimeStamp");
 		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
+
 		return false;
 	}
-	
+
 	/**
 	 * Connect to database
 	 *
@@ -541,16 +534,16 @@
 	 * @param [forceNew]		force new connection
 	 *
 	 * @return true or false
-	 */	  
-	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) 
+	 */
+	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false)
 	{
 		if ($argHostname != "") $this->host = $argHostname;
 		if ($argUsername != "") $this->user = $argUsername;
 		if ($argPassword != "") $this->password = 'not stored'; // not stored for security reasons
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-		
-		$this->_isPersistentConnection = false;	
-			
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;
+
+		$this->_isPersistentConnection = false;
+
 		if ($forceNew) {
 			if ($rez=$this->_nconnect($this->host, $this->user, $argPassword, $this->database)) return true;
 		} else {
@@ -564,21 +557,21 @@
 			$err = "Missing extension for ".$this->dataProvider;
 			$ret = 0;
 		}
-		if ($fn = $this->raiseErrorFn) 
+		if ($fn = $this->raiseErrorFn)
 			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		
-		
+
+
 		$this->_connectionID = false;
 		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
 		return $ret;
-	}	
-	
+	}
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
 	}
-	
-	
+
+
 	/**
 	 * Always force a new connection to database - currently only works with oracle
 	 *
@@ -588,12 +581,12 @@
 	 * @param [argDatabaseName]	database
 	 *
 	 * @return true or false
-	 */	  
-	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") 
+	 */
+	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
 	{
 		return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
 	}
-	
+
 	/**
 	 * Establish persistent connect to database
 	 *
@@ -603,20 +596,20 @@
 	 * @param [argDatabaseName]	database
 	 *
 	 * @return return true or false
-	 */	
+	 */
 	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
 	{
-		
-		if (defined('ADODB_NEVER_PERSIST')) 
+
+		if (defined('ADODB_NEVER_PERSIST'))
 			return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
-		
+
 		if ($argHostname != "") $this->host = $argHostname;
 		if ($argUsername != "") $this->user = $argUsername;
 		if ($argPassword != "") $this->password = 'not stored';
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-			
-		$this->_isPersistentConnection = true;	
-		
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;
+
+		$this->_isPersistentConnection = true;
+
 		if ($rez = $this->_pconnect($this->host, $this->user, $argPassword, $this->database)) return true;
 		if (isset($rez)) {
 			$err = $this->ErrorMsg();
@@ -629,7 +622,7 @@
 		if ($fn = $this->raiseErrorFn) {
 			$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
 		}
-		
+
 		$this->_connectionID = false;
 		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
 		return $ret;
@@ -640,32 +633,32 @@
 		if (defined('ADODB_ERROR_HANDLER') &&  ADODB_ERROR_HANDLER == 'adodb_throw') {
 			adodb_throw($this->databaseType,$src,-9999,$msg,$sql,false,$this);
 			return;
-		} 
+		}
 		ADOConnection::outp($msg);
 	}
-	
+
 	// create cache class. Code is backward compat with old memcache implementation
 	function _CreateCache()
 	{
 	global $ADODB_CACHE, $ADODB_CACHE_CLASS;
-	
+
 		if ($this->memCache) {
 		global $ADODB_INCLUDED_MEMCACHE;
-		
+
 			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
 				$ADODB_CACHE = new ADODB_Cache_MemCache($this);
 		} else
 				$ADODB_CACHE = new $ADODB_CACHE_CLASS($this);
-		
+
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysDate;
 		return $col; // child class implement
 	}
-	
+
 	/**
 	 * Should prepare the sql statement and return the stmt resource.
 	 * For databases that do not support this, we return the $sql. To ensure
@@ -680,7 +673,7 @@
 	 * @return return FALSE, or the prepared statement, or the original sql if
 	 * 			if the database does not support prepare.
 	 *
-	 */	
+	 */
 	function Prepare($sql)
 	{
 		return $sql;
@@ -699,7 +692,7 @@
 	 * @return return FALSE, or the prepared statement, or the original sql if
 	 * 			if the database does not support prepare.
 	 *
-	 */	
+	 */
 	function PrepareSP($sql,$param=true)
 	{
 		return $this->Prepare($sql,$param);
@@ -712,7 +705,7 @@
 	{
 		return $this->qstr($s,false);
 	}
-	
+
 	/**
 	 Requested by "Karsten Dambekalns" <k.dambekalns at fishfarm.de>
 	*/
@@ -726,48 +719,48 @@
 		#if (!empty($this->qNull)) if ($s == 'null') return $s;
 		$s = $this->qstr($s,false);
 	}
-	
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
 	function ErrorNative()
 	{
 		return $this->ErrorNo();
 	}
 
-	
-   /**
-	* PEAR DB Compat - do not use internally. 
-	*/
+
+	/**
+	 * PEAR DB Compat - do not use internally.
+	 */
 	function nextId($seq_name)
 	{
 		return $this->GenID($seq_name);
 	}
 
 	/**
-	*	 Lock a row, will escalate and lock the table if row locking not supported
-	*	will normally free the lock at the end of the transaction
-	*
-	*  @param $table	name of table to lock
-	*  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
-	*/
+	 *	 Lock a row, will escalate and lock the table if row locking not supported
+	 *	will normally free the lock at the end of the transaction
+	 *
+	 *  @param $table	name of table to lock
+	 *  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
+	 */
 	function RowLock($table,$where,$col='1 as adodbignore')
 	{
 		return false;
 	}
-	
+
 	function CommitLock($table)
 	{
 		return $this->CommitTrans();
 	}
-	
+
 	function RollbackLock($table)
 	{
 		return $this->RollbackTrans();
 	}
-	
+
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*
 	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
 	* 	for easy porting :-)
@@ -776,20 +769,20 @@
 	* @returns		The previous fetch mode
 	*/
 	function SetFetchMode($mode)
-	{	
+	{
 		$old = $this->fetchMode;
 		$this->fetchMode = $mode;
-		
+
 		if ($old === false) {
 		global $ADODB_FETCH_MODE;
 			return $ADODB_FETCH_MODE;
 		}
 		return $old;
 	}
-	
+
 
 	/**
-	* PEAR DB Compat - do not use internally. 
+	* PEAR DB Compat - do not use internally.
 	*/
 	function Query($sql, $inputarr=false)
 	{
@@ -798,18 +791,18 @@
 		return $rs;
 	}
 
-	
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
 	function LimitQuery($sql, $offset, $count, $params=false)
 	{
-		$rs = $this->SelectLimit($sql, $count, $offset, $params); 
+		$rs = $this->SelectLimit($sql, $count, $offset, $params);
 		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
 		return $rs;
 	}
 
-	
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
@@ -817,21 +810,25 @@
 	{
 		return $this->Close();
 	}
-	
-	/*
-		 Returns placeholder for parameter, eg.
-		 $DB->Param('a')
-		 
-		 will return ':a' for Oracle, and '?' for most other databases...
-		 
-		 For databases that require positioned params, eg $1, $2, $3 for postgresql,
-		 	pass in Param(false) before setting the first parameter.
-	*/
+
+	/**
+	 * Returns a placeholder for query parameters
+	 * e.g. $DB->Param('a') will return
+	 * - '?' for most databases
+	 * - ':a' for Oracle
+	 * - '$1', '$2', etc. for PostgreSQL
+	 * @param string $name parameter's name, false to force a reset of the
+	 *                     number to 1 (for databases that require positioned
+	 *                     params such as PostgreSQL; note that ADOdb will
+	 *                     automatically reset this when executing a query )
+	 * @param string $type (unused)
+	 * @return string query parameter placeholder
+	 */
 	function Param($name,$type='C')
 	{
 		return '?';
 	}
-	
+
 	/*
 		InParameter and OutParameter are self-documenting versions of Parameter().
 	*/
@@ -839,23 +836,23 @@
 	{
 		return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
 	}
-	
+
 	/*
 	*/
 	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
 	{
 		return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
-	
+
 	}
 
-	
-	/* 
+
+	/*
 	Usage in oracle
 		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
 		$db->Parameter($stmt,$id,'myid');
 		$db->Parameter($stmt,$group,'group',64);
 		$db->Execute();
-		
+
 		@param $stmt Statement returned by Prepare() or PrepareSP().
 		@param $var PHP variable to bind to
 		@param $name Name of stored procedure variable name to bind to.
@@ -868,8 +865,8 @@
 	{
 		return false;
 	}
-	
-	
+
+
 	function IgnoreErrors($saveErrs=false)
 	{
 		if (!$saveErrs) {
@@ -881,11 +878,11 @@
 			$this->_transOK = $saveErrs[1];
 		}
 	}
-	
+
 	/**
 		Improved method of initiating a transaction. Used together with CompleteTrans().
 		Advantages include:
-		
+
 		a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
 		   Only the outermost block is treated as a transaction.<br>
 		b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.<br>
@@ -898,23 +895,23 @@
 			$this->transOff += 1;
 			return true;
 		}
-		
+
 		$this->_oldRaiseFn = $this->raiseErrorFn;
 		$this->raiseErrorFn = $errfn;
 		$this->_transOK = true;
-		
+
 		if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
 		$ok = $this->BeginTrans();
 		$this->transOff = 1;
 		return $ok;
 	}
-	
-	
+
+
 	/**
 		Used together with StartTrans() to end a transaction. Monitors connection
 		for sql errors, and will commit or rollback as appropriate.
-		
-		@autoComplete if true, monitor sql errors and commit and rollback as appropriate, 
+
+		@autoComplete if true, monitor sql errors and commit and rollback as appropriate,
 		and if set to false force rollback even if no SQL error detected.
 		@returns true on commit, false on rollback.
 	*/
@@ -925,7 +922,7 @@
 			return true;
 		}
 		$this->raiseErrorFn = $this->_oldRaiseFn;
-		
+
 		$this->transOff = 0;
 		if ($this->_transOK && $autoComplete) {
 			if (!$this->CommitTrans()) {
@@ -938,16 +935,16 @@
 			$this->RollbackTrans();
 			if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred");
 		}
-		
+
 		return $this->_transOK;
 	}
-	
+
 	/*
 		At the end of a StartTrans/CompleteTrans block, perform a rollback.
 	*/
 	function FailTrans()
 	{
-		if ($this->debug) 
+		if ($this->debug)
 			if ($this->transOff == 0) {
 				ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans");
 			} else {
@@ -956,7 +953,7 @@
 			}
 		$this->_transOK = false;
 	}
-	
+
 	/**
 		Check if transaction has failed, only for Smart Transactions.
 	*/
@@ -965,43 +962,43 @@
 		if ($this->transOff > 0) return $this->_transOK == false;
 		return false;
 	}
-	
+
 	/**
-	 * Execute SQL 
+	 * Execute SQL
 	 *
 	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
 	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
 	 * @return 		RecordSet or false
 	 */
-	function Execute($sql,$inputarr=false) 
+	function Execute($sql,$inputarr=false)
 	{
 		if ($this->fnExecute) {
 			$fn = $this->fnExecute;
 			$ret = $fn($this,$sql,$inputarr);
 			if (isset($ret)) return $ret;
 		}
-		if ($inputarr) {
+		if ($inputarr !== false) {
 			if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
+
 			$element0 = reset($inputarr);
 			# is_object check because oci8 descriptors can be passed in
 			$array_2d = $this->bulkBind && is_array($element0) && !is_object(reset($element0));
-		
+
 			//remove extra memory copy of input -mikefedyk
 			unset($element0);
-			
+
 			if (!is_array($sql) && !$this->_bindInputArray) {
 				$sqlarr = explode('?',$sql);
 				$nparams = sizeof($sqlarr)-1;
 				if (!$array_2d) $inputarr = array($inputarr);
-	
+
 				foreach($inputarr as $arr) {
 					$sql = ''; $i = 0;
 					//Use each() instead of foreach to reduce memory usage -mikefedyk
 					while(list(, $v) = each($arr)) {
 						$sql .= $sqlarr[$i];
 						// from Ron Baldwin <ron.baldwin#sourceprose.com>
-						// Only quote string types	
+						// Only quote string types
 						$typ = gettype($v);
 						if ($typ == 'string')
 							//New memory copy of input created here -mikefedyk
@@ -1018,25 +1015,25 @@
 						else
 							$sql .= $v;
 						$i += 1;
-						
+
 						if ($i == $nparams) break;
 					} // while
 					if (isset($sqlarr[$i])) {
 						$sql .= $sqlarr[$i];
 						if ($i+1 != sizeof($sqlarr)) $this->outp_throw( "Input Array does not match ?: ".htmlspecialchars($sql),'Execute');
-					} else if ($i != sizeof($sqlarr))	
+					} else if ($i != sizeof($sqlarr))
 						$this->outp_throw( "Input array does not match ?: ".htmlspecialchars($sql),'Execute');
-		
+
 					$ret = $this->_Execute($sql);
 					if (!$ret) return $ret;
-				}	
+				}
 			} else {
 				if ($array_2d) {
 					if (is_string($sql))
 						$stmt = $this->Prepare($sql);
 					else
 						$stmt = $sql;
-					
+
 					foreach($inputarr as $arr) {
 						$ret = $this->_Execute($stmt,$arr);
 						if (!$ret) return $ret;
@@ -1051,8 +1048,8 @@
 
 		return $ret;
 	}
-	
-	
+
+
 	function _Execute($sql,$inputarr=false)
 	{
 		if ($this->debug) {
@@ -1062,28 +1059,28 @@
 		} else {
 			$this->_queryID = @$this->_query($sql,$inputarr);
 		}
-		
-		/************************
+
+		// ************************
 		// OK, query executed
-		*************************/
+		// ************************
 
 		if ($this->_queryID === false) { // error handling if query fails
-			if ($this->debug == 99) adodb_backtrace(true,5);	
+			if ($this->debug == 99) adodb_backtrace(true,5);
 			$fn = $this->raiseErrorFn;
 			if ($fn) {
 				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
-			} 
+			}
 			$false = false;
 			return $false;
-		} 
-		
+		}
+
 		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
 			$rsclass = $this->rsPrefix.'empty';
 			$rs = (class_exists($rsclass)) ? new $rsclass():  new ADORecordSet_empty();
-			
+
 			return $rs;
 		}
-		
+
 		// return real recordset from select statement
 		$rsclass = $this->rsPrefix.$this->databaseType;
 		$rs = new $rsclass($this->_queryID,$this->fetchMode);
@@ -1094,7 +1091,7 @@
 		if ($rs->_numOfRows <= 0) {
 		global $ADODB_COUNTRECS;
 			if ($ADODB_COUNTRECS) {
-				if (!$rs->EOF) { 
+				if (!$rs->EOF) {
 					$rs = $this->_rs2rs($rs,-1,-1,!is_array($sql));
 					$rs->_queryID = $this->_queryID;
 				} else
@@ -1129,16 +1126,16 @@
 		if (!$this->hasGenID) {
 			return 0; // formerly returns false pre 1.60
 		}
-		
+
 		$getnext = sprintf($this->_genIDSQL,$seqname);
-		
+
 		$holdtransOK = $this->_transOK;
-		
+
 		$save_handler = $this->raiseErrorFn;
 		$this->raiseErrorFn = '';
 		@($rs = $this->Execute($getnext));
 		$this->raiseErrorFn = $save_handler;
-		
+
 		if (!$rs) {
 			$this->_transOK = $holdtransOK; //if the status was ok before reset
 			$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
@@ -1146,17 +1143,17 @@
 		}
 		if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
 		else $this->genID = 0; // false
-	
+
 		if ($rs) $rs->Close();
 
 		return $this->genID;
-	}	
+	}
 
 	/**
 	 * @param $table string name of the table, not needed by all databases (eg. mysql), default ''
 	 * @param $column string name of the column, not needed by all databases (eg. mysql), default ''
 	 * @return  the last inserted ID. Not all databases support this.
-	 */ 
+	 */
 	function Insert_ID($table='',$column='')
 	{
 		if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
@@ -1174,8 +1171,8 @@
 	 *
 	 * @return  the last inserted ID. All databases support this. But aware possible
 	 * problems in multiuser environments. Heavy test this before deploying.
-	 */ 
-	function PO_Insert_ID($table="", $id="") 
+	 */
+	function PO_Insert_ID($table="", $id="")
 	{
 	   if ($this->hasInsertID){
 		   return $this->Insert_ID($table,$id);
@@ -1186,7 +1183,7 @@
 
 	/**
 	* @return # rows affected by UPDATE/DELETE
-	*/ 
+	*/
 	function Affected_Rows()
 	{
 		if ($this->hasAffectedRows) {
@@ -1196,12 +1193,12 @@
 			$val = $this->_affectedrows();
 			return ($val < 0) ? false : $val;
 		}
-				  
+
 		if ($this->debug) ADOConnection::outp( '<p>Affected_Rows error</p>',false);
 		return false;
 	}
-	
-	
+
+
 	/**
 	 * @return  the last error message
 	 */
@@ -1210,29 +1207,29 @@
 		if ($this->_errorMsg) return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
 		else return '';
 	}
-	
-	
+
+
 	/**
 	 * @return the last error number. Normally 0 means no error.
 	 */
-	function ErrorNo() 
+	function ErrorNo()
 	{
 		return ($this->_errorMsg) ? -1 : 0;
 	}
-	
+
 	function MetaError($err=false)
 	{
 		include_once(ADODB_DIR."/adodb-error.inc.php");
 		if ($err === false) $err = $this->ErrorNo();
 		return adodb_error($this->dataProvider,$this->databaseType,$err);
 	}
-	
+
 	function MetaErrorMsg($errno)
 	{
 		include_once(ADODB_DIR."/adodb-error.inc.php");
 		return adodb_errormsg($errno);
 	}
-	
+
 	/**
 	 * @returns an array with the primary key columns in it.
 	 */
@@ -1252,7 +1249,7 @@
 			return ADODB_VIEW_PRIMARYKEYS($this->databaseType, $this->database, $table, $owner);
 		return false;
 	}
-	
+
 	/**
 	 * @returns assoc array where keys are tables, and values are foreign keys
 	 */
@@ -1266,40 +1263,40 @@
 	 * @param dbName 	is the name of the database to select
 	 * @return 		true or false
 	 */
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{return false;}
-	
-	
+
+
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
-	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
-	* BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]		is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
+	 * Will select, getting rows from $offset (1-based), for $nrows.
+	 * This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	 * the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	 * MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	 * eg.
+	 *  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
+	 *  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
+	 *
+	 * Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
+	 * BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
+	 *
+	 * @param sql
+	 * @param [offset]	is the row to start calculations from (1-based)
+	 * @param [nrows]		is the number of rows to get
+	 * @param [inputarr]	array of bind variables
+	 * @param [secs2cache]		is a private parameter only used by jlim
+	 * @return		the recordset ($rs->databaseType == 'array')
+	 */
 	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		if ($this->hasTop && $nrows > 0) {
-		// suggested by Reinhard Balling. Access requires top after distinct 
+		// suggested by Reinhard Balling. Access requires top after distinct
 		 // Informix requires first before distinct - F Riosa
 			$ismssql = (strpos($this->databaseType,'mssql') !== false);
 			if ($ismssql) $isaccess = false;
 			else $isaccess = (strpos($this->databaseType,'access') !== false);
-			
+
 			if ($offset <= 	0) {
-				
+
 					// access includes ties in result
 					if ($isaccess) {
 						$sql = preg_replace(
@@ -1329,18 +1326,18 @@
 				}
 			}
 		}
-		
+
 		// if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is set, we buffer  rows
 		// 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS.
 		global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-			
+
 
 		if ($secs2cache != 0) $rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		else $rs = $this->Execute($sql,$inputarr);
-		
+
 		$ADODB_COUNTRECS = $savec;
 		if ($rs && !$rs->EOF) {
 			$rs = $this->_rs2rs($rs,$nrows,$offset);
@@ -1348,7 +1345,7 @@
 		//print_r($rs);
 		return $rs;
 	}
-	
+
 	/**
 	* Create serializable recordset. Breaks rs link to connection.
 	*
@@ -1359,10 +1356,10 @@
 		$rs2 = $this->_rs2rs($rs);
 		$ignore = false;
 		$rs2->connection = $ignore;
-		
+
 		return $rs2;
 	}
-	
+
 	/**
 	* Convert database recordset to an array recordset
 	* input recordset's cursor should be at beginning, and
@@ -1397,9 +1394,9 @@
 		$arr = $rs->GetArrayLimit($nrows,$offset);
 		//print_r($arr);
 		if ($close) $rs->Close();
-		
+
 		$arrayClass = $this->arrayClass;
-		
+
 		$rs2 = new $arrayClass();
 		$rs2->connection = $this;
 		$rs2->sql = $rs->sql;
@@ -1408,7 +1405,7 @@
 		$rs2->fetchMode = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
 		return $rs2;
 	}
-	
+
 	/*
 	* Return all rows. Compat with PEAR DB
 	*/
@@ -1417,7 +1414,7 @@
 		$arr = $this->GetArray($sql,$inputarr);
 		return $arr;
 	}
-	
+
 	function GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
 	{
 		$rs = $this->Execute($sql, $inputarr);
@@ -1428,7 +1425,7 @@
 		$arr = $rs->GetAssoc($force_array,$first2cols);
 		return $arr;
 	}
-	
+
 	function CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false)
 	{
 		if (!is_numeric($secs2cache)) {
@@ -1443,7 +1440,7 @@
 		$arr = $rs->GetAssoc($force_array,$first2cols);
 		return $arr;
 	}
-	
+
 	/**
 	* Return first element of first row of sql statement. Recordset is disposed
 	* for you.
@@ -1456,32 +1453,32 @@
 	global $ADODB_COUNTRECS,$ADODB_GETONE_EOF;
 		$crecs = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-		
+
 		$ret = false;
 		$rs = $this->Execute($sql,$inputarr);
-		if ($rs) {	
+		if ($rs) {
 			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
 			else $ret = reset($rs->fields);
-			
+
 			$rs->Close();
 		}
 		$ADODB_COUNTRECS = $crecs;
 		return $ret;
 	}
-	
+
 	// $where should include 'WHERE fld=value'
 	function GetMedian($table, $field,$where = '')
 	{
 		$total = $this->GetOne("select count(*) from $table $where");
 		if (!$total) return false;
-	
+
 		$midrow = (integer) ($total/2);
 		$rs = $this->SelectLimit("select $field from $table $where order by 1",1,$midrow);
 		if ($rs && !$rs->EOF) return reset($rs->fields);
 		return false;
 	}
-	
-	
+
+
 	function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
 	{
 	global $ADODB_GETONE_EOF;
@@ -1491,14 +1488,14 @@
 			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
 			else $ret = reset($rs->fields);
 			$rs->Close();
-		} 
-		
+		}
+
 		return $ret;
 	}
-	
+
 	function GetCol($sql, $inputarr = false, $trim = false)
 	{
-	  	
+
 	  	$rs = $this->Execute($sql, $inputarr);
 	  	if ($rs) {
 			$rv = array();
@@ -1518,7 +1515,7 @@
 			$rv = false;
 	  	return $rv;
 	}
-	
+
 	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
 	{
 	  	$rs = $this->CacheExecute($secs, $sql, $inputarr);
@@ -1538,34 +1535,34 @@
 	   		$rs->Close();
 	  	} else
 			$rv = false;
-			
+
 	  	return $rv;
 	}
-	
+
 	function Transpose(&$rs,$addfieldnames=true)
 	{
 		$rs2 = $this->_rs2rs($rs);
 		$false = false;
 		if (!$rs2) return $false;
-		
+
 		$rs2->_transpose($addfieldnames);
 		return $rs2;
 	}
- 
+
 	/*
 		Calculate the offset of a date for a particular database and generate
 			appropriate SQL. Useful for calculating future/past dates and storing
 			in a database.
-			
+
 		If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
 	*/
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
 		return  '('.$date.'+'.$dayFraction.')';
 	}
-	
-	
+
+
 	/**
 	*
 	* @param sql			SQL statement
@@ -1574,12 +1571,12 @@
 	function GetArray($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
 		$rs = $this->Execute($sql,$inputarr);
 		$ADODB_COUNTRECS = $savec;
-		if (!$rs) 
+		if (!$rs)
 			if (defined('ADODB_PEAR')) {
 				$cls = ADODB_PEAR_Error();
 				return $cls;
@@ -1591,23 +1588,23 @@
 		$rs->Close();
 		return $arr;
 	}
-	
+
 	function CacheGetAll($secs2cache,$sql=false,$inputarr=false)
 	{
 		$arr = $this->CacheGetArray($secs2cache,$sql,$inputarr);
 		return $arr;
 	}
-	
+
 	function CacheGetArray($secs2cache,$sql=false,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-		
+
 		$savec = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
 		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		$ADODB_COUNTRECS = $savec;
-		
-		if (!$rs) 
+
+		if (!$rs)
 			if (defined('ADODB_PEAR')) {
 				$cls = ADODB_PEAR_Error();
 				return $cls;
@@ -1619,16 +1616,16 @@
 		$rs->Close();
 		return $arr;
 	}
-	
+
 	function GetRandRow($sql, $arr= false)
 	{
 		$rezarr = $this->GetAll($sql, $arr);
 		$sz = sizeof($rezarr);
 		return $rezarr[abs(rand()) % $sz];
 	}
-	
+
 	/**
-	* Return one row of sql statement. Recordset is disposed for you. 
+	* Return one row of sql statement. Recordset is disposed for you.
 	* Note that SelectLimit should not be called.
 	*
 	* @param sql			SQL statement
@@ -1639,9 +1636,9 @@
 	global $ADODB_COUNTRECS;
 		$crecs = $ADODB_COUNTRECS;
 		$ADODB_COUNTRECS = false;
-		
+
 		$rs = $this->Execute($sql,$inputarr);
-		
+
 		$ADODB_COUNTRECS = $crecs;
 		if ($rs) {
 			if (!$rs->EOF) $arr = $rs->fields;
@@ -1649,27 +1646,27 @@
 			$rs->Close();
 			return $arr;
 		}
-		
+
 		$false = false;
 		return $false;
 	}
-	
+
 	function CacheGetRow($secs2cache,$sql=false,$inputarr=false)
 	{
 		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
 		if ($rs) {
 			if (!$rs->EOF) $arr = $rs->fields;
 			else $arr = array();
-			
+
 			$rs->Close();
 			return $arr;
 		}
 		$false = false;
 		return $false;
 	}
-	
+
 	/**
-	* Insert or replace a single record. Note: this is not the same as MySQL's replace. 
+	* Insert or replace a single record. Note: this is not the same as MySQL's replace.
 	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
 	* Also note that no table locking is done currently, so it is possible that the
 	* record be inserted twice by two programs...
@@ -1685,38 +1682,38 @@
 	*
 	* Currently blob replace not supported
 	*
-	* returns 0 = fail, 1 = update, 2 = insert 
+	* returns 0 = fail, 1 = update, 2 = insert
 	*/
-	
+
 	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
 	{
 		global $ADODB_INCLUDED_LIB;
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		
+
 		return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
 	}
-	
-	
+
+
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
-	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]	is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
+	 * Will select, getting rows from $offset (1-based), for $nrows.
+	 * This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	 * the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	 * MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	 * eg.
+	 *  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
+	 *  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
+	 *
+	 * BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
+	 *
+	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
+	 * @param sql
+	 * @param [offset]	is the row to start calculations from (1-based)
+	 * @param [nrows]	is the number of rows to get
+	 * @param [inputarr]	array of bind variables
+	 * @return		the recordset ($rs->databaseType == 'array')
+	 */
 	function CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
-	{	
+	{
 		if (!is_numeric($secs2cache)) {
 			if ($sql === false) $sql = -1;
 			if ($offset == -1) $offset = false;
@@ -1728,52 +1725,52 @@
 		}
 		return $rs;
 	}
-	
-	
+
+
 	/**
-	* Flush cached recordsets that match a particular $sql statement. 
-	* If $sql == false, then we purge all files in the cache.
- 	*/
-	
+	 * Flush cached recordsets that match a particular $sql statement.
+	 * If $sql == false, then we purge all files in the cache.
+	 */
+
 	/**
-   * Flush cached recordsets that match a particular $sql statement. 
-   * If $sql == false, then we purge all files in the cache.
-    */
+	 * Flush cached recordsets that match a particular $sql statement.
+	 * If $sql == false, then we purge all files in the cache.
+	 */
 	function CacheFlush($sql=false,$inputarr=false)
 	{
 	global $ADODB_CACHE_DIR, $ADODB_CACHE;
-		
+
 		if (empty($ADODB_CACHE)) return false;
-		
+
 		if (!$sql) {
 			 $ADODB_CACHE->flushall($this->debug);
 	         return;
 	    }
-		
+
 		$f = $this->_gencachename($sql.serialize($inputarr),false);
 		return $ADODB_CACHE->flushcache($f, $this->debug);
 	}
-   
-	
+
+
 	/**
-	* Private function to generate filename for caching.
-	* Filename is generated based on:
-	*
-	*  - sql statement
-	*  - database type (oci8, ibase, ifx, etc)
-	*  - database name
-	*  - userid
-	*  - setFetchMode (adodb 4.23)
-	*
-	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). 
-	* Assuming that we can have 50,000 files per directory with good performance, 
-	* then we can scale to 12.8 million unique cached recordsets. Wow!
- 	*/
+	 * Private function to generate filename for caching.
+	 * Filename is generated based on:
+	 *
+	 *  - sql statement
+	 *  - database type (oci8, ibase, ifx, etc)
+	 *  - database name
+	 *  - userid
+	 *  - setFetchMode (adodb 4.23)
+	 *
+	 * When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR).
+	 * Assuming that we can have 50,000 files per directory with good performance,
+	 * then we can scale to 12.8 million unique cached recordsets. Wow!
+	 */
 	function _gencachename($sql,$createdir)
 	{
 	global $ADODB_CACHE, $ADODB_CACHE_DIR;
-		
-		if ($this->fetchMode === false) { 
+
+		if ($this->fetchMode === false) {
 		global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		} else {
@@ -1783,15 +1780,15 @@
 		if (!$ADODB_CACHE->createdir) return $m;
 		if (!$createdir) $dir = $ADODB_CACHE->getdirname($m);
 		else $dir = $ADODB_CACHE->createdir($m, $this->debug);
-		
+
 		return $dir.'/adodb_'.$m.'.cache';
 	}
-	
-	
+
+
 	/**
 	 * Execute SQL, caching recordsets.
 	 *
-	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. 
+	 * @param [secs2cache]	seconds to cache data, set to 0 to force query.
 	 *					  This is an optional parameter.
 	 * @param sql		SQL statement to execute
 	 * @param [inputarr]	holds the input data  to bind to
@@ -1800,25 +1797,25 @@
 	function CacheExecute($secs2cache,$sql=false,$inputarr=false)
 	{
 	global $ADODB_CACHE;
-	
+
 		if (empty($ADODB_CACHE)) $this->_CreateCache();
-		
+
 		if (!is_numeric($secs2cache)) {
 			$inputarr = $sql;
 			$sql = $secs2cache;
 			$secs2cache = $this->cacheSecs;
 		}
-		
+
 		if (is_array($sql)) {
 			$sqlparam = $sql;
 			$sql = $sql[0];
 		} else
 			$sqlparam = $sql;
-			
-		
+
+
 		$md5file = $this->_gencachename($sql.serialize($inputarr),true);
 		$err = '';
-		
+
 		if ($secs2cache > 0){
 			$rs = $ADODB_CACHE->readcache($md5file,$err,$secs2cache,$this->arrayClass);
 			$this->numCacheHits += 1;
@@ -1827,7 +1824,7 @@
 			$rs = false;
 			$this->numCacheMisses += 1;
 		}
-		
+
 		if (!$rs) {
 		// no cached rs found
 			if ($this->debug) {
@@ -1836,7 +1833,7 @@
 				}
 				if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (this is a notice and not an error)");
 			}
-			
+
 			$rs = $this->Execute($sqlparam,$inputarr);
 
 			if ($rs) {
@@ -1845,13 +1842,13 @@
 				$rs = $this->_rs2rs($rs); // read entire recordset into memory immediately
 				$rs->timeCreated = time(); // used by caching
 				$txt = _rs2serialize($rs,false,$sql); // serialize
-	
+
 				$ok = $ADODB_CACHE->writecache($md5file,$txt,$this->debug, $secs2cache);
 				if (!$ok) {
 					if ($ok === false) {
 						$em = 'Cache write error';
 						$en = -32000;
-						
+
 						if ($fn = $this->raiseErrorFn) {
 							$fn($this->databaseType,'CacheExecute', $en, $em, $md5file,$sql,$this);
 						}
@@ -1860,52 +1857,52 @@
 						$en = -32001;
 						// do not call error handling for just a warning
 					}
-					
+
 					if ($this->debug) ADOConnection::outp( " ".$em);
 				}
 				if ($rs->EOF && !$eof) {
 					$rs->MoveFirst();
-					//$rs = csv2rs($md5file,$err);		
+					//$rs = csv2rs($md5file,$err);
 					$rs->connection = $this; // Pablo suggestion
-				}  
-				
+				}
+
 			} else if (!$this->memCache)
 				$ADODB_CACHE->flushcache($md5file);
 		} else {
 			$this->_errorMsg = '';
 			$this->_errorCode = 0;
-			
+
 			if ($this->fnCacheExecute) {
 				$fn = $this->fnCacheExecute;
 				$fn($this, $secs2cache, $sql, $inputarr);
 			}
 		// ok, set cached object found
 			$rs->connection = $this; // Pablo suggestion
-			if ($this->debug){ 			
+			if ($this->debug){
 				if ($this->debug == 99) adodb_backtrace();
 				$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
 				$ttl = $rs->timeCreated + $secs2cache - time();
 				$s = is_array($sql) ? $sql[0] : $sql;
 				if ($inBrowser) $s = '<i>'.htmlspecialchars($s).'</i>';
-				
+
 				ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
 			}
 		}
 		return $rs;
 	}
-	
-	
-	/* 
-		Similar to PEAR DB's autoExecute(), except that 
+
+
+	/*
+		Similar to PEAR DB's autoExecute(), except that
 		$mode can be 'INSERT' or 'UPDATE' or DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
 		If $mode == 'UPDATE', then $where is compulsory as a safety measure.
-		
+
 		$forceUpdate means that even if the data has not changed, perform update.
 	 */
-	function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
+	function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false)
 	{
 		$false = false;
-		$sql = 'SELECT * FROM '.$table;  
+		$sql = 'SELECT * FROM '.$table;
 		if ($where!==FALSE) $sql .= ' WHERE '.$where;
 		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
 			$this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause','AutoExecute');
@@ -1916,7 +1913,7 @@
 		if (!$rs) return $false; // table does not exist
 		$rs->tableName = $table;
 		$rs->sql = $sql;
-		
+
 		switch((string) $mode) {
 		case 'UPDATE':
 		case '2':
@@ -1935,31 +1932,31 @@
 		if ($ret) $ret = true;
 		return $ret;
 	}
-	
-	
+
+
 	/**
 	 * Generates an Update Query based on an existing recordset.
 	 * $arrFields is an associative array of fields with the value
 	 * that should be assigned.
 	 *
 	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table and sql should only 
+	 *	   that is run against a single table and sql should only
 	 *		 be a simple select stmt with no groupby/orderby/limit
 	 *
 	 * "Jonathan Younger" <jyounger at unilab.com>
-  	 */
+	 */
 	function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null)
 	{
 		global $ADODB_INCLUDED_LIB;
 
-        //********************************************************//
-        //This is here to maintain compatibility
-        //with older adodb versions. Sets force type to force nulls if $forcenulls is set.
+		// ********************************************************
+		// This is here to maintain compatibility
+		// with older adodb versions. Sets force type to force nulls if $forcenulls is set.
 		if (!isset($force)) {
 				global $ADODB_FORCE_TYPE;
 			    $force = $ADODB_FORCE_TYPE;
 		}
-		//********************************************************//
+		// ********************************************************
 
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
 		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
@@ -1971,30 +1968,30 @@
 	 * that should be assigned.
 	 *
 	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table.
-  	 */
+	 *       that is run against a single table.
+	 */
 	function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null)
-	{	
+	{
 		global $ADODB_INCLUDED_LIB;
 		if (!isset($force)) {
 			global $ADODB_FORCE_TYPE;
 			$force = $ADODB_FORCE_TYPE;
-			
+
 		}
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
 		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
 	}
-	
+
 
 	/**
 	* Update a blob column, given a where clause. There are more sophisticated
 	* blob handling functions that we could have implemented, but all require
 	* a very complex API. Instead we have chosen something that is extremely
-	* simple to understand and use. 
+	* simple to understand and use.
 	*
 	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
 	*
-	* Usage to update a $blobvalue which has a primary key blob_id=1 into a 
+	* Usage to update a $blobvalue which has a primary key blob_id=1 into a
 	* field blobtable.blobcolumn:
 	*
 	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
@@ -2004,7 +2001,7 @@
 	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 	*	$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
-	
+
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
@@ -2013,7 +2010,7 @@
 	/**
 	* Usage:
 	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
-	*	
+	*
 	*	$blobtype supports 'BLOB' and 'CLOB'
 	*
 	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
@@ -2027,45 +2024,45 @@
 		fclose($fd);
 		return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
 	}
-	
+
 	function BlobDecode($blob)
 	{
 		return $blob;
 	}
-	
+
 	function BlobEncode($blob)
 	{
 		return $blob;
 	}
-	
+
 	function SetCharSet($charset)
 	{
 		return false;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
 	}
-	
+
 	function LogSQL($enable=true)
 	{
 		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		
+
 		if ($enable) $this->fnExecute = 'adodb_log_sql';
 		else $this->fnExecute = false;
-		
-		$old = $this->_logsql;	
+
+		$old = $this->_logsql;
 		$this->_logsql = $enable;
 		if ($enable && !$old) $this->_affected = false;
 		return $old;
 	}
-	
+
 	function GetCharSet()
 	{
 		return false;
 	}
-	
+
 	/**
 	* Usage:
 	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
@@ -2077,21 +2074,21 @@
 	{
 		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
 	}
-	
+
 	// not the fastest implementation - quick and dirty - jlim
 	// for best performance, use the actual $rs->MetaType().
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
-		
+
 		if (empty($this->_metars)) {
 			$rsclass = $this->rsPrefix.$this->databaseType;
-			$this->_metars = new $rsclass(false,$this->fetchMode); 
+			$this->_metars = new $rsclass(false,$this->fetchMode);
 			$this->_metars->connection = $this;
 		}
 		return $this->_metars->MetaType($t,$len,$fieldobj);
 	}
-	
-	
+
+
 	/**
 	*  Change the SQL connection locale to a specified locale.
 	*  This is used to get the date formats written depending on the client locale.
@@ -2105,13 +2102,13 @@
 				$this->fmtDate="'Y-m-d'";
 				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
 				break;
-				
+
 			case 'US':
 				$this->fmtDate = "'m-d-Y'";
 				$this->fmtTimeStamp = "'m-d-Y H:i:s'";
 				break;
-				
-			case 'PT_BR': 	
+
+			case 'PT_BR':
 			case 'NL':
 			case 'FR':
 			case 'RO':
@@ -2119,12 +2116,12 @@
 				$this->fmtDate="'d-m-Y'";
 				$this->fmtTimeStamp = "'d-m-Y H:i:s'";
 				break;
-				
+
 			case 'GE':
 				$this->fmtDate="'d.m.Y'";
 				$this->fmtTimeStamp = "'d.m.Y H:i:s'";
 				break;
-				
+
 			default:
 				$this->fmtDate="'Y-m-d'";
 				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
@@ -2133,13 +2130,13 @@
 	}
 
 	/**
-	 * GetActiveRecordsClass Performs an 'ALL' query 
-	 * 
+	 * GetActiveRecordsClass Performs an 'ALL' query
+	 *
 	 * @param mixed $class This string represents the class of the current active record
 	 * @param mixed $table Table used by the active record object
 	 * @param mixed $whereOrderBy Where, order, by clauses
-	 * @param mixed $bindarr 
-	 * @param mixed $primkeyArr 
+	 * @param mixed $bindarr
+	 * @param mixed $primkeyArr
 	 * @param array $extra Query extras: limit, offset...
 	 * @param mixed $relations Associative array: table's foreign name, "hasMany", "belongsTo"
 	 * @access public
@@ -2156,13 +2153,13 @@
 		if (!isset($_ADODB_ACTIVE_DBS))include_once(ADODB_DIR.'/adodb-active-record.inc.php');
 		return adodb_GetActiveRecordsClass($this, $class, $table, $whereOrderBy, $bindarr, $primkeyArr, $extra, $relations);
 	}
-	
+
 	function GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false)
 	{
 		$arr = $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr);
 		return $arr;
 	}
-	
+
 	/**
 	 * Close Connection
 	 */
@@ -2172,20 +2169,20 @@
 		$this->_connectionID = false;
 		return $rez;
 	}
-	
+
 	/**
 	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
 	 *
 	 * @return true if succeeded or false if database does not support transactions
 	 */
-	function BeginTrans() 
+	function BeginTrans()
 	{
 		if ($this->debug) ADOConnection::outp("BeginTrans: Transactions not supported for this driver");
 		return false;
 	}
-	
+
 	/* set transaction mode */
-	function SetTransactionMode( $transaction_mode ) 
+	function SetTransactionMode( $transaction_mode )
 	{
 		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
 		$this->_transmode  = $transaction_mode;
@@ -2200,11 +2197,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		$mode = strtoupper($mode);
 		$mode = str_replace('ISOLATION LEVEL ','',$mode);
-		
+
 		switch($mode) {
 
 		case 'READ UNCOMMITTED':
-			switch($db) { 
+			switch($db) {
 			case 'oci8':
 			case 'oracle':
 				return 'ISOLATION LEVEL READ COMMITTED';
@@ -2212,11 +2209,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				return 'ISOLATION LEVEL READ UNCOMMITTED';
 			}
 			break;
-					
+
 		case 'READ COMMITTED':
 				return 'ISOLATION LEVEL READ COMMITTED';
 			break;
-			
+
 		case 'REPEATABLE READ':
 			switch($db) {
 			case 'oci8':
@@ -2226,16 +2223,16 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				return 'ISOLATION LEVEL REPEATABLE READ';
 			}
 			break;
-			
+
 		case 'SERIALIZABLE':
 				return 'ISOLATION LEVEL SERIALIZABLE';
 			break;
-			
+
 		default:
 			return $mode;
 		}
 	}
-	
+
 	/**
 	 * If database does not support transactions, always return true as data always commited
 	 *
@@ -2243,71 +2240,70 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return true/false.
 	 */
-	function CommitTrans($ok=true) 
+	function CommitTrans($ok=true)
 	{ return true;}
-	
-	
+
+
 	/**
 	 * If database does not support transactions, rollbacks always fail, so return false
 	 *
 	 * @return true/false.
 	 */
-	function RollbackTrans() 
+	function RollbackTrans()
 	{ return false;}
 
 
 	/**
-	 * return the databases that the driver can connect to. 
+	 * return the databases that the driver can connect to.
 	 * Some databases will return an empty array.
 	 *
 	 * @return an array of database names.
 	 */
-		function MetaDatabases() 
+		function MetaDatabases()
 		{
 		global $ADODB_FETCH_MODE;
-		
+
 			if ($this->metaDatabasesSQL) {
-				$save = $ADODB_FETCH_MODE; 
-				$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-				
+				$save = $ADODB_FETCH_MODE;
+				$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
 				if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-				
+
 				$arr = $this->GetCol($this->metaDatabasesSQL);
 				if (isset($savem)) $this->SetFetchMode($savem);
-				$ADODB_FETCH_MODE = $save; 
-			
+				$ADODB_FETCH_MODE = $save;
+
 				return $arr;
 			}
-			
+
 			return false;
 		}
-	
-	  /**
-      * List procedures or functions in an array.
-      * @param procedureNamePattern  a procedure name pattern; must match the procedure name as it is stored in the database
-      * @param catalog a catalog name; must match the catalog name as it is stored in the database;
-      * @param schemaPattern a schema name pattern;
-      *
-      * @return array of procedures on current database.
-	  
-		 Array (
-		    [name_of_procedure] => Array
-		      (
-		      [type] => PROCEDURE or FUNCTION
-		      [catalog] => Catalog_name
-		      [schema] => Schema_name
-		      [remarks] => explanatory comment on the procedure 
-		      )
-                 )		
-      */
-     function MetaProcedures($procedureNamePattern = null, $catalog  = null, $schemaPattern  = null)
-     {
-            return false;
-     }
-
-		
+
 	/**
-	 * @param ttype can either be 'VIEW' or 'TABLE' or false. 
+	 * List procedures or functions in an array.
+	 * @param procedureNamePattern  a procedure name pattern; must match the procedure name as it is stored in the database
+	 * @param catalog a catalog name; must match the catalog name as it is stored in the database;
+	 * @param schemaPattern a schema name pattern;
+	 *
+	 * @return array of procedures on current database.
+	 *
+	 * Array(
+	 *   [name_of_procedure] => Array(
+	 *     [type] => PROCEDURE or FUNCTION
+	 *     [catalog] => Catalog_name
+	 *     [schema] => Schema_name
+	 *     [remarks] => explanatory comment on the procedure
+	 *   )
+	 * )
+	 */
+	function MetaProcedures($procedureNamePattern = null, $catalog  = null, $schemaPattern  = null)
+	{
+		return false;
+	}
+
+
+	/**
+	 * @param ttype can either be 'VIEW' or 'TABLE' or false.
 	 * 		If false, both views and tables are returned.
 	 *		"VIEW" returns only views
 	 *		"TABLE" returns only tables
@@ -2315,34 +2311,34 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * @param mask  is the input mask - only supported by oci8 and postgresql
 	 *
 	 * @return  array of tables for current database.
-	 */ 
-	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	 */
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
-		
+
+
 		$false = false;
 		if ($mask) {
 			return $false;
 		}
 		if ($this->metaTablesSQL) {
-			$save = $ADODB_FETCH_MODE; 
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-			
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
 			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			
+
 			$rs = $this->Execute($this->metaTablesSQL);
 			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save; 
-			
+			$ADODB_FETCH_MODE = $save;
+
 			if ($rs === false) return $false;
 			$arr = $rs->GetArray();
 			$arr2 = array();
-			
-			if ($hast = ($ttype && isset($arr[0][1]))) { 
+
+			if ($hast = ($ttype && isset($arr[0][1]))) {
 				$showt = strncmp($ttype,'T',1);
 			}
-			
+
 			for ($i=0; $i < sizeof($arr); $i++) {
 				if ($hast) {
 					if ($showt == 0) {
@@ -2358,8 +2354,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		}
 		return $false;
 	}
-	
-	
+
+
 	function _findschema(&$table,&$schema)
 	{
 		if (!$schema && ($at = strpos($table,'.')) !== false) {
@@ -2367,9 +2363,9 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$table = substr($table,$at+1);
 		}
 	}
-	
+
 	/**
-	 * List columns in a database as an array of ADOFieldObjects. 
+	 * List columns in a database as an array of ADOFieldObjects.
 	 * See top of file for definition of object.
 	 *
 	 * @param $table	table name to query
@@ -2378,17 +2374,17 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return  array of ADOFieldObjects for current table.
 	 */
-	function MetaColumns($table,$normalize=true) 
+	function MetaColumns($table,$normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-		
+
 		$false = false;
-		
+
 		if (!empty($this->metaColumnsSQL)) {
-		
+
 			$schema = false;
 			$this->_findschema($table,$schema);
-		
+
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
@@ -2408,48 +2404,47 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					if ($fld->scale>0) $fld->max_length += 1;
 				} else
 					$fld->max_length = $rs->fields[2];
-					
-				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+
+				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 				else $retarr[strtoupper($fld->name)] = $fld;
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 		}
 		return $false;
 	}
-	
-    /**
-      * List indexes on a table as an array.
-      * @param table  table name to query
-      * @param primary true to only show primary keys. Not actually used for most databases
-	  *
-      * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
-	  
-		 Array (
-		    [name_of_index] => Array
-		      (
-	          [unique] => true or false
-	          [columns] => Array
-	          (
-	          	[0] => firstname
-		      	[1] => lastname
-	          )
-		)		
-      */
-     function MetaIndexes($table, $primary = false, $owner = false)
-     {
-	 		$false = false;
-            return $false;
-     }
 
 	/**
-	 * List columns names in a table as an array. 
+	 * List indexes on a table as an array.
+	 * @param table  table name to query
+	 * @param primary true to only show primary keys. Not actually used for most databases
+	 *
+	 * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
+	 *
+	 * Array(
+	 *   [name_of_index] => Array(
+	 *     [unique] => true or false
+	 *     [columns] => Array(
+	 *       [0] => firstname
+	 *       [1] => lastname
+	 *     )
+	 *   )
+	 * )
+	 */
+	function MetaIndexes($table, $primary = false, $owner = false)
+	{
+		$false = false;
+		return $false;
+	}
+
+	/**
+	 * List columns names in a table as an array.
 	 * @param table	table name to query
 	 *
 	 * @return  array of column names for current table.
-	 */ 
-	function MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
+	 */
+	function MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */)
 	{
 		$objarr = $this->MetaColumns($table);
 		if (!is_array($objarr)) {
@@ -2460,34 +2455,34 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($numIndexes) {
 			$i = 0;
 			if ($useattnum) {
-				foreach($objarr as $v) 
+				foreach($objarr as $v)
 					$arr[$v->attnum] = $v->name;
-				
+
 			} else
 				foreach($objarr as $v) $arr[$i++] = $v->name;
 		} else
 			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
-		
+
 		return $arr;
 	}
-			
+
 	/**
 	 * Different SQL databases used different methods to combine strings together.
-	 * This function provides a wrapper. 
-	 * 
+	 * This function provides a wrapper.
+	 *
 	 * param s	variable number of string parameters
 	 *
 	 * Usage: $db->Concat($str1,$str2);
-	 * 
+	 *
 	 * @return concatenated string
-	 */ 	 
+	 */
 	function Concat()
-	{	
+	{
 		$arr = func_get_args();
 		return implode($this->concat_operator, $arr);
 	}
-	
-	
+
+
 	/**
 	 * Converts a date "d" to a string that the database can understand.
 	 *
@@ -2499,10 +2494,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		if (empty($d) && $d !== 0) return 'null';
 		if ($isfld) return $d;
-		
+
 		if (is_object($d)) return $d->format($this->fmtDate);
-		
-		
+
+
 		if (is_string($d) && !is_numeric($d)) {
 			if ($d === 'null') return $d;
 			if (strncmp($d,"'",1) === 0) {
@@ -2515,24 +2510,24 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 
 		return adodb_date($this->fmtDate,$d);
 	}
-	
+
 	function BindDate($d)
 	{
 		$d = $this->DBDate($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
+
 	function BindTimeStamp($d)
 	{
 		$d = $this->DBTimeStamp($d);
 		if (strncmp($d,"'",1)) return $d;
-		
+
 		return substr($d,1,strlen($d)-2);
 	}
-	
-	
+
+
 	/**
 	 * Converts a timestamp "ts" to a string that the database can understand.
 	 *
@@ -2545,11 +2540,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if (empty($ts) && $ts !== 0) return 'null';
 		if ($isfld) return $ts;
 		if (is_object($ts)) return $ts->format($this->fmtTimeStamp);
-		
+
 		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
+		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14))
 			return adodb_date($this->fmtTimeStamp,$ts);
-		
+
 		if ($ts === 'null') return $ts;
 		if ($this->isoDates && strlen($ts) !== 14) {
 			$ts = _adodb_safedate($ts);
@@ -2558,7 +2553,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$ts = ADOConnection::UnixTimeStamp($ts);
 		return adodb_date($this->fmtTimeStamp,$ts);
 	}
-	
+
 	/**
 	 * Also in ADORecordSet.
 	 * @param $v is a date string in YYYY-MM-DD format
@@ -2572,16 +2567,16 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
 			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
-	
+
 		if (is_numeric($v) && strlen($v) !== 8) return $v;
-		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
+		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|",
 			($v), $rr)) return false;
 
 		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
 		// h-m-s-MM-DD-YY
 		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 	}
-	
+
 
 	/**
 	 * Also in ADORecordSet.
@@ -2596,18 +2591,18 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
 			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
 		}
-		
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+
+		if (!preg_match(
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
 			($v), $rr)) return false;
-			
+
 		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-	
+
 		// h-m-s-MM-DD-YY
 		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
 		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
 	}
-	
+
 	/**
 	 * Also in ADORecordSet.
 	 *
@@ -2618,7 +2613,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return a date formated as user desires
 	 */
-	 
+
 	function UserDate($v,$fmt='Y-m-d',$gmt=false)
 	{
 		$tt = $this->UnixDate($v);
@@ -2628,11 +2623,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		else if ($tt == 0) return $this->emptyDate;
 		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
 		}
-		
+
 		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-	
+
 	}
-	
+
 		/**
 	 *
 	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
@@ -2651,19 +2646,19 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($tt == 0) return $this->emptyTimeStamp;
 		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
 	}
-	
+
 	function escape($s,$magic_quotes=false)
 	{
 		return $this->addq($s,$magic_quotes);
 	}
-	
+
 	/**
-	* Quotes a string, without prefixing nor appending quotes. 
+	* Quotes a string, without prefixing nor appending quotes.
 	*/
 	function addq($s,$magic_quotes=false)
 	{
 		if (!$magic_quotes) {
-		
+
 			if ($this->replaceQuote[0] == '\\'){
 				// only since php 4.0.5
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
@@ -2671,10 +2666,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			}
 			return  str_replace("'",$this->replaceQuote,$s);
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
-		
+
 		if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase'))  // ' already quoted, no need to change anything
 			return $s;
 		else {// change \' to '' for sybase/mssql
@@ -2682,12 +2677,12 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			return str_replace("\\'",$this->replaceQuote,$s);
 		}
 	}
-	
+
 	/**
 	 * Correctly quotes a string so that all strings are escaped. We prefix and append
 	 * to the string single-quotes.
 	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
+	 *
 	 * @param s			the string to quote
 	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
 	 *				This undoes the stupidity of magic quotes for GPC.
@@ -2695,9 +2690,9 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * @return  quoted string to be sent back to database
 	 */
 	function qstr($s,$magic_quotes=false)
-	{	
+	{
 		if (!$magic_quotes) {
-		
+
 			if ($this->replaceQuote[0] == '\\'){
 				// only since php 4.0.5
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
@@ -2705,10 +2700,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			}
 			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
-		
+
 		if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase'))  // ' already quoted, no need to change anything
 			return "'$s'";
 		else {// change \' to '' for sybase/mssql
@@ -2716,14 +2711,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
 		}
 	}
-	
-	
+
+
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
+	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
 	*
-	* See readme.htm#ex8 for an example of usage.
+	* See docs-adodb.htm#ex8 for an example of usage.
 	*
 	* @param sql
 	* @param nrows		is the number of rows per page to get
@@ -2735,7 +2730,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
 	*
 	*/
-	function PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
+	function PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0)
 	{
 		global $ADODB_INCLUDED_LIB;
 		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
@@ -2743,12 +2738,12 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		else $rs = _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
 		return $rs;
 	}
-	
-		
+
+
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
+	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
 	*
 	* @param secs2cache	seconds to cache data, set to 0 to force query
 	* @param sql
@@ -2757,11 +2752,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	* @param [inputarr]	array of bind variables
 	* @return		the recordset ($rs->databaseType == 'array')
 	*/
-	function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) 
+	function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false)
 	{
 		/*switch($this->dataProvider) {
 		case 'postgres':
-		case 'mysql': 
+		case 'mysql':
 			break;
 		default: $secs2cache = 0; break;
 		}*/
@@ -2770,67 +2765,67 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	}
 
 } // end class ADOConnection
-	
-	
-	
-	//==============================================================================================	
+
+
+
+	//==============================================================================================
 	// CLASS ADOFetchObj
-	//==============================================================================================	
-		
+	//==============================================================================================
+
 	/**
 	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
 	*/
 	class ADOFetchObj {
 	};
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet_empty
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	class ADODB_Iterator_empty implements Iterator {
-	
+
 	    private $rs;
-	
-	    function __construct($rs) 
+
+	    function __construct($rs)
 		{
 	        $this->rs = $rs;
 	    }
-	    function rewind() 
+	    function rewind()
 		{
 	    }
-	
-		function valid() 
+
+		function valid()
 		{
 	        return !$this->rs->EOF;
 	    }
-		
-	    function key() 
+
+	    function key()
 		{
 	        return false;
 	    }
-		
-	    function current() 
+
+	    function current()
 		{
 	        return false;
 	    }
-		
-	    function next() 
+
+	    function next()
 		{
 	    }
-		
+
 		function __call($func, $params)
 		{
 			return call_user_func_array(array($this->rs, $func), $params);
 		}
-		
+
 		function hasMore()
 		{
 			return false;
 		}
-	
+
 	}
 
-	
+
 	/**
 	* Lightweight recordset when there are no records to be returned
 	*/
@@ -2852,65 +2847,65 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		function getIterator() {return new ADODB_Iterator_empty($this);}
 		function GetAssoc() {return array();}
 	}
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// DATE AND TIME FUNCTIONS
-	//==============================================================================================	
+	//==============================================================================================
 	if (!defined('ADODB_DATE_VERSION')) include(ADODB_DIR.'/adodb-time.inc.php');
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet
-	//==============================================================================================	
+	//==============================================================================================
 
 	class ADODB_Iterator implements Iterator {
-	
+
 	    private $rs;
-	
-	    function __construct($rs) 
+
+	    function __construct($rs)
 		{
 	        $this->rs = $rs;
 	    }
-	    function rewind() 
+	    function rewind()
 		{
 	        $this->rs->MoveFirst();
 	    }
-	
-		function valid() 
+
+		function valid()
 		{
 	        return !$this->rs->EOF;
 	    }
-		
-	    function key() 
+
+	    function key()
 		{
 	        return $this->rs->_currentRow;
 	    }
-		
-	    function current() 
+
+	    function current()
 		{
 	        return $this->rs->fields;
 	    }
-		
-	    function next() 
+
+	    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;
 		}
-	
+
 	}
 
 
 
-   /**
+	/**
 	 * RecordSet class that represents the dataset returned by the database.
 	 * To keep memory overhead low, this class holds only the current row in memory.
 	 * No prefetching of data is done, so the RecordCount() can return -1 ( which
@@ -2918,7 +2913,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 */
 	class ADORecordSet implements IteratorAggregate {
 	/*
-	 * public variables	
+	 * public variables
 	 */
 	var $dataProvider = "native";
 	var $fields = false; 	/// holds the current row data
@@ -2926,8 +2921,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 							/// in other words, we use a text area for editing.
 	var $canSeek = false; 	/// indicates that seek is supported
 	var $sql; 				/// sql text
-	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object. 
-	
+	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object.
+
 	var $emptyTimeStamp = ' '; /// what to display when $time==0
 	var $emptyDate = ' '; /// what to display when $time==0
 	var $debug = false;
@@ -2937,7 +2932,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	var $fetchMode;			/// default fetch mode
 	var $connection = false; /// the parent connection
 	/*
-	 *	private variables	
+	 *	private variables
 	 */
 	var $_numOfRows = -1;	/** number of rows, or -1 */
 	var $_numOfFields = -1;	/** number of fields in recordset */
@@ -2947,38 +2942,38 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	var $_inited = false; 	/** Init() should only be called once */
 	var $_obj; 				/** Used by FetchObj */
 	var $_names;			/** Used by FetchObj */
-	
-	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
-	var $_lastPageNo = -1; 
+
+	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_lastPageNo = -1;
 	var $_maxRecordCount = 0;
 	var $datetime = false;
-	
+
 	/**
 	 * Constructor
 	 *
 	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
 	 *
 	 */
-	function ADORecordSet($queryID) 
+	function ADORecordSet($queryID)
 	{
 		$this->_queryID = $queryID;
 	}
-	
-	function getIterator() 
+
+	function getIterator()
 	{
-        return new ADODB_Iterator($this);
-    }
-	
+		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);
 	}
-	
-	
+
+
 	function Init()
 	{
 		if ($this->_inited) return;
@@ -2989,7 +2984,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$this->_numOfFields = 0;
 		}
 		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
-			
+
 			$this->_currentRow = 0;
 			if ($this->EOF = ($this->_fetch() === false)) {
 				$this->_numOfRows = 0; // _numOfRows could be -1
@@ -2998,11 +2993,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$this->EOF = true;
 		}
 	}
-	
-	
+
+
 	/**
 	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * If the recordset has 2 cols, we treat the 1st col as the containing
 	 * the text to display to the user, and 2nd col as the return value. Default
 	 * strings are compared with the FIRST column.
 	 *
@@ -3013,7 +3008,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * @param [size]		#rows to show for listbox. not used by popup
 	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
 	 *				useful for holding javascript onChange='...' handlers.
-	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with 
+	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with
 	 *				column 0 (1st col) if this is true. This is not documented.
 	 *
 	 * @return HTML
@@ -3028,22 +3023,22 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
 			$size, $selectAttr,$compareFields0);
 	}
-	
 
-	
+
+
 	/**
 	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * If the recordset has 2 cols, we treat the 1st col as the containing
 	 * the text to display to the user, and 2nd col as the return value. Default
 	 * strings are compared with the SECOND column.
 	 *
 	 */
-	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')	
+	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')
 	{
 		return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
 			$size, $selectAttr,false);
 	}
-	
+
 	/*
 		Grouped Menu
 	*/
@@ -3063,7 +3058,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function GetArray($nRows = -1) 
+	function GetArray($nRows = -1)
 	{
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) {
 		$results = adodb_getall($this,$nRows);
@@ -3078,13 +3073,13 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		}
 		return $results;
 	}
-	
+
 	function GetAll($nRows = -1)
 	{
 		$arr = $this->GetArray($nRows);
 		return $arr;
 	}
-	
+
 	/*
 	* Some databases allow multiple recordsets to be returned. This function
 	* will return true if there is a next recordset, or false if no more.
@@ -3093,9 +3088,9 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return false;
 	}
-	
+
 	/**
-	 * return recordset as a 2-dimensional array. 
+	 * return recordset as a 2-dimensional array.
 	 * Helper function for ADOConnection->SelectLimit()
 	 *
 	 * @param offset	is the row to start calculations from (1-based)
@@ -3103,26 +3098,26 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function GetArrayLimit($nrows,$offset=-1) 
-	{	
+	function GetArrayLimit($nrows,$offset=-1)
+	{
 		if ($offset <= 0) {
 			$arr = $this->GetArray($nrows);
 			return $arr;
-		} 
-		
+		}
+
 		$this->Move($offset);
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
-	
-	
+
+
 	/**
 	 * Synonym for GetArray() for compatibility with ADO.
 	 *
@@ -3130,15 +3125,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return an array indexed by the rows (0-based) from the recordset
 	 */
-	function GetRows($nRows = -1) 
+	function GetRows($nRows = -1)
 	{
 		$arr = $this->GetArray($nRows);
 		return $arr;
 	}
-	
+
 	/**
-	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns. 
-	 * The first column is treated as the key and is not included in the array. 
+	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns.
+	 * The first column is treated as the key and is not included in the array.
 	 * If there is only 2 columns, it will return a 1 dimensional array of key-value pairs unless
 	 * $force_array == true.
 	 *
@@ -3146,24 +3141,24 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * 	array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
 	 * 	read the source.
 	 *
-	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and 
+	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and
 	 * instead of returning array[col0] => array(remaining cols), return array[col0] => col1
 	 *
-	 * @return an associative array indexed by the first column of the array, 
+	 * @return an associative array indexed by the first column of the array,
 	 * 	or false if the  data has less than 2 cols.
 	 */
-	function GetAssoc($force_array = false, $first2cols = false) 
+	function GetAssoc($force_array = false, $first2cols = false)
 	{
 	global $ADODB_EXTENSION;
-	
+
 		$cols = $this->_numOfFields;
 		if ($cols < 2) {
 			$false = false;
 			return $false;
 		}
-		$numIndex = isset($this->fields[0]) && isset($this->fields[1]);
+		$numIndex = is_array($this->fields) && array_key_exists(0, $this->fields);
 		$results = array();
-		
+
 		if (!$first2cols && ($cols > 2 || $force_array)) {
 			if ($ADODB_EXTENSION) {
 				if ($numIndex) {
@@ -3180,7 +3175,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 						foreach($keys as $key) {
 							$sliced_array[$key] = $this->fields[$key];
 						}
-						
+
 						$results[trim(reset($this->fields))] = $sliced_array;
 						adodb_movenext($this);
 					}
@@ -3200,7 +3195,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 						foreach($keys as $key) {
 							$sliced_array[$key] = $this->fields[$key];
 						}
-						
+
 						$results[trim(reset($this->fields))] = $sliced_array;
 						$this->MoveNext();
 					}
@@ -3219,7 +3214,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					while (!$this->EOF) {
 					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
 						$v1 = trim(reset($this->fields));
-						$v2 = ''.next($this->fields); 
+						$v2 = ''.next($this->fields);
 						$results[$v1] = $v2;
 						adodb_movenext($this);
 					}
@@ -3235,19 +3230,19 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					while (!$this->EOF) {
 					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
 						$v1 = trim(reset($this->fields));
-						$v2 = ''.next($this->fields); 
+						$v2 = ''.next($this->fields);
 						$results[$v1] = $v2;
 						$this->MoveNext();
 					}
 				}
 			}
 		}
-		
+
 		$ref = $results; # workaround accelerator incompat with PHP 4.4 :(
-		return $ref; 
+		return $ref;
 	}
-	
-	
+
+
 	/**
 	 *
 	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
@@ -3264,8 +3259,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($tt === 0) return $this->emptyTimeStamp;
 		return adodb_date($fmt,$tt);
 	}
-	
-	
+
+
 	/**
 	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
 	 * @param fmt 	is the format to apply to it, using date()
@@ -3282,8 +3277,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		}
 		return adodb_date($fmt,$tt);
 	}
-	
-	
+
+
 	/**
 	 * @param $v is a date string in YYYY-MM-DD format
 	 *
@@ -3293,7 +3288,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return ADOConnection::UnixDate($v);
 	}
-	
+
 
 	/**
 	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
@@ -3304,8 +3299,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return ADOConnection::UnixTimeStamp($v);
 	}
-	
-	
+
+
 	/**
 	* PEAR DB Compat - do not use internally
 	*/
@@ -3313,8 +3308,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return $this->Close();
 	}
-	
-	
+
+
 	/**
 	* PEAR DB compat, number of rows
 	*/
@@ -3322,8 +3317,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return $this->_numOfRows;
 	}
-	
-	
+
+
 	/**
 	* PEAR DB compat, number of cols
 	*/
@@ -3331,9 +3326,9 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return $this->_numOfFields;
 	}
-	
+
 	/**
-	* Fetch a row, returning false if no more rows. 
+	* Fetch a row, returning false if no more rows.
 	* This is PEAR DB compat mode.
 	*
 	* @return false or array containing the current record
@@ -3349,10 +3344,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if (!$this->_fetch()) $this->EOF = true;
 		return $arr;
 	}
-	
-	
+
+
 	/**
-	* Fetch a row, returning PEAR_Error if no more rows. 
+	* Fetch a row, returning PEAR_Error if no more rows.
 	* This is PEAR DB compat mode.
 	*
 	* @return DB_OK or error object
@@ -3364,26 +3359,26 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$this->MoveNext();
 		return 1; // DB_OK
 	}
-	
-	
+
+
 	/**
 	 * Move to the first row in the recordset. Many databases do NOT support this.
 	 *
 	 * @return true or false
 	 */
-	function MoveFirst() 
+	function MoveFirst()
 	{
 		if ($this->_currentRow == 0) return true;
-		return $this->Move(0);			
-	}			
+		return $this->Move(0);
+	}
+
 
-	
 	/**
-	 * Move to the last row in the recordset. 
+	 * Move to the last row in the recordset.
 	 *
 	 * @return true or false
 	 */
-	function MoveLast() 
+	function MoveLast()
 	{
 		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
 		if ($this->EOF) return false;
@@ -3395,14 +3390,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$this->EOF = false;
 		return true;
 	}
-	
-	
+
+
 	/**
 	 * Move to next record in the recordset.
 	 *
 	 * @return true if there still rows available, or false if there are no more rows (EOF).
 	 */
-	function MoveNext() 
+	function MoveNext()
 	{
 		if (!$this->EOF) {
 			$this->_currentRow++;
@@ -3418,8 +3413,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		*/
 		return false;
 	}
-	
-	
+
+
 	/**
 	 * Random access to a specific row in the recordset. Some databases do not support
 	 * access to previous rows in the databases (no scrolling backwards).
@@ -3428,15 +3423,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return true if there still rows available, or false if there are no more rows (EOF).
 	 */
-	function Move($rowNumber = 0) 
+	function Move($rowNumber = 0)
 	{
 		$this->EOF = false;
 		if ($rowNumber == $this->_currentRow) return true;
 		if ($rowNumber >= $this->_numOfRows)
 	   		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
-  				
-		if ($this->canSeek) { 
-	
+
+		if ($this->canSeek) {
+
 			if ($this->_seek($rowNumber)) {
 				$this->_currentRow = $rowNumber;
 				if ($this->_fetch()) {
@@ -3454,26 +3449,26 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					adodb_movenext($this);
 				}
 			} else {
-			
+
 				while (! $this->EOF && $this->_currentRow < $rowNumber) {
 					$this->_currentRow++;
-					
+
 					if (!$this->_fetch()) $this->EOF = true;
 				}
 			}
 			return !($this->EOF);
 		}
-		
-		$this->fields = false;	
+
+		$this->fields = false;
 		$this->EOF = true;
 		return false;
 	}
-	
-		
+
+
 	/**
 	 * Get the value of a field in the current row by column name.
 	 * Will not work if ADODB_FETCH_MODE is set to ADODB_FETCH_NUM.
-	 * 
+	 *
 	 * @param colname  is the field to access
 	 *
 	 * @return the value of $colname column
@@ -3482,68 +3477,86 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return $this->fields[$colname];
 	}
-	
-	function GetAssocKeys($upper=true)
+
+	/**
+	 * Builds the bind array associating keys to recordset fields
+	 *
+	 * @param int $upper Case for the array keys, defaults to uppercase
+	 *                   (see ADODB_ASSOC_CASE_xxx constants)
+	 */
+	function GetAssocKeys($upper=ADODB_ASSOC_CASE_UPPER)
 	{
 		$this->bind = array();
 		for ($i=0; $i < $this->_numOfFields; $i++) {
 			$o = $this->FetchField($i);
-			if ($upper === 2) $this->bind[$o->name] = $i;
-			else $this->bind[($upper) ? strtoupper($o->name) : strtolower($o->name)] = $i;
+			switch($upper) {
+				case ADODB_ASSOC_CASE_LOWER:
+					$key = strtolower($o->name);
+					break;
+				case ADODB_ASSOC_CASE_UPPER:
+					$key = strtoupper($o->name);
+					break;
+				case ADODB_ASSOC_CASE_NATIVE:
+				default:
+					$key = $o->name;
+					break;
+			}
+			$val = $this->fetchMode == ADODB_FETCH_ASSOC ? $o->name : $i;
+			$this->bind[$key] = $val;
 		}
 	}
-	
-  /**
-   * Use associative array to get fields array for databases that do not support
-   * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
-   *
-   * If you don't want uppercase cols, set $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC
-   * before you execute your SQL statement, and access $rs->fields['col'] directly.
-   *
-   * $upper  0 = lowercase, 1 = uppercase, 2 = whatever is returned by FetchField
-   */
-	function GetRowAssoc($upper=1) 
+
+	/**
+	 * Use associative array to get fields array for databases that do not support
+	 * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
+	 *
+	 * @param int $upper Case for the array keys, defaults to uppercase
+	 *                   (see ADODB_ASSOC_CASE_xxx constants)
+	 */
+	function GetRowAssoc($upper=ADODB_ASSOC_CASE_UPPER)
 	{
 		$record = array();
 		if (!$this->bind) {
 			$this->GetAssocKeys($upper);
 		}
 		foreach($this->bind as $k => $v) {
-			if( isset( $this->fields[$v] ) ) {
+			if( array_key_exists( $v, $this->fields ) ) {
 				$record[$k] = $this->fields[$v];
-			} else if (isset($this->fields[$k])) {
+			} elseif( array_key_exists( $k, $this->fields ) ) {
 				$record[$k] = $this->fields[$k];
-			} else
-				$record[$k] = $this->fields[$v];
+			} else {
+				# This should not happen... trigger error ?
+				$record[$k] = null;
+			}
 		}
 		return $record;
 	}
-	
+
 	/**
 	 * Clean up recordset
 	 *
 	 * @return true or false
 	 */
-	function Close() 
+	function Close()
 	{
 		// free connection object - this seems to globally free the object
 		// and not merely the reference, so don't do this...
-		// $this->connection = false; 
+		// $this->connection = false;
 		if (!$this->_closed) {
 			$this->_closed = true;
-			return $this->_close();		
+			return $this->_close();
 		} else
 			return true;
 	}
-	
+
 	/**
-	 * synonyms RecordCount and RowCount	
+	 * synonyms RecordCount and RowCount
 	 *
 	 * @return the number of rows or -1 if this is not supported
 	 */
 	function RecordCount() {return $this->_numOfRows;}
-	
-	
+
+
 	/*
 	* If we are using PageExecute(), this will return the maximum possible rows
 	* that can be returned when paging a recordset.
@@ -3552,14 +3565,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount();
 	}
-	
+
 	/**
-	 * synonyms RecordCount and RowCount	
+	 * synonyms RecordCount and RowCount
 	 *
 	 * @return the number of rows or -1 if this is not supported
 	 */
-	function RowCount() {return $this->_numOfRows;} 
-	
+	function RowCount() {return $this->_numOfRows;}
+
 
 	 /**
 	 * Portable RecordCount. Pablo Roca <pabloroca at mvps.org>
@@ -3568,39 +3581,39 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * But aware possible problems in multiuser environments. For better speed the table
 	 * must be indexed by the condition. Heavy test this before deploying.
-	 */ 
+	 */
 	function PO_RecordCount($table="", $condition="") {
-		
+
 		$lnumrows = $this->_numOfRows;
 		// the database doesn't support native recordcount, so we do a workaround
 		if ($lnumrows == -1 && $this->connection) {
 			IF ($table) {
-				if ($condition) $condition = " WHERE " . $condition; 
+				if ($condition) $condition = " WHERE " . $condition;
 				$resultrows = $this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
 				if ($resultrows) $lnumrows = reset($resultrows->fields);
 			}
 		}
 		return $lnumrows;
 	}
-	
-	
+
+
 	/**
 	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
 	 */
 	function CurrentRow() {return $this->_currentRow;}
-	
+
 	/**
 	 * synonym for CurrentRow -- for ADO compat
 	 *
 	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
 	 */
 	function AbsolutePosition() {return $this->_currentRow;}
-	
+
 	/**
 	 * @return the number of columns in the recordset. Some databases will set this to 0
 	 * if no records are returned, others will return the number of columns in the query.
 	 */
-	function FieldCount() {return $this->_numOfFields;}   
+	function FieldCount() {return $this->_numOfFields;}
 
 
 	/**
@@ -3610,14 +3623,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 *
 	 * @return the ADOFieldObject for that column, or false.
 	 */
-	function FetchField($fieldoffset = -1) 
+	function FetchField($fieldoffset = -1)
 	{
 		// must be defined by child class
-		
+
 		$false = false;
 		return $false;
-	}	
-	
+	}
+
 	/**
 	 * Get the ADOFieldObjects of all columns in an array.
 	 *
@@ -3625,11 +3638,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	function FieldTypesArray()
 	{
 		$arr = array();
-		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
+		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++)
 			$arr[] = $this->FetchField($i);
 		return $arr;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default case is lowercase field names.
@@ -3641,11 +3654,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$o = $this->FetchObject(false);
 		return $o;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default case is uppercase.
-	* 
+	*
 	* @param $isupper to set the object property names to uppercase
 	*
 	* @return the object with the properties set to the fields of the current row
@@ -3663,21 +3676,21 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$i = 0;
 		if (PHP_VERSION >= 5) $o = clone($this->_obj);
 		else $o = $this->_obj;
-	
+
 		for ($i=0; $i <$this->_numOfFields; $i++) {
 			$name = $this->_names[$i];
 			if ($isupper) $n = strtoupper($name);
 			else $n = $name;
-			
+
 			$o->$n = $this->Fields($name);
 		}
 		return $o;
 	}
-	
+
 	/**
 	* Return the fields array of the current row as an object for convenience.
 	* The default is lower-case field names.
-	* 
+	*
 	* @return the object with the properties set to the fields of the current row,
 	* 	or false if EOF
 	*
@@ -3688,12 +3701,12 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$o = $this->FetchNextObject(false);
 		return $o;
 	}
-	
-	
+
+
 	/**
-	* Return the fields array of the current row as an object for convenience. 
+	* Return the fields array of the current row as an object for convenience.
 	* The default is upper case field names.
-	* 
+	*
 	* @param $isupper to set the object property names to uppercase
 	*
 	* @return the object with the properties set to the fields of the current row,
@@ -3705,14 +3718,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	{
 		$o = false;
 		if ($this->_numOfRows != 0 && !$this->EOF) {
-			$o = $this->FetchObject($isupper);	
+			$o = $this->FetchObject($isupper);
 			$this->_currentRow++;
 			if ($this->_fetch()) return $o;
 		}
 		$this->EOF = true;
 		return $o;
 	}
-	
+
 	/**
 	 * Get the metatype of the column. This is used for formatting. This is because
 	 * many databases use different names for the same type, so we transform the original
@@ -3723,8 +3736,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * 	fields bigger than a certain size as a 'B' (blob).
 	 * @param fieldobj is the field object returned by the database driver. Can hold
 	 *	additional info (eg. primary_key for mysql).
-	 * 
-	 * @return the general type of the data: 
+	 *
+	 * @return the general type of the data:
 	 *	C for character < 250 chars
 	 *	X for teXt (>= 250 chars)
 	 *	B for Binary
@@ -3734,7 +3747,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	 * 	L for logical/Boolean
 	 *	I for integer
 	 *	R for autoincrement counter/integer
-	 * 
+	 *
 	 *
 	*/
 	function MetaType($t,$len=-1,$fieldobj=false)
@@ -3791,7 +3804,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
 		##
 		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
+		'BOOLEAN' => 'L',
 		'BIT' => 'L',
 		'L' => 'L',
 		##
@@ -3824,21 +3837,21 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		'NUM' => 'N',
 		'NUMERIC' => 'N',
 		'MONEY' => 'N',
-		
+
 		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
+		'SQLINT' => 'I',
+		'SQLSERIAL' => 'I',
+		'SQLSMINT' => 'I',
+		'SQLSMFLOAT' => 'N',
+		'SQLFLOAT' => 'N',
+		'SQLMONEY' => 'N',
+		'SQLDECIMAL' => 'N',
+		'SQLDATE' => 'D',
+		'SQLVCHAR' => 'C',
+		'SQLCHAR' => 'C',
+		'SQLDTIME' => 'T',
+		'SQLINTERVAL' => 'N',
+		'SQLBYTES' => 'B',
 		'SQLTEXT' => 'X',
 		 ## informix 10
 		"SQLINT8" => 'I8',
@@ -3848,46 +3861,46 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		"SQLLVARCHAR" => 'X',
 		"SQLBOOL" => 'L'
 		);
-		
+
 		$tmap = false;
 		$t = strtoupper($t);
 		$tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N';
 		switch ($tmap) {
 		case 'C':
-		
-			// is the char field is too long, return as text field... 
+
+			// is the char field is too long, return as text field...
 			if ($this->blobSize >= 0) {
 				if ($len > $this->blobSize) return 'X';
 			} else if ($len > 250) {
 				return 'X';
 			}
 			return 'C';
-			
+
 		case 'I':
 			if (!empty($fieldobj->primary_key)) return 'R';
 			return 'I';
-		
+
 		case false:
 			return 'N';
-			
+
 		case 'B':
-			 if (isset($fieldobj->binary)) 
+			 if (isset($fieldobj->binary))
 				 return ($fieldobj->binary) ? 'B' : 'X';
 			return 'B';
-		
+
 		case 'D':
 			if (!empty($this->connection) && !empty($this->connection->datetime)) return 'T';
 			return 'D';
-			
-		default: 
+
+		default:
 			if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B';
 			return $tmap;
 		}
 	}
-	
-	
+
+
 	function _close() {}
-	
+
 	/**
 	 * set/returns the current recordset page when paginating
 	 */
@@ -3896,7 +3909,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($page != -1) $this->_currentPage = $page;
 		return $this->_currentPage;
 	}
-	
+
 	/**
 	 * set/returns the status of the atFirstPage flag when paginating
 	 */
@@ -3905,13 +3918,13 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($status != false) $this->_atFirstPage = $status;
 		return $this->_atFirstPage;
 	}
-	
+
 	function LastPageNo($page = false)
 	{
 		if ($page != false) $this->_lastPageNo = $page;
 		return $this->_lastPageNo;
 	}
-	
+
 	/**
 	 * set/returns the status of the atLastPage flag when paginating
 	 */
@@ -3920,20 +3933,20 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if ($status != false) $this->_atLastPage = $status;
 		return $this->_atLastPage;
 	}
-	
+
 } // end class ADORecordSet
-	
-	//==============================================================================================	
+
+	//==============================================================================================
 	// CLASS ADORecordSet_array
-	//==============================================================================================	
-	
+	//==============================================================================================
+
 	/**
 	 * This class encapsulates the concept of a recordset created in memory
 	 * as an array. This is useful for the creation of cached recordsets.
-	 * 
+	 *
 	 * Note that the constructor is different from the standard ADORecordSet
 	 */
-	
+
 	class ADORecordSet_array extends ADORecordSet
 	{
 		var $databaseType = 'array';
@@ -3955,32 +3968,32 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		function ADORecordSet_array($fakeid=1)
 		{
 		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
-		
+
 			// fetch() on EOF does not delete $this->fields
 			$this->compat = !empty($ADODB_COMPAT_FETCH);
-			$this->ADORecordSet($fakeid); // fake queryID		
+			$this->ADORecordSet($fakeid); // fake queryID
 			$this->fetchMode = $ADODB_FETCH_MODE;
 		}
-		
+
 		function _transpose($addfieldnames=true)
 		{
 		global $ADODB_INCLUDED_LIB;
-			
+
 			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
 			$hdr = true;
-			
+
 			$fobjs = $addfieldnames ? $this->_fieldobjects : false;
 			adodb_transpose($this->_array, $newarr, $hdr, $fobjs);
 			//adodb_pr($newarr);
-			
+
 			$this->_skiprow1 = false;
 			$this->_array = $newarr;
 			$this->_colnames = $hdr;
-			
+
 			adodb_probetypes($newarr,$this->_types);
-		
+
 			$this->_fieldobjects = array();
-			
+
 			foreach($hdr as $k => $name) {
 				$f = new ADOFieldObject();
 				$f->name = $name;
@@ -3989,18 +4002,18 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				$this->_fieldobjects[] = $f;
 			}
 			$this->fields = reset($this->_array);
-			
+
 			$this->_initrs();
-			
+
 		}
-		
+
 		/**
 		 * Setup the array.
 		 *
 		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
+		 *			The first row should hold the column names
 		 *			unless paramter $colnames is used.
-		 * @param typearr	holds an array of types. These are the same types 
+		 * @param typearr	holds an array of types. These are the same types
 		 *			used in MetaTypes (C,B,L,I,N).
 		 * @param [colnames]	array of column names. If set, then the first row of
 		 *			$array should not hold the column names.
@@ -4008,7 +4021,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		function InitArray($array,$typearr,$colnames=false)
 		{
 			$this->_array = $array;
-			$this->_types = $typearr;	
+			$this->_types = $typearr;
 			if ($colnames) {
 				$this->_skiprow1 = false;
 				$this->_colnames = $colnames;
@@ -4022,7 +4035,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		 * Setup the Array and datatype file objects
 		 *
 		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
+		 *			The first row should hold the column names
 		 *			unless paramter $colnames is used.
 		 * @param fieldarr	holds an array of ADOFieldObject's.
 		 */
@@ -4032,10 +4045,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$this->_skiprow1= false;
 			if ($fieldarr) {
 				$this->_fieldobjects = $fieldarr;
-			} 
+			}
 			$this->Init();
 		}
-		
+
 		function GetArray($nRows=-1)
 		{
 			if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) {
@@ -4045,21 +4058,21 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				return $arr;
 			}
 		}
-		
+
 		function _initrs()
 		{
 			$this->_numOfRows =  sizeof($this->_array);
 			if ($this->_skiprow1) $this->_numOfRows -= 1;
-		
+
 			$this->_numOfFields =(isset($this->_fieldobjects)) ?
 				 sizeof($this->_fieldobjects):sizeof($this->_types);
 		}
-		
+
 		/* Use associative array to get fields array */
 		function Fields($colname)
 		{
 			$mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode;
-			
+
 			if ($mode & ADODB_FETCH_ASSOC) {
 				if (!isset($this->fields[$colname]) && !is_null($this->fields[$colname])) $colname = strtolower($colname);
 				return $this->fields[$colname];
@@ -4073,8 +4086,8 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			}
 			return $this->fields[$this->bind[strtoupper($colname)]];
 		}
-		
-		function FetchField($fieldOffset = -1) 
+
+		function FetchField($fieldOffset = -1)
 		{
 			if (isset($this->_fieldobjects)) {
 				return $this->_fieldobjects[$fieldOffset];
@@ -4083,10 +4096,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$o->name = $this->_colnames[$fieldOffset];
 			$o->type =  $this->_types[$fieldOffset];
 			$o->max_length = -1; // length not known
-			
+
 			return $o;
 		}
-			
+
 		function _seek($row)
 		{
 			if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) {
@@ -4097,31 +4110,31 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			}
 			return false;
 		}
-		
-		function MoveNext() 
+
+		function MoveNext()
 		{
-			if (!$this->EOF) {		
+			if (!$this->EOF) {
 				$this->_currentRow++;
-				
+
 				$pos = $this->_currentRow;
-				
+
 				if ($this->_numOfRows <= $pos) {
 					if (!$this->compat) $this->fields = false;
 				} else {
 					if ($this->_skiprow1) $pos += 1;
 					$this->fields = $this->_array[$pos];
 					return true;
-				}		
+				}
 				$this->EOF = true;
 			}
-			
+
 			return false;
-		}	
-	
+		}
+
 		function _fetch()
 		{
 			$pos = $this->_currentRow;
-			
+
 			if ($this->_numOfRows <= $pos) {
 				if (!$this->compat) $this->fields = false;
 				return false;
@@ -4130,56 +4143,62 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			$this->fields = $this->_array[$pos];
 			return true;
 		}
-		
-		function _close() 
+
+		function _close()
 		{
-			return true;	
+			return true;
 		}
-	
+
 	} // ADORecordSet_array
 
-	//==============================================================================================	
+	//==============================================================================================
 	// HELPER FUNCTIONS
-	//==============================================================================================			
-	
+	//==============================================================================================
+
 	/**
 	 * Synonym for ADOLoadCode. Private function. Do not use.
 	 *
 	 * @deprecated
 	 */
-	function ADOLoadDB($dbType) 
-	{ 
+	function ADOLoadDB($dbType)
+	{
 		return ADOLoadCode($dbType);
 	}
-		
+
 	/**
 	 * Load the code for a specific database driver. Private function. Do not use.
 	 */
-	function ADOLoadCode($dbType) 
+	function ADOLoadCode($dbType)
 	{
 	global $ADODB_LASTDB;
-	
+
 		if (!$dbType) return false;
 		$db = strtolower($dbType);
 		switch ($db) {
-			case 'ado': 
+			case 'ado':
 				if (PHP_VERSION >= 5) $db = 'ado5';
-				$class = 'ado'; 
+				$class = 'ado';
 				break;
+
 			case 'ifx':
-			case 'maxsql': $class = $db = 'mysqlt'; break;
+			case 'maxsql':
+				$class = $db = 'mysqlt';
+				break;
+
+			case 'pgsql':
 			case 'postgres':
-			case 'postgres8':
-			case 'pgsql': $class = $db = 'postgres7'; break;
+				$class = $db = 'postgres8';
+				break;
+
 			default:
 				$class = $db; break;
 		}
-		
+
 		$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
 		@include_once($file);
 		$ADODB_LASTDB = $class;
 		if (class_exists("ADODB_" . $class)) return $class;
-		
+
 		//ADOConnection::outp(adodb_pr(get_declared_classes(),true));
 		if (!file_exists($file)) ADOConnection::outp("Missing file: $file");
 		else ADOConnection::outp("Syntax error in file: $file");
@@ -4194,7 +4213,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$tmp = ADONewConnection($db);
 		return $tmp;
 	}
-	
+
 	/**
 	 * Instantiate a new Connection class for a specific database driver.
 	 *
@@ -4206,7 +4225,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 	function ADONewConnection($db='')
 	{
 	GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
-		
+
 		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
 		$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
 		$false = false;
@@ -4217,21 +4236,22 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 				// special handling of oracle, which might not have host
 				$fakedsn = str_replace('@/','@adodb-fakehost/',$fakedsn);
 			}
-			
-			 if ((strpos($origdsn, 'sqlite')) !== FALSE && stripos($origdsn, '%2F') === FALSE) {
-             // special handling for SQLite, it only might have the path to the database file.
-             // If you try to connect to a SQLite database using a dsn like 'sqlite:///path/to/database', the 'parse_url' php function
-             // will throw you an exception with a message such as "unable to parse url"
-                list($scheme, $path) = explode('://', $origdsn);
-                $dsna['scheme'] = $scheme;
+
+			if ((strpos($origdsn, 'sqlite')) !== FALSE && stripos($origdsn, '%2F') === FALSE) {
+				// special handling for SQLite, it only might have the path to the database file.
+				// If you try to connect to a SQLite database using a dsn
+				// like 'sqlite:///path/to/database', the 'parse_url' php function
+				// will throw you an exception with a message such as "unable to parse url"
+				list($scheme, $path) = explode('://', $origdsn);
+				$dsna['scheme'] = $scheme;
 				if ($qmark = strpos($path,'?')) {
 					$dsn['query'] = substr($path,$qmark+1);
 					$path = substr($path,0,$qmark);
 				}
-            	$dsna['path'] = '/' . urlencode($path);
+				$dsna['path'] = '/' . urlencode($path);
 			} else
 				$dsna = @parse_url($fakedsn);
-				
+
 			if (!$dsna) {
 				return $false;
 			}
@@ -4239,11 +4259,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 			if ($at2 !== FALSE) {
 				$dsna['host'] = '';
 			}
-			
+
 			if (strncmp($origdsn,'pdo',3) == 0) {
 				$sch = explode('_',$dsna['scheme']);
 				if (sizeof($sch)>1) {
-				
+
 					$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
 					if ($sch[1] == 'sqlite')
 						$dsna['host'] = rawurlencode($sch[1].':'.rawurldecode($dsna['host']));
@@ -4252,14 +4272,14 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					$dsna['scheme'] = 'pdo';
 				}
 			}
-			
+
 			$db = @$dsna['scheme'];
 			if (!$db) return $false;
 			$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
 			$dsna['user'] = isset($dsna['user']) ? rawurldecode($dsna['user']) : '';
 			$dsna['pass'] = isset($dsna['pass']) ? rawurldecode($dsna['pass']) : '';
 			$dsna['path'] = isset($dsna['path']) ? rawurldecode(substr($dsna['path'],1)) : ''; # strip off initial /
-			
+
 			if (isset($dsna['query'])) {
 				$opt1 = explode('&',$dsna['query']);
 				foreach($opt1 as $k => $v) {
@@ -4280,15 +4300,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		if (!empty($ADODB_NEWCONNECTION)) {
 			$obj = $ADODB_NEWCONNECTION($db);
 
-		} 
-		
+		}
+
 		if(empty($obj)) {
-		
+
 			if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
 			if (empty($db)) $db = $ADODB_LASTDB;
-			
+
 			if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
-			
+
 			if (!$db) {
 				if (isset($origdsn)) $db = $origdsn;
 				if ($errorfn) {
@@ -4299,19 +4319,19 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 							 $db,false,$ignore);
 				} else
 					 ADOConnection::outp( "<p>ADONewConnection: Unable to load database driver '$db'</p>",false);
-					
+
 				return $false;
 			}
-			
+
 			$cls = 'ADODB_'.$db;
 			if (!class_exists($cls)) {
 				adodb_backtrace();
 				return $false;
 			}
-			
+
 			$obj = new $cls();
 		}
-		
+
 		# constructor should not fail
 		if ($obj) {
 			if ($errorfn)  $obj->raiseErrorFn = $errorfn;
@@ -4341,15 +4361,15 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					#oci8
 					case 'nls_date_format': $obj->NLS_DATE_FORMAT = $v; break;
 					case 'cachesecs': $obj->cacheSecs = $v; break;
-					case 'memcache': 
+					case 'memcache':
 						$varr = explode(':',$v);
 						$vlen = sizeof($varr);
-						if ($vlen == 0) break;	
+						if ($vlen == 0) break;
 						$obj->memCache = true;
 						$obj->memCacheHost = explode(',',$varr[0]);
-						if ($vlen == 1) break;	
+						if ($vlen == 1) break;
 						$obj->memCachePort = $varr[1];
-						if ($vlen == 2) break;	
+						if ($vlen == 2) break;
 						$obj->memCacheCompress = $varr[2] ?  true : false;
 						break;
 					}
@@ -4360,36 +4380,36 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 					$ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
 				else
 					$ok = $obj->NConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-					
+
 				if (!$ok) return $false;
 			}
 		}
 		return $obj;
 	}
-	
-	
-	
+
+
+
 	// $perf == true means called by NewPerfMonitor(), otherwise for data dictionary
 	function _adodb_getdriver($provider,$drivername,$perf=false)
 	{
 		switch ($provider) {
-		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6); 
-		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5); 
+		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6);
+		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5);
 		case 'ado'  :   if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4);
 		case 'native':  break;
 		default:
 			return $provider;
 		}
-		
+
 		switch($drivername) {
 		case 'mysqlt':
-		case 'mysqli': 
-				$drivername='mysql'; 
+		case 'mysqli':
+				$drivername='mysql';
 				break;
 		case 'postgres7':
 		case 'postgres8':
-				$drivername = 'postgres'; 
-				break;	
+				$drivername = 'postgres';
+				break;
 		case 'firebird15': $drivername = 'firebird'; break;
 		case 'oracle': $drivername = 'oci8'; break;
 		case 'access': if ($perf) $drivername = ''; break;
@@ -4401,7 +4421,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		}
 		return $drivername;
 	}
-	
+
 	function NewPerfMonitor(&$conn)
 	{
 		$false = false;
@@ -4412,10 +4432,10 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$class = "Perf_$drivername";
 		if (!class_exists($class)) return $false;
 		$perf = new $class($conn);
-		
+
 		return $perf;
 	}
-	
+
 	function NewDataDictionary(&$conn,$drivername=false)
 	{
 		$false = false;
@@ -4438,34 +4458,34 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 		$dict->quote = $conn->nameQuote;
 		if (!empty($conn->_connectionID))
 			$dict->serverInfo = $conn->ServerInfo();
-		
+
 		return $dict;
 	}
 
 
-	
+
 	/*
 		Perform a print_r, with pre tags for better formatting.
 	*/
 	function adodb_pr($var,$as_string=false)
 	{
 		if ($as_string) ob_start();
-		
-		if (isset($_SERVER['HTTP_USER_AGENT'])) { 
+
+		if (isset($_SERVER['HTTP_USER_AGENT'])) {
 			echo " <pre>\n";print_r($var);echo "</pre>\n";
 		} else
 			print_r($var);
-			
+
 		if ($as_string) {
 			$s = ob_get_contents();
 			ob_end_clean();
 			return $s;
 		}
 	}
-	
+
 	/*
 		Perform a stack-crawl and pretty print it.
-		
+
 		@param printOrArr  Pass in a boolean to indicate print, or an $exception->trace array (assumes that print is true then).
 		@param levels Number of levels to display
 	*/
@@ -4478,4 +4498,3 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
 
 
 }
-?>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/composer.json b/src/plugins/wiki/www/lib/WikiDB/adodb/composer.json
new file mode 100644
index 0000000..73eedb5
--- /dev/null
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/composer.json
@@ -0,0 +1,33 @@
+{
+	"name" : "adodb/adodb-php",
+	"description" : "ADOdb is a PHP database abstraction layer library",
+	"license" : [ "LGPL-2.1", " BSD-2-Clause" ],
+	"authors" : [
+		{
+			"name": "John Lim",
+			"email" : "jlim at natsoft.com",
+			"role": "Author"
+		},
+		{
+			"name": "Damien Regad",
+			"role": "Current maintainer"
+		}
+	],
+
+	"keywords" : [ "database" ],
+
+	"homepage": "http://adodb.sourceforge.net/",
+	"support" : {
+		"issues" : "https://github.com/ADOdb/ADOdb/issues",
+		"source" : "https://github.com/ADOdb/ADOdb"
+	},
+
+	"require" : {
+		"php" : ">=5.3.2"
+	},
+
+	"autoload" : {
+		"files" : ["adodb.inc.php"]
+	}
+
+}
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/contrib/toxmlrpc.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/contrib/toxmlrpc.inc.php
index 3711bda..f769cc5 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/contrib/toxmlrpc.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/contrib/toxmlrpc.inc.php
@@ -2,11 +2,11 @@
     /**
     * Helper functions to convert between ADODB recordset objects and XMLRPC values.
     * Uses John Lim's AdoDB and Edd Dumbill's phpxmlrpc libs
-    * 
+    *
     * @author Daniele Baroncelli
     * @author Gaetano Giunta
     * @copyright (c) 2003-2004 Giunta/Baroncelli. All rights reserved.
-    * 
+    *
     * @todo some more error checking here and there
     * @todo document the xmlrpc-struct used to encode recordset info
     * @todo verify if using xmlrpc_encode($rs->GetArray()) would work with:
@@ -16,10 +16,10 @@
 
     /**
     * Include the main libraries
-    */    
+    */
     require_once('xmlrpc.inc');
     if (!defined('ADODB_DIR')) require_once('adodb.inc.php');
-            
+
     /**
     * Builds an xmlrpc struct value out of an AdoDB recordset
     */
@@ -113,12 +113,12 @@
         }
         $body = new xmlrpcval ($rows, "array");
 
-        return $body;    
+        return $body;
     }
-    
+
     /**
     * Returns an xmlrpc struct value as string out of an AdoDB recordset
-    */    
+    */
     function rs2xmlrpcstring (&$adodbrs) {
         $xmlrpc = rs2xmlrpcval ($adodbrs);
         if ($xmlrpc)
@@ -129,24 +129,24 @@
 
     /**
     * Given a well-formed xmlrpc struct object returns an AdoDB object
-    * 
+    *
     * @todo add some error checking on the input value
     */
     function xmlrpcval2rs (&$xmlrpcval) {
 
         $fields_array = array();
         $data_array = array();
- 
-        // rebuild column information  
+
+        // rebuild column information
         $header = $xmlrpcval->structmem('header');
-        
+
         $numfields = $header->structmem('fieldcount');
         $numfields = $numfields->scalarval();
         $numrecords = $header->structmem('recordcount');
         $numrecords = $numrecords->scalarval();
         $sqlstring = $header->structmem('sql');
         $sqlstring = $sqlstring->scalarval();
-        
+
         $fieldinfo = $header->structmem('fieldinfo');
         for ($i = 0; $i < $numfields; $i++) {
             $temp = $fieldinfo->arraymem($i);
@@ -179,5 +179,3 @@
         return $rs;
 
     }
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-access.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-access.inc.php
index 9b0bf84..6a0a2cd 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-access.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-access.inc.php
@@ -1,54 +1,54 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_access extends ADODB_DataDict {
-	
+
 	var $databaseType = 'access';
 	var $seqField = false;
-	
- 	
+
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'TEXT';
 		case 'XL':
-		case 'X': return 'MEMO'; 
-		
+		case 'X': return 'MEMO';
+
 		case 'C2': return 'TEXT'; // up to 32K
 		case 'X2': return 'MEMO';
-		
+
 		case 'B': return 'BINARY';
-		
+
 		case 'TS':
 		case 'D': return 'DATETIME';
 		case 'T': return 'DATETIME';
-		
+
 		case 'L': return 'BYTE';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'BYTE';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'INTEGER';
-		
+
 		case 'F': return 'DOUBLE';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
@@ -66,13 +66,13 @@ class ADODB2_access extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	function CreateDatabase($dbname,$options=false)
 	{
 		return array();
 	}
-	
-	
+
+
 	function SetSchema($schema)
 	{
 	}
@@ -82,15 +82,12 @@ class ADODB2_access extends ADODB_DataDict {
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
-}
 
-
-?>
\ No newline at end of file
+}
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-db2.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
index 6c58110..5bbca1d 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
@@ -1,28 +1,28 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_db2 extends ADODB_DataDict {
-	
+
 	var $databaseType = 'db2';
 	var $seqField = false;
-	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL': return 'CLOB';
-		case 'X': return 'VARCHAR(3600)'; 
+		case 'X': return 'VARCHAR(3600)';
 
 		case 'C2': return 'VARCHAR'; // up to 32K
 		case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default page size too small
@@ -46,12 +46,12 @@ class ADODB2_db2 extends ADODB_DataDict {
 			return $meta;
 		}
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
-		if ($fautoinc) return ' GENERATED ALWAYS AS IDENTITY'; # as identity start with 
+		if ($fautoinc) return ' GENERATED ALWAYS AS IDENTITY'; # as identity start with
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fnotnull) $suffix .= ' NOT NULL';
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
@@ -63,37 +63,37 @@ class ADODB2_db2 extends ADODB_DataDict {
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
 	{
-		
+
 		/**
 		  Allow basic table changes to DB2 databases
-		  DB2 will fatally reject changes to non character columns 
+		  DB2 will fatally reject changes to non character columns
 
 		*/
-		
+
 		$validTypes = array("CHAR","VARC");
 		$invalidTypes = array("BIGI","BLOB","CLOB","DATE", "DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
 		// check table exists
 		$cols = $this->MetaColumns($tablename);
-		if ( empty($cols)) { 
+		if ( empty($cols)) {
 			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
 		}
-		
+
 		// 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]) ) {
 				/**
@@ -110,10 +110,10 @@ class ADODB2_db2 extends ADODB_DataDict {
 				for ($i=1;$i<sizeof($vargs);$i++)
 					if ($vargs[$i] != '')
 						break;
-				
+
 				// if $vargs[$i] is one of the following, we are trying to change the
 				// size of the field, if not allowed, simply ignore the request.
-				if (in_array(substr($vargs[$i],0,4),$invalidTypes)) 
+				if (in_array(substr($vargs[$i],0,4),$invalidTypes))
 					continue;
 				// insert the appropriate DB2 syntax
 				if (in_array(substr($vargs[$i],0,4),$validTypes)) {
@@ -128,17 +128,14 @@ class ADODB2_db2 extends ADODB_DataDict {
 						break;
 					array_splice($vargs,$i,2,'');
 				}
-				$v = implode(' ',$vargs);	
+				$v = implode(' ',$vargs);
 				$sql[] = $alter . $this->alterCol . ' ' . $v;
 			} else {
 				$sql[] = $alter . $this->addCol . ' ' . $v;
 			}
 		}
-		
+
 		return $sql;
 	}
-	
-}
 
-
-?>
\ No newline at end of file
+}
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
index c353f71..d4471df 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
@@ -1,76 +1,76 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 class ADODB2_firebird extends ADODB_DataDict {
-	
+
 	var $databaseType = 'firebird';
 	var $seqField = false;
 	var $seqPrefix = 'gen_';
-	var $blobSize = 40000;	
- 	
+	var $blobSize = 40000;
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
-		case 'XL': return 'VARCHAR(32000)'; 
-		case 'X': return 'VARCHAR(4000)'; 
-		
+		case 'XL': return 'VARCHAR(32000)';
+		case 'X': return 'VARCHAR(4000)';
+
 		case 'C2': return 'VARCHAR'; // up to 32K
 		case 'X2': return 'VARCHAR(4000)';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'INTEGER';
-		
+
 		case 'F': return 'DOUBLE PRECISION';
 		case 'N': return 'DECIMAL';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	function NameQuote($name = NULL)
 	{
 		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
 		if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
 			return $quote . $name . $quote;
 		}
-		
+
 		return $quote . $name . $quote;
 	}
 
@@ -78,12 +78,12 @@ class ADODB2_firebird extends ADODB_DataDict {
 	{
 		$options = $this->_Options($options);
 		$sql = array();
-		
+
 		$sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
-		
+
 		return $sql;
 	}
-	
+
 	function _DropAutoIncrement($t)
 	{
 		if (strpos($t,'.') !== false) {
@@ -92,20 +92,20 @@ class ADODB2_firebird extends ADODB_DataDict {
 		}
 		return 'DROP GENERATOR "GEN_'.$t;
 	}
-	
+
 
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
 		$suffix = '';
-		
+
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fnotnull) $suffix .= ' NOT NULL';
 		if ($fautoinc) $this->seqField = $fname;
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
+
 		return $suffix;
 	}
-	
+
 /*
 CREATE or replace TRIGGER jaddress_insert
 before insert on jaddress
@@ -116,9 +116,9 @@ IF ( NEW."seqField" IS NULL OR NEW."seqField" = 0 ) THEN
 end;
 */
 	function _Triggers($tabname,$tableoptions)
-	{	
+	{
 		if (!$this->seqField) return array();
-		
+
 		$tab1 = preg_replace( '/"/', '', $tabname );
 		if ($this->schema) {
 			$t = strpos($tab1,'.');
@@ -141,12 +141,9 @@ end;
 		{ $sql[] = "CREATE GENERATOR \"$seqname\"";
 		  $sql[] = "CREATE TRIGGER \"$trigname\" FOR $tabname BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
 		}
-		
+
 		$this->seqField = false;
 		return $sql;
 	}
 
 }
-
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-generic.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
index 9b78d22..b3736f5 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
@@ -1,47 +1,47 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_generic extends ADODB_DataDict {
-	
+
 	var $databaseType = 'generic';
 	var $seqField = false;
-	
- 	
+
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'VARCHAR(250)';
-		
+
 		case 'C2': return 'VARCHAR';
 		case 'X2': return 'VARCHAR(250)';
-		
+
 		case 'B': return 'VARCHAR';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'DATE';
-		
+
 		case 'L': return 'DECIMAL(1)';
 		case 'I': return 'DECIMAL(10)';
 		case 'I1': return 'DECIMAL(3)';
 		case 'I2': return 'DECIMAL(5)';
 		case 'I4': return 'DECIMAL(10)';
 		case 'I8': return 'DECIMAL(20)';
-		
+
 		case 'F': return 'DECIMAL(32,8)';
 		case 'N': return 'DECIMAL';
 		default:
@@ -54,14 +54,14 @@ class ADODB2_generic extends ADODB_DataDict {
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
+
 }
 
 /*
@@ -70,52 +70,52 @@ class ADODB2_generic extends ADODB_DataDict {
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
-		case 'X': return 'VARCHAR'; 
-		
+		case 'X': return 'VARCHAR';
+
 		case 'C2': return 'VARCHAR'; // up to 32K
 		case 'X2': return 'VARCHAR';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'DOUBLE';
 		case 'N': return 'DECIMAL';
 		default:
 			return $meta;
 		}
 	}
-	
+
 // ifx
 function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';// 255
-		case 'X': return 'TEXT'; 
-		
+		case 'X': return 'TEXT';
+
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'TEXT';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'T': return 'DATETIME';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'DECIMAL(20)';
-		
+
 		case 'F': return 'FLOAT';
 		case 'N': return 'DECIMAL';
 		default:
@@ -123,4 +123,3 @@ function ActualType($meta)
 		}
 	}
 */
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
index cd755f6..13f028e 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
@@ -1,47 +1,47 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_ibase extends ADODB_DataDict {
-	
+
 	var $databaseType = 'ibase';
 	var $seqField = false;
-	
- 	
+
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
-		case 'X': return 'VARCHAR(4000)'; 
-		
+		case 'X': return 'VARCHAR(4000)';
+
 		case 'C2': return 'VARCHAR'; // up to 32K
 		case 'X2': return 'VARCHAR(4000)';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'INTEGER';
-		
+
 		case 'F': return 'DOUBLE PRECISION';
 		case 'N': return 'DECIMAL';
 		default:
@@ -54,15 +54,12 @@ class ADODB2_ibase extends ADODB_DataDict {
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
-}
-
 
-?>
\ No newline at end of file
+}
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-informix.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
index 29ddb0d..1bc6880 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
@@ -1,47 +1,47 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_informix extends ADODB_DataDict {
-	
+
 	var $databaseType = 'informix';
 	var $seqField = false;
-	
- 	
+
+
 	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';// 255
 		case 'XL':
-		case 'X': return 'TEXT'; 
-		
+		case 'X': return 'TEXT';
+
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'TEXT';
-		
+
 		case 'B': return 'BLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'DATETIME YEAR TO SECOND';
-		
+
 		case 'L': return 'SMALLINT';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'DECIMAL(20)';
-		
+
 		case 'F': return 'FLOAT';
 		case 'N': return 'DECIMAL';
 		default:
@@ -54,14 +54,14 @@ class ADODB2_informix extends ADODB_DataDict {
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
 		return array();
 	}
-	
-	
+
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
 		return array();
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
@@ -75,7 +75,5 @@ class ADODB2_informix extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
-}
 
-?>
\ No newline at end of file
+}
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
index 79ff1d0..6610fc4 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
@@ -1,38 +1,38 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 /*
 In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
 
-	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords, 
+	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords,
 	whether or not they are marked as reserved in SQL Server.
-	
+
 	Quoted identifiers are delimited by double quotation marks ("):
 	SELECT * FROM "Blanks in Table Name"
-	
+
 	Bracketed identifiers are delimited by brackets ([ ]):
 	SELECT * FROM [Blanks In Table Name]
-	
-	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default, 
-	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON 
-	when they connect. 
-	
-	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER, 
+
+	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default,
+	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON
+	when they connect.
+
+	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER,
 	the quoted identifier option of sp_dboption, or the user options option of sp_configure.
-	
+
 	When SET ANSI_DEFAULTS is ON, SET QUOTED_IDENTIFIER is enabled.
-	
+
 	Syntax
-	
+
 		SET QUOTED_IDENTIFIER { ON | OFF }
 
 
@@ -49,9 +49,9 @@ class ADODB2_mssql extends ADODB_DataDict {
 
 	var $typeX = 'TEXT';  ## Alternatively, set it to VARCHAR(4000)
 	var $typeXL = 'TEXT';
-	
+
 	//var $alterCol = ' ALTER COLUMN ';
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -59,11 +59,11 @@ class ADODB2_mssql extends ADODB_DataDict {
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
 		case 'R':
-		case 'INT': 
+		case 'INT':
 		case 'INTEGER': return  'I';
 		case 'BIT':
 		case 'TINYINT': return  'I1';
@@ -75,7 +75,7 @@ class ADODB2_mssql extends ADODB_DataDict {
 		default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
-	
+
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
@@ -85,30 +85,30 @@ class ADODB2_mssql extends ADODB_DataDict {
 		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
+
 		case 'D': return 'DATETIME';
-		
+
 		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'BIT';
-		
-		case 'R':		
-		case 'I': return 'INT'; 
+
+		case 'R':
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -122,7 +122,7 @@ class ADODB2_mssql extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	/*
 	function AlterColumnSQL($tabname, $flds)
 	{
@@ -136,7 +136,7 @@ class ADODB2_mssql extends ADODB_DataDict {
 		return $sql;
 	}
 	*/
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -151,10 +151,10 @@ class ADODB2_mssql extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
@@ -163,110 +163,110 @@ class ADODB2_mssql extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
-	
+
+
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
 		switch ($ftype) {
@@ -277,8 +277,7 @@ CREATE TABLE
 			return $ftype;
 		}
     	if ($ty == 'T') return $ftype;
-    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);
 
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
index c579536..0741c79 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
@@ -1,38 +1,38 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 /*
 In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
 
-	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords, 
+	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords,
 	whether or not they are marked as reserved in SQL Server.
-	
+
 	Quoted identifiers are delimited by double quotation marks ("):
 	SELECT * FROM "Blanks in Table Name"
-	
+
 	Bracketed identifiers are delimited by brackets ([ ]):
 	SELECT * FROM [Blanks In Table Name]
-	
-	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default, 
-	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON 
-	when they connect. 
-	
-	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER, 
+
+	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default,
+	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON
+	when they connect.
+
+	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER,
 	the quoted identifier option of sp_dboption, or the user options option of sp_configure.
-	
+
 	When SET ANSI_DEFAULTS is ON, SET QUOTED_IDENTIFIER is enabled.
-	
+
 	Syntax
-	
+
 		SET QUOTED_IDENTIFIER { ON | OFF }
 
 
@@ -43,15 +43,14 @@ if (!defined('ADODB_DIR')) die();
 
 class ADODB2_mssqlnative extends ADODB_DataDict {
 	var $databaseType = 'mssqlnative';
-	var $dropIndex = 'DROP INDEX %2$s.%1$s';
+	var $dropIndex = 'DROP INDEX %1$s ON %2$s';
 	var $renameTable = "EXEC sp_rename '%s','%s'";
 	var $renameColumn = "EXEC sp_rename '%s.%s','%s'";
-
 	var $typeX = 'TEXT';  ## Alternatively, set it to VARCHAR(4000)
 	var $typeXL = 'TEXT';
-	
+
 	//var $alterCol = ' ALTER COLUMN ';
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -59,25 +58,48 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'R':
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
-		
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
-		}
+
+		$_typeConversion = array(
+			-155 => 'D',
+			  93 => 'D',
+			-154 => 'D',
+			  -2 => 'D',
+			  91 => 'D',
+
+			  12 => 'C',
+			   1 => 'C',
+			  -9 => 'C',
+			  -8 => 'C',
+
+			  -7 => 'L',
+			  -6 => 'I2',
+			  -5 => 'I8',
+			 -11 => 'I',
+			   4 => 'I',
+			   5 => 'I4',
+
+			  -1 => 'X',
+			 -10 => 'X',
+
+			   2 => 'N',
+			   3 => 'N',
+			   6 => 'N',
+			   7 => 'N',
+
+			-152 => 'X',
+			-151 => 'X',
+			  -4 => 'X',
+			  -3 => 'X'
+			);
+
+		return $_typeConversion($t);
+
 	}
-	
+
 	function ActualType($meta)
 	{
+		$DATE_TYPE = 'DATETIME';
+
 		switch(strtoupper($meta)) {
 
 		case 'C': return 'VARCHAR';
@@ -85,28 +107,29 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
 		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
+
+		case 'D': return $DATE_TYPE;
+		case 'T': return 'TIME';
 		case 'L': return 'BIT';
-		
-		case 'R':		
-		case 'I': return 'INT'; 
+
+		case 'R':
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
+			print "RETURN $meta";
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -120,7 +143,7 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	/*
 	function AlterColumnSQL($tabname, $flds)
 	{
@@ -134,25 +157,36 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
 		return $sql;
 	}
 	*/
-	
-	function DropColumnSQL($tabname, $flds)
+
+	/**
+	 * Drop a column, syntax is ALTER TABLE table DROP COLUMN column,column
+	 *
+	 * @param string   $tabname      Table Name
+	 * @param string[] $flds         One, or an array of Fields To Drop
+	 * @param string   $tableflds    Throwaway value to make the function match the parent
+	 * @param string   $tableoptions Throway value to make the function match the parent
+	 *
+	 * @return string  The SQL necessary to drop the column
+	 */
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
 		$tabname = $this->TableName ($tabname);
 		if (!is_array($flds))
 			$flds = explode(',',$flds);
 		$f = array();
-		$s = 'ALTER TABLE ' . $tabname;
+		$s = 'ALTER TABLE ' . $tabname . ' DROP COLUMN ';
 		foreach($flds as $v) {
-			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
+			//$f[] = "\n$this->dropCol ".$this->NameQuote($v);
+			$f[] = $this->NameQuote($v);
 		}
 		$s .= implode(', ',$f);
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
@@ -161,110 +195,110 @@ class ADODB2_mssqlnative extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
-	
+
+
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
 		switch ($ftype) {
@@ -275,8 +309,7 @@ CREATE TABLE
 			return $ftype;
 		}
     	if ($ty == 'T') return $ftype;
-    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);
 
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
index 07344d0..773aa0c 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 // security - hide paths
@@ -18,10 +18,10 @@ class ADODB2_mysql extends ADODB_DataDict {
 	var $alterCol = ' MODIFY COLUMN';
 	var $alterTableAddIndex = true;
 	var $dropTable = 'DROP TABLE IF EXISTS %s'; // requires mysql 3.22 or later
-	
+
 	var $dropIndex = 'DROP INDEX %s ON %s';
 	var $renameColumn = 'ALTER TABLE %s CHANGE COLUMN %s %s %s';	// needs column-definition!
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -30,43 +30,43 @@ class ADODB2_mysql extends ADODB_DataDict {
 			$len = $fieldobj->max_length;
 		}
 		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->auto_increment;
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING': 
+		case 'STRING':
 		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
+		case 'VARCHAR':
+		case 'TINYBLOB':
+		case 'TINYTEXT':
+		case 'ENUM':
 		case 'SET':
 			if ($len <= $this->blobSize) return 'C';
-			
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 			return 'X';
-			
+
 		// php_mysql extension always returns 'blob' even if 'text'
 		// so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
 			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
+
 		case 'YEAR':
 		case 'DATE': return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP': return 'T';
-		
+
 		case 'FLOAT':
 		case 'DOUBLE':
 			return 'F';
-			
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER': return $is_serial ? 'R' : 'I';
 		case 'TINYINT': return $is_serial ? 'R' : 'I1';
 		case 'SMALLINT': return $is_serial ? 'R' : 'I2';
@@ -82,34 +82,34 @@ class ADODB2_mysql extends ADODB_DataDict {
 		case 'C': return 'VARCHAR';
 		case 'XL':return 'LONGTEXT';
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'VARCHAR';
 		case 'X2': return 'LONGTEXT';
-		
+
 		case 'B': return 'LONGBLOB';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'TINYINT';
-		
+
 		case 'R':
 		case 'I4':
 		case 'I': return 'INTEGER';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'DOUBLE';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if ($funsigned) $suffix .= ' UNSIGNED';
 		if ($fnotnull) $suffix .= ' NOT NULL';
@@ -118,7 +118,7 @@ class ADODB2_mysql extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
 	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
 		[table_options] [select_statement]
@@ -134,16 +134,16 @@ class ADODB2_mysql extends ADODB_DataDict {
 		[reference_definition]
 		or CHECK (expr)
 	*/
-	
+
 	/*
 	CREATE [UNIQUE|FULLTEXT] INDEX index_name
 		ON tbl_name (col_name[(length)],... )
 	*/
-	
+
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE $tabname DROP INDEX $idxname";
 			else $sql[] = sprintf($this->dropIndex, $idxname, $tabname);
@@ -151,11 +151,11 @@ class ADODB2_mysql extends ADODB_DataDict {
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		if (isset($idxoptions['FULLTEXT'])) {
 			$unique = ' FULLTEXT';
 		} elseif (isset($idxoptions['UNIQUE'])) {
@@ -163,20 +163,19 @@ class ADODB2_mysql extends ADODB_DataDict {
 		} else {
 			$unique = '';
 		}
-		
+
 		if ( is_array($flds) ) $flds = implode(', ',$flds);
-		
+
 		if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD $unique INDEX $idxname ";
 		else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname;
-		
+
 		$s .= ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
index 597fadd..0f03389 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_oci8 extends ADODB_DataDict {
-	
+
 	var $databaseType = 'oci8';
 	var $seqField = false;
 	var $seqPrefix = 'SEQ_';
@@ -23,7 +23,7 @@ class ADODB2_oci8 extends ADODB_DataDict {
 	var $alterCol = ' MODIFY ';
 	var $typeX = 'VARCHAR(4000)';
 	var $typeXL = 'CLOB';
-	
+
 	function MetaType($t,$len=-1)
 	{
 		if (is_object($t)) {
@@ -39,70 +39,70 @@ class ADODB2_oci8 extends ADODB_DataDict {
 		case 'BINARY':
 			if (isset($this) && $len <= $this->blobSize) return 'C';
 			return 'X';
-		
+
 		case 'NCHAR':
 		case 'NVARCHAR2':
 		case 'NVARCHAR':
 			if (isset($this) && $len <= $this->blobSize) return 'C2';
 			return 'X2';
-			
+
 		case 'NCLOB':
 		case 'CLOB':
 			return 'XL';
-		
+
 		case 'LONG RAW':
 		case 'LONG VARBINARY':
 		case 'BLOB':
 			return 'B';
-		
+
 		case 'TIMESTAMP':
 			return 'TS';
-			
-		case 'DATE': 
+
+		case 'DATE':
 			return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'SMALLINT':
-		case 'INTEGER': 
+		case 'INTEGER':
 			return 'I';
-			
+
 		default:
 			return 'N';
 		}
 	}
-	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'X': return $this->typeX;
 		case 'XL': return $this->typeXL;
-		
+
 		case 'C2': return 'NVARCHAR2';
 		case 'X2': return 'NVARCHAR2(4000)';
-		
+
 		case 'B': return 'BLOB';
-		
+
 		case 'TS':
 				return 'TIMESTAMP';
-				
-		case 'D': 
+
+		case 'D':
 		case 'T': return 'DATE';
 		case 'L': return 'NUMBER(1)';
 		case 'I1': return 'NUMBER(3)';
 		case 'I2': return 'NUMBER(5)';
 		case 'I':
 		case 'I4': return 'NUMBER(10)';
-		
+
 		case 'I8': return 'NUMBER(20)';
 		case 'F': return 'NUMBER';
 		case 'N': return 'NUMBER';
 		case 'R': return 'NUMBER(20)';
 		default:
 			return $meta;
-		}	
+		}
 	}
-	
+
 	function CreateDatabase($dbname, $options=false)
 	{
 		$options = $this->_Options($options);
@@ -110,10 +110,10 @@ class ADODB2_oci8 extends ADODB_DataDict {
 		$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
 		$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
 		$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
-		
+
 		return $sql;
 	}
-	
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$f = array();
@@ -122,12 +122,12 @@ class ADODB2_oci8 extends ADODB_DataDict {
 		foreach($lines as $v) {
 			$f[] = "\n $v";
 		}
-		
+
 		$s .= implode(', ',$f).')';
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function AlterColumnSQL($tabname, $flds)
 	{
 		$f = array();
@@ -140,19 +140,19 @@ class ADODB2_oci8 extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if (!is_array($flds)) $flds = explode(',',$flds);
 		foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
-		
+
 		$sql = array();
 		$s = "ALTER TABLE $tabname DROP(";
 		$s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function _DropAutoIncrement($t)
 	{
 		if (strpos($t,'.') !== false) {
@@ -161,26 +161,26 @@ class ADODB2_oci8 extends ADODB_DataDict {
 		}
 		return "drop sequence seq_".$t;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
 		$suffix = '';
-		
+
 		if ($fdefault == "''" && $fnotnull) {// this is null in oracle
 			$fnotnull = false;
 			if ($this->debug) ADOConnection::outp("NOT NULL and DEFAULT='' illegal in Oracle");
 		}
-		
+
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fnotnull) $suffix .= ' NOT NULL';
-		
+
 		if ($fautoinc) $this->seqField = $fname;
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
+
 		return $suffix;
 	}
-	
+
 /*
 CREATE or replace TRIGGER jaddress_insert
 before insert on jaddress
@@ -192,7 +192,7 @@ end;
 	function _Triggers($tabname,$tableoptions)
 	{
 		if (!$this->seqField) return array();
-		
+
 		if ($this->schema) {
 			$t = strpos($tabname,'.');
 			if ($t !== false) $tab = substr($tabname,$t+1);
@@ -203,7 +203,7 @@ end;
 			$seqname = $this->seqPrefix.$tabname;
 			$trigname = $this->trigPrefix.$seqname;
 		}
-		
+
 		if (strlen($seqname) > 30) {
 			$seqname = $this->seqPrefix.uniqid('');
 		} // end if
@@ -219,12 +219,12 @@ end;
 		$seqStart = '';
 		if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START WITH '.$tableoptions['SEQUENCE_START'];}
 		$sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr $seqCache";
-		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField = 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END";
-		
+		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField = 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
+
 		$this->seqField = false;
 		return $sql;
 	}
-	
+
 	/*
 	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
 		[table_options] [select_statement]
@@ -240,58 +240,57 @@ end;
 		[reference_definition]
 		or CHECK (expr)
 	*/
-	
 
-	
+
+
 	function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		if (isset($idxoptions['BITMAP'])) {
-			$unique = ' BITMAP'; 
+			$unique = ' BITMAP';
 		} elseif (isset($idxoptions['UNIQUE'])) {
 			$unique = ' UNIQUE';
 		} else {
 			$unique = '';
 		}
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		if (isset($idxoptions['oci8']))
 			$s .= $idxoptions['oci8'];
-		
+
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
+
 	function GetCommentSQL($table,$col)
 	{
 		$table = $this->connection->qstr($table);
-		$col = $this->connection->qstr($col);	
+		$col = $this->connection->qstr($col);
 		return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
 	}
-	
+
 	function SetCommentSQL($table,$col,$cmt)
 	{
 		$cmt = $this->connection->qstr($cmt);
 		return  "COMMENT ON COLUMN $table.$col IS $cmt";
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
index 67d5890..965314d 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_postgres extends ADODB_DataDict {
-	
+
 	var $databaseType = 'postgres';
 	var $seqField = false;
 	var $seqPrefix = 'SEQ_';
@@ -22,7 +22,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 	var $quote = '"';
 	var $renameTable = 'ALTER TABLE %s RENAME TO %s'; // at least since 7.1
 	var $dropTable = 'DROP TABLE %s CASCADE';
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -30,9 +30,9 @@ class ADODB2_postgres extends ADODB_DataDict {
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		$is_serial = is_object($fieldobj) && !empty($fieldobj->primary_key) && !empty($fieldobj->unique) && 
+		$is_serial = is_object($fieldobj) && !empty($fieldobj->primary_key) && !empty($fieldobj->unique) &&
 			!empty($fieldobj->has_default) && substr($fieldobj->default_value,0,8) == 'nextval(';
-		
+
 		switch (strtoupper($t)) {
 			case 'INTERVAL':
 			case 'CHAR':
@@ -41,84 +41,84 @@ class ADODB2_postgres extends ADODB_DataDict {
 			case 'NAME':
 	   		case 'BPCHAR':
 				if ($len <= $this->blobSize) return 'C';
-			
+
 			case 'TEXT':
 				return 'X';
-	
+
 			case 'IMAGE': // user defined type
 			case 'BLOB': // user defined type
 			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
 			case 'VARBIT':
 			case 'BYTEA':
 				return 'B';
-			
+
 			case 'BOOL':
 			case 'BOOLEAN':
 				return 'L';
-			
+
 			case 'DATE':
 				return 'D';
-			
+
 			case 'TIME':
 			case 'DATETIME':
 			case 'TIMESTAMP':
 			case 'TIMESTAMPTZ':
 				return 'T';
-			
+
 			case 'INTEGER': return !$is_serial ? 'I' : 'R';
-			case 'SMALLINT': 
+			case 'SMALLINT':
 			case 'INT2': return !$is_serial ? 'I2' : 'R';
 			case 'INT4': return !$is_serial ? 'I4' : 'R';
-			case 'BIGINT': 
+			case 'BIGINT':
 			case 'INT8': return !$is_serial ? 'I8' : 'R';
-				
+
 			case 'OID':
 			case 'SERIAL':
 				return 'R';
-			
+
 			case 'FLOAT4':
 			case 'FLOAT8':
 			case 'DOUBLE PRECISION':
 			case 'REAL':
 				return 'F';
-				
+
 			 default:
 			 	return 'N';
 		}
 	}
- 	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'VARCHAR';
 		case 'X2': return 'TEXT';
-		
+
 		case 'B': return 'BYTEA';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'BOOLEAN';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'SMALLINT';
 		case 'I2': return 'INT2';
 		case 'I4': return 'INT4';
 		case 'I8': return 'INT8';
-		
+
 		case 'F': return 'FLOAT8';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	/**
-	 * Adding a new Column 
+	 * Adding a new Column
 	 *
 	 * reimplementation of the default function as postgres does NOT allow to set the default in the same statement
 	 *
@@ -142,7 +142,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
 				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
 				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-			} else {				
+			} else {
 				$sql[] = $alter . $v;
 			}
 			if ($not_null) {
@@ -158,7 +158,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 	{
 	   return array(sprintf($this->dropIndex, $this->TableName($idxname), $this->TableName($tabname)));
 	}
-	
+
 	/**
 	 * Change the definition of one column
 	 *
@@ -179,85 +179,96 @@ class ADODB2_postgres extends ADODB_DataDict {
 		}
 		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
 	}*/
-	
+
 	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
-	   // Check if alter single column datatype available - works with 8.0+
-	   $has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
-	
-	   if ($has_alter_column) {
-	      $tabname = $this->TableName($tabname);
-	      $sql = array();
-	      list($lines,$pkey) = $this->_GenFields($flds);
-		  $set_null = false;
-	      $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-	      foreach($lines as $v) {
-	        if ($not_null = preg_match('/NOT NULL/i',$v)) {
-	            $v = preg_replace('/NOT NULL/i','',$v);
-	        }
-	         // this next block doesn't work - there is no way that I can see to 
-	         // explicitly ask a column to be null using $flds
-	        else if ($set_null = preg_match('/NULL/i',$v)) {
-	            // if they didn't specify not null, see if they explicitely asked for null
-	            $v = preg_replace('/\sNULL/i','',$v);
-	        }
-	         
-			if (preg_match('/^([^ ]+) .*DEFAULT (\'[^\']+\'|\"[^\"]+\"|[^ ]+)/',$v,$matches)) {
-				$existing = $this->MetaColumns($tabname);
-				list(,$colname,$default) = $matches;
-				if ($this->connection) $old_coltype = $this->connection->MetaType($existing[strtoupper($colname)]);
-				else $old_coltype = $t;
-				$v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
-				$t = trim(str_replace('DEFAULT '.$default,'',$v));
-
-				// Type change from bool to int
-				if ( $old_coltype == 'L' && $t == 'INTEGER' ) {
-					$sql[] = $alter . $colname . ' DROP DEFAULT';
-					$sql[] = $alter . $colname . " TYPE $t USING ($colname::BOOL)::INT";
-					$sql[] = $alter . $colname . " SET DEFAULT $default";
+		// Check if alter single column datatype available - works with 8.0+
+		$has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
+
+		if ($has_alter_column) {
+			$tabname = $this->TableName($tabname);
+			$sql = array();
+			list($lines,$pkey) = $this->_GenFields($flds);
+			$set_null = false;
+			$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+			foreach($lines as $v) {
+				if ($not_null = preg_match('/NOT NULL/i',$v)) {
+					$v = preg_replace('/NOT NULL/i','',$v);
 				}
-				// Type change from int to bool
-				else if ( $old_coltype == 'I' && $t == 'BOOLEAN' ) {
-					$sql[] = $alter . $colname . ' DROP DEFAULT';
-					$sql[] = $alter . $colname . " TYPE $t USING CASE WHEN $colname = 0 THEN false ELSE true END";
-					$sql[] = $alter . $colname . " SET DEFAULT " . $this->connection->qstr($default);
+				 // this next block doesn't work - there is no way that I can see to
+				 // explicitly ask a column to be null using $flds
+				else if ($set_null = preg_match('/NULL/i',$v)) {
+					// if they didn't specify not null, see if they explicitely asked for null
+					// Lookbehind pattern covers the case 'fieldname NULL datatype DEFAULT NULL'
+					// only the first NULL should be removed, not the one specifying
+					// the default value
+					$v = preg_replace('/(?<!DEFAULT)\sNULL/i','',$v);
+				}
+
+				if (preg_match('/^([^ ]+) .*DEFAULT (\'[^\']+\'|\"[^\"]+\"|[^ ]+)/',$v,$matches)) {
+					$existing = $this->MetaColumns($tabname);
+					list(,$colname,$default) = $matches;
+					$alter .= $colname;
+					if ($this->connection) {
+						$old_coltype = $this->connection->MetaType($existing[strtoupper($colname)]);
+					}
+					else {
+						$old_coltype = $t;
+					}
+					$v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
+					$t = trim(str_replace('DEFAULT '.$default,'',$v));
+
+					// Type change from bool to int
+					if ( $old_coltype == 'L' && $t == 'INTEGER' ) {
+						$sql[] = $alter . ' DROP DEFAULT';
+						$sql[] = $alter . " TYPE $t USING ($colname::BOOL)::INT";
+						$sql[] = $alter . " SET DEFAULT $default";
+					}
+					// Type change from int to bool
+					else if ( $old_coltype == 'I' && $t == 'BOOLEAN' ) {
+						if( strcasecmp('NULL', trim($default)) != 0 ) {
+							$default = $this->connection->qstr($default);
+						}
+						$sql[] = $alter . ' DROP DEFAULT';
+						$sql[] = $alter . " TYPE $t USING CASE WHEN $colname = 0 THEN false ELSE true END";
+						$sql[] = $alter . " SET DEFAULT $default";
+					}
+					// Any other column types conversion
+					else {
+						$sql[] = $alter . " TYPE $t";
+						$sql[] = $alter . " SET DEFAULT $default";
+					}
+
 				}
-				// Any other column types conversion
 				else {
-					$sql[] = $alter . $colname . " TYPE $t";
-					$sql[] = $alter . $colname . " SET DEFAULT $default";
+					// drop default?
+					preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
+					list (,$colname,$rest) = $matches;
+					$alter .= $colname;
+					$sql[] = $alter . ' TYPE ' . $rest;
+				}
+
+#				list($colname) = explode(' ',$v);
+				if ($not_null) {
+					// this does not error out if the column is already not null
+					$sql[] = $alter . ' SET NOT NULL';
+				}
+				if ($set_null) {
+					// this does not error out if the column is already null
+					$sql[] = $alter . ' DROP NOT NULL';
 				}
-			 
-			 
-	         } 
-	         else {
-	            // drop default?
-	            preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
-	            list (,$colname,$rest) = $matches;
-	            $sql[] = $alter . $colname . ' TYPE ' . $rest;
-	         }
-	
-#	         list($colname) = explode(' ',$v);
-	         if ($not_null) {
-	            // this does not error out if the column is already not null
-				$sql[] = $alter . $colname . ' SET NOT NULL';
-	         }
-	         if ($set_null) {
-	            // this does not error out if the column is already null
-	            $sql[] = $alter . $colname . ' DROP NOT NULL';
-	         }
-	      }
-	      return $sql;
-	   }
-	
-	   // does not have alter column
-	   if (!$tableflds) {
-	      if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
-	      return array();
-	   }
-	   return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+			}
+			return $sql;
+		}
+
+		// does not have alter column
+		if (!$tableflds) {
+			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
+			return array();
+		}
+		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
 	}
-	
+
 	/**
 	 * Drop one column
 	 *
@@ -281,7 +292,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 		}
 		return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
 	}
-	
+
 	/**
 	 * Save the content into a temp. table, drop and recreate the original table and copy the content back in
 	 *
@@ -301,14 +312,14 @@ class ADODB2_postgres extends ADODB_DataDict {
 		foreach($this->MetaColumns($tabname) as $fld) {
 			if (!$dropflds || !in_array($fld->name,$dropflds)) {
 				// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
-				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) && 
+				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) &&
 					in_array($fld->type,array('varchar','char','text','bytea'))) {
 					$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
 				} else {
 					$copyflds[] = $fld->name;
 				}
 				// identify the sequence name and the fld its on
-				if ($fld->primary_key && $fld->has_default && 
+				if ($fld->primary_key && $fld->has_default &&
 					preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
 					$seq_name = $matches[1];
 					$seq_fld = $fld->name;
@@ -316,7 +327,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 			}
 		}
 		$copyflds = implode(', ',$copyflds);
-		
+
 		$tempname = $tabname.'_tmp';
 		$aSql[] = 'BEGIN';		// we use a transaction, to make sure not to loose the content of the table
 		$aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
@@ -339,14 +350,14 @@ class ADODB2_postgres extends ADODB_DataDict {
 		$aSql[] = 'COMMIT';
 		return $aSql;
 	}
-	
+
 	function DropTableSQL($tabname)
 	{
 		$sql = ADODB_DataDict::DropTableSQL($tabname);
-		
+
 		$drop_seq = $this->_DropAutoIncrement($tabname);
 		if ($drop_seq) $sql[] = $drop_seq;
-		
+
 		return $sql;
 	}
 
@@ -363,7 +374,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	// search for a sequece for the given table (asumes the seqence-name contains the table-name!)
 	// if yes return sql to drop it
 	// this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!!
@@ -379,7 +390,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 		}
 		return "DROP SEQUENCE ".$seq;
 	}
-	
+
 	function RenameTableSQL($tabname,$newname)
 	{
 		if (!empty($this->schema)) {
@@ -393,7 +404,7 @@ class ADODB2_postgres extends ADODB_DataDict {
 
 		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
 	}
-	
+
 	/*
 	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
 	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
@@ -417,8 +428,8 @@ class ADODB2_postgres extends ADODB_DataDict {
 	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
 	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
 	*/
-	
-	
+
+
 	/*
 	CREATE [ UNIQUE ] INDEX index_name ON table
 [ USING acc_method ] ( column [ ops_name ] [, ...] )
@@ -430,35 +441,35 @@ CREATE [ UNIQUE ] INDEX index_name ON table
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			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['HASH']))
 			$s .= 'USING HASH ';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s .= '(' . $flds . ')';
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
-	
+
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
 		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty  != 'I' && strpos($ftype,'(') === false) {
@@ -469,4 +480,3 @@ CREATE [ UNIQUE ] INDEX index_name ON table
 		return $ftype;
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
index 4ef44c1..aaa4820 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
-  V4.50 6 July 2004  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
-  
+
   Modified from datadict-generic.inc.php for sapdb by RalfBecker-AT-outdoor-training.de
 */
 
@@ -15,41 +15,41 @@
 if (!defined('ADODB_DIR')) die();
 
 class ADODB2_sapdb extends ADODB_DataDict {
-	
+
 	var $databaseType = 'sapdb';
-	var $seqField = false;	
+	var $seqField = false;
 	var $renameColumn = 'RENAME COLUMN %s.%s TO %s';
- 	
+
  	function ActualType($meta)
 	{
 		switch($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'LONG';
-		
+
 		case 'C2': return 'VARCHAR UNICODE';
 		case 'X2': return 'LONG UNICODE';
-		
+
 		case 'B': return 'LONG';
-			
+
 		case 'D': return 'DATE';
 		case 'TS':
 		case 'T': return 'TIMESTAMP';
-		
+
 		case 'L': return 'BOOLEAN';
 		case 'I': return 'INTEGER';
 		case 'I1': return 'FIXED(3)';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INTEGER';
 		case 'I8': return 'FIXED(20)';
-		
+
 		case 'F': return 'FLOAT(38)';
 		case 'N': return 'FIXED';
 		default:
 			return $meta;
 		}
 	}
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -79,10 +79,10 @@ class ADODB2_sapdb extends ADODB_DataDict {
 
 		return $type;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if ($funsigned) $suffix .= ' UNSIGNED';
 		if ($fnotnull) $suffix .= ' NOT NULL';
@@ -99,7 +99,7 @@ class ADODB2_sapdb extends ADODB_DataDict {
 		list($lines,$pkey) = $this->_GenFields($flds);
 		return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', ',$lines) . ')' );
 	}
-	
+
 	function AlterColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -116,7 +116,5 @@ class ADODB2_sapdb extends ADODB_DataDict {
 			$flds[$k] = $this->NameQuote($v);
 		}
 		return array( 'ALTER TABLE ' . $tabname . ' DROP (' . implode(', ',$flds) . ')' );
-	}	
+	}
 }
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
index dd6b982..81fb016 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 	SQLite datadict Andrei Besleaga
- 
+
 */
 
 // security - hide paths
@@ -22,8 +22,8 @@ class ADODB2_sqlite extends ADODB_DataDict {
 	var $dropTable = 'DROP TABLE IF EXISTS %s';
 	var $dropIndex = 'DROP INDEX IF EXISTS %s';
 	var $renameTable = 'ALTER TABLE %s RENAME TO %s';
-	
-	
+
+
 
 	function ActualType($meta)
 	{
@@ -31,33 +31,33 @@ class ADODB2_sqlite extends ADODB_DataDict {
 		case 'C': return 'VARCHAR'; //  TEXT , TEXT affinity
 		case 'XL':return 'LONGTEXT'; //  TEXT , TEXT affinity
 		case 'X': return 'TEXT'; //  TEXT , TEXT affinity
-		
+
 		case 'C2': return 'VARCHAR'; //  TEXT , TEXT affinity
 		case 'X2': return 'LONGTEXT'; //  TEXT , TEXT affinity
-		
+
 		case 'B': return 'LONGBLOB'; //  TEXT , NONE affinity , BLOB
-			
+
 		case 'D': return 'DATE'; // NUMERIC , NUMERIC affinity
 		case 'T': return 'DATETIME'; // NUMERIC , NUMERIC affinity
 		case 'L': return 'TINYINT'; // NUMERIC , INTEGER affinity
-		
-		case 'R': 
+
+		case 'R':
 		case 'I4':
 		case 'I': return 'INTEGER'; // NUMERIC , INTEGER affinity
 		case 'I1': return 'TINYINT'; // NUMERIC , INTEGER affinity
 		case 'I2': return 'SMALLINT'; // NUMERIC , INTEGER affinity
 		case 'I8': return 'BIGINT'; // NUMERIC , INTEGER affinity
-		
+
 		case 'F': return 'DOUBLE'; // NUMERIC , REAL affinity
 		case 'N': return 'NUMERIC'; // NUMERIC , NUMERIC affinity
 		default:
 			return $meta;
 		}
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if ($funsigned) $suffix .= ' UNSIGNED';
 		if ($fnotnull) $suffix .= ' NOT NULL';
@@ -66,24 +66,23 @@ class ADODB2_sqlite extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	function AlterColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported natively by SQLite");
 		return array();
 	}
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported natively by SQLite");
 		return array();
 	}
-	
+
 	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
 	{
 		if ($this->debug) ADOConnection::outp("RenameColumnSQL not supported natively by SQLite");
-		return array();	
+		return array();
 	}
-	
+
 }
-?>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
index dca8949..3426e07 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
-  V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
- 
+
 */
 
 // security - hide paths
@@ -15,9 +15,9 @@ if (!defined('ADODB_DIR')) die();
 
 class ADODB2_sybase extends ADODB_DataDict {
 	var $databaseType = 'sybase';
-	
+
 	var $dropIndex = 'DROP INDEX %2$s.%1$s';
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -25,54 +25,54 @@ class ADODB2_sybase extends ADODB_DataDict {
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
 
-		case 'INT': 
+		case 'INT':
 		case 'INTEGER': return  'I';
 		case 'BIT':
 		case 'TINYINT': return  'I1';
 		case 'SMALLINT': return 'I2';
 		case 'BIGINT':  return  'I8';
-		
+
 		case 'REAL':
 		case 'FLOAT': return 'F';
 		default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
-	
+
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'TEXT';
-		
+
 		case 'C2': return 'NVARCHAR';
 		case 'X2': return 'NTEXT';
-		
+
 		case 'B': return 'IMAGE';
-			
+
 		case 'D': return 'DATETIME';
 		case 'TS':
 		case 'T': return 'DATETIME';
 		case 'L': return 'BIT';
-		
-		case 'I': return 'INT'; 
+
+		case 'I': return 'INT';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
 		case 'I4': return 'INT';
 		case 'I8': return 'BIGINT';
-		
+
 		case 'F': return 'REAL';
 		case 'N': return 'NUMERIC';
 		default:
 			return $meta;
 		}
 	}
-	
-	
+
+
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -86,7 +86,7 @@ class ADODB2_sybase extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	function AlterColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -98,7 +98,7 @@ class ADODB2_sybase extends ADODB_DataDict {
 
 		return $sql;
 	}
-	
+
 	function DropColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName($tabname);
@@ -112,10 +112,10 @@ class ADODB2_sybase extends ADODB_DataDict {
 		$sql[] = $s;
 		return $sql;
 	}
-	
+
 	// return string must begin with space
 	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
+	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
 		if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
@@ -124,106 +124,105 @@ class ADODB2_sybase extends ADODB_DataDict {
 		if ($fconstraint) $suffix .= ' '.$fconstraint;
 		return $suffix;
 	}
-	
+
 	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
+CREATE TABLE
+    [ database_name.[ owner ] . | owner. ] table_name
+    ( { < column_definition >
+        | column_name AS computed_column_expression
         | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
 
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ]
+    )
 
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+[ ON { filegroup | DEFAULT } ]
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ]
 
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
+< column_definition > ::= { column_name data_type }
+    [ COLLATE < collation_name > ]
+    [ [ DEFAULT constant_expression ]
         | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
+    ]
+    [ ROWGUIDCOL]
+    [ < column_constraint > ] [ ...n ]
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ NULL | NOT NULL ]
+        | [ { PRIMARY KEY | UNIQUE }
+            [ CLUSTERED | NONCLUSTERED ]
+            [ WITH FILLFACTOR = fillfactor ]
+            [ON {filegroup | DEFAULT} ] ]
+        ]
+        | [ [ FOREIGN KEY ]
+            REFERENCES ref_table [ ( ref_column ) ]
+            [ ON DELETE { CASCADE | NO ACTION } ]
+            [ ON UPDATE { CASCADE | NO ACTION } ]
+            [ NOT FOR REPLICATION ]
+        ]
+        | CHECK [ NOT FOR REPLICATION ]
+        ( logical_expression )
+    }
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ]
+    { [ { PRIMARY KEY | UNIQUE }
+        [ CLUSTERED | NONCLUSTERED ]
+        { ( column [ ASC | DESC ] [ ,...n ] ) }
+        [ WITH FILLFACTOR = fillfactor ]
+        [ ON { filegroup | DEFAULT } ]
+    ]
+    | FOREIGN KEY
+        [ ( column [ ,...n ] ) ]
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ]
+        [ ON DELETE { CASCADE | NO ACTION } ]
+        [ ON UPDATE { CASCADE | NO ACTION } ]
+        [ NOT FOR REPLICATION ]
+    | CHECK [ NOT FOR REPLICATION ]
+        ( search_conditions )
+    }
 
 
 	*/
-	
+
 	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] )
+		[ WITH < index_option > [ ,...n] ]
 		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
+		< index_option > :: =
+		    { PAD_INDEX |
+		        FILLFACTOR = fillfactor |
+		        IGNORE_DUP_KEY |
+		        DROP_EXISTING |
+		    STATISTICS_NORECOMPUTE |
+		    SORT_IN_TEMPDB
 		}
 */
 	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
 	{
 		$sql = array();
-		
+
 		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
 				return $sql;
 		}
-		
+
 		if ( empty ($flds) ) {
 			return $sql;
 		}
-		
+
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
+
 		if ( is_array($flds) )
 			$flds = implode(', ',$flds);
 		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
+
 		if ( isset($idxoptions[$this->upperName]) )
 			$s .= $idxoptions[$this->upperName];
 
 		$sql[] = $s;
-		
+
 		return $sql;
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/adodb-faq.html b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/adodb-faq.html
new file mode 100644
index 0000000..1bf2581
--- /dev/null
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/adodb-faq.html
@@ -0,0 +1,108 @@
+<table width=100%><tr><td>
+<h2>ADOdb Frequently Asked Questions</h2>
+</td><td align=right><img src=adodb.gif></a></td></tr></table>
+<p>
+<a href=index.html><b>Home</b></a>   <a href=index.html#download><b>Download</b></a>
+<p>
+<b>GENERAL</b>
+<ol>
+<li><b>What is ADOdb?</b><br>
+An object oriented library written in PHP that abstracts database operations for portability. It is modelled on Microsoft's ADO, but has many improvements that make it unique (eg. pivot tables, Active Record support, generating HTML for paging recordsets with next and previous links, cached recordsets, HTML menu generation, etc).
+  <p>
+<li><b>Can I use ADOdb for commercial applications for free? </b><br>
+Yes; ADOdb uses a BSD-style license so you can freely use the source code in any application, so long as you comply to the terms of license.txt.
+<p>
+<li><b>How can I learn ADOdb?</b><br>
+See the <a href=/index.html#docs>docs</a>. There is an extensive list of tutorials listed. 
+<p>
+<li><b>How can I contribute to ADOdb?</b><br>
+- You can translate documentation to another language.<br>
+- Link to this web-site. <br>
+- Port ADOdb to new databases. <br>
+- Make me very happy by buying a copy of <a href=http://phplens.com/>phpLens</a>.<br>
+<br>
+Code contributions are also welcome provided they enhance functionality, preferably work on multiple databases, and are backward compatible.
+<p>
+<li><b>Who is using ADOdb?</b><br>
+Many PHP applications and web-sites. There is partial list here: <a href="http://php.weblogs.com/adodb-cool-applications">http://php.weblogs.com/adodb-cool-applications</a>
+<p>
+<li><b>Is there a mailing list or forum to discuss ADOdb?</b><br>
+There is a forum at <a href="http://phplens.com/lens/lensforum/topics.php?id=4">http://phplens.com/lens/lensforum/topics.php?id=4</a>. There is no longer any mailing list due to spammers. 
+</ol>
+<p>
+<b>TECHNICAL</b>
+<ol>
+
+  <li><a name=t1 href=#t1>#</a> <b>Why do I get a ociplogon/ocilogon undefined error message?<br>
+Why do I get a mysql_pconnect/mysql_connect undefined error message?<br>
+Why do I get a ibase_timefmt undefined error message?<br>
+Why do I get a *_connect/*_pconnect undefined error message?</b><br>
+You do not have this extension compiled or included with PHP. On Windows, you can include it by modifying your php.ini (extension=<i>extension_name.dll</i>). On Unix, you will need to compile the extension - for help try <a href=http://www.faqts.com/knowledge_base/index.phtml/fid/51/>this knowledgebase</a>. Or perhaps you do not have the database client installed.
+    <p>
+<a name=t2></a>
+  <li><a name=2connection href=#2connection>#</a>
+<b>I am trying to create two connections to the same database, but the 2nd connection doesn't work, but reuses the first connection.</b><br>
+    <p>
+This is a "feature" of PHP. When you make a 2nd connection that only differs by the database name, you get back the first connection. This is normally the reason for the problem described.
+    <p>
+
+From <a href="http://php.net/manual/en/function.mysql-connect.php">http://php.net/manual/en/function.mysql-connect.php</a>
+(this applies to other db's too):
+    <p>
+
+<i>If a second call is made to mysql_connect() with the same arguments, no new link will be established, but instead, the link identifier of the already opened link will be returned.</i>
+    <p>
+
+Possible solutions include: 
+    <ul>
+      <li> Use different userid and password for each connection. 
+      <li> Use different IP or  host-address for each connection, even when connecting to same server! Eg. use 'localhost' and '127.0.0.l'.
+      <li> Use NConnect( ), which always forces a new connection, if the database driver supports it (Oci8, MySQL,MSSQL and PostgreSQL).
+    
+      <li>Use SelectDB( ), which switches databases, if the database driver supports it (MySQL, MSSQL, Sybase).
+    </ul>
+    <p>
+
+
+  <li> 
+<b>Can you tell me what is wrong with this code snipplet? - it does not do anything...[code deleted]...</b><br>
+Try turning on debugging. Eg.
+    <pre>
+  $DB = ADONewConnection($driver);
+  $DB->debug = 1;</pre>
+   This will show all error messages and generated SQL.
+    <p>
+  <li><b>SelectLimit with Oracle oci8 is not working.<br>
+    The adodb_pager class is not working with oci8.</b><br>
+You are probably using a version of Oracle earlier than 8.1.7, or have compatibility set to an earlier version in init.ora. You can try using the <i>oci805 </i>driver instead.
+    <p>
+  <li><b>Why does mssql only retrieve the first 255 or 4096 bytes of my data?</b><br>
+See <a href="http://phplens.com/lens/lensforum/msgs.php?id=3564">http://phplens.com/lens/lensforum/msgs.php?id=3564</a>
+    <p>
+  <li><a href=#access>#</a><a name=access></a> <b>I tried in Microsoft Access to insert a record but i cannot see it, or it is inserted twice. Why?</b> <br>
+The <a href=http://support.microsoft.com/default.aspx?scid=kb;en-us;299973>Access ODBC driver is not thread-safe</a>.
+<p>
+When you run Microsoft Jet in an IIS environment, it is recommended that you use the native Jet OLE DB Provider in place of the Microsoft Access ODBC driver. The Microsoft Access ODBC driver (Jet ODBC driver) can have stability issues due to the version of Visual Basic for Applications that is invoked because the version is not thread safe. 
+<p>
+An example of using the thread-safe OLE DB provider:
+<pre>
+$dsn = 'Provider=Microsoft.Jet.OLEDB.4.0;'.
+             'Data Source=C:\path\to\MyDatabase.mdb;';
+$db = NewADOConnection('ado_access');
+$db->PConnect($dsn);
+</pre>
+<p>
+There have been reports that using PConnect() is more reliable than Connect() with Access. 
+I have also heard of good experiences using <a href=http://odbtp.sourceforge.net/>ODBTP</a>; you can
+call it directly, or through the ADOdb odbtp driver.
+<p>
+  <li> <a name=perms href=#perms>#</a> <b>I cannot connect to Access/VFP/SQL Server from IIS. However I can connect from the desktop.</b><br>
+This is probably a Windows 2000 file permissions problem. IIS assumes a specific userid when serving web pages, and it is likely that userid does not have permission to access the  database. You need to change the IIS user to someone who has permission the database.
+<p>
+          
+  <li><b>Oracle problem with ADOdb?</b>
+    <p>
+If it is a very technical question, you can try this forum <a href="http://forums.oracle.com/forums/forum.jsp?forum=178">http://forums.oracle.com/forums/forum.jsp?forum=178</a>
+</ol>
+<hr>
+(c) 2000-2004 John Lim. All rights reserved.
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/adodb.gif b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/adodb.gif
new file mode 100644
index 0000000..c5e8dfc
Binary files /dev/null and b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/adodb.gif differ
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/adodb2.gif b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/adodb2.gif
new file mode 100644
index 0000000..f12ae20
Binary files /dev/null and b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/adodb2.gif differ
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-active-record.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-active-record.htm
index 88b6ee5..70435c1 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-active-record.htm
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-active-record.htm
@@ -14,8 +14,8 @@ font-family: Arial, Helvetica, sans-serif ;
 <title>ADOdb Active Record</title>
 <body>
 <h1>ADOdb Active Record</h1>
-<p> (c) 2000-2010 John Lim (jlim#natsoft.com)</p>
-<p><font size="1">This software is dual licensed using BSD-Style and LGPL. This 
+<p> (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
+<p><font size="1">This software is dual licensed using BSD-Style and LGPL. This
   means you can use it in compiled proprietary and commercial products.</font></p>
 <p><hr>
 <ol>
@@ -34,7 +34,7 @@ This implementation differs from Zend Framework's implementation in the followin
 <li>Caching of table metadata so it is only queried once per table, no matter how many Active Records are created.<p>
 <li>PHP5 version of ADOdb_Active_Record now supports <a href=#onetomany>one-to-many</a> relationships.<p>
 <li>New adodb-active-recordx.inc.php, which is an <a href=#recordx>Active Record eXtended</a> implementation that support JOINs for higher performance when loading children, and other nice features.<p>
-<li>Lots of  <a href=#additional>additional functionality</a>.<p> 
+<li>Lots of  <a href=#additional>additional functionality</a>.<p>
 </ul>
 <P>
 ADOdb_Active_Record is designed upon the principles of the "ActiveRecord" design pattern, which was first described by Martin Fowler. The ActiveRecord pattern has been implemented in many forms across the spectrum of programming languages. ADOdb_Active_Record attempts to represent the database as closely to native PHP objects as possible.
@@ -44,14 +44,14 @@ ADOdb_Active_Record maps a database table to a PHP class, and each instance of t
 
 <h3><li>Setting the Database Connection</h3>
 <p>
-The first step to using  ADOdb_Active_Record is to set the default connection that an ADOdb_Active_Record objects will use to connect to a database. 
+The first step to using  ADOdb_Active_Record is to set the default connection that an ADOdb_Active_Record objects will use to connect to a database.
 
 <pre>
 require_once('adodb/adodb-active-record.inc.php');
 
 $db = NewADOConnection('mysql://root:pwd@localhost/dbname');
 ADOdb_Active_Record::SetDatabaseAdapter($db);
-</pre>        
+</pre>
 
 <h3><li>Table Rows as Objects</h3>
 <p>
@@ -66,14 +66,14 @@ $db->Execute("CREATE TEMPORARY TABLE `persons` (
                 PRIMARY KEY  (`id`)
             ) ENGINE=MyISAM;
            ");
- </pre>   
+ </pre>
 <p>
 ADOdb_Active_Records are object representations of table rows. Each table in the database is represented by a class in PHP. To begin working with a table as a ADOdb_Active_Record, a class that extends ADOdb_Active_Record needs to be created for it.
 
 <pre>
 class person extends ADOdb_Active_Record{}
 $person = new person();
-</pre>   
+</pre>
 
 <p>
 In the above example, a new ADOdb_Active_Record object $person was created to access the "persons" table. Zend_Db_DataObject takes the name of the class, pluralizes it (according to American English rules), and assumes that this is the name of the table in the database. Also note that with MySQL, table names are case-sensitive, so your class name must match the table name's case. With other databases with case-insensitive tables, your class can be capitalized differently.
@@ -101,7 +101,7 @@ var_dump($person->getAttributeNames());
  *    string(13) "favorite_color"
  *  }
  */
-    </pre>   
+    </pre>
 <p>
 One big difference between ADOdb and Zend's implementation is we do not automatically convert to camelCaps style.
 <p>
@@ -115,12 +115,12 @@ $person = new person();
 $person->name_first = 'Andi';
 $person->name_last  = 'Gutmans';
 $person->save();
- </pre>   
+ </pre>
 <p>
 Oh, no! The above code snippet does not insert a new record into the database. Instead, outputs an error:
 <pre>
 1048: Column 'favorite_color' cannot be null
- </pre>   
+ </pre>
 <p>
 This error occurred because MySQL rejected the INSERT query that was generated by ADOdb_Active_Record. If exceptions are enabled in ADOdb and you are using PHP5, an error will be thrown. In the definition of our table, we specified all of the fields as NOT NULL; i.e., they must contain a value.
 <p>
@@ -147,7 +147,7 @@ var_dump($person->id);
  * Outputs the following:
  * string(1)
  */
- </pre>       
+ </pre>
 <p>
 From this point on, updating it is simply a matter of changing the object's properties and calling the save() method again:
 
@@ -162,8 +162,8 @@ The code snippet above will change the favorite color to red, and then UPDATE th
 <h2>ADOdb Specific Functionality</h2>
 <h3><li>Setting the Table Name</h3>
 <p>The default behaviour on creating an ADOdb_Active_Record is to "pluralize" the class name and
- use that as the table name. Often, this is not the case. For example, the person class could be reading 
- from the "People" table. 
+ use that as the table name. Often, this is not the case. For example, the person class could be reading
+ from the "People" table.
 <p>We provide two ways to define your own table:
 <p>1. Use a constructor parameter to override the default table naming behaviour.
 <pre>
@@ -180,7 +180,7 @@ The code snippet above will change the favorite color to red, and then UPDATE th
 </pre>
 
 <h3><li>$ADODB_ASSOC_CASE</h3>
-<p>This allows you to control the case of field names and properties. For example, all field names in Oracle are upper-case by default. So you 
+<p>This allows you to control the case of field names and properties. For example, all field names in Oracle are upper-case by default. So you
 can force field names to be lowercase using $ADODB_ASSOC_CASE. Legal values are as follows:
 <pre>
  0: lower-case
@@ -194,14 +194,14 @@ $person = new person('People');
 $person->name = 'Lily';
 $ADODB_ASSOC_CASE = 2;
 $person2 = new person('People');
-$person2->NAME = 'Lily'; 
+$person2->NAME = 'Lily';
 </pre>
 
 <p>Also see <a href=http://phplens.com/adodb/reference.constants.adodb_assoc_case.html>$ADODB_ASSOC_CASE</a>.
 
 <h3><li>ADOdb_Active_Record::Save()</h3>
 <p>
-Saves a record by executing an INSERT or UPDATE SQL statement as appropriate. 
+Saves a record by executing an INSERT or UPDATE SQL statement as appropriate.
 <p>Returns false on  unsuccessful INSERT, true if successsful INSERT.
 <p>Returns 0 on failed UPDATE, and 1 on UPDATE if data has changed, and -1 if no data was changed, so no UPDATE statement was executed.
 
@@ -247,7 +247,7 @@ ADODB_Active_Record::$_quoteNames = true;
 
 <h3><li>Error Handling and Debugging</h3>
 <p>
-In PHP5, if adodb-exceptions.inc.php is included, then errors are thrown. Otherwise errors are handled by returning a value. False by default means an error has occurred. You can get the last error message using the ErrorMsg() function. 
+In PHP5, if adodb-exceptions.inc.php is included, then errors are thrown. Otherwise errors are handled by returning a value. False by default means an error has occurred. You can get the last error message using the ErrorMsg() function.
 <p>
 To check for errors in ADOdb_Active_Record, do not poll ErrorMsg() as the last error message will always be returned, even if it occurred several operations ago. Do this instead:
 <pre>
@@ -288,14 +288,14 @@ try {
 <p>
 <h3><li>Primary Keys</h3>
 <p>
-ADOdb_Active_Record does not require the table to have a primary key. You can insert records for such a table, but you will not be able to update nor delete. 
+ADOdb_Active_Record does not require the table to have a primary key. You can insert records for such a table, but you will not be able to update nor delete.
 <p>Sometimes you are retrieving data from a view or table that has no primary key, but has a unique index. You can dynamically set the primary key of a table through the constructor:
 <pre>
 	$pkeys = array('category','prodcode');
-	
+
 	// set primary key using constructor
 	$rec = new ADOdb_Active_Record('Products', $pkeys);
-	
+
 	// or define a new class
 	class Product extends ADOdb_Active_Record {
 		function __construct()
@@ -303,7 +303,7 @@ ADOdb_Active_Record does not require the table to have a primary key. You can in
 			parent::__construct('Products', array('prodid'));
 		}
 	}
-	
+
 	$rec = new Product();
 </pre>
 
@@ -326,7 +326,7 @@ foreach($activeRecs as $rec) {
 	$rec2 = new ADOdb_Active_Record('table2',$db2);
 	$rec2->id = $rec->id;
 	$rec2->name = $rec->name;
-	
+
 	$rec2->Save();
 }
 </pre>
@@ -370,7 +370,7 @@ Of course an UPDATE statement is superior because it's simpler and much more eff
 
 <h3><li>Transactions</h3>
 <p>
-The default transaction mode in ADOdb is autocommit. So that is the default with active record too. 
+The default transaction mode in ADOdb is autocommit. So that is the default with active record too.
 The general rules for managing transactions still apply. Active Record to the database is a set of insert/update/delete statements, and the db has no knowledge of active records.
 <p>
 Smart transactions, that does an auto-rollback if an error occurs, is still the best method to multiple activities (inserts/updates/deletes) that need to be treated as a single transaction:
@@ -383,7 +383,7 @@ $conn->CompleteTrans();
 
 <a name=onetomany>
 <h2>One to Many Relations</h2>
-<p>Since ADOdb 5.06, we support parent child relationships. This is done using the ClassBelongsTo() and ClassHasMany() functions. 
+<p>Since ADOdb 5.06, we support parent child relationships. This is done using the ClassBelongsTo() and ClassHasMany() functions.
 <a name=tablehasmany>
 <h3><li>ClassHasMany</h3>
 <p>To globally define a one-to-many relationship we use the static function ADODB_Active_Record::ClassHasMany($class, $relation, $foreignKey = '', $foreignClass = 'ADODB_Active_Record'). For example, we have 2 tables, <strong>persons</strong> (parent table) and <strong>children</strong> (child table)
@@ -391,7 +391,7 @@ linked by <strong>persons.id = children.person_id</strong>. The variable $person
 <pre>
 	class person extends ADOdb_Active_Record{}
 	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
-	
+
 	$person = new person();
 	$person->Load("id=1");
 	foreach($person->children as $c) {
@@ -413,15 +413,15 @@ linked by <strong>persons.id = children.person_id</strong>. The variable $person
 	class person extends ADOdb_Active_Record{}
 	class children extends ADOdb_Active_Record{}
 	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
-	
+
 	$person = new person();
-	
-	for ($i=0; $i<10; $i++) 
+
+	for ($i=0; $i<10; $i++)
 		$person->children[0] = new children('children');
-	 
+
 	 // modify fields of $person, then...
 	$person->save();
-	
+
 	foreach($person->children as $c) {
 		// modify fields of $c then...
 		$c->save();
@@ -442,7 +442,7 @@ linked by <strong>persons.id = children.person_id</strong>. The variable $person
 	class child extends ADOdb_Active_Record { .... some modifications here ... }
 	ADODB_Active_Record::ClassHasMany('person', 'children','person_id', 'child');
 </pre>
-<p>Lastly some troubleshooting issues. We use the __get() method to set 
+<p>Lastly some troubleshooting issues. We use the __get() method to set
 $p->children below. So once $p->children is defined by accessing it, we don't change the child reference, as shown below:
 <pre>
 	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
@@ -450,14 +450,14 @@ $p->children below. So once $p->children is defined by accessing it, we don't ch
 	$p->Load('id=1');
 	# $p->children points to person_id = 1
 	var_dump($p->children);
-	
+
 	$p->Load('id=2');
 	# $p->children still points to person_id = 1
-	var_dump($p->children); 
+	var_dump($p->children);
 </pre>
 <p>The solution to the above is to unset($p->children) before $p->Load('id=2').
 <h3><li>TableHasMany</h3>
-For some classes, the mapping between class name and table name (which is the pluralised version) might not match. For example, 
+For some classes, the mapping between class name and table name (which is the pluralised version) might not match. For example,
 the class name might be <b>person</b>, but the table name might be <b>people</b>. So we have 2 tables, <strong>people</strong> (parent table) and <strong>children</strong> (child table)
 linked by <strong>people.id = children.person_id</strong>.
 <p>Then you use the following static function
@@ -466,7 +466,7 @@ linked by <strong>people.id = children.person_id</strong>.
 ADODB_Active_Record::TableHasMany('people', 'children', 'person_id')
 </pre>
 <h3><li>TableKeyHasMany</h3>
-For some classes, the mapping between class name and table name (which is the pluralised version) might not match or the primary key is not the default <b>id</b>. For example, 
+For some classes, the mapping between class name and table name (which is the pluralised version) might not match or the primary key is not the default <b>id</b>. For example,
 the class name might be <b>person</b>, but the table name might be <b>people</b>. So we have 2 tables, <strong>people</strong> (parent table) and <strong>children</strong> (child table)
 linked by <strong>people.pid = children.person_id</strong>.
 <p>Then you use the following static function
@@ -493,7 +493,7 @@ ADODB_Active_Record::TableKeyHasMany('people', 'pid', 'children', 'person_id')
 	                PRIMARY KEY  (`id`)
 	            ) ENGINE=MyISAM;
 	           ");
-			   
+
 	$db->Execute("CREATE TEMPORARY TABLE `children` (
 	                `id` int(10) unsigned NOT NULL auto_increment,
 					`person_id` int(10) unsigned NOT NULL,
@@ -504,24 +504,24 @@ ADODB_Active_Record::TableKeyHasMany('people', 'pid', 'children', 'person_id')
 	                PRIMARY KEY  (`id`)
 	            ) ENGINE=MyISAM;
 	           ");
-			   
+
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Jill','Lim')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Joan','Lim')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'JAMIE','Lim')");
-			   
+
 	class person extends ADOdb_Active_Record{}
-	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');	
-	
+	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
+
 	$person = new person();
-	
+
 	$person->name_first     = 'John';
 	$person->name_last      = 'Lim';
 	$person->favorite_color = 'lavender';
 	$person->save(); // this save will perform an INSERT successfully
-	
+
 	$person2 = new person(); # no need to define HasMany() again, adodb remembers definition
 	$person2->Load('id=1');
-	
+
 	$c = $person2->children;
 	if (is_array($c) && sizeof($c) == 3 && $c[0]->name_first=='Jill' && $c[1]->name_first=='Joan'
 		&& $c[2]->name_first == 'JAMIE') echo "OK Loaded HasMany<br>";
@@ -531,12 +531,12 @@ ADODB_Active_Record::TableKeyHasMany('people', 'pid', 'children', 'person_id')
 </pre>
 
 <h3><li>HasMany</h3>
-<p>This older method is deprecated and ClassHasMany/TableHasMany/TableKeyHasMany should be used. 
+<p>This older method is deprecated and ClassHasMany/TableHasMany/TableKeyHasMany should be used.
 <p>The older way to define a one-to-many relationship is to use $parentobj->HasMany($relation, $foreignKey = ''). For example, we have 2 tables, <strong>persons</strong> (parent table) and <strong>children</strong> (child table)
 linked by <strong>persons.id = children.person_id</strong>. The variable $person->children is an array that holds the children. To define this relationship:
 <pre>
 	class person extends ADOdb_Active_Record{}
-	
+
 	$person = new person();
 	$person->HasMany('children','person_id');
 	$person->Load("id=1");
@@ -550,7 +550,7 @@ linked by <strong>persons.id = children.person_id</strong>. The variable $person
 <pre>
 	$person = new person();
 	$person->HasMany('children','person_id');
-	
+
 	$person2 = new person();
 	$person->Load("id=1");
 	$p = $person2->children;
@@ -562,20 +562,20 @@ linked by <strong>persons.id = children.person_id</strong>. The variable $person
 we have a child table <strong>kids</strong>, and a parent table <strong>person</strong>. We have a link <strong>kids.person_id = persons.id</strong>. We create a child first, then link it to the parent:
 <pre>
 	class kid extends ADOdb_Active_Record{};
-	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id'); 
+	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id');
 
-	$ch = new kid(); // default tablename will be 'kids', with primary key 'id' 
+	$ch = new kid(); // default tablename will be 'kids', with primary key 'id'
 	$ch->Load('id=1');
 	$p = $ch->person;
 	if (!$p || $p->name_first != 'John') echo "Error loading belongsTo<br>";
 	else echo "OK loading BelongTo<br>";
 </pre>
 <p>
-<p>Note that relationships are case-sensitive, so ClassBelongsTo('kid','PARENT', 'parent_id') and ClassBelongsTo('kid', 'parent', 'parent_id') are not the same. 
+<p>Note that relationships are case-sensitive, so ClassBelongsTo('kid','PARENT', 'parent_id') and ClassBelongsTo('kid', 'parent', 'parent_id') are not the same.
 <p>Also if no data is loaded into the child instance, then $p will return null;
 <pre>
-	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id'); 
-	
+	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id');
+
 	$ch = new kid();
 	$p = $ch->person; # $p is null
 </pre>
@@ -584,7 +584,7 @@ we have a child table <strong>kids</strong>, and a parent table <strong>person</
 
 	class kid extends ADOdb_Active_Record{};
 	class person extends ADOdb_Active_Record{... your modifications ... };
-	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id', 'person'); 
+	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id', 'person');
 </pre>
 <h3><li>TableBelongsTo</h3>
 <p>If the child table differs from the convention that the child table name is the plural of the child class name, use this function:
@@ -608,23 +608,23 @@ we have a child table <strong>children</strong>, and a parent table <strong>pers
 	class Child extends ADOdb_Active_Record{};
 	$ch = new Child('children',array('id'));
 	$ch->BelongsTo('person','person_id','id');  ## this can be simplified to $ch->BelongsTo('person')
-	                                            ## as foreign key defaults to $table.'_id' and 
-	                                            ## parent pkey defaults to 'id' 
+	                                            ## as foreign key defaults to $table.'_id' and
+	                                            ## parent pkey defaults to 'id'
 	$ch->Load('id=1');
 	$p = $ch->person;
 	if (!$p || $p->name_first != 'John') echo "Error loading belongsTo<br>";
 	else echo "OK loading BelongTo<br>";
 </pre>
-<p>You only need to define BelongsTo() once in a script as it is global for all instances. 
+<p>You only need to define BelongsTo() once in a script as it is global for all instances.
 <a name=loadrelations>
 <h3><li>LoadRelations</h3>
 <p>Sometimes you want to load only a subset of data in a relationship. For example, you could load all female children sorted by children.name
 using LoadRelations($relation, $whereOrderBy = '', $offset = -1, $limit = -1):
 <pre>
-	# assume this has been called: 
+	# assume this has been called:
 	#   ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
-	$person = new person(); 
-	$person->Load('id=23');  
+	$person = new person();
+	$person->Load('id=23');
 	# Load doesn't load children until $person->children is accessed or LoadRelations is called:
 	$person->LoadRelations('children',"gender='F' order by name");
 </pre>
@@ -632,11 +632,11 @@ using LoadRelations($relation, $whereOrderBy = '', $offset = -1, $limit = -1):
 example, we load a window of 100 records at a time:
 <pre>
 
-	# assume this has been called: 
-	#  ADODB_Active_Record::ClassHasMany('Account', 'transactions','account_id'); 
+	# assume this has been called:
+	#  ADODB_Active_Record::ClassHasMany('Account', 'transactions','account_id');
 	$acc = new Account();
 	$acc->Load('id=23');
-	
+
 	$start = 0;
 	while(true) {
 		$acc->LoadRelations('transactions',"tx_done=0 order by trxdate", $start, $start+100);
@@ -742,7 +742,7 @@ $db->Execute("CREATE TEMPORARY TABLE `persons` (
                 PRIMARY KEY  (`id`)
             ) ENGINE=MyISAM;
            ");
-		   
+
 class person extends ADOdb_Active_Record{}
 $person = new person();
 
@@ -794,7 +794,7 @@ var_dump($person2);
 // retrieve an array of records
 $activeArr = $db->GetActiveRecordsClass($class = "person",$table = "persons","id=".$db->Param(0),array(2));
 $person2 = $activeArr[0];
-echo "<p>Name first (should be John): ",$person->name_first, "<br>Class = ",get_class($person2);	
+echo "<p>Name first (should be John): ",$person->name_first, "<br>Class = ",get_class($person2);
 </pre>
 
 
@@ -803,7 +803,7 @@ echo "<p>Name first (should be John): ",$person->name_first, "<br>Class =
 <h2>Active Record eXtended</h2>
 <p>This is the original one-to-many Active Record implementation submitted by
 Chris Ravenscroft  (chris#voilaweb.com). The reason why we are offering both versions is that the Extended version
-is more powerful but more complex. My personal preference is to keep it simpler, but your view may vary. 
+is more powerful but more complex. My personal preference is to keep it simpler, but your view may vary.
 <p>To use, just include adodb-active-recordx.inc.php instead of adodb-active-record.inc.php.
 <p>It provides a new function called Find() that is quite intuitive to use as shown in the example below. It also supports loading all relationships using a single query (using joins).
 <pre>
@@ -817,7 +817,7 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 
 	include_once('../adodb.inc.php');
 	include_once('../adodb-active-recordx.inc.php');
-	
+
 
 	$db = NewADOConnection('mysql://root@localhost/northwind');
 	$db->debug=0;
@@ -846,12 +846,12 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 	                PRIMARY KEY  (`id`)
 	            ) ENGINE=MyISAM;
 	           ");
-			   
-	
+
+
 	$db->Execute("insert into children (person_id,name_first,name_last,favorite_pet) values (1,'Jill','Lim','tortoise')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Joan','Lim')");
 	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'JAMIE','Lim')");
-			   
+
 	// This class _implicitely_ relies on the 'people' table (pluralized form of 'person')
 	class Person extends ADOdb_Active_Record
 	{
@@ -887,7 +887,7 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 			parent::__construct('children', false, false, array('new' => true));
 		}
 	}
-	
+
 	echo "Inserting person in 'people' table ('John Lim, he likes lavender')\n";
 	echo "---------------------------------------------------------------------------\n";
 	$person = new Person();
@@ -934,7 +934,7 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 	$people7 = $person7->Find('people.id=1', false, false, array('loading' => ADODB_JOIN_AR));
 	echo (ar_assert($people7, "'name_first' => 'John'")) ? "[OK] Found John\n" : "[!!] Find failed\n";
 	echo (ar_assert($people7, "'favorite_pet' => 'tortoise'")) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n";
-	
+
 	echo "\n\n---------------------------------------------------------------------------\n";
 	echo "person->Load('people.id=1') [Join Method]\n";
 	echo "Load() always uses the join method since it returns only one row\n";
@@ -986,7 +986,7 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 		if($akid->person);
 	}
 	echo (ar_assert($ach32, "'favorite_color' => 'lavender'")) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n";
-	
+
 	echo "\n\n---------------------------------------------------------------------------\n";
 	echo "rugrat->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n";
 	echo "In rugrat's constructor it is specified that\nit must forget any existing relation\n";
@@ -1004,7 +1004,7 @@ is more powerful but more complex. My personal preference is to keep it simpler,
 	$ach5 = $ch5->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR));
 	echo (ar_assert($ach5, "'name_first' => 'Jill'")) ? "[OK] Found Jill\n" : "[!!] Find failed\n";
 	echo (ar_assert($ach5, "'favorite_color' => 'lavender'")) ? "[OK] I did not forget relation: person\n" : "[!!] I should not have forgotten relation: person\n";
-	
+
 	echo "\n\n---------------------------------------------------------------------------\n";
 	echo "rugrat->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n";
 	echo "---------------------------------------------------------------------------\n";
@@ -1036,7 +1036,7 @@ ADODB_Active_Record::$_quoteNames = true;
 
 <p>0.92
 <p>Fixed some issues with incompatible fetch modes (ADODB_FETCH_ASSOC) causing problems in UpdateActiveTable.
-<p>Added support for functions that support predefining one-to-many relationships:<br> 
+<p>Added support for functions that support predefining one-to-many relationships:<br>
   <i>ClassHasMany ClassBelongsTo TableHasMany TableBelongsTo TableKeyHasMany TableKeyBelongsTo</i>. <br>
 <p>You can also define your child/parent class in these functions, instead of the default ADODB_Active_Record.
 
@@ -1057,7 +1057,7 @@ Added support for assoc arrays in Set().
 <p>0.06
 <p>Added ErrorNo().
 <p>Fixed php 5.2.0 compat issues.
- 
+
 <p>0.05
 <p>If inserting a record and the value of a primary key field is null, then we do not insert that field in as
 we assume it is an auto-increment field. Needed by mssql.
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-adodb.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-adodb.htm
index 54fbc5a..db0ef58 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-adodb.htm
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-adodb.htm
@@ -620,7 +620,7 @@ ul
 
 <h2>ADOdb Library for PHP</h2>
 
-<p>V5.18 3 Sep 2012 (c) 2000-2012 John Lim (jlim#natsoft.com)</p>
+<p>V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
 
 <p><span style='font-size:7.5pt'>This software is dual licensed using BSD-Style
 and LGPL. This means you can use it in compiled proprietary and commercial
@@ -997,7 +997,7 @@ style='mso-tab-count:1'>
 style='mso-tab-count:1'>         </span></pre><pre><span style='mso-tab-count:
 1'>         </span><span style='color:green'># persistent connection</span></pre>
 <pre><span
-style='mso-tab-count:1'>         </span>$dsn2 = 'mysql://root:pwd@localhost/mydb?persist'; 
+style='mso-tab-count:1'>         </span>$dsn2 = 'mysql://root:pwd@localhost/mydb?persist';
 <span
 style='mso-tab-count:1'></span></pre>
 <pre><span style='mso-tab-count:
@@ -1086,14 +1086,14 @@ CacheExecute() and CacheSelectLimit() are called and no cache-time parameter is
 <li class=MsoNormal><i>memcache</i> which defines the memcache host, port and whether to use compression. For example:
 <pre>
 	# we have a memcache server at 10.1.1.22 using default port 11211, no compression
-	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=10.1.1.22'; 
-	
+	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=10.1.1.22';
+
 	# we have a memcache server 10.1.1.22 port 8888, compression=on
 	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=10.1.1.22:8888:1';
-	 	
+
 	# we have a memcache servers mem1,mem2 on port 8888, compression=off
-	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=mem1,mem2:8888:0'; 
-	
+	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=mem1,mem2:8888:0';
+
 	# we have a memcache servers mem1,mem2 on port 8888, compression=off and cachesecs=120
 	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=mem1,mem2:8888:0&cachesecs=120';
 </pre>
@@ -1745,7 +1745,7 @@ NewADOConnection($name) to create a connection object for that database. </p>
   Universal Database client.</span></p>
   </td>
  </tr>
- 
+
  <tr style='mso-yfti-irow:5;height:40.5pt'>
   <td valign=top style='padding:.75pt .75pt .75pt .75pt;height:40.5pt'>
   <p class=MsoNormal><b><span style='font-size:10.0pt'>db2oci</span></b></p>
@@ -1767,7 +1767,7 @@ NewADOConnection($name) to create a connection object for that database. </p>
   Universal Database client.</span></p>
   </td>
  </tr>
- 
+
  <tr style='mso-yfti-irow:6;height:40.5pt'>
   <td valign=top style='padding:.75pt .75pt .75pt .75pt;height:40.5pt'>
   <p class=MsoNormal><b><span style='font-size:10.0pt'>odbc_db2</span></b></p>
@@ -4782,7 +4782,7 @@ beginning of each page request. This is only supported in postgresql, mssql,
 mysql with InnoDB and oci8 currently. For example: </p>
 
 <div style='mso-element:para-border-div;border:solid #DDDDDD 1.0pt;mso-border-alt:
-solid #DDDDDD .75pt;padding:9.0pt 18.0pt 9.0pt 18.0pt;background:#EEEEEE'><pre><o:p> </o:p></pre><pre>$db->SetTransactionMode("SERIALIZABLE");</pre><pre>$db->BeginTrans();</pre><pre>$db->Execute(...); $db->Execute(...);</pre><pre>$db->CommiTrans();</pre><pre><o:p> </o:p></pre><pre>$db->SetTransactionMode(""); // restore to default</pre><pre>$db->StartTrans();</pre><pre>$db->Execute(...); $db->Execute(...);</pre><pre>$db->CompleteTrans();</pre></div>
+solid #DDDDDD .75pt;padding:9.0pt 18.0pt 9.0pt 18.0pt;background:#EEEEEE'><pre><o:p> </o:p></pre><pre>$db->SetTransactionMode("SERIALIZABLE");</pre><pre>$db->BeginTrans();</pre><pre>$db->Execute(...); $db->Execute(...);</pre><pre>$db->CommitTrans();</pre><pre><o:p> </o:p></pre><pre>$db->SetTransactionMode(""); // restore to default</pre><pre>$db->StartTrans();</pre><pre>$db->Execute(...); $db->Execute(...);</pre><pre>$db->CompleteTrans();</pre></div>
 
 <p>Supported values to pass in: </p>
 
@@ -6169,6 +6169,51 @@ href="http://phplens.com/lens/php-book/optimizing-debugging-php.php">Optimizing
 PHP</a>. </p>
 
 <h2>Change Log<a name=changes></a><a name=changelog></a></h2>
+
+<p><a name=5.19><b>5.19 - 23-Apr-2014</b>
+<p>
+<p>adodb: GetRowAssoc will return null as required. See http://phplens.com/lens/lensforum/msgs.php?id=19289
+<p>adodb: Fix GetRowAssoc bug introduced in 5.17, causing function to return data from previous fetch for NULL fields. See http://phplens.com/lens/lensforum/msgs.php?id=17539
+<p>adodb: GetAssoc will return a zero-based array when 2nd column is null. See https://sourceforge.net/p/adodb/bugs/130/
+<p>adodb: Execute no longer ignores single parameters evaluating to false. See https://sourceforge.net/p/adodb/patches/32/
+<p>adodb: Fix LIMIT 1 clause in subquery gets stripped off. See http://phplens.com/lens/lensforum/msgs.php?id=17813
+<p>adodb-lib: Fix columns quoting bug. See https://sourceforge.net/p/adodb/bugs/127/
+<p>Added new ADODB_ASSOC_CASE_* constants. Thx to Damien Regad.
+<p>sessions: changed lob handling to detect all variations of oci8 driver.
+<p>ads: clear fields before fetching. See http://phplens.com/lens/lensforum/msgs.php?id=17539
+<p>mssqlnative: fixed many FetchField compat issues. See http://phplens.com/lens/lensforum/msgs.php?id=18464. Also date format changed to remove timezone.
+<p>mssqlnative: Numerous fixes and improvements by Mark Newnham <ul>
+	<li class="MsoNormal">Driver supports SQL Server 2005, 2008 and 2012</li>
+	<li class="MsoNormal">Bigint data types mapped to I8 instead of I</li>
+	<li class="MsoNormal">Reintroduced MetaColumns function</li>
+	<li class="MsoNormal">On SQL Server 2012, makes use of new CREATE SEQUENCE statement</li>
+	<li class="MsoNormal">FetchField caches metadata at initialization to improve performance</li>
+	<li class="MsoNormal">etc.</li>
+	</ul>
+<p>mssqlnative: Fix Insert ID on prepared statement, thanks to Mike Parks. See http://phplens.com/lens/lensforum/msgs.php?id=19079
+<p>mssql: timestamp format changed to 'Y-m-d\TH:i:s' (ISO 8601)
+	to make them independent from DATEFORMAT setting, as recommended on
+	<a href="http://technet.microsoft.com/en-us/library/ms180878%28v=sql.105%29.aspx#StringLiteralDateandTimeFormats">Microsoft TechNet</a>.
+<p>mysql/mysqli: Fix ability for MetaTables to filter by table name, broken since 5.15. See http://phplens.com/lens/lensforum/msgs.php?id=19359
+<p>odbc: Fixed MetaTables and MetaPrimaryKeys definitions in odbc driver to match adoconnection class.
+<p>odbc: clear fields before fetching. See http://phplens.com/lens/lensforum/msgs.php?id=17539
+<p>oci8: GetRowAssoc now works in ADODB_FETCH_ASSOC fetch mode
+<p>oci8: MetaType and MetaForeignKeys argument count are now strict-standards compliant
+<p>oci8: Added trailing ';' on trigger creation for sequence fields, prevents occurence of ORA-24344
+<p>oci8quercus: new oci8 driver with support for quercus jdbc data types.
+<p>pdo: Fixed concat recursion bug in 5.3. See http://phplens.com/lens/lensforum/msgs.php?id=19285
+<p>pgsql: Default driver (postgres/pgsql) is now postgres8
+<p>pgsql: Fix output of BLOB (bytea) columns with PostgreSQL >= 9.0
+<p>pgsql: Fix handling of DEFAULT NULL columns in AlterColumnSQL
+<p>pgsql: Fix mapping of error message to ADOdb error codes
+<p>pgsql: Reset parameter number in Param() method when $name == false
+<p>postgres8: New class/type with correct behavior for _insertid(). See Github #8
+<p>postgres9: Fixed assoc problem. See http://phplens.com/lens/lensforum/msgs.php?id=19296
+<p>sybase: Removed redundant sybase_connect() call in _connect(). See Github #3
+<p>sybase: Allow connection on custom port. See Github #9
+<p>sybase: Fix null values returned with ASSOC fetch mode. See Github #10
+<p>Added Composer support. See Github #7
+
 <p><a name=5.18><b>5.18 3 Sep 2012</b>
 <p>datadict-postgres: Fixes bug in ALTER COL. See http://phplens.com/lens/lensforum/msgs.php?id=19202. Also fixed bugs in MetaType() checking $fieldobj properties.
 <p>GetRowAssoc did not work with null values. Bug in 5.17.
@@ -6183,9 +6228,10 @@ $ADODB_CACHE_PERMS. Default value is 0771.
 make Prepare() and empty function, and we still execute the unprepared stmt.
 <p>mysql: FetchField(-1), turns it is is not possible to retrieve the max_length. Set to -1.
 <p>mysql-perf: Fixed "SHOW INNODB STATUS". Change to "SHOW ENGINE INNODB STATUS"
+
 <p><a name=5.17><b>5.17 18 May 2012</b>
 <p>Active Record: Removed trailing whitespace from adodb-active-record.inc.php.
-<p>odbc: Added support for $database parameter in odbc Connect() function. E.g. $DB->Connect($dsn_without_db, $user, $pwd, $database). 
+<p>odbc: Added support for $database parameter in odbc Connect() function. E.g. $DB->Connect($dsn_without_db, $user, $pwd, $database).
 Previously $database had to be left blank and the $dsn was used to pass in this parameter.
 <p>oci8: Added better empty($rs) error handling to metaindexes().
 <p>oci8: Changed to use newer oci API to support PHP 5.4.
@@ -6206,7 +6252,7 @@ Previously $database had to be left blank and the $dsn was used to pass in this
 <p>mysql and mysqli: MetaTables() now identifies views and tables correctly.
 <p>Added function adodb_time() to adodb-time.inc.php. Generates current time in unsigned integer format.
 <p><a name=5.14><b>5.14 8 Sep 2011</b>
-<p>mysqli: fix php compilation bug. 
+<p>mysqli: fix php compilation bug.
 <p>postgres: bind variables did not work properly. Fixed.
 <p>postgres: blob handling bug in _decode. Fixed.
 <p>ActiveRecord: if a null field was never updated, activerecord would still update the record. Fixed.
@@ -6289,11 +6335,11 @@ Also changed oci8 $conn->sysTimeStamp to use 'SYSTIMESTAMP' instead of 'SYSDATE'
 <p><a name=5.08a></a><b>5.08a 17 Apr 2009</b> </p>
 <p>Fixes wrong version number string.
 <p>Incorrect + in adodb-datadict.inc.php removed.
-<p>Fixes missing OffsetDate() function in pdo. Thx paul#mantisforge.org. 
+<p>Fixes missing OffsetDate() function in pdo. Thx paul#mantisforge.org.
 
 <p><a name=5.08></a><b>5.08 17 Apr 2009</b> </p>
 <p>adodb-sybase.inc.php driver. Added $conn->charSet support. Thx Luis Henrique Mulinari (luis.mulinari#gmail.com)
-<p>adodb-ado5.inc.php. Fixed some bind param issues. Thx Jirka Novak. 
+<p>adodb-ado5.inc.php. Fixed some bind param issues. Thx Jirka Novak.
 <p>adodb-ado5.inc.php. Now has improved error handling.
 <p>Fixed typo in adodb-xmlschema03.inc.php. See XMLS_EXISTING_DATA, line 1501. Thx james johnson.
 <p>Made $inputarr optional for _query() in all drivers.
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-datadict.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-datadict.htm
index b2e6422..bb6013f 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-datadict.htm
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-datadict.htm
@@ -11,7 +11,7 @@
       }
       pre {
         font-size: 9pt;
-         background-color: #EEEEEE; padding: .5em; margin: 0px; 
+         background-color: #EEEEEE; padding: .5em; margin: 0px;
       }
       .toplink {
         font-size: 8pt;
@@ -20,7 +20,7 @@
 </head>
 <body style="background-color: rgb(255, 255, 255);">
 <h2>ADOdb Data Dictionary Library for PHP</h2>
-<p>V5.18 3 Sep 2012  (c) 2000-2010 John Lim (<a
+<p>V5.19  23-Apr-2014  (c) 2000-2014 John Lim (<a
  href="mailto:jlim#natsoft.com">jlim#natsoft.com</a>).<br>
 AXMLS (c) 2004 ars Cognita, Inc</p>
 <p><font size="1">This software is dual licensed using BSD-Style and
@@ -289,8 +289,8 @@ documentation for a more detailed description of the adoSchema methods,
 including methods and schema elements that are not described in this
 tutorial.</p>
 <h3>XML Schema Version 3</h3>
-<p>In March 2006, we added adodb-xmlschema03.inc.php to the release, which supports version 3 of XML Schema. 
-The adodb-xmlschema.inc.php remains the same as previous releases, and supports version 2 of XML Schema. 
+<p>In March 2006, we added adodb-xmlschema03.inc.php to the release, which supports version 3 of XML Schema.
+The adodb-xmlschema.inc.php remains the same as previous releases, and supports version 2 of XML Schema.
 Version 3 provides some enhancements:
 
 <ul>
@@ -308,7 +308,7 @@ Version 3 provides some enhancements:
   <descr>ATS KnowledgeBase</descr>
   <opt platform="mysql">TYPE=INNODB</opt>
   <field name="recid" type="I"/>
-  <field name="organization_code" type="I4"/> 
+  <field name="organization_code" type="I4"/>
   <field name="sub_code" type="C" size="20"/>
   etc...
 </pre>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-oracle.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-oracle.htm
index 3ee27aa..5e8992e 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-oracle.htm
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-oracle.htm
@@ -1,542 +1,542 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<style>
-pre {
-  background-color: #eee;
-  padding: 0.75em 1.5em;
-  font-size: 12px;
-  border: 1px solid #ddd;
-}
-.greybg {
-  background-color: #eee;
-  padding: 0.75em 1.5em;
-  font-size: 12px;
-  border: 1px solid #ddd;
-}
-.style1 {color: #660000}
-</style>
-<title>ADOdb with PHP and Oracle</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</style>
-</head>
-
-<body>
-<table width=100%><tr><td>
-<h2>Using ADOdb with PHP and Oracle: an advanced tutorial</h2>
-</td><td><div align="right"><img src=cute_icons_for_site/adodb.gif width="88" height="31"></div></tr></table>
-<p><font size="1">(c)2004-2005 John Lim. All rights reserved.</font></p>
-<h3>1. Introduction</h3>
-<p>Oracle is the most popular commercial database used with PHP. There are many ways of accessing Oracle databases in PHP. These include:</p>
-<ul>
-  <li>The oracle extension</li>
-  <li>The oci8 extension</li>
-  <li>PEAR DB library</li>
-  <li>ADOdb library</li>
-</ul>
-<p>The wide range of choices is confusing to someone just starting with Oracle and PHP. I will briefly summarize the differences, and  show you the advantages of using <a href="http://adodb.sourceforge.net/">ADOdb</a>. </p>
-<p>First we have the C extensions which provide low-level access to Oracle functionality. These C extensions are precompiled into PHP, or linked in dynamically when the web server starts up. Just in case you need it, here's a <a href=http://www.oracle.com/technology/tech/opensource/php/apache/inst_php_apache_linux.html>guide to installing Oracle and PHP on Linux</a>.</p>
-<table width="75%" border="1" align="center">
-  <tr valign="top">
-    <td nowrap><b>Oracle extension</b></td>
-    <td>Designed for Oracle 7 or earlier. This is obsolete.</td>
-  </tr>
-  <tr valign="top">
-    <td nowrap><b>Oci8 extension</b></td>
-    <td> Despite it's name, which implies it is only for Oracle 8i, this is the standard method for accessing databases running Oracle 8i, 9i or 10g (and later).</td>
-  </tr>
-</table>
-<p>Here is an example of using the oci8 extension to query the <i>emp</i> table of the <i>scott</i> schema with bind parameters:
-<pre>
-$conn = OCILogon("scott","tiger", $tnsName); 
-
-$stmt = OCIParse($conn,"select * from emp where empno > :emp order by empno"); 
-$emp = 7900;
-OCIBindByName($stmt, ':emp', $emp);
-$ok = OCIExecute($stmt);
-while (OCIFetchInto($stmt,$arr)) {
-	print_r($arr);
-	echo "<hr>";	
-} 
-</pre>
-<p>This generates the following output:
-<div class=greybg>
-Array ( [0] => 7902 [1] => FORD [2] => ANALYST [3] => 7566 [4] => 03/DEC/81 [5] => 3000 [7] => 20 ) 
-<hr />
-  Array ( [0] => 7934 [1] => MILLER [2] => CLERK [3] => 7782 [4] => 23/JAN/82 [5] => 1300 [7] => 10 )
-</div>
-<p>We also have  many higher level PHP libraries that allow you to simplify the above code. The most popular are <a href="http://pear.php.net/">PEAR DB</a> and <a href="http://adodb.sourceforge.net/">ADOdb</a>.  Here are some of the differences between these libraries:</p>
-<table width="75%" border="1" align="center">
-  <tr>
-    <td><b>Feature</b></td>
-    <td><b>PEAR DB 1.6</b></td>
-    <td><b>ADOdb 4.52</b></td>
-  </tr>
-  <tr valign="top">
-    <td>General Style</td>
-    <td>Simple, easy to use. Lacks Oracle specific functionality.</td>
-    <td>Has multi-tier design. Simple high-level design for beginners, and also lower-level advanced Oracle functionality.</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for Prepare</td>
-    <td>Yes, but only on one statement, as the last prepare overwrites previous prepares.</td>
-    <td>Yes (multiple simultaneous prepare's allowed)</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for LOBs</td>
-    <td>No</td>
-    <td>Yes, using update semantics</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for REF Cursors</td>
-    <td>No</td>
-    <td>Yes</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for IN Parameters</td>
-    <td>Yes</td>
-    <td>Yes</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for OUT Parameters</td>
-    <td>No</td>
-    <td>Yes</td>
-  </tr>
-  <tr valign="top">
-    <td>Schema creation using XML</td>
-    <td>No</td>
-    <td>Yes, including ability to define tablespaces and constraints</td>
-  </tr>
-  <tr valign="top">
-    <td>Provides database portability features</td>
-    <td>No</td>
-    <td>Yes, has some ability to abstract features that differ between databases such as dates, bind parameters, and data types.</td>
-  </tr>
-  <tr valign="top">
-    <td>Performance monitoring and tracing</td>
-    <td>No</td>
-    <td>Yes. SQL can be traced and linked to web page it was executed on. Explain plan support included.</td>
-  </tr>
-  <tr valign="top">
-    <td>Recordset caching for frequently used queries</td>
-    <td>No</td>
-    <td>Yes. Provides great speedups for SQL involving complex <i>where, group-by </i>and <i>order-by</i> clauses.</td>
-  </tr>
-  <tr valign="top">
-    <td>Popularity</td>
-    <td>Yes, part of PEAR release</td>
-    <td>Yes, many open source projects are using this software, including PostNuke, Xaraya, Mambo, Tiki Wiki.</td>
-  </tr>
-  <tr valign="top">
-    <td>Speed</td>
-    <td>Medium speed.</td>
-    <td>Very high speed. Fastest database abstraction library available for PHP. <a href="http://phplens.com/lens/adodb/">Benchmarks are available</a>.</td>
-  </tr>
-  <tr valign="top">
-    <td>High Speed Extension available</td>
-    <td>No</td>
-    <td>Yes. You can install the optional ADOdb extension, which reimplements the most frequently used parts of ADOdb as fast C code. Note that the source code version of ADOdb runs just fine without this extension, and only makes use of the extension if detected.</td>
-  </tr>
-</table>
-<p> PEAR DB is good enough for simple web apps. But if you need more power, you can see ADOdb offers more sophisticated functionality. The rest of this article will concentrate on using ADOdb with Oracle. You can find out more about <a href="#connecting">connecting to Oracle</a> later in this guide.</p>
-<h4>ADOdb Example</h4>
-<p>In ADOdb, the above oci8 example querying the <i>emp</i> table could be written as:</p>
-<pre>
-include "/path/to/adodb.inc.php";
-$db = NewADOConnection("oci8");
-$db->Connect($tnsName, "scott", "tiger");
-
-$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
-                    array('emp' => 7900));
-while ($arr = $rs->FetchRow()) {
-    print_r($arr);
-	echo "<hr>";
-}
-</pre>
-<p>The Execute( ) function returns a recordset object, and you can retrieve the rows returned using $recordset->FetchRow( ). </p>
-<p>If we ignore the initial connection preamble, we can see the ADOdb version is much easier and simpler:</p>
-<table width="100%" border="1">
-  <tr valign="top" bgcolor="#FFFFFF">
-    <td width="50%" bgcolor="#e0e0e0"><b>Oci8</b></td>
-    <td bgcolor="#e0e0e0"><b>ADOdb</b></td>
-  </tr>
-  <tr valign="top" bgcolor="#CCCCCC">
-    <td><pre><font size="1">$stmt = <b>OCIParse</b>($conn,
-       "select * from emp where empno > :emp"); 
-$emp = 7900;
-<b>OCIBindByName</b>($stmt, ':emp', $emp);
-$ok = <b>OCIExecute</b>($stmt);
-
-while (<b>OCIFetchInto</b>($stmt,$arr)) {
-	print_r($arr);
-	echo "<hr>";	
-} </font></pre></td>
-    <td><pre><font size="1">$recordset = $db-><b>Execute</b>("select * from emp where empno>:emp", 
-                           array('emp' => 7900));
-
-while ($arr = $recordset-><b>FetchRow</b>()) {
-	print_r($arr);
-	echo "<hr>";
-}</font></pre></td>
-  </tr>
-</table>
-<p> </p>
-<h3>2. ADOdb Query Semantics</h3>
-<p>You can also query the database using the standard Microsoft ADO MoveNext( ) metaphor. The data array for the current row is stored in the <i>fields</i> property of the recordset object, $rs.
-MoveNext( ) offers the highest performance among all the techniques for iterating through a recordset:
-<pre>
-$rs = $db->Execute("select * from emp where empno>:emp", array('emp' => 7900));
-while (!$rs->EOF) {
-	print_r($rs->fields);
-	$rs->MoveNext();
-}
-</pre>
-<p>And if you are interested in having the data returned in a 2-dimensional array, you can use:
-<pre>
-$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
-</pre>
-<p>Now to obtain only the first row as an array:
-<pre>
-$arr = $db->GetRow("select * from emp where empno=:emp", array('emp' => 7900));
-</pre>
-<p>Or to retrieve only the first field of the first row:
-<pre>
-$arr = $db->GetOne("select ename from emp where empno=:emp", array('emp' => 7900));
-</pre>
-<p>For easy pagination support, we provide the SelectLimit function. The following will perform a select query, limiting it to 100 rows, starting from row 201 (row 1 being the 1st row):
-<pre>
-$offset = 200; $limitrows = 100;
-$rs = $db->SelectLimit('select * from table', $limitrows, $offset);
-</pre>
-<p>The $offset parameter is optional.
-<h4>Array Fetch Mode</h4>
-<p>When data is being returned in an array, you can choose the type of array the data is returned in. 
-<ol>
-  <li> Numeric indexes - use <font size="2" face="Courier New, Courier, mono">$connection->SetFetchMode(ADODB_FETCH_NUM).</font></li>
-  <li>Associative indexes - the keys of the array are the names of the fields (in upper-case). Use <font size="2" face="Courier New, Courier, mono">$connection->SetFetchMode(ADODB_FETCH_ASSOC)</font><font face="Courier New, Courier, mono">.</font></li>
-  <li>Both numeric and associative indexes - use <font size="2" face="Courier New, Courier, mono">$connection->SetFetchMode(ADODB_FETCH_BOTH).</font></li>
-</ol>
-<p>The default is ADODB_FETCH_BOTH for Oracle.</p>
-<h4><b>Caching</b></h4>
-<p>You can define a database cache directory using $ADODB_CACHE_DIR, and cache the results of frequently used queries that rarely change. This is particularly useful for SQL with complex where clauses and group-by's and order-by's. It is also good for relieving heavily-loaded database servers.</p>
-<p>This example will cache the following select statement for 3600 seconds (1 hour):</p>
-<pre>
-$ADODB_CACHE_DIR = '/var/adodb/tmp';
-$rs = $db->CacheExecute(3600, "select names from allcountries order by 1");
-</pre>
-There are analogous CacheGetArray(
-), CacheGetRow( ),  CacheGetOne( ) and CacheSelectLimit( )  functions. The first parameter is the number of seconds to cache. You can also pass a bind array as a 3rd parameter (not shown above).
-<p>There is an alternative syntax for the caching functions. The first parameter is omitted, and you set the cacheSecs
- property of the connection object:
-<pre>
-$ADODB_CACHE_DIR = '/var/adodb/tmp';
-$connection->cacheSecs = 3600;
-$rs = $connection->CacheExecute($sql, array('id' => 1));
-</pre>
-<h3> </h3>
-<h3>3. Using Prepare( ) For Frequently Used Statements</h3>
-<p>Prepare( ) is  for compiling frequently used  SQL statement for reuse. For example, suppose we have a large array which needs to be inserted into an Oracle database. The following will result in a massive speedup in query execution (at least 20-40%), as the SQL statement only needs to be compiled once:</p>
-<pre>
-$stmt = $db->Prepare('insert into table (field1, field2) values (:f1, :f2)');
-foreach ($arrayToInsert as $key => $value) {
-	$db->Execute($stmt, array('f1' => $key, 'f2' => $val);
-}
-</pre>
-<p> </p>
-<h3>4. Working With LOBs</h3>
-<p>Oracle treats data which is more than 4000 bytes in length specially. These are called Large Objects, or LOBs for short. Binary LOBs are BLOBs, and character LOBs are CLOBs. In most Oracle libraries, you need to do a lot of work to process LOBs, probably because Oracle designed it to work in systems with little memory. ADOdb tries to make things easy by assuming the LOB can fit into main memory. </p>
-<p>ADOdb will transparently handle LOBs  in <i>select</i> statements. The LOBs are automatically converted to PHP variables without any special coding.</p>
-<p>For updating records with LOBs, the functions UpdateBlob( ) and UpdateClob( ) are provided. Here's a BLOB example. The parameters should be self-explanatory:
-<pre>
-$ok = $db->Execute("insert into aTable (id, name, ablob) 
-                                values (aSequence.nextVal, 'Name', null)");
-if (!$ok) return LogError($db->ErrorMsg());
-<font color="#006600"># params: $tableName, $blobFieldName, $blobValue, $whereClause</font>
-$db->UpdateBlob('aTable', 'ablob', $blobValue, 'id=aSequence.currVal');
-</pre>
-<p>and the analogous CLOB example:
-<pre>
-$ok = $db->Execute("insert into aTable (id, name, aclob) 
-                                values (aSequence.nextVal, 'Name', null)");
-if (!$ok) return LogError($db->ErrorMsg());
-$db->UpdateClob('aTable', 'aclob', $clobValue, 'id=aSequence.currVal');
-</pre>
-<p>Note that LogError( ) is a user-defined function, and not part of ADOdb.
-<p>Inserting LOBs is more complicated. Since ADOdb 4.55, we allow you to do this
-  (assuming that the <em>photo</em> field is a BLOB, and we want to store $blob_data into
-  this field, and the primary key is the <em>id</em> field):
-<pre>
-	$sql = <span class="style1">"INSERT INTO photos ( ID, photo) ".
-			"VALUES ( :id, empty_blob() )".
-			" RETURNING photo INTO :xx"</span>;
-
- 		$stmt = $db->PrepareSP($sql);
-		$db->InParameter($stmt, $<strong>id</strong>, <span class="style1">'id'</span>);
-		$blob = $db->InParameter($stmt, $<strong>blob_data</strong>, <span class="style1">'xx'</span>,-1, OCI_B_BLOB);
-		$db->StartTrans();
-		$ok = $db->Execute($stmt);
-		$db->CompleteTrans();
-</pre> 
-<p>
-<h3>5. REF CURSORs</h3>
-<p>Oracle recordsets can be passed around as variables called REF Cursors. For example, in PL/SQL, we could define a function <i>open_tab</i> that returns a REF CURSOR in the first parameter:</p>
-<pre>
-TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
-
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
-	BEGIN
-		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
-	END open_tab;
-</pre>
-<p>In ADOdb, we could access this REF Cursor using the ExecuteCursor() function. The following will find
- all table names that begin with 'A' in the current schema:
-<pre>
-$rs = $db->ExecuteCursor("BEGIN open_tab(:refc,'A%'); END;",'refc');
-while ($arr = $rs->FetchRow()) print_r($arr);
-</pre>
-<p>The first parameter is the PL/SQL statement, and the second parameter is the name of the REF Cursor.
-</p>
-<p> </p>
-<h3>6. In and Out Parameters</h3>
-<p>The following PL/SQL
-stored procedure  requires an input  variable, and returns a result into an output variable:
-<pre>
-PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
-	BEGIN
-		output := 'I love '||input;
-	END;
-</pre>
-<p>The following ADOdb code allows you to call the stored procedure:</p>
-<pre>
-$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
-$input = 'Sophia Loren';
-$db->InParameter($stmt,$input,'a1');
-$db->OutParameter($stmt,$output,'a2');
-$ok = $db->Execute($stmt);
-if ($ok) echo ($output == 'I love Sophia Loren') ? 'OK' : 'Failed';
-</pre>
-<p>PrepareSP( ) is a special function that knows about bind parameters.
-The main limitation currently is that IN OUT parameters do not work.
-<h4>Bind Parameters and REF CURSORs</h4>
-<p>We could also rewrite the REF CURSOR example to use InParameter (requires ADOdb 4.53 or later):
-<pre>
-$stmt = $db->PrepareSP("BEGIN adodb.open_tab(:refc,:tabname); END;");
-$input = 'A%';
-$db->InParameter($stmt,$input,'tabname');
-$rs = $db->ExecuteCursor($stmt,'refc');
-while ($arr = $rs->FetchRow()) print_r($arr);
-</pre>
-<h4>Bind Parameters and LOBs</h4>
-<p>You can also operate on LOBs. In this example, we have IN and OUT parameters using CLOBs. 
-<pre>
-	$text = 'test test test';
-	$sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";
-	$stmt = $conn -> PrepareSP($sql);
-	$conn -> InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB); # -1 means variable length
-	$rs = '';
-	$conn -> OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);
-	$conn -> Execute($stmt);
-	echo "return = ".$rs."<br>";
-</pre>
-<p>Similarly, you can use the constant OCI_B_BLOB to indicate that you are using BLOBs.
-<h4>Reusing Bind Parameters with CURSOR_SHARING=FORCE</h4>
-<p>Many web programmers do not care to use bind parameters, and prefer to enter the SQL directly. So instead of:</p>
-<pre>
-$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
-</pre>
-<p>They prefer  entering the values inside the SQL:
-<pre>
-$arr = $db->GetArray("select * from emp where empno>7900");
-</pre>
-<p>This reduces Oracle performance because Oracle will reuse compiled SQL which is identical to previously compiled SQL. The above example with the values inside the SQL
-is unlikely to be reused. As an optimization, from Oracle 8.1 onwards, you can set the following session parameter after you login:
-<pre>
-ALTER SESSION SET CURSOR_SHARING=FORCE
-</pre>
-<p>This will force Oracle to convert all such variables (eg. the 7900 value) into constant bind parameters, improving SQL reuse.</p>
-<p>More <a href="http://phplens.com/adodb/code.initialization.html#speed">speedup tips</a>.</p>
-<p> </p>
-<h3>7. Dates and Datetime in ADOdb</h3>
-<p>There are two things you need to know about dates in ADOdb. </p>
-<p>First, to ensure cross-database compability, ADOdb assumes that dates are returned in ISO format (YYYY-MM-DD H24:MI:SS).</p>
-<p>Secondly, since Oracle treats dates and datetime as the same data type, we decided not to display the time in the default date format. So on login, ADOdb will set the NLS_DATE_FORMAT to 'YYYY-MM-DD'. If you prefer to show the date and time by default, do this:</p>
-<pre>
-$db = NewADOConnection('oci8');
-$db->NLS_DATE_FORMAT =  'RRRR-MM-DD HH24:MI:SS';
-$db->Connect($tns, $user, $pwd);
-</pre>
-<p>Or execute:</p>
-<pre>$sql = quot;ALTER SESSION SET NLS_DATE_FORMAT = 'RRRR-MM-DD HH24:MI:SS'";
-$db->Execute($sql);
-</pre>
-<p>If you are not concerned about date portability and do not use ADOdb's portability layer, you can use your preferred date format instead.
-<p>
-<h3>8. Database Portability Layer</h3>
-<p>ADOdb provides the following functions for portably generating SQL functions 
-  as strings to be merged into your SQL statements:</p>
-<table width="75%" border="1" align=center>
-  <tr> 
-    <td width=30%><b>Function</b></td>
-    <td><b>Description</b></td>
-  </tr>
-  <tr> 
-    <td>DBDate($date)</td>
-    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a date 
-      string formatted for INSERT/UPDATE</td>
-  </tr>
-  <tr> 
-    <td>DBTimeStamp($date)</td>
-    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp 
-      string formatted for INSERT/UPDATE</td>
-  </tr>
-  <tr> 
-    <td>SQLDate($date, $fmt)</td>
-    <td>Portably generate a date formatted using $fmt mask, for use in SELECT 
-      statements.</td>
-  </tr>
-  <tr> 
-    <td>OffsetDate($date, $ndays)</td>
-    <td>Portably generate a $date offset by $ndays.</td>
-  </tr>
-  <tr> 
-    <td>Concat($s1, $s2, ...)</td>
-    <td>Portably concatenate strings. Alternatively, for mssql use mssqlpo driver, 
-      which allows || operator.</td>
-  </tr>
-  <tr> 
-    <td>IfNull($fld, $replaceNull)</td>
-    <td>Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.</td>
-  </tr>
-  <tr>
-    <td>Param($name)</td>
-    <td>Generates bind placeholders, using ? or named conventions as appropriate.</td>
-  </tr>
-  <tr><td>$db->sysDate</td><td>Property that holds the SQL function that returns today's date</td>
-</tr>
-<tr><td>$db->sysTimeStamp</td><td>Property that holds the SQL function that returns the current
-timestamp (date+time).
-</td>
-</tr>
-<tr>
-<td>$db->concat_operator</td><td>Property that holds the concatenation operator
-</td>
-</tr>
-<tr><td>$db->length</td><td>Property that holds the name of the SQL strlen function.
-</td></tr>
-
-<tr><td>$db->upperCase</td><td>Property that holds the name of the SQL strtoupper function.
-</td></tr>
-<tr><td>$db->random</td><td>Property that holds the SQL to generate a random number between 0.00 and 1.00.
-</td>
-</tr>
-<tr><td>$db->substr</td><td>Property that holds the name of the SQL substring function.
-</td></tr>
-</table>
-<p>ADOdb also provides multiple oracle oci8 drivers for different scenarios:</p>
-<table width="75%" border="1" align="center">
-  <tr>
-    <td nowrap><b>Driver Name</b></td>
-    <td><b>Description</b></td>
-  </tr>
-  <tr>
-    <td>oci805 </td>
-    <td>Specifically for Oracle 8.0.5. This driver has a slower SelectLimit( ).</td>
-  </tr>
-  <tr>
-    <td>oci8</td>
-    <td>The default high performance driver. The keys of associative arrays returned in a recordset are upper-case.</td>
-  </tr>
-  <tr>
-    <td>oci8po</td>
-    <td> The portable Oracle driver. Slightly slower than oci8. This driver uses ? instead of :<i>bindvar</i> for binding variables, which is the standard for  other databases. Also the keys of associative arrays are in lower-case like other databases.</td>
-  </tr>
-</table>
-<p>Here's an example of calling the <i>oci8po</i> driver. Note that the bind variables use question-mark:</p>
-<pre>$db = NewADOConnection('oci8po');
-$db->Connect($tns, $user, $pwd);
-$db->Execute("insert into atable (f1, f2) values (?,?)", array(12, 'abc'));</pre>
-<p> <a name=connecting></a>
-<h3>9. Connecting to Oracle</h3>
-<p>Before you can use ADOdb, you need to have the Oracle client installed and setup the oci8 extension. This extension comes pre-compiled for Windows (but you still need to enable it in the php.ini file). For information on compiling the oci8 extension for PHP and Apache on Unix, there is an excellent guide at <a href="http://www.oracle.com/technology/tech/opensource/php/apache/inst_php_apache_linux.html">oracle.com</a>. </p>
-<h4>Should You Use Persistent Connections</h4>
-<p>One question that is frequently asked is should you use persistent connections to Oracle. Persistent connections allow PHP to recycle existing connections, reusing them after the previous web pages have completed. Non-persistent connections close automatically after the web page has completed. Persistent connections are faster because the cost of reconnecting is expensive, but there is additional resource overhead. As an alternative, Oracle allows you to pool and reuse server processes; this is called  <a href="http://www.cise.ufl.edu/help/database/oracle-docs/server.920/a96521/manproc.htm#13132">Shared Server</a> (also known as MTS).</p>
-<p>The author's benchmarks suggest that using non-persistent connections and the  Shared Server configuration offer the best performance. If Shared Server is not an option, only then consider using persistent connections.</p>
-<h4>Connection Examples</h4>
-<p>Just in case you are having problems connecting to Oracle, here are some examples:</p>
-<p>a. PHP and Oracle reside on the same machine, use default SID, with non-persistent connections:</p>
-<pre>	$conn = NewADOConnection('oci8');
-	$conn->Connect(false, 'scott', 'tiger');</pre>
-<p>b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 'myTNS', using persistent connections:</p>
-<pre>	$conn = NewADOConnection('oci8');
-	$conn->PConnect(false, 'scott', 'tiger', 'myTNS');</pre>
-<p>or</p>
-<pre> 	$conn->PConnect('myTNS', 'scott', 'tiger');</pre>
-<p>c. Host Address and SID</p>
-<pre>
-	$conn->connectSID = true;	
-	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'SID');</pre>
-<p>d. Host Address and Service Name</p>
-<pre>	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'servicename');</pre>
-<p>e. Oracle connection string:
-<pre>	$cstr = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))
-			(CONNECT_DATA=(SID=$sid)))";
-	$conn->Connect($cstr, 'scott', 'tiger');
-</pre>
-<p>f. ADOdb data source names (dsn):
-<pre>
-	$dsn = 'oci8://user:pwd at tnsname/?persist';  # persist is optional
-	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect
-	
-	$dsn = 'oci8://user:pwd at host/sid';
-	$conn = ADONewConnection($dsn);
-	
-	$dsn = 'oci8://user:pwd@/';   # oracle on local machine
-	$conn = ADONewConnection($dsn);</pre>
-<p>With ADOdb data source names,
-you don't have to call Connect( ) or PConnect( ).
-</p>
-<p> </p>
-<h3>10. Error Checking</h3>
-<p>The examples in this article are easy to read but a bit simplistic because we ignore error-handling. Execute( ) and Connect( ) will return false on error. So a more realistic way to call Connect( ) and Execute( ) is:
-<pre>function InvokeErrorHandler()
-{<br>global $db; ## assume global
-    MyLogFunction($db->ErrorNo(), $db->ErrorMsg());
-}
-if (!$db->Connect($tns, $usr, $pwd)) InvokeErrorHandler();
-
-$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
-                    array('emp' => 7900));
-if (!$rs) return InvokeErrorHandler();
-while ($arr = $rs->FetchRow()) {
-    print_r($arr);
-	echo "<hr>";
-}
-</pre>
-<p>You can retrieve the  error message and error number of the last SQL statement executed from ErrorMsg( ) and ErrorNo( ). You can also <a href=http://phplens.com/adodb/using.custom.error.handlers.and.pear_error.html>define a custom error handler function</a>.
-ADOdb also supports throwing exceptions in PHP5.
-<p> </p>
-<h3>Handling Large Recordsets (added 27 May 2005)</h3>
-The oci8 driver does not support counting the number of records returned in a SELECT statement, so the function RecordCount() 
-is emulated when the global variable $ADODB_COUNTRECS is set to true, which is the default. 
-We emulate this by buffering all the records. This can take up large amounts of memory for big recordsets.
- Set $ADODB_COUNTRECS to false for the best performance. 
- <p>
-This variable is checked every time a query is executed, so you can selectively choose which recordsets to count.
-<p> </p>
-<h3>11. Other ADOdb Features</h3>
-<p><a href="http://phplens.com/lens/adodb/docs-datadict.htm">Schema generation</a>. This allows you to define a schema using XML and import it into different RDBMS systems portably.</p>
-<p><a href="http://phplens.com/lens/adodb/docs-perf.htm">Performance monitoring and tracing</a>. Highlights of performance monitoring include identification of poor and suspicious SQL, with explain plan support, and identifying which web pages the SQL ran on.</p>
-<p> </p>
-<h3>12. Download</h3>
-<p>You can <a href="http://adodb.sourceforge.net/#download">download ADOdb from sourceforge</a>. ADOdb uses a BSD style license. That means that it is free for commercial use, and redistribution without source code is allowed.</p>
-<p> </p>
-<h3>13. Resources</h3>
-<ul>
-  <li>Oracle's <a href="http://www.oracle.com/technology/pub/articles/php_experts/index.html">Hitchhiker Guide to PHP</a></li>
-  <li>OTN article on <a href=http://www.oracle.com/technology/pub/articles/deployphp/lim_deployphp.html>Optimizing PHP and Oracle</a> by this author.
-  <li>Oracle has an excellent <a href="http://www.oracle.com/technology/tech/opensource/php/php_troubleshooting_faq.html">FAQ on PHP</a></li>
-  <li>PHP <a href="http://php.net/oci8">oci8</a> manual pages</li>
-  <li><a href=http://phplens.com/lens/lensforum/topics.php?id=4>ADOdb forums</a>.
-</ul>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<style>
+pre {
+  background-color: #eee;
+  padding: 0.75em 1.5em;
+  font-size: 12px;
+  border: 1px solid #ddd;
+}
+.greybg {
+  background-color: #eee;
+  padding: 0.75em 1.5em;
+  font-size: 12px;
+  border: 1px solid #ddd;
+}
+.style1 {color: #660000}
+</style>
+<title>ADOdb with PHP and Oracle</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</style>
+</head>
+
+<body>
+<table width=100%><tr><td>
+<h2>Using ADOdb with PHP and Oracle: an advanced tutorial</h2>
+</td><td><div align="right"><img src=cute_icons_for_site/adodb.gif width="88" height="31"></div></tr></table>
+<p><font size="1">(c) 2004-2014 John Lim. All rights reserved.</font></p>
+<h3>1. Introduction</h3>
+<p>Oracle is the most popular commercial database used with PHP. There are many ways of accessing Oracle databases in PHP. These include:</p>
+<ul>
+  <li>The oracle extension</li>
+  <li>The oci8 extension</li>
+  <li>PEAR DB library</li>
+  <li>ADOdb library</li>
+</ul>
+<p>The wide range of choices is confusing to someone just starting with Oracle and PHP. I will briefly summarize the differences, and  show you the advantages of using <a href="http://adodb.sourceforge.net/">ADOdb</a>. </p>
+<p>First we have the C extensions which provide low-level access to Oracle functionality. These C extensions are precompiled into PHP, or linked in dynamically when the web server starts up. Just in case you need it, here's a <a href=http://www.oracle.com/technology/tech/opensource/php/apache/inst_php_apache_linux.html>guide to installing Oracle and PHP on Linux</a>.</p>
+<table width="75%" border="1" align="center">
+  <tr valign="top">
+    <td nowrap><b>Oracle extension</b></td>
+    <td>Designed for Oracle 7 or earlier. This is obsolete.</td>
+  </tr>
+  <tr valign="top">
+    <td nowrap><b>Oci8 extension</b></td>
+    <td> Despite it's name, which implies it is only for Oracle 8i, this is the standard method for accessing databases running Oracle 8i, 9i or 10g (and later).</td>
+  </tr>
+</table>
+<p>Here is an example of using the oci8 extension to query the <i>emp</i> table of the <i>scott</i> schema with bind parameters:
+<pre>
+$conn = OCILogon("scott","tiger", $tnsName);
+
+$stmt = OCIParse($conn,"select * from emp where empno > :emp order by empno");
+$emp = 7900;
+OCIBindByName($stmt, ':emp', $emp);
+$ok = OCIExecute($stmt);
+while (OCIFetchInto($stmt,$arr)) {
+	print_r($arr);
+	echo "<hr>";
+}
+</pre>
+<p>This generates the following output:
+<div class=greybg>
+Array ( [0] => 7902 [1] => FORD [2] => ANALYST [3] => 7566 [4] => 03/DEC/81 [5] => 3000 [7] => 20 )
+<hr />
+  Array ( [0] => 7934 [1] => MILLER [2] => CLERK [3] => 7782 [4] => 23/JAN/82 [5] => 1300 [7] => 10 )
+</div>
+<p>We also have  many higher level PHP libraries that allow you to simplify the above code. The most popular are <a href="http://pear.php.net/">PEAR DB</a> and <a href="http://adodb.sourceforge.net/">ADOdb</a>.  Here are some of the differences between these libraries:</p>
+<table width="75%" border="1" align="center">
+  <tr>
+    <td><b>Feature</b></td>
+    <td><b>PEAR DB 1.6</b></td>
+    <td><b>ADOdb 4.52</b></td>
+  </tr>
+  <tr valign="top">
+    <td>General Style</td>
+    <td>Simple, easy to use. Lacks Oracle specific functionality.</td>
+    <td>Has multi-tier design. Simple high-level design for beginners, and also lower-level advanced Oracle functionality.</td>
+  </tr>
+  <tr valign="top">
+    <td>Support for Prepare</td>
+    <td>Yes, but only on one statement, as the last prepare overwrites previous prepares.</td>
+    <td>Yes (multiple simultaneous prepare's allowed)</td>
+  </tr>
+  <tr valign="top">
+    <td>Support for LOBs</td>
+    <td>No</td>
+    <td>Yes, using update semantics</td>
+  </tr>
+  <tr valign="top">
+    <td>Support for REF Cursors</td>
+    <td>No</td>
+    <td>Yes</td>
+  </tr>
+  <tr valign="top">
+    <td>Support for IN Parameters</td>
+    <td>Yes</td>
+    <td>Yes</td>
+  </tr>
+  <tr valign="top">
+    <td>Support for OUT Parameters</td>
+    <td>No</td>
+    <td>Yes</td>
+  </tr>
+  <tr valign="top">
+    <td>Schema creation using XML</td>
+    <td>No</td>
+    <td>Yes, including ability to define tablespaces and constraints</td>
+  </tr>
+  <tr valign="top">
+    <td>Provides database portability features</td>
+    <td>No</td>
+    <td>Yes, has some ability to abstract features that differ between databases such as dates, bind parameters, and data types.</td>
+  </tr>
+  <tr valign="top">
+    <td>Performance monitoring and tracing</td>
+    <td>No</td>
+    <td>Yes. SQL can be traced and linked to web page it was executed on. Explain plan support included.</td>
+  </tr>
+  <tr valign="top">
+    <td>Recordset caching for frequently used queries</td>
+    <td>No</td>
+    <td>Yes. Provides great speedups for SQL involving complex <i>where, group-by </i>and <i>order-by</i> clauses.</td>
+  </tr>
+  <tr valign="top">
+    <td>Popularity</td>
+    <td>Yes, part of PEAR release</td>
+    <td>Yes, many open source projects are using this software, including PostNuke, Xaraya, Mambo, Tiki Wiki.</td>
+  </tr>
+  <tr valign="top">
+    <td>Speed</td>
+    <td>Medium speed.</td>
+    <td>Very high speed. Fastest database abstraction library available for PHP. <a href="http://phplens.com/lens/adodb/">Benchmarks are available</a>.</td>
+  </tr>
+  <tr valign="top">
+    <td>High Speed Extension available</td>
+    <td>No</td>
+    <td>Yes. You can install the optional ADOdb extension, which reimplements the most frequently used parts of ADOdb as fast C code. Note that the source code version of ADOdb runs just fine without this extension, and only makes use of the extension if detected.</td>
+  </tr>
+</table>
+<p> PEAR DB is good enough for simple web apps. But if you need more power, you can see ADOdb offers more sophisticated functionality. The rest of this article will concentrate on using ADOdb with Oracle. You can find out more about <a href="#connecting">connecting to Oracle</a> later in this guide.</p>
+<h4>ADOdb Example</h4>
+<p>In ADOdb, the above oci8 example querying the <i>emp</i> table could be written as:</p>
+<pre>
+include "/path/to/adodb.inc.php";
+$db = NewADOConnection("oci8");
+$db->Connect($tnsName, "scott", "tiger");
+
+$rs = $db->Execute("select * from emp where empno>:emp order by empno",
+                    array('emp' => 7900));
+while ($arr = $rs->FetchRow()) {
+    print_r($arr);
+	echo "<hr>";
+}
+</pre>
+<p>The Execute( ) function returns a recordset object, and you can retrieve the rows returned using $recordset->FetchRow( ). </p>
+<p>If we ignore the initial connection preamble, we can see the ADOdb version is much easier and simpler:</p>
+<table width="100%" border="1">
+  <tr valign="top" bgcolor="#FFFFFF">
+    <td width="50%" bgcolor="#e0e0e0"><b>Oci8</b></td>
+    <td bgcolor="#e0e0e0"><b>ADOdb</b></td>
+  </tr>
+  <tr valign="top" bgcolor="#CCCCCC">
+    <td><pre><font size="1">$stmt = <b>OCIParse</b>($conn,
+       "select * from emp where empno > :emp");
+$emp = 7900;
+<b>OCIBindByName</b>($stmt, ':emp', $emp);
+$ok = <b>OCIExecute</b>($stmt);
+
+while (<b>OCIFetchInto</b>($stmt,$arr)) {
+	print_r($arr);
+	echo "<hr>";
+} </font></pre></td>
+    <td><pre><font size="1">$recordset = $db-><b>Execute</b>("select * from emp where empno>:emp",
+                           array('emp' => 7900));
+
+while ($arr = $recordset-><b>FetchRow</b>()) {
+	print_r($arr);
+	echo "<hr>";
+}</font></pre></td>
+  </tr>
+</table>
+<p> </p>
+<h3>2. ADOdb Query Semantics</h3>
+<p>You can also query the database using the standard Microsoft ADO MoveNext( ) metaphor. The data array for the current row is stored in the <i>fields</i> property of the recordset object, $rs.
+MoveNext( ) offers the highest performance among all the techniques for iterating through a recordset:
+<pre>
+$rs = $db->Execute("select * from emp where empno>:emp", array('emp' => 7900));
+while (!$rs->EOF) {
+	print_r($rs->fields);
+	$rs->MoveNext();
+}
+</pre>
+<p>And if you are interested in having the data returned in a 2-dimensional array, you can use:
+<pre>
+$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
+</pre>
+<p>Now to obtain only the first row as an array:
+<pre>
+$arr = $db->GetRow("select * from emp where empno=:emp", array('emp' => 7900));
+</pre>
+<p>Or to retrieve only the first field of the first row:
+<pre>
+$arr = $db->GetOne("select ename from emp where empno=:emp", array('emp' => 7900));
+</pre>
+<p>For easy pagination support, we provide the SelectLimit function. The following will perform a select query, limiting it to 100 rows, starting from row 201 (row 1 being the 1st row):
+<pre>
+$offset = 200; $limitrows = 100;
+$rs = $db->SelectLimit('select * from table', $limitrows, $offset);
+</pre>
+<p>The $offset parameter is optional.
+<h4>Array Fetch Mode</h4>
+<p>When data is being returned in an array, you can choose the type of array the data is returned in.
+<ol>
+  <li> Numeric indexes - use <font size="2" face="Courier New, Courier, mono">$connection->SetFetchMode(ADODB_FETCH_NUM).</font></li>
+  <li>Associative indexes - the keys of the array are the names of the fields (in upper-case). Use <font size="2" face="Courier New, Courier, mono">$connection->SetFetchMode(ADODB_FETCH_ASSOC)</font><font face="Courier New, Courier, mono">.</font></li>
+  <li>Both numeric and associative indexes - use <font size="2" face="Courier New, Courier, mono">$connection->SetFetchMode(ADODB_FETCH_BOTH).</font></li>
+</ol>
+<p>The default is ADODB_FETCH_BOTH for Oracle.</p>
+<h4><b>Caching</b></h4>
+<p>You can define a database cache directory using $ADODB_CACHE_DIR, and cache the results of frequently used queries that rarely change. This is particularly useful for SQL with complex where clauses and group-by's and order-by's. It is also good for relieving heavily-loaded database servers.</p>
+<p>This example will cache the following select statement for 3600 seconds (1 hour):</p>
+<pre>
+$ADODB_CACHE_DIR = '/var/adodb/tmp';
+$rs = $db->CacheExecute(3600, "select names from allcountries order by 1");
+</pre>
+There are analogous CacheGetArray(
+), CacheGetRow( ),  CacheGetOne( ) and CacheSelectLimit( )  functions. The first parameter is the number of seconds to cache. You can also pass a bind array as a 3rd parameter (not shown above).
+<p>There is an alternative syntax for the caching functions. The first parameter is omitted, and you set the cacheSecs
+ property of the connection object:
+<pre>
+$ADODB_CACHE_DIR = '/var/adodb/tmp';
+$connection->cacheSecs = 3600;
+$rs = $connection->CacheExecute($sql, array('id' => 1));
+</pre>
+<h3> </h3>
+<h3>3. Using Prepare( ) For Frequently Used Statements</h3>
+<p>Prepare( ) is  for compiling frequently used  SQL statement for reuse. For example, suppose we have a large array which needs to be inserted into an Oracle database. The following will result in a massive speedup in query execution (at least 20-40%), as the SQL statement only needs to be compiled once:</p>
+<pre>
+$stmt = $db->Prepare('insert into table (field1, field2) values (:f1, :f2)');
+foreach ($arrayToInsert as $key => $value) {
+	$db->Execute($stmt, array('f1' => $key, 'f2' => $val);
+}
+</pre>
+<p> </p>
+<h3>4. Working With LOBs</h3>
+<p>Oracle treats data which is more than 4000 bytes in length specially. These are called Large Objects, or LOBs for short. Binary LOBs are BLOBs, and character LOBs are CLOBs. In most Oracle libraries, you need to do a lot of work to process LOBs, probably because Oracle designed it to work in systems with little memory. ADOdb tries to make things easy by assuming the LOB can fit into main memory. </p>
+<p>ADOdb will transparently handle LOBs  in <i>select</i> statements. The LOBs are automatically converted to PHP variables without any special coding.</p>
+<p>For updating records with LOBs, the functions UpdateBlob( ) and UpdateClob( ) are provided. Here's a BLOB example. The parameters should be self-explanatory:
+<pre>
+$ok = $db->Execute("insert into aTable (id, name, ablob)
+                                values (aSequence.nextVal, 'Name', null)");
+if (!$ok) return LogError($db->ErrorMsg());
+<font color="#006600"># params: $tableName, $blobFieldName, $blobValue, $whereClause</font>
+$db->UpdateBlob('aTable', 'ablob', $blobValue, 'id=aSequence.currVal');
+</pre>
+<p>and the analogous CLOB example:
+<pre>
+$ok = $db->Execute("insert into aTable (id, name, aclob)
+                                values (aSequence.nextVal, 'Name', null)");
+if (!$ok) return LogError($db->ErrorMsg());
+$db->UpdateClob('aTable', 'aclob', $clobValue, 'id=aSequence.currVal');
+</pre>
+<p>Note that LogError( ) is a user-defined function, and not part of ADOdb.
+<p>Inserting LOBs is more complicated. Since ADOdb 4.55, we allow you to do this
+  (assuming that the <em>photo</em> field is a BLOB, and we want to store $blob_data into
+  this field, and the primary key is the <em>id</em> field):
+<pre>
+	$sql = <span class="style1">"INSERT INTO photos ( ID, photo) ".
+			"VALUES ( :id, empty_blob() )".
+			" RETURNING photo INTO :xx"</span>;
+
+ 		$stmt = $db->PrepareSP($sql);
+		$db->InParameter($stmt, $<strong>id</strong>, <span class="style1">'id'</span>);
+		$blob = $db->InParameter($stmt, $<strong>blob_data</strong>, <span class="style1">'xx'</span>,-1, OCI_B_BLOB);
+		$db->StartTrans();
+		$ok = $db->Execute($stmt);
+		$db->CompleteTrans();
+</pre>
+<p>
+<h3>5. REF CURSORs</h3>
+<p>Oracle recordsets can be passed around as variables called REF Cursors. For example, in PL/SQL, we could define a function <i>open_tab</i> that returns a REF CURSOR in the first parameter:</p>
+<pre>
+TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
+
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
+	BEGIN
+		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
+	END open_tab;
+</pre>
+<p>In ADOdb, we could access this REF Cursor using the ExecuteCursor() function. The following will find
+ all table names that begin with 'A' in the current schema:
+<pre>
+$rs = $db->ExecuteCursor("BEGIN open_tab(:refc,'A%'); END;",'refc');
+while ($arr = $rs->FetchRow()) print_r($arr);
+</pre>
+<p>The first parameter is the PL/SQL statement, and the second parameter is the name of the REF Cursor.
+</p>
+<p> </p>
+<h3>6. In and Out Parameters</h3>
+<p>The following PL/SQL
+stored procedure  requires an input  variable, and returns a result into an output variable:
+<pre>
+PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
+	BEGIN
+		output := 'I love '||input;
+	END;
+</pre>
+<p>The following ADOdb code allows you to call the stored procedure:</p>
+<pre>
+$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
+$input = 'Sophia Loren';
+$db->InParameter($stmt,$input,'a1');
+$db->OutParameter($stmt,$output,'a2');
+$ok = $db->Execute($stmt);
+if ($ok) echo ($output == 'I love Sophia Loren') ? 'OK' : 'Failed';
+</pre>
+<p>PrepareSP( ) is a special function that knows about bind parameters.
+The main limitation currently is that IN OUT parameters do not work.
+<h4>Bind Parameters and REF CURSORs</h4>
+<p>We could also rewrite the REF CURSOR example to use InParameter (requires ADOdb 4.53 or later):
+<pre>
+$stmt = $db->PrepareSP("BEGIN adodb.open_tab(:refc,:tabname); END;");
+$input = 'A%';
+$db->InParameter($stmt,$input,'tabname');
+$rs = $db->ExecuteCursor($stmt,'refc');
+while ($arr = $rs->FetchRow()) print_r($arr);
+</pre>
+<h4>Bind Parameters and LOBs</h4>
+<p>You can also operate on LOBs. In this example, we have IN and OUT parameters using CLOBs.
+<pre>
+	$text = 'test test test';
+	$sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";
+	$stmt = $conn -> PrepareSP($sql);
+	$conn -> InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB); # -1 means variable length
+	$rs = '';
+	$conn -> OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);
+	$conn -> Execute($stmt);
+	echo "return = ".$rs."<br>";
+</pre>
+<p>Similarly, you can use the constant OCI_B_BLOB to indicate that you are using BLOBs.
+<h4>Reusing Bind Parameters with CURSOR_SHARING=FORCE</h4>
+<p>Many web programmers do not care to use bind parameters, and prefer to enter the SQL directly. So instead of:</p>
+<pre>
+$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
+</pre>
+<p>They prefer  entering the values inside the SQL:
+<pre>
+$arr = $db->GetArray("select * from emp where empno>7900");
+</pre>
+<p>This reduces Oracle performance because Oracle will reuse compiled SQL which is identical to previously compiled SQL. The above example with the values inside the SQL
+is unlikely to be reused. As an optimization, from Oracle 8.1 onwards, you can set the following session parameter after you login:
+<pre>
+ALTER SESSION SET CURSOR_SHARING=FORCE
+</pre>
+<p>This will force Oracle to convert all such variables (eg. the 7900 value) into constant bind parameters, improving SQL reuse.</p>
+<p>More <a href="http://phplens.com/adodb/code.initialization.html#speed">speedup tips</a>.</p>
+<p> </p>
+<h3>7. Dates and Datetime in ADOdb</h3>
+<p>There are two things you need to know about dates in ADOdb. </p>
+<p>First, to ensure cross-database compability, ADOdb assumes that dates are returned in ISO format (YYYY-MM-DD H24:MI:SS).</p>
+<p>Secondly, since Oracle treats dates and datetime as the same data type, we decided not to display the time in the default date format. So on login, ADOdb will set the NLS_DATE_FORMAT to 'YYYY-MM-DD'. If you prefer to show the date and time by default, do this:</p>
+<pre>
+$db = NewADOConnection('oci8');
+$db->NLS_DATE_FORMAT =  'RRRR-MM-DD HH24:MI:SS';
+$db->Connect($tns, $user, $pwd);
+</pre>
+<p>Or execute:</p>
+<pre>$sql = quot;ALTER SESSION SET NLS_DATE_FORMAT = 'RRRR-MM-DD HH24:MI:SS'";
+$db->Execute($sql);
+</pre>
+<p>If you are not concerned about date portability and do not use ADOdb's portability layer, you can use your preferred date format instead.
+<p>
+<h3>8. Database Portability Layer</h3>
+<p>ADOdb provides the following functions for portably generating SQL functions
+  as strings to be merged into your SQL statements:</p>
+<table width="75%" border="1" align=center>
+  <tr>
+    <td width=30%><b>Function</b></td>
+    <td><b>Description</b></td>
+  </tr>
+  <tr>
+    <td>DBDate($date)</td>
+    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a date
+      string formatted for INSERT/UPDATE</td>
+  </tr>
+  <tr>
+    <td>DBTimeStamp($date)</td>
+    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp
+      string formatted for INSERT/UPDATE</td>
+  </tr>
+  <tr>
+    <td>SQLDate($date, $fmt)</td>
+    <td>Portably generate a date formatted using $fmt mask, for use in SELECT
+      statements.</td>
+  </tr>
+  <tr>
+    <td>OffsetDate($date, $ndays)</td>
+    <td>Portably generate a $date offset by $ndays.</td>
+  </tr>
+  <tr>
+    <td>Concat($s1, $s2, ...)</td>
+    <td>Portably concatenate strings. Alternatively, for mssql use mssqlpo driver,
+      which allows || operator.</td>
+  </tr>
+  <tr>
+    <td>IfNull($fld, $replaceNull)</td>
+    <td>Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.</td>
+  </tr>
+  <tr>
+    <td>Param($name)</td>
+    <td>Generates bind placeholders, using ? or named conventions as appropriate.</td>
+  </tr>
+  <tr><td>$db->sysDate</td><td>Property that holds the SQL function that returns today's date</td>
+</tr>
+<tr><td>$db->sysTimeStamp</td><td>Property that holds the SQL function that returns the current
+timestamp (date+time).
+</td>
+</tr>
+<tr>
+<td>$db->concat_operator</td><td>Property that holds the concatenation operator
+</td>
+</tr>
+<tr><td>$db->length</td><td>Property that holds the name of the SQL strlen function.
+</td></tr>
+
+<tr><td>$db->upperCase</td><td>Property that holds the name of the SQL strtoupper function.
+</td></tr>
+<tr><td>$db->random</td><td>Property that holds the SQL to generate a random number between 0.00 and 1.00.
+</td>
+</tr>
+<tr><td>$db->substr</td><td>Property that holds the name of the SQL substring function.
+</td></tr>
+</table>
+<p>ADOdb also provides multiple oracle oci8 drivers for different scenarios:</p>
+<table width="75%" border="1" align="center">
+  <tr>
+    <td nowrap><b>Driver Name</b></td>
+    <td><b>Description</b></td>
+  </tr>
+  <tr>
+    <td>oci805 </td>
+    <td>Specifically for Oracle 8.0.5. This driver has a slower SelectLimit( ).</td>
+  </tr>
+  <tr>
+    <td>oci8</td>
+    <td>The default high performance driver. The keys of associative arrays returned in a recordset are upper-case.</td>
+  </tr>
+  <tr>
+    <td>oci8po</td>
+    <td> The portable Oracle driver. Slightly slower than oci8. This driver uses ? instead of :<i>bindvar</i> for binding variables, which is the standard for  other databases. Also the keys of associative arrays are in lower-case like other databases.</td>
+  </tr>
+</table>
+<p>Here's an example of calling the <i>oci8po</i> driver. Note that the bind variables use question-mark:</p>
+<pre>$db = NewADOConnection('oci8po');
+$db->Connect($tns, $user, $pwd);
+$db->Execute("insert into atable (f1, f2) values (?,?)", array(12, 'abc'));</pre>
+<p> <a name=connecting></a>
+<h3>9. Connecting to Oracle</h3>
+<p>Before you can use ADOdb, you need to have the Oracle client installed and setup the oci8 extension. This extension comes pre-compiled for Windows (but you still need to enable it in the php.ini file). For information on compiling the oci8 extension for PHP and Apache on Unix, there is an excellent guide at <a href="http://www.oracle.com/technology/tech/opensource/php/apache/inst_php_apache_linux.html">oracle.com</a>. </p>
+<h4>Should You Use Persistent Connections</h4>
+<p>One question that is frequently asked is should you use persistent connections to Oracle. Persistent connections allow PHP to recycle existing connections, reusing them after the previous web pages have completed. Non-persistent connections close automatically after the web page has completed. Persistent connections are faster because the cost of reconnecting is expensive, but there is additional resource overhead. As an alternative, Oracle allows you to pool and reuse server processes; this is called  <a href="http://www.cise.ufl.edu/help/database/oracle-docs/server.920/a96521/manproc.htm#13132">Shared Server</a> (also known as MTS).</p>
+<p>The author's benchmarks suggest that using non-persistent connections and the  Shared Server configuration offer the best performance. If Shared Server is not an option, only then consider using persistent connections.</p>
+<h4>Connection Examples</h4>
+<p>Just in case you are having problems connecting to Oracle, here are some examples:</p>
+<p>a. PHP and Oracle reside on the same machine, use default SID, with non-persistent connections:</p>
+<pre>	$conn = NewADOConnection('oci8');
+	$conn->Connect(false, 'scott', 'tiger');</pre>
+<p>b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 'myTNS', using persistent connections:</p>
+<pre>	$conn = NewADOConnection('oci8');
+	$conn->PConnect(false, 'scott', 'tiger', 'myTNS');</pre>
+<p>or</p>
+<pre> 	$conn->PConnect('myTNS', 'scott', 'tiger');</pre>
+<p>c. Host Address and SID</p>
+<pre>
+	$conn->connectSID = true;
+	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'SID');</pre>
+<p>d. Host Address and Service Name</p>
+<pre>	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'servicename');</pre>
+<p>e. Oracle connection string:
+<pre>	$cstr = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))
+			(CONNECT_DATA=(SID=$sid)))";
+	$conn->Connect($cstr, 'scott', 'tiger');
+</pre>
+<p>f. ADOdb data source names (dsn):
+<pre>
+	$dsn = 'oci8://user:pwd at tnsname/?persist';  # persist is optional
+	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect
+
+	$dsn = 'oci8://user:pwd at host/sid';
+	$conn = ADONewConnection($dsn);
+
+	$dsn = 'oci8://user:pwd@/';   # oracle on local machine
+	$conn = ADONewConnection($dsn);</pre>
+<p>With ADOdb data source names,
+you don't have to call Connect( ) or PConnect( ).
+</p>
+<p> </p>
+<h3>10. Error Checking</h3>
+<p>The examples in this article are easy to read but a bit simplistic because we ignore error-handling. Execute( ) and Connect( ) will return false on error. So a more realistic way to call Connect( ) and Execute( ) is:
+<pre>function InvokeErrorHandler()
+{<br>global $db; ## assume global
+    MyLogFunction($db->ErrorNo(), $db->ErrorMsg());
+}
+if (!$db->Connect($tns, $usr, $pwd)) InvokeErrorHandler();
+
+$rs = $db->Execute("select * from emp where empno>:emp order by empno",
+                    array('emp' => 7900));
+if (!$rs) return InvokeErrorHandler();
+while ($arr = $rs->FetchRow()) {
+    print_r($arr);
+	echo "<hr>";
+}
+</pre>
+<p>You can retrieve the  error message and error number of the last SQL statement executed from ErrorMsg( ) and ErrorNo( ). You can also <a href=http://phplens.com/adodb/using.custom.error.handlers.and.pear_error.html>define a custom error handler function</a>.
+ADOdb also supports throwing exceptions in PHP5.
+<p> </p>
+<h3>Handling Large Recordsets (added 27 May 2005)</h3>
+The oci8 driver does not support counting the number of records returned in a SELECT statement, so the function RecordCount()
+is emulated when the global variable $ADODB_COUNTRECS is set to true, which is the default.
+We emulate this by buffering all the records. This can take up large amounts of memory for big recordsets.
+ Set $ADODB_COUNTRECS to false for the best performance.
+ <p>
+This variable is checked every time a query is executed, so you can selectively choose which recordsets to count.
+<p> </p>
+<h3>11. Other ADOdb Features</h3>
+<p><a href="http://phplens.com/lens/adodb/docs-datadict.htm">Schema generation</a>. This allows you to define a schema using XML and import it into different RDBMS systems portably.</p>
+<p><a href="http://phplens.com/lens/adodb/docs-perf.htm">Performance monitoring and tracing</a>. Highlights of performance monitoring include identification of poor and suspicious SQL, with explain plan support, and identifying which web pages the SQL ran on.</p>
+<p> </p>
+<h3>12. Download</h3>
+<p>You can <a href="http://adodb.sourceforge.net/#download">download ADOdb from sourceforge</a>. ADOdb uses a BSD style license. That means that it is free for commercial use, and redistribution without source code is allowed.</p>
+<p> </p>
+<h3>13. Resources</h3>
+<ul>
+  <li>Oracle's <a href="http://www.oracle.com/technology/pub/articles/php_experts/index.html">Hitchhiker Guide to PHP</a></li>
+  <li>OTN article on <a href=http://www.oracle.com/technology/pub/articles/deployphp/lim_deployphp.html>Optimizing PHP and Oracle</a> by this author.
+  <li>Oracle has an excellent <a href="http://www.oracle.com/technology/tech/opensource/php/php_troubleshooting_faq.html">FAQ on PHP</a></li>
+  <li>PHP <a href="http://php.net/oci8">oci8</a> manual pages</li>
+  <li><a href=http://phplens.com/lens/lensforum/topics.php?id=4>ADOdb forums</a>.
+</ul>
+</body>
+</html>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-perf.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-perf.htm
index 0be7079..471ff5a 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-perf.htm
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-perf.htm
@@ -18,7 +18,7 @@ font-size: 8pt;
 </head>
 <body>
 <h3>The ADOdb Performance Monitoring Library</h3>
-<p>V5.18 3 Sep 2012  (c) 2000-2010 John Lim (jlim#natsoft.com)</p>
+<p>V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
 <p><font size="1">This software is dual licensed using BSD-Style and
 LGPL. This means you can use it in compiled proprietary and commercial
 products.</font></p>
@@ -299,7 +299,7 @@ $this->DBParameter("data cache size").</p>
 percentage. Only works for Linux and Windows. For Windows, WMI must be
 available.</p>
 <h3>$ADODB_PERF_MIN</h3>
-<p>New in adodb 4.97/5.03 is this global variable, which controls whether sql timings which are too small are not saved. Currently it defaults 
+<p>New in adodb 4.97/5.03 is this global variable, which controls whether sql timings which are too small are not saved. Currently it defaults
 to 0.05 (seconds). This means that all sql's which are faster than 0.05 seconds to execute are not saved.
 <h3>Format of $settings Property</h3>
 <p> To create new database parameters, you need to understand
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-session.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-session.htm
index f5425cb..6fab268 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-session.htm
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-session.htm
@@ -21,7 +21,7 @@ font-size: 8pt;
 <body style="background-color: rgb(255, 255, 255);">
 <h1>ADODB Session 2 Management Manual</h1>
 <p>
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com)
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)
 </p>
 <p> <font size="1">This software is dual licensed using BSD-Style and
 LGPL. This means you can use it in compiled proprietary and commercial
@@ -44,7 +44,7 @@ session, as the user moves from page to page. </p>
 <p>To use session variables, call session_start() at the beginning of
 your web page, before your HTTP headers are sent. Then for every
 variable you want to keep alive for the duration of the session, call
-variable you want to keep alive for the duration of the session, use $_SESSION['variablename']. 
+variable you want to keep alive for the duration of the session, use $_SESSION['variablename'].
  By default, the session handler will
 keep track of the session by using a cookie. You can save objects or
 arrays in session variables also.
@@ -60,8 +60,8 @@ However if you have special needs such as you:
 <p>The ADOdb session handler provides you with the above
 additional capabilities by storing the session information as records
 in a database table that can be shared across multiple servers. </p>
-<p>These records will be garbage collected based on the php.ini [session] timeout settings. 
-You can register a notification function to notify you when the record has expired and 
+<p>These records will be garbage collected based on the php.ini [session] timeout settings.
+You can register a notification function to notify you when the record has expired and
 is about to be freed by the garbage collector.</p>
 <p>An alternative to using a database backed session handler is to use <a href="http://www.danga.com/memcached/">memcached</a>.
   This is a distributed memory based caching system suitable for storing session
@@ -82,7 +82,7 @@ It features the following improvements:
 <li>The functions dataFieldName() and syncSeconds() is obsolete.
 </ul>
 
-<p>Usage is 
+<p>Usage is
 
 <pre>
 include_once("adodb/session/adodb-session2.php");
@@ -96,7 +96,7 @@ session_start();
 <p>When the session is created in session_start( ), the global variable $<b>ADODB_SESS_CONN</b> holds
 the connection object.
 <p>The default name of the table is sessions2. If you want to override it:
-  
+
 <pre>
 include_once("adodb/session/adodb-session2.php");
 $options['table'] = 'mytablename';
@@ -127,13 +127,13 @@ including adodb-cryptsession2.php instead of adodb-session2.php. </li>
 <h2><strong>Usage Examples</strong></h2>
 <p>To force non-persistent connections, call <font color="#004040"><b>Persist</b></font>() first before session_start():
 
- 
+
 <pre>
  <font color="#004040">
 include_once("adodb/session/adodb-session2.php");
 $driver = 'mysql'; $host = 'localhost'; $user = 'auser'; $pwd = 'secret'; $database = 'sessiondb';
 ADOdb_Session::config($driver, $host, $user, $password, $database, $options=false);<b><br>ADOdb_session::Persist($connectMode=false);</b>
-session_start();<br> 
+session_start();<br>
 
 # or, using DSN support so you can set other options such as port (since 5.11)
 include_once("adodb/session/adodb-session2.php");
@@ -217,7 +217,7 @@ CREATE INDEX SESS2_EXPIREREF ON SESSIONS2(EXPIREREF);</font></pre>
 <p> We need to use a CLOB here because for text greater than 4000 bytes long,
   Oracle requires you to use the CLOB data type. If you are using the oci8 driver,
   ADOdb will automatically enable CLOB handling. So you can use either adodb-session2.php
-  or adodb-session-clob2.php - in this case it doesn't matter. <br>    
+  or adodb-session-clob2.php - in this case it doesn't matter. <br>
 <h2>Notifications</h2>
 <p>You can receive notification when your session is cleaned up by the session garbage collector or
 when you call session_destroy().
@@ -231,18 +231,18 @@ adodb's garbage collection function, which can be setup to do notification.
 	executed at     called by                             for all recs
 	random time     Session Extension                     queued for deletion
 </pre>
-<p>When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically 
+<p>When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically
 the userid of the session. Later when the session has expired,  just before the record is deleted,
-we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which 
+we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which
 is the userid of the person being logged off.
 <p>ADOdb uses a global variable $ADODB_SESSION_EXPIRE_NOTIFY that you must predefine before session
-start to store the notification configuration. 
+start to store the notification configuration.
 $ADODB_SESSION_EXPIRE_NOTIFY is an array with 2 elements, the
 first being the name of the session variable you would like to store in
 the EXPIREREF field, and the 2nd is the notification function's name. </p>
 <p>For example, suppose we want to be notified when a user's session has expired,
 based on the userid. When the user logs in, we store the id in the global session variable
-$USERID. The function name is 'NotifyFn'. 
+$USERID. The function name is 'NotifyFn'.
 <p>
 So we define (before session_start() is called): </p>
 <pre> <font color="#004040">
@@ -259,10 +259,10 @@ records in the database and temporary files: </p>
 	{
 		global $ADODB_SESS_CONN; # the session connection object
 		$user = $ADODB_SESS_CONN->qstr($expireref);
-		
-		$ADODB_SESS_CONN->Execute("delete from shopping_cart where user=$user");          
+
+		$ADODB_SESS_CONN->Execute("delete from shopping_cart where user=$user");
 		system("rm /work/tmpfiles/$expireref/*");
-	}</font>  
+	}</font>
 			  </pre>
 <p> NOTE 1: If you have register_globals disabled in php.ini, then you
 will have to manually set the EXPIREREF. E.g. </p>
@@ -300,16 +300,16 @@ will compress and then encrypt the record in the database.
 <p>Dynamically change the current session id with a newly generated one and update
   database. Currently only works with cookies. Useful to improve security by
   reducing the risk of session-hijacking. See this article on <a href=http://shiflett.org/articles/security-corner-feb2004>Session
-  Fixation</a> for more info 
+  Fixation</a> for more info
 on the theory behind this feature. Usage:<pre>
 	include('path/to/adodb/session/adodb-session2.php');
-	
+
 	session_start();
 	# Approximately every 10 page loads, reset cookie for safety.
-	# This is extremely simplistic example, better 
+	# This is extremely simplistic example, better
 	# to regenerate only when the user logs in or changes
 	# user privilege levels.
-	if ((rand()%10) == 0) adodb_session_regenerate_id(); 
+	if ((rand()%10) == 0) adodb_session_regenerate_id();
 </pre>
 <p>This function calls session_regenerate_id() internally or simulates it if the function does not exist.
 <h2>Vacuum/Optimize Database</h2>
@@ -327,7 +327,7 @@ ADODB_Session::optimize($turnOn);
  $ADODB_SESSION_USER ='root';
  $ADODB_SESSION_PWD ='abc';
  $ADODB_SESSION_DB ='phplens';
- 
+
  include('path/to/adodb/session/adodb-<strong>session2</strong>.php'); </pre>
 <p>In the above example, the only things you need to change in your code to upgrade
   is </p>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-session.old.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-session.old.htm
index f253818..fff3c2e 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-session.old.htm
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/docs-session.old.htm
@@ -21,7 +21,7 @@ font-size: 8pt;
 <body style="background-color: rgb(255, 255, 255);">
 <h3>ADODB Session Management Manual</h3>
 <p>
-V5.18 3 Sep 2012  (c) 2000-2010 John Lim (jlim#natsoft.com)
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)
 </p>
 <p> <font size="1">This software is dual licensed using BSD-Style and
 LGPL. This means you can use it in compiled proprietary and commercial
@@ -30,7 +30,7 @@ products. </font>
   <a href="http://adodb.sourceforge.net/#docs">Other Docs</a>
 </p>
 <h3>Introduction</h3>
-<p>This documentation discusses the old adodb-session.php. 
+<p>This documentation discusses the old adodb-session.php.
 Here is the <a href=docs-session.htm>new documentation</a> on the newer adodb-session2.php.
 <p> We store state information specific to a user or web client in
 session variables. These session variables persist throughout a
@@ -53,8 +53,8 @@ However if you have special needs such as you:
 <p>The ADOdb session handler provides you with the above
 additional capabilities by storing the session information as records
 in a database table that can be shared across multiple servers. </p>
-<p>These records will be garbage collected based on the php.ini [session] timeout settings. 
-You can register a notification function to notify you when the record has expired and 
+<p>These records will be garbage collected based on the php.ini [session] timeout settings.
+You can register a notification function to notify you when the record has expired and
 is about to be freed by the garbage collector.</p>
 <p><b>Important Upgrade Notice:</b> Since ADOdb 4.05, the session files
 have been moved to its own folder, adodb/session. This is a rewrite
@@ -84,7 +84,7 @@ including adodb-cryptsession.php instead of adodb-session.php. </li>
 <p><pre>
  <font
  color="#004040">    include('adodb/adodb.inc.php');<br>    <br><b>    $ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>    $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    $ADODB_SESSION_DB ='sessiondb';</b><br>    <br>    <b>include('adodb/session/adodb-session.php');</b><br>    session_start();<br>    <br>    #<br>    # Test session vars, the following should increment on refresh<br>    #<br>    $_SESSION['AVAR'] += 1;<br>    print "<p>\$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";<br></font></pre>
- 
+
 <p>To force non-persistent connections, call adodb_session_open() first before session_start():
 <p>
  <pre>
@@ -179,18 +179,18 @@ adodb's garbage collection function, which can be setup to do notification.
 	executed at     called by                             for all recs
 	random time     Session Extension                     queued for deletion
 </pre>
-<p>When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically 
+<p>When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically
 the userid of the session. Later when the session has expired,  just before the record is deleted,
-we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which 
+we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which
 is the userid of the person being logged off.
 <p>ADOdb uses a global variable $ADODB_SESSION_EXPIRE_NOTIFY that you must predefine before session
-start to store the notification configuration. 
+start to store the notification configuration.
 $ADODB_SESSION_EXPIRE_NOTIFY is an array with 2 elements, the
 first being the name of the session variable you would like to store in
 the EXPIREREF field, and the 2nd is the notification function's name. </p>
 <p>For example, suppose we want to be notified when a user's session has expired,
 based on the userid. When the user logs in, we store the id in the global session variable
-$USERID. The function name is 'NotifyFn'. 
+$USERID. The function name is 'NotifyFn'.
 <p>
 So we define (before session_start() is called): </p>
 <pre> <font color="#004040">
@@ -207,10 +207,10 @@ records in the database and temporary files: </p>
 	{
 		global $ADODB_SESS_CONN; # the session connection object
 		$user = $ADODB_SESS_CONN->qstr($expireref);
-		
-		$ADODB_SESS_CONN->Execute("delete from shopping_cart where user=$user");          
+
+		$ADODB_SESS_CONN->Execute("delete from shopping_cart where user=$user");
 		system("rm /work/tmpfiles/$expireref/*");
-	}</font>  
+	}</font>
 			  </pre>
 <p> NOTE 1: If you have register_globals disabled in php.ini, then you
 will have to manually set the EXPIREREF. E.g. </p>
@@ -246,7 +246,7 @@ can be logged in twice. Useful for security reasons.
        DATA CLOB,
       PRIMARY KEY (sesskey)
   );</font>
- </pre> 
+ </pre>
  <p>Then your PHP code could look like this:
 	 <pre>
 	ADODB_SESSION_DRIVER='oci8';
@@ -254,20 +254,20 @@ can be logged in twice. Useful for security reasons.
 	$ADODB_SESSION_USER ='scott';
 	$ADODB_SESSION_PWD = 'tiger';
 	$ADODB_SESSION_DB ='';
-	
+
 	$ADODB_SESSION_USE_LOBS = 'clob';
 	$ADODB_SESSION_TBL = 'sessions';
-	
+
 	$ADODB_SESS_DEBUG=0;
-	
+
 	include(ADODB_DIR.'/session/adodb-session.php');
-	
+
 	ADODB_Session::persist('P'); # use 'C' for non-persistent connects
-	
+
 	session_start();
  </pre>
  <p>Note that you can set persistance using ADODB_Session::persist('P').
- 
+
 <h3>Compression/Encryption Schemes</h3>
 Since ADOdb 4.05, thanks to Ross Smith, multiple encryption and
 compression schemes are supported. Currently, supported are:
@@ -279,7 +279,7 @@ will compress and then encrypt the record in the database.
 <h3>adodb_session_regenerate_id()</h3>
 <p>Dynamically change the current session id with a newly generated one and update database. Currently only
 works with cookies. Useful to improve security by reducing the risk of session-hijacking.
-See this article on <a href=http://shiflett.org/articles/security-corner-feb2004>Session Fixation</a> for more info 
+See this article on <a href=http://shiflett.org/articles/security-corner-feb2004>Session Fixation</a> for more info
 on the theory behind this feature. Usage:
 <pre>
 	$ADODB_SESSION_DRIVER='mysql';
@@ -287,15 +287,15 @@ on the theory behind this feature. Usage:
 	$ADODB_SESSION_USER ='root';
 	$ADODB_SESSION_PWD ='abc';
 	$ADODB_SESSION_DB ='phplens';
-	
+
 	include('path/to/adodb/session/adodb-session.php');
-	
+
 	session_start();
 	# Every 10 page loads, reset cookie for safety.
-	# This is extremely simplistic example, better 
+	# This is extremely simplistic example, better
 	# to regenerate only when the user logs in or changes
 	# user privilege levels.
-	if ((rand()%10) == 0) adodb_session_regenerate_id(); 
+	if ((rand()%10) == 0) adodb_session_regenerate_id();
 </pre>
 <p>This function calls session_regenerate_id() internally or simulates it if the function does not exist.
 <h3>Vacuum/Optimize Database</h3>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/index.html b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/index.html
new file mode 100644
index 0000000..7e74593
--- /dev/null
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/index.html
@@ -0,0 +1,241 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <style>
+pre {
+  background-color: #eee;
+  padding: 0.75em 1.5em;
+  font-size: 12px;
+  font-family: "Lucida Console", "DejaVu Sans Mono", Courier, monospace;
+  border: 1px solid #ddd;
+}
+body {
+    background-color: #0066FF;
+}
+.style1 {
+    font-family: Arial, Helvetica, sans-serif
+}
+.style2 {
+    font-family: Arial, Helvetica, sans-serif;
+    color: #FFFFFF;
+}
+  </style>
+  <title>ADOdb Database Abstraction Library for PHP</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body>
+<table width="986" cellpadding=8 border="2" align="center" bordercolor="#999999">
+  <tbody>
+    <tr>
+      <td bgcolor="#FFFFFF">
+      <table border="0" cellpadding=2 width="100%">
+        <tbody>
+          <tr bgcolor="#000099">
+            <td bordercolor="#FFFFFF" class="style2">
+            <h2>ADOdb Database Abstraction Library for PHP</h2>
+            <font size="2">© 2000-2014 John Lim
+(jlim#natsoft.com). All rights reserved. </font></td>
+            <td align="center" valign="center" bgcolor="#CCCCCC" class="style1"><img src="adodb.gif"></td>
+          </tr>
+        </tbody>
+      </table>
+      <p class="style1"> <font size="2">
+          <a href="#download">Download</a>  
+          <a href="https://github.com/ADOdb/ADOdb">Source code</a>  
+          <a href="#docs">Documentation</a>  
+          <a href="#support">Support</a>  
+          <a href="docs-adodb.htm#changelog">Changelog</a> 
+          <a href="adodb-faq.html">FAQ</a> </font></p>
+      <hr>
+      <p class="style1">ADOdb is a database abstraction library for PHP</p>
+      <p class="style1">It currently supports an amazing number of
+databases, thanks to the wonderful ADOdb community: <i>MySQL,
+PostgreSQL, Interbase, Firebird, Informix, Oracle, MS SQL, Foxpro,
+Access, ADO, Sybase, FrontBase, DB2, SAP DB, SQLite, Netezza, LDAP, </i>and<i>
+generic ODBC, ODBTP</i>. The Sybase, Informix, FrontBase and
+PostgreSQL, Netezza, LDAP, ODBTP drivers are community contributions.
+Here is the <a href="docs-adodb.htm#drivers">complete
+list of drivers</a>. </p>
+      <p class="style1"> Many popular web applications such as
+      <a href="http://www.andrew.cmu.edu/%7Erdanyliw/snort/snortacid.html">ACID</a>,
+      <a href="http://community.zikula.org">Zikula/PostNuke</a>,
+      <a href="http://phpwiki.sourceforge.net/">phpWiki</a>,
+      <a href="http://www.mamboserver.com/">Mambo</a>,
+      <a href="http://phpgacl.sourceforge.net/">PHP GACL</a>,
+      <a href="http://sourceforge.net/projects/tikiwiki">TikiWiki</a>,
+      <a href="http://www.egroupware.org/">eGroupWare</a> and
+      <a href="http://phplens.com/lens/">phpLens App Server</a>
+      are using ADOdb as their database abstraction layer.
+
+      Some reasons why ADOdb is popular include: </p>
+      <ul class="style1">
+        <li>Designed for <b>speed</b>. It is probably the fastest open
+source database abstraction library available for PHP. See <a
+ href="http://phplens.com/lens/adodb/">benchmarks</a>.</li>
+        <li>Provides <b>extensive portability support</b> such as date
+and type-handling and portable schema creation. See <a
+ href="tips_portable_sql.htm">portable sql tips</a></li>
+        <li>Support many <b>enterprise features</b> such as database
+backed sessions (with session expiry notification), SQL code
+generation, pivot tables, SELECT LIMIT emulation for all databases,
+performance monitoring.</li>
+        <li><b>Easy to learn</b>, especially if you have Window's
+programming experience, as it uses many ADO conventions.</li>
+        <li><b>Extensive QA</b>, every release is unit-tested on
+Access, MySQL, PostgreSQL, MS SQL, Oracle 11g.</li>
+        <li><b>Mature</b>, continiously developed since August 2000.
+Has a <b>large community</b> of users. </li>
+        <li>Powerful <strong>Active Record </strong>support. See <a href="docs-active-record.htm">docs</a>. </li>
+        <li>Very <b>reasonable licensing</b> terms (BSD). This means
+that you can incorporate (and even compile) it into your software
+applications<b> royalty-free</b> without asking the author's
+permission, provided you include license.txt in your release. Also
+dual-licensed (Lesser GPL). </li>
+      </ul>
+
+
+      <h3 class="style1">PHP Code Samples</h3>
+
+      <pre>include('/path/to/adodb.inc.php');<br>$DB = NewADOConnection('mysql');<br>$DB->Connect($server, $user, $pwd, $db);<br><br><font
+ color="#006600"># M'soft style data retrieval with binds</font>
+$rs = $DB->Execute("select * from table where key=?",array($key));
+while (!$rs->EOF) {
+    print_r($rs->fields);
+    $rs->MoveNext();
+}
+
+<font color="#006600"># PEAR style data retrieval</font>
+$rs = $DB->Execute("select * from table where key=123");
+while ($array = $rs->FetchRow()) {
+    print_r($array);
+}
+
+<font color="#006600"># Alternative URI connection syntax:</font>
+$DB = NewADOConnection("<b>mysql://$user:$pwd@$server/$db?persist</b>");<br><br><font
+ color="#006600"># No need for Connect or PConnect when using URI syntax</font>
+
+$ok = $DB->Execute("update atable set aval = 0");
+if (!$ok) mylogerr($DB->ErrorMsg());
+      </pre>
+
+      <p class="style1">Other things you can try include: </p>
+      <pre><font color="#006600"># Updating tables</font>
+$ok = $DB->Execute("update table set col1=? where key=?",array($colval, $key));
+
+<font color="#006600"># retrieving data shortcuts</font>
+$val = $DB->GetOne("select col from table where key='John'");
+$row = $DB->GetRow("select col from table where key='John'");
+$arr = $DB->GetAll("select col from table");
+$arr = $DB->GetAssoc("select key,col from table"); # returns associative array $key=>col
+
+<font color="#006600"># Retrieve high speed cached recordsets (cached for 3600 secs)<br>
+# Cache directory defined in  global $ADODB_CACHE_DIR. <br>
+# CacheGetOne, CacheRow, CacheGetAll all work</font>
+$rs = $DB->CacheExecute(3600, "select orgname from users where user='JOHN'");
+      </pre>
+
+      <span class="style1">And there are <a href="docs-adodb.htm#coding">more
+connection examples</a> showing you how to connect to
+      <a href="docs-adodb.htm#sqlite">SQLite</a>,
+      <a href="docs-adodb.htm#oci8">Oracle</a>,
+      <a href="docs-adodb.htm#postgres">PostgreSQL</a>,
+      <a href="docs-adodb.htm#odbc_mssql">Microsoft SQL Server</a>,
+      <a href="docs-adodb.htm#access">MS Access</a>,
+      <a href="docs-adodb.htm#ldap">LDAP</a>,
+      <a href="docs-adodb.htm#ibase">Interbase/Firebird</a>,
+      etc.
+      </span>
+
+      <h3 class="style1">PHP5 Support</h3>
+      <span class="style1">ADOdb has full PHP5 support, including SPL and exception support. For
+example, you can do this in PHP5:
+      </span>      <pre>$rs = $DB->Execute("select * from table");<br>foreach ($rs as $row) {<br>    print_r($row);<br>}<br></pre>
+      <span class="style1">If you include the following adodb-exceptions.inc.php file, then ADOdb
+will throw exceptions when an error occurs:
+      </span>      <pre>include("<b>/path/to/adodb-exceptions.inc.php</b>");<br>include("/path/to/adodb.inc.php");<br>$DB = NewADOConnection('oci8');  <br>$DB->Connect("", "scott", "tiger");<br>try {<br>   $DB->Execute("select badsql from badtable");<br>} catch (exception $e) {<br>    print_r($e);<br>}<br></pre>
+
+      <a name="download"></a>
+      <h3 class="style1">Download</h3>
+      <p class="style1">
+          <a href="https://sourceforge.net/projects/adodb/files/adodb-php5-only/">Download from SourceForge</a><br>
+      </p>
+      <p class="style1"><i>Requirements</i>: PHP 5.0 or later.</p>
+      <p class="style1"><i>Installation</i>: Unpack files into a directory. Try the
+above sample code, adjusting
+the connection parameters to suit your database server, and modify the
+sql to match your tables. </p>
+      <p class="style1"><i>Debugging</i>: Set your connection's debug property, e.g.
+<tt>$DB->debug=true;</tt> if you are having problems. It will output lots of
+useful status and
+error messages.</p>
+
+      <a name="docs"></a>
+      <h3 class="style1">ADOdb Documentation</h3>
+      <p class="style1"><a href="docs-adodb.htm">One HTML Page</a>
+      </p>
+
+      <p class="style1">
+        <a href="docs-datadict.htm">Data Dictionary</a> for schema creation.<br>
+        <a href="docs-perf.htm">Performance Monitoring</a>.<br>
+        <a href="docs-session.htm">Database-backed Session Management</a>.
+      </p>
+
+      <h4 class="style1">Other Docs for PHP version</h4>
+      <p class="style1">
+        The documents in this section are maintained (or not, as the case may be)
+        by their respective authors and are therefore potentially out of date
+        or even obsolete.
+      </p>
+
+      <p class="style1">
+        <a href="tute.htm">MySQL Tutorial</a><br>
+        <a href="docs-oracle.htm">Advanced Oracle Tutorial</a><br>
+        <a href="tips_portable_sql.htm">Portable SQL Tips with ADOdb</a><br>
+        <a href="docs-active-record.htm">ADOdb Active Record</a>, an OOP encapsulation of a database record.</br>
+      </p>
+
+      <p class="style1">A couple excellent articles by icarus about ADOdb at MelonFire: </p>
+      <p class="style1">    
+        <a href="http://www.melonfire.com/community/columns/trog/article.php?id=142">Part 1 on Basics</a> and
+        <a href="http://www.melonfire.com/community/columns/trog/article.php?id=144">Part 2 on Advanced ADOdb</a>.
+      </p>
+
+      <h4 class="style1">Translations</h4>
+      <p class="style1">PHP documentation in other languages: </p>
+      <ul class="style1">
+        <li><a
+ href="http://phplens.com/lens/adodb/ADODB-Manual-Korean.htm">Korean</a></li>
+        <li><a href="http://www.lacorona.com.mx/fortiz/adodb/">Spanish (Castellano)</a> </li>
+ <li><a href=http://www.souken.co.jp/tech/php/adodb/docs-adodb-ja.htm>Japanese</a>
+      </ul>
+      <p class="style1">and tutorials in: </p>
+      <ul class="style1">
+        <li><a href="http://www.ifin.net.tw/adodb/adodb_tutorial.htm">Chinese</a><br></li>
+        <li><a href="http://phplens.com/phpeverywhere/adodb_french">Francais</a><br></li>
+        <li><a href="http://phplens.com/phpeverywhere/adodb_german">German</a><br></li>
+        <li><a href="http://phplens.com/phpeverywhere/adodb_italian">Italian</a><br></li>
+        <li><a href="http://phplens.com/adodb/adodb_tutorial_pl.html">Polish</a><br></li>
+        <li><a href="http://www.lacorona.com.mx/fortiz/adodb/tute-es.htm">Spanish (Castellano)</a></li>
+        <li><a href="http://www.exzilla.net/docs/adodb/adodb-mysql-tutorial.php">Thai</a><br></li>
+      </ul>
+
+      <a name="support"></a>
+      <h3 class="style1">Support</h3>
+      <p class="style1">Bug reports, feature requests and questions should be filed on
+        <a href="https://github.com/ADOdb/ADOdb/issues">Github</a>.
+      </p>
+      <p class="style1">The legacy
+        <a href="http://phplens.com/lens/lensforum/topics.php?id=4">ADOdb forums</a>
+        are still available, however they are not actively monitored and should
+        only be used as reference.
+      </p>
+      <hr>
+      <span class="style1">© 2000-2014 John Lim. All Rights Reserved.
+        <strong>Contact:</strong> jlim#natsoft.com <br>
+      </span></td>
+    </tr>
+  </tbody>
+</table>
+</body>
+</html>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/old-changelog.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/old-changelog.htm
index bf8a1af..8f8a03d 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/old-changelog.htm
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/old-changelog.htm
@@ -1,822 +1,822 @@
-<html><title>Old Changelog: ADOdb</title><body>
-<h3>Old Changelog</h3>
-
-</p><p><b>3.92 22 Sept 2003</b> 
-</p><p>Added GetAssoc and CacheGetAssoc to connection object.
-</p><p>Removed TextMax and CharMax functions from adodb.inc.php. 
-</p><p>HasFailedTrans() returned false when trans failed. Fixed. 
-</p><p>Moved perf driver classes into adodb/perf/*.php. 
-</p><p>Misc improvements to performance monitoring, including UI(). 
-</p><p>RETVAL in mssql Parameter(), we do not append @ now. 
-</p><p>Added Param($name) to connection class, returns '?' or ":$name", for defining 
-  bind parameters portably. 
-</p><p>LogSQL traps affected_rows() and saves its value properly now. Also fixed oci8 
-  _stmt and _affectedrows() bugs. 
-</p><p>Session code timestamp check for oci8 works now. Formerly default NLS_DATE_FORMAT 
-  stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). Also 
-  added new $conn->datetime field to oci8, controls whether MetaType() returns 
-  'D' ($this->datetime==false) or 'T' ($this->datetime == true) for DATE type. 
-</p><p>Fixed bugs in adodb-cryptsession.inc.php and adodb-session-clob.inc.php. 
-</p><p>Fixed misc bugs in adodb_key_exists, GetInsertSQL() and GetUpdateSQL(). 
-</p><p>Tuned include_once handling to reduce file-system checking overhead. 
-</p><p><b>3.91 9 Sept 2003</b> 
-</p><p>Only released to InterAkt 
-</p><p>Added LogSQL() for sql logging and $ADODB_NEWCONNECTION to override factory 
-  for driver instantiation. 
-</p><p>Added IfNull($field,$ifNull) function, thx to johnwilk#juno.com 
-</p><p>Added portable substr support. 
-</p><p>Now rs2html() has new parameter, $echo. Set to false to return $html instead 
-  of echoing it. 
-</p><p><b>3.90 5 Sept 2003</b> 
-</p><p>First beta of performance monitoring released. 
-</p><p>MySQL supports MetaTable() masking. 
-</p><p>Fixed key_exists() bug in adodb-lib.inc.php 
-</p><p>Added sp_executesql Prepare() support to mssql. 
-</p><p>Added bind support to db2. 
-</p><p>Added swedish language file - Christian Tiberg" christian#commsoft.nu 
-</p><p>Bug in drop index for mssql data dict fixed. Thx to Gert-Rainer Bitterlich. 
-</p><p>Left join setting for oci8 was wrong. Thx to johnwilk#juno.com 
-</p><p><b>3.80 27 Aug 2003</b> 
-</p><p>Patch for PHP 4.3.3 cached recordset csv2rs() fread loop incompatibility. 
-</p><p>Added matching mask for MetaTables. Only for oci8, mssql and postgres currently. 
-</p><p>Rewrite of "oracle" driver connection code, merging with "oci8", by Gaetano. 
-</p><p>Added better debugging for Smart Transactions. 
-</p><p>Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to TO_TIMESTAMP. 
-</p><p>ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to define 
-  it after including adodb.inc.php. 
-</p><p>Added portugese (brazilian) to languages. Thx to "Levi Fukumori". 
-</p><p>Removed arg3 parameter from Execute/SelectLimit/Cache* functions. 
-</p><p>Execute() now accepts 2-d array as $inputarray. Also changed docs of fnExecute() 
-  to note change in sql query counting with 2-d arrays. 
-</p><p>Added MONEY to MetaType in PostgreSQL. 
-</p><p>Added more debugging output to CacheFlush(). 
-</p><p><b>3.72 9 Aug 2003</b> 
-</p><p>Added qmagic($str), which is a qstr($str) that auto-checks for magic quotes 
-  and does the right thing... 
-</p><p>Fixed CacheFlush() bug - Thx to martin#gmx.de 
-</p><p>Walt Boring contributed MetaForeignKeys for postgres7. 
-</p><p>_fetch() called _BlobDecode() wrongly in interbase. Fixed. 
-</p><p>adodb_time bug fixed with dates after 2038 fixed by Jason Pell. http://phplens.com/lens/lensforum/msgs.php?id=6980 
-</p><p><b>3.71 4 Aug 2003</b> 
-</p><p>The oci8 driver, MetaPrimaryKeys() did not check the owner correctly when $owner 
-  == false. 
-</p><p>Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru. 
-</p><p>Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com. 
-</p><p>Error handling in oci8 bugfix - if there was an error in Execute(), then when 
-  calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but 
-  the 2nd call would return no error. 
-</p><p>Error handling in odbc bugfix. ODBC would always return the last error, even 
-  if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 
-  0 everytime before CacheExecute() and Execute(). 
-</p><p><b>3.70 29 July 2003</b> 
-</p><p>Added new SQLite driver. Tested on PHP 4.3 and PHP 5. 
-</p><p>Added limited "sapdb" driver support - mainly date support. 
-</p><p>The oci8 driver did not identify NUMBER with no defined precision correctly. 
-</p><p>Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL nulls 
-  in GetInsertSQL/GetUpdateSQL. 
-</p><p>DBDate() and DBTimeStamp() format for postgresql had problems. Fixed. 
-</p><p>Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit. 
-</p><p>Added charset support to postgresql. Thx to Julian Tarkhanov. 
-</p><p>Changed OS check for MS-Windows to prevent confusion with darWIN (MacOS) 
-</p><p>Timestamp format for db2 was wrong. Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn. 
-</p><p>adodb-cryptsession.php includes wrong. Fixed. 
-</p><p>Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8. 
-</p><p>Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring. 
-</p><p>adodb_getcount() did not init qryRecs to 0. Missing "WHERE" clause checking 
-  in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn. 
-</p><p>Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt Boring. 
-</p><p>Upgraded to adodb-xmlschema.inc.php 0.0.2. 
-</p><p>NConnect for mysql now returns value. Thx to Dennis Verspuij. 
-</p><p>ADODB_FETCH_BOTH support added to interbase/firebird. 
-</p><p>Czech language file contributed by Kamil Jakubovic jake#host.sk. 
-</p><p>PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj Chlebec. 
-</p><p>Added some new initialization stuff for Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it 
-</p><p>ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed. 
-</p><p><b>3.60 16 June 2003</b> 
-</p><p>We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be compat with 
-  mssql driver. 
-</p><p>The property $emptyDate missing from connection class. Also changed 1903 to 
-  constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn. 
-</p><p>ADOdb speedup optimization - we now return all arrays by reference. 
-</p><p>Now DBDate() and DBTimeStamp() now accepts the string 'null' as a parameter. 
-  Suggested by vincent. 
-</p><p>Added GetArray() to connection class. 
-</p><p>Added not_null check in informix metacolumns(). 
-</p><p>Connection parameters for postgresql did not work correctly when port was defined. 
-</p><p>DB2 is now a tested driver, making adodb 100% compatible. Extensive changes 
-  to odbc driver for DB2, including implementing serverinfo() and SQLDate(), switching 
-  to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and SelectLimit() 
-  fixes. 
-</p><p>The odbc driver's FetchField() field names did not obey ADODB_ASSOC_CASE. Fixed. 
-</p><p>Some bugs in adodb_backtrace() fixed. 
-</p><p>Added "INT IDENTITY" type to adorecordset::MetaType() to support odbc_mssql 
-  properly. 
-</p><p>MetaColumns() for oci8, mssql, odbc revised to support scale. Also minor revisions 
-  to odbc MetaColumns() for vfp and db2 compat. 
-</p><p>Added unsigned support to mysql datadict class. Thx to iamsure. 
-</p><p>Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. Thx to 
-  Josh R, Night_Wulfe#hotmail.com. 
-</p><p>ChangeTableSQL contributed by Florian Buzin. 
-</p><p>The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat with 
-  mssql driver. 
-</p>
-
-<p><b>3.50 19 May 2003</b></p>
-<p>Fixed mssql compat with FreeTDS. FreeTDS does not implement mssql_fetch_assoc(). 
-<p>Merged back connection and recordset code into adodb.inc.php. 
-<p>ADOdb sessions using oracle clobs contributed by achim.gosse#ddd.de. See adodb-session-clob.php. 
-<p>Added /s modifier to preg_match everywhere, which ensures that regex does not 
-  stop at /n. Thx Pao-Hsi Huang. 
-<p>Fixed error in metacolumns() for mssql. 
-<p>Added time format support for SQLDate. 
-<p>Image => B added to metatype. 
-<p>MetaType now checks empty($this->blobSize) instead of empty($this). 
-<p>Datadict has beta support for informix, sybase (mapped to mssql), db2 and generic 
-  (which is a fudge). 
-<p>BlobEncode for postgresql uses pg_escape_bytea, if available. Needed for compat 
-  with 7.3. 
-<p>Added $ADODB_LANG, to support multiple languages in MetaErrorMsg(). 
-<p>Datadict can now parse table definition as declarative text. 
-<p>For DataDict, oci8 autoincrement trigger missing semi-colon. Fixed. 
-<p>For DataDict, when REPLACE flag enabled, drop sequence in datadict for autoincrement 
-  field in postgres and oci8.s 
-<p>Postgresql defaults to template1 database if no database defined in connect/pconnect. 
-<p>We now clear _resultid in postgresql if query fails. 
-<p><b>3.40 19 May 2003</b></p>
-<p>Added insert_id for odbc_mssql. 
-<p>Modified postgresql UpdateBlobFile() because it did not work in safe mode. 
-<p>Now connection object is passed to raiseErrorFn as last parameter. Needed by 
-  StartTrans(). 
-<p>Added StartTrans() and CompleteTrans(). It is recommended that you do not modify 
-  transOff, but use the above functions. 
-<p>oci8po now obeys ADODB_ASSOC_CASE settings. 
-<p>Added virtualized error codes, using PEAR DB equivalents. Requires you to manually 
-  include adodb-error.inc.php yourself, with MetaError() and MetaErrorMsg($errno). 
-<p>GetRowAssoc for mysql and pgsql were flawed. Fix by Ross Smith. 
-<p>Added to datadict types I1, I2, I4 and I8. Changed datadict type 'T' to map 
-  to timestamp instead of datetime for postgresql. 
-<p>Error handling in ExecuteSQLArray(), adodb-datadict.inc.php did not work. 
-<p>We now auto-quote postgresql connection parameters when building connection 
-  string. 
-<p>Added session expiry notification. 
-<p>We now test with odbc mysql - made some changes to odbc recordset constructor. 
-<p>MetaColumns now special cases access and other databases for odbc. 
-<p><b>3.31 17 March 2003</b></p>
-<p>Added row checking for _fetch in postgres. 
-<p>Added Interval type to MetaType for postgres. 
-<p>Remapped postgres driver to call postgres7 driver internally. 
-<p>Adorecordset_array::getarray() did not return array when nRows >= 0. 
-<p>Postgresql: at times, no error message returned by pg_result_error() but error 
-  message returned in pg_last_error(). Recoded again. 
-<p>Interbase blob's now use chunking for updateblob. 
-<p>Move() did not set EOF correctly. Reported by Jorma T. 
-<p>We properly support mysql timestamp fields when we are creating mysql tables 
-  using the data-dict interface. 
-<p>Table regex includes backticks character now. 
-<p><b>3.30 3 March 2003</b></p>
-<p>Added $ADODB_EXTENSION and $ADODB_COMPAT_FETCH constant. 
-<p>Made blank1stItem configurable using syntax "value:text" in GetMenu/GetMenu2. 
-  Thx to Gabriel Birke. 
-<p>Previously ADOdb differed from the Microsoft standard because it did not define 
-  what to set $this->fields when EOF was reached. Now at EOF, ADOdb sets $this->fields 
-  to false for all databases, which is consist with Microsoft's implementation. 
-  Postgresql and mysql have always worked this way (in 3.11 and earlier). If you 
-  are experiencing compatibility problems (and you are not using postgresql nor 
-  mysql) on upgrading to 3.30, try setting the global variables $ADODB_COUNTRECS 
-  = true (which is the default) and $ADODB_FETCH_COMPAT = true (this is a new 
-  global variable). 
-<p>We now check both pg_result_error and pg_last_error as sometimes pg_result_error 
-  does not display anything. Iman Mayes 
-<p> We no longer check for magic quotes gpc in Quote(). 
-<p> Misc fixes for table creation in adodb-datadict.inc.php. Thx to iamsure. 
-<p> Time calculations use adodb_time library for all negative timestamps due to 
-  problems in Red Hat 7.3 or later. Formerly, only did this for Windows. 
-<p> In mssqlpo, we now check if $sql in _query is a string before we change || 
-  to +. This is to support prepared stmts. 
-<p> Move() and MoveLast() internals changed to support to support EOF and $this->fields 
-  change. 
-<p> Added ADODB_FETCH_BOTH support to mssql. Thx to Angel Fradejas afradejas#mediafusion.es 
-<p> We now check if link resource exists before we run mysql_escape_string in 
-  qstr(). 
-<p> Before we flock in csv code, we check that it is not a http url. 
-<p><b>3.20 17 Feb 2003</b></p>
-<p>Added new Data Dictionary classes for creating tables and indexes. Warning 
-  - this is very much alpha quality code. The API can still change. See adodb/tests/test-datadict.php 
-  for more info. 
-<p>We now ignore $ADODB_COUNTRECS for mysql, because PHP truncates incomplete 
-  recordsets when mysql_unbuffered_query() is called a second time. 
-<p>Now postgresql works correctly when $ADODB_COUNTRECS = false. 
-<p>Changed _adodb_getcount to properly support SELECT DISTINCT. 
-<p>Discovered that $ADODB_COUNTRECS=true has some problems with prepared queries 
-  - suspect PHP bug. 
-<p>Now GetOne and GetRow run in $ADODB_COUNTRECS=false mode for better performance. 
-<p>Added support for mysql_real_escape_string() and pg_escape_string() in qstr(). 
-<p>Added an intermediate variable for mysql _fetch() and MoveNext() to store fields, 
-  to prevent overwriting field array with boolean when mysql_fetch_array() returns 
-  false. 
-<p>Made arrays for getinsertsql and getupdatesql case-insensitive. Suggested by 
-  Tim Uckun" tim#diligence.com 
-<p><b>3.11 11 Feb 2003</b></p>
-<p>Added check for ADODB_NEVER_PERSIST constant in PConnect(). If defined, then 
-  PConnect() will actually call non-persistent Connect(). 
-<p>Modified interbase to properly work with Prepare(). 
-<p>Added $this->ibase_timefmt to allow you to change the date and time format. 
-<p>Added support for $input_array parameter in CacheFlush(). 
-<p>Added experimental support for dbx, which was then removed when i found that 
-  it was slower than using native calls. 
-<p>Added MetaPrimaryKeys for mssql and ibase/firebird. 
-<p>Added new $trim parameter to GetCol and CacheGetCol 
-<p>Uses updated adodb-time.inc.php 0.06. 
-<p><b>3.10 27 Jan 2003</b> 
-<p>Added adodb_date(), adodb_getdate(), adodb_mktime() and adodb-time.inc.php. 
-<p>For interbase, added code to handle unlimited number of bind parameters. From 
-  Daniel Hasan daniel#hasan.cl. 
-<p>Added BlobDecode and UpdateBlob for informix. Thx to Fernando Ortiz. 
-<p>Added constant ADODB_WINDOWS. If defined, means that running on Windows. 
-<p>Added constant ADODB_PHPVER which stores php version as a hex num. Removed 
-  $ADODB_PHPVER variable. 
-<p>Felho Bacsi reported a minor white-space regular expression problem in GetInsertSQL. 
-<p>Modified ADO to use variant to store _affectedRows 
-<p>Changed ibase to use base class Replace(). Modified base class Replace() to 
-  support ibase. 
-<p>Changed odbc to auto-detect when 0 records returned is wrong due to bad odbc 
-  drivers. 
-<p>Changed mssql to use datetimeconvert ini setting only when 4.30 or later (does 
-  not work in 4.23). 
-<p>ExecuteCursor($stmt, $cursorname, $params) now accepts a new $params array 
-  of additional bind parameters -- William Lovaton walovaton#yahoo.com.mx. 
-<p>Added support for sybase_unbuffered_query if ADODB_COUNTRECS == false. Thx 
-  to chuck may. 
-<p>Fixed FetchNextObj() bug. Thx to Jorma Tuomainen. 
-<p>We now use SCOPE_IDENTITY() instead of @@IDENTITY for mssql - thx to marchesini#eside.it 
-<p>Changed postgresql movenext logic to prevent illegal row number from being 
-  passed to pg_fetch_array(). 
-<p>Postgresql initrs bug found by "Bogdan RIPA" bripa#interakt.ro $f1 accidentally 
-  named $f 
-<p><b>3.00 6 Jan 2003</b> 
-<p>Fixed adodb-pear.inc.php syntax error. 
-<p>Improved _adodb_getcount() to use SELECT COUNT(*) FROM ($sql) for languages 
-  that accept it. 
-<p>Fixed _adodb_getcount() caching error. 
-<p>Added sql to retrive table and column info for odbc_mssql. 
-<p><strong>2.91 3 Jan 2003</strong> 
-<p>Revised PHP version checking to use $ADODB_PHPVER with legal values 0x4000, 
-  0x4050, 0x4200, 0x4300. 
-<p>Added support for bytea fields and oid blobs in postgres by allowing BlobDecode() 
-  to detect and convert non-oid fields. Also added BlobEncode to postgres when 
-  you want to encode oid blobs. 
-<p>Added blobEncodeType property for connections to inform phpLens what encoding 
-  method to use for blobs. 
-<p>Added BlobDecode() and BlobEncode() to base ADOConnection class. 
-<p>Added umask() to _gencachename() when creating directories. 
-<p>Added charPage for ado drivers, so you can set the code page. 
-<pre>
-$conn->charPage = CP_UTF8;
-$conn->Connect($dsn);
-</pre>
-<p>Modified _seek in mysql to check for num rows=0. 
-<p>Added to metatypes new informix types for IDS 9.30. Thx Fernando Ortiz. 
-<p>_maxrecordcount returned in CachePageExecute $rsreturn 
-<p>Fixed sybase cacheselectlimit( ) problems 
-<p>MetaColumns() max_length should use precision for types X and C for ms access. 
-  Fixed. 
-<p>Speedup of odbc non-SELECT sql statements. 
-<p>Added support in MetaColumns for Wide Char types for ODBC. We halve max_length 
-  if unicode/wide char. 
-<p>Added 'B' to types handled by GetUpdateSQL/GetInsertSQL. 
-<p>Fixed warning message in oci8 driver with $persist variable when using PConnect. 
-<p><b>2.90 11 Dec 2002</b> 
-<p>Mssql and mssqlpo and oci8po now support ADODB_ASSOC_CASE. 
-<p>Now MetaType() can accept a field object as the first parameter. 
-<p>New $arr = $db->ServerInfo( ) function. Returns $arr['description'] which 
-  is the string description, and $arr['version']. 
-<p>PostgreSQL and MSSQL speedups for insert/updates. 
-<p> Implemented new SetFetchMode() that removes the need to use $ADODB_FETCH_MODE. 
-  Each connection has independant fetchMode. 
-<p>ADODB_ASSOC_CASE now defaults to 2, use native defaults. This is because we 
-  would break backward compat for too many applications otherwise. 
-<p>Patched encrypted sessions to use replace() 
-<p>The qstr function supports quoting of nulls when escape character is \ 
-<p>Rewrote bits and pieces of session code to check for time synch and improve 
-  reliability. 
-<p>Added property ADOConnection::hasTransactions = true/false; 
-<p>Added CreateSequence and DropSequence functions 
-<p>Found misplaced MoveNext() in adodb-postgres.inc.php. Fixed. 
-<p>Sybase SelectLimit not reliable because 'set rowcount' not cached - fixed. 
-<p>Moved ADOConnection to adodb-connection.inc.php and ADORecordSet to adodb-recordset.inc.php. 
-  This allows us to use doxygen to generate documentation. Doxygen doesn't like 
-  the classes in the main adodb.inc.php file for some mysterious reason. 
-<p><b>2.50, 14 Nov 2002</b> 
-<p>Added transOff and transCnt properties for disabling (transOff = true) and 
-  tracking transaction status (transCnt>0). 
-<p>Added inputarray handling into _adodb_pageexecute_all_rows - "Ross Smith" RossSmith#bnw.com. 
-<p>Fixed postgresql inconsistencies in date handling. 
-<p>Added support for mssql_fetch_assoc. 
-<p>Fixed $ADODB_FETCH_MODE bug in odbc MetaTables() and MetaPrimaryKeys(). 
-<p>Accidentally declared UnixDate() twice, making adodb incompatible with php 
-  4.3.0. Fixed. 
-<p>Fixed pager problems with some databases that returned -1 for _currentRow on 
-  MoveLast() by switching to MoveNext() in adodb-lib.inc.php. 
-<p>Also fixed uninited $discard in adodb-lib.inc.php. 
-<p><b>2.43, 25 Oct 2002</b></p>
-Added ADODB_ASSOC_CASE constant to better support ibase and odbc field names. 
-<p>Added support for NConnect() for oracle OCINLogin. 
-<p>Fixed NumCols() bug. 
-<p>Changed session handler to use Replace() on write. 
-<p>Fixed oci8 SelectLimit aggregate function bug again. 
-<p>Rewrote pivoting code. 
-<p><b>2.42, 4 Oct 2002</b></p>
-<p>Fixed ibase_fetch() problem with nulls. Also interbase now does automatic blob 
-  decoding, and is backward compatible. Suggested by Heinz Hombergs heinz#hhombergs.de. 
-<p>Fixed postgresql MoveNext() problems when called repeatedly after EOF. Also 
-  suggested by Heinz Hombergs. 
-<p>PageExecute() does not rewrite queries if SELECT DISTINCT is used. Requested 
-  by hans#velum.net 
-<p>Added additional fixes to oci8 SelectLimit handling with aggregate functions 
-  - thx to Christian Bugge for reporting the problem. 
-<p><b>2.41, 2 Oct 2002</b></p>
-<p>Fixed ADODB_COUNTRECS bug in odbc. Thx to Joshua Zoshi jzoshi#hotmail.com. 
-<p>Increased buffers for adodb-csvlib.inc.php for extremely long sql from 8192 
-  to 32000. 
-<p>Revised pivottable.inc.php code. Added better support for aggregate fields. 
-<p>Fixed mysql text/blob types problem in MetaTypes base class - thx to horacio 
-  degiorgi. 
-<p>Added SQLDate($fmt,$date) function, which allows an sql date format string 
-  to be generated - useful for group by's. 
-<p>Fixed bug in oci8 SelectLimit when offset>100. 
-<p><b>2.40 4 Sept 2002</b></p>
-<p>Added new NLS_DATE_FORMAT property to oci8. Suggested by Laurent NAVARRO ln#altidev.com 
-<p>Now use bind parameters in oci8 selectlimit for better performance. 
-<p>Fixed interbase replaceQuote for dialect != 1. Thx to "BEGUIN Pierre-Henri 
-  - INFOCOB" phb#infocob.com. 
-<p>Added white-space check to QA. 
-<p>Changed unixtimestamp to support fractional seconds (we always round down/floor 
-  the seconds). Thanks to beezly#beezly.org.uk. 
-<p>Now you can set the trigger_error type your own user-defined type in adodb-errorhandler.inc.php. 
-  Suggested by Claudio Bustos clbustos#entelchile.net. 
-<p>Added recordset filters with rsfilter.inc.php. 
-<p>$conn->_rs2rs does not create a new recordset when it detects it is of type 
-  array. Some trickery there as there seems to be a bug in Zend Engine 
-<p>Added render_pagelinks to adodb-pager.inc.php. Code by "Pablo Costa" pablo#cbsp.com.br. 
-<p>MetaType() speedup in adodb.inc.php by using hashing instead of switch. Best 
-  performance if constant arrays are supported, as they are in PHP5. 
-<p>adodb-session.php now updates only the expiry date if the crc32 check indicates 
-  that the data has not been modified. 
-<p><b>2.31 20 Aug 2002</b></p>
-<p>Made changes to pivottable.inc.php due to daniel lucuzaeu's suggestions (we sum the pivottable column if desired).
-<p>Fixed ErrorNo() in postgres so it does not depend on _errorMsg property.
-<p>Robert Tuttle added support for oracle cursors. See ExecuteCursor().
-<p>Fixed Replace() so it works with mysql when updating record where data has not changed. Reported by
-Cal Evans (cal#calevans.com).
-<p><b>2.30 1 Aug 2002</b></p>
-<p>Added pivottable.inc.php. Thanks to daniel.lucazeau#ajornet.com for the original 
-  concept.
-<p>Added ADOConnection::outp($msg,$newline) to output error and debugging messages. Now 
-you can override this using the ADODB_OUTP constant and use your own output handler.
-<p>Changed == to === for 'null' comparison. Reported by ericquil#yahoo.com 
-<p>Fixed mssql SelectLimit( ) bug when distinct used.
-<p><b>2.30 1 Aug 2002</b></p>
-<p>New GetCol() and CacheGetCol() from ross#bnw.com that returns the first field as a 1 dim array.
-<p>We have an empty recordset, but RecordCount() could return -1. Fixed. Reported by  "Jonathan Polansky" jonathan#polansky.com.
-<p>We now check for session variable changes using strlen($sessval).crc32($sessval). 
-Formerly we only used crc32().
-<p>Informix SelectLimit() problem with $ADODB_COUNTRECS fixed.
-<p>Fixed informix SELECT FIRST x DISTINCT, and not SELECT DISTINCT FIRST x - reported by F Riosa
-<p>Now default adodb error handlers ignores error if @ used.
-<p>If you set $conn->autoRollback=true, we auto-rollback persistent connections for odbc, mysql, oci8, mssql. 
-Default for autoRollback is false. No need to do so for postgres. 
-As interbase requires a transaction id (what a flawed api), we don't do it for interbase.
-<p>Changed PageExecute() to use non-greedy preg_match when searching for "FROM" keyword.
-<p><b>2.20 9 July 2002</b></p>
-<p>Added CacheGetOne($secs2cache,$sql), CacheGetRow($secs2cache,$sql), CacheGetAll($secs2cache,$sql).
-<p>Added $conn->OffsetDate($dayFraction,$date=false) to generate sql that calcs 
-  date offsets. Useful for scheduling appointments.
-<p>Added connection properties: leftOuter, rightOuter that hold left and right 
-  outer join operators.
-<p>Added connection property: ansiOuter to indicate whether ansi outer joins supported.
-<p>New driver <i>mssqlpo</i>, the portable mssql driver, which converts string 
-  concat operator from || to +.
-<p>Fixed ms access bug - SelectLimit() did not support ties - fixed.
-<p>Karsten Kraus (Karsten.Kraus#web.de), contributed error-handling code to ADONewConnection. 
-  Unfortunately due to backward compat problems, had to rollback most of the changes.
-<p>Added new parameter to GetAssoc() to allow returning an array of key-value pairs, 
-ignoring any additional columns in the recordset. Off by default.
-<p>Corrected mssql $conn->sysDate to return only date using convert().
-<p>CacheExecute() improved debugging output.
-<p>Changed rs2html() so newlines are converted to BR tags. Also optimized rs2html() based
-on feedback by "Jerry Workman" jerry#mtncad.com.
-<p>Added support for Replace() with Interbase, using DELETE and INSERT.
-<p>Some minor optimizations (mostly removing & references when passing arrays).
-<p>Changed  GenID() to allows id's larger than the size of an integer.
-<p>Added force_session property to oci8 for better updateblob() support.
-<p>Fixed PageExecute() which did not work properly with sql containing GROUP BY.
-<p><b>2.12 12 June 2002</b></p>
-<p>Added toexport.inc.php to export recordsets in CSV and tab-delimited format.
-<p>CachePageExecute() does not work - fixed - thx John Huong.
-<p>Interbase aliases not set properly in FetchField() - fixed. Thx Stefan Goethals.
-<p>Added cache property to adodb pager class. The number of secs to cache recordsets.
-<p>SQL rewriting bug in pageexecute() due to skipping of newlines due to missing /s modifier. Fixed.
-<p>Max size of cached recordset due to a bug was 256000 bytes. Fixed.
-<p>Speedup of 1st invocation of CacheExecute() by tuning code.
-<p>We compare $rewritesql with $sql in pageexecute code in case of rewrite failure.
-<p><b>2.11 7 June 2002</b></p>
-<p>Fixed PageExecute() rewrite sql problem - COUNT(*) and ORDER BY don't go together with
-	mssql, access and postgres. Thx to Alexander Zhukov alex#unipack.ru
-<p>DB2 support for CHARACTER type added - thx John Huong huongch#bigfoot.com
-<p>For ado, $argProvider not properly checked. Fixed - kalimero#ngi.it
-<p>Added $conn->Replace() function for update with automatic insert if the record does not exist. 
-	Supported by all databases except interbase.
-<p><b>2.10 4 June 2002</b></p>
-<p>Added uniqueSort property to indicate mssql ORDER BY cols must be unique.
-<p>Optimized session handler by crc32 the data. We only write if session data has changed.
-<p>adodb_sess_read in adodb-session.php now returns ''correctly - thanks to Jorma Tuomainen, webmaster#wizactive.com
-<p>Mssql driver did not throw EXECUTE errors correctly because ErrorMsg() and ErrorNo() called in wrong order. 
-Pointed out by Alexios Fakos. Fixed.
-<p>Changed ado to use client cursors. This fixes BeginTran() problems with ado.
-<p>Added handling of timestamp type in ado.
-<p>Added to ado_mssql support for insert_id() and affected_rows().
-<p>Added support for mssql.datetimeconvert=0, available since php 4.2.0.
-<p>Made UnixDate() less strict, so that the time is ignored if present.
-<p>Changed quote() so that it checks for magic_quotes_gpc.
-<p>Changed maxblobsize for odbc to default to 64000.
-<p><b>2.00 13 May 2002</b></p>
-<p>Added drivers <i>informix72</i> for pre-7.3 versions, and <i>oci805</i> for 
-  oracle 8.0.5, and postgres64 for postgresql 6.4 and earlier. The postgres and postgres7 drivers
-  are now identical.
-<p>Interbase now partially supports ADODB_FETCH_BOTH, by defaulting to ASSOC mode.
-<p>Proper support for blobs in mssql. Also revised blob support code 
-is base class. Now UpdateBlobFile() calls UpdateBlob() for consistency.
-<p>Added support for changed odbc_fetch_into api in php 4.2.0 
-with $conn->_has_stupid_odbc_fetch_api_change.
-<p>Fixed spelling of tablock locking hint in GenID( ) for mssql. 
-<p>Added RowLock( ) to several databases, including oci8, informix, sybase, etc. 
-  Fixed where error in mssql RowLock().
-<p>Added sysDate and sysTimeStamp properties to most database drivers. These are the sql
-functions/constants for that database that return the current date and current timestamp, and 
-are useful for portable inserts and updates.
-<p>Support for RecordCount() caused date handling in sybase and mssql to break. 
-Fixed, thanks to Toni Tunkkari, by creating derived classes for ADORecordSet_array for
-both databases. Generalized using arrayClass property. Also to support RecordCount(), 
-changed metatype handling for ado drivers. Now the type returned in FetchField 
-  is no longer a number, but the 1-char data type returned by MetaType.
-  At the same time, fixed a lot of date handling. Now mssql support dmy and mdy date formats. 
-Also speedups in sybase and mssql with preg_match and ^ in date/timestamp handling.
-Added support in sybase and mssql for 24 hour clock in timestamps (no AM/PM).
-<p>Extensive revisions to informix driver - thanks to Samuel CARRIERE samuel_carriere#hotmail.com 
-<p>Added $ok parameter to CommitTrans($ok) for easy rollbacks.
-<p>Fixed odbc MetaColumns and MetaTables to save and restore $ADODB_FETCH_MODE.
-<p>Some odbc drivers did not call the base connection class constructor. Fixed.
-<p>Fixed regex for GetUpdateSQL() and GetInsertSQL() to support more legal character combinations.
-
-<p><b>1.99 21 April 2002</b></p>
-<p>Added emulated RecordCount() to all database drivers if $ADODB_COUNTRECS = true 
-  (which it is by default). Inspired by Cristiano Duarte (cunha17#uol.com.br). 
-<p>Unified stored procedure support for mssql and oci8. Parameter() and PrepareSP() 
-  functions implemented. 
-<p>Added support for SELECT FIRST in informix, modified hasTop property to support 
-  this. 
-<p>Changed csv driver to handle updates/deletes/inserts properly (when Execute() returns true).
-Bind params also work now, and raiseErrorFn with csv driver. Added csv driver to QA process. 
-<p>Better error checking in oci8 UpdateBlob() and UpdateBlobFile().
-<p>Added TIME type to MySQL - patch by Manfred h9125297#zechine.wu-wien.ac.at
-<p>Prepare/Execute implemented for Interbase/Firebird 
-<p>Changed some regular expressions to be anchored by /^ $/ for speed.
-<p>Added UnixTimeStamp() and UnixDate() to ADOConnection(). Now these functions 
-  are in both ADOConnection and ADORecordSet classes.
-<p>Empty recordsets were not cached - fixed.
-<p>Thanks to Gaetano Giunta (g.giunta#libero.it) for the oci8 code review. We 
-  didn't agree on everything, but i hoped we agreed to disagree! 
-<p><b>1.90 6 April 2002</b></p>
-<p>Now all database drivers support fetch modes ADODB_FETCH_NUM and ADODB_FETCH_ASSOC, though
-	still not fully tested. Eg. Frontbase, Sybase, Informix.
-<p>NextRecordSet() support for mssql. Contributed by "Sven Axelsson" sven.axelsson#bokochwebb.se
-<p>Added blob support for SQL Anywhere. Contributed by Wade Johnson wade#wadejohnson.de
-<p>Fixed some security loopholes in server.php. Server.php also supports fetch mode.
-<p>Generalized GenID() to support odbc and mssql drivers. Mssql no longer generates GUID's.
-<p>Experimental RowLock($table,$where) for mssql.
-<p>Properly implemented Prepare() in oci8 and ODBC.
-<p>Added Bind() support to oci8 to support Prepare().
-<p>Improved error handler. Catches CacheExecute() and GenID() errors now.
-<p>Now if you are running php from the command line, debugging messages do not output html formating.
-Not 100% complete, but getting there.
-<p><b>1.81 22 March 2002</b></p>
-<p>Restored default $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT for backward compatibility.
-<p>SelectLimit for oci8 improved - Our FIRST_ROWS optimization now does not overwrite existing hint.
-<p>New Sybase SQL Anywhere driver. Contributed by Wade Johnson wade#wadejohnson.de
-<p><b>1.80 15 March 2002</b></p>
-<p>Redesigned directory structure of ADOdb files. Added new driver directory where
-all database drivers reside.
-<p>Changed caching algorithm to create subdirectories. Now we scale better.
-<p>Informix driver now supports insert_id(). Contribution by "Andrea Pinnisi" pinnisi#sysnet.it
-<p>Added experimental ISO date and FetchField support for informix.
-<p>Fixed a quoting bug in Execute() with bind parameters, causing problems with blobs.
-<p>Mssql driver speedup by 10-15%.
-<p>Now in CacheExecute($secs2cache,$sql,...), $secs2cache is optional. If missing, it will
-take the value defined in $connection->cacheSecs (default is 3600 seconds). Note that
-CacheSelectLimit(), the secs2cache is still compulsory - sigh.
-<p>Sybase SQL Anywhere driver (using ODBC) contributed by Wade Johnson wade#wadejohnson.de
-<p><b>1.72 8 March 2002</b></p>
-<p>Added @ when returning Fields() to prevent spurious error - "Michael William Miller" mille562#pilot.msu.edu
-<p>MetaDatabases() for postgres contributed by Phil pamelant#nerim.net
- <p>Mitchell T. Young (mitch#youngfamily.org) contributed informix driver.
- <p>Fixed rs2html() problem. I cannot reproduce, so probably a problem with pre PHP 4.1.0 versions,
-  when supporting new ADODB_FETCH_MODEs.
- <p>Mattia Rossi (mattia#technologist.com) contributed BlobDecode() and UpdateBlobFile() for postgresql
- using the postgres specific pg_lo_import()/pg_lo_open() - i don't use them but hopefully others will
- find this useful. See <a href="http://phplens.com/lens/lensforum/msgs.php?id=1262">this posting</a>
- for an example of usage.
- <p>Added UpdateBlobFile() for uploading files to a database.
- <p>Made UpdateBlob() compatible with oci8po driver.
- <p>Added noNullStrings support to oci8 driver. Oracle changes all ' ' strings to nulls,
-  so you need to set strings to ' ' to prevent the nullifying of strings. $conn->noNullStrings = true;
-  will do this for you automatically. This is useful when you define a char column as NOT NULL.
-  <p>Fixed UnixTimeStamp() bug - wasn't setting minutes and seconds properly. Patch from Agusti Fita i Borrell agusti#anglatecnic.com.
-  <p>Toni Tunkkari added patch for sybase dates. Problem with spaces in day part of date fixed.
- <p><b>1.71 18 Jan 2002</b></p>
- <p>Sequence start id support. Now $conn->Gen_ID('seqname', 50) to start sequence from 50.
- <p>CSV driver fix for selectlimit, from Andreas - akaiser#vocote.de.
-<P>Gam3r spotted that a global variable was undefined in the session handler. 
-<p>Mssql date regex had error. Fixed - reported by Minh Hoang vb_user#yahoo.com.
-<p>DBTimeStamp() and DBDate() now accept iso dates and unix timestamps. This means
-that the PostgreSQL handling of dates in GetInsertSQL() and GetUpdateSQL() can
-be removed. Also if these functions are passed '' or null or false, we return a SQL null.
-<p>GetInsertSQL() and GetUpdateSQL() now accept a new parameter, $magicq to 
-indicate whether quotes should be inserted based on magic quote settings - suggested by
-dj#4ict.com.
-<p>Reformated docs slightly based on suggestions by Chris Small.
- <p><b>1.65 28 Dec 2001</b></p>
- <p>Fixed borland_ibase class naming bug.
- <p>Now instead of using $rs->fields[0] internally, we use reset($rs->fields) so 
- that we are compatible with ADODB_FETCH_ASSOC mode. Reported by Nico S.
- <p>Changed recordset constructor and _initrs() for oci8 so that it returns the field definitions even
- if no rows in the recordset. Reported by Rick Hickerson (rhickers#mv.mv.com).
- <p>Improved support for postgresql in GetInsertSQL and GetUpdateSQL by
-  "mike" mike#partner2partner.com  and "Ryan Bailey" rebel#windriders.com
- <p><b>1.64 20 Dec 2001</b></p>
-<p>Danny Milosavljevic <danny.milo#gmx.net> added some patches for MySQL error handling
-and displaying default values.
-<p>Fixed some ADODB_FETCH_BOTH inconsistencies in odbc and interbase.
-<p>Added more tests to test suite to cover ADODB_FETCH_* and ADODB_ERROR_HANDLER.
-<p>Added firebird (ibase) driver
-<p>Added borland_ibase driver for interbase 6.5
-<p><b>1.63 13 Dec 2001</b></p>
-Absolute to the adodb-lib.inc.php file not set properly. Fixed.<p>
-
-<p><b>1.62 11 Dec 2001</b></p>
-<p>Major speedup of ADOdb for low-end web sites by reducing the php code loading and compiling
-cycle. We conditionally compile not so common functions. 
-Moved csv code to adodb-csvlib.inc.php to reduce adodb.inc.php parsing. This file
-is loaded only when the csv/proxy driver is used, or CacheExecute() is run.
-Also moved PageExecute(), GetSelectSQL() and GetUpdateSQL() core code to adodb-lib.inc.php.
-This reduced the 70K main adodb.inc.php file to 55K, and since at least 20K of the file
-is comments, we have reduced 50K of code in adodb.inc.php to 35K. There
- should be 35% reduction in memory and thus 35% speedup in compiling the php code for the
-main adodb.inc.php file.
-<p>Highly tuned SelectLimit() for oci8 for massive speed improvements on large files. 
-Selecting 20 rows starting from the 20,000th row of a table is now 7 times faster. 
-Thx to Tomas V V Cox.
-<p>Allow . and # in table definitions in GetInsertSQL and GetUpdateSQL.
- See ADODB_TABLE_REGEX constant. Thx to Ari Kuorikoski.
-<p>Added ADODB_PREFETCH_ROWS constant, defaulting to 10. This determines the number
-of records to prefetch in a SELECT statement. Only used by oci8.</p>
-<p>Added high portability Oracle class called oci8po. This uses ? for bind variables, and 
-lower cases column names.</p>
-<p>Now all database drivers support $ADODB_FETCH_MODE, including interbase, ado, and odbc:
-ADODB_FETCH_NUM and ADODB_FETCH_ASSOC. ADODB_FETCH_BOTH is not fully implemented for all 
-database drivers.
-<p><b>1.61 Nov 2001</b></p>
-<p>Added PO_RecordCount() and PO_Insert_ID(). PO stands for portable. Pablo Roca 
-  [pabloroca#mvps.org]</p>
-<p>GenID now returns 0 if not available. Safer is that you should check $conn->hasGenID 
-  for availability.</p>
-<p>M'soft ADO we now correctly close recordset in _close() peterd#telephonetics.co.uk</p>
-<p>MSSQL now supports GenID(). It generates a 16-byte GUID from mssql newid() 
-  function.</p>
-<p>Changed ereg_replace to preg_replace in SelectLimit. This is a fix for mssql. 
-  Ereg doesn't support t or n! Reported by marino Carlos xaplo#postnuke-espanol.org</p>
-<p>Added $recordset->connection. This is the ADOConnection object for the recordset. 
-Works with cached and normal recordsets. Surprisingly, this had no affect on performance!</p>
-<p><b>1.54 15 Nov 2001</b></p>
-Fixed some more bugs in PageExecute().  I am getting sick of bug in this and will have to 
-reconsider my QA here. The main issue is that I don't use PageExecute() and 
-to check whether it is working requires a visual inspection of the html generated currently.
-It is possible to write a test script but it would be quite complicated :(
-<p> More speedups of SelectLimit() for DB2, Oci8, access, vfp, mssql.
-<p>
-
-<p><b>1.53 7 Nov 2001</b></p>
-Added support for ADODB_FETCH_ASSOC for ado and odbc drivers.<p>
-Tuned GetRowAssoc(false) in postgresql and mysql.<p>
-Stephen Van Dyke contributed ADOdb icon, accepted with some minor mods.<p>
-Enabled Affected_Rows() for postgresql<p>
-Speedup for Concat() using implode() - Benjamin Curtis ben_curtis#yahoo.com<p>
-Fixed some more bugs in PageExecute() to prevent infinite loops<p>
-<p><b>1.52 5 Nov 2001</b></p>
-Spelling error in CacheExecute() caused it to fail. $ql should be $sql in line 625!<p>
-Added fixes for parsing [ and ] in GetUpdateSQL().
-<p><b>1.51 5 Nov 2001</b></p>
-<p>Oci8 SelectLimit() speedup by using OCIFetch().
-<p>Oci8 was mistakenly reporting errors when $db->debug = true.
-<p>If a connection failed with ODBC, it was not correctly reported - fixed.
-<p>_connectionID was inited to -1, changed to false.
-<p>Added $rs->FetchRow(), to simplify API, ala PEAR DB
-<p>Added PEAR DB compat mode, which is still faster than PEAR! See adodb-pear.inc.php.
-<p>Removed postgres pconnect debugging statement.
-<p><b>1.50 31 Oct 2001</b></p>
-<p>ADOdbConnection renamed to ADOConnection, and ADOdbFieldObject to ADOFieldObject.
-<p>PageExecute() now checks for empty $rs correctly, and the errors in the docs on this subject have been fixed.
-<p>odbc_error() does not return 6 digit error correctly at times. Implemented workaround.
-<p>Added ADORecordSet_empty class. This will speedup INSERTS/DELETES/UPDATES because the return
-object created is much smaller.
-<p>Added Prepare() to odbc, and oci8 (but doesn't work properly for oci8 still).
-<p>Made pgsql a synonym for postgre7, and changed SELECT LIMIT to use OFFSET for compat with 
-postgres 7.2.
-<p>Revised adodb-cryptsession.php thanks to Ari.
-<p>Set resources to false on _close, to force freeing of resources.
-<p>Added adodb-errorhandler.inc.php, adodb-errorpear.inc.php and raiseErrorFn on Freek's urging.
-<p>GetRowAssoc($toUpper=true): $toUpper added as default.
-<p>Errors when connecting to a database were not captured formerly. Now we do it correctly.
-<p><b>1.40 19 September 2001</b></p>
-<p>PageExecute() to implement page scrolling added. Code and idea by Iván Oliva.</p>
-<p>Some minor postgresql fixes.</p>
-<p>Added sequence support using GenID() for postgresql, oci8, mysql, interbase.</p>
-<p>Added UpdateBlob support for interbase (untested).</p>
-<p>Added encrypted sessions (see adodb-cryptsession.php). By Ari Kuorikoski <kuoriari#finebyte.com></p>
-<p><b>1.31 21 August 2001</b></p>
-<p>Many bug fixes thanks to "GaM3R (Cameron)" <gamr#outworld.cx>. Some session changes due to Gam3r.
-<p>Fixed qstr() to quote  also.
-<p>rs2html() now pretty printed.
-<p>Jonathan Younger jyounger#unilab.com contributed the great idea GetUpdateSQL() and GetInsertSQL() which
-generates SQL to update and insert into a table from a recordset. Modify the recordset fields
-array, then can this function to generate the SQL (the SQL is not executed).
-<p>"Nicola Fankhauser" <nicola.fankhauser#couniq.com> found some bugs in date handling for mssql.</p>
-<p>Added minimal Oracle support for LOBs. Still under development.</p>
-Added $ADODB_FETCH_MODE so you can control whether recordsets return arrays which are
-numeric, associative or both. This is a global variable you set. Currently only MySQL, Oci8, Postgres
-drivers support this.
-<p>PostgreSQL properly closes recordsets now. Reported by several people.
-<p>
-Added UpdateBlob() for Oracle. A hack to make it easier to save blobs.
-<p>
-Oracle timestamps did not display properly. Fixed.
-<p><b>1.20 6 June 2001</b></p>
-<p>Now Oracle can connect using tnsnames.ora or server and service name</p>
-<p>Extensive Oci8 speed optimizations. 
-Oci8 code revised to support variable binding, and /*+ FIRST_ROWS */ hint.</p>
-<p>Worked around some 4.0.6 bugs in odbc_fetch_into().</p>
-<p>Paolo S. Asioli paolo.asioli#libero.it suggested GetRowAssoc().</p>
-<p>Escape quotes for oracle wrongly set to '. Now '' is used.</p>
-<p>Variable binding now works in ODBC also.</p>
-<p>Jumped to version 1.20 because I don't like 13 :-)</p>
-<p><b>1.12 6 June 2001</b></p>
-<p>Changed $ADODB_DIR to ADODB_DIR constant to plug a security loophole.</p>
-<p>Changed _close() to close persistent connections also. Prevents connection leaks.</p>
-<p>Major revision of oracle and oci8 drivers. 
-Added OCI_RETURN_NULLS and OCI_RETURN_LOBS to OCIFetchInto(). BLOB, CLOB and VARCHAR2 recognition
-in MetaType() improved. MetaColumns() returns columns in correct sort order.</p>
-<p>Interbase timestamp input format was wrong. Fixed.</p>
-<p><b>1.11 20 May 2001</b></p>
-<p>Improved file locking for Windows.</p>
-<p>Probabilistic flushing of cache to avoid avalanche updates when cache timeouts.</p>
-<p>Cached recordset timestamp not saved in some scenarios. Fixed.</p>
-<p><b>1.10 19 May 2001</b></p>
-<p>Added caching. CacheExecute() and CacheSelectLimit().
-<p>Added csv driver. See <a href="http://php.weblogs.com/adodb_csv">http://php.weblogs.com/ADODB_csv</a>. 
-<p>Fixed SelectLimit(), SELECT TOP not working under certain circumstances.
-<p>Added better Frontbase support of MetaTypes() by Frank M. Kromann.
-<p><b>1.01 24 April 2001</b></p>
-<p>Fixed SelectLimit bug.  not quoted properly.
-<p>SelectLimit: SELECT TOP -1 * FROM TABLE not support by Microsoft. Fixed.</p>
-<p>GetMenu improved by glen.davies#cce.ac.nz to support multiple hilited items<p>
-<p>FetchNextObject() did not work with only 1 record returned. Fixed bug reported by $tim#orotech.net</p>
-<p>Fixed mysql field max_length problem. Fix suggested by Jim Nicholson (jnich#att.com)</p>
-<p><b>1.00 16 April 2001</b></p>
-<p>Given some brilliant suggestions on how to simplify ADOdb by akul. You no longer need to
-setup $ADODB_DIR yourself, and ADOLoadCode() is automatically called by ADONewConnection(), 
-simplifying the startup code.</p>
-<p>FetchNextObject() added. Suggested by Jakub Marecek. This makes FetchObject() obsolete, as
-this is more flexible and powerful.</p>
-<p>Misc fixes to SelectLimit() to support Access (top must follow distinct) and Fields() 
-in the array recordset. From Reinhard Balling.</p>
-<p><b>0.96 27 Mar 2001</b></p>
-<p>ADOConnection Close() did not return a value correctly. Thanks to akul#otamedia.com.</p>
-<p>When the horrible magic_quotes is enabled, back-slash () is changed to double-backslash (\).
-This doesn't make sense for Microsoft/Sybase databases. We fix this in qstr().</p>
-<p>Fixed Sybase date problem in UnixDate() thanks to Toni Tunkkari. Also fixed MSSQL problem
-in UnixDate() - thanks to milhouse31#hotmail.com.</p>
-<p>MoveNext() moved to leaf classes for speed in MySQL/PostgreSQL. 10-15% speedup.</p>
-<p>Added null handling in bindInputArray in Execute() -- Ron Baldwin suggestion.</p>
-<p>Fixed some option tags. Thanks to john#jrmstudios.com.</p>
-<p><b>0.95 13 Mar 2001</b></p>
-<p>Added postgres7 database driver which supports LIMIT and other version 7 stuff in the future.</p>
-<p>Added SelectLimit to ADOConnection to simulate PostgreSQL's "select * from table limit 10 offset 3".
-Added helper function GetArrayLimit() to ADORecordSet.</p>
-<p>Fixed mysql metacolumns bug. Thanks to Freek Dijkstra (phpeverywhere#macfreek.com).</p>
-<p>Also many PostgreSQL changes by Freek. He almost rewrote the whole PostgreSQL driver!</p>
-<p>Added fix to input parameters in Execute for non-strings by Ron Baldwin.</p>
-<p>Added new metatype, X for TeXt. Formerly, metatype B for Blob also included
-text fields. Now 'B' is for binary/image data. 'X' for textual data.</p>
-<p>Fixed $this->GetArray() in GetRows().</p>
-<p>Oracle and OCI8: 1st parameter is always blank -- now warns if it is filled.</p>
-<p>Now <i>hasLimit</i> and <i>hasTop</i> added to indicate whether 
-SELECT * FROM TABLE LIMIT 10 or SELECT TOP 10 * FROM TABLE are supported.</p>
-<p><b>0.94 04 Feb 2001</b></p>
-<p>Added ADORecordSet::GetRows() for compatibility with Microsoft ADO. Synonym for GetArray().</p>
-<p>Added new metatype 'R' to represent autoincrement numbers.</p>
-<p>Added ADORecordSet.FetchObject() to return a row as an object.</p>
-<p>Finally got a Linux box to test PostgreSql. Many fixes.</p>
-<p>Fixed copyright misspellings in 0.93.</p>
-<p>Fixed mssql MetaColumns type bug.</p>
-<p>Worked around odbc bug in PHP4 for sessions.</p>
-<p>Fixed many documentation bugs (affected_rows, metadatabases, qstr).</p>
-<p>Fixed MySQL timestamp format (removed comma).</p>
-<p>Interbase driver did not call ibase_pconnect(). Fixed.</p>
-<p><b>0.93 18 Jan 2002</b></p>
-<p>Fixed GetMenu bug.</p>
-<p>Simplified Interbase commit and rollback.</p>
-<p>Default behaviour on closing a connection is now to rollback all active transactions.</p>
-<p>Added field object handling for array recordset for future XML compatibility.</p>
-<p>Added arr2html() to convert array to html table.</p>
-<p><b>0.92 2 Jan 2002</b></p>
-<p>Interbase Commit and Rollback should be working again.</p>
-<p>Changed initialisation of ADORecordSet. This is internal and should not affect users. We
-are doing this to support cached recordsets in the future.</p>
-
-<p>Implemented ADORecordSet_array class. This allows you to simulate a database recordset
-with an array.</p>
-<p>Added UnixDate() and UnixTimeStamp() to ADORecordSet.</p>
-<p><b>0.91 21 Dec 2000</b></p>
-<p>Fixed ODBC so ErrorMsg() is working.</p>
-<p>Worked around ADO unrecognised null (0x1) value problem in COM.</p>
-<p>Added Sybase support for FetchField() type</p>
-<p>Removed debugging code and unneeded html from various files</p>
-<p>Changed to javadoc style comments to adodb.inc.php.</p>
-<p>Added maxsql as synonym for mysqlt</p>
-<p>Now ODBC downloads first 8K of blob by default
-<p><b>0.90 15 Nov 2000</b></p>
-<p>Lots of testing of Microsoft ADO. Should be more stable now.</p>
-<p>Added $ADODB_COUNTREC. Set to false for high speed selects.</p>
-<p>Added Sybase support. Contributed by Toni Tunkkari (toni.tunkkari#finebyte.com). Bug in Sybase 
-  API: GetFields is unable to determine date types.</p>
-<p>Changed behaviour of RecordSet.GetMenu() to support size parameter (listbox) properly.</p>
-<p>Added emptyDate and emptyTimeStamp to RecordSet class that defines how to represent 
-  empty dates.</p>
-<p>Added MetaColumns($table) that returns an array of ADOFieldObject's listing 
-  the columns of a table.</p>
-<p>Added transaction support for PostgresSQL -- thanks to "Eric G. Werk" egw#netguide.dk.</p>
-<p>Added adodb-session.php for session support.</p>
-<p><b>0.80 30 Nov 2000</b></p>
-<p>Added support for charSet for interbase. Implemented MetaTables for most databases. 
-  PostgreSQL more extensively tested.</p>
-<p><b>0.71 22 Nov 2000</b></p>
-<p>Switched from using require_once to include/include_once for backward compatability with PHP 4.02 and earlier.</p>
-<p><b>0.70 15 Nov 2000</b></p>
-<p>Calls by reference have been removed (call_time_pass_reference=Off) to ensure compatibility with future versions of PHP, 
-except in Oracle 7 driver due to a bug in php_oracle.dll.</p>
-<p>PostgreSQL database driver contributed by Alberto Cerezal (acerezalp#dbnet.es). 
-</p>
-<p>Oci8 driver for Oracle 8 contributed by George Fourlanos (fou#infomap.gr).</p>
-<p>Added <i>mysqlt</i> database driver to support MySQL 3.23 which has transaction 
- support. </p>
-<p>Oracle default date format (DD-MON-YY) did not match ADOdb default date format (which is YYYY-MM-DD). Use ALTER SESSION to force the default date.</p>
-<p>Error message checking is now included in test suite.</p>
-<p>MoveNext() did not check EOF properly -- fixed.</p>
-<p><b>0.60 Nov 8 2000</b></p>
-<p>Fixed some constructor bugs in ODBC and ADO. Added ErrorNo function to ADOConnection 
- class. </p>
-<p><b>0.51 Oct 18 2000</b></p>
-<p>Fixed some interbase bugs.</p>
-<p><b>0.50 Oct 16 2000</b></p>
-<p>Interbase commit/rollback changed to be compatible with PHP 4.03. </p>
-<p>CommitTrans( ) will now return true if transactions not supported. </p>
-<p>Conversely RollbackTrans( ) will return false if transactions not supported. 
-</p>
-<p><b>0.46 Oct 12</b></p>
-Many Oracle compatibility issues fixed. 
-<p><b>0.40 Sept 26</b></p>
-<p>Many bug fixes</p>
-<p>Now Code for BeginTrans, CommitTrans and RollbackTrans is working. So is the Affected_Rows
-and Insert_ID. Added above functions to test.php.</p>
-<p>ADO type handling was busted in 0.30. Fixed.</p>
-<p>Generalised Move( ) so it works will all databases, including ODBC.</p>
-<p><b>0.30 Sept 18</b></p>
-<p>Renamed ADOLoadDB to ADOLoadCode. This is clearer.</p>
-<p>Added BeginTrans, CommitTrans and RollbackTrans functions.</p>
-<p>Added Affected_Rows() and Insert_ID(), _affectedrows() and _insertID(), ListTables(), 
- ListDatabases(), ListColumns().</p>
-<p>Need to add New_ID() and hasInsertID and hasAffectedRows, autoCommit </p>
-<p><b>0.20 Sept 12</b></p>
-<p>Added support for Microsoft's ADO.</p>
-<p>Added new field to ADORecordSet -- canSeek</p>
-<p>Added new parameter to _fetch($ignore_fields = false). Setting to true will 
- not update fields array for faster performance.</p>
-<p>Added new field to ADORecordSet/ADOConnection -- dataProvider to indicate whether 
- a class is derived from odbc or ado.</p>
-<p>Changed class ODBCFieldObject to ADOFieldObject -- not documented currently.</p>
-<p>Added benchmark.php and testdatabases.inc.php to the test suite.</p>
-<p>Added to ADORecordSet FastForward( ) for future high speed scrolling. Not documented.</p>
-<p>Realised that ADO's Move( ) uses relative positioning. ADOdb uses absolute. 
-</p>
-<p><b>0.10 Sept 9 2000</b></p>
-<p>First release</p>
+<html><title>Old Changelog: ADOdb</title><body>
+<h3>Old Changelog</h3>
+
+</p><p><b>3.92 22 Sept 2003</b>
+</p><p>Added GetAssoc and CacheGetAssoc to connection object.
+</p><p>Removed TextMax and CharMax functions from adodb.inc.php.
+</p><p>HasFailedTrans() returned false when trans failed. Fixed.
+</p><p>Moved perf driver classes into adodb/perf/*.php.
+</p><p>Misc improvements to performance monitoring, including UI().
+</p><p>RETVAL in mssql Parameter(), we do not append @ now.
+</p><p>Added Param($name) to connection class, returns '?' or ":$name", for defining
+  bind parameters portably.
+</p><p>LogSQL traps affected_rows() and saves its value properly now. Also fixed oci8
+  _stmt and _affectedrows() bugs.
+</p><p>Session code timestamp check for oci8 works now. Formerly default NLS_DATE_FORMAT
+  stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). Also
+  added new $conn->datetime field to oci8, controls whether MetaType() returns
+  'D' ($this->datetime==false) or 'T' ($this->datetime == true) for DATE type.
+</p><p>Fixed bugs in adodb-cryptsession.inc.php and adodb-session-clob.inc.php.
+</p><p>Fixed misc bugs in adodb_key_exists, GetInsertSQL() and GetUpdateSQL().
+</p><p>Tuned include_once handling to reduce file-system checking overhead.
+</p><p><b>3.91 9 Sept 2003</b>
+</p><p>Only released to InterAkt
+</p><p>Added LogSQL() for sql logging and $ADODB_NEWCONNECTION to override factory
+  for driver instantiation.
+</p><p>Added IfNull($field,$ifNull) function, thx to johnwilk#juno.com
+</p><p>Added portable substr support.
+</p><p>Now rs2html() has new parameter, $echo. Set to false to return $html instead
+  of echoing it.
+</p><p><b>3.90 5 Sept 2003</b>
+</p><p>First beta of performance monitoring released.
+</p><p>MySQL supports MetaTable() masking.
+</p><p>Fixed key_exists() bug in adodb-lib.inc.php
+</p><p>Added sp_executesql Prepare() support to mssql.
+</p><p>Added bind support to db2.
+</p><p>Added swedish language file - Christian Tiberg" christian#commsoft.nu
+</p><p>Bug in drop index for mssql data dict fixed. Thx to Gert-Rainer Bitterlich.
+</p><p>Left join setting for oci8 was wrong. Thx to johnwilk#juno.com
+</p><p><b>3.80 27 Aug 2003</b>
+</p><p>Patch for PHP 4.3.3 cached recordset csv2rs() fread loop incompatibility.
+</p><p>Added matching mask for MetaTables. Only for oci8, mssql and postgres currently.
+</p><p>Rewrite of "oracle" driver connection code, merging with "oci8", by Gaetano.
+</p><p>Added better debugging for Smart Transactions.
+</p><p>Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to TO_TIMESTAMP.
+</p><p>ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to define
+  it after including adodb.inc.php.
+</p><p>Added portugese (brazilian) to languages. Thx to "Levi Fukumori".
+</p><p>Removed arg3 parameter from Execute/SelectLimit/Cache* functions.
+</p><p>Execute() now accepts 2-d array as $inputarray. Also changed docs of fnExecute()
+  to note change in sql query counting with 2-d arrays.
+</p><p>Added MONEY to MetaType in PostgreSQL.
+</p><p>Added more debugging output to CacheFlush().
+</p><p><b>3.72 9 Aug 2003</b>
+</p><p>Added qmagic($str), which is a qstr($str) that auto-checks for magic quotes
+  and does the right thing...
+</p><p>Fixed CacheFlush() bug - Thx to martin#gmx.de
+</p><p>Walt Boring contributed MetaForeignKeys for postgres7.
+</p><p>_fetch() called _BlobDecode() wrongly in interbase. Fixed.
+</p><p>adodb_time bug fixed with dates after 2038 fixed by Jason Pell. http://phplens.com/lens/lensforum/msgs.php?id=6980
+</p><p><b>3.71 4 Aug 2003</b>
+</p><p>The oci8 driver, MetaPrimaryKeys() did not check the owner correctly when $owner
+  == false.
+</p><p>Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
+</p><p>Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com.
+</p><p>Error handling in oci8 bugfix - if there was an error in Execute(), then when
+  calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but
+  the 2nd call would return no error.
+</p><p>Error handling in odbc bugfix. ODBC would always return the last error, even
+  if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to
+  0 everytime before CacheExecute() and Execute().
+</p><p><b>3.70 29 July 2003</b>
+</p><p>Added new SQLite driver. Tested on PHP 4.3 and PHP 5.
+</p><p>Added limited "sapdb" driver support - mainly date support.
+</p><p>The oci8 driver did not identify NUMBER with no defined precision correctly.
+</p><p>Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL nulls
+  in GetInsertSQL/GetUpdateSQL.
+</p><p>DBDate() and DBTimeStamp() format for postgresql had problems. Fixed.
+</p><p>Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit.
+</p><p>Added charset support to postgresql. Thx to Julian Tarkhanov.
+</p><p>Changed OS check for MS-Windows to prevent confusion with darWIN (MacOS)
+</p><p>Timestamp format for db2 was wrong. Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn.
+</p><p>adodb-cryptsession.php includes wrong. Fixed.
+</p><p>Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8.
+</p><p>Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring.
+</p><p>adodb_getcount() did not init qryRecs to 0. Missing "WHERE" clause checking
+  in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn.
+</p><p>Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt Boring.
+</p><p>Upgraded to adodb-xmlschema.inc.php 0.0.2.
+</p><p>NConnect for mysql now returns value. Thx to Dennis Verspuij.
+</p><p>ADODB_FETCH_BOTH support added to interbase/firebird.
+</p><p>Czech language file contributed by Kamil Jakubovic jake#host.sk.
+</p><p>PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj Chlebec.
+</p><p>Added some new initialization stuff for Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it
+</p><p>ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed.
+</p><p><b>3.60 16 June 2003</b>
+</p><p>We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be compat with
+  mssql driver.
+</p><p>The property $emptyDate missing from connection class. Also changed 1903 to
+  constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn.
+</p><p>ADOdb speedup optimization - we now return all arrays by reference.
+</p><p>Now DBDate() and DBTimeStamp() now accepts the string 'null' as a parameter.
+  Suggested by vincent.
+</p><p>Added GetArray() to connection class.
+</p><p>Added not_null check in informix metacolumns().
+</p><p>Connection parameters for postgresql did not work correctly when port was defined.
+</p><p>DB2 is now a tested driver, making adodb 100% compatible. Extensive changes
+  to odbc driver for DB2, including implementing serverinfo() and SQLDate(), switching
+  to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and SelectLimit()
+  fixes.
+</p><p>The odbc driver's FetchField() field names did not obey ADODB_ASSOC_CASE. Fixed.
+</p><p>Some bugs in adodb_backtrace() fixed.
+</p><p>Added "INT IDENTITY" type to adorecordset::MetaType() to support odbc_mssql
+  properly.
+</p><p>MetaColumns() for oci8, mssql, odbc revised to support scale. Also minor revisions
+  to odbc MetaColumns() for vfp and db2 compat.
+</p><p>Added unsigned support to mysql datadict class. Thx to iamsure.
+</p><p>Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. Thx to
+  Josh R, Night_Wulfe#hotmail.com.
+</p><p>ChangeTableSQL contributed by Florian Buzin.
+</p><p>The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat with
+  mssql driver.
+</p>
+
+<p><b>3.50 19 May 2003</b></p>
+<p>Fixed mssql compat with FreeTDS. FreeTDS does not implement mssql_fetch_assoc().
+<p>Merged back connection and recordset code into adodb.inc.php.
+<p>ADOdb sessions using oracle clobs contributed by achim.gosse#ddd.de. See adodb-session-clob.php.
+<p>Added /s modifier to preg_match everywhere, which ensures that regex does not
+  stop at /n. Thx Pao-Hsi Huang.
+<p>Fixed error in metacolumns() for mssql.
+<p>Added time format support for SQLDate.
+<p>Image => B added to metatype.
+<p>MetaType now checks empty($this->blobSize) instead of empty($this).
+<p>Datadict has beta support for informix, sybase (mapped to mssql), db2 and generic
+  (which is a fudge).
+<p>BlobEncode for postgresql uses pg_escape_bytea, if available. Needed for compat
+  with 7.3.
+<p>Added $ADODB_LANG, to support multiple languages in MetaErrorMsg().
+<p>Datadict can now parse table definition as declarative text.
+<p>For DataDict, oci8 autoincrement trigger missing semi-colon. Fixed.
+<p>For DataDict, when REPLACE flag enabled, drop sequence in datadict for autoincrement
+  field in postgres and oci8.s
+<p>Postgresql defaults to template1 database if no database defined in connect/pconnect.
+<p>We now clear _resultid in postgresql if query fails.
+<p><b>3.40 19 May 2003</b></p>
+<p>Added insert_id for odbc_mssql.
+<p>Modified postgresql UpdateBlobFile() because it did not work in safe mode.
+<p>Now connection object is passed to raiseErrorFn as last parameter. Needed by
+  StartTrans().
+<p>Added StartTrans() and CompleteTrans(). It is recommended that you do not modify
+  transOff, but use the above functions.
+<p>oci8po now obeys ADODB_ASSOC_CASE settings.
+<p>Added virtualized error codes, using PEAR DB equivalents. Requires you to manually
+  include adodb-error.inc.php yourself, with MetaError() and MetaErrorMsg($errno).
+<p>GetRowAssoc for mysql and pgsql were flawed. Fix by Ross Smith.
+<p>Added to datadict types I1, I2, I4 and I8. Changed datadict type 'T' to map
+  to timestamp instead of datetime for postgresql.
+<p>Error handling in ExecuteSQLArray(), adodb-datadict.inc.php did not work.
+<p>We now auto-quote postgresql connection parameters when building connection
+  string.
+<p>Added session expiry notification.
+<p>We now test with odbc mysql - made some changes to odbc recordset constructor.
+<p>MetaColumns now special cases access and other databases for odbc.
+<p><b>3.31 17 March 2003</b></p>
+<p>Added row checking for _fetch in postgres.
+<p>Added Interval type to MetaType for postgres.
+<p>Remapped postgres driver to call postgres7 driver internally.
+<p>Adorecordset_array::getarray() did not return array when nRows >= 0.
+<p>Postgresql: at times, no error message returned by pg_result_error() but error
+  message returned in pg_last_error(). Recoded again.
+<p>Interbase blob's now use chunking for updateblob.
+<p>Move() did not set EOF correctly. Reported by Jorma T.
+<p>We properly support mysql timestamp fields when we are creating mysql tables
+  using the data-dict interface.
+<p>Table regex includes backticks character now.
+<p><b>3.30 3 March 2003</b></p>
+<p>Added $ADODB_EXTENSION and $ADODB_COMPAT_FETCH constant.
+<p>Made blank1stItem configurable using syntax "value:text" in GetMenu/GetMenu2.
+  Thx to Gabriel Birke.
+<p>Previously ADOdb differed from the Microsoft standard because it did not define
+  what to set $this->fields when EOF was reached. Now at EOF, ADOdb sets $this->fields
+  to false for all databases, which is consist with Microsoft's implementation.
+  Postgresql and mysql have always worked this way (in 3.11 and earlier). If you
+  are experiencing compatibility problems (and you are not using postgresql nor
+  mysql) on upgrading to 3.30, try setting the global variables $ADODB_COUNTRECS
+  = true (which is the default) and $ADODB_FETCH_COMPAT = true (this is a new
+  global variable).
+<p>We now check both pg_result_error and pg_last_error as sometimes pg_result_error
+  does not display anything. Iman Mayes
+<p> We no longer check for magic quotes gpc in Quote().
+<p> Misc fixes for table creation in adodb-datadict.inc.php. Thx to iamsure.
+<p> Time calculations use adodb_time library for all negative timestamps due to
+  problems in Red Hat 7.3 or later. Formerly, only did this for Windows.
+<p> In mssqlpo, we now check if $sql in _query is a string before we change ||
+  to +. This is to support prepared stmts.
+<p> Move() and MoveLast() internals changed to support to support EOF and $this->fields
+  change.
+<p> Added ADODB_FETCH_BOTH support to mssql. Thx to Angel Fradejas afradejas#mediafusion.es
+<p> We now check if link resource exists before we run mysql_escape_string in
+  qstr().
+<p> Before we flock in csv code, we check that it is not a http url.
+<p><b>3.20 17 Feb 2003</b></p>
+<p>Added new Data Dictionary classes for creating tables and indexes. Warning
+  - this is very much alpha quality code. The API can still change. See adodb/tests/test-datadict.php
+  for more info.
+<p>We now ignore $ADODB_COUNTRECS for mysql, because PHP truncates incomplete
+  recordsets when mysql_unbuffered_query() is called a second time.
+<p>Now postgresql works correctly when $ADODB_COUNTRECS = false.
+<p>Changed _adodb_getcount to properly support SELECT DISTINCT.
+<p>Discovered that $ADODB_COUNTRECS=true has some problems with prepared queries
+  - suspect PHP bug.
+<p>Now GetOne and GetRow run in $ADODB_COUNTRECS=false mode for better performance.
+<p>Added support for mysql_real_escape_string() and pg_escape_string() in qstr().
+<p>Added an intermediate variable for mysql _fetch() and MoveNext() to store fields,
+  to prevent overwriting field array with boolean when mysql_fetch_array() returns
+  false.
+<p>Made arrays for getinsertsql and getupdatesql case-insensitive. Suggested by
+  Tim Uckun" tim#diligence.com
+<p><b>3.11 11 Feb 2003</b></p>
+<p>Added check for ADODB_NEVER_PERSIST constant in PConnect(). If defined, then
+  PConnect() will actually call non-persistent Connect().
+<p>Modified interbase to properly work with Prepare().
+<p>Added $this->ibase_timefmt to allow you to change the date and time format.
+<p>Added support for $input_array parameter in CacheFlush().
+<p>Added experimental support for dbx, which was then removed when i found that
+  it was slower than using native calls.
+<p>Added MetaPrimaryKeys for mssql and ibase/firebird.
+<p>Added new $trim parameter to GetCol and CacheGetCol
+<p>Uses updated adodb-time.inc.php 0.06.
+<p><b>3.10 27 Jan 2003</b>
+<p>Added adodb_date(), adodb_getdate(), adodb_mktime() and adodb-time.inc.php.
+<p>For interbase, added code to handle unlimited number of bind parameters. From
+  Daniel Hasan daniel#hasan.cl.
+<p>Added BlobDecode and UpdateBlob for informix. Thx to Fernando Ortiz.
+<p>Added constant ADODB_WINDOWS. If defined, means that running on Windows.
+<p>Added constant ADODB_PHPVER which stores php version as a hex num. Removed
+  $ADODB_PHPVER variable.
+<p>Felho Bacsi reported a minor white-space regular expression problem in GetInsertSQL.
+<p>Modified ADO to use variant to store _affectedRows
+<p>Changed ibase to use base class Replace(). Modified base class Replace() to
+  support ibase.
+<p>Changed odbc to auto-detect when 0 records returned is wrong due to bad odbc
+  drivers.
+<p>Changed mssql to use datetimeconvert ini setting only when 4.30 or later (does
+  not work in 4.23).
+<p>ExecuteCursor($stmt, $cursorname, $params) now accepts a new $params array
+  of additional bind parameters -- William Lovaton walovaton#yahoo.com.mx.
+<p>Added support for sybase_unbuffered_query if ADODB_COUNTRECS == false. Thx
+  to chuck may.
+<p>Fixed FetchNextObj() bug. Thx to Jorma Tuomainen.
+<p>We now use SCOPE_IDENTITY() instead of @@IDENTITY for mssql - thx to marchesini#eside.it
+<p>Changed postgresql movenext logic to prevent illegal row number from being
+  passed to pg_fetch_array().
+<p>Postgresql initrs bug found by "Bogdan RIPA" bripa#interakt.ro $f1 accidentally
+  named $f
+<p><b>3.00 6 Jan 2003</b>
+<p>Fixed adodb-pear.inc.php syntax error.
+<p>Improved _adodb_getcount() to use SELECT COUNT(*) FROM ($sql) for languages
+  that accept it.
+<p>Fixed _adodb_getcount() caching error.
+<p>Added sql to retrive table and column info for odbc_mssql.
+<p><strong>2.91 3 Jan 2003</strong>
+<p>Revised PHP version checking to use $ADODB_PHPVER with legal values 0x4000,
+  0x4050, 0x4200, 0x4300.
+<p>Added support for bytea fields and oid blobs in postgres by allowing BlobDecode()
+  to detect and convert non-oid fields. Also added BlobEncode to postgres when
+  you want to encode oid blobs.
+<p>Added blobEncodeType property for connections to inform phpLens what encoding
+  method to use for blobs.
+<p>Added BlobDecode() and BlobEncode() to base ADOConnection class.
+<p>Added umask() to _gencachename() when creating directories.
+<p>Added charPage for ado drivers, so you can set the code page.
+<pre>
+$conn->charPage = CP_UTF8;
+$conn->Connect($dsn);
+</pre>
+<p>Modified _seek in mysql to check for num rows=0.
+<p>Added to metatypes new informix types for IDS 9.30. Thx Fernando Ortiz.
+<p>_maxrecordcount returned in CachePageExecute $rsreturn
+<p>Fixed sybase cacheselectlimit( ) problems
+<p>MetaColumns() max_length should use precision for types X and C for ms access.
+  Fixed.
+<p>Speedup of odbc non-SELECT sql statements.
+<p>Added support in MetaColumns for Wide Char types for ODBC. We halve max_length
+  if unicode/wide char.
+<p>Added 'B' to types handled by GetUpdateSQL/GetInsertSQL.
+<p>Fixed warning message in oci8 driver with $persist variable when using PConnect.
+<p><b>2.90 11 Dec 2002</b>
+<p>Mssql and mssqlpo and oci8po now support ADODB_ASSOC_CASE.
+<p>Now MetaType() can accept a field object as the first parameter.
+<p>New $arr = $db->ServerInfo( ) function. Returns $arr['description'] which
+  is the string description, and $arr['version'].
+<p>PostgreSQL and MSSQL speedups for insert/updates.
+<p> Implemented new SetFetchMode() that removes the need to use $ADODB_FETCH_MODE.
+  Each connection has independant fetchMode.
+<p>ADODB_ASSOC_CASE now defaults to 2, use native defaults. This is because we
+  would break backward compat for too many applications otherwise.
+<p>Patched encrypted sessions to use replace()
+<p>The qstr function supports quoting of nulls when escape character is \
+<p>Rewrote bits and pieces of session code to check for time synch and improve
+  reliability.
+<p>Added property ADOConnection::hasTransactions = true/false;
+<p>Added CreateSequence and DropSequence functions
+<p>Found misplaced MoveNext() in adodb-postgres.inc.php. Fixed.
+<p>Sybase SelectLimit not reliable because 'set rowcount' not cached - fixed.
+<p>Moved ADOConnection to adodb-connection.inc.php and ADORecordSet to adodb-recordset.inc.php.
+  This allows us to use doxygen to generate documentation. Doxygen doesn't like
+  the classes in the main adodb.inc.php file for some mysterious reason.
+<p><b>2.50, 14 Nov 2002</b>
+<p>Added transOff and transCnt properties for disabling (transOff = true) and
+  tracking transaction status (transCnt>0).
+<p>Added inputarray handling into _adodb_pageexecute_all_rows - "Ross Smith" RossSmith#bnw.com.
+<p>Fixed postgresql inconsistencies in date handling.
+<p>Added support for mssql_fetch_assoc.
+<p>Fixed $ADODB_FETCH_MODE bug in odbc MetaTables() and MetaPrimaryKeys().
+<p>Accidentally declared UnixDate() twice, making adodb incompatible with php
+  4.3.0. Fixed.
+<p>Fixed pager problems with some databases that returned -1 for _currentRow on
+  MoveLast() by switching to MoveNext() in adodb-lib.inc.php.
+<p>Also fixed uninited $discard in adodb-lib.inc.php.
+<p><b>2.43, 25 Oct 2002</b></p>
+Added ADODB_ASSOC_CASE constant to better support ibase and odbc field names.
+<p>Added support for NConnect() for oracle OCINLogin.
+<p>Fixed NumCols() bug.
+<p>Changed session handler to use Replace() on write.
+<p>Fixed oci8 SelectLimit aggregate function bug again.
+<p>Rewrote pivoting code.
+<p><b>2.42, 4 Oct 2002</b></p>
+<p>Fixed ibase_fetch() problem with nulls. Also interbase now does automatic blob
+  decoding, and is backward compatible. Suggested by Heinz Hombergs heinz#hhombergs.de.
+<p>Fixed postgresql MoveNext() problems when called repeatedly after EOF. Also
+  suggested by Heinz Hombergs.
+<p>PageExecute() does not rewrite queries if SELECT DISTINCT is used. Requested
+  by hans#velum.net
+<p>Added additional fixes to oci8 SelectLimit handling with aggregate functions
+  - thx to Christian Bugge for reporting the problem.
+<p><b>2.41, 2 Oct 2002</b></p>
+<p>Fixed ADODB_COUNTRECS bug in odbc. Thx to Joshua Zoshi jzoshi#hotmail.com.
+<p>Increased buffers for adodb-csvlib.inc.php for extremely long sql from 8192
+  to 32000.
+<p>Revised pivottable.inc.php code. Added better support for aggregate fields.
+<p>Fixed mysql text/blob types problem in MetaTypes base class - thx to horacio
+  degiorgi.
+<p>Added SQLDate($fmt,$date) function, which allows an sql date format string
+  to be generated - useful for group by's.
+<p>Fixed bug in oci8 SelectLimit when offset>100.
+<p><b>2.40 4 Sept 2002</b></p>
+<p>Added new NLS_DATE_FORMAT property to oci8. Suggested by Laurent NAVARRO ln#altidev.com
+<p>Now use bind parameters in oci8 selectlimit for better performance.
+<p>Fixed interbase replaceQuote for dialect != 1. Thx to "BEGUIN Pierre-Henri
+  - INFOCOB" phb#infocob.com.
+<p>Added white-space check to QA.
+<p>Changed unixtimestamp to support fractional seconds (we always round down/floor
+  the seconds). Thanks to beezly#beezly.org.uk.
+<p>Now you can set the trigger_error type your own user-defined type in adodb-errorhandler.inc.php.
+  Suggested by Claudio Bustos clbustos#entelchile.net.
+<p>Added recordset filters with rsfilter.inc.php.
+<p>$conn->_rs2rs does not create a new recordset when it detects it is of type
+  array. Some trickery there as there seems to be a bug in Zend Engine
+<p>Added render_pagelinks to adodb-pager.inc.php. Code by "Pablo Costa" pablo#cbsp.com.br.
+<p>MetaType() speedup in adodb.inc.php by using hashing instead of switch. Best
+  performance if constant arrays are supported, as they are in PHP5.
+<p>adodb-session.php now updates only the expiry date if the crc32 check indicates
+  that the data has not been modified.
+<p><b>2.31 20 Aug 2002</b></p>
+<p>Made changes to pivottable.inc.php due to daniel lucuzaeu's suggestions (we sum the pivottable column if desired).
+<p>Fixed ErrorNo() in postgres so it does not depend on _errorMsg property.
+<p>Robert Tuttle added support for oracle cursors. See ExecuteCursor().
+<p>Fixed Replace() so it works with mysql when updating record where data has not changed. Reported by
+Cal Evans (cal#calevans.com).
+<p><b>2.30 1 Aug 2002</b></p>
+<p>Added pivottable.inc.php. Thanks to daniel.lucazeau#ajornet.com for the original
+  concept.
+<p>Added ADOConnection::outp($msg,$newline) to output error and debugging messages. Now
+you can override this using the ADODB_OUTP constant and use your own output handler.
+<p>Changed == to === for 'null' comparison. Reported by ericquil#yahoo.com
+<p>Fixed mssql SelectLimit( ) bug when distinct used.
+<p><b>2.30 1 Aug 2002</b></p>
+<p>New GetCol() and CacheGetCol() from ross#bnw.com that returns the first field as a 1 dim array.
+<p>We have an empty recordset, but RecordCount() could return -1. Fixed. Reported by  "Jonathan Polansky" jonathan#polansky.com.
+<p>We now check for session variable changes using strlen($sessval).crc32($sessval).
+Formerly we only used crc32().
+<p>Informix SelectLimit() problem with $ADODB_COUNTRECS fixed.
+<p>Fixed informix SELECT FIRST x DISTINCT, and not SELECT DISTINCT FIRST x - reported by F Riosa
+<p>Now default adodb error handlers ignores error if @ used.
+<p>If you set $conn->autoRollback=true, we auto-rollback persistent connections for odbc, mysql, oci8, mssql.
+Default for autoRollback is false. No need to do so for postgres.
+As interbase requires a transaction id (what a flawed api), we don't do it for interbase.
+<p>Changed PageExecute() to use non-greedy preg_match when searching for "FROM" keyword.
+<p><b>2.20 9 July 2002</b></p>
+<p>Added CacheGetOne($secs2cache,$sql), CacheGetRow($secs2cache,$sql), CacheGetAll($secs2cache,$sql).
+<p>Added $conn->OffsetDate($dayFraction,$date=false) to generate sql that calcs
+  date offsets. Useful for scheduling appointments.
+<p>Added connection properties: leftOuter, rightOuter that hold left and right
+  outer join operators.
+<p>Added connection property: ansiOuter to indicate whether ansi outer joins supported.
+<p>New driver <i>mssqlpo</i>, the portable mssql driver, which converts string
+  concat operator from || to +.
+<p>Fixed ms access bug - SelectLimit() did not support ties - fixed.
+<p>Karsten Kraus (Karsten.Kraus#web.de), contributed error-handling code to ADONewConnection.
+  Unfortunately due to backward compat problems, had to rollback most of the changes.
+<p>Added new parameter to GetAssoc() to allow returning an array of key-value pairs,
+ignoring any additional columns in the recordset. Off by default.
+<p>Corrected mssql $conn->sysDate to return only date using convert().
+<p>CacheExecute() improved debugging output.
+<p>Changed rs2html() so newlines are converted to BR tags. Also optimized rs2html() based
+on feedback by "Jerry Workman" jerry#mtncad.com.
+<p>Added support for Replace() with Interbase, using DELETE and INSERT.
+<p>Some minor optimizations (mostly removing & references when passing arrays).
+<p>Changed  GenID() to allows id's larger than the size of an integer.
+<p>Added force_session property to oci8 for better updateblob() support.
+<p>Fixed PageExecute() which did not work properly with sql containing GROUP BY.
+<p><b>2.12 12 June 2002</b></p>
+<p>Added toexport.inc.php to export recordsets in CSV and tab-delimited format.
+<p>CachePageExecute() does not work - fixed - thx John Huong.
+<p>Interbase aliases not set properly in FetchField() - fixed. Thx Stefan Goethals.
+<p>Added cache property to adodb pager class. The number of secs to cache recordsets.
+<p>SQL rewriting bug in pageexecute() due to skipping of newlines due to missing /s modifier. Fixed.
+<p>Max size of cached recordset due to a bug was 256000 bytes. Fixed.
+<p>Speedup of 1st invocation of CacheExecute() by tuning code.
+<p>We compare $rewritesql with $sql in pageexecute code in case of rewrite failure.
+<p><b>2.11 7 June 2002</b></p>
+<p>Fixed PageExecute() rewrite sql problem - COUNT(*) and ORDER BY don't go together with
+	mssql, access and postgres. Thx to Alexander Zhukov alex#unipack.ru
+<p>DB2 support for CHARACTER type added - thx John Huong huongch#bigfoot.com
+<p>For ado, $argProvider not properly checked. Fixed - kalimero#ngi.it
+<p>Added $conn->Replace() function for update with automatic insert if the record does not exist.
+	Supported by all databases except interbase.
+<p><b>2.10 4 June 2002</b></p>
+<p>Added uniqueSort property to indicate mssql ORDER BY cols must be unique.
+<p>Optimized session handler by crc32 the data. We only write if session data has changed.
+<p>adodb_sess_read in adodb-session.php now returns ''correctly - thanks to Jorma Tuomainen, webmaster#wizactive.com
+<p>Mssql driver did not throw EXECUTE errors correctly because ErrorMsg() and ErrorNo() called in wrong order.
+Pointed out by Alexios Fakos. Fixed.
+<p>Changed ado to use client cursors. This fixes BeginTran() problems with ado.
+<p>Added handling of timestamp type in ado.
+<p>Added to ado_mssql support for insert_id() and affected_rows().
+<p>Added support for mssql.datetimeconvert=0, available since php 4.2.0.
+<p>Made UnixDate() less strict, so that the time is ignored if present.
+<p>Changed quote() so that it checks for magic_quotes_gpc.
+<p>Changed maxblobsize for odbc to default to 64000.
+<p><b>2.00 13 May 2002</b></p>
+<p>Added drivers <i>informix72</i> for pre-7.3 versions, and <i>oci805</i> for
+  oracle 8.0.5, and postgres64 for postgresql 6.4 and earlier. The postgres and postgres7 drivers
+  are now identical.
+<p>Interbase now partially supports ADODB_FETCH_BOTH, by defaulting to ASSOC mode.
+<p>Proper support for blobs in mssql. Also revised blob support code
+is base class. Now UpdateBlobFile() calls UpdateBlob() for consistency.
+<p>Added support for changed odbc_fetch_into api in php 4.2.0
+with $conn->_has_stupid_odbc_fetch_api_change.
+<p>Fixed spelling of tablock locking hint in GenID( ) for mssql.
+<p>Added RowLock( ) to several databases, including oci8, informix, sybase, etc.
+  Fixed where error in mssql RowLock().
+<p>Added sysDate and sysTimeStamp properties to most database drivers. These are the sql
+functions/constants for that database that return the current date and current timestamp, and
+are useful for portable inserts and updates.
+<p>Support for RecordCount() caused date handling in sybase and mssql to break.
+Fixed, thanks to Toni Tunkkari, by creating derived classes for ADORecordSet_array for
+both databases. Generalized using arrayClass property. Also to support RecordCount(),
+changed metatype handling for ado drivers. Now the type returned in FetchField
+  is no longer a number, but the 1-char data type returned by MetaType.
+  At the same time, fixed a lot of date handling. Now mssql support dmy and mdy date formats.
+Also speedups in sybase and mssql with preg_match and ^ in date/timestamp handling.
+Added support in sybase and mssql for 24 hour clock in timestamps (no AM/PM).
+<p>Extensive revisions to informix driver - thanks to Samuel CARRIERE samuel_carriere#hotmail.com
+<p>Added $ok parameter to CommitTrans($ok) for easy rollbacks.
+<p>Fixed odbc MetaColumns and MetaTables to save and restore $ADODB_FETCH_MODE.
+<p>Some odbc drivers did not call the base connection class constructor. Fixed.
+<p>Fixed regex for GetUpdateSQL() and GetInsertSQL() to support more legal character combinations.
+
+<p><b>1.99 21 April 2002</b></p>
+<p>Added emulated RecordCount() to all database drivers if $ADODB_COUNTRECS = true
+  (which it is by default). Inspired by Cristiano Duarte (cunha17#uol.com.br).
+<p>Unified stored procedure support for mssql and oci8. Parameter() and PrepareSP()
+  functions implemented.
+<p>Added support for SELECT FIRST in informix, modified hasTop property to support
+  this.
+<p>Changed csv driver to handle updates/deletes/inserts properly (when Execute() returns true).
+Bind params also work now, and raiseErrorFn with csv driver. Added csv driver to QA process.
+<p>Better error checking in oci8 UpdateBlob() and UpdateBlobFile().
+<p>Added TIME type to MySQL - patch by Manfred h9125297#zechine.wu-wien.ac.at
+<p>Prepare/Execute implemented for Interbase/Firebird
+<p>Changed some regular expressions to be anchored by /^ $/ for speed.
+<p>Added UnixTimeStamp() and UnixDate() to ADOConnection(). Now these functions
+  are in both ADOConnection and ADORecordSet classes.
+<p>Empty recordsets were not cached - fixed.
+<p>Thanks to Gaetano Giunta (g.giunta#libero.it) for the oci8 code review. We
+  didn't agree on everything, but i hoped we agreed to disagree!
+<p><b>1.90 6 April 2002</b></p>
+<p>Now all database drivers support fetch modes ADODB_FETCH_NUM and ADODB_FETCH_ASSOC, though
+	still not fully tested. Eg. Frontbase, Sybase, Informix.
+<p>NextRecordSet() support for mssql. Contributed by "Sven Axelsson" sven.axelsson#bokochwebb.se
+<p>Added blob support for SQL Anywhere. Contributed by Wade Johnson wade#wadejohnson.de
+<p>Fixed some security loopholes in server.php. Server.php also supports fetch mode.
+<p>Generalized GenID() to support odbc and mssql drivers. Mssql no longer generates GUID's.
+<p>Experimental RowLock($table,$where) for mssql.
+<p>Properly implemented Prepare() in oci8 and ODBC.
+<p>Added Bind() support to oci8 to support Prepare().
+<p>Improved error handler. Catches CacheExecute() and GenID() errors now.
+<p>Now if you are running php from the command line, debugging messages do not output html formating.
+Not 100% complete, but getting there.
+<p><b>1.81 22 March 2002</b></p>
+<p>Restored default $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT for backward compatibility.
+<p>SelectLimit for oci8 improved - Our FIRST_ROWS optimization now does not overwrite existing hint.
+<p>New Sybase SQL Anywhere driver. Contributed by Wade Johnson wade#wadejohnson.de
+<p><b>1.80 15 March 2002</b></p>
+<p>Redesigned directory structure of ADOdb files. Added new driver directory where
+all database drivers reside.
+<p>Changed caching algorithm to create subdirectories. Now we scale better.
+<p>Informix driver now supports insert_id(). Contribution by "Andrea Pinnisi" pinnisi#sysnet.it
+<p>Added experimental ISO date and FetchField support for informix.
+<p>Fixed a quoting bug in Execute() with bind parameters, causing problems with blobs.
+<p>Mssql driver speedup by 10-15%.
+<p>Now in CacheExecute($secs2cache,$sql,...), $secs2cache is optional. If missing, it will
+take the value defined in $connection->cacheSecs (default is 3600 seconds). Note that
+CacheSelectLimit(), the secs2cache is still compulsory - sigh.
+<p>Sybase SQL Anywhere driver (using ODBC) contributed by Wade Johnson wade#wadejohnson.de
+<p><b>1.72 8 March 2002</b></p>
+<p>Added @ when returning Fields() to prevent spurious error - "Michael William Miller" mille562#pilot.msu.edu
+<p>MetaDatabases() for postgres contributed by Phil pamelant#nerim.net
+ <p>Mitchell T. Young (mitch#youngfamily.org) contributed informix driver.
+ <p>Fixed rs2html() problem. I cannot reproduce, so probably a problem with pre PHP 4.1.0 versions,
+  when supporting new ADODB_FETCH_MODEs.
+ <p>Mattia Rossi (mattia#technologist.com) contributed BlobDecode() and UpdateBlobFile() for postgresql
+ using the postgres specific pg_lo_import()/pg_lo_open() - i don't use them but hopefully others will
+ find this useful. See <a href="http://phplens.com/lens/lensforum/msgs.php?id=1262">this posting</a>
+ for an example of usage.
+ <p>Added UpdateBlobFile() for uploading files to a database.
+ <p>Made UpdateBlob() compatible with oci8po driver.
+ <p>Added noNullStrings support to oci8 driver. Oracle changes all ' ' strings to nulls,
+  so you need to set strings to ' ' to prevent the nullifying of strings. $conn->noNullStrings = true;
+  will do this for you automatically. This is useful when you define a char column as NOT NULL.
+  <p>Fixed UnixTimeStamp() bug - wasn't setting minutes and seconds properly. Patch from Agusti Fita i Borrell agusti#anglatecnic.com.
+  <p>Toni Tunkkari added patch for sybase dates. Problem with spaces in day part of date fixed.
+ <p><b>1.71 18 Jan 2002</b></p>
+ <p>Sequence start id support. Now $conn->Gen_ID('seqname', 50) to start sequence from 50.
+ <p>CSV driver fix for selectlimit, from Andreas - akaiser#vocote.de.
+<P>Gam3r spotted that a global variable was undefined in the session handler.
+<p>Mssql date regex had error. Fixed - reported by Minh Hoang vb_user#yahoo.com.
+<p>DBTimeStamp() and DBDate() now accept iso dates and unix timestamps. This means
+that the PostgreSQL handling of dates in GetInsertSQL() and GetUpdateSQL() can
+be removed. Also if these functions are passed '' or null or false, we return a SQL null.
+<p>GetInsertSQL() and GetUpdateSQL() now accept a new parameter, $magicq to
+indicate whether quotes should be inserted based on magic quote settings - suggested by
+dj#4ict.com.
+<p>Reformated docs slightly based on suggestions by Chris Small.
+ <p><b>1.65 28 Dec 2001</b></p>
+ <p>Fixed borland_ibase class naming bug.
+ <p>Now instead of using $rs->fields[0] internally, we use reset($rs->fields) so
+ that we are compatible with ADODB_FETCH_ASSOC mode. Reported by Nico S.
+ <p>Changed recordset constructor and _initrs() for oci8 so that it returns the field definitions even
+ if no rows in the recordset. Reported by Rick Hickerson (rhickers#mv.mv.com).
+ <p>Improved support for postgresql in GetInsertSQL and GetUpdateSQL by
+  "mike" mike#partner2partner.com  and "Ryan Bailey" rebel#windriders.com
+ <p><b>1.64 20 Dec 2001</b></p>
+<p>Danny Milosavljevic <danny.milo#gmx.net> added some patches for MySQL error handling
+and displaying default values.
+<p>Fixed some ADODB_FETCH_BOTH inconsistencies in odbc and interbase.
+<p>Added more tests to test suite to cover ADODB_FETCH_* and ADODB_ERROR_HANDLER.
+<p>Added firebird (ibase) driver
+<p>Added borland_ibase driver for interbase 6.5
+<p><b>1.63 13 Dec 2001</b></p>
+Absolute to the adodb-lib.inc.php file not set properly. Fixed.<p>
+
+<p><b>1.62 11 Dec 2001</b></p>
+<p>Major speedup of ADOdb for low-end web sites by reducing the php code loading and compiling
+cycle. We conditionally compile not so common functions.
+Moved csv code to adodb-csvlib.inc.php to reduce adodb.inc.php parsing. This file
+is loaded only when the csv/proxy driver is used, or CacheExecute() is run.
+Also moved PageExecute(), GetSelectSQL() and GetUpdateSQL() core code to adodb-lib.inc.php.
+This reduced the 70K main adodb.inc.php file to 55K, and since at least 20K of the file
+is comments, we have reduced 50K of code in adodb.inc.php to 35K. There
+ should be 35% reduction in memory and thus 35% speedup in compiling the php code for the
+main adodb.inc.php file.
+<p>Highly tuned SelectLimit() for oci8 for massive speed improvements on large files.
+Selecting 20 rows starting from the 20,000th row of a table is now 7 times faster.
+Thx to Tomas V V Cox.
+<p>Allow . and # in table definitions in GetInsertSQL and GetUpdateSQL.
+ See ADODB_TABLE_REGEX constant. Thx to Ari Kuorikoski.
+<p>Added ADODB_PREFETCH_ROWS constant, defaulting to 10. This determines the number
+of records to prefetch in a SELECT statement. Only used by oci8.</p>
+<p>Added high portability Oracle class called oci8po. This uses ? for bind variables, and
+lower cases column names.</p>
+<p>Now all database drivers support $ADODB_FETCH_MODE, including interbase, ado, and odbc:
+ADODB_FETCH_NUM and ADODB_FETCH_ASSOC. ADODB_FETCH_BOTH is not fully implemented for all
+database drivers.
+<p><b>1.61 Nov 2001</b></p>
+<p>Added PO_RecordCount() and PO_Insert_ID(). PO stands for portable. Pablo Roca
+  [pabloroca#mvps.org]</p>
+<p>GenID now returns 0 if not available. Safer is that you should check $conn->hasGenID
+  for availability.</p>
+<p>M'soft ADO we now correctly close recordset in _close() peterd#telephonetics.co.uk</p>
+<p>MSSQL now supports GenID(). It generates a 16-byte GUID from mssql newid()
+  function.</p>
+<p>Changed ereg_replace to preg_replace in SelectLimit. This is a fix for mssql.
+  Ereg doesn't support t or n! Reported by marino Carlos xaplo#postnuke-espanol.org</p>
+<p>Added $recordset->connection. This is the ADOConnection object for the recordset.
+Works with cached and normal recordsets. Surprisingly, this had no affect on performance!</p>
+<p><b>1.54 15 Nov 2001</b></p>
+Fixed some more bugs in PageExecute().  I am getting sick of bug in this and will have to
+reconsider my QA here. The main issue is that I don't use PageExecute() and
+to check whether it is working requires a visual inspection of the html generated currently.
+It is possible to write a test script but it would be quite complicated :(
+<p> More speedups of SelectLimit() for DB2, Oci8, access, vfp, mssql.
+<p>
+
+<p><b>1.53 7 Nov 2001</b></p>
+Added support for ADODB_FETCH_ASSOC for ado and odbc drivers.<p>
+Tuned GetRowAssoc(false) in postgresql and mysql.<p>
+Stephen Van Dyke contributed ADOdb icon, accepted with some minor mods.<p>
+Enabled Affected_Rows() for postgresql<p>
+Speedup for Concat() using implode() - Benjamin Curtis ben_curtis#yahoo.com<p>
+Fixed some more bugs in PageExecute() to prevent infinite loops<p>
+<p><b>1.52 5 Nov 2001</b></p>
+Spelling error in CacheExecute() caused it to fail. $ql should be $sql in line 625!<p>
+Added fixes for parsing [ and ] in GetUpdateSQL().
+<p><b>1.51 5 Nov 2001</b></p>
+<p>Oci8 SelectLimit() speedup by using OCIFetch().
+<p>Oci8 was mistakenly reporting errors when $db->debug = true.
+<p>If a connection failed with ODBC, it was not correctly reported - fixed.
+<p>_connectionID was inited to -1, changed to false.
+<p>Added $rs->FetchRow(), to simplify API, ala PEAR DB
+<p>Added PEAR DB compat mode, which is still faster than PEAR! See adodb-pear.inc.php.
+<p>Removed postgres pconnect debugging statement.
+<p><b>1.50 31 Oct 2001</b></p>
+<p>ADOdbConnection renamed to ADOConnection, and ADOdbFieldObject to ADOFieldObject.
+<p>PageExecute() now checks for empty $rs correctly, and the errors in the docs on this subject have been fixed.
+<p>odbc_error() does not return 6 digit error correctly at times. Implemented workaround.
+<p>Added ADORecordSet_empty class. This will speedup INSERTS/DELETES/UPDATES because the return
+object created is much smaller.
+<p>Added Prepare() to odbc, and oci8 (but doesn't work properly for oci8 still).
+<p>Made pgsql a synonym for postgre7, and changed SELECT LIMIT to use OFFSET for compat with
+postgres 7.2.
+<p>Revised adodb-cryptsession.php thanks to Ari.
+<p>Set resources to false on _close, to force freeing of resources.
+<p>Added adodb-errorhandler.inc.php, adodb-errorpear.inc.php and raiseErrorFn on Freek's urging.
+<p>GetRowAssoc($toUpper=true): $toUpper added as default.
+<p>Errors when connecting to a database were not captured formerly. Now we do it correctly.
+<p><b>1.40 19 September 2001</b></p>
+<p>PageExecute() to implement page scrolling added. Code and idea by Iván Oliva.</p>
+<p>Some minor postgresql fixes.</p>
+<p>Added sequence support using GenID() for postgresql, oci8, mysql, interbase.</p>
+<p>Added UpdateBlob support for interbase (untested).</p>
+<p>Added encrypted sessions (see adodb-cryptsession.php). By Ari Kuorikoski <kuoriari#finebyte.com></p>
+<p><b>1.31 21 August 2001</b></p>
+<p>Many bug fixes thanks to "GaM3R (Cameron)" <gamr#outworld.cx>. Some session changes due to Gam3r.
+<p>Fixed qstr() to quote  also.
+<p>rs2html() now pretty printed.
+<p>Jonathan Younger jyounger#unilab.com contributed the great idea GetUpdateSQL() and GetInsertSQL() which
+generates SQL to update and insert into a table from a recordset. Modify the recordset fields
+array, then can this function to generate the SQL (the SQL is not executed).
+<p>"Nicola Fankhauser" <nicola.fankhauser#couniq.com> found some bugs in date handling for mssql.</p>
+<p>Added minimal Oracle support for LOBs. Still under development.</p>
+Added $ADODB_FETCH_MODE so you can control whether recordsets return arrays which are
+numeric, associative or both. This is a global variable you set. Currently only MySQL, Oci8, Postgres
+drivers support this.
+<p>PostgreSQL properly closes recordsets now. Reported by several people.
+<p>
+Added UpdateBlob() for Oracle. A hack to make it easier to save blobs.
+<p>
+Oracle timestamps did not display properly. Fixed.
+<p><b>1.20 6 June 2001</b></p>
+<p>Now Oracle can connect using tnsnames.ora or server and service name</p>
+<p>Extensive Oci8 speed optimizations.
+Oci8 code revised to support variable binding, and /*+ FIRST_ROWS */ hint.</p>
+<p>Worked around some 4.0.6 bugs in odbc_fetch_into().</p>
+<p>Paolo S. Asioli paolo.asioli#libero.it suggested GetRowAssoc().</p>
+<p>Escape quotes for oracle wrongly set to '. Now '' is used.</p>
+<p>Variable binding now works in ODBC also.</p>
+<p>Jumped to version 1.20 because I don't like 13 :-)</p>
+<p><b>1.12 6 June 2001</b></p>
+<p>Changed $ADODB_DIR to ADODB_DIR constant to plug a security loophole.</p>
+<p>Changed _close() to close persistent connections also. Prevents connection leaks.</p>
+<p>Major revision of oracle and oci8 drivers.
+Added OCI_RETURN_NULLS and OCI_RETURN_LOBS to OCIFetchInto(). BLOB, CLOB and VARCHAR2 recognition
+in MetaType() improved. MetaColumns() returns columns in correct sort order.</p>
+<p>Interbase timestamp input format was wrong. Fixed.</p>
+<p><b>1.11 20 May 2001</b></p>
+<p>Improved file locking for Windows.</p>
+<p>Probabilistic flushing of cache to avoid avalanche updates when cache timeouts.</p>
+<p>Cached recordset timestamp not saved in some scenarios. Fixed.</p>
+<p><b>1.10 19 May 2001</b></p>
+<p>Added caching. CacheExecute() and CacheSelectLimit().
+<p>Added csv driver. See <a href="http://php.weblogs.com/adodb_csv">http://php.weblogs.com/ADODB_csv</a>.
+<p>Fixed SelectLimit(), SELECT TOP not working under certain circumstances.
+<p>Added better Frontbase support of MetaTypes() by Frank M. Kromann.
+<p><b>1.01 24 April 2001</b></p>
+<p>Fixed SelectLimit bug.  not quoted properly.
+<p>SelectLimit: SELECT TOP -1 * FROM TABLE not support by Microsoft. Fixed.</p>
+<p>GetMenu improved by glen.davies#cce.ac.nz to support multiple hilited items<p>
+<p>FetchNextObject() did not work with only 1 record returned. Fixed bug reported by $tim#orotech.net</p>
+<p>Fixed mysql field max_length problem. Fix suggested by Jim Nicholson (jnich#att.com)</p>
+<p><b>1.00 16 April 2001</b></p>
+<p>Given some brilliant suggestions on how to simplify ADOdb by akul. You no longer need to
+setup $ADODB_DIR yourself, and ADOLoadCode() is automatically called by ADONewConnection(),
+simplifying the startup code.</p>
+<p>FetchNextObject() added. Suggested by Jakub Marecek. This makes FetchObject() obsolete, as
+this is more flexible and powerful.</p>
+<p>Misc fixes to SelectLimit() to support Access (top must follow distinct) and Fields()
+in the array recordset. From Reinhard Balling.</p>
+<p><b>0.96 27 Mar 2001</b></p>
+<p>ADOConnection Close() did not return a value correctly. Thanks to akul#otamedia.com.</p>
+<p>When the horrible magic_quotes is enabled, back-slash () is changed to double-backslash (\).
+This doesn't make sense for Microsoft/Sybase databases. We fix this in qstr().</p>
+<p>Fixed Sybase date problem in UnixDate() thanks to Toni Tunkkari. Also fixed MSSQL problem
+in UnixDate() - thanks to milhouse31#hotmail.com.</p>
+<p>MoveNext() moved to leaf classes for speed in MySQL/PostgreSQL. 10-15% speedup.</p>
+<p>Added null handling in bindInputArray in Execute() -- Ron Baldwin suggestion.</p>
+<p>Fixed some option tags. Thanks to john#jrmstudios.com.</p>
+<p><b>0.95 13 Mar 2001</b></p>
+<p>Added postgres7 database driver which supports LIMIT and other version 7 stuff in the future.</p>
+<p>Added SelectLimit to ADOConnection to simulate PostgreSQL's "select * from table limit 10 offset 3".
+Added helper function GetArrayLimit() to ADORecordSet.</p>
+<p>Fixed mysql metacolumns bug. Thanks to Freek Dijkstra (phpeverywhere#macfreek.com).</p>
+<p>Also many PostgreSQL changes by Freek. He almost rewrote the whole PostgreSQL driver!</p>
+<p>Added fix to input parameters in Execute for non-strings by Ron Baldwin.</p>
+<p>Added new metatype, X for TeXt. Formerly, metatype B for Blob also included
+text fields. Now 'B' is for binary/image data. 'X' for textual data.</p>
+<p>Fixed $this->GetArray() in GetRows().</p>
+<p>Oracle and OCI8: 1st parameter is always blank -- now warns if it is filled.</p>
+<p>Now <i>hasLimit</i> and <i>hasTop</i> added to indicate whether
+SELECT * FROM TABLE LIMIT 10 or SELECT TOP 10 * FROM TABLE are supported.</p>
+<p><b>0.94 04 Feb 2001</b></p>
+<p>Added ADORecordSet::GetRows() for compatibility with Microsoft ADO. Synonym for GetArray().</p>
+<p>Added new metatype 'R' to represent autoincrement numbers.</p>
+<p>Added ADORecordSet.FetchObject() to return a row as an object.</p>
+<p>Finally got a Linux box to test PostgreSql. Many fixes.</p>
+<p>Fixed copyright misspellings in 0.93.</p>
+<p>Fixed mssql MetaColumns type bug.</p>
+<p>Worked around odbc bug in PHP4 for sessions.</p>
+<p>Fixed many documentation bugs (affected_rows, metadatabases, qstr).</p>
+<p>Fixed MySQL timestamp format (removed comma).</p>
+<p>Interbase driver did not call ibase_pconnect(). Fixed.</p>
+<p><b>0.93 18 Jan 2002</b></p>
+<p>Fixed GetMenu bug.</p>
+<p>Simplified Interbase commit and rollback.</p>
+<p>Default behaviour on closing a connection is now to rollback all active transactions.</p>
+<p>Added field object handling for array recordset for future XML compatibility.</p>
+<p>Added arr2html() to convert array to html table.</p>
+<p><b>0.92 2 Jan 2002</b></p>
+<p>Interbase Commit and Rollback should be working again.</p>
+<p>Changed initialisation of ADORecordSet. This is internal and should not affect users. We
+are doing this to support cached recordsets in the future.</p>
+
+<p>Implemented ADORecordSet_array class. This allows you to simulate a database recordset
+with an array.</p>
+<p>Added UnixDate() and UnixTimeStamp() to ADORecordSet.</p>
+<p><b>0.91 21 Dec 2000</b></p>
+<p>Fixed ODBC so ErrorMsg() is working.</p>
+<p>Worked around ADO unrecognised null (0x1) value problem in COM.</p>
+<p>Added Sybase support for FetchField() type</p>
+<p>Removed debugging code and unneeded html from various files</p>
+<p>Changed to javadoc style comments to adodb.inc.php.</p>
+<p>Added maxsql as synonym for mysqlt</p>
+<p>Now ODBC downloads first 8K of blob by default
+<p><b>0.90 15 Nov 2000</b></p>
+<p>Lots of testing of Microsoft ADO. Should be more stable now.</p>
+<p>Added $ADODB_COUNTREC. Set to false for high speed selects.</p>
+<p>Added Sybase support. Contributed by Toni Tunkkari (toni.tunkkari#finebyte.com). Bug in Sybase
+  API: GetFields is unable to determine date types.</p>
+<p>Changed behaviour of RecordSet.GetMenu() to support size parameter (listbox) properly.</p>
+<p>Added emptyDate and emptyTimeStamp to RecordSet class that defines how to represent
+  empty dates.</p>
+<p>Added MetaColumns($table) that returns an array of ADOFieldObject's listing
+  the columns of a table.</p>
+<p>Added transaction support for PostgresSQL -- thanks to "Eric G. Werk" egw#netguide.dk.</p>
+<p>Added adodb-session.php for session support.</p>
+<p><b>0.80 30 Nov 2000</b></p>
+<p>Added support for charSet for interbase. Implemented MetaTables for most databases.
+  PostgreSQL more extensively tested.</p>
+<p><b>0.71 22 Nov 2000</b></p>
+<p>Switched from using require_once to include/include_once for backward compatability with PHP 4.02 and earlier.</p>
+<p><b>0.70 15 Nov 2000</b></p>
+<p>Calls by reference have been removed (call_time_pass_reference=Off) to ensure compatibility with future versions of PHP,
+except in Oracle 7 driver due to a bug in php_oracle.dll.</p>
+<p>PostgreSQL database driver contributed by Alberto Cerezal (acerezalp#dbnet.es).
+</p>
+<p>Oci8 driver for Oracle 8 contributed by George Fourlanos (fou#infomap.gr).</p>
+<p>Added <i>mysqlt</i> database driver to support MySQL 3.23 which has transaction
+ support. </p>
+<p>Oracle default date format (DD-MON-YY) did not match ADOdb default date format (which is YYYY-MM-DD). Use ALTER SESSION to force the default date.</p>
+<p>Error message checking is now included in test suite.</p>
+<p>MoveNext() did not check EOF properly -- fixed.</p>
+<p><b>0.60 Nov 8 2000</b></p>
+<p>Fixed some constructor bugs in ODBC and ADO. Added ErrorNo function to ADOConnection
+ class. </p>
+<p><b>0.51 Oct 18 2000</b></p>
+<p>Fixed some interbase bugs.</p>
+<p><b>0.50 Oct 16 2000</b></p>
+<p>Interbase commit/rollback changed to be compatible with PHP 4.03. </p>
+<p>CommitTrans( ) will now return true if transactions not supported. </p>
+<p>Conversely RollbackTrans( ) will return false if transactions not supported.
+</p>
+<p><b>0.46 Oct 12</b></p>
+Many Oracle compatibility issues fixed.
+<p><b>0.40 Sept 26</b></p>
+<p>Many bug fixes</p>
+<p>Now Code for BeginTrans, CommitTrans and RollbackTrans is working. So is the Affected_Rows
+and Insert_ID. Added above functions to test.php.</p>
+<p>ADO type handling was busted in 0.30. Fixed.</p>
+<p>Generalised Move( ) so it works will all databases, including ODBC.</p>
+<p><b>0.30 Sept 18</b></p>
+<p>Renamed ADOLoadDB to ADOLoadCode. This is clearer.</p>
+<p>Added BeginTrans, CommitTrans and RollbackTrans functions.</p>
+<p>Added Affected_Rows() and Insert_ID(), _affectedrows() and _insertID(), ListTables(),
+ ListDatabases(), ListColumns().</p>
+<p>Need to add New_ID() and hasInsertID and hasAffectedRows, autoCommit </p>
+<p><b>0.20 Sept 12</b></p>
+<p>Added support for Microsoft's ADO.</p>
+<p>Added new field to ADORecordSet -- canSeek</p>
+<p>Added new parameter to _fetch($ignore_fields = false). Setting to true will
+ not update fields array for faster performance.</p>
+<p>Added new field to ADORecordSet/ADOConnection -- dataProvider to indicate whether
+ a class is derived from odbc or ado.</p>
+<p>Changed class ODBCFieldObject to ADOFieldObject -- not documented currently.</p>
+<p>Added benchmark.php and testdatabases.inc.php to the test suite.</p>
+<p>Added to ADORecordSet FastForward( ) for future high speed scrolling. Not documented.</p>
+<p>Realised that ADO's Move( ) uses relative positioning. ADOdb uses absolute.
+</p>
+<p><b>0.10 Sept 9 2000</b></p>
+<p>First release</p>
 </body></html>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/readme.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/readme.htm
deleted file mode 100644
index 944b967..0000000
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/readme.htm
+++ /dev/null
@@ -1,68 +0,0 @@
-<html>
-<head>
-<title>ADODB Manual</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<XSTYLE
-	body,td {font-family:Arial,Helvetica,sans-serif;font-size:11pt}
-	pre {font-size:9pt}
-	.toplink {font-size:8pt}
-	/>
-</head>	
-<body bgcolor="#FFFFFF">
-
-<h3>ADOdb Library for PHP</h3>
-<p>ADOdb is a suite of database libraries that allow you to connect to multiple 
-	databases in a portable manner. Download from <a href=http://adodb.sourceforge.net/>http://adodb.sourceforge.net/</a>.
-<ul><li>The ADOdb documentation has moved to <a href=docs-adodb.htm>docs-adodb.htm</a> 
-	This allows you to query, update and insert records using a portable API.
-<p><li>The ADOdb data dictionary docs are at <a href=docs-datadict.htm>docs-datadict.htm</a>. 
-	This allows you to create database tables and indexes in a portable manner.
-<p><li>The ADOdb database performance monitoring docs are at <a href=docs-perf.htm>docs-perf.htm</a>. 
-	This allows you to perform health checks, tune and monitor your database.
-<p><li>The ADOdb database-backed session docs are at <a href=docs-session.htm>docs-session.htm</a>. 
-</ul>
-<p>
-<h3>Installation</h3>
-Make sure you are running PHP5 or later. For PHP 4 or earlier, you need to use adodb 4.9. Unpack all the files into a directory accessible by your webserver.
-<p>
-To test, try modifying some of the tutorial examples. Make sure you customize the connection settings correctly. You can debug using:
-<pre>
-<?php
-include('adodb/adodb.inc.php');
-
-$db = <b>ADONewConnection</b>($driver); # eg. 'mysql' or 'oci8' 
-$db->debug = true;
-$db-><b>Connect</b>($server, $user, $password, $database);
-$rs = $db-><b>Execute</b>('select * from some_small_table');
-print "<pre>";
-print_r($rs-><b>GetRows</b>());
-print "</pre>";
-?>
-</pre>
-<h3>How are people using ADOdb</h3>
-Here are some examples of how people are using ADOdb: 
-<ul>
-	<li> <strong>PhpLens</strong> is a commercial data grid component that allows 
-		both cool Web designers and serious unshaved programmers to develop and 
-		maintain databases on the Web easily. Developed by the author of ADOdb. 
-	</li>
-	<li> <strong>PHAkt</strong>: PHP Extension for DreamWeaver Ultradev allows 
-		you to script PHP in the popular Web page editor. Database handling provided 
-		by ADOdb. </li>
-	<li> <strong>Analysis Console for Intrusion Databases (ACID)</strong>: PHP-based 
-		analysis engine to search and process a database of security incidents 
-		generated by security-related software such as IDSes and firewalls (e.g. 
-		Snort, ipchains). By Roman Danyliw. </li>
-	<li> <strong>PostNuke</strong> is a very popular free content management system 
-		and weblog system. It offers full CSS support, HTML 4.01 transitional 
-		compliance throughout, an advanced blocks system, and is fully multi-lingual 
-		enabled. </li>
-	<li><strong> EasyPublish CMS</strong> is another free content management system 
-		for managing information and integrated modules on your internet, intranet- 
-		and extranet-sites. From Norway. </li>
-	<li> <strong>NOLA</strong> is a full featured accounting, inventory, and job 
-		tracking application. It is licensed under the GPL, and developed by Noguska. 
-	</li>
-</ul>
-</body>
-</html>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/tips_portable_sql.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/tips_portable_sql.htm
index aa75069..5374357 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/tips_portable_sql.htm
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/tips_portable_sql.htm
@@ -1,367 +1,367 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>Tips on Writing Portable SQL for Multiple Databases for PHP</title>
-</head>
-
-<body bgcolor=white>
-<table width=100% border=0><tr><td><h2>Tips on Writing Portable SQL  </h2></td><td>
- <div align=right><img src="cute_icons_for_site/adodb.gif"></div></td></tr></table>
-  <p>Updated 6 Oct 2006. Added OffsetDate example.
-  <p>Updated 18 Sep 2003. Added Portable Native SQL section.
-<p>
-
- If you are writing an application that is used in multiple environments and 
-  operating systems, you need to plan to support multiple databases. This article 
-  is based on my experiences with multiple database systems, stretching from 4th 
-  Dimension in my Mac days, to the databases I currently use, which are: Oracle, 
-  FoxPro, Access, MS SQL Server and MySQL. Although most of the advice here applies 
-  to using SQL with Perl, Python and other programming languages, I will focus on PHP and how 
-  the <a href="http://adodb.sourceforge.net/">ADOdb</a> database abstraction library 
-  offers some solutions.<p></p>
-<p>Most database vendors practice product lock-in. The best or fastest way to 
-  do things is often implemented using proprietary extensions to SQL. This makes 
-  it extremely hard to write portable SQL code that performs well under all conditions. 
-  When the first ANSI committee got together in 1984 to standardize SQL, the database 
-  vendors had such different implementations that they could only agree on the 
-  core functionality of SQL. Many important application specific requirements 
-  were not standardized, and after so many years since the ANSI effort began, 
-  it looks as if much useful database functionality will never be standardized. 
-  Even though ANSI-92 SQL has codified much more, we still have to implement portability 
-  at the application level.</p>
-<h3><b>Selects</b></h3>
-<p>The SELECT statement has been standardized to a great degree. Nearly every 
-  database supports the following:</p>
-<p>SELECT [cols] FROM [tables]<br>
-    [WHERE conditions]<br>
-    [GROUP BY cols]<br>
-    [HAVING conditions] <br>
-    [ORDER BY cols]</p>
-<p>But so many useful techniques can only be implemented by using proprietary 
-  extensions. For example, when writing SQL to retrieve the first 10 rows for 
-  paging, you could write...</p>
-<table width="80%" border="1" cellspacing="0" cellpadding="0" align="center">
-  <tr> 
-	<td><b>Database</b></td>
-	<td><b>SQL Syntax</b></td>
-  </tr>
-  <tr> 
-	<td>DB2</td>
-	<td>select * from table fetch first 10 rows only</td>
-  </tr>
-  <tr> 
-	<td>Informix</td>
-	<td>select first 10 * from table</td>
-  </tr>
-  <tr> 
-	<td>Microsoft SQL Server and Access</td>
-	<td>select top 10 * from table</td>
-  </tr>
-  <tr> 
-	<td>MySQL and PostgreSQL</td>
-	<td>select * from table limit 10</td>
-  </tr>
-  <tr> 
-	<td>Oracle 8i</td>
-	<td>select * from (select * from table) where rownum <= 10</td>
-  </tr>
-</table>
-<p>This feature of getting a subset of data is so useful that in the PHP class 
-  library ADOdb, we have a SelectLimit( ) function that allows you to hide the 
-  implementation details within a function that will rewrite your SQL for you:</p>
-<pre>$connection->SelectLimit('select * from table', 10);
-</pre>
-<p><b>Selects: Fetch Modes</b></p>
-<p>PHP allows you to retrieve database records as arrays. You can choose to have 
-  the arrays indexed by field name or number. However different low-level PHP 
-  database drivers are inconsistent in their indexing efforts. ADOdb allows you 
-  to determine your prefered mode. You set this by setting the variable $ADODB_FETCH_MODE 
-  to either of the constants ADODB_FETCH_NUM (for numeric indexes) or ADODB_FETCH_ASSOC 
-  (using field names as an associative index).</p>
-<p>The default behaviour of ADOdb varies depending on the database you are using. 
-  For consistency, set the fetch mode to either ADODB_FETCH_NUM (for speed) or 
-  ADODB_FETCH_ASSOC (for convenience) at the beginning of your code. </p>
-<p><b>Selects: Counting Records</b></p>
-<p>Another problem with SELECTs is that some databases do not return the number 
-  of rows retrieved from a select statement. This is because the highest performance 
-  databases will return records to you even before the last record has been found. 
-</p>
-<p>In ADOdb, RecordCount( ) returns the number of rows returned, or will emulate 
-  it by buffering the rows and returning the count after all rows have been returned. 
-  This can be disabled for performance reasons when retrieving large recordsets 
-  by setting the global variable $ADODB_COUNTRECS = false. This variable is checked 
-  every time a query is executed, so you can selectively choose which recordsets 
-  to count.</p>
-<p>If you prefer to set $ADODB_COUNTRECS = false, ADOdb still has the PO_RecordCount( 
-  ) function. This will return the number of rows, or if it is not found, it will 
-  return an estimate using SELECT COUNT(*):</p>
-<pre>$rs = $db->Execute("select * from table where state=$state");
-$numrows = $rs->PO_RecordCount('table', "state=$state");</pre>
-<p><b>Selects: Locking</b> </p>
-<p>SELECT statements are commonly used to implement row-level locking of tables. 
-  Other databases such as Oracle, Interbase, PostgreSQL and MySQL with InnoDB 
-  do not require row-level locking because they use versioning to display data 
-  consistent with a specific point in time.</p>
-<p>Currently, I recommend encapsulating the row-level locking in a separate function, 
-  such as RowLock($table, $where):</p>
-<pre>$connection->BeginTrans( );
-$connection->RowLock($table, $where); </pre>
-<pre><font color=green># some operation</font></pre>
-<pre>if ($ok) $connection->CommitTrans( );
-else $connection->RollbackTrans( );
-</pre>
-<p><b>Selects: Outer Joins</b></p>
-<p>Not all databases support outer joins. Furthermore the syntax for outer joins 
-  differs dramatically between database vendors. One portable (and possibly slower) 
-  method of implementing outer joins is using UNION.</p>
-<p>For example, an ANSI-92 left outer join between two tables t1 and t2 could 
-  look like:</p>
-<pre>SELECT t1.col1, t1.col2, t2.cola <br>  FROM t1 <i>LEFT JOIN</i> t2 ON t1.col = t2.col</pre>
-<p>This can be emulated using:</p>
-<pre>SELECT t1.col1, t1.col2, t2.cola FROM t1, t2 <br>	   WHERE t1.col = t2.col 
-   UNION ALL
-SELECT col1, col2, null FROM t1 <br>	   WHERE t1.col not in (select distinct col from t2)
-</pre>
-<p>Since ADOdb 2.13, we provide some hints in the connection object as to legal 
-  join variations. This is still incomplete and sometimes depends on the database 
-  version you are using, but is useful as a general guideline:</p>
-<p><font face="Courier New, Courier, mono">$conn->leftOuter</font>: holds the 
-  operator used for left outer joins (eg. '*='), or false if not known or not 
-  available.<br>
-  <font face="Courier New, Courier, mono">$conn->rightOuter</font>: holds the 
-  operator used for right outer joins (eg '=*'), or false if not known or not 
-  available.<br>
-  <font face="Courier New, Courier, mono">$conn->ansiOuter</font>: boolean 
-  that if true means that ANSI-92 style outer joins are supported, or false if 
-  not known.</p>
-<h3><b>Inserts</b> </h3>
-<p>When you create records, you need to generate unique id's for each record. 
-  There are two common techniques: (1) auto-incrementing columns and (2) sequences. 
-</p>
-<p>Auto-incrementing columns are supported by MySQL, Sybase and Microsoft Access 
-  and SQL Server. However most other databases do not support this feature. So 
-  for portability, you have little choice but to use sequences. Sequences are 
-  special functions that return a unique incrementing number every time you call 
-  it, suitable to be used as database keys. In ADOdb, we use the GenID( ) function. 
-  It has takes a parameter, the sequence name. Different tables can have different 
-  sequences. </p>
-<pre>$id = $connection->GenID('sequence_name');<br>$connection->Execute("insert into table (id, firstname, lastname) <br>			   values ($id, $firstname, $lastname)");</pre>
-<p>For databases that do not support sequences natively, ADOdb emulates sequences 
-  by creating a table for every sequence.</p>
-<h3><b>Binding</b></h3>
-<p>Binding variables in an SQL statement is another tricky feature. Binding is 
-  useful because it allows pre-compilation of SQL. When inserting multiple records 
-  into a database in a loop, binding can offer a 50% (or greater) speedup. However 
-  many databases such as Access and MySQL do not support binding natively and 
-  there is some overhead in emulating binding. Furthermore, different databases 
-  (specificly Oracle!) implement binding differently. My recommendation is to 
-  use binding if your database queries are too slow, but make sure you are using 
-  a database that supports it like Oracle. </p>
-<p>ADOdb supports portable Prepare/Execute with:</p>
-<pre>$stmt = $db->Prepare('select * from customers where custid=? and state=?');
-$rs = $db->Execute($stmt, array($id,'New York'));</pre>
-<p>Oracle uses named bind placeholders, not "?", so to support portable binding, we have Param() that generates 
-the correct placeholder (available since ADOdb 3.92):
-<pre><font color="#000000">$sql = <font color="#993300">'insert into table (col1,col2) values ('</font>.$DB->Param('a').<font color="#993300">','</font>.$DB->Param('b').<font color="#993300">')'</font>;
-<font color="#006600"># generates 'insert into table (col1,col2) values (?,?)'
-# or        'insert into table (col1,col2) values (:a,:b)</font>'
-$stmt = $DB->Prepare($sql);
-$stmt = $DB->Execute($stmt,array('one','two'));
-</font></pre>
-<a name="native"></a>
-<h2>Portable Native SQL</h2>
-<p>ADOdb provides the following functions for portably generating SQL functions 
-  as strings to be merged into your SQL statements (some are only available since 
-  ADOdb 3.92): </p>
-<table width="75%" border="1" align=center>
-  <tr> 
-    <td width=30%><b>Function</b></td>
-    <td><b>Description</b></td>
-  </tr>
-  <tr> 
-    <td>DBDate($date)</td>
-    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a date 
-      string formatted for INSERT/UPDATE</td>
-  </tr>
-  <tr> 
-    <td>DBTimeStamp($date)</td>
-    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp 
-      string formatted for INSERT/UPDATE</td>
-  </tr>
-  <tr> 
-    <td>SQLDate($date, $fmt)</td>
-    <td>Portably generate a date formatted using $fmt mask, for use in SELECT 
-      statements.</td>
-  </tr>
-  <tr> 
-    <td>OffsetDate($date, $ndays)</td>
-    <td>Portably generate a $date offset by $ndays.</td>
-  </tr>
-  <tr> 
-    <td>Concat($s1, $s2, ...)</td>
-    <td>Portably concatenate strings. Alternatively, for mssql use mssqlpo driver, 
-      which allows || operator.</td>
-  </tr>
-  <tr> 
-    <td>IfNull($fld, $replaceNull)</td>
-    <td>Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.</td>
-  </tr>
-  <tr>
-    <td>Param($name)</td>
-    <td>Generates bind placeholders, using ? or named conventions as appropriate.</td>
-  </tr>
-  <tr><td>$db->sysDate</td><td>Property that holds the SQL function that returns today's date</td>
-</tr>
-<tr><td>$db->sysTimeStamp</td><td>Property that holds the SQL function that returns the current
-timestamp (date+time).
-</td>
-</tr>
-<tr>
-<td>$db->concat_operator</td><td>Property that holds the concatenation operator
-</td>
-</tr>
-<tr><td>$db->length</td><td>Property that holds the name of the SQL strlen function.
-</td></tr>
-
-<tr><td>$db->upperCase</td><td>Property that holds the name of the SQL strtoupper function.
-</td></tr>
-<tr><td>$db->random</td><td>Property that holds the SQL to generate a random number between 0.00 and 1.00.
-</td>
-</tr>
-<tr><td>$db->substr</td><td>Property that holds the name of the SQL substring function.
-</td></tr>
-</table>
-<p>  </p>
-<h2>DDL and Tuning</h2>
-There are database design tools such as ERWin or Dezign that allow you to generate data definition language commands such as ALTER TABLE or CREATE INDEX from Entity-Relationship diagrams. 
-<p>
-However if you prefer to use a PHP-based table creation scheme, adodb provides you with this feature. Here is the code to generate the SQL to create a table with: 
-<ol>
-	<li> Auto-increment primary key 'ID', </li>
-	<li>The person's 'NAME' VARCHAR(32) NOT NULL and defaults to '', </li>
-	<li>The date and time of record creation 'CREATED', </li>
-	<li> The person's 'AGE', defaulting to 0, type NUMERIC(16). </li>
-</ol>
-<p>
-Also create a compound index consisting of 'NAME' and 'AGE': 
-<pre>
-$datadict = <strong>NewDataDictionary</strong>($connection);
-$flds = " 
-<font color="#660000">  ID I AUTOINCREMENT PRIMARY,
-  NAME C(32) DEFAULT '' NOTNULL,
-  CREATED T DEFTIMESTAMP,
-  AGE N(16) DEFAULT 0</font>
-";
-$sql1 = $datadict-><strong>CreateTableSQL</strong>('tabname', $flds);
-$sql2 = $datadict-><strong>CreateIndexSQL</strong>('idx_name_age', 'tabname', 'NAME,AGE');
-</pre>
-
-<h3>Data Types</h3>
-<p>Stick to a few data types that are available in most databases. Char, varchar 
-  and numeric/number are supported by most databases. Most other data types (including 
-  integer, boolean and float) cannot be relied on being available. I recommend 
-  using char(1) or number(1) to hold booleans. </p>
-<p>Different databases have different ways of representing dates and timestamps/datetime. 
-  ADOdb attempts to display all dates in ISO (YYYY-MM-DD) format. ADOdb also provides 
-  DBDate( ) and DBTimeStamp( ) to convert dates to formats that are acceptable 
-  to that database. Both functions accept Unix integer timestamps and date strings 
-  in ISO format.</p>
-<pre>$date1 = $connection->DBDate(time( ));<br>$date2 = $connection->DBTimeStamp('2002-02-23 13:03:33');</pre>
-<p>We also provide functions to convert database dates to Unix timestamps:</p>
-<pre>$unixts = $recordset->UnixDate('#2002-02-30#'); <font color="green"># MS Access date =gt; unix timestamp</font></pre>
-<p>For date calculations, we have OffsetDate which allows you to calculate dates such as <i>yesterday</i> and <i>next week</i> in a RDBMS independant fashion. For example, if we want to set a field to 6 hour from now, use:
-<pre>
-$sql = 'update table set dtimefld='.$db->OffsetDate($db-&gtsysTimeStamp, 6/24).' where ...';
-</pre>
-<p>The maximum length of a char/varchar field is also database specific. You can 
-  only assume that field lengths of up to 250 characters are supported. This is 
-  normally impractical for web based forum or content management systems. You 
-  will need to be familiar with how databases handle large objects (LOBs). ADOdb 
-  implements two functions, UpdateBlob( ) and UpdateClob( ) that allow you to 
-  update fields holding Binary Large Objects (eg. pictures) and Character Large 
-  Objects (eg. HTML articles):</p>
-<pre><font color=green># for oracle </font>
-$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1,empty_blob())'); 
-$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1'); 
-   
-<font color=green># non-oracle databases</font>
-$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); 
-$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
-</pre>
-<p>Null handling is another area where differences can occur. This is a mine-field, 
-  because 3-value logic is tricky.
-<p>In general, I avoid using nulls except for dates and default all my numeric 
-  and character fields to 0 or the empty string. This maintains consistency with 
-  PHP, where empty strings and zero are treated as equivalent, and avoids SQL 
-  ambiguities when you use the ANY and EXISTS operators. However if your database 
-  has significant amounts of missing or unknown data, using nulls might be a good 
-  idea. 
-  <p>
-  ADOdb also supports a portable <a href=http://phplens.com/adodb/reference.functions.concat.html#ifnull>IfNull</a> function, so you can define what to display
-  if the field contains a null.
-<h3><b>Stored Procedures</b></h3>
-<p>Stored procedures are another problem area. Some databases allow recordsets 
-  to be returned in a stored procedure (Microsoft SQL Server and Sybase), and 
-  others only allow output parameters to be returned. Stored procedures sometimes 
-  need to be wrapped in special syntax. For example, Oracle requires such code 
-  to be wrapped in an anonymous block with BEGIN and END. Also internal sql operators 
-  and functions such as +, ||, TRIM( ), SUBSTR( ) or INSTR( ) vary between vendors. 
-</p>
-<p>An example of how to call a stored procedure with 2 parameters and 1 return 
-  value follows:</p>
-<pre>	switch ($db->databaseType) {
-	case '<font color="#993300">mssql</font>':
-	  $sql = <font color="#000000"><font color="#993333">'<font color="#993300">SP_RUNSOMETHING</font>'</font></font>; break;
-	case '<font color="#993300">oci8</font>':
-	  $sql = 
-<font color="#993300">	  </font><font color="#000000"><font color="#993300">"declare RETVAL integer;begin :RETVAL := </font><font color="#000000"><font color="#993333"><font color="#993300">SP_RUNSOMETHING</font></font></font><font color="#993300">(:myid,:group);end;";
-</font>	  break;</font>
-	default:
-	  die('<font color="#993300">Unsupported feature</font>');
-	}
-<font color="#000000"><font color="green">	# @RETVAL = SP_RUNSOMETHING @myid, at group</font>
-	$stmt = $db->PrepareSP($sql);	<br>	$db->Parameter($stmt,$id,'<font color="#993300">myid</font>'); 
-	$db->Parameter($stmt,$group,'<font color="#993300">group</font>');
-	<font color="green"># true indicates output parameter<br>	</font>$db->Parameter($stmt,$ret,'<font color="#993300">RETVAL</font>',true); 
-	$db->Execute($stmt); </font></pre>
-<p>As you can see, the ADOdb API is the same for both databases. But the stored 
-  procedure SQL syntax is quite different between databases and is not portable, 
-  so be forewarned! However sometimes you have little choice as some systems only 
-  allow data to be accessed via stored procedures. This is when the ultimate portability 
-  solution might be the only solution: <i>treating portable SQL as a localization 
-  exercise...</i></p>
-<h3><b>SQL as a Localization Exercise</b></h3>
-<p> In general to provide real portability, you will have to treat SQL coding 
-  as a localization exercise. In PHP, it has become common to define separate 
-  language files for English, Russian, Korean, etc. Similarly, I would suggest 
-  you have separate Sybase, Intebase, MySQL, etc files, and conditionally include 
-  the SQL based on the database. For example, each MySQL SQL statement would be 
-  stored in a separate variable, in a file called 'mysql-lang.inc.php'.</p>
-<pre>$sqlGetPassword = '<font color="#993300">select password from users where userid=%s</font>';
-$sqlSearchKeyword = quot;<font color="#993300">SELECT * FROM articles WHERE match (title,body) against (%s</font>)";</pre>
-<p>In our main PHP file:</p>
-<pre><font color=green># define which database to load...</font>
-<b>$database = '<font color="#993300">mysql</font>';
-include_once("<font color="#993300">$database-lang.inc.php</font>");</b>
-
-$db = NewADOConnection($database);
-$db->PConnect(...) or die('<font color="#993300">Failed to connect to database</font>');
-
-<font color=green># search for a keyword $word</font>
-$rs = $db->Execute(sprintf($sqlSearchKeyWord,$db->qstr($word)));</pre>
-<p>Note that we quote the $word variable using the qstr( ) function. This is because 
-  each database quotes strings using different conventions.</p>
-<p>
-<h3>Final Thoughts</h3>
-<p>The best way to ensure that you have portable SQL is to have your data tables designed using 
-sound principles. Learn the theory of normalization and entity-relationship diagrams and model 
-your data carefully. Understand how joins and indexes work and how they are used to tune performance.
-<p> Visit the following page for more references on database theory and vendors: 
-  <a href="http://php.weblogs.com/sql_tutorial">http://php.weblogs.com/sql_tutorial</a>. 
-  Also read this article on <a href=http://phplens.com/lens/php-book/optimizing-debugging-php.php>Optimizing PHP</a>.
-<p>
-<font size=1>(c) 2002-2003 John Lim.</font>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<title>Tips on Writing Portable SQL for Multiple Databases for PHP</title>
+</head>
+
+<body bgcolor=white>
+<table width=100% border=0><tr><td><h2>Tips on Writing Portable SQL  </h2></td><td>
+ <div align=right><img src="cute_icons_for_site/adodb.gif"></div></td></tr></table>
+  <p>Updated 6 Oct 2006. Added OffsetDate example.
+  <p>Updated 18 Sep 2003. Added Portable Native SQL section.
+<p>
+
+ If you are writing an application that is used in multiple environments and
+  operating systems, you need to plan to support multiple databases. This article
+  is based on my experiences with multiple database systems, stretching from 4th
+  Dimension in my Mac days, to the databases I currently use, which are: Oracle,
+  FoxPro, Access, MS SQL Server and MySQL. Although most of the advice here applies
+  to using SQL with Perl, Python and other programming languages, I will focus on PHP and how
+  the <a href="http://adodb.sourceforge.net/">ADOdb</a> database abstraction library
+  offers some solutions.<p></p>
+<p>Most database vendors practice product lock-in. The best or fastest way to
+  do things is often implemented using proprietary extensions to SQL. This makes
+  it extremely hard to write portable SQL code that performs well under all conditions.
+  When the first ANSI committee got together in 1984 to standardize SQL, the database
+  vendors had such different implementations that they could only agree on the
+  core functionality of SQL. Many important application specific requirements
+  were not standardized, and after so many years since the ANSI effort began,
+  it looks as if much useful database functionality will never be standardized.
+  Even though ANSI-92 SQL has codified much more, we still have to implement portability
+  at the application level.</p>
+<h3><b>Selects</b></h3>
+<p>The SELECT statement has been standardized to a great degree. Nearly every
+  database supports the following:</p>
+<p>SELECT [cols] FROM [tables]<br>
+    [WHERE conditions]<br>
+    [GROUP BY cols]<br>
+    [HAVING conditions] <br>
+    [ORDER BY cols]</p>
+<p>But so many useful techniques can only be implemented by using proprietary
+  extensions. For example, when writing SQL to retrieve the first 10 rows for
+  paging, you could write...</p>
+<table width="80%" border="1" cellspacing="0" cellpadding="0" align="center">
+  <tr>
+	<td><b>Database</b></td>
+	<td><b>SQL Syntax</b></td>
+  </tr>
+  <tr>
+	<td>DB2</td>
+	<td>select * from table fetch first 10 rows only</td>
+  </tr>
+  <tr>
+	<td>Informix</td>
+	<td>select first 10 * from table</td>
+  </tr>
+  <tr>
+	<td>Microsoft SQL Server and Access</td>
+	<td>select top 10 * from table</td>
+  </tr>
+  <tr>
+	<td>MySQL and PostgreSQL</td>
+	<td>select * from table limit 10</td>
+  </tr>
+  <tr>
+	<td>Oracle 8i</td>
+	<td>select * from (select * from table) where rownum <= 10</td>
+  </tr>
+</table>
+<p>This feature of getting a subset of data is so useful that in the PHP class
+  library ADOdb, we have a SelectLimit( ) function that allows you to hide the
+  implementation details within a function that will rewrite your SQL for you:</p>
+<pre>$connection->SelectLimit('select * from table', 10);
+</pre>
+<p><b>Selects: Fetch Modes</b></p>
+<p>PHP allows you to retrieve database records as arrays. You can choose to have
+  the arrays indexed by field name or number. However different low-level PHP
+  database drivers are inconsistent in their indexing efforts. ADOdb allows you
+  to determine your prefered mode. You set this by setting the variable $ADODB_FETCH_MODE
+  to either of the constants ADODB_FETCH_NUM (for numeric indexes) or ADODB_FETCH_ASSOC
+  (using field names as an associative index).</p>
+<p>The default behaviour of ADOdb varies depending on the database you are using.
+  For consistency, set the fetch mode to either ADODB_FETCH_NUM (for speed) or
+  ADODB_FETCH_ASSOC (for convenience) at the beginning of your code. </p>
+<p><b>Selects: Counting Records</b></p>
+<p>Another problem with SELECTs is that some databases do not return the number
+  of rows retrieved from a select statement. This is because the highest performance
+  databases will return records to you even before the last record has been found.
+</p>
+<p>In ADOdb, RecordCount( ) returns the number of rows returned, or will emulate
+  it by buffering the rows and returning the count after all rows have been returned.
+  This can be disabled for performance reasons when retrieving large recordsets
+  by setting the global variable $ADODB_COUNTRECS = false. This variable is checked
+  every time a query is executed, so you can selectively choose which recordsets
+  to count.</p>
+<p>If you prefer to set $ADODB_COUNTRECS = false, ADOdb still has the PO_RecordCount(
+  ) function. This will return the number of rows, or if it is not found, it will
+  return an estimate using SELECT COUNT(*):</p>
+<pre>$rs = $db->Execute("select * from table where state=$state");
+$numrows = $rs->PO_RecordCount('table', "state=$state");</pre>
+<p><b>Selects: Locking</b> </p>
+<p>SELECT statements are commonly used to implement row-level locking of tables.
+  Other databases such as Oracle, Interbase, PostgreSQL and MySQL with InnoDB
+  do not require row-level locking because they use versioning to display data
+  consistent with a specific point in time.</p>
+<p>Currently, I recommend encapsulating the row-level locking in a separate function,
+  such as RowLock($table, $where):</p>
+<pre>$connection->BeginTrans( );
+$connection->RowLock($table, $where); </pre>
+<pre><font color=green># some operation</font></pre>
+<pre>if ($ok) $connection->CommitTrans( );
+else $connection->RollbackTrans( );
+</pre>
+<p><b>Selects: Outer Joins</b></p>
+<p>Not all databases support outer joins. Furthermore the syntax for outer joins
+  differs dramatically between database vendors. One portable (and possibly slower)
+  method of implementing outer joins is using UNION.</p>
+<p>For example, an ANSI-92 left outer join between two tables t1 and t2 could
+  look like:</p>
+<pre>SELECT t1.col1, t1.col2, t2.cola <br>  FROM t1 <i>LEFT JOIN</i> t2 ON t1.col = t2.col</pre>
+<p>This can be emulated using:</p>
+<pre>SELECT t1.col1, t1.col2, t2.cola FROM t1, t2 <br>	   WHERE t1.col = t2.col
+   UNION ALL
+SELECT col1, col2, null FROM t1 <br>	   WHERE t1.col not in (select distinct col from t2)
+</pre>
+<p>Since ADOdb 2.13, we provide some hints in the connection object as to legal
+  join variations. This is still incomplete and sometimes depends on the database
+  version you are using, but is useful as a general guideline:</p>
+<p><font face="Courier New, Courier, mono">$conn->leftOuter</font>: holds the
+  operator used for left outer joins (eg. '*='), or false if not known or not
+  available.<br>
+  <font face="Courier New, Courier, mono">$conn->rightOuter</font>: holds the
+  operator used for right outer joins (eg '=*'), or false if not known or not
+  available.<br>
+  <font face="Courier New, Courier, mono">$conn->ansiOuter</font>: boolean
+  that if true means that ANSI-92 style outer joins are supported, or false if
+  not known.</p>
+<h3><b>Inserts</b> </h3>
+<p>When you create records, you need to generate unique id's for each record.
+  There are two common techniques: (1) auto-incrementing columns and (2) sequences.
+</p>
+<p>Auto-incrementing columns are supported by MySQL, Sybase and Microsoft Access
+  and SQL Server. However most other databases do not support this feature. So
+  for portability, you have little choice but to use sequences. Sequences are
+  special functions that return a unique incrementing number every time you call
+  it, suitable to be used as database keys. In ADOdb, we use the GenID( ) function.
+  It has takes a parameter, the sequence name. Different tables can have different
+  sequences. </p>
+<pre>$id = $connection->GenID('sequence_name');<br>$connection->Execute("insert into table (id, firstname, lastname) <br>			   values ($id, $firstname, $lastname)");</pre>
+<p>For databases that do not support sequences natively, ADOdb emulates sequences
+  by creating a table for every sequence.</p>
+<h3><b>Binding</b></h3>
+<p>Binding variables in an SQL statement is another tricky feature. Binding is
+  useful because it allows pre-compilation of SQL. When inserting multiple records
+  into a database in a loop, binding can offer a 50% (or greater) speedup. However
+  many databases such as Access and MySQL do not support binding natively and
+  there is some overhead in emulating binding. Furthermore, different databases
+  (specificly Oracle!) implement binding differently. My recommendation is to
+  use binding if your database queries are too slow, but make sure you are using
+  a database that supports it like Oracle. </p>
+<p>ADOdb supports portable Prepare/Execute with:</p>
+<pre>$stmt = $db->Prepare('select * from customers where custid=? and state=?');
+$rs = $db->Execute($stmt, array($id,'New York'));</pre>
+<p>Oracle uses named bind placeholders, not "?", so to support portable binding, we have Param() that generates
+the correct placeholder (available since ADOdb 3.92):
+<pre><font color="#000000">$sql = <font color="#993300">'insert into table (col1,col2) values ('</font>.$DB->Param('a').<font color="#993300">','</font>.$DB->Param('b').<font color="#993300">')'</font>;
+<font color="#006600"># generates 'insert into table (col1,col2) values (?,?)'
+# or        'insert into table (col1,col2) values (:a,:b)</font>'
+$stmt = $DB->Prepare($sql);
+$stmt = $DB->Execute($stmt,array('one','two'));
+</font></pre>
+<a name="native"></a>
+<h2>Portable Native SQL</h2>
+<p>ADOdb provides the following functions for portably generating SQL functions
+  as strings to be merged into your SQL statements (some are only available since
+  ADOdb 3.92): </p>
+<table width="75%" border="1" align=center>
+  <tr>
+    <td width=30%><b>Function</b></td>
+    <td><b>Description</b></td>
+  </tr>
+  <tr>
+    <td>DBDate($date)</td>
+    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a date
+      string formatted for INSERT/UPDATE</td>
+  </tr>
+  <tr>
+    <td>DBTimeStamp($date)</td>
+    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp
+      string formatted for INSERT/UPDATE</td>
+  </tr>
+  <tr>
+    <td>SQLDate($date, $fmt)</td>
+    <td>Portably generate a date formatted using $fmt mask, for use in SELECT
+      statements.</td>
+  </tr>
+  <tr>
+    <td>OffsetDate($date, $ndays)</td>
+    <td>Portably generate a $date offset by $ndays.</td>
+  </tr>
+  <tr>
+    <td>Concat($s1, $s2, ...)</td>
+    <td>Portably concatenate strings. Alternatively, for mssql use mssqlpo driver,
+      which allows || operator.</td>
+  </tr>
+  <tr>
+    <td>IfNull($fld, $replaceNull)</td>
+    <td>Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.</td>
+  </tr>
+  <tr>
+    <td>Param($name)</td>
+    <td>Generates bind placeholders, using ? or named conventions as appropriate.</td>
+  </tr>
+  <tr><td>$db->sysDate</td><td>Property that holds the SQL function that returns today's date</td>
+</tr>
+<tr><td>$db->sysTimeStamp</td><td>Property that holds the SQL function that returns the current
+timestamp (date+time).
+</td>
+</tr>
+<tr>
+<td>$db->concat_operator</td><td>Property that holds the concatenation operator
+</td>
+</tr>
+<tr><td>$db->length</td><td>Property that holds the name of the SQL strlen function.
+</td></tr>
+
+<tr><td>$db->upperCase</td><td>Property that holds the name of the SQL strtoupper function.
+</td></tr>
+<tr><td>$db->random</td><td>Property that holds the SQL to generate a random number between 0.00 and 1.00.
+</td>
+</tr>
+<tr><td>$db->substr</td><td>Property that holds the name of the SQL substring function.
+</td></tr>
+</table>
+<p>  </p>
+<h2>DDL and Tuning</h2>
+There are database design tools such as ERWin or Dezign that allow you to generate data definition language commands such as ALTER TABLE or CREATE INDEX from Entity-Relationship diagrams.
+<p>
+However if you prefer to use a PHP-based table creation scheme, adodb provides you with this feature. Here is the code to generate the SQL to create a table with:
+<ol>
+	<li> Auto-increment primary key 'ID', </li>
+	<li>The person's 'NAME' VARCHAR(32) NOT NULL and defaults to '', </li>
+	<li>The date and time of record creation 'CREATED', </li>
+	<li> The person's 'AGE', defaulting to 0, type NUMERIC(16). </li>
+</ol>
+<p>
+Also create a compound index consisting of 'NAME' and 'AGE':
+<pre>
+$datadict = <strong>NewDataDictionary</strong>($connection);
+$flds = "
+<font color="#660000">  ID I AUTOINCREMENT PRIMARY,
+  NAME C(32) DEFAULT '' NOTNULL,
+  CREATED T DEFTIMESTAMP,
+  AGE N(16) DEFAULT 0</font>
+";
+$sql1 = $datadict-><strong>CreateTableSQL</strong>('tabname', $flds);
+$sql2 = $datadict-><strong>CreateIndexSQL</strong>('idx_name_age', 'tabname', 'NAME,AGE');
+</pre>
+
+<h3>Data Types</h3>
+<p>Stick to a few data types that are available in most databases. Char, varchar
+  and numeric/number are supported by most databases. Most other data types (including
+  integer, boolean and float) cannot be relied on being available. I recommend
+  using char(1) or number(1) to hold booleans. </p>
+<p>Different databases have different ways of representing dates and timestamps/datetime.
+  ADOdb attempts to display all dates in ISO (YYYY-MM-DD) format. ADOdb also provides
+  DBDate( ) and DBTimeStamp( ) to convert dates to formats that are acceptable
+  to that database. Both functions accept Unix integer timestamps and date strings
+  in ISO format.</p>
+<pre>$date1 = $connection->DBDate(time( ));<br>$date2 = $connection->DBTimeStamp('2002-02-23 13:03:33');</pre>
+<p>We also provide functions to convert database dates to Unix timestamps:</p>
+<pre>$unixts = $recordset->UnixDate('#2002-02-30#'); <font color="green"># MS Access date =gt; unix timestamp</font></pre>
+<p>For date calculations, we have OffsetDate which allows you to calculate dates such as <i>yesterday</i> and <i>next week</i> in a RDBMS independant fashion. For example, if we want to set a field to 6 hour from now, use:
+<pre>
+$sql = 'update table set dtimefld='.$db->OffsetDate($db-&gtsysTimeStamp, 6/24).' where ...';
+</pre>
+<p>The maximum length of a char/varchar field is also database specific. You can
+  only assume that field lengths of up to 250 characters are supported. This is
+  normally impractical for web based forum or content management systems. You
+  will need to be familiar with how databases handle large objects (LOBs). ADOdb
+  implements two functions, UpdateBlob( ) and UpdateClob( ) that allow you to
+  update fields holding Binary Large Objects (eg. pictures) and Character Large
+  Objects (eg. HTML articles):</p>
+<pre><font color=green># for oracle </font>
+$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1,empty_blob())');
+$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
+
+<font color=green># non-oracle databases</font>
+$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
+</pre>
+<p>Null handling is another area where differences can occur. This is a mine-field,
+  because 3-value logic is tricky.
+<p>In general, I avoid using nulls except for dates and default all my numeric
+  and character fields to 0 or the empty string. This maintains consistency with
+  PHP, where empty strings and zero are treated as equivalent, and avoids SQL
+  ambiguities when you use the ANY and EXISTS operators. However if your database
+  has significant amounts of missing or unknown data, using nulls might be a good
+  idea.
+  <p>
+  ADOdb also supports a portable <a href=http://phplens.com/adodb/reference.functions.concat.html#ifnull>IfNull</a> function, so you can define what to display
+  if the field contains a null.
+<h3><b>Stored Procedures</b></h3>
+<p>Stored procedures are another problem area. Some databases allow recordsets
+  to be returned in a stored procedure (Microsoft SQL Server and Sybase), and
+  others only allow output parameters to be returned. Stored procedures sometimes
+  need to be wrapped in special syntax. For example, Oracle requires such code
+  to be wrapped in an anonymous block with BEGIN and END. Also internal sql operators
+  and functions such as +, ||, TRIM( ), SUBSTR( ) or INSTR( ) vary between vendors.
+</p>
+<p>An example of how to call a stored procedure with 2 parameters and 1 return
+  value follows:</p>
+<pre>	switch ($db->databaseType) {
+	case '<font color="#993300">mssql</font>':
+	  $sql = <font color="#000000"><font color="#993333">'<font color="#993300">SP_RUNSOMETHING</font>'</font></font>; break;
+	case '<font color="#993300">oci8</font>':
+	  $sql =
+<font color="#993300">	  </font><font color="#000000"><font color="#993300">"declare RETVAL integer;begin :RETVAL := </font><font color="#000000"><font color="#993333"><font color="#993300">SP_RUNSOMETHING</font></font></font><font color="#993300">(:myid,:group);end;";
+</font>	  break;</font>
+	default:
+	  die('<font color="#993300">Unsupported feature</font>');
+	}
+<font color="#000000"><font color="green">	# @RETVAL = SP_RUNSOMETHING @myid, at group</font>
+	$stmt = $db->PrepareSP($sql);	<br>	$db->Parameter($stmt,$id,'<font color="#993300">myid</font>');
+	$db->Parameter($stmt,$group,'<font color="#993300">group</font>');
+	<font color="green"># true indicates output parameter<br>	</font>$db->Parameter($stmt,$ret,'<font color="#993300">RETVAL</font>',true);
+	$db->Execute($stmt); </font></pre>
+<p>As you can see, the ADOdb API is the same for both databases. But the stored
+  procedure SQL syntax is quite different between databases and is not portable,
+  so be forewarned! However sometimes you have little choice as some systems only
+  allow data to be accessed via stored procedures. This is when the ultimate portability
+  solution might be the only solution: <i>treating portable SQL as a localization
+  exercise...</i></p>
+<h3><b>SQL as a Localization Exercise</b></h3>
+<p> In general to provide real portability, you will have to treat SQL coding
+  as a localization exercise. In PHP, it has become common to define separate
+  language files for English, Russian, Korean, etc. Similarly, I would suggest
+  you have separate Sybase, Intebase, MySQL, etc files, and conditionally include
+  the SQL based on the database. For example, each MySQL SQL statement would be
+  stored in a separate variable, in a file called 'mysql-lang.inc.php'.</p>
+<pre>$sqlGetPassword = '<font color="#993300">select password from users where userid=%s</font>';
+$sqlSearchKeyword = quot;<font color="#993300">SELECT * FROM articles WHERE match (title,body) against (%s</font>)";</pre>
+<p>In our main PHP file:</p>
+<pre><font color=green># define which database to load...</font>
+<b>$database = '<font color="#993300">mysql</font>';
+include_once("<font color="#993300">$database-lang.inc.php</font>");</b>
+
+$db = NewADOConnection($database);
+$db->PConnect(...) or die('<font color="#993300">Failed to connect to database</font>');
+
+<font color=green># search for a keyword $word</font>
+$rs = $db->Execute(sprintf($sqlSearchKeyWord,$db->qstr($word)));</pre>
+<p>Note that we quote the $word variable using the qstr( ) function. This is because
+  each database quotes strings using different conventions.</p>
+<p>
+<h3>Final Thoughts</h3>
+<p>The best way to ensure that you have portable SQL is to have your data tables designed using
+sound principles. Learn the theory of normalization and entity-relationship diagrams and model
+your data carefully. Understand how joins and indexes work and how they are used to tune performance.
+<p> Visit the following page for more references on database theory and vendors:
+  <a href="http://php.weblogs.com/sql_tutorial">http://php.weblogs.com/sql_tutorial</a>.
+  Also read this article on <a href=http://phplens.com/lens/php-book/optimizing-debugging-php.php>Optimizing PHP</a>.
+<p>
+<font size=1>(c) 2002-2014 John Lim.</font>
+
+</body>
+</html>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/tute.htm b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/tute.htm
index 408ba75..6f32da4 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/docs/tute.htm
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/docs/tute.htm
@@ -1,290 +1,290 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>Tutorial: Moving from MySQL to ADODB</title>
-</head>
-
-<body bgcolor=white>
-<h1>Tutorial: Moving from MySQL to ADODB</h1>
-
-<pre>		You say eether and I say eyether, 
-		You say neether and I say nyther; 
-		Eether, eyether, neether, nyther - 
-		Let's call the whole thing off ! 
-<br>
-		You like potato and I like po-tah-to, 
-		You like tomato and I like to-mah-to; 
-		Potato, po-tah-to, tomato, to-mah-to - 
-		Let's call the whole thing off ! 
-</pre>
-<p>I love this song, especially the version with Louis Armstrong and Ella singing 
-  duet. It is all about how hard it is for two people in love to be compatible 
-  with each other. It's about compromise and finding a common ground, and that's 
-  what this article is all about. 
-<p>PHP is all about creating dynamic web-sites with the least fuss and the most 
-  fun. To create these websites we need to use databases to retrieve login information, 
-  to splash dynamic news onto the web page and store forum postings. So let's 
-  say we were using the popular MySQL database for this. Your company has done 
-  such a fantastic job that the Web site is more popular than your wildest dreams. 
-  You find that MySQL cannot scale to handle the workload; time to switch databases. 
-<p> Unfortunately in PHP every database is accessed slightly differently. To connect 
-  to MySQL, you would use <i>mysql_connect()</i>; when you decide to upgrade to 
-  Oracle or Microsoft SQL Server, you would use <i>ocilogon() </i>or <i>mssql_connect()</i> 
-  respectively. What is worse is that the parameters you use for the different 
-  connect functions are different also.. One database says po-tato, the other 
-  database says pota-to. Oh-oh. 
-<h3>Let's NOT call the whole thing off</h3>
-<p>A database wrapper library such as ADODB comes in handy when you need to ensure portability. It provides 
-  you with a common API to communicate with any supported database so you don't have to call things off. <p>
-
-<p>ADODB stands for Active Data Objects DataBase (sorry computer guys are sometimes 
-  not very original). ADODB currently supports MySQL, PostgreSQL, Oracle, Interbase, 
-  Microsoft SQL Server, Access, FoxPro, Sybase, ODBC and ADO. You can download 
-  ADODB from <a href=http://php.weblogs.com/adodb></a><a href="http://php.weblogs.com/adodb">http://php.weblogs.com/adodb</a>.
-<h3>MySQL Example</h3>
-<p>The most common database used with PHP is MySQL, so I guess you should be familiar 
-  with the following code. It connects to a MySQL server at <i>localhost</i>, 
-  database <i>mydb</i>, and executes an SQL select statement. The results are 
-  printed, one line per row. 
-<pre><font color="#666600">$db = <b>mysql_connect</b>("localhost", "root", "password");
-<b>mysql_select_db</b>("mydb",$db);</font>
-<font color="#660000">$result = <b>mysql_query</b>("SELECT * FROM employees",$db)</font><code><font color="#663300">;
-if ($result === false) die("failed");</font></code> 
-<font color="#006666"><b>while</b> ($fields =<b> mysql_fetch_row</b>($result)) {
- <b>for</b> ($i=0, $max=sizeof($fields); $i < $max; $i++) {
-		<b>print</b> $fields[$i].' ';
- }
- <b>print</b> "<br>\n";
-}</font> 
-</pre>
-<p>The above code has been color-coded by section. The first section is the connection 
-  phase. The second is the execution of the SQL, and the last section is displaying 
-  the fields. The <i>while</i> loop scans the rows of the result, while the <i>for</i> 
-  loop scans the fields in one row.</p>
-<p>Here is the equivalent code in ADODB</p>
-<pre><b><font color="#666600"> include("adodb.inc.php");</font></b><font color="#666600">
- $db = <b>NewADOConnection</b>('mysql');
- $db-><b>Connect</b>("localhost", "root", "password", "mydb");</font>
- <font color="#663300">$result = $db-><b>Execute</b>("SELECT * FROM employees");
- </font><font color="#663300"></font><code><font color="#663300">if ($result === false) die("failed")</font></code><code><font color="#663300">;</font></code>  
- <font color="#006666"><b>while</b> (!$result->EOF) {
-	<b>for</b> ($i=0, $max=$result-><b>FieldCount</b>(); $i < $max; $i++)
-		   <b>print</b> $result->fields[$i].' ';
-	$result-><b>MoveNext</b>();
-	<b>print</b> "<br>\n";
- }</font> </pre>
-<p></p>
-<p>Now porting to Oracle is as simple as changing the second line to <code>NewADOConnection('oracle')</code>. 
-  Let's walk through the code...</p>
-<h3>Connecting to the Database</h3>
-<p></p>
-<pre><b><font color="#666600">include("adodb.inc.php");</font></b><font color="#666600">
-$db = <b>NewADOConnection</b>('mysql');
-$db-><b>Connect</b>("localhost", "root", "password", "mydb");</font></pre>
-<p>The connection code is a bit more sophisticated than MySQL's because our needs 
-  are more sophisticated. In ADODB, we use an object-oriented approach to managing 
-  the complexity of handling multiple databases. We have different classes to 
-  handle different databases. If you aren't familiar with object-oriented programing, 
-  don't worry -- the complexity is all hidden away in the<code> NewADOConnection()</code> 
-  function.</p>
-<p>To conserve memory, we only load the PHP code specific to the database you 
-  are connecting to. We do this by calling <code>NewADOConnection(databasedriver)</code>. 
-  Legal database drivers include <i>mysql, mssql, oracle, oci8, postgres, sybase, 
-  vfp, access, ibase </i>and many others.</p>
-<p>Then we create a new instance of the connection class by calling <code>NewADOConnection()</code>. 
-  Finally we connect to the database using <code>$db->Connect(). </code></p>
-<h3>Executing the SQL</h3>
-<p><code><font color="#663300">$result = $db-><b>Execute</b>("SELECT * 
-  FROM employees");<br>
-  if ($result === false) die("failed")</font></code><code><font color="#663300">;</font></code> 
-  <br>
-</p>
-<p>Sending the SQL statement to the server is straight forward. Execute() will 
-  return a recordset object on successful execution. You should check $result 
-  as we do above.
-<p>An issue that confuses beginners is the fact that we have two types of objects 
-  in ADODB, the connection object and the recordset object. When do we use each?
-<p>The connection object ($db) is responsible for connecting to the database, 
-  formatting your SQL and querying the database server. The recordset object ($result) 
-  is responsible for retrieving the results and formatting the reply as text or 
-  as an array.
-<p>The only thing I need to add is that ADODB provides several helper functions 
-  for making INSERT and UPDATE statements easier, which we will cover in the Advanced 
-  section. 
-<h3>Retrieving the Data<br>
-</h3>
-<pre><font color="#006666"><b>while</b> (!$result->EOF) {
-   <b>for</b> ($i=0, $max=$result-><b>FieldCount</b>(); $i < $max; $i++)
-	   <b>print</b> $result->fields[$i].' ';
-   $result-><b>MoveNext</b>();
-   <b>print</b> "<br>\n";
-}</font></pre>
-<p>The paradigm for getting the data is that it's like reading a file. For every 
-  line, we check first whether we have reached the end-of-file (EOF). While not 
-  end-of-file, loop through each field in the row. Then move to the next line 
-  (MoveNext) and repeat. 
-<p>The <code>$result->fields[]</code> array is generated by the PHP database 
-  extension. Some database extensions do not index the array by field name. 
-  To force indexing by name - that is associative arrays - 
-  use the $ADODB_FETCH_MODE global variable. 
-<pre>
-	$<b>ADODB_FETCH_MODE</b> = ADODB_FETCH_NUM;
-	$rs1 = $db->Execute('select * from table');
-	$<b>ADODB_FETCH_MODE</b> = ADODB_FETCH_ASSOC;
-	$rs2 = $db->Execute('select * from table');
-	print_r($rs1->fields); // shows <i>array([0]=>'v0',[1] =>'v1')</i>
-	print_r($rs2->fields); // shows <i>array(['col1']=>'v0',['col2'] =>'v1')</i>
-</pre>
-<p>
-As you can see in the above example, both recordsets store and use different fetch modes
-based on the $ADODB_FETCH_MODE setting when the recordset was created by Execute().</p>
-<h2>ADOConnection<a name="ADOConnection"></a></h2>
-<p>Object that performs the connection to the database, executes SQL statements 
-  and has a set of utility functions for standardising the format of SQL statements 
-  for issues such as concatenation and date formats.</p>
-  
-<h3>Other Useful Functions</h3>
-<p><code>$recordset->Move($pos)</code> scrolls to that particular row. ADODB supports forward 
-  scrolling for all databases. Some databases will not support backwards scrolling. 
-  This is normally not a problem as you can always cache records to simulate backwards 
-  scrolling. 
-<p><code>$recordset->RecordCount()</code> returns the number of records accessed by the 
-  SQL statement. Some databases will return -1 because it is not supported. 
-<p><code>$recordset->GetArray()</code> returns the result as an array. 
-<p><code>rs2html($recordset)</code> is a function that is generates a HTML table based on the 
-  $recordset passed to it. An example with the relevant lines in bold:
-<pre>   include('adodb.inc.php'); 
-   <b>include('tohtml.inc.php');</b> /* includes the rs2html function */
-   $conn = ADONewConnection('mysql'); 
-   $conn->PConnect('localhost','userid','password','database');
-   $rs = $conn->Execute('select * from table');
-  <b> rs2html($rs)</b>; /* recordset to html table */ </pre>
-<p>There are many other helper functions that are listed in the documentation available at <a href="http://php.weblogs.com/adodb_manual"></a><a href="http://php.weblogs.com/adodb_manual">http://php.weblogs.com/adodb_manual</a>. 
-<h2>Advanced Material</h2>
-<h3>Inserts and Updates </h3>
-<p>Let's say you want to insert the following data into a database. 
-<p><b>ID</b> = 3<br>
-  <b>TheDate</b>=mktime(0,0,0,8,31,2001) /* 31st August 2001 */<br>
-  <b>Note</b>= sugar why don't we call it off 
-<p>When you move to another database, your insert might no longer work.</p>
-<p>The first problem is that each database has a different default date format. 
-  MySQL expects YYYY-MM-DD format, while other databases have different defaults. 
-  ADODB has a function called DBDate() that addresses this issue by converting 
-  converting the date to the correct format.</p>
-<p>The next problem is that the <b>don't</b> in the Note needs to be quoted. In 
-  MySQL, we use <b>don\'t</b> but in some other databases (Sybase, Access, Microsoft 
-  SQL Server) we use <b>don''t. </b>The qstr() function addresses this issue.</p>
-<p>So how do we use the functions? Like this:</p>
-<pre>$sql = "INSERT INTO table (id, thedate,note) values (" 
-   . $<b>ID</b> . ','
-   . $db->DBDate($<b>TheDate</b>) .','
-   . $db->qstr($<b>Note</b>).")";
-$db->Execute($sql);</pre>
-<p>ADODB also supports <code>$connection->Affected_Rows()</code> (returns the 
-  number of rows affected by last update or delete) and <code>$recordset->Insert_ID()</code> 
-  (returns last autoincrement number generated by an insert statement). Be forewarned 
-  that not all databases support the two functions.<br>
-</p>
-<h3>MetaTypes</h3>
-<p>You can find out more information about each of the fields (I use the words 
-  fields and columns interchangebly) you are selecting by calling the recordset 
-  method <code>FetchField($fieldoffset)</code>. This will return an object with 
-  3 properties: name, type and max_length. 
-<pre>For example:</pre>
-<pre>$recordset = $conn->Execute("select adate from table");<br>$f0 = $recordset->FetchField(0);
-</pre>
-<p>Then <code>$f0->name</code> will hold <i>'adata'</i>, <code>$f0->type</code> 
-  will be set to '<i>date'</i>. If the max_length is unknown, it will be set to 
-  -1. 
-<p>One problem with handling different databases is that each database often calls 
-  the same type by a different name. For example a <i>timestamp</i> type is called 
-  <i>datetime</i> in one database and <i>time</i> in another. So ADODB has a special 
-  <code>MetaType($type, $max_length)</code> function that standardises the types 
-  to the following: 
-<p>C: character and varchar types<br>
-  X: text or long character (eg. more than 255 bytes wide).<br>
-  B: blob or binary image<br>
-  D: date<br>
-  T: timestamp<br>
-  L: logical (boolean)<br>
-  I: integer<br>
-  N: numeric (float, double, money) 
-<p>In the above date example, 
-<p><code>$recordset = $conn->Execute("select adate from table");<br>
-  $f0 = $recordset->FetchField(0);<br>
-  $type = $recordset->MetaType($f0->type, $f0->max_length);<br>
-  print $type; /* should print 'D'</code> */
-<p> 
-<p><b>Select Limit and Top Support</b> 
-<p>ADODB has a function called $connection->SelectLimit($sql,$nrows,$offset) that allows
-you to retrieve a subset of the recordset. This will take advantage of native
-SELECT TOP on Microsoft products and SELECT ... LIMIT with PostgreSQL and MySQL, and
-emulated if the database does not support it.
-<p><b>Caching Support</b> 
-<p>ADODB allows you to cache recordsets in your file system, and only requery the database
-server after a certain timeout period with $connection->CacheExecute($secs2cache,$sql) and 
-$connection->CacheSelectLimit($secs2cache,$sql,$nrows,$offset).
-<p><b>PHP4 Session Handler Support</b> 
-<p>ADODB also supports PHP4 session handlers. You can store your session variables 
-  in a database for true scalability using ADODB. For further information, visit 
-  <a href="http://php.weblogs.com/adodb-sessions"></a><a href="http://php.weblogs.com/adodb-sessions">http://php.weblogs.com/adodb-sessions</a>
-<h3>Commercial Use Encouraged</h3>
-<p>If you plan to write commercial PHP applications that you want to resell, you should consider ADODB. It has been released using the lesser GPL, which means you can legally include it in commercial applications, while keeping your code proprietary. Commercial use of ADODB is strongly encouraged! We are using it internally for this reason.<p>
-
-<h2>Conclusion</h2>
-<p>As a thank you for finishing this article, here are the complete lyrics for 
-  <i>let's call the whole thing off</i>.<br>
-  <br>
-<pre>
-   Refrain 
-<br>
-		You say eether and I say eyether, 
-		You say neether and I say nyther; 
-		Eether, eyether, neether, nyther - 
-		Let's call the whole thing off ! 
-<br>
-		You like potato and I like po-tah-to, 
-		You like tomato and I like to-mah-to; 
-		Potato, po-tah-to, tomato, to-mah-to - 
-		Let's call the whole thing off ! 
-<br>
-But oh, if we call the whole thing off, then we must part. 
-And oh, if we ever part, then that might break my heart. 
-<br>
-		So, if you like pajamas and I like pa-jah-mas, 
-		I'll wear pajamas and give up pa-jah-mas. 
-		For we know we 
-		Need each other, so we 
-		Better call the calling off off. 
-		Let's call the whole thing off ! 
-<br>
-   Second Refrain 
-<br>
-		You say laughter and I say lawfter, 
-		You say after and I say awfter; 
-		Laughter, lawfter, after, awfter - 
-		Let's call the whole thing off ! 
-<br>
-		You like vanilla and I like vanella, 
-		You, sa's'parilla and I sa's'parella; 
-		Vanilla, vanella, choc'late, strawb'ry - 
-		Let's call the whole thing off ! 
-<br>
-But oh, if we call the whole thing off, then we must part. 
-And oh, if we ever part, then that might break my heart. 
-<br>
-		So, if you go for oysters and I go for ersters, 
-		I'll order oysters and cancel the ersters. 
-		For we know we 
-		Need each other, so we 
-		Better call the calling off off. 
-		Let's call the whole thing off ! 
-  </pre>
-<p><font size=2>Song and lyrics by George and Ira Gershwin, introduced by Fred Astaire and Ginger Rogers
-in the film "Shall We Dance?"  </font><p>
-<p>
-(c)2001-2002 John Lim.
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<title>Tutorial: Moving from MySQL to ADODB</title>
+</head>
+
+<body bgcolor=white>
+<h1>Tutorial: Moving from MySQL to ADODB</h1>
+
+<pre>		You say eether and I say eyether,
+		You say neether and I say nyther;
+		Eether, eyether, neether, nyther -
+		Let's call the whole thing off !
+<br>
+		You like potato and I like po-tah-to,
+		You like tomato and I like to-mah-to;
+		Potato, po-tah-to, tomato, to-mah-to -
+		Let's call the whole thing off !
+</pre>
+<p>I love this song, especially the version with Louis Armstrong and Ella singing
+  duet. It is all about how hard it is for two people in love to be compatible
+  with each other. It's about compromise and finding a common ground, and that's
+  what this article is all about.
+<p>PHP is all about creating dynamic web-sites with the least fuss and the most
+  fun. To create these websites we need to use databases to retrieve login information,
+  to splash dynamic news onto the web page and store forum postings. So let's
+  say we were using the popular MySQL database for this. Your company has done
+  such a fantastic job that the Web site is more popular than your wildest dreams.
+  You find that MySQL cannot scale to handle the workload; time to switch databases.
+<p> Unfortunately in PHP every database is accessed slightly differently. To connect
+  to MySQL, you would use <i>mysql_connect()</i>; when you decide to upgrade to
+  Oracle or Microsoft SQL Server, you would use <i>ocilogon() </i>or <i>mssql_connect()</i>
+  respectively. What is worse is that the parameters you use for the different
+  connect functions are different also.. One database says po-tato, the other
+  database says pota-to. Oh-oh.
+<h3>Let's NOT call the whole thing off</h3>
+<p>A database wrapper library such as ADODB comes in handy when you need to ensure portability. It provides
+  you with a common API to communicate with any supported database so you don't have to call things off. <p>
+
+<p>ADODB stands for Active Data Objects DataBase (sorry computer guys are sometimes
+  not very original). ADODB currently supports MySQL, PostgreSQL, Oracle, Interbase,
+  Microsoft SQL Server, Access, FoxPro, Sybase, ODBC and ADO. You can download
+  ADODB from <a href=http://php.weblogs.com/adodb></a><a href="http://php.weblogs.com/adodb">http://php.weblogs.com/adodb</a>.
+<h3>MySQL Example</h3>
+<p>The most common database used with PHP is MySQL, so I guess you should be familiar
+  with the following code. It connects to a MySQL server at <i>localhost</i>,
+  database <i>mydb</i>, and executes an SQL select statement. The results are
+  printed, one line per row.
+<pre><font color="#666600">$db = <b>mysql_connect</b>("localhost", "root", "password");
+<b>mysql_select_db</b>("mydb",$db);</font>
+<font color="#660000">$result = <b>mysql_query</b>("SELECT * FROM employees",$db)</font><code><font color="#663300">;
+if ($result === false) die("failed");</font></code>
+<font color="#006666"><b>while</b> ($fields =<b> mysql_fetch_row</b>($result)) {
+ <b>for</b> ($i=0, $max=sizeof($fields); $i < $max; $i++) {
+		<b>print</b> $fields[$i].' ';
+ }
+ <b>print</b> "<br>\n";
+}</font>
+</pre>
+<p>The above code has been color-coded by section. The first section is the connection
+  phase. The second is the execution of the SQL, and the last section is displaying
+  the fields. The <i>while</i> loop scans the rows of the result, while the <i>for</i>
+  loop scans the fields in one row.</p>
+<p>Here is the equivalent code in ADODB</p>
+<pre><b><font color="#666600"> include("adodb.inc.php");</font></b><font color="#666600">
+ $db = <b>NewADOConnection</b>('mysql');
+ $db-><b>Connect</b>("localhost", "root", "password", "mydb");</font>
+ <font color="#663300">$result = $db-><b>Execute</b>("SELECT * FROM employees");
+ </font><font color="#663300"></font><code><font color="#663300">if ($result === false) die("failed")</font></code><code><font color="#663300">;</font></code>
+ <font color="#006666"><b>while</b> (!$result->EOF) {
+	<b>for</b> ($i=0, $max=$result-><b>FieldCount</b>(); $i < $max; $i++)
+		   <b>print</b> $result->fields[$i].' ';
+	$result-><b>MoveNext</b>();
+	<b>print</b> "<br>\n";
+ }</font> </pre>
+<p></p>
+<p>Now porting to Oracle is as simple as changing the second line to <code>NewADOConnection('oracle')</code>.
+  Let's walk through the code...</p>
+<h3>Connecting to the Database</h3>
+<p></p>
+<pre><b><font color="#666600">include("adodb.inc.php");</font></b><font color="#666600">
+$db = <b>NewADOConnection</b>('mysql');
+$db-><b>Connect</b>("localhost", "root", "password", "mydb");</font></pre>
+<p>The connection code is a bit more sophisticated than MySQL's because our needs
+  are more sophisticated. In ADODB, we use an object-oriented approach to managing
+  the complexity of handling multiple databases. We have different classes to
+  handle different databases. If you aren't familiar with object-oriented programing,
+  don't worry -- the complexity is all hidden away in the<code> NewADOConnection()</code>
+  function.</p>
+<p>To conserve memory, we only load the PHP code specific to the database you
+  are connecting to. We do this by calling <code>NewADOConnection(databasedriver)</code>.
+  Legal database drivers include <i>mysql, mssql, oracle, oci8, postgres, sybase,
+  vfp, access, ibase </i>and many others.</p>
+<p>Then we create a new instance of the connection class by calling <code>NewADOConnection()</code>.
+  Finally we connect to the database using <code>$db->Connect(). </code></p>
+<h3>Executing the SQL</h3>
+<p><code><font color="#663300">$result = $db-><b>Execute</b>("SELECT *
+  FROM employees");<br>
+  if ($result === false) die("failed")</font></code><code><font color="#663300">;</font></code>
+  <br>
+</p>
+<p>Sending the SQL statement to the server is straight forward. Execute() will
+  return a recordset object on successful execution. You should check $result
+  as we do above.
+<p>An issue that confuses beginners is the fact that we have two types of objects
+  in ADODB, the connection object and the recordset object. When do we use each?
+<p>The connection object ($db) is responsible for connecting to the database,
+  formatting your SQL and querying the database server. The recordset object ($result)
+  is responsible for retrieving the results and formatting the reply as text or
+  as an array.
+<p>The only thing I need to add is that ADODB provides several helper functions
+  for making INSERT and UPDATE statements easier, which we will cover in the Advanced
+  section.
+<h3>Retrieving the Data<br>
+</h3>
+<pre><font color="#006666"><b>while</b> (!$result->EOF) {
+   <b>for</b> ($i=0, $max=$result-><b>FieldCount</b>(); $i < $max; $i++)
+	   <b>print</b> $result->fields[$i].' ';
+   $result-><b>MoveNext</b>();
+   <b>print</b> "<br>\n";
+}</font></pre>
+<p>The paradigm for getting the data is that it's like reading a file. For every
+  line, we check first whether we have reached the end-of-file (EOF). While not
+  end-of-file, loop through each field in the row. Then move to the next line
+  (MoveNext) and repeat.
+<p>The <code>$result->fields[]</code> array is generated by the PHP database
+  extension. Some database extensions do not index the array by field name.
+  To force indexing by name - that is associative arrays -
+  use the $ADODB_FETCH_MODE global variable.
+<pre>
+	$<b>ADODB_FETCH_MODE</b> = ADODB_FETCH_NUM;
+	$rs1 = $db->Execute('select * from table');
+	$<b>ADODB_FETCH_MODE</b> = ADODB_FETCH_ASSOC;
+	$rs2 = $db->Execute('select * from table');
+	print_r($rs1->fields); // shows <i>array([0]=>'v0',[1] =>'v1')</i>
+	print_r($rs2->fields); // shows <i>array(['col1']=>'v0',['col2'] =>'v1')</i>
+</pre>
+<p>
+As you can see in the above example, both recordsets store and use different fetch modes
+based on the $ADODB_FETCH_MODE setting when the recordset was created by Execute().</p>
+<h2>ADOConnection<a name="ADOConnection"></a></h2>
+<p>Object that performs the connection to the database, executes SQL statements
+  and has a set of utility functions for standardising the format of SQL statements
+  for issues such as concatenation and date formats.</p>
+
+<h3>Other Useful Functions</h3>
+<p><code>$recordset->Move($pos)</code> scrolls to that particular row. ADODB supports forward
+  scrolling for all databases. Some databases will not support backwards scrolling.
+  This is normally not a problem as you can always cache records to simulate backwards
+  scrolling.
+<p><code>$recordset->RecordCount()</code> returns the number of records accessed by the
+  SQL statement. Some databases will return -1 because it is not supported.
+<p><code>$recordset->GetArray()</code> returns the result as an array.
+<p><code>rs2html($recordset)</code> is a function that is generates a HTML table based on the
+  $recordset passed to it. An example with the relevant lines in bold:
+<pre>   include('adodb.inc.php');
+   <b>include('tohtml.inc.php');</b> /* includes the rs2html function */
+   $conn = ADONewConnection('mysql');
+   $conn->PConnect('localhost','userid','password','database');
+   $rs = $conn->Execute('select * from table');
+  <b> rs2html($rs)</b>; /* recordset to html table */ </pre>
+<p>There are many other helper functions that are listed in the documentation available at <a href="http://php.weblogs.com/adodb_manual"></a><a href="http://php.weblogs.com/adodb_manual">http://php.weblogs.com/adodb_manual</a>.
+<h2>Advanced Material</h2>
+<h3>Inserts and Updates </h3>
+<p>Let's say you want to insert the following data into a database.
+<p><b>ID</b> = 3<br>
+  <b>TheDate</b>=mktime(0,0,0,8,31,2001) /* 31st August 2001 */<br>
+  <b>Note</b>= sugar why don't we call it off
+<p>When you move to another database, your insert might no longer work.</p>
+<p>The first problem is that each database has a different default date format.
+  MySQL expects YYYY-MM-DD format, while other databases have different defaults.
+  ADODB has a function called DBDate() that addresses this issue by converting
+  converting the date to the correct format.</p>
+<p>The next problem is that the <b>don't</b> in the Note needs to be quoted. In
+  MySQL, we use <b>don\'t</b> but in some other databases (Sybase, Access, Microsoft
+  SQL Server) we use <b>don''t. </b>The qstr() function addresses this issue.</p>
+<p>So how do we use the functions? Like this:</p>
+<pre>$sql = "INSERT INTO table (id, thedate,note) values ("
+   . $<b>ID</b> . ','
+   . $db->DBDate($<b>TheDate</b>) .','
+   . $db->qstr($<b>Note</b>).")";
+$db->Execute($sql);</pre>
+<p>ADODB also supports <code>$connection->Affected_Rows()</code> (returns the
+  number of rows affected by last update or delete) and <code>$recordset->Insert_ID()</code>
+  (returns last autoincrement number generated by an insert statement). Be forewarned
+  that not all databases support the two functions.<br>
+</p>
+<h3>MetaTypes</h3>
+<p>You can find out more information about each of the fields (I use the words
+  fields and columns interchangebly) you are selecting by calling the recordset
+  method <code>FetchField($fieldoffset)</code>. This will return an object with
+  3 properties: name, type and max_length.
+<pre>For example:</pre>
+<pre>$recordset = $conn->Execute("select adate from table");<br>$f0 = $recordset->FetchField(0);
+</pre>
+<p>Then <code>$f0->name</code> will hold <i>'adata'</i>, <code>$f0->type</code>
+  will be set to '<i>date'</i>. If the max_length is unknown, it will be set to
+  -1.
+<p>One problem with handling different databases is that each database often calls
+  the same type by a different name. For example a <i>timestamp</i> type is called
+  <i>datetime</i> in one database and <i>time</i> in another. So ADODB has a special
+  <code>MetaType($type, $max_length)</code> function that standardises the types
+  to the following:
+<p>C: character and varchar types<br>
+  X: text or long character (eg. more than 255 bytes wide).<br>
+  B: blob or binary image<br>
+  D: date<br>
+  T: timestamp<br>
+  L: logical (boolean)<br>
+  I: integer<br>
+  N: numeric (float, double, money)
+<p>In the above date example,
+<p><code>$recordset = $conn->Execute("select adate from table");<br>
+  $f0 = $recordset->FetchField(0);<br>
+  $type = $recordset->MetaType($f0->type, $f0->max_length);<br>
+  print $type; /* should print 'D'</code> */
+<p>
+<p><b>Select Limit and Top Support</b>
+<p>ADODB has a function called $connection->SelectLimit($sql,$nrows,$offset) that allows
+you to retrieve a subset of the recordset. This will take advantage of native
+SELECT TOP on Microsoft products and SELECT ... LIMIT with PostgreSQL and MySQL, and
+emulated if the database does not support it.
+<p><b>Caching Support</b>
+<p>ADODB allows you to cache recordsets in your file system, and only requery the database
+server after a certain timeout period with $connection->CacheExecute($secs2cache,$sql) and
+$connection->CacheSelectLimit($secs2cache,$sql,$nrows,$offset).
+<p><b>PHP4 Session Handler Support</b>
+<p>ADODB also supports PHP4 session handlers. You can store your session variables
+  in a database for true scalability using ADODB. For further information, visit
+  <a href="http://php.weblogs.com/adodb-sessions"></a><a href="http://php.weblogs.com/adodb-sessions">http://php.weblogs.com/adodb-sessions</a>
+<h3>Commercial Use Encouraged</h3>
+<p>If you plan to write commercial PHP applications that you want to resell, you should consider ADODB. It has been released using the lesser GPL, which means you can legally include it in commercial applications, while keeping your code proprietary. Commercial use of ADODB is strongly encouraged! We are using it internally for this reason.<p>
+
+<h2>Conclusion</h2>
+<p>As a thank you for finishing this article, here are the complete lyrics for
+  <i>let's call the whole thing off</i>.<br>
+  <br>
+<pre>
+   Refrain
+<br>
+		You say eether and I say eyether,
+		You say neether and I say nyther;
+		Eether, eyether, neether, nyther -
+		Let's call the whole thing off !
+<br>
+		You like potato and I like po-tah-to,
+		You like tomato and I like to-mah-to;
+		Potato, po-tah-to, tomato, to-mah-to -
+		Let's call the whole thing off !
+<br>
+But oh, if we call the whole thing off, then we must part.
+And oh, if we ever part, then that might break my heart.
+<br>
+		So, if you like pajamas and I like pa-jah-mas,
+		I'll wear pajamas and give up pa-jah-mas.
+		For we know we
+		Need each other, so we
+		Better call the calling off off.
+		Let's call the whole thing off !
+<br>
+   Second Refrain
+<br>
+		You say laughter and I say lawfter,
+		You say after and I say awfter;
+		Laughter, lawfter, after, awfter -
+		Let's call the whole thing off !
+<br>
+		You like vanilla and I like vanella,
+		You, sa's'parilla and I sa's'parella;
+		Vanilla, vanella, choc'late, strawb'ry -
+		Let's call the whole thing off !
+<br>
+But oh, if we call the whole thing off, then we must part.
+And oh, if we ever part, then that might break my heart.
+<br>
+		So, if you go for oysters and I go for ersters,
+		I'll order oysters and cancel the ersters.
+		For we know we
+		Need each other, so we
+		Better call the calling off off.
+		Let's call the whole thing off !
+  </pre>
+<p><font size=2>Song and lyrics by George and Ira Gershwin, introduced by Fred Astaire and Ginger Rogers
+in the film "Shall We Dance?"  </font><p>
+<p>
+(c) 2001-2014 John Lim.
+
+</body>
+</html>
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-access.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-access.inc.php
index 1787650..a0932a0 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-access.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-access.inc.php
@@ -1,24 +1,24 @@
 <?php
-/* 
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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
-  
+
   Microsoft Access data driver. Requires ODBC. Works only on MS Windows.
 */
 if (!defined('_ADODB_ODBC_LAYER')) {
 	if (!defined('ADODB_DIR')) die();
-	
+
 	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
  if (!defined('_ADODB_ACCESS')) {
  	define('_ADODB_ACCESS',1);
 
-class  ADODB_access extends ADODB_odbc {	
+class  ADODB_access extends ADODB_odbc {
 	var $databaseType = 'access';
 	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
 	var $fmtDate = "#Y-m-d#";
@@ -28,23 +28,23 @@ class  ADODB_access extends ADODB_odbc {
 	var $sysTimeStamp = 'NOW';
 	var $hasTransactions = false;
 	var $upperCase = 'ucase';
-	
+
 	function ADODB_access()
 	{
 	global $ADODB_EXTENSION;
-	
+
 		$ADODB_EXTENSION = false;
 		$this->ADODB_odbc();
 	}
-	
+
 	function Time()
 	{
 		return time();
 	}
-	
+
 	function BeginTrans() { return false;}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " IIF(IsNull($field), $ifNull, $field) "; // if Access
 	}
@@ -52,16 +52,16 @@ class  ADODB_access extends ADODB_odbc {
 	function MetaTables()
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = odbc_tables($this->_connectionID);
 		$rs = new ADORecordSet_odbc($qid);
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) return false;
-		
+
 		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
+
 		$arr = $rs->GetArray();
 		//print_pre($arr);
 		$arr2 = array();
@@ -73,15 +73,14 @@ class  ADODB_access extends ADODB_odbc {
 	}*/
 }
 
- 
-class  ADORecordSet_access extends ADORecordSet_odbc {	
-	
-	var $databaseType = "access";		
-	
+
+class  ADORecordSet_access extends ADORecordSet_odbc {
+
+	var $databaseType = "access";
+
 	function ADORecordSet_access($id,$mode=false)
 	{
 		return $this->ADORecordSet_odbc($id,$mode);
 	}
 }// class
-} 
-?>
\ No newline at end of file
+}
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
index 15b8677..2c312f7 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
@@ -1,31 +1,31 @@
 <?php
-/* 
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
 	Microsoft ADO data driver. Requires ADO. Works only on MS Windows.
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
-	
+
 define("_ADODB_ADO_LAYER", 1 );
 /*--------------------------------------------------------------------------------------
 --------------------------------------------------------------------------------------*/
 
-	
+
 class ADODB_ado extends ADOConnection {
-	var $databaseType = "ado";	
+	var $databaseType = "ado";
 	var $_bindInputArray = false;
 	var $fmtDate = "'Y-m-d'";
 	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
-	var $dataProvider = "ado";	
+	var $dataProvider = "ado";
 	var $hasAffectedRows = true;
 	var $adoParameterType = 201; // 201 = long varchar, 203=long wide varchar, 205 = long varbinary
 	var $_affectedRows = false;
@@ -34,11 +34,11 @@ class ADODB_ado extends ADOConnection {
 	var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
 	var $_lock_type = -1;
 	var $_execute_option = -1;
-	var $poorAffectedRows = true; 
+	var $poorAffectedRows = true;
 	var $charPage;
-		
-	function ADODB_ado() 
-	{ 	
+
+	function ADODB_ado()
+	{
 		$this->_affectedRows = new VARIANT;
 	}
 
@@ -47,14 +47,14 @@ class ADODB_ado extends ADOConnection {
 		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
 		return array('description' => $desc, 'version' => '');
 	}
-	
+
 	function _affectedrows()
 	{
 		if (PHP_VERSION >= 5) return $this->_affectedRows;
-		
+
 		return $this->_affectedRows->value;
 	}
-	
+
 	// you can also pass a connection string like this:
 	//
 	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
@@ -62,49 +62,49 @@ class ADODB_ado extends ADOConnection {
 	{
 		$u = 'UID';
 		$p = 'PWD';
-	
+
 		if (!empty($this->charPage))
 			$dbc = new COM('ADODB.Connection',null,$this->charPage);
 		else
 			$dbc = new COM('ADODB.Connection');
-			
+
 		if (! $dbc) return false;
 
 		/* special support if provider is mssql or access */
 		if ($argProvider=='mssql') {
 			$u = 'User Id';  //User parameter name for OLEDB
-			$p = 'Password'; 
+			$p = 'Password';
 			$argProvider = "SQLOLEDB"; // SQL Server Provider
-			
+
 			// not yet
 			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
-			
+
 			//use trusted conection for SQL if username not specified
 			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
 		} else if ($argProvider=='access')
 			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
-		
-		if ($argProvider) $dbc->Provider = $argProvider;	
-		
+
+		if ($argProvider) $dbc->Provider = $argProvider;
+
 		if ($argUsername) $argHostname .= ";$u=$argUsername";
 		if ($argPassword)$argHostname .= ";$p=$argPassword";
-		
+
 		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."<BR>\n version=$dbc->version");
 		// @ added below for php 4.0.1 and earlier
 		@$dbc->Open((string) $argHostname);
-		
+
 		$this->_connectionID = $dbc;
-		
+
 		$dbc->CursorLocation = $this->_cursor_location;
 		return  $dbc->State > 0;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
 	{
 		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-	}	
-	
+	}
+
 /*
 	adSchemaCatalogs	= 1,
 	adSchemaCharacterSets	= 2,
@@ -146,12 +146,12 @@ class ADODB_ado extends ADOConnection {
 	adSchemaMembers	= 38
 
 */
-	
+
 	function MetaTables()
 	{
 		$arr= array();
 		$dbc = $this->_connectionID;
-		
+
 		$adors=@$dbc->OpenSchema(20);//tables
 		if ($adors){
 			$f = $adors->Fields(2);//table/view name
@@ -165,25 +165,25 @@ class ADODB_ado extends ADOConnection {
 			}
 			$adors->Close();
 		}
-		
+
 		return $arr;
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
 		$table = strtoupper($table);
 		$arr = array();
 		$dbc = $this->_connectionID;
-		
+
 		$adors=@$dbc->OpenSchema(4);//tables
-	
+
 		if ($adors){
 			$t = $adors->Fields(2);//table/view name
 			while (!$adors->EOF){
-				
-				
+
+
 				if (strtoupper($t->Value) == $table) {
-				
+
 					$fld = new ADOFieldObject();
 					$c = $adors->Fields(3);
 					$fld->name = $c->Value;
@@ -191,7 +191,7 @@ class ADODB_ado extends ADOConnection {
 					$fld->max_length = -1;
 					$arr[strtoupper($fld->name)]=$fld;
 				}
-		
+
 				$adors->MoveNext();
 			}
 			$adors->Close();
@@ -199,20 +199,20 @@ class ADODB_ado extends ADOConnection {
 		$false = false;
 		return empty($arr) ? $false : $arr;
 	}
-	
 
 
-	
+
+
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
-		
+
 		$dbc = $this->_connectionID;
 		$false = false;
-		
-	//	return rs	
+
+	//	return rs
 		if ($inputarr) {
-			
+
 			if (!empty($this->charPage))
 				$oCmd = new COM('ADODB.Command',null,$this->charPage);
 			else
@@ -238,7 +238,7 @@ class ADODB_ado extends ADOConnection {
 					$len=1;
 				else
 					$this->adoParameterType = 130;
-				
+
 				// name, type, direction 1 = input, len,
         		$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val);
 
@@ -250,12 +250,12 @@ class ADODB_ado extends ADOConnection {
 			if ($dbc->Errors->Count > 0) return $false;
 			return $rs;
 		}
-		
+
 		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
 
 		if ($dbc->Errors->Count > 0) return $false;
 		if (! $rs) return $false;
-		
+
 		if ($rs->State == 0) {
 			$true = true;
 			return $true; // 0 = adStateClosed means no records returned
@@ -263,11 +263,11 @@ class ADODB_ado extends ADOConnection {
 		return $rs;
 	}
 
-	
-	function BeginTrans() 
-	{ 
+
+	function BeginTrans()
+	{
 		if ($this->transOff) return true;
-		
+
 		if (isset($this->_thisTransactions))
 			if (!$this->_thisTransactions) return false;
 		else {
@@ -279,12 +279,12 @@ class ADODB_ado extends ADOConnection {
 		$this->transCnt += 1;
 		return true;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transOff) return true;
-		
+
 		@$this->_connectionID->CommitTrans();
 		if ($this->transCnt) @$this->transCnt -= 1;
 		return true;
@@ -295,10 +295,10 @@ class ADODB_ado extends ADOConnection {
 		if ($this->transCnt) @$this->transCnt -= 1;
 		return true;
 	}
-	
-	/*	Returns: the last error message from previous database operation	*/	
 
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+
+	function ErrorMsg()
 	{
 		if (!$this->_connectionID) return "No connection established";
 		$errc = $this->_connectionID->Errors;
@@ -307,8 +307,8 @@ class ADODB_ado extends ADOConnection {
 		$err = $errc->Item($errc->Count-1);
 		return $err->Description;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		$errc = $this->_connectionID->Errors;
 		if ($errc->Count == 0) return 0;
@@ -323,27 +323,27 @@ class ADODB_ado extends ADOConnection {
 		$this->_connectionID = false;
 		return true;
 	}
-	
-	
+
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_ado extends ADORecordSet {	
-	
+class ADORecordSet_ado extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "ado";	
-	var $dataProvider = "ado";	
+	var $databaseType = "ado";
+	var $dataProvider = "ado";
 	var $_tarr = false; // caches the types
 	var $_flds; // and field objects
 	var $canSeek = true;
   	var $hideErrors = true;
-		  
+
 	function ADORecordSet_ado($id,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -355,7 +355,7 @@ class ADORecordSet_ado extends ADORecordSet {
 	// returns the field object
 	function FetchField($fieldOffset = -1) {
 		$off=$fieldOffset+1; // offsets begin at 1
-		
+
 		$o= new ADOFieldObject();
 		$rs = $this->_queryID;
 		$f = $rs->Fields($fieldOffset);
@@ -363,12 +363,12 @@ class ADORecordSet_ado extends ADORecordSet {
 		$t = $f->Type;
 		$o->type = $this->MetaType($t);
 		$o->max_length = $f->DefinedSize;
-		$o->ado_type = $t;	
+		$o->ado_type = $t;
 
 		//print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
 		return $o;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
@@ -380,25 +380,25 @@ class ADORecordSet_ado extends ADORecordSet {
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
 
-		
+
 	function _initrs()
 	{
 		$rs = $this->_queryID;
 		$this->_numOfRows = $rs->RecordCount;
-		
+
 		$f = $rs->Fields;
 		$this->_numOfFields = $f->Count;
 	}
-	
-	
+
+
 	 // should only be used to move forward as we normally use forward-only cursors
 	function _seek($row)
 	{
-	   $rs = $this->_queryID; 
+	   $rs = $this->_queryID;
 		// absoluteposition doesn't work -- my maths is wrong ?
 		//	$rs->AbsolutePosition->$row-2;
 		//	return true;
@@ -406,10 +406,10 @@ class ADORecordSet_ado extends ADORecordSet {
 		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
 		return true;
 	}
-	
+
 /*
 	OLEDB types
-	
+
 	 enum DBTYPEENUM
 	{	DBTYPE_EMPTY	= 0,
 	DBTYPE_NULL	= 1,
@@ -445,9 +445,9 @@ class ADORecordSet_ado extends ADORecordSet {
 	DBTYPE_DBDATE	= 133,
 	DBTYPE_DBTIME	= 134,
 	DBTYPE_DBTIMESTAMP	= 135
-	
+
 	ADO Types
-	
+
    	adEmpty	= 0,
 	adTinyInt	= 16,
 	adSmallInt	= 2,
@@ -467,7 +467,7 @@ class ADORecordSet_ado extends ADORecordSet {
 	adUserDefined	= 132,
 	adVariant	= 12,
 	adIDispatch	= 9,
-	adIUnknown	= 13,	
+	adIUnknown	= 13,
 	adGUID	= 72,
 	adDate	= 7,
 	adDBDate	= 133,
@@ -496,9 +496,9 @@ class ADORecordSet_ado extends ADORecordSet {
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		if (!is_numeric($t)) return $t;
-		
+
 		switch ($t) {
 		case 0:
 		case 12: // variant
@@ -511,7 +511,7 @@ class ADORecordSet_ado extends ADORecordSet {
 		case 204: // varBin
 		case 72: // guid
 			if ($len <= $this->blobSize) return 'C';
-		
+
 		case 201:
 		case 203:
 			return 'X';
@@ -521,12 +521,12 @@ class ADORecordSet_ado extends ADORecordSet {
 			 return 'B';
 		case 7:
 		case 133: return 'D';
-		
+
 		case 134:
 		case 135: return 'T';
-		
+
 		case 11: return 'L';
-		
+
 		case 16://	adTinyInt	= 16,
 		case 2://adSmallInt	= 2,
 		case 3://adInteger	= 3,
@@ -539,17 +539,17 @@ class ADORecordSet_ado extends ADORecordSet {
 		default: return 'N';
 		}
 	}
-	
+
 	// time stamp not supported yet
 	function _fetch()
-	{	
+	{
 		$rs = $this->_queryID;
 		if (!$rs or $rs->EOF) {
 			$this->fields = false;
 			return false;
 		}
 		$this->fields = array();
-	
+
 		if (!$this->_tarr) {
 			$tarr = array();
 			$flds = array();
@@ -559,12 +559,12 @@ class ADORecordSet_ado extends ADORecordSet {
 				$tarr[] = $f->Type;
 			}
 			// bind types and flds only once
-			$this->_tarr = $tarr; 
+			$this->_tarr = $tarr;
 			$this->_flds = $flds;
 		}
 		$t = reset($this->_tarr);
 		$f = reset($this->_flds);
-		
+
 		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
 		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
 			//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
@@ -575,12 +575,12 @@ class ADORecordSet_ado extends ADORecordSet {
 					if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
 						// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
 						$val=(float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
-					else 
+					else
 						$val = $f->value;
 					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
 				}
-				break;			
-			case 133:// A date value (yyyymmdd) 
+				break;
+			case 133:// A date value (yyyymmdd)
 				if ($val = $f->value) {
 					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
 				} else
@@ -591,7 +591,7 @@ class ADORecordSet_ado extends ADORecordSet {
 				else {
 					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
 					else $val = $f->value;
-					
+
 					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
 					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
 				}
@@ -610,11 +610,11 @@ class ADORecordSet_ado extends ADORecordSet {
 					else $val = 0;
 				}
 				if(is_null($f->value)) $val = null;
-				
+
 				$this->fields[] = $val;
 				break;
 			default:
-				$this->fields[] = $f->value; 
+				$this->fields[] = $f->value;
 				break;
 			}
 			//print " $f->value $t, ";
@@ -623,27 +623,27 @@ class ADORecordSet_ado extends ADORecordSet {
 		} // for
 		if ($this->hideErrors) error_reporting($olde);
 		@$rs->MoveNext(); // @ needed for some versions of PHP!
-		
+
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
 		}
 		return true;
 	}
-	
+
 		function NextRecordSet()
 		{
 			$rs = $this->_queryID;
 			$this->_queryID = $rs->NextRecordSet();
 			//$this->_queryID = $this->_QueryId->NextRecordSet();
 			if ($this->_queryID == null) return false;
-			
+
 			$this->_currentRow = -1;
 			$this->_currentPage = -1;
 			$this->bind = false;
 			$this->fields = false;
 			$this->_flds = false;
 			$this->_tarr = false;
-			
+
 			$this->_inited = false;
 			$this->Init();
 			return true;
@@ -652,9 +652,7 @@ class ADORecordSet_ado extends ADORecordSet {
 	function _close() {
 		$this->_flds = false;
 		@$this->_queryID->Close();// by Pete Dishman (peterd at telephonetics.co.uk)
-		$this->_queryID = false;	
+		$this->_queryID = false;
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
index 7aa9d97..9f5cea2 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
@@ -1,31 +1,31 @@
 <?php
-/* 
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
 	Microsoft ADO data driver. Requires ADO. Works only on MS Windows. PHP5 compat version.
 */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
-	
+
 define("_ADODB_ADO_LAYER", 1 );
 /*--------------------------------------------------------------------------------------
 --------------------------------------------------------------------------------------*/
 
-	
+
 class ADODB_ado extends ADOConnection {
-	var $databaseType = "ado";	
+	var $databaseType = "ado";
 	var $_bindInputArray = false;
 	var $fmtDate = "'Y-m-d'";
 	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
-	var $dataProvider = "ado";	
+	var $dataProvider = "ado";
 	var $hasAffectedRows = true;
 	var $adoParameterType = 201; // 201 = long varchar, 203=long wide varchar, 205 = long varbinary
 	var $_affectedRows = false;
@@ -34,11 +34,11 @@ class ADODB_ado extends ADOConnection {
 	var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
 	var $_lock_type = -1;
 	var $_execute_option = -1;
-	var $poorAffectedRows = true; 
+	var $poorAffectedRows = true;
 	var $charPage;
-		
-	function ADODB_ado() 
-	{ 	
+
+	function ADODB_ado()
+	{
 		$this->_affectedRows = new VARIANT;
 	}
 
@@ -47,14 +47,14 @@ class ADODB_ado extends ADOConnection {
 		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
 		return array('description' => $desc, 'version' => '');
 	}
-	
+
 	function _affectedrows()
 	{
 		if (PHP_VERSION >= 5) return $this->_affectedRows;
-		
+
 		return $this->_affectedRows->value;
 	}
-	
+
 	// you can also pass a connection string like this:
 	//
 	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
@@ -63,73 +63,73 @@ class ADODB_ado extends ADOConnection {
 	// two modes
 	//	-	if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat
 	//	- 	if $argProvider is not empty, then $argDBorProvider holds db
-	
-		
+
+
 		 if ($argProvider) {
 		 	$argDatabasename = $argDBorProvider;
 		 } else {
 		 	$argDatabasename = '';
 		 	if ($argDBorProvider) $argProvider = $argDBorProvider;
-			else if (stripos($argHostname,'PROVIDER') === false) /* full conn string is not in $argHostname */ 
+			else if (stripos($argHostname,'PROVIDER') === false) /* full conn string is not in $argHostname */
 				$argProvider = 'MSDASQL';
 		}
-		
-		
+
+
 		try {
 		$u = 'UID';
 		$p = 'PWD';
-	
+
 		if (!empty($this->charPage))
 			$dbc = new COM('ADODB.Connection',null,$this->charPage);
 		else
 			$dbc = new COM('ADODB.Connection');
-			
+
 		if (! $dbc) return false;
 
 		/* special support if provider is mssql or access */
 		if ($argProvider=='mssql') {
 			$u = 'User Id';  //User parameter name for OLEDB
-			$p = 'Password'; 
+			$p = 'Password';
 			$argProvider = "SQLOLEDB"; // SQL Server Provider
-			
+
 			// not yet
 			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
-			
+
 			//use trusted conection for SQL if username not specified
 			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
 		} else if ($argProvider=='access')
 			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
-		
-		if ($argProvider) $dbc->Provider = $argProvider;	
 
-		if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";	
-		
+		if ($argProvider) $dbc->Provider = $argProvider;
 
-		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";		
+		if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";
+
+
+		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";
 		if ($argUsername) $argHostname .= ";$u=$argUsername";
 		if ($argPassword)$argHostname .= ";$p=$argPassword";
-		
+
 		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."<BR>\n version=$dbc->version");
 		// @ added below for php 4.0.1 and earlier
 		@$dbc->Open((string) $argHostname);
-		
+
 		$this->_connectionID = $dbc;
-		
+
 		$dbc->CursorLocation = $this->_cursor_location;
 		return  $dbc->State > 0;
 		} catch (exception $e) {
 			if ($this->debug) echo "<pre>",$argHostname,"\n",$e,"</pre>\n";
 		}
-		
+
 		return false;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
 	{
 		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-	}	
-	
+	}
+
 /*
 	adSchemaCatalogs	= 1,
 	adSchemaCharacterSets	= 2,
@@ -171,12 +171,12 @@ class ADODB_ado extends ADOConnection {
 	adSchemaMembers	= 38
 
 */
-	
+
 	function MetaTables()
 	{
 		$arr= array();
 		$dbc = $this->_connectionID;
-		
+
 		$adors=@$dbc->OpenSchema(20);//tables
 		if ($adors){
 			$f = $adors->Fields(2);//table/view name
@@ -190,25 +190,25 @@ class ADODB_ado extends ADOConnection {
 			}
 			$adors->Close();
 		}
-		
+
 		return $arr;
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
 		$table = strtoupper($table);
 		$arr= array();
 		$dbc = $this->_connectionID;
-		
+
 		$adors=@$dbc->OpenSchema(4);//tables
-	
+
 		if ($adors){
 			$t = $adors->Fields(2);//table/view name
 			while (!$adors->EOF){
-				
-				
+
+
 				if (strtoupper($t->Value) == $table) {
-				
+
 					$fld = new ADOFieldObject();
 					$c = $adors->Fields(3);
 					$fld->name = $c->Value;
@@ -216,28 +216,28 @@ class ADODB_ado extends ADOConnection {
 					$fld->max_length = -1;
 					$arr[strtoupper($fld->name)]=$fld;
 				}
-		
+
 				$adors->MoveNext();
 			}
 			$adors->Close();
 		}
-		
+
 		return $arr;
 	}
-	
+
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
 		try { // In PHP5, all COM errors are exceptions, so to maintain old behaviour...
-		
+
 		$dbc = $this->_connectionID;
-		
-	//	return rs	
-	
+
+	//	return rs
+
 		$false = false;
-		
+
 		if ($inputarr) {
-			
+
 			if (!empty($this->charPage))
 				$oCmd = new COM('ADODB.Command',null,$this->charPage);
 			else
@@ -261,42 +261,42 @@ class ADODB_ado extends ADOConnection {
 					$len=1;
 				else
 					$this->adoParameterType = 130;
-				
+
 				// name, type, direction 1 = input, len,
         		$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val);
 
 				$oCmd->Parameters->Append($p);
 			}
-			
+
 			$p = false;
 			$rs = $oCmd->Execute();
 			$e = $dbc->Errors;
 			if ($dbc->Errors->Count > 0) return $false;
 			return $rs;
 		}
-		
+
 		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
-			
+
 		if ($dbc->Errors->Count > 0) return $false;
 		if (! $rs) return $false;
-		
+
 		if ($rs->State == 0) {
 			$true = true;
 			return $true; // 0 = adStateClosed means no records returned
 		}
 		return $rs;
-		
+
 		} catch (exception $e) {
-			
+
 		}
 		return $false;
 	}
 
-	
-	function BeginTrans() 
-	{ 
+
+	function BeginTrans()
+	{
 		if ($this->transOff) return true;
-		
+
 		if (isset($this->_thisTransactions))
 			if (!$this->_thisTransactions) return false;
 		else {
@@ -308,11 +308,11 @@ class ADODB_ado extends ADOConnection {
 		$this->transCnt += 1;
 		return true;
 	}
-	function CommitTrans($ok=true) 
-	{ 
+	function CommitTrans($ok=true)
+	{
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transOff) return true;
-		
+
 		@$this->_connectionID->CommitTrans();
 		if ($this->transCnt) @$this->transCnt -= 1;
 		return true;
@@ -323,14 +323,14 @@ class ADODB_ado extends ADOConnection {
 		if ($this->transCnt) @$this->transCnt -= 1;
 		return true;
 	}
-	
-	/*	Returns: the last error message from previous database operation	*/	
 
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+
+	function ErrorMsg()
 	{
 		if (!$this->_connectionID) return "No connection established";
 		$errmsg = '';
-		
+
 		try {
 			$errc = $this->_connectionID->Errors;
 			if (!$errc) return "No Errors object found";
@@ -341,8 +341,8 @@ class ADODB_ado extends ADOConnection {
 		}
 		return $errmsg;
 	}
-	
-	function ErrorNo() 
+
+	function ErrorNo()
 	{
 		$errc = $this->_connectionID->Errors;
 		if ($errc->Count == 0) return 0;
@@ -357,27 +357,27 @@ class ADODB_ado extends ADOConnection {
 		$this->_connectionID = false;
 		return true;
 	}
-	
-	
+
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_ado extends ADORecordSet {	
-	
+class ADORecordSet_ado extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "ado";	
-	var $dataProvider = "ado";	
+	var $databaseType = "ado";
+	var $dataProvider = "ado";
 	var $_tarr = false; // caches the types
 	var $_flds; // and field objects
 	var $canSeek = true;
   	var $hideErrors = true;
-		  
+
 	function ADORecordSet_ado($id,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -389,23 +389,23 @@ class ADORecordSet_ado extends ADORecordSet {
 	// returns the field object
 	function FetchField($fieldOffset = -1) {
 		$off=$fieldOffset+1; // offsets begin at 1
-		
+
 		$o= new ADOFieldObject();
 		$rs = $this->_queryID;
 		if (!$rs) return false;
-		
+
 		$f = $rs->Fields($fieldOffset);
 		$o->name = $f->Name;
 		$t = $f->Type;
 		$o->type = $this->MetaType($t);
 		$o->max_length = $f->DefinedSize;
 		$o->ado_type = $t;
-		
+
 
 		//print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
 		return $o;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
@@ -417,15 +417,15 @@ class ADORecordSet_ado extends ADORecordSet {
 				$this->bind[strtoupper($o->name)] = $i;
 			}
 		}
-		
+
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
 
-		
+
 	function _initrs()
 	{
 		$rs = $this->_queryID;
-		
+
 		try {
 			$this->_numOfRows = $rs->RecordCount;
 		} catch (Exception $e) {
@@ -434,12 +434,12 @@ class ADORecordSet_ado extends ADORecordSet {
 		$f = $rs->Fields;
 		$this->_numOfFields = $f->Count;
 	}
-	
-	
+
+
 	 // should only be used to move forward as we normally use forward-only cursors
 	function _seek($row)
 	{
-	   $rs = $this->_queryID; 
+	   $rs = $this->_queryID;
 		// absoluteposition doesn't work -- my maths is wrong ?
 		//	$rs->AbsolutePosition->$row-2;
 		//	return true;
@@ -447,10 +447,10 @@ class ADORecordSet_ado extends ADORecordSet {
 		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
 		return true;
 	}
-	
+
 /*
 	OLEDB types
-	
+
 	 enum DBTYPEENUM
 	{	DBTYPE_EMPTY	= 0,
 	DBTYPE_NULL	= 1,
@@ -486,9 +486,9 @@ class ADORecordSet_ado extends ADORecordSet {
 	DBTYPE_DBDATE	= 133,
 	DBTYPE_DBTIME	= 134,
 	DBTYPE_DBTIMESTAMP	= 135
-	
+
 	ADO Types
-	
+
    	adEmpty	= 0,
 	adTinyInt	= 16,
 	adSmallInt	= 2,
@@ -508,7 +508,7 @@ class ADORecordSet_ado extends ADORecordSet {
 	adUserDefined	= 132,
 	adVariant	= 12,
 	adIDispatch	= 9,
-	adIUnknown	= 13,	
+	adIUnknown	= 13,
 	adGUID	= 72,
 	adDate	= 7,
 	adDBDate	= 133,
@@ -537,9 +537,9 @@ class ADORecordSet_ado extends ADORecordSet {
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		if (!is_numeric($t)) return $t;
-		
+
 		switch ($t) {
 		case 0:
 		case 12: // variant
@@ -552,7 +552,7 @@ class ADORecordSet_ado extends ADORecordSet {
 		case 204: // varBin
 		case 72: // guid
 			if ($len <= $this->blobSize) return 'C';
-		
+
 		case 201:
 		case 203:
 			return 'X';
@@ -562,12 +562,12 @@ class ADORecordSet_ado extends ADORecordSet {
 			 return 'B';
 		case 7:
 		case 133: return 'D';
-		
+
 		case 134:
 		case 135: return 'T';
-		
+
 		case 11: return 'L';
-		
+
 		case 16://	adTinyInt	= 16,
 		case 2://adSmallInt	= 2,
 		case 3://adInteger	= 3,
@@ -580,17 +580,17 @@ class ADORecordSet_ado extends ADORecordSet {
 		default: return 'N';
 		}
 	}
-	
+
 	// time stamp not supported yet
 	function _fetch()
-	{	
+	{
 		$rs = $this->_queryID;
 		if (!$rs or $rs->EOF) {
 			$this->fields = false;
 			return false;
 		}
 		$this->fields = array();
-	
+
 		if (!$this->_tarr) {
 			$tarr = array();
 			$flds = array();
@@ -600,12 +600,12 @@ class ADORecordSet_ado extends ADORecordSet {
 				$tarr[] = $f->Type;
 			}
 			// bind types and flds only once
-			$this->_tarr = $tarr; 
+			$this->_tarr = $tarr;
 			$this->_flds = $flds;
 		}
 		$t = reset($this->_tarr);
 		$f = reset($this->_flds);
-		
+
 		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
 		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
 			//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
@@ -616,12 +616,12 @@ class ADORecordSet_ado extends ADORecordSet {
 					if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
 						// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
 						$val= (float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
-					else 
+					else
 						$val = $f->value;
 					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
 				}
-				break;			
-			case 133:// A date value (yyyymmdd) 
+				break;
+			case 133:// A date value (yyyymmdd)
 				if ($val = $f->value) {
 					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
 				} else
@@ -632,7 +632,7 @@ class ADORecordSet_ado extends ADORecordSet {
 				else {
 					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
 					else $val = $f->value;
-					
+
 					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
 					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
 				}
@@ -655,11 +655,11 @@ class ADORecordSet_ado extends ADORecordSet {
 					else $val = 0;
 				}
 				if(is_null($f->value)) $val = null;
-				
+
 				$this->fields[] = $val;
 				break;
 			default:
-				$this->fields[] = $f->value; 
+				$this->fields[] = $f->value;
 				break;
 			}
 			//print " $f->value $t, ";
@@ -668,27 +668,27 @@ class ADORecordSet_ado extends ADORecordSet {
 		} // for
 		if ($this->hideErrors) error_reporting($olde);
 		@$rs->MoveNext(); // @ needed for some versions of PHP!
-		
+
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
 		}
 		return true;
 	}
-	
+
 		function NextRecordSet()
 		{
 			$rs = $this->_queryID;
 			$this->_queryID = $rs->NextRecordSet();
 			//$this->_queryID = $this->_QueryId->NextRecordSet();
 			if ($this->_queryID == null) return false;
-			
+
 			$this->_currentRow = -1;
 			$this->_currentPage = -1;
 			$this->bind = false;
 			$this->fields = false;
 			$this->_flds = false;
 			$this->_tarr = false;
-			
+
 			$this->_inited = false;
 			$this->Init();
 			return true;
@@ -700,9 +700,7 @@ class ADORecordSet_ado extends ADORecordSet {
 		@$this->_queryID->Close();// by Pete Dishman (peterd at telephonetics.co.uk)
 		} catch (Exception $e) {
 		}
-		$this->_queryID = false;	
+		$this->_queryID = false;
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
index d1632eb..ad8a982 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
@@ -1,13 +1,13 @@
 <?php
-/* 
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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
-  
+
 	Microsoft Access ADO data driver. Requires ADO and ODBC. Works only on MS Windows.
 */
 
@@ -19,7 +19,7 @@ if (!defined('_ADODB_ADO_LAYER')) {
 	else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
 }
 
-class  ADODB_ado_access extends ADODB_ado {	
+class  ADODB_ado_access extends ADODB_ado {
 	var $databaseType = 'ado_access';
 	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
 	var $fmtDate = "#Y-m-d#";
@@ -27,28 +27,27 @@ class  ADODB_ado_access extends ADODB_ado {
 	var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
 	var $sysTimeStamp = 'NOW';
 	var $upperCase = 'ucase';
-	
+
 	function ADODB_ado_access()
 	{
 		$this->ADODB_ado();
 	}
-	
+
 	/*function BeginTrans() { return false;}
-	
+
 	function CommitTrans() { return false;}
-	
+
 	function RollbackTrans() { return false;}*/
 
 }
 
- 
-class  ADORecordSet_ado_access extends ADORecordSet_ado {	
-	
-	var $databaseType = "ado_access";		
-	
+
+class  ADORecordSet_ado_access extends ADORecordSet_ado {
+
+	var $databaseType = "ado_access";
+
 	function ADORecordSet_ado_access($id,$mode=false)
 	{
 		return $this->ADORecordSet_ado($id,$mode);
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
index 682f254..c03c0fa 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
@@ -1,17 +1,17 @@
 <?php
-/* 
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
-  Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client. 
+
+  Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client.
   Works only on MS Windows.
-  
-  Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used. 
+
+  Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used.
   Please check http://bugs.php.net/ for more info.
 */
 
@@ -24,7 +24,7 @@ if (!defined('_ADODB_ADO_LAYER')) {
 }
 
 
-class  ADODB_ado_mssql extends ADODB_ado {        
+class  ADODB_ado_mssql extends ADODB_ado {
 	var $databaseType = 'ado_mssql';
 	var $hasTop = 'top';
 	var $hasInsertID = true;
@@ -36,25 +36,25 @@ class  ADODB_ado_mssql extends ADODB_ado {
 	var $substr = "substring";
 	var $length = 'len';
 	var $_dropSeqSQL = "drop table %s";
-	
+
 	//var $_inTransaction = 1; // always open recordsets, so no transaction problems.
-	
+
 	function ADODB_ado_mssql()
 	{
 	        $this->ADODB_ado();
 	}
-	
+
 	function _insertid()
 	{
 	        return $this->GetOne('select SCOPE_IDENTITY()');
 	}
-	
+
 	function _affectedrows()
 	{
 	        return $this->GetOne('select @@rowcount');
 	}
-	
-	function SetTransactionMode( $transaction_mode ) 
+
+	function SetTransactionMode( $transaction_mode )
 	{
 		$this->_transmode  = $transaction_mode;
 		if (empty($transaction_mode)) {
@@ -64,25 +64,25 @@ class  ADODB_ado_mssql extends ADODB_ado {
 		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
 		$this->Execute("SET TRANSACTION ".$transaction_mode);
 	}
-	
+
 	function qstr($s,$magic_quotes=false)
 	{
 		$s = ADOConnection::qstr($s, $magic_quotes);
 		return str_replace("\0", "\\\\000", $s);
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
         $table = strtoupper($table);
         $arr= array();
         $dbc = $this->_connectionID;
-        
+
         $osoptions = array();
         $osoptions[0] = null;
         $osoptions[1] = null;
         $osoptions[2] = $table;
         $osoptions[3] = null;
-        
+
         $adors=@$dbc->OpenSchema(4, $osoptions);//tables
 
         if ($adors){
@@ -93,7 +93,7 @@ class  ADODB_ado_mssql extends ADODB_ado {
                         $fld->type = 'CHAR'; // cannot discover type in ADO!
                         $fld->max_length = -1;
                         $arr[strtoupper($fld->name)]=$fld;
-        
+
                         $adors->MoveNext();
                 }
                 $adors->Close();
@@ -101,10 +101,10 @@ class  ADODB_ado_mssql extends ADODB_ado {
         $false = false;
 		return empty($arr) ? $false : $arr;
 	}
-	
+
 	function CreateSequence($seq='adodbseq',$start=1)
 	{
-		
+
 		$this->Execute('BEGIN TRANSACTION adodbseq');
 		$start -= 1;
 		$this->Execute("create table $seq (id float(53))");
@@ -113,7 +113,7 @@ class  ADODB_ado_mssql extends ADODB_ado {
 				$this->Execute('ROLLBACK TRANSACTION adodbseq');
 				return false;
 		}
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		$this->Execute('COMMIT TRANSACTION adodbseq');
 		return true;
 	}
 
@@ -129,26 +129,25 @@ class  ADODB_ado_mssql extends ADODB_ado {
 				$this->Execute('ROLLBACK TRANSACTION adodbseq');
 				return false;
 			}
-			$this->Execute('COMMIT TRANSACTION adodbseq'); 
+			$this->Execute('COMMIT TRANSACTION adodbseq');
 			return $start;
 		}
 		$num = $this->GetOne("select id from $seq");
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		$this->Execute('COMMIT TRANSACTION adodbseq');
 		return $num;
-		
+
 		// in old implementation, pre 1.90, we returned GUID...
 		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
 	}
-	
-	} // end class 
-	
-	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        
-	
+
+	} // end class
+
+	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {
+
 	var $databaseType = 'ado_mssql';
-	
+
 	function ADORecordSet_ado_mssql($id,$mode=false)
 	{
 	        return $this->ADORecordSet_ado($id,$mode);
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ads.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ads.inc.php
index 0de57ca..4481d2b 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ads.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ads.inc.php
@@ -1,6 +1,6 @@
 <?php
 /*
-  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
+  (c) 2000-2014 John Lim (jlim#natsoft.com.my). All rights reserved.
   Portions Copyright (c) 2007-2009, iAnywhere Solutions, Inc.
   All rights reserved. All unpublished rights reserved.
 
@@ -749,18 +749,8 @@ class ADORecordSet_ads extends ADORecordSet {
   {
     if ($this->_numOfRows != 0 && !$this->EOF) {
       $this->_currentRow++;
-
-      if ($this->_has_stupid_odbc_fetch_api_change)
-        $rez = @ads_fetch_into($this->_queryID,$this->fields);
-      else {
-        $row = 0;
-        $rez = @ads_fetch_into($this->_queryID,$row,$this->fields);
-      }
-      if ($rez) {
-        if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-          $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-        }
-        return true;
+      if( $this->_fetch() ) {
+          return true;
       }
     }
     $this->fields = false;
@@ -770,7 +760,7 @@ class ADORecordSet_ads extends ADORecordSet {
 
   function _fetch()
   {
-
+    $this->fields = false;
     if ($this->_has_stupid_odbc_fetch_api_change)
       $rez = @ads_fetch_into($this->_queryID,$this->fields);
     else {
@@ -783,7 +773,6 @@ class ADORecordSet_ads extends ADORecordSet {
       }
       return true;
     }
-    $this->fields = false;
     return false;
   }
 
@@ -793,4 +782,3 @@ class ADORecordSet_ads extends ADORecordSet {
   }
 
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
index 6fb598b..3338db7 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
@@ -1,13 +1,13 @@
 <?php
-/* 
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Support Borland Interbase 6.5 and later
 
 */
@@ -18,28 +18,28 @@ if (!defined('ADODB_DIR')) die();
 include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
 
 class ADODB_borland_ibase extends ADODB_ibase {
-	var $databaseType = "borland_ibase";	
-	
-	
+	var $databaseType = "borland_ibase";
+
+
 	function ADODB_borland_ibase()
 	{
 		$this->ADODB_ibase();
 	}
-	
+
 	function BeginTrans()
-	{	 
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 	 	$this->_transactionID = ibase_trans($this->ibasetrans, $this->_connectionID);
 		return $this->_transactionID;
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['dialect'] = $this->dialect;
 		switch($arr['dialect']) {
-		case '': 
+		case '':
 		case '1': $s = 'Interbase 6.5, Dialect 1'; break;
 		case '2': $s = 'Interbase 6.5, Dialect 2'; break;
 		default:
@@ -49,44 +49,43 @@ class ADODB_borland_ibase extends ADODB_ibase {
 		$arr['description'] = $s;
 		return $arr;
 	}
-	
+
 	// Note that Interbase 6.5 uses ROWS instead - don't you love forking wars!
-	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
+	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows
 	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
 	// Firebird uses
 	//		SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
 	{
 		if ($nrows > 0) {
-			if ($offset <= 0) $str = " ROWS $nrows "; 
+			if ($offset <= 0) $str = " ROWS $nrows ";
 			else {
 				$a = $offset+1;
 				$b = $offset+$nrows;
 				$str = " ROWS $a TO $b";
 			}
 		} else {
-			// ok, skip 
+			// ok, skip
 			$a = $offset + 1;
 			$str = " ROWS $a TO 999999999"; // 999 million
 		}
 		$sql .= $str;
-		
-		return ($secs2cache) ? 
+
+		return ($secs2cache) ?
 				$this->CacheExecute($secs2cache,$sql,$inputarr)
 			:
 				$this->Execute($sql,$inputarr);
 	}
-	
+
 };
- 
 
-class  ADORecordSet_borland_ibase extends ADORecordSet_ibase {	
-	
-	var $databaseType = "borland_ibase";		
-	
+
+class  ADORecordSet_borland_ibase extends ADORecordSet_ibase {
+
+	var $databaseType = "borland_ibase";
+
 	function ADORecordSet_borland_ibase($id,$mode=false)
 	{
 		$this->ADORecordSet_ibase($id,$mode);
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-csv.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
index bf8655c..4fb2dcc 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
@@ -1,19 +1,19 @@
 <?php
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
-  
+
   Currently unsupported: MetaDatabases, MetaTables and MetaColumns, and also inputarr in Execute.
   Native types have been converted to MetaTypes.
   Transactions not supported yet.
-  
+
   Limitation of url length. For IIS, see MaxClientRequestBuffer registry value.
-  
+
 	  http://support.microsoft.com/default.aspx?scid=kb;en-us;260694
-*/ 
+*/
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -22,12 +22,12 @@ if (! defined("_ADODB_CSV_LAYER")) {
  define("_ADODB_CSV_LAYER", 1 );
 
 include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
- 
+
 class ADODB_csv extends ADOConnection {
 	var $databaseType = 'csv';
 	var $databaseProvider = 'csv';
 	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
+	var $hasAffectedRows = true;
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
 	var $_affectedrows=0;
 	var $_insertid=0;
@@ -35,35 +35,35 @@ class ADODB_csv extends ADOConnection {
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $hasTransactions = false;
 	var $_errorNo = false;
-	
-	function ADODB_csv() 
-	{		
+
+	function ADODB_csv()
+	{
 	}
-	
+
 	function _insertid()
 	{
 			return $this->_insertid;
 	}
-	
+
 	function _affectedrows()
 	{
 			return $this->_affectedrows;
 	}
-  
+
   	function MetaDatabases()
 	{
 		return false;
 	}
 
-	
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
 		$this->_url = $argHostname;
-		return true;	
+		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
@@ -71,24 +71,24 @@ class ADODB_csv extends ADOConnection {
 		$this->_url = $argHostname;
 		return true;
 	}
-	
- 	function MetaColumns($table, $normalize=true) 
+
+ 	function MetaColumns($table, $normalize=true)
 	{
 		return false;
 	}
-		
-		
+
+
 	// parameters use PostgreSQL convention, not MySQL
 	function SelectLimit($sql,$nrows=-1,$offset=-1)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
 			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE).
 			"&offset=$offset";
 		$err = false;
 		$rs = csv2rs($url,$err,false);
-		
+
 		if ($this->debug) print "$url<br><i>$err</i><br>";
 
 		$at = strpos($err,'::::');
@@ -99,25 +99,25 @@ class ADODB_csv extends ADOConnection {
 			$this->_errorMsg = substr($err,$at+4,1024);
 			$this->_errorNo = -9999;
 		}
-		if ($this->_errorNo) 
+		if ($this->_errorNo)
 			if ($fn = $this->raiseErrorFn) {
 				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,'');
 			}
-			
-		if (is_object($rs)) {	
-		
-			$rs->databaseType='csv';		
+
+		if (is_object($rs)) {
+
+			$rs->databaseType='csv';
 			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
 			$rs->connection = $this;
 		}
 		return $rs;
 	}
-	
+
 	// returns queryID or false
 	function _Execute($sql,$inputarr=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		if (!$this->_bindInputArray && $inputarr) {
 			$sqlarr = explode('?',$sql);
 			$sql = '';
@@ -132,37 +132,37 @@ class ADODB_csv extends ADOConnection {
 				else
 					$sql .= $v;
 				$i += 1;
-	
+
 			}
 			$sql .= $sqlarr[$i];
-			if ($i+1 != sizeof($sqlarr))	
+			if ($i+1 != sizeof($sqlarr))
 				print "Input Array does not match ?: ".htmlspecialchars($sql);
 			$inputarr = false;
 		}
-		
+
 		$url =  $this->_url.'?sql='.urlencode($sql)."&fetch=".
 			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
 		$err = false;
-		
-		
+
+
 		$rs = csv2rs($url,$err,false);
 		if ($this->debug) print urldecode($url)."<br><i>$err</i><br>";
 		$at = strpos($err,'::::');
-		if ($at === false) {		
+		if ($at === false) {
 			$this->_errorMsg = $err;
 			$this->_errorNo = (integer)$err;
 		} else {
 			$this->_errorMsg = substr($err,$at+4,1024);
 			$this->_errorNo = -9999;
 		}
-		
-		if ($this->_errorNo) 
+
+		if ($this->_errorNo)
 			if ($fn = $this->raiseErrorFn) {
 				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr);
 			}
 		if (is_object($rs)) {
 			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
-			
+
 			$this->_affectedrows = $rs->affectedrows;
 			$this->_insertid = $rs->insertid;
 			$rs->databaseType='csv';
@@ -171,18 +171,18 @@ class ADODB_csv extends ADOConnection {
 		return $rs;
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	{
 			return $this->_errorMsg;
 	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
+
+	/*	Returns: the last error number from previous database operation	*/
+	function ErrorNo()
 	{
 		return $this->_errorNo;
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -195,7 +195,7 @@ class ADORecordset_csv extends ADORecordset {
 	{
 		$this->ADORecordset($id,$mode);
 	}
-	
+
 	function _close()
 	{
 		return true;
@@ -203,5 +203,3 @@ class ADORecordset_csv extends ADORecordset {
 }
 
 } // define
-	
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
index bd863d9..d7ff91a 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
@@ -1,6 +1,6 @@
 <?php
-/* 
-  V5.18 3 Sep 2012  (c) 2000-2012 (jlim#natsoft.com). All rights reserved.
+/*
+  V5.19  23-Apr-2014  (c) 2000-2012 (jlim#natsoft.com). All rights reserved.
 
   This is a version of the ADODB driver for DB2.  It uses the 'ibm_db2' PECL extension
   for PHP (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2 or
@@ -19,7 +19,7 @@
 if (!defined('ADODB_DIR')) die();
 
   define("_ADODB_DB2_LAYER", 2 );
-	 
+
 /*--------------------------------------------------------------------------------------
 --------------------------------------------------------------------------------------*/
 
@@ -28,14 +28,14 @@ if (!defined('ADODB_DIR')) die();
 
 
 class ADODB_db2 extends ADOConnection {
-	var $databaseType = "db2";	
+	var $databaseType = "db2";
 	var $fmtDate = "'Y-m-d'";
 	var $concat_operator = '||';
-	
+
 	var $sysTime = 'CURRENT TIME';
 	var $sysDate = 'CURRENT DATE';
 	var $sysTimeStamp = 'CURRENT TIMESTAMP';
-	
+
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $dataProvider = "db2";
@@ -45,7 +45,7 @@ class ADODB_db2 extends ADOConnection {
 
 	var $useFetchArray = false; // setting this to true will make array elements in FETCH_ASSOC mode case-sensitive
 								// breaking backward-compat
-	var $_bindInputArray = false;	
+	var $_bindInputArray = false;
 	var $_genIDSQL = "VALUES NEXTVAL FOR %s";
 	var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s NO MAXVALUE NO CYCLE";
 	var $_dropSeqSQL = "DROP SEQUENCE %s";
@@ -54,23 +54,23 @@ class ADODB_db2 extends ADOConnection {
 	var $_lastAffectedRows = 0;
 	var $uCaseTables = true; // for meta* functions, uppercase table names
 	var $hasInsertID = true;
-	
-	
+
+
     function _insertid()
     {
         return ADOConnection::GetOne('VALUES IDENTITY_VAL_LOCAL()');
     }
-	
-	function ADODB_db2() 
-	{ 	
+
+	function ADODB_db2()
+	{
 		$this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
 	}
-	
+
 		// returns true or false
 	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 		global $php_errormsg;
-		
+
 		if (!function_exists('db2_connect')) {
 			ADOConnection::outp("Warning: The old ODBC based DB2 driver has been renamed 'odbc_db2'. This ADOdb driver calls PHP's native db2 extension which is not installed.");
 			return null;
@@ -80,7 +80,7 @@ class ADODB_db2 extends ADOConnection {
 		ini_set('ibm_db2.binmode', $this->binmode);
 
 		if ($argDatabasename && empty($argDSN)) {
-		
+
 			if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_connect($argDatabasename,null,null);
 			else $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword);
 		} else {
@@ -95,27 +95,27 @@ class ADODB_db2 extends ADOConnection {
 
 		$this->_errorMsg = @db2_conn_errormsg();
 		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
+
 		if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema");
 		return $this->_connectionID != false;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
 	{
 		global $php_errormsg;
-	
+
 		if (!function_exists('db2_connect')) return null;
-		
+
 		// This needs to be set before the connect().
 		// Replaces the odbc_binmode() call that was in Execute()
 		ini_set('ibm_db2.binmode', $this->binmode);
 
 		if (isset($php_errormsg)) $php_errormsg = '';
 		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		
+
 		if ($argDatabasename && empty($argDSN)) {
-		
+
 			if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_pconnect($argDatabasename,null,null);
 			else $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword);
 		} else {
@@ -128,7 +128,7 @@ class ADODB_db2 extends ADOConnection {
 		$this->_errorMsg = @db2_conn_errormsg();
 		if ($this->_connectionID && $this->autoRollback) @db2_rollback($this->_connectionID);
 		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
+
 		if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema");
 		return $this->_connectionID != false;
 	}
@@ -140,10 +140,10 @@ class ADODB_db2 extends ADOConnection {
 		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
 		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD HH24:MI:SS')";
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 	// use right() and replace() ?
 		if (!$col) $col = $this->sysDate;
 
@@ -152,7 +152,7 @@ class ADODB_db2 extends ADOConnection {
 			return 'TO_CHAR('.$col.", 'YYYY-MM-DD HH24:MI:SS')";
 
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= $this->concat_operator;
@@ -179,7 +179,7 @@ class ADODB_db2 extends ADOConnection {
 			case 'H':
 			case 'h':
 				if ($len==1) return "hour($col)";
-				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";
 				else $s .= "''";
 				break;
 			case 'i':
@@ -205,26 +205,26 @@ class ADODB_db2 extends ADOConnection {
 			}
 		}
 		return $s;
-	} 
- 
-	
+	}
+
+
 	function ServerInfo()
 	{
-		$row = $this->GetRow("SELECT service_level, fixpack_num FROM TABLE(sysproc.env_get_inst_info()) 
+		$row = $this->GetRow("SELECT service_level, fixpack_num FROM TABLE(sysproc.env_get_inst_info())
 			as INSTANCEINFO");
 
-		
-		if ($row) {		
+
+		if ($row) {
 			$info['version'] = $row[0].':'.$row[1];
 			$info['fixpack'] = $row[1];
 			$info['description'] = '';
 		} else {
 			return ADOConnection::ServerInfo();
 		}
-		
+
 		return $info;
 	}
-	
+
 	function CreateSequence($seqname='adodbseq',$start=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
@@ -232,13 +232,13 @@ class ADODB_db2 extends ADOConnection {
 		if (!$ok) return false;
 		return true;
 	}
-	
+
 	function DropSequence($seqname)
 	{
 		if (empty($this->_dropSeqSQL)) return false;
 		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
 	}
-	
+
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
 	{
 		$nrows = (integer) $nrows;
@@ -254,18 +254,18 @@ class ADODB_db2 extends ADOConnection {
 			}
 			$rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
 		}
-		
+
 		return $rs;
 	}
-	
+
 	/*
 		This algorithm is not very efficient, but works even if table locking
 		is not available.
-		
+
 		Will return false if unable to generate an ID after $MAXLOOPS attempts.
 	*/
 	function GenID($seq='adodbseq',$start=1)
-	{	
+	{
 		// if you have to modify the parameter below, your database is overloaded,
 		// or you need to implement generation of id's yourself!
 				$num = $this->GetOne("VALUES NEXTVAL FOR $seq");
@@ -281,40 +281,40 @@ class ADODB_db2 extends ADOConnection {
 			return @db2_conn_errormsg($this->_connectionID);
 		} else return ADOConnection::ErrorMsg();
 	}
-	
+
 	function ErrorNo()
 	{
-		
+
 		if ($this->_haserrorfunctions) {
 			if ($this->_errorCode !== false) {
 				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
 				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
 			}
 
-			if (empty($this->_connectionID)) $e = @db2_conn_error(); 
+			if (empty($this->_connectionID)) $e = @db2_conn_error();
 			else $e = @db2_conn_error($this->_connectionID);
-			
+
 			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
 			 // so we check and patch
 			if (strlen($e)<=2) return 0;
 			return $e;
 		} else return ADOConnection::ErrorNo();
 	}
-	
-	
+
+
 
 	function BeginTrans()
-	{	
+	{
 		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->_autocommit = false;
 		return db2_autocommit($this->_connectionID,false);
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
@@ -322,21 +322,21 @@ class ADODB_db2 extends ADOConnection {
 		db2_autocommit($this->_connectionID,true);
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
 		$this->_autocommit = true;
 		$ret = db2_rollback($this->_connectionID);
 		db2_autocommit($this->_connectionID,true);
 		return $ret;
 	}
-	
+
 	function MetaPrimaryKeys($table)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		if ($this->uCaseTables) $table = strtoupper($table);
 		$schema = '';
 		$this->_findschema($table,$schema);
@@ -344,16 +344,16 @@ class ADODB_db2 extends ADOConnection {
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = @db2_primarykeys($this->_connectionID,'',$schema,$table);
-		
+
 		if (!$qid) {
 			$ADODB_FETCH_MODE = $savem;
 			return false;
 		}
 		$rs = new ADORecordSet_db2($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return false;
-		
+
 		$arr = $rs->GetArray();
 		$rs->Close();
 		$arr2 = array();
@@ -362,11 +362,11 @@ class ADODB_db2 extends ADOConnection {
 		}
 		return $arr2;
 	}
-	
+
 	function MetaForeignKeys($table, $owner = FALSE, $upper = FALSE, $asociative = FALSE )
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		if ($this->uCaseTables) $table = strtoupper($table);
 		$schema = '';
 		$this->_findschema($table,$schema);
@@ -391,15 +391,15 @@ class ADODB_db2 extends ADOConnection {
 		5 FKTABLE_SCHEM
 		6 FKTABLE_NAME
 		7 FKCOLUMN_NAME
-		*/	
+		*/
 		if (!$rs) return false;
 
-		$foreign_keys = array();	 	 
+		$foreign_keys = array();
 		while (!$rs->EOF) {
 			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				if (!is_array($foreign_keys[$rs->fields[5].'.'.$rs->fields[6]])) 
+				if (!is_array($foreign_keys[$rs->fields[5].'.'.$rs->fields[6]]))
 					$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]] = array();
-				$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]][$rs->fields[7]] = $rs->fields[3];	 		
+				$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]][$rs->fields[7]] = $rs->fields[3];
 			}
 			$rs->MoveNext();
 		}
@@ -407,28 +407,28 @@ class ADODB_db2 extends ADOConnection {
 		$rs->Close();
 		return $foreign_key;
 	}
-	
-	
+
+
 	function MetaTables($ttype=false,$schema=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = db2_tables($this->_connectionID);
-		
+
 		$rs = new ADORecordSet_db2($qid);
-		
+
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) {
 			$false = false;
 			return $false;
 		}
-		
+
 		$arr = $rs->GetArray();
 		$rs->Close();
 		$arr2 = array();
-		
+
 		if ($ttype) {
 			$isview = strncmp($ttype,'V',1) === 0;
 		}
@@ -437,7 +437,7 @@ class ADODB_db2 extends ADOConnection {
 			$type = $arr[$i][3];
 			$owner = $arr[$i][1];
 			$schemaval = ($schema) ? $arr[$i][1].'.' : '';
-			if ($ttype) { 
+			if ($ttype) {
 				if ($isview) {
 					if (strncmp($type,'V',1) === 0) $arr2[] = $schemaval.$arr[$i][2];
 				} else if (strncmp($owner,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
@@ -445,7 +445,7 @@ class ADODB_db2 extends ADOConnection {
 		}
 		return $arr2;
 	}
-	
+
 /*
 See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_data_type_changes.asp
 / SQL data type codes /
@@ -477,7 +477,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 	function DB2Types($t)
 	{
 		switch ((integer)$t) {
-		case 1:	
+		case 1:
 		case 12:
 		case 0:
 		case -95:
@@ -488,56 +488,56 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 			return 'X';
 		case -4: //image
 			return 'B';
-				
-		case 9:	
+
+		case 9:
 		case 91:
 			return 'D';
-		
+
 		case 10:
 		case 11:
 		case 92:
 		case 93:
 			return 'T';
-			
+
 		case 4:
 		case 5:
 		case -6:
 			return 'I';
-			
+
 		case -11: // uniqidentifier
 			return 'R';
 		case -7: //bit
 			return 'L';
-		
+
 		default:
 			return 'N';
 		}
 	}
-	
+
 	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$false = false;
 		if ($this->uCaseTables) $table = strtoupper($table);
 		$schema = '';
 		$this->_findschema($table,$schema);
-		
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
+
         	$colname = "%";
 	        $qid = db2_columns($this->_connectionID, "", $schema, $table, $colname);
 		if (empty($qid)) return $false;
-		
+
 		$rs = new ADORecordSet_db2($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return $false;
 		$rs->_fetch();
-		
+
 		$retarr = array();
-		
+
 		/*
 		$rs->fields indices
 		0 TABLE_QUALIFIER
@@ -558,7 +558,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 				$fld = new ADOFieldObject();
 				$fld->name = $rs->fields[3];
 				$fld->type = $this->DB2Types($rs->fields[4]);
-				
+
 				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
 				// access uses precision to store length for char/varchar
 				if ($fld->type == 'C' or $fld->type == 'X') {
@@ -566,28 +566,28 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 						$fld->max_length = $rs->fields[7]/2;
 					else
 						$fld->max_length = $rs->fields[7];
-				} else 
+				} else
 					$fld->max_length = $rs->fields[7];
 				$fld->not_null = !empty($rs->fields[10]);
 				$fld->scale = $rs->fields[8];
 				$fld->primary_key = false;
-				$retarr[strtoupper($fld->name)] = $fld;	
+				$retarr[strtoupper($fld->name)] = $fld;
 			} else if (sizeof($retarr)>0)
 				break;
 			$rs->MoveNext();
 		}
-		$rs->Close(); 
+		$rs->Close();
 		if (empty($retarr)) $retarr = false;
 
 	      $qid = db2_primary_keys($this->_connectionID, "", $schema, $table);
 		if (empty($qid)) return $false;
-		
+
 		$rs = new ADORecordSet_db2($qid);
 		$ADODB_FETCH_MODE = $savem;
-		
+
 		if (!$rs) return $retarr;
 		$rs->_fetch();
-		
+
 		/*
 		$rs->fields indices
 		0 TABLE_CAT
@@ -604,13 +604,13 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 				break;
 			$rs->MoveNext();
 		}
-		$rs->Close(); 
-		
+		$rs->Close();
+
 		if (empty($retarr)) $retarr = false;
 		return $retarr;
 	}
-	
-		
+
+
 	function Prepare($sql)
 	{
 		if (! $this->_bindInputArray) return $sql; // no binding
@@ -623,24 +623,24 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 	}
 
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
 	GLOBAL $php_errormsg;
 		if (isset($php_errormsg)) $php_errormsg = '';
 		$this->_error = '';
-		
+
 		if ($inputarr) {
 			if (is_array($sql)) {
 				$stmtid = $sql[1];
 			} else {
 				$stmtid = db2_prepare($this->_connectionID,$sql);
-	
+
 				if ($stmtid == false) {
 					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
 					return false;
 				}
 			}
-			
+
 			if (! db2_execute($stmtid,$inputarr)) {
 				if ($this->_haserrorfunctions) {
 					$this->_errorMsg = db2_stmt_errormsg();
@@ -648,7 +648,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 				}
 				return false;
 			}
-		
+
 		} else if (is_array($sql)) {
 			$stmtid = $sql[1];
 			if (!db2_execute($stmtid)) {
@@ -660,7 +660,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 			}
 		} else
 			$stmtid = @db2_exec($this->_connectionID,$sql);
-		
+
 		$this->_lastAffectedRows = 0;
 		if ($stmtid) {
 			if (@db2_num_fields($stmtid) == 0) {
@@ -669,7 +669,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 			} else {
 				$this->_lastAffectedRows = 0;
 			}
-			
+
 			if ($this->_haserrorfunctions) {
 				$this->_errorMsg = '';
 				$this->_errorCode = 0;
@@ -689,9 +689,9 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 	/*
 		Insert a null into the blob field of the table first.
 		Then use UpdateBlob to store the blob.
-		
+
 		Usage:
-		 
+
 		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
@@ -699,7 +699,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 	{
 		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -712,34 +712,34 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2
 	{
 		return $this->_lastAffectedRows;
 	}
-	
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_db2 extends ADORecordSet {	
-	
+class ADORecordSet_db2 extends ADORecordSet {
+
 	var $bind = false;
-	var $databaseType = "db2";		
+	var $databaseType = "db2";
 	var $dataProvider = "db2";
 	var $useFetchArray;
-	
+
 	function ADORecordSet_db2($id,$mode=false)
 	{
-		if ($mode === false) {  
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->fetchMode = $mode;
-		
+
 		$this->_queryID = $id;
 	}
 
 
 	// returns the field object
-	function FetchField($offset = -1) 
+	function FetchField($offset = -1)
 	{
 		$o= new ADOFieldObject();
 		$o->name = @db2_field_name($this->_queryID,$offset);
@@ -749,7 +749,7 @@ class ADORecordSet_db2 extends ADORecordSet {
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
@@ -764,8 +764,8 @@ class ADORecordSet_db2 extends ADORecordSet {
 
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
-		
+
+
 	function _initrs()
 	{
 	global $ADODB_COUNTRECS;
@@ -773,15 +773,15 @@ class ADORecordSet_db2 extends ADORecordSet {
 		$this->_numOfFields = @db2_num_fields($this->_queryID);
 		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
 		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
-	}	
-	
+	}
+
 	function _seek($row)
 	{
 		return false;
 	}
-	
+
 	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-	function GetArrayLimit($nrows,$offset=-1) 
+	function GetArrayLimit($nrows,$offset=-1)
 	{
 		if ($offset <= 0) {
 			$rs = $this->GetArray($nrows);
@@ -791,27 +791,27 @@ class ADORecordSet_db2 extends ADORecordSet {
 		$this->fetchMode = ADODB_FETCH_NUM;
 		$this->Move($offset);
 		$this->fetchMode = $savem;
-		
+
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
 		}
-		
+
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
-		
+
 		return $results;
 	}
-	
-	
-	function MoveNext() 
+
+
+	function MoveNext()
 	{
-		if ($this->_numOfRows != 0 && !$this->EOF) {		
+		if ($this->_numOfRows != 0 && !$this->EOF) {
 			$this->_currentRow++;
-			
+
 			$this->fields = @db2_fetch_array($this->_queryID);
 			if ($this->fields) {
 				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
@@ -823,8 +823,8 @@ class ADORecordSet_db2 extends ADORecordSet {
 		$this->fields = false;
 		$this->EOF = true;
 		return false;
-	}	
-	
+	}
+
 	function _fetch()
 	{
 
@@ -838,11 +838,10 @@ class ADORecordSet_db2 extends ADORecordSet {
 		$this->fields = false;
 		return false;
 	}
-	
-	function _close() 
+
+	function _close()
 	{
-		return @db2_free_result($this->_queryID);		
+		return @db2_free_result($this->_queryID);
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
index 12a4883..b58ec1a 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
@@ -1,13 +1,13 @@
 <?php
-/* 
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
 */
 
@@ -37,22 +37,22 @@ global $_COLONARR,$_COLONSZ;
 
 	$_COLONARR = array();
 	$_COLONSZ = sizeof($arr);
-	
+
 	$sql2 = preg_replace("/(:[0-9]+)/e","_colontrack('\\1')",$sql);
-	
+
 	if (empty($_COLONARR)) return array($sql,$arr);
-	
+
 	foreach($_COLONARR as $k => $v) {
-		$arr2[] = $arr[$v]; 
+		$arr2[] = $arr[$v];
 	}
-	
+
 	return array($sql2,$arr2);
 }
 */
 
 /*
 	Smart remapping of :0, :1 bind vars to ? ?
-	
+
 	Handles colons in comments -- and / * * / and in quoted strings.
 */
 
@@ -62,41 +62,41 @@ function _colonparser($sql,$arr)
 	$arrsize = sizeof($arr);
 	$state = 'NORM';
 	$at = 1;
-	$ch = $sql[0]; 
+	$ch = $sql[0];
 	$ch2 = @$sql[1];
 	$sql2 = '';
 	$arr2 = array();
 	$nprev = 0;
-	
-	
+
+
 	while (strlen($ch)) {
-	
+
 		switch($ch) {
 		case '/':
 			if ($state == 'NORM' && $ch2 == '*') {
 				$state = 'COMMENT';
-				
+
 				$at += 1;
 				$ch = $ch2;
 				$ch2 = $at < $lensql ? $sql[$at] : '';
 			}
 			break;
-			
+
 		case '*':
 			if ($state == 'COMMENT' && $ch2 == '/') {
 				$state = 'NORM';
-				
+
 				$at += 1;
 				$ch = $ch2;
 				$ch2 = $at < $lensql ? $sql[$at] : '';
 			}
 			break;
-		
+
 		case "\n":
 		case "\r":
 			if ($state == 'COMMENT2') $state = 'NORM';
 			break;
-		
+
 		case "'":
 			do {
 				$at += 1;
@@ -104,10 +104,10 @@ function _colonparser($sql,$arr)
 				$ch2 = $at < $lensql ? $sql[$at] : '';
 			} while ($ch !== "'");
 			break;
-			
+
 		case ':':
 			if ($state == 'COMMENT' || $state == 'COMMENT2') break;
-			
+
 			//echo "$at=$ch $ch2, ";
 			if ('0' <= $ch2 && $ch2 <= '9') {
 				$n = '';
@@ -127,7 +127,7 @@ function _colonparser($sql,$arr)
 				}
 			}
 			break;
-			
+
 		case '-':
 			if ($state == 'NORM') {
 				if ($ch2 == '-') $state = 'COMMENT2';
@@ -137,54 +137,54 @@ function _colonparser($sql,$arr)
 			}
 			break;
 		}
-		
+
 		$at += 1;
 		$ch = $ch2;
 		$ch2 = $at < $lensql ? $sql[$at] : '';
 	}
-	
+
 	if ($nprev == 0) {
 		$sql2 = $sql;
 	} else {
 		$sql2 .= substr($sql,$nprev);
 	}
-	
+
 	return array($sql2,$arr2);
 }
 
 class ADODB_db2oci extends ADODB_db2 {
-	var $databaseType = "db2oci";	
+	var $databaseType = "db2oci";
 	var $sysTimeStamp = 'sysdate';
 	var $sysDate = 'trunc(sysdate)';
 	var $_bindInputArray = true;
-	
+
 	function ADODB_db2oci()
 	{
 		parent::ADODB_db2();
 	}
-	
+
 	function Param($name,$type='C')
 	{
 		return ':'.$name;
 	}
-	
-	
+
+
 	function MetaTables($ttype=false,$schema=false)
 	{
 	global $ADODB_FETCH_MODE;
-	
+
 		$savem = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$qid = db2_tables($this->_connectionID);
-		
+
 		$rs = new ADORecordSet_db2($qid);
-		
+
 		$ADODB_FETCH_MODE = $savem;
 		if (!$rs) {
 			$false = false;
 			return $false;
 		}
-		
+
 		$arr = $rs->GetArray();
 		$rs->Close();
 		$arr2 = array();
@@ -199,7 +199,7 @@ class ADODB_db2oci extends ADODB_db2 {
 			$name = $schemaval.$arr[$i][2];
 			$owner = $arr[$i][1];
 			if (substr($name,0,8) == 'EXPLAIN_') continue;
-			if ($ttype) { 
+			if ($ttype) {
 				if ($isview) {
 					if (strncmp($type,'V',1) === 0) $arr2[] = $name;
 				} else if (strncmp($type,'T',1) === 0 && strncmp($owner,'SYS',3) !== 0) $arr2[] = $name;
@@ -207,19 +207,19 @@ class ADODB_db2oci extends ADODB_db2 {
 		}
 		return $arr2;
 	}
-	
+
 	function _Execute($sql, $inputarr=false	)
 	{
 		if ($inputarr) list($sql,$inputarr) = _colonparser($sql, $inputarr);
 		return parent::_Execute($sql, $inputarr);
 	}
 };
- 
 
-class  ADORecordSet_db2oci extends ADORecordSet_db2 {	
-	
-	var $databaseType = "db2oci";		
-	
+
+class  ADORecordSet_db2oci extends ADORecordSet_db2 {
+
+	var $databaseType = "db2oci";
+
 	function ADORecordSet_db2oci($id,$mode=false)
 	{
 		return $this->ADORecordSet_db2($id,$mode);
@@ -227,4 +227,3 @@ class  ADORecordSet_db2oci extends ADORecordSet_db2 {
 }
 
 } //define
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
index b84d8b8..ebcdab6 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
@@ -1,13 +1,13 @@
 <?php
-/* 
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
-  
+
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
 */
 
@@ -35,41 +35,41 @@ global $_COLONARR,$_COLONSZ;
 
 	$_COLONARR = array();
 	$_COLONSZ = sizeof($arr);
-	
+
 	$sql2 = preg_replace("/(:[0-9]+)/e","_colontrack('\\1')",$sql);
-	
+
 	if (empty($_COLONARR)) return array($sql,$arr);
-	
+
 	foreach($_COLONARR as $k => $v) {
-		$arr2[] = $arr[$v]; 
+		$arr2[] = $arr[$v];
 	}
-	
+
 	return array($sql2,$arr2);
 }
 
 class ADODB_db2oci extends ADODB_db2 {
-	var $databaseType = "db2oci";	
+	var $databaseType = "db2oci";
 	var $sysTimeStamp = 'sysdate';
 	var $sysDate = 'trunc(sysdate)';
-	
+
 	function ADODB_db2oci()
 	{
 		$this->ADODB_db2();
 	}
-	
-	
+
+
 	function _Execute($sql, $inputarr)
 	{
 		if ($inputarr) list($sql,$inputarr) = _colonscope($sql, $inputarr);
 		return parent::_Execute($sql, $inputarr);
 	}
 };
- 
 
-class  ADORecordSet_db2oci extends ADORecordSet_odbc {	
-	
-	var $databaseType = "db2oci";		
-	
+
+class  ADORecordSet_db2oci extends ADORecordSet_odbc {
+
+	var $databaseType = "db2oci";
+
 	function ADORecordSet_db2oci($id,$mode=false)
 	{
 		return $this->ADORecordSet_db2($id,$mode);
@@ -77,4 +77,3 @@ class  ADORecordSet_db2oci extends ADORecordSet_odbc {
 }
 
 } //define
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
index f5af4d1..5695707 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
@@ -1,12 +1,12 @@
 <?php
 /*
- @version V5.18 3 Sep 2012 (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
- Contribution by Frank M. Kromann <frank at frontbase.com>. 
+ @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
+ Contribution by Frank M. Kromann <frank at frontbase.com>.
   Set tabs to 8.
-*/ 
+*/
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -17,26 +17,26 @@ if (! defined("_ADODB_FBSQL_LAYER")) {
 class ADODB_fbsql extends ADOConnection {
 	var $databaseType = 'fbsql';
 	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $metaTablesSQL = "SHOW TABLES";	
+	var $hasAffectedRows = true;
+	var $metaTablesSQL = "SHOW TABLES";
 	var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
 	var $hasLimit = false;
-	
-	function ADODB_fbsql() 
-	{			
+
+	function ADODB_fbsql()
+	{
 	}
-	
+
 	function _insertid()
 	{
 			return fbsql_insert_id($this->_connectionID);
 	}
-	
+
 	function _affectedrows()
 	{
 			return fbsql_affected_rows($this->_connectionID);
 	}
-  
+
   	function MetaDatabases()
 	{
 		$qid = fbsql_list_dbs($this->_connectionID);
@@ -61,39 +61,39 @@ class ADODB_fbsql extends ADOConnection {
 		if (sizeof($arr) > 0) return "CONCAT($s)";
 		else return '';
 	}
-	
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		$this->_connectionID = fbsql_connect($argHostname,$argUsername,$argPassword);
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		$this->_connectionID = fbsql_pconnect($argHostname,$argUsername,$argPassword);
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
- 	function MetaColumns($table, $normalize=true) 
+
+ 	function MetaColumns($table, $normalize=true)
 	{
 		if ($this->metaColumnsSQL) {
-			
+
 			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			
+
 			if ($rs === false) return false;
-			
+
 			$retarr = array();
 			while (!$rs->EOF){
 				$fld = new ADOFieldObject();
 				$fld->name = $rs->fields[0];
 				$fld->type = $rs->fields[1];
-					
+
 				// split type into type(length):
 				if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array)) {
 					$fld->type = $query_array[1];
@@ -105,86 +105,86 @@ class ADODB_fbsql extends ADOConnection {
 				$fld->primary_key = ($rs->fields[3] == 'PRI');
 				$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
 				$fld->binary = (strpos($fld->type,'blob') !== false);
-				
-				$retarr[strtoupper($fld->name)] = $fld;	
+
+				$retarr[strtoupper($fld->name)] = $fld;
 				$rs->MoveNext();
 			}
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 		}
 		return false;
 	}
-		
+
 	// returns true or false
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		if ($this->_connectionID) {
-			return @fbsql_select_db($dbName,$this->_connectionID);		
+			return @fbsql_select_db($dbName,$this->_connectionID);
 		}
-		else return false;	
+		else return false;
 	}
-	
-	
+
+
 	// returns queryID or false
 	function _query($sql,$inputarr=false)
 	{
 		return fbsql_query("$sql;",$this->_connectionID);
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	{
 		$this->_errorMsg = @fbsql_error($this->_connectionID);
 			return $this->_errorMsg;
 	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
+
+	/*	Returns: the last error number from previous database operation	*/
+	function ErrorNo()
 	{
 		return @fbsql_errno($this->_connectionID);
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
 		return @fbsql_close($this->_connectionID);
 	}
-		
+
 }
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_fbsql extends ADORecordSet{	
-	
+class ADORecordSet_fbsql extends ADORecordSet{
+
 	var $databaseType = "fbsql";
 	var $canSeek = true;
-	
-	function ADORecordSet_fbsql($queryID,$mode=false) 
+
+	function ADORecordSet_fbsql($queryID,$mode=false)
 	{
-		if (!$mode) { 
+		if (!$mode) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		switch ($mode) {
 		case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
 		case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
-		case ADODB_FETCH_BOTH: 
+		case ADODB_FETCH_BOTH:
 		default:
 		$this->fetchMode = FBSQL_BOTH; break;
 		}
 		return $this->ADORecordSet($queryID);
 	}
-	
+
 	function _initrs()
 	{
 	GLOBAL $ADODB_COUNTRECS;
 		$this->_numOfRows = ($ADODB_COUNTRECS) ? @fbsql_num_rows($this->_queryID):-1;
 		$this->_numOfFields = @fbsql_num_fields($this->_queryID);
 	}
-	
+
 
 
 	function FetchField($fieldOffset = -1) {
@@ -198,25 +198,25 @@ class ADORecordSet_fbsql extends ADORecordSet{
 			$o = @fbsql_fetch_field($this->_queryID);// fbsql returns the max length less spaces -- so it is unrealiable
 			//$o->max_length = -1;
 		}
-		
+
 		return $o;
 	}
-		
+
 	function _seek($row)
 	{
 		return @fbsql_data_seek($this->_queryID,$row);
 	}
-	
+
 	function _fetch($ignore_fields=false)
 	{
 		$this->fields = @fbsql_fetch_array($this->_queryID,$this->fetchMode);
 		return ($this->fields == true);
 	}
-	
+
 	function _close() {
-		return @fbsql_free_result($this->_queryID);		
+		return @fbsql_free_result($this->_queryID);
 	}
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -227,40 +227,39 @@ class ADORecordSet_fbsql extends ADORecordSet{
 		$len = -1; // fbsql max_length is not accurate
 		switch (strtoupper($t)) {
 		case 'CHARACTER':
-		case 'CHARACTER VARYING': 
-		case 'BLOB': 
-		case 'CLOB': 
-		case 'BIT': 
-		case 'BIT VARYING': 
+		case 'CHARACTER VARYING':
+		case 'BLOB':
+		case 'CLOB':
+		case 'BIT':
+		case 'BIT VARYING':
 			if ($len <= $this->blobSize) return 'C';
-			
+
 		// so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
 			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
+
 		case 'DATE': return 'D';
-		
+
 		case 'TIME':
 		case 'TIME WITH TIME ZONE':
-		case 'TIMESTAMP': 
+		case 'TIMESTAMP':
 		case 'TIMESTAMP WITH TIME ZONE': return 'T';
-		
+
 		case 'PRIMARY_KEY':
 			return 'R';
 		case 'INTEGER':
-		case 'SMALLINT': 
+		case 'SMALLINT':
 		case 'BOOLEAN':
-			
+
 			if (!empty($fieldobj->primary_key)) return 'R';
 			else return 'I';
-		
+
 		default: return 'N';
 		}
 	}
 
 } //class
 } // defined
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
index f09ed14..2e0917d 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
@@ -1,11 +1,11 @@
 <?php
-/* 
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). 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. 
+/*
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
-  
+
   Latest version is available at http://adodb.sourceforge.net
 
 */
@@ -16,21 +16,21 @@ if (!defined('ADODB_DIR')) die();
 include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
 
 class ADODB_firebird extends ADODB_ibase {
-	var $databaseType = "firebird";	
+	var $databaseType = "firebird";
 	var $dialect = 3;
-	
+
 	var $sysTimeStamp = "CURRENT_TIMESTAMP"; //"cast('NOW' as timestamp)";
-	
+
 	function ADODB_firebird()
-	{	
+	{
 		$this->ADODB_ibase();
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['dialect'] = $this->dialect;
 		switch($arr['dialect']) {
-		case '': 
+		case '':
 		case '1': $s = 'Firebird Dialect 1'; break;
 		case '2': $s = 'Firebird Dialect 2'; break;
 		default:
@@ -40,38 +40,37 @@ class ADODB_firebird extends ADODB_ibase {
 		$arr['description'] = $s;
 		return $arr;
 	}
-	
+
 	// Note that Interbase 6.5 uses this ROWS instead - don't you love forking wars!
-	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
+	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows
 	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
 	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0)
 	{
 		$nrows = (integer) $nrows;
 		$offset = (integer) $offset;
 		$str = 'SELECT ';
-		if ($nrows >= 0) $str .= "FIRST $nrows "; 
+		if ($nrows >= 0) $str .= "FIRST $nrows ";
 		$str .=($offset>=0) ? "SKIP $offset " : '';
-		
-		$sql = preg_replace('/^[ \t]*select/i',$str,$sql); 
+
+		$sql = preg_replace('/^[ \t]*select/i',$str,$sql);
 		if ($secs)
 			$rs = $this->CacheExecute($secs,$sql,$inputarr);
 		else
 			$rs = $this->Execute($sql,$inputarr);
-			
+
 		return $rs;
 	}
-	
-	
+
+
 };
- 
 
-class  ADORecordSet_firebird extends ADORecordSet_ibase {	
-	
-	var $databaseType = "firebird";		
-	
+
+class  ADORecordSet_firebird extends ADORecordSet_ibase {
+
+	var $databaseType = "firebird";
+
 	function ADORecordSet_firebird($id,$mode=false)
 	{
 		$this->ADORecordSet_ibase($id,$mode);
 	}
 }
-?>
\ No newline at end of file
diff --git a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
index f47b33e..a638f58 100644
--- a/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
+++ b/src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
@@ -1,23 +1,23 @@
 <?php
 /*
-V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.  
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). 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.
 
   Latest version is available at http://adodb.sourceforge.net
-  
+
   Interbase data driver. Requires interbase client. Works on Windows and Unix.
 
   3 Jan 2002 -- suggestions by Hans-Peter Oeri <kampfcaspar75 at oeri.ch>
   	changed transaction handling and added experimental blob stuff
-  
+
   Docs to interbase at the website
    http://www.synectics.co.za/php3/tutorial/IB_PHP3_API.html
-   
+
   To use gen_id(), see
    http://www.volny.cz/iprenosil/interbase/ip_ib_code.htm#_code_creategen
-   
+
    $rs = $conn->Execute('select gen_id(adodb,1) from rdb$database');
    $id = $rs->fields[0];
    $conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
@@ -53,26 +53,26 @@ class ADODB_ibase extends ADOConnection {
 	var $poorAffectedRows = true;
 	var $blobEncodeType = 'C';
 	var $role = false;
-	
-	function ADODB_ibase() 
+
+	function ADODB_ibase()
 	{
 		 if (defined('IBASE_DEFAULT')) $this->ibasetrans = IBASE_DEFAULT;
   	}
-	
-	
+
+
 	   // returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false)
-	{  
+	{
 		if (!function_exists('ibase_pconnect')) return null;
 		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
 		$fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
 		if ($this->role)
 			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
 					$this->charSet,$this->buffers,$this->dialect,$this->role);
-		else	
+		else
 			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
 					$this->charSet,$this->buffers,$this->dialect);
-		
+
 		if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
 			$this->replaceQuote = "''";
 		}
@@ -80,14 +80,14 @@ class ADODB_ibase extends ADOConnection {
 			$this->_handleerror();
 			return false;
 		}
-		
+
 		// PHP5 change.
 		if (function_exists('ibase_timefmt')) {
 			ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
 			if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
 			else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
 			ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
-			
+
 		} else {
 			ini_set("ibase.timestampformat", $this->ibase_timestampfmt);
 			ini_set("ibase.dateformat", $this->ibase_datefmt);
@@ -99,30 +99,30 @@ class ADODB_ibase extends ADOConnection {
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,true);
-	}	
-	
-	
+	}
+
+
 	function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
-	{	
+	{
 		if ($internalKey) return array('RDB$DB_KEY');
-		
+
 		$table = strtoupper($table);
-		
+
 		$sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME
-	FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME  
+	FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME
 	WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\'
 	ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
 
 		$a = $this->GetCol($sql,false,true);
 		if ($a && sizeof($a)>0) return $a;
-		return false;	  
+		return false;
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['dialect'] = $this->dialect;
 		switch($arr['dialect']) {
-		case '': 
+		case '':
 		case '1': $s = 'Interbase 5.5 or earlier'; break;
 		case '2': $s = 'Interbase 5.6'; break;
 		default:
@@ -134,16 +134,16 @@ class ADODB_ibase extends ADOConnection {
 	}
 
 	function BeginTrans()
-	{	 
+	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 	 	$this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
 		return $this->_transactionID;
 	}
-	
-	function CommitTrans($ok=true) 
-	{ 
+
+	function CommitTrans($ok=true)
+	{
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
@@ -156,13 +156,13 @@ class ADODB_ibase extends ADOConnection {
 		$this->_transactionID = false;
 		return $ret;
 	}
-	
+
 	// there are some compat problems with ADODB_COUNTRECS=false and $this->_logsql currently.
 	// it appears that ibase extension cannot support multiple concurrent queryid's
-	function _Execute($sql,$inputarr=false) 
+	function _Execute($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
-	
+
 		if ($this->_logsql) {
 			$savecrecs = $ADODB_COUNTRECS;
 			$ADODB_COUNTRECS = true; // force countrecs
@@ -173,20 +173,20 @@ class ADODB_ibase extends ADOConnection {
 		}
 		return $ret;
 	}
-	
+
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
 		if ($this->transCnt) $this->transCnt -= 1;
 		$ret = false;
 		$this->autoCommit = true;
-		if ($this->_transactionID) 
+		if ($this->_transactionID)
 				  $ret = ibase_rollback($this->_transactionID);
-		$this->_transactionID = false;   
-		
+		$this->_transactionID = false;
+
 		return $ret;
 	}
-	
+
 	function MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
         // save old fetch mode
@@ -214,7 +214,7 @@ class ADODB_ibase extends ADOConnection {
 	        $ADODB_FETCH_MODE = $save;
             return $false;
         }
-        
+
         $indexes = array();
 		while ($row = $rs->FetchRow()) {
 			$index = $row[0];
@@ -236,11 +236,11 @@ class ADODB_ibase extends ADOConnection {
             $this->SetFetchMode($savem);
         }
         $ADODB_FETCH_MODE = $save;
-        
+
         return $indexes;
 	}
 
-	
+
 	// See http://community.borland.com/article/0,1410,25844,00.html
 	function RowLock($tables,$where,$col=false)
 	{
@@ -248,21 +248,21 @@ class ADODB_ibase extends ADOConnection {
 		$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
 		return 1;
 	}
-	
-	
+
+
 	function CreateSequence($seqname,$startID=1)
 	{
 		$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
 		if (!$ok) return false;
 		return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
 	}
-	
+
 	function DropSequence($seqname)
 	{
 		$seqname = strtoupper($seqname);
 		$this->Execute("delete from RDB\$GENERATORS where RDB\$GENERATOR_NAME='$seqname'");
 	}
-	
+
 	function GenID($seqname='adodbseq',$startID=1)
 	{
 		$getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
@@ -274,13 +274,13 @@ class ADODB_ibase extends ADOConnection {
 		}
 		if ($rs && !$rs->EOF) $this->genID = (integer) reset($rs->fields);
 		else $this->genID = 0; // false
-		
+
 		if ($rs) $rs->Close();
-		
+
 		return $this->genID;
 	}
 
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 		   return false;
 	}
@@ -290,13 +290,13 @@ class ADODB_ibase extends ADOConnection {
 		$this->_errorMsg = ibase_errmsg();
 	}
 
-	function ErrorNo() 
+	function ErrorNo()
 	{
 		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
 		else return 0;
 	}
 
-	function ErrorMsg() 
+	function ErrorMsg()
 	{
 			return $this->_errorMsg;
 	}
@@ -311,7 +311,7 @@ class ADODB_ibase extends ADOConnection {
 	   // returns query ID if successful, otherwise false
 	   // there have been reports of problems with nested queries - the code is probably not re-entrant?
 	function _query($sql,$iarr=false)
-	{ 
+	{
 
 		if (!$this->autoCommit && $this->_transactionID) {
 			$conn = $this->_transactionID;
@@ -341,11 +341,11 @@ class ADODB_ibase extends ADOConnection {
 					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
 					}
 				}
-			} else $ret = $fn($sql); 
+			} else $ret = $fn($sql);
 		} else {
 			$fn = 'ibase_query';
-		
-			if (is_array($iarr)) {	
+
+			if (is_array($iarr)) {
 				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
 					if (sizeof($iarr) == 0) $iarr[0] = ''; // PHP5 compat hack
 					$fnarr = array_merge( array($conn,$sql) , $iarr);
@@ -363,7 +363,7 @@ class ADODB_ibase extends ADOConnection {
 					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
 					}
 				}
-			} else $ret = $fn($conn,$sql); 
+			} else $ret = $fn($conn,$sql);
 		}
 		if ($docommit && $ret === true) ibase_commit($this->_connectionID);
 
@@ -373,11 +373,11 @@ class ADODB_ibase extends ADOConnection {
 
 	 // returns true or false
 	 function _close()
-	 {	   
+	 {
 		if (!$this->autoCommit) @ibase_rollback($this->_connectionID);
 		return @ibase_close($this->_connectionID);
 	 }
-	
+
 	//OPN STUFF start
 	function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3)
 	{
@@ -385,14 +385,14 @@ class ADODB_ibase extends ADOConnection {
 		$fld->max_length = $flen;
 		$fld->scale = null;
 		switch($ftype){
-			case 7: 
+			case 7:
 			case 8:
 				if ($dialect3) {
 				    switch($fsubtype){
-				    	case 0: 
+				    	case 0:
 				    		$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
 				    		break;
-				    	case 1: 
+				    	case 1:
 				    		$fld->type = 'numeric';
 							$fld->max_length = $fprecision;
 							$fld->scale = $fscale;
@@ -413,15 +413,15 @@ class ADODB_ibase extends ADOConnection {
 					}
 				}
 				break;
-			case 16: 
+			case 16:
 				if ($dialect3) {
 				    switch($fsubtype){
-				    	case 0: 
+				    	case 0:
 				    		$fld->type = 'decimal';
 							$fld->max_length = 18;
 							$fld->scale = 0;
 				    		break;
-				    	case 1: 
+				    	case 1:
 				    		$fld->type = 'numeric';
 							$fld->max_length = $fprecision;
 							$fld->scale = $fscale;
@@ -476,21 +476,21 @@ class ADODB_ibase extends ADOConnection {
 	}
 	//OPN STUFF end
 		// returns array of ADOFieldObjects for current table
-	function MetaColumns($table, $normalize=true) 
+	function MetaColumns($table, $normalize=true)
 	{
 	global $ADODB_FETCH_MODE;
-		
+
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
+
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-	
+
 		$ADODB_FETCH_MODE = $save;
 		$false = false;
 		if ($rs === false) {
 			return $false;
 		}
-		
+
 		$retarr = array();
 		//OPN STUFF start
 		$dialect3 = ($this->dialect==3 ? true : false);
@@ -502,16 +502,16 @@ class ADODB_ibase extends ADOConnection {
 			$this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3);
 			if (isset($rs->fields[1]) && $rs->fields[1]) {
 				$fld->not_null = true;
-			}				
+			}
 			if (isset($rs->fields[2])) {
-				
+
 				$fld->has_default = true;
 				$d = substr($rs->fields[2],strlen('default '));
 				switch ($fld->type)
 				{
 				case 'smallint':
 				case 'integer': $fld->default_value = (int) $d; break;
-				case 'char': 
+				case 'char':
 				case 'blob':
 				case 'text':
 				case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
@@ -527,48 +527,48 @@ class ADODB_ibase extends ADOConnection {
 				$fld->sub_type = null;
 			}
 			//OPN STUFF end
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
 			else $retarr[strtoupper($fld->name)] = $fld;
-			
+
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if ( empty($retarr)) return $false;
-		else return $retarr;	
+		else return $retarr;
 	}
-	
-	function BlobEncode( $blob ) 
+
+	function BlobEncode( $blob )
 	{
 		$blobid = ibase_blob_create( $this->_connectionID);
 		ibase_blob_add( $blobid, $blob );
 		return ibase_blob_close( $blobid );
 	}
-	
-	// since we auto-decode all blob's since 2.42, 
+
+	// since we auto-decode all blob's since 2.42,
 	// BlobDecode should not do any transforms
 	function BlobDecode($blob)
 	{
-		return $blob; 
+		return $blob;
 	}
-	
-	
-	
-	
+
+
+
+
 	// old blobdecode function
 	// still used to auto-decode all blob's
-	function _BlobDecode_old( $blob ) 
+	function _BlobDecode_old( $blob )
 	{
 		$blobid = ibase_blob_open($this->_connectionID, $blob );
 		$realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet <kevinboillet at yahoo.fr>
-		while($string = ibase_blob_get($blobid, 8192)){ 
-			$realblob .= $string; 
+		while($string = ibase_blob_get($blobid, 8192)){
+			$realblob .= $string;
 		}
 		ibase_blob_close( $blobid );
 
 		return( $realblob );
-	} 
-	
-	function _BlobDecode( $blob ) 
+	}
+
+	function _BlobDecode( $blob )
     {
         if  (ADODB_PHPVER >= 0x5000) {
             $blob_data = ibase_blob_info($this->_connectionID, $blob );
@@ -584,7 +584,7 @@ class ADODB_ibase extends ADOConnection {
             $realblob = ibase_blob_get($blobid, $this->maxblobsize);
 
             while($string = ibase_blob_get($blobid, 8192)){
-                $realblob .= $string; 
+                $realblob .= $string;
             }
         } else {
             $realblob = ibase_blob_get($blobid, $blob_data[0]);
@@ -593,69 +593,69 @@ class ADODB_ibase extends ADOConnection {
         ibase_blob_close( $blobid );
         return( $realblob );
 	}
-	
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		$fd = fopen($path,'rb'); 
-		if ($fd === false) return false; 
-		$blob_id = ibase_blob_create($this->_connectionID); 
-		
-		/* fill with data */ 
-		
-		while ($val = fread($fd,32768)){ 
-			ibase_blob_add($blob_id, $val); 
-		} 
-		
-		/* close and get $blob_id_str for inserting into table */ 
-		$blob_id_str = ibase_blob_close($blob_id); 
-		
-		fclose($fd); 
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
-	} 
-	
+
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+	{
+		$fd = fopen($path,'rb');
+		if ($fd === false) return false;
+		$blob_id = ibase_blob_create($this->_connectionID);
+
+		/* fill with data */
+
+		while ($val = fread($fd,32768)){
+			ibase_blob_add($blob_id, $val);
+		}
+
+		/* close and get $blob_id_str for inserting into table */
+		$blob_id_str = ibase_blob_close($blob_id);
+
+		fclose($fd);
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
+	}
+
 	/*
 		Insert a null into the blob field of the table first.
 		Then use UpdateBlob to store the blob.
-		
+
 		Usage:
-		 
+
 		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
-	{ 
-	$blob_id = ibase_blob_create($this->_connectionID); 
-	
-	// ibase_blob_add($blob_id, $val); 
-	
-	// replacement that solves the problem by which only the first modulus 64K / 
-	// of $val are stored at the blob field //////////////////////////////////// 
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+	$blob_id = ibase_blob_create($this->_connectionID);
+
+	// ibase_blob_add($blob_id, $val);
+
+	// replacement that solves the problem by which only the first modulus 64K /
+	// of $val are stored at the blob field ////////////////////////////////////
 	// Thx Abel Berenstein  aberenstein#afip.gov.ar
-	$len = strlen($val); 
-	$chunk_size = 32768; 
-	$tail_size = $len % $chunk_size; 
-	$n_chunks = ($len - $tail_size) / $chunk_size; 
-	
-	for ($n = 0; $n < $n_chunks; $n++) { 
-		$start = $n * $chunk_size; 
-		$data = substr($val, $start, $chunk_size); 
-		ibase_blob_add($blob_id, $data); 
-	} 
-	
+	$len = strlen($val);
+	$chunk_size = 32768;
+	$tail_size = $len % $chunk_size;
+	$n_chunks = ($len - $tail_size) / $chunk_size;
+
+	for ($n = 0; $n < $n_chunks; $n++) {
+		$start = $n * $chunk_size;
+		$data = substr($val, $start, $chunk_size);
+		ibase_blob_add($blob_id, $data);
+	}
+
 	if ($tail_size) {
-		$start = $n_chunks * $chunk_size; 
-		$data = substr($val, $start, $tail_size); 
-		ibase_blob_add($blob_id, $data); 
-	}
-	// end replacement ///////////////////////////////////////////////////////// 
-	
-	$blob_id_str = ibase_blob_close($blob_id); 
-	
-	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
-	
-	} 
-	
-	
+		$start = $n_chunks * $chunk_size;
+		$data = substr($val, $start, $tail_size);
+		ibase_blob_add($blob_id, $data);
+	}
+	// end replacement /////////////////////////////////////////////////////////
+
+	$blob_id_str = ibase_blob_close($blob_id);
+
+	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
+
+	}
+
+
 	function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		$blob_id = ibase_blob_create($this->_connectionID);
@@ -663,15 +663,15 @@ class ADODB_ibase extends ADOConnection {
 		$blob_id_str = ibase_blob_close($blob_id);
 		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
 	}
-	
+
 	// Format date column in sql string given an input format that understands Y M D
 	// Only since Interbase 6.0 - uses EXTRACT
 	// problem - does not zero-fill the day and month yet
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysDate;
 		$s = '';
-		
+
 		$len = strlen($fmt);
 		for ($i=0; $i < $len; $i++) {
 			if ($s) $s .= '||';
@@ -696,15 +696,15 @@ class ADODB_ibase extends ADOConnection {
 			case 'H':
 			case 'h':
 			  $s .= "(extract(hour from $col))";
-			  break;                        
+			  break;
 			case 'I':
 			case 'i':
 			  $s .= "(extract(minute from $col))";
-			  break;                
+			  break;
 			case 'S':
 			case 's':
 			  $s .= "CAST((extract(second from $col)) AS INTEGER)";
-			  break;        
+			  break;
 
 			def