From f8fa64feb0a33b5712c8822a6fc58de918dcdaa4 Mon Sep 17 00:00:00 2001
From: chriskl <chriskl>
Date: Mon, 11 Feb 2002 09:32:47 +0000
Subject: [PATCH] Initial revision

---
 classes/database/ADODB_base.php            |  298 +++
 classes/database/BaseDB.php                |   70 +
 classes/database/Postgres.php              |  599 +++++
 classes/database/Postgres71.php            |  428 ++++
 conf/config.inc                            |   62 +
 lang/english.php                           |   31 +
 lang/template.php                          |   16 +
 libraries/adodb/adodb-access.inc.php       |   54 +
 libraries/adodb/adodb-ado.inc.php          |  522 +++++
 libraries/adodb/adodb-ado_access.inc.php   |   38 +
 libraries/adodb/adodb-ado_mssql.inc.php    |   36 +
 libraries/adodb/adodb-cryptsession.php     |  245 ++
 libraries/adodb/adodb-csv.inc.php          |  147 ++
 libraries/adodb/adodb-db2.inc.php          |  163 ++
 libraries/adodb/adodb-errorhandler.inc.php |   73 +
 libraries/adodb/adodb-errorpear.inc.php    |   86 +
 libraries/adodb/adodb-fbsql.inc.php        |  251 +++
 libraries/adodb/adodb-ibase.inc.php        |  349 +++
 libraries/adodb/adodb-mssql.inc.php        |  279 +++
 libraries/adodb/adodb-mysql.inc.php        |  352 +++
 libraries/adodb/adodb-mysqlt.inc.php       |   53 +
 libraries/adodb/adodb-oci8.inc.php         |  503 +++++
 libraries/adodb/adodb-odbc.inc.php         |  369 ++++
 libraries/adodb/adodb-odbc_mssql.inc.php   |   38 +
 libraries/adodb/adodb-odbc_oracle.inc.php  |  104 +
 libraries/adodb/adodb-oracle.inc.php       |  243 ++
 libraries/adodb/adodb-pear.inc.php         |  348 +++
 libraries/adodb/adodb-postgres.inc.php     |  377 ++++
 libraries/adodb/adodb-postgres7.inc.php    |   62 +
 libraries/adodb/adodb-proxy.inc.php        |   28 +
 libraries/adodb/adodb-session.php          |  228 ++
 libraries/adodb/adodb-sybase.inc.php       |  215 ++
 libraries/adodb/adodb-vfp.inc.php          |   79 +
 libraries/adodb/adodb.gif                  |  Bin 0 -> 1089 bytes
 libraries/adodb/adodb.inc.php              | 2332 ++++++++++++++++++++
 libraries/adodb/adodb.png                  |  Bin 0 -> 29073 bytes
 libraries/adodb/benchmark.php              |   78 +
 libraries/adodb/client.php                 |  194 ++
 libraries/adodb/crypt.inc.php              |   60 +
 libraries/adodb/license.txt                |  161 ++
 libraries/adodb/readme.htm                 | 1518 +++++++++++++
 libraries/adodb/readme.txt                 |   57 +
 libraries/adodb/server.php                 |   92 +
 libraries/adodb/test.php                   |  436 ++++
 libraries/adodb/test2.php                  |   52 +
 libraries/adodb/test3.php                  |   30 +
 libraries/adodb/test4.php                  |   64 +
 libraries/adodb/test5.php                  |   35 +
 libraries/adodb/testcache.php              |   20 +
 libraries/adodb/testdatabases.inc.php      |  164 ++
 libraries/adodb/testoci8.php               |   43 +
 libraries/adodb/testpaging.php             |   36 +
 libraries/adodb/testpear.php               |   17 +
 libraries/adodb/testsessions.php           |   12 +
 libraries/adodb/tohtml.inc.php             |  150 ++
 libraries/adodb/tute.htm                   |  273 +++
 public_html/browser.php                    |   46 +
 public_html/databases.php                  |   23 +
 public_html/index.php                      |   31 +
 public_html/intro.php                      |   22 +
 public_html/login.php                      |   68 +
 public_html/topbar.php                     |   24 +
 62 files changed, 12784 insertions(+)
 create mode 100644 classes/database/ADODB_base.php
 create mode 100644 classes/database/BaseDB.php
 create mode 100755 classes/database/Postgres.php
 create mode 100644 classes/database/Postgres71.php
 create mode 100644 conf/config.inc
 create mode 100755 lang/english.php
 create mode 100644 lang/template.php
 create mode 100755 libraries/adodb/adodb-access.inc.php
 create mode 100755 libraries/adodb/adodb-ado.inc.php
 create mode 100755 libraries/adodb/adodb-ado_access.inc.php
 create mode 100755 libraries/adodb/adodb-ado_mssql.inc.php
 create mode 100755 libraries/adodb/adodb-cryptsession.php
 create mode 100755 libraries/adodb/adodb-csv.inc.php
 create mode 100755 libraries/adodb/adodb-db2.inc.php
 create mode 100755 libraries/adodb/adodb-errorhandler.inc.php
 create mode 100755 libraries/adodb/adodb-errorpear.inc.php
 create mode 100755 libraries/adodb/adodb-fbsql.inc.php
 create mode 100755 libraries/adodb/adodb-ibase.inc.php
 create mode 100755 libraries/adodb/adodb-mssql.inc.php
 create mode 100755 libraries/adodb/adodb-mysql.inc.php
 create mode 100755 libraries/adodb/adodb-mysqlt.inc.php
 create mode 100755 libraries/adodb/adodb-oci8.inc.php
 create mode 100755 libraries/adodb/adodb-odbc.inc.php
 create mode 100755 libraries/adodb/adodb-odbc_mssql.inc.php
 create mode 100755 libraries/adodb/adodb-odbc_oracle.inc.php
 create mode 100755 libraries/adodb/adodb-oracle.inc.php
 create mode 100755 libraries/adodb/adodb-pear.inc.php
 create mode 100755 libraries/adodb/adodb-postgres.inc.php
 create mode 100755 libraries/adodb/adodb-postgres7.inc.php
 create mode 100755 libraries/adodb/adodb-proxy.inc.php
 create mode 100755 libraries/adodb/adodb-session.php
 create mode 100755 libraries/adodb/adodb-sybase.inc.php
 create mode 100755 libraries/adodb/adodb-vfp.inc.php
 create mode 100755 libraries/adodb/adodb.gif
 create mode 100755 libraries/adodb/adodb.inc.php
 create mode 100755 libraries/adodb/adodb.png
 create mode 100755 libraries/adodb/benchmark.php
 create mode 100755 libraries/adodb/client.php
 create mode 100755 libraries/adodb/crypt.inc.php
 create mode 100755 libraries/adodb/license.txt
 create mode 100755 libraries/adodb/readme.htm
 create mode 100755 libraries/adodb/readme.txt
 create mode 100755 libraries/adodb/server.php
 create mode 100755 libraries/adodb/test.php
 create mode 100755 libraries/adodb/test2.php
 create mode 100755 libraries/adodb/test3.php
 create mode 100755 libraries/adodb/test4.php
 create mode 100755 libraries/adodb/test5.php
 create mode 100755 libraries/adodb/testcache.php
 create mode 100755 libraries/adodb/testdatabases.inc.php
 create mode 100755 libraries/adodb/testoci8.php
 create mode 100755 libraries/adodb/testpaging.php
 create mode 100755 libraries/adodb/testpear.php
 create mode 100755 libraries/adodb/testsessions.php
 create mode 100755 libraries/adodb/tohtml.inc.php
 create mode 100755 libraries/adodb/tute.htm
 create mode 100644 public_html/browser.php
 create mode 100755 public_html/databases.php
 create mode 100755 public_html/index.php
 create mode 100755 public_html/intro.php
 create mode 100755 public_html/login.php
 create mode 100755 public_html/topbar.php

diff --git a/classes/database/ADODB_base.php b/classes/database/ADODB_base.php
new file mode 100644
index 00000000..1fb1a22b
--- /dev/null
+++ b/classes/database/ADODB_base.php
@@ -0,0 +1,298 @@
+<?php
+
+/*
+ * Parent class of all ADODB objects.
+ *
+ * $Id: ADODB_base.php,v 1.1 2002/02/11 09:32:47 chriskl Exp $
+ */
+
+include_once('../libraries/adodb/adodb-errorhandler.inc.php');
+include_once('../libraries/adodb/adodb.inc.php');
+
+class ADODB_base {
+
+	var $conn;
+
+	/**
+	 * Base constructor
+	 * @param $fetchMode Defaults to associative.  Override for different behaviour
+	 */
+	function ADODB_base($type, $fetchMode = ADODB_FETCH_ASSOC) {
+		$this->conn->databaseType = $type;
+		$this->conn = &ADONewConnection($type);
+		$this->conn->setFetchMode($fetchMode);
+	}
+
+	/**
+	 * Cleans (escapes) a string
+	 * @param $str The string to clean, by reference
+	 * @return The cleaned string
+	 */
+	function clean(&$str) {
+		$str = addslashes($str);
+		return $str;
+	}
+
+	/**
+	 * Retrieves a ResultSet from a query
+	 * @param $sql The SQL statement to be executed
+	 * @return A recordset
+	 */
+	function selectSet($sql) {
+		// Execute the statement
+		$rs = $this->conn->Execute($sql);
+
+		// If failure, return error value
+		if (!$rs) return $this->conn->ErrorNo();
+
+		return $rs;
+	}
+
+	/**
+	 * Retrieves a single value from a query
+	 *
+	 * @@ assumes that the query will return only one row - returns field value in the first row
+	 *
+	 * @param $sql The SQL statement to be executed
+	 * @param $field The field name to be returned
+	 * @return A single field value
+	 * @return -1 No rows were found
+	 */
+	function selectField($sql, $field) {
+		// Execute the statement
+		$rs = $this->conn->Execute($sql);
+
+		// If failure, or no rows returned, return error value
+		if (!$rs) return $this->conn->ErrorNo();
+		elseif ($rs->RecordCount() == 0) return -1;
+
+		return $rs->f[$field];
+	}
+
+	/**
+	 * Delete from the database
+	 * @param $table The name of the table
+	 * @param $conditions (array) A map of field names to conditions
+	 * @return 0 success
+	 * @return -1 on referential integrity violation
+	 * @return -2 on no rows deleted
+	 */
+	function delete($table, $conditions) {
+		$this->clean($table);
+
+		reset($conditions);
+
+		// Build clause
+		$sql = '';
+		while(list($key, $value) = each($conditions)) {
+			$this->clean($key);
+			$this->clean($value);
+			if ($sql) $sql .= " AND {$key}='{$value}'";
+			else $sql = "DELETE FROM {$table} WHERE {$key}='{$value}'";
+		}
+
+		// Check for failures
+		if (!$this->conn->Execute($sql)) {
+			// Check for referential integrity failure
+			if (stristr($this->conn->ErrorMsg(), 'referential'))
+				return -1;
+		}
+
+		// Check for no rows modified
+		if ($this->conn->Affected_Rows() == 0) return -2;
+
+		return $this->conn->ErrorNo();
+	}
+
+	/**
+	 * Insert a set of values into the database
+	 * @param $table The table to insert into
+	 * @param $vars (array) A mapping of the field names to the values to be inserted
+	 * @return 0 success
+	 * @return -1 if a unique constraint is violated
+	 * @return -2 if a referential constraint is violated
+	 */
+	function insert($table, $vars) {
+		$this->clean($table);
+
+		reset($vars);
+
+		// Build clause
+		$fields = '';
+		$values = '';
+		while(list($key, $value) = each($vars)) {
+			$this->clean($key);
+			$this->clean($value);
+
+			if ($fields) $fields .= ", {$key}";
+			else $fields = "INSERT INTO {$table} ({$key}";
+
+			if ($values) $values .= ", '{$value}'";
+			else $values = ") VALUES ('{$value}'";
+		}
+
+		// Check for failures
+		if (!$this->conn->Execute($fields . $values . ')')) {
+			// Check for unique constraint failure
+			if (stristr($this->conn->ErrorMsg(), 'unique'))
+				return -1;
+			// Check for referential integrity failure
+			elseif (stristr($this->conn->ErrorMsg(), 'referential'))
+				return -2;
+		}
+
+		return $this->conn->ErrorNo();
+	}
+
+	/**
+	 * Update a row in the database
+	 * @param $table The table that is to be updated
+	 * @param $vars (array) A mapping of the field names to the values to be updated
+	 * @param $where (array) A mapping of field names to values for the where clause
+	 * @param $nulls (array, optional) An array of fields to be set null
+	 * @return 0 success
+	 * @return -1 if a unique constraint is violated
+	 * @return -2 if a referential constraint is violated
+	 * @return -3 on no rows deleted
+	 */
+	function update($table, $vars, $where, $nulls = array()) {
+		$this->clean($table);
+
+		$setClause = '';
+		$whereClause = '';
+
+		// Populate the syntax arrays
+		reset($vars);
+		while(list($key, $value) = each($vars)) {
+			$this->clean($key);
+			$this->clean($value);
+			if ($setClause) $setClause .= ", {$key}='{$value}'";
+			else $setClause = "UPDATE {$table} SET {$key}='{$value}'";
+		}
+
+		reset($nulls);
+		while(list(, $value) = each($nulls)) {
+			$this->clean($value);
+			if ($setClause) $setClause .= ", {$value}=NULL";
+			else $setClause = "UPDATE {$table} SET {$value}=NULL";
+		}
+
+		reset($where);
+		while(list($key, $value) = each($where)) {
+			$this->clean($key);
+			$this->clean($value);
+			if ($whereClause) $whereClause .= " AND {$key}='{$value}'";
+			else $whereClause = " WHERE {$key}='{$value}'";
+		}
+
+		// Check for failures
+		if (!$this->conn->Execute($setClause . $whereClause)) {
+			// Check for unique constraint failure
+			if (stristr($this->conn->ErrorMsg(), 'unique'))
+				return -1;
+			// Check for referential integrity failure
+			elseif (stristr($this->conn->ErrorMsg(), 'referential'))
+				return -2;
+		}
+
+		// Check for no rows modified
+		if ($this->conn->Affected_Rows() == 0) return -3;
+
+		return $this->conn->ErrorNo();
+	}
+
+	/**
+	 * Begin a transaction
+	 * @return 0 success
+	 */
+	function beginTransaction() {
+		return !$this->conn->BeginTrans();
+	}
+
+	/**
+	 * End a transaction
+	 * @return 0 success
+	 */
+	function endTransaction() {
+		return !$this->conn->CommitTrans();
+	}
+
+	/**
+	 * Roll back a transaction
+	 * @return 0 success
+	 */
+	function rollbackTransaction() {
+		return !$this->conn->RollbackTrans();
+	}
+
+	// Type conversion routines
+
+	/**
+	 * Converts an array of identifiers into a bitset, given a bitset definition
+	 * Duplicate flags are silently ignored.
+	 * Note: This is not case insensitive.
+	 * @param flags An array of identifiers
+	 * @param allowed The definition of allowed identifiers, mapping identifier -> bit index
+	 * @return A string representation of the bitset
+	 */
+	function dbBitSet(&$flags, &$allowed) {
+		$bitset = (int)0;
+		for ($i = 0; $i < sizeof($flags); $i++) {
+			if (isset($allowed[$flags[$i]])) {
+				$bitset |= (1 << $allowed[$flags[$i]]);
+			}
+		}
+
+		// Left-pad the bitset to match the database size
+		// Important!
+		$bitset = decbin($bitset);
+		$bitset = str_pad($bitset, sizeof($allowed), '0', STR_PAD_LEFT);
+
+		return 'b' . $bitset;
+	}
+
+	/** 
+	 * Change an int from a database bitset field back into an array of identifiers
+	 * @param $bitset The database bitset, in database format (B'10101')
+	 * @param $allowed The definition of allowed identifiers, mapping identifier -> bit index
+	 * @return An array of identifiers
+	 */
+	function phpBitSet($bitset, &$allowed) {
+		// @@ NOTE: Should we be doing better error handling here?
+		// @@ This condition will catch both NULL values (correctly) and borked values (incorrectly)
+		if (!ereg("^[01]+$", $bitset)) return array();
+
+		$intset = bindec($bitset);
+
+		$temp = array();
+
+		reset($allowed);
+		while (list($k, $v) = each($allowed)) {
+			if ($intset & (1 << $v)) $temp[] = $k;
+		}
+		return $temp;
+	}
+
+	/** 
+	 * Change the value of a parameter to 't' or 'f' depending on whether it evaluates to true or false
+	 * @param $parameter the parameter
+	 */
+	function dbBool(&$parameter) {
+		if ($parameter) $parameter = 't';
+		else $parameter = 'f';
+
+		return $parameter;
+	}
+
+	/** 
+	 * Change a parameter from 't' or 'f' to a boolean, (others evaluate to false)
+	 * @param $parameter the parameter
+	 */
+	function phpBool($parameter) {
+		$parameter = ($parameter == 't');
+		return $parameter;
+	}
+
+}
+
+?>
diff --git a/classes/database/BaseDB.php b/classes/database/BaseDB.php
new file mode 100644
index 00000000..c5722abd
--- /dev/null
+++ b/classes/database/BaseDB.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * A class that implements the DB interface for Postgres
+ * Note: This class uses ADODB and returns RecordSets.
+ *
+ * $Id: BaseDB.php,v 1.1 2002/02/11 09:32:47 chriskl Exp $
+ */
+
+include_once('../classes/database/ADODB_base.php');
+
+class BaseDB extends ADODB_base {
+
+	// Filter objects for user?
+	var $_filterTables = true;
+
+	function BaseDB($type) {
+		$this->ADODB_base($type);
+	}
+
+	/**
+	 * Set object filtering for user
+	 * @param $state (boolean)
+	 */
+	function setFilterTables($state) {
+		$this->$_filterTables = $state;
+	}
+
+/*
+	// Feature functions
+
+	// Is "ALTER TABLE" with add column supported? 
+	function supportsAlterTableWithAddColumn() {}
+	
+	// Is "ALTER TABLE" with drop column supported? 
+	function supportsAlterTableWithDropColumn() 
+
+	// Are both data definition and data manipulation statements within a transaction supported? 
+	function supportsDataDefinitionAndDataManipulationTransactions() 
+
+	// Are only data manipulation statements within a transaction supported? 
+	function supportsDataManipulationTransactionsOnly() 
+
+	// Does the database treat mixed case unquoted SQL identifiers as case sensitive and as a result store them in mixed case? A JDBC CompliantTM driver will always return false. 
+	function supportsMixedCaseIdentifiers() 
+
+	// Does the database treat mixed case quoted SQL identifiers as case sensitive and as a result store them in mixed case? A JDBC CompliantTM driver will always return true. 
+	function supportsMixedCaseQuotedIdentifiers() 
+
+	// Can columns be defined as non-nullable? A JDBC CompliantTM driver always returns true. 
+	function supportsNonNullableColumns() 
+
+	// Are stored procedure calls using the stored procedure escape syntax supported? 
+	function supportsStoredProcedures() 
+	
+	// Are transactions supported? If not, invoking the method commit is a noop and the isolation level is TRANSACTION_NONE. 
+	function supportsTransactions() 
+
+	// Can you define your own aggregates?
+	function supportsAggregates()
+
+	// Can you define your own operators?
+	function supportsOperators()
+
+	// Database manipulation
+
+*/
+}
+
+?>
\ No newline at end of file
diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
new file mode 100755
index 00000000..db43021b
--- /dev/null
+++ b/classes/database/Postgres.php
@@ -0,0 +1,599 @@
+<?php
+
+/**
+ * A class that implements the DB interface for Postgres
+ * Note: This class uses ADODB and returns RecordSets.
+ *
+ * $Id: Postgres.php,v 1.1 2002/02/11 09:32:47 chriskl Exp $
+ */
+
+include_once('ADODB_base.pclass');
+
+class Postgres extends BaseDB {
+
+	function Postgres() {
+		$this->User = 'auadmin';
+		$this->Password = 'bfd12hutz';
+
+		$this->BaseDB();
+	}
+
+	// Flag functions
+
+	/**
+	 * Retrieves the flags of the specified user
+	 * @param $user_id The ID of the user
+	 * @param $values (optional) Return array as values, rather than keys
+	 * @return An array containing the flag names as it keys with values of true
+	 */
+	function &getUserFlags($user_id, $values = false) {
+		$this->clean($meal_id);
+		$sql = "SELECT fl.name FROM users_flags uf, medidiets_flags fl WHERE uf.flag_id = fl.flag_id AND uf.user_id = '{$user_id}'";
+		$rs = $this->selectSet($sql);
+
+		$flags = array();
+		while (!$rs->EOF) {
+			if ($values)
+				$flags[] = $rs->f['name'];
+			else
+				$flags[$rs->f['name']] = true;
+			$rs->moveNext();
+		}
+
+		return $flags;
+	}
+
+	/**
+	 * Retrieves a user's profile and plan joined
+	 * @param $user_id The ID of the user whose data is to be returned
+	 * @return A recordset
+	 */
+	function &getProfileAndPlan($user_id) {
+		$this->clean($user_id);
+
+		$sql = "SELECT * FROM users_profiles_tmp up, medidiets_plans mp WHERE up.user_id='$user_id' AND up.plan_id=mp.plan_id";
+
+		return $this->selectSet($sql);
+	}
+
+	// Plan functions
+
+	/**
+	 * Returns all existing plans
+	 * @return A recordset
+	 */
+	function &getPlans() {
+		$sql = "SELECT * FROM medidiets_plans ORDER BY calories";
+		return $this->selectSet($sql);
+	}
+
+	/*
+	 * Finds a meal plan that matches the given number of calories most closely
+	 * @param $cals The number of calories the plan should be
+	 * @return (array) The ID of the plan found, and the actual cals
+	 */
+	function &findPlan($cals) {
+		$this->clean($cals);
+
+		$sql = "SELECT plan_id, calories, ABS(calories::numeric - '$cals') AS diff FROM medidiets_plans ORDER BY diff LIMIT 1";
+		$rs = $this->selectSet($sql);
+
+		return array($rs->f['plan_id'], $rs->f['calories']);
+	}
+
+	/*
+	 * Finds all meals that adhere to the given options, randomly ordered
+	 * @param $cals The number of calories the plan should be
+	 * @param $when_id The meal of the day to find meals for
+	 * @param $flags An array of flag names to be excluded
+	 * @param $names (optional) Specify whether to return names as well, sorted
+	 * @return A recordset
+	 */
+	function &findMeals($cals, $when_id, $flags, $names = false) {
+		$this->clean($cals);
+		$this->clean($when_id);
+		$flag_str = implode("','", $flags);
+
+		if ($names) {
+			$params = 'meal_id, name';
+			$order = 'name';
+		}
+		else {
+			$params = 'meal_id';
+			$order = 'RANDOM()';
+		}
+
+		$sql = "
+			SELECT 
+				{$params}
+			FROM 
+				medidiets_meals mm
+			WHERE 
+				mm.calories='{$cals}'
+				AND mm.when_id='{$when_id}'
+				AND mm.visible
+				AND NOT mm.pending
+				AND mm.meal_id NOT IN (
+					SELECT 
+						DISTINCT (meal_id)
+					FROM 
+						medidiets_flags_map mfp, medidiets_flags mf 
+					WHERE
+						mfp.flag_id=mf.flag_id
+						AND mf.name IN ('{$flag_str}')
+				)
+			ORDER BY {$order}
+		";
+
+		return $this->selectSet($sql);
+	}
+
+	/*
+	 * Inserts meals into a range of dates for a user
+	 * @param $user_id The ID of the user we're inserting for
+	 * @param $start_date The date at which to start the insertion
+	 * @param $no_days The number of days to insert
+	 * @return 0 success
+	 * @return -1 transaction error
+	 * @return -2 profile/plan retrieval error
+	 * @return -3 meal list retrieval error
+	 * @return -4 insertion failure
+	 * @@ What happens if no breakfasts could be found?!?!?
+	 */
+	function createMealPlan($user_id, $start_date, $no_days)  {
+		global $defaultCountryCode;
+
+		// begin transaction
+		$status = $this->beginTransaction();
+		if ($status != 0) return -1;
+
+		// Get user data, joined with plan data?
+		$data = &$this->getProfileAndPlan($user_id);
+		$data->f['seasonal'] = $this->phpBool($data->f['seasonal']);
+		$flags = &$this->getUserFlags($user_id, true);
+		
+		// Seasonal menus
+		if ($data->f['seasonal']) {
+			if ($defaultCountryCode == 'AU')
+				$is_summer = in_array(date('m'), array(10, 11, 12, 1, 2, 3));
+			else
+				$is_summer = in_array(date('m'), array(4, 5, 6, 7, 8, 9));
+
+			if ($is_summer) $flags[] = 'NOT_SUMMER';
+			else $flags[] = 'NOT_WINTER';
+		}
+
+		// Convenience
+		$b_flags = $flags;
+		if ($data->f['mp_breakfast'] == 'C') $b_flags[] = 'NOT_CONVENIENT';
+		$l_flags = $flags;
+		if ($data->f['mp_lunch'] == 'C') $l_flags[] = 'NOT_CONVENIENT';
+		$d_flags = $flags;
+		if ($data->f['mp_dinner'] == 'C') $d_flags[] = 'NOT_CONVENIENT';
+
+		// Get lists of breakfasts, lunches, dinners and snacks, ordered
+		// randomly.
+		if ($data->f['breakfast'] > 0) {
+			$breakfasts = &$this->findMeals($data->f['breakfast'], 1, $b_flags);
+			if (!$breakfasts) {
+				$this->rollbackTransaction();
+				return -3;
+			}
+			if ($breakfasts->recordCount() == 0) reportError("User {$user_id} could not find a {$data->f['breakfast']} cal breakfast for " . 
+				implode(',', $b_flags) . " flags.");
+		}
+		if ($data->f['lunch'] > 0) {
+			$lunches = &$this->findMeals($data->f['lunch'], 2, $l_flags);
+			if (!$lunches) {
+				$this->rollbackTransaction();
+				return -3;
+			}
+			if ($lunches->recordCount() == 0) reportError("User {$user_id} could not find a {$data->f['lunch']} cal lunch for " . 
+				implode(',', $l_flags) . " flags.");
+		}
+		if ($data->f['dinner'] > 0) {
+			$dinners = &$this->findMeals($data->f['dinner'], 3, $d_flags);
+			if (!$dinners) {
+				$this->rollbackTransaction();
+				return -3;
+			}
+			if ($dinners->recordCount() == 0) reportError("User {$user_id} could not find a {$data->f['dinner']} cal dinner for " . 
+				implode(',', $d_flags) . " flags.");
+		}
+		if ($data->f['snack'] > 0) {
+			$snacks = &$this->findMeals($data->f['snack'], 4, $flags);		
+			if (!$snacks) {
+				$this->rollbackTransaction();
+				return -3;
+			}
+			if ($snacks->recordCount() == 0) reportError("User {$user_id} could not find a {$data->f['snack']} cal snack for " . 
+				implode(',', $flags) . " flags.");
+		}
+
+		// For each day, insert a breakfast, lunch, dinner and snack
+		list($sy, $sm, $sd) = explode('-', $start_date);
+		for ($i = 0; $i < $no_days; $i++) {
+			$temp = array();
+			$temp['user_id'] = $user_id;
+			$temp['date'] = date('Y-m-d', mktime(0, 0, 0, $sm, $sd + $i, $sy));
+			// Breakfast
+			if ($data->f['breakfast'] > 0 && $breakfasts->recordCount() > 0) {
+				$temp['breakfast_id'] = $breakfasts->f['meal_id'];
+				$breakfasts->moveNext();
+				if ($breakfasts->EOF) $breakfasts->moveFirst();
+			}
+			// Lunch
+			if ($data->f['lunch'] > 0 && $lunches->recordCount() > 0) {
+				$temp['lunch_id'] = $lunches->f['meal_id'];
+				$lunches->moveNext();
+				if ($lunches->EOF) $lunches->moveFirst();
+		   }
+			// Dinner
+			if ($data->f['dinner'] > 0 && $dinners->recordCount() > 0) {
+				$temp['dinner_id'] = $dinners->f['meal_id'];
+				$dinners->moveNext();
+				if ($dinners->EOF) $dinners->moveFirst();
+			}
+			// Snack
+			if ($data->f['snack'] > 0 && $snacks->recordCount() > 0) {
+				$temp['snack_id'] = $snacks->f['meal_id'];
+				$snacks->moveNext();
+				if ($snacks->EOF) $snacks->moveFirst();
+			}
+
+			$status = $this->insert('users_mealplans', $temp);
+			if ($status != 0) {
+				$this->rollbackTransaction();
+				return -4;
+			}
+			unset($temp);
+		}
+
+		// @@ Take care of overriding preferences
+
+		return $this->endTransaction();
+	}
+
+	/**
+	 * Records a user's meal substitution to the database
+	 * @param $user_id The ID of the user to be updated
+	 * @param $date The date to update
+	 * @param $when_id The meal to replace
+	 * @param $meal_id The new meal to substitute
+	 * @return 0 success
+	 */
+	function setUserMeal($user_id, $date, $when_id, $meal_id) {
+		$fields = array('', 'breakfast_id', 'lunch_id', 'dinner_id', 'snack_id');
+		return $this->update('users_mealplans',
+			array($fields[$when_id] => $meal_id),
+			array('user_id' => $user_id, 'date' => $date));
+	}
+
+	/**
+	 * Retrieves a user's shopping list
+	 * @param $user_id The ID fo the user to retrieve
+	 * @param $date The date from which to retrieve
+	 * @param $num_days The number of days from the date forward to retrieve
+	 */
+	function &getShoppingList($user_id, $from, $to) {
+		$this->clean($user_id);
+		$this->clean($date);
+
+		$sql = "
+			SELECT description, food_id, name, measurement, base, type, name_pl, measurement_pl, qty, SUM(quantity) AS quantity FROM (
+				(SELECT 
+					mcf.description, mf.food_id, mf.name, mf.measurement, mf.base, mf.type, mf.name_pl, mf.measurement_pl, mf.quantity AS qty, mfm.quantity AS quantity 
+				FROM 
+					medidiets_categories_foods mcf, medidiets_foods mf, medidiets_foods_map mfm, users_mealplans um 
+				WHERE 
+					mcf.category_id=mf.category_id
+					AND mf.food_id=mfm.food_id 
+					AND mfm.meal_id IN (um.breakfast_id, um.lunch_id, um.dinner_id, um.snack_id)
+					AND um.date BETWEEN '$from' AND '$to'
+					AND user_id='$user_id')
+				UNION ALL
+				(SELECT 
+					mcf.description, mf.food_id, mf.name, mf.measurement, mf.base, mf.type, mf.name_pl, mf.measurement_pl, mf.quantity AS qty, mi.quantity AS quantity 
+				FROM 
+					medidiets_categories_foods mcf, medidiets_foods mf, medidiets_ingredients mi, medidiets_recipes_map mrm, users_mealplans um 
+				WHERE 
+					mcf.category_id=mf.category_id
+					AND mf.food_id=mi.food_id 
+					AND mi.recipe_id=mrm.recipe_id 
+					AND mrm.meal_id IN (um.breakfast_id, um.lunch_id, um.dinner_id, um.snack_id) 
+					AND um.date BETWEEN '$from' AND '$to'
+					AND user_id='$user_id')
+			) AS subselect
+			GROUP BY description, food_id, name, measurement, base, type, name_pl, measurement_pl, qty
+		";
+
+	   return $this->selectSet($sql);
+	}
+
+	// Miscellaneous functions
+
+	/*
+	 * Returns an array with the correct imperial or metric units
+	 * @return Array containing measurements
+	 */
+	function getDefaultUnits() {
+		global $defaultMeasurements;
+
+		if ($defaultMeasurement == 'imperial') {
+			$units = array('M' => 'oz', 'V' => 'fl.oz');
+		}
+		else {
+			$units = array('M' => 'g', 'V' => 'mL');
+		}
+
+		return $units;
+	}
+
+	/*
+	 * A helper function to convert decimals to fractions
+	 * @param A decimal number to convert
+	 * @return The formatted version of the number
+	 */
+	function _fracConvert($num) {
+		$decpart = $num - floor($num);
+
+		switch ($decpart * 4) {
+			case 0:
+				return number_format($num, 0);
+				break;
+			case 1:
+				if (floor($num) != 0)
+					return number_format(floor($num), 0) . ' 1/4';
+				else
+					return '1/4';
+				break;
+			case 2:
+				if (floor($num) != 0)
+					return number_format(floor($num), 0) . ' 1/2';
+				else
+					return '1/2';
+				break;
+			case 3:
+				if (floor($num) != 0)
+					return number_format(floor($num), 0) . ' 3/4';
+				else
+					return '3/4';
+				break;
+			default:
+				if ($decpart == 0.33) {
+					if (floor($num) != 0)
+						return number_format(floor($num), 0) . ' 1/3';
+					else
+						return '1/3';
+				}
+				elseif ($decpart == 0.66 || $decpart == 0.67) {
+					if (floor($num) != 0)
+						return number_format(floor($num), 0) . ' 2/3';
+					else
+						return '2/3';
+				}
+				else return number_format($num, 2);
+
+				break;
+		}
+	}
+
+	/**
+	 * Return the string to be used to as the display for the ingredient
+	 *
+	 * The string is to be formatted depending upon the values of the measurement
+	 * and base variables.  The string will also use the $defaultMeasurement
+	 * specified in the network config files.
+	 *
+	 * @param $name The name of the food of the ingredient
+	 * @param $name The pluralised form of the name
+	 * @param $quantity The amount of ingredient
+	 * @param $measurement The measurement of the food of the ingredient ('' if none)
+	 * @param $measurement The pluralised form of the measurement ('' if none)
+	 * @param $base The base size of the food of the ingredient ('' if none)
+	 * @param $type The base type of the food of the ingredient ('M' - mass, 'V' - volume)
+	 * @param $show_qty (optional) If false, only gives the name, not the quantity
+	 * @param $how How the ingredient is prepared.
+	 *
+	 */
+	function getIngredientDisplay($name, $name_pl, $quantity, $measurement, $measurement_pl, $base, $type, $how, $show_qty = true) {
+		global $defaultMeasurement;
+
+		// set display units depending on defaultMeasurement
+		$units = $this->getDefaultUnits();
+
+		// if quantity is an integer value show only the integer
+		if ($quantity == (int)$quantity) $quantity = (int)$quantity;
+
+		// discard fractional part of base size, cos who can measure half a gram?
+		if ($base != '') {
+			$base = round($base);
+			if ($base == 0) $base = 1;
+		}
+
+		if ($measurement != '' && $base != '') {
+			// both measurement and base are set
+			// eg. "2 1/2 375mL cans of Tomato Soup"
+			$display_qty = $this->_fracConvert($quantity) . ' ';
+		 	$display_nam = $base . $units[$type] . ' ';
+			$display_nam .= ($quantity > 1) ? $measurement_pl : $measurement;
+			$display_nam .= ' of ' . $name;
+		}
+		elseif ($measurement != '') {
+			// measurement is set but base is not
+			// eg. "4 2/3 slices of Bread"
+			$display_qty = $this->_fracConvert($quantity) . ' ';
+			$display_nam = ($quantity > 1) ? $measurement_pl : $measurement;
+			$display_nam .= ' of ' . $name;
+		}
+		elseif ($base != '') {
+			// base is set but measurement is not
+			// eg. "500g of Beef"
+			$display_qty = ceil($quantity * $base);
+		 	$display_nam = $units[$type] . ' of ' . $name;
+		}
+		else {
+			// neither measurement nor base is set
+			// eg. "1 1/2 Apples"
+			$display_qty = $this->_fracConvert($quantity) . ' ';
+			$display_nam = ($quantity > 1) ? $name_pl : $name;
+		}
+		// Add 'crumbed', etc.
+		if ($how != '') $display_nam .= ", {$how}";
+
+		if ($show_qty)
+			return $display_qty . $display_nam;
+		else
+			return $display_nam;
+
+	}
+
+	// Meal Manipulation Functions
+
+	/**
+	 * Retrieve the Nutritional Data for a Food associated with a given meal
+	 * @param $meal_id The ID of the meal
+	 * @param $food_id The ID of the food
+	 * @return The set of nutritional data and food information
+	 */
+	function &getMealFood($meal_id, $food_id) {
+		$this->clean($meal_id);
+		$this->clean($food_id);
+		$sql = "SELECT f.*, fm.* FROM medidiets_foods_map fm, medidiets_foods f WHERE fm.food_id = f.food_id AND fm.meal_id = '{$meal_id}' AND fm.food_id = '{$food_id}'";
+		return $this->selectSet($sql);
+	}
+
+	/**
+	 * Retrieves all categories in the database, with all fields, sorted
+	 * alphabetically.  This userland function excludes all categories with id's
+	 * less than zero!
+	 * @return A recordset
+	 */
+	function &getRecipeCategories() {
+		$sql = "SELECT * FROM medidiets_categories_rec WHERE category_id >= 0 ORDER BY description";
+		return $this->selectSet($sql);
+	}
+
+	/**
+	 * Retrieve the Nutritional Data for a Food associated with a given recipe
+	 * @param $recipe_id The ID of the recipe
+	 * @param $food_id The ID of the food
+	 * @return The set of nutritional data and food information
+	 */
+	function &getRecipeIngredient($recipe_id, $food_id) {
+		$this->clean($recipe_id);
+		$this->clean($food_id);
+		$sql = "SELECT f.*, fm.* FROM medidiets_ingredients fm, medidiets_foods f WHERE fm.food_id = f.food_id AND fm.recipe_id = '{$recipe_id}' AND fm.food_id = '{$food_id}'";
+		return $this->selectSet($sql);
+	}
+
+	/**
+	 * Retrieve a particular recipe
+	 * @param $recipe_id The ID of the recipe to retrieve
+	 * @return a recordset
+	 */
+	function &getRecipe($recipe_id) {
+		$this->clean($recipe_id);
+		$sql = "SELECT * FROM medidiets_recipes WHERE recipe_id='{$recipe_id}'";
+		return $this->selectSet($sql);
+	}
+
+	/**
+	 * Retrieve all recipes in a particular category, sorted alphabetically
+	 * This userland version of the function doesn't show magic recipes.
+	 * @param $category_id The ID of the category in which to search
+	 * @param $data A boolean switch to retrieve the nutritional data for the recipe (default false)
+	 * @return a recordset
+	 */
+	function &getRecipes($category_id, $data = false) {
+		$this->clean($category_id);
+		if ($data) {
+			$sql = "SELECT * FROM
+								medidiets_recipes r LEFT JOIN
+								(SELECT i.recipe_id,
+									sum(i.quantity * f.calories) AS calories,
+									sum(i.quantity * f.kilojoules) AS kilojoules,
+									sum(i.quantity * f.protein) AS protein,
+									sum(i.quantity * f.fat) AS fat,
+									sum(i.quantity * f.saturated_fat) AS saturated_fat,
+									sum(i.quantity * f.carbohydrate) AS carbohydrate,
+									sum(i.quantity * f.sugar) AS sugar,
+									sum(i.quantity * f.fiber) AS fiber,
+									sum(i.quantity * f.cholesterol) AS cholesterol,
+									sum(i.quantity * f.sodium) AS sodium,
+									sum(i.quantity * f.potassium) AS potassium,
+									sum(i.quantity * f.calcium) AS calcium,
+									sum(i.quantity * f.iron) AS iron,
+									sum(i.quantity * f.zinc) AS zinc
+								FROM
+									medidiets_ingredients i,
+									medidiets_foods f
+								WHERE i.food_id = f.food_id
+								GROUP BY i.recipe_id
+								) AS sub
+							ON r.recipe_id = sub.recipe_id
+							AND r.category_id = '{$category_id}'
+							AND r.recipe_id >= 0
+							ORDER BY r.name";
+		}
+		else {
+			$sql = "SELECT * FROM medidiets_recipes WHERE category_id='{$category_id}' AND recipe_id >= 0 ORDER BY name";
+		}
+
+		return $this->selectSet($sql);
+	}
+
+	/**
+	 * Retrieve the nutritional data for the specified recipe
+	 * @param $recipe_id The ID of the recipe to retrieve
+	 * @return a recordset
+	 */
+	function &getRecipeData($recipe_id) {
+		$this->clean($recipe_id);
+		$sql = "SELECT * FROM
+							medidiets_recipes r LEFT JOIN
+							(SELECT i.recipe_id,
+								sum(i.quantity * f.calories) AS total_calories,
+								sum(i.quantity * f.kilojoules) AS total_kilojoules,
+								sum(i.quantity * f.protein) AS total_protein,
+								sum(i.quantity * f.fat) AS total_fat,
+								sum(i.quantity * f.saturated_fat) AS total_saturated_fat,
+								sum(i.quantity * f.carbohydrate) AS total_carbohydrate,
+								sum(i.quantity * f.sugar) AS total_sugar,
+								sum(i.quantity * f.fiber) AS total_fiber,
+								sum(i.quantity * f.cholesterol) AS total_cholesterol,
+								sum(i.quantity * f.sodium) AS total_sodium,
+								sum(i.quantity * f.potassium) AS total_potassium,
+								sum(i.quantity * f.calcium) AS total_calcium,
+								sum(i.quantity * f.iron) AS total_iron,
+								sum(i.quantity * f.zinc) AS total_zinc
+							FROM
+								medidiets_ingredients i,
+								medidiets_foods f
+							WHERE i.food_id = f.food_id
+							GROUP BY i.recipe_id
+							) AS sub
+						ON r.recipe_id = sub.recipe_id
+						WHERE r.recipe_id = '{$recipe_id}'";
+		return $this->selectSet($sql);
+	}
+
+	/**
+	 * Retrieve all ingredients for a recipe, sorted by their oid
+	 * @param $recipe_id The ID of the recipe to which the ingredients are needed
+	 * @return a recordset
+	 */
+	function &getRecipeIngredients($recipe_id) {
+		$this->clean($recipe_id);
+		// @@ i.quantity must be after the f.* in the select until f.quantity removed...
+		$sql = "SELECT f.*, i.quantity, i.how FROM medidiets_foods f, medidiets_ingredients i
+						WHERE f.food_id = i.food_id
+						AND i.recipe_id = '{$recipe_id}'
+						ORDER BY i.oid";
+
+		return $this->selectSet($sql);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/classes/database/Postgres71.php b/classes/database/Postgres71.php
new file mode 100644
index 00000000..34239d76
--- /dev/null
+++ b/classes/database/Postgres71.php
@@ -0,0 +1,428 @@
+<?php
+
+/**
+ * A class that implements the DB interface for Postgres
+ * Note: This class uses ADODB and returns RecordSets.
+ *
+ * $Id: Postgres71.php,v 1.1 2002/02/11 09:32:48 chriskl Exp $
+ */
+
+// @@@ THOUGHT: What about inherits? ie. use of ONLY???
+
+include_once('../classes/database/BaseDB.php');
+
+class Postgres71 extends BaseDB {
+
+	function Postgres71($host, $port, $database, $user, $password) {
+		$this->BaseDB('postgres7');
+
+//		$this->conn->host = $host;
+		//$this->Port = $port;
+
+		$this->conn->connect($host, $user, $password, $database);
+	}
+
+	/**
+	 * Return all database available on the server
+	 * @return A list of databases, sorted alphabetically
+	 */
+	function &getDatabases() {
+		$sql = "SELECT pdb.datname, pdb.datistemplate, pde.description FROM 
+					pg_database pdb LEFT JOIN pg_description pde ON pdb.oid=pde.objoid
+					ORDER BY pdb.datname";
+		return $this->selectSet($sql);
+	}
+
+	/**
+	 * Return all information about a particular database
+	 * @param $database The name of the database to retrieve
+	 * @return The database info
+	 */
+	function &getDatabase($database) {
+		$this->clean($database);
+		$sql = "SELECT * FROM pg_database WHERE datname='{$database}'";
+		return $this->selectRow($sql);
+	}
+
+	/**
+	 * Drops a database
+	 * @param $database The name of the database to retrieve
+	 * @return 0 success
+	 */
+	function dropDatabase($database) {
+		$this->clean($database);
+		$sql = "DROP DATABASE \"{$database}\"";
+	}
+
+	// Table functions
+
+	/**
+	 * Return all tables in current database
+	 * @return All tables, sorted alphabetically 
+	 */
+	function &getTables() {
+		$sql = "SELECT * FROM pg_class ORDER BY relname";
+		return $this->selectSet($sql);
+	}
+
+	/**
+	 * Return all information relating to a table
+	 * @param $table The name of the table
+	 * @return Table information
+	 */
+	function &getTableByName($table) {
+		$this->clean($table);
+		$sql = "SELECT * FROM pg_class WHERE relname='{$table}'";
+		return $this->selectRow($sql);
+	}
+
+	// @@ Need create table - tricky!!
+	
+	/**
+	 * Removes a table from the database
+	 * @param $table
+	 * @return 0 success
+	 */
+	function dropTable($table) {
+		$this->clean($table);
+		
+		$sql = "DROP TABLE \"{$table}\"";
+
+		// @@ How do you do this?
+		return $this->execute($sql);
+	}
+
+	/**
+	 * Renames a table
+	 * @param $table The table to be renamed
+	 * @param $newName The new name for the table
+	 * @return 0 success
+	 */
+	function renameTable($table, $newName) {
+		$this->clean($table);
+		$this->clean($newName);
+		$sql = "ALTER TABLE \"{$table}\" RENAME TO \"{$newName}\"";
+
+		// @@ How do you do this?
+		return $this->execute($sql);
+	}
+
+	/**
+	 * Adds a check constraint to a table
+	 * @param $table The table to which to add the check
+	 * @param $definition The definition of the check
+	 * @param $name (optional) The name to give the check, otherwise default name is assigned
+	 * @return 0 success
+	 */
+	function addCheckConstraint($table, $definition, $name = '') {
+		$this->clean($table);
+		$this->clean($name);
+		// @@ how the heck do you clean definition???
+		
+		if ($name != '')
+			$sql = "ALTER TABLE \"{$table}\" ADD CONSTRAINT \"{$name}\" CHECK ({$definition})";
+		else
+			$sql = "ALTER TABLE \"{$table}\" ADD CHECK ({$definition})";
+
+		// @@ How do you do this?
+		return $this->execute($sql);
+	}
+	
+	/**
+	 * Drops a check constraint from a table
+	 * @param $table The table from which to drop the check
+	 * @param $name The name of the check to be dropped
+	 * @return 0 success
+	 * @return -2 transaction error
+	 * @return -3 lock error
+	 * @return -4 check drop error
+	 */
+	function dropCheckConstraint($table, $name) {
+		$this->clean($table);
+		$this->clean($name);
+		
+		// Begin transaction
+		$status = $this->beginTransaction();
+		if ($status != 0) return -2;
+
+		// Properly lock the table
+		$sql = "LOCK TABLE \"{$table}\" IN ACCESS EXCLUSIVE MODE";
+		$status = $this->execute($sql);
+		if ($status != 0) {
+			$this->rollbackTransaction();
+			return -3;
+		}
+
+		// Delete the check constraint
+		$sql = "DELETE FROM pg_relcheck WHERE rcrelid=(SELECT oid FROM pg_class WHERE relname='{$table}') AND rcname='{$name}'";
+	   $status = $this->execute($sql);
+		if ($status != 0) {
+			$this->rollbackTransaction();
+			return -4;
+		}
+		
+		// Update the pg_class catalog to reflect the new number of checks
+		$sql = "UPDATE pg_class SET relchecks=(SELECT COUNT(*) FROM pg_relcheck WHERE 
+					rcrelid=(SELECT oid FROM pg_class WHERE relname='{$table}')) 
+					WHERE relname='{$table}'";
+	   $status = $this->execute($sql);
+		if ($status != 0) {
+			$this->rollbackTransaction();
+			return -4;
+		}
+
+		// Otherwise, close the transaction
+		return $this->endTransaction();
+	}	
+
+	/**
+	 * Adds a unique constraint to a table
+	 * @param $table The table to which to add the unique
+	 * @param $fields (array) An array of fields over which to add the unique
+	 * @param $name (optional) The name to give the unique, otherwise default name is assigned
+	 * @return 0 success
+	 */
+	function addUniqueConstraint($table, $fields, $name = '') {
+		$this->clean($table);
+		$this->arrayClean($fields);
+		$this->clean($name);
+		
+		if ($name != '')
+			$sql = "CREATE UNIQUE INDEX \"{$name}\" ON \"{$table}\"(\"" . join('","', $fields) . "\")";
+		else return -99; // Not supported
+
+		// @@ How do you do this?
+		return $this->execute($sql);
+	}
+
+	/**
+	 * Drops a unique constraint from a table
+	 * @param $table The table from which to drop the unique
+	 * @param $name The name of the unique
+	 * @return 0 success
+	 */
+	function dropUniqueConstraint($table, $name) {
+		$this->clean($table);
+		$this->clean($name);
+		
+		$sql = "DROP INDEX \"{$name}\"";
+
+		// @@ How do you do this?
+		return $this->execute($sql);
+	}	
+	 
+	/**
+	 * Adds a primary key constraint to a table
+	 * @param $table The table to which to add the primery key
+	 * @param $fields (array) An array of fields over which to add the primary key
+	 * @param $name (optional) The name to give the key, otherwise default name is assigned
+	 * @return 0 success
+	 */
+	function addPrimaryKeyConstraint($table, $fields, $name = '') {
+		// This function can be faked with a unique index and a catalog twiddle, however
+		// how do we ensure that it's only used on NOT NULL fields?
+		return -99; // Not supported.
+	}
+
+	/**
+	 * Drops a primary key constraint from a table
+	 * @param $table The table from which to drop the primary key
+	 * @param $name The name of the primary key
+	 * @return 0 success
+	 */
+	function dropPrimaryKeyConstraint($table, $name) {
+		$this->clean($table);
+		$this->clean($name);
+		
+		$sql = "DROP INDEX \"{$name}\"";
+
+		// @@ How do you do this?
+		return $this->execute($sql);
+	}	
+	
+	/**
+	 * Changes the owner of a table
+	 * @param $table The table whose owner is to change
+	 * @param $owner The new owner (username) of the table
+	 * @return 0 success
+	 */
+	function setOwnerOfTable($table, $owner) {
+		$this->clean($table);
+		$this->clean($owner);
+		
+		$sql = "ALTER TABLE \"{$table}\" OWNER TO \"{$owner}\"";
+
+		// @@ How do you do this?
+		return $this->execute($sql);
+	}
+
+	// Column Functions
+
+	/**
+	 * Add a new column to a table
+	 * @param $table The table to add to
+	 * @param $column The name of the new column
+	 * @param $type The type of the column
+	 * @param $size (optional) The optional size of the column (ie. 30 for varchar(30))
+	 * @return 0 success
+	 */
+	function addColumnToTable($table, $column, $type, $size = '') {
+		$this->clean($table);
+		$this->clean($column);
+		$this->clean($type);
+		$this->clean($size);
+		// @@ How the heck do you properly clean type and size?
+		
+		if ($size == '')
+			$sql = "ALTER TABLE \"{$table}\" ADD COLUMN \"{$column}\" {$type}";
+		else
+			$sql = "ALTER TABLE \"{$table}\" ADD COLUMN \"{$column}\" {$type}({$size})";
+
+		// @@ How do you do this?
+		return $this->execute($sql);
+	}
+
+	/**
+	 * Drops a column from a table
+	 * @param $table The table from which to drop
+	 * @param $column The column name to drop
+	 * @return 0 success
+	 */
+	function dropColumnFromTable($table, $column) {
+		return -99; // Not implemented
+	}
+
+	/**
+	 * Sets default value of a column
+	 * @param $table The table from which to drop
+	 * @param $column The column name to set
+	 * @param $default The new default value
+	 * @return 0 success
+	 */
+	function setColumnDefault($table, $column, $default) {
+		$this->clean($table);
+		$this->clean($column);
+		// @@ How the heck do you clean default clause?
+		
+		$sql = "ALTER TABLE \"{$table}\" ALTER COLUMN \"{$column}\" SET DEFAULT {$default}";
+
+		// @@ How do you do this?
+		return $this->execute($sql);
+	}
+
+	/**
+	 * Drops default value of a column
+	 * @param $table The table from which to drop
+	 * @param $column The column name to drop default
+	 * @return 0 success
+	 */
+	function dropColumnDefault($table, $column) {
+		$this->clean($table);
+		$this->clean($column);
+
+		$sql = "ALTER TABLE \"{$table}\" ALTER COLUMN \"{$column}\" DROP DEFAULT";
+
+		// @@ How do you do this?
+		return $this->execute($sql);
+	}
+
+	/**
+	 * Sets whether or not a column can contain NULLs
+	 * @param $table The table that contains the column
+	 * @param $column The column to alter
+	 * @param $state True to set null, false to set not null
+	 * @return 0 success
+	 * @return -1 attempt to set not null, but column contains nulls
+	 * @return -2 transaction error
+	 * @return -3 lock error
+	 * @return -4 update error
+	 */
+	function setColumnNull($table, $column, $state) {
+		$this->clean($table);
+		$this->clean($column);
+
+		// Begin transaction
+		$status = $this->beginTransaction();
+		if ($status != 0) return -2;
+
+		// Properly lock the table
+		$sql = "LOCK TABLE \"{$table}\" IN ACCESS EXCLUSIVE MODE";
+		$status = $this->execute($sql);
+		if ($status != 0) {
+			$this->rollbackTransaction();
+			return -3;
+		}
+
+		// Check for existing nulls
+		if (!$state) {
+			$sql = "SELECT COUNT(*) AS total FROM \"{$table}\" WHERE \"{$column}\" IS NULL";
+			$result = $this->selectField($sql, 'total');
+			if ($result > 0) {
+				$this->rollbackTransaction();
+				return -1;
+			}
+		}
+		
+		// Otherwise update the table.  Note the reverse-sensed $state variable
+		$sql = "UPDATE pg_attribute SET attnotnull = " . ($state) ? 'false' : 'true' . " 
+					WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = '{$table}') 
+					AND attname = '{$column}'";
+	   $status = $this->execute($sql);
+		if ($status != 0) {
+			$this->rollbackTransaction();
+			return -4;
+		}
+
+		// Otherwise, close the transaction
+		return $this->endTransaction();
+	}
+
+	/**
+	 * Renames a column in a table
+	 * @param $table The table containing the column to be renamed
+	 * @param $column The column to be renamed
+	 * @param $newName The new name for the column
+	 * @return 0 success
+	 */
+	function renameColumn($table, $column, $newName) {
+		$this->clean($table);
+		$this->clean($column);
+		$this->clean($newName);
+
+		$sql = "ALTER TABLE \"{$table}\" RENAME COLUMN \"{$column}\" TO \"{$newName}\"";
+
+		// @@ how?
+		return $this->execute($sql);
+	}
+/*
+	function &getIndices()
+	function &getIndex()
+	function setIndex()
+	function delIndex()
+
+	function &getSequences()
+	function &getSequence()
+	function setSequence()
+	function delSequence()
+
+	// DML Functions
+
+	function doSelect()
+	function doDelete()
+	function doUpdate()
+*/
+
+	// Capabilities
+	function hasTables() { return true; }
+	function hasViews() { return true; }
+	function hasSequences() { return true; }
+	function hasFunctions() { return true; }
+	function hasTriggers() { return true; }
+	function hasOperators() { return true; }
+	function hasTypes() { return true; }
+	function hasAggregates() { return true; }
+	function hasRules() { return true; }
+
+}
+
+?>
\ No newline at end of file
diff --git a/conf/config.inc b/conf/config.inc
new file mode 100644
index 00000000..617d1b49
--- /dev/null
+++ b/conf/config.inc
@@ -0,0 +1,62 @@
+<?php
+
+	/**
+	 * Central WebDB configuration
+	 *
+	 * $Id: config.inc,v 1.1 2002/02/11 09:32:49 chriskl Exp $
+	 */
+
+	// Set error reporting level
+	error_reporting(E_ALL);
+
+	// App settings
+	$appName = 'WebDB';
+	$appIntro = 'Welcome to WebDB.';
+	$appBase = '/home/chriskl/public_html/webdb';
+	$appVersion = '1-dev';
+	
+	// GUI settings
+	$guiLeftFrameWidth = 150;
+
+	// Servers and types
+	$confServers = array();
+	$confServers[0]['desc'] = 'Houston';
+	$confServers[0]['host'] = 'database.internal';
+	$confServers[0]['port'] = '5432';
+	$confServers[0]['type'] = 'Postgres71';
+	$confServers[0]['default'] = 'template1';
+
+	// Language
+	include_once($appBase . '/lang/template.php');
+	
+	// If login action is set, then set login variables
+	if (isset($formServer) && isset($formUsername) && isset($formPassword)) {
+		$webdbServerID = $formServer;
+		$webdbUsername = $formUsername;
+		$webdbPassword = $formPassword;
+		setCookie('webdbServerID', $webdbServerID);
+		setCookie('webdbUsername', $webdbUsername);
+		setCookie('webdbPassword', $webdbPassword);
+	}
+		
+	// If the logged in settings aren't present, put up the login screen
+	if (!isset($webdbUsername) || !isset($webdbPassword) || !isset($webdbServerID) || !isset($confServers[$webdbServerID])) {
+		include($appBase . '/public_html/login.php');
+		exit;
+	}
+	
+	// Create data accessor object, if valid
+	if (isset($webdbServerID) && isset($confServers[$webdbServerID])) {
+		$_type = $confServers[$webdbServerID]['type'];
+		include_once($appBase . '/classes/database/' . $_type . '.php');
+		$data = new $_type(	$confServers[$webdbServerID]['host'],
+									$confServers[$webdbServerID]['port'],
+									$confServers[$webdbServerID]['default'],
+									$webdbUsername,
+									$webdbPassword);
+	}
+
+
+	
+
+?>
\ No newline at end of file
diff --git a/lang/english.php b/lang/english.php
new file mode 100755
index 00000000..152d6b22
--- /dev/null
+++ b/lang/english.php
@@ -0,0 +1,31 @@
+<?php
+
+	/**
+	 * Main access point to WebDB.
+	 *
+	 * $Id: english.php,v 1.1 2002/02/11 09:32:49 chriskl Exp $
+	 */
+
+	// Include application functions
+	include_once('../conf/config.inc');
+
+?>
+
+<html>
+<head>
+<title><?= $appName ?></title>
+</head>
+
+<frameset rows="50, *" border="0" frameborder="0">
+	<frame src="topbar.php" name="topbar">
+	<frameset cols="<?= $guiLeftFrameWidth ?>,*" border="0" frameborder="0">
+	  <frame src="browser.php" name="browser">
+	  <frame src="detail.php" name="detail">
+	</frameset>
+</frameset>
+<noframes>
+<body>
+	<?= $strNoFrames ?>
+</body>
+</noframes>
+</html>
\ No newline at end of file
diff --git a/lang/template.php b/lang/template.php
new file mode 100644
index 00000000..a819a5f8
--- /dev/null
+++ b/lang/template.php
@@ -0,0 +1,16 @@
+<?php
+
+	/**
+	 * Language template file for WebDB.  Use this to base language
+	 * files.
+	 *
+	 * $Id: template.php,v 1.1 2002/02/11 09:32:49 chriskl Exp $
+	 */
+
+	$appLang = 'english';
+
+	$strNoFrames = 'You need a frames-enabled browser to use this application.';
+	$strLogin = 'Login';
+	
+	
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-access.inc.php b/libraries/adodb/adodb-access.inc.php
new file mode 100755
index 00000000..d8fe7faf
--- /dev/null
+++ b/libraries/adodb/adodb-access.inc.php
@@ -0,0 +1,54 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://php.weblogs.com/
+  
+  Microsoft Access data driver. Requires ODBC. Works only on MS Windows.
+*/
+if (!defined('_ADODB_ODBC_LAYER')) {
+	include(ADODB_DIR."/adodb-odbc.inc.php");
+}
+ if (!defined('_ADODB_ACCESS')) {
+ 	define('_ADODB_ACCESS',1);
+class  ADODB_access extends ADODB_odbc {	
+	var $databaseType = 'access';
+	var $hasTop = true;		// support mssql SELECT TOP 10 * FROM TABLE
+	var $fmtDate = "#Y-m-d#";
+	var $fmtTimeStamp = "#Y-m-d h:i:sA#"; // note not comma
+	var $_bindInputArray = false;
+
+	function BeginTrans() { return false;}
+	
+	function &MetaTables()
+	{
+		$qid = odbc_tables($this->_connectionID);
+		$rs = new ADORecordSet_odbc($qid);
+		//print_r($rs);
+		$arr = &$rs->GetArray();
+		
+		$arr2 = array();
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if ($arr[$i][2] && substr($arr[$i][2],0,4) != 'MSys')
+				$arr2[] = $arr[$i][2];
+		}
+		return $arr2;
+	}
+}
+
+ 
+class  ADORecordSet_access extends ADORecordSet_odbc {	
+	
+	var $databaseType = "access";		
+	
+	function ADORecordSet_access($id)
+	{
+		return $this->ADORecordSet_odbc($id);
+	}
+}
+} // class
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-ado.inc.php b/libraries/adodb/adodb-ado.inc.php
new file mode 100755
index 00000000..73ef407f
--- /dev/null
+++ b/libraries/adodb/adodb-ado.inc.php
@@ -0,0 +1,522 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://php.weblogs.com/
+  
+    Microsoft ADO data driver. Requires ADO. Works only on MS Windows.
+*/
+  define("_ADODB_ADO_LAYER", 1 );
+/*--------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------*/
+  
+class ADODB_ado extends ADOConnection {
+	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 $hasAffectedRows = true;
+	var $adoParameterType = 201; // 201 = long varchar, 203=long wide varchar, 205 = long varbinary
+	var $_affectedRows = false;
+	
+	function ADODB_ado() 
+	{ 	
+	}
+
+	
+    function _affectedrows()
+    {
+            return $this->_affectedRows;
+    }
+         
+	function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDASQL')
+	{
+		$u = 'UID';
+		$p = 'PWD';
+	
+		$dbc = new COM('ADODB.Connection');
+		if (! $dbc) return false;
+		/* // handle SQL server provider specially ? no need
+		if ($argProvider) {
+			if ($argProvider == "SQLOLEDB") { // SQL Server Provider
+			} 
+		}*/
+		if ($argProvider) $dbc->Provider = $argProvider;
+		else $dbc->Provider ='MSDASQL';
+		
+		if ($argUsername) $argHostname .= ";$u=$argUsername";
+		if ($argPassword)$argHostname .= ";$p=$argPassword";
+		
+		if ($this->debug) print "<p>Host=".$argHostname."<BR>version=$dbc->version</p>";
+		// @ added below for php 4.0.1 and earlier
+		@$dbc->Open((string) $argHostname);
+
+		$this->_connectionID = $dbc;
+		return  $dbc != false;
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
+	{
+		$dbc = new COM("ADODB.Connection");
+		if (! $dbc) return false;
+		
+		if ($argProvider) $dbc->Provider = $argProvider;
+		else $dbc->Provider ='MSDASQL';
+		
+		if ($argUsername) $argHostname .= ";UID=$argUsername";
+		if ($argPassword)$argHostname .= ";PWD=$argPassword";
+		
+		if ($this->debug) print "<p>Host=".$argHostname."<BR>version=$dbc->version</p>";
+		$dbc->Open((string) $argHostname);
+		
+		$this->_connectionID = $dbc;
+		return  $dbc != false;
+	}	
+	
+/*
+	adSchemaCatalogs	= 1,
+	adSchemaCharacterSets	= 2,
+	adSchemaCollations	= 3,
+	adSchemaColumns	= 4,
+	adSchemaCheckConstraints	= 5,
+	adSchemaConstraintColumnUsage	= 6,
+	adSchemaConstraintTableUsage	= 7,
+	adSchemaKeyColumnUsage	= 8,
+	adSchemaReferentialContraints	= 9,
+	adSchemaTableConstraints	= 10,
+	adSchemaColumnsDomainUsage	= 11,
+	adSchemaIndexes	= 12,
+	adSchemaColumnPrivileges	= 13,
+	adSchemaTablePrivileges	= 14,
+	adSchemaUsagePrivileges	= 15,
+	adSchemaProcedures	= 16,
+	adSchemaSchemata	= 17,
+	adSchemaSQLLanguages	= 18,
+	adSchemaStatistics	= 19,
+	adSchemaTables	= 20,
+	adSchemaTranslations	= 21,
+	adSchemaProviderTypes	= 22,
+	adSchemaViews	= 23,
+	adSchemaViewColumnUsage	= 24,
+	adSchemaViewTableUsage	= 25,
+	adSchemaProcedureParameters	= 26,
+	adSchemaForeignKeys	= 27,
+	adSchemaPrimaryKeys	= 28,
+	adSchemaProcedureColumns	= 29,
+	adSchemaDBInfoKeywords	= 30,
+	adSchemaDBInfoLiterals	= 31,
+	adSchemaCubes	= 32,
+	adSchemaDimensions	= 33,
+	adSchemaHierarchies	= 34,
+	adSchemaLevels	= 35,
+	adSchemaMeasures	= 36,
+	adSchemaProperties	= 37,
+	adSchemaMembers	= 38
+
+*/
+	
+	function MetaTables()
+	{
+		$arr= array();
+		$dbc = $this->_connectionID;
+		
+		$adors=@$dbc->OpenSchema(20);//tables
+		if ($adors){
+			$f = $adors->Fields(2);//table/view name
+			$t = $adors->Fields(3);//table type
+			while (!$adors->EOF){
+				$tt=substr($t->value,0,6);
+				if ($tt!='SYSTEM' && $tt !='ACCESS')
+					$arr[]=$f->value;
+				//print $f->value . ' ' . $t->value.'<br>';
+				$adors->MoveNext();
+			}
+			$adors->Close();
+		}
+		
+		return $arr;
+	}
+	
+	function MetaColumns($table)
+	{
+		$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;
+					$fld->type = 'CHAR'; // cannot discover type in ADO!
+					$fld->max_length = -1;
+					$arr[strtoupper($fld->name)]=$fld;
+				}
+		
+				$adors->MoveNext();
+			}
+			$adors->Close();
+		}
+		
+		return $arr;
+	}
+	
+	/* returns queryID or false */
+	function &_query($sql,$inputarr=false) 
+	{
+		
+		$dbc = $this->_connectionID;
+		
+	//	return rs	
+		if ($inputarr) {
+			$oCmd = new COM('ADODB.Command');
+			$oCmd->ActiveConnection = $dbc;
+			$oCmd->CommandText = $sql;
+			$oCmd->CommandType = 1;
+
+			foreach($inputarr as $val) {
+				// name, type, direction 1 = input, len,
+				$this->adoParameterType = 130;
+				$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,strlen($val),$val);
+				//print $p->Type.' '.$p->value;
+				$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);	
+	
+		if ($dbc->Errors->Count > 0) return false;
+		return $rs;
+	}
+
+	
+	function BeginTrans() 
+	{ 
+		$o = $this->_connectionID->Properties("Transaction DDL");
+		if (!$o) return false;
+		@$this->_connectionID->BeginTrans();
+		return true;
+	}
+	function CommitTrans() { 
+		@$this->_connectionID->CommitTrans();
+		return true;
+	}
+	function RollbackTrans() {
+		@$this->_connectionID->RollbackTrans();
+		return true;
+	}
+	
+	/*	Returns: the last error message from previous database operation	*/	
+
+	function ErrorMsg() 
+	{
+		$errc = $this->_connectionID->Errors;
+		if ($errc->Count == 0) return '';
+		$err = $errc->Item($errc->Count-1);
+		return $err->Description;
+	}
+	
+	function ErrorNo() 
+	{
+		$errc = $this->_connectionID->Errors;
+		if ($errc->Count == 0) return 0;
+		$err = $errc->Item($errc->Count-1);
+		return $err->NativeError;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		if ($this->_connectionID) $this->_connectionID->Close();
+		$this->_connectionID = false;
+		return true;
+	}
+	
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_ado extends ADORecordSet {	
+	
+	var $bind = false;
+	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)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$this->fetchMode = $ADODB_FETCH_MODE;
+		return $this->ADORecordSet($id);
+	}
+
+
+	// 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);
+		$o->name = $f->Name;
+		$o->type = $f->Type;
+		$o->max_length = $f->DefinedSize;
+		
+		//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)
+	{
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$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; 
+            // absoluteposition doesn't work -- my maths is wrong ?
+            //    $rs->AbsolutePosition->$row-2;
+            //    return true;
+                 if ($this->_currentRow > $row) return false;
+                $rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
+		return true;
+	}
+	
+/*
+	OLEDB types
+	
+     enum DBTYPEENUM
+    {	DBTYPE_EMPTY	= 0,
+	DBTYPE_NULL	= 1,
+	DBTYPE_I2	= 2,
+	DBTYPE_I4	= 3,
+	DBTYPE_R4	= 4,
+	DBTYPE_R8	= 5,
+	DBTYPE_CY	= 6,
+	DBTYPE_DATE	= 7,
+	DBTYPE_BSTR	= 8,
+	DBTYPE_IDISPATCH	= 9,
+	DBTYPE_ERROR	= 10,
+	DBTYPE_BOOL	= 11,
+	DBTYPE_VARIANT	= 12,
+	DBTYPE_IUNKNOWN	= 13,
+	DBTYPE_DECIMAL	= 14,
+	DBTYPE_UI1	= 17,
+	DBTYPE_ARRAY	= 0x2000,
+	DBTYPE_BYREF	= 0x4000,
+	DBTYPE_I1	= 16,
+	DBTYPE_UI2	= 18,
+	DBTYPE_UI4	= 19,
+	DBTYPE_I8	= 20,
+	DBTYPE_UI8	= 21,
+	DBTYPE_GUID	= 72,
+	DBTYPE_VECTOR	= 0x1000,
+	DBTYPE_RESERVED	= 0x8000,
+	DBTYPE_BYTES	= 128,
+	DBTYPE_STR	= 129,
+	DBTYPE_WSTR	= 130,
+	DBTYPE_NUMERIC	= 131,
+	DBTYPE_UDT	= 132,
+	DBTYPE_DBDATE	= 133,
+	DBTYPE_DBTIME	= 134,
+	DBTYPE_DBTIMESTAMP	= 135
+	
+	ADO Types
+	
+   	adEmpty	= 0,
+	adTinyInt	= 16,
+	adSmallInt	= 2,
+	adInteger	= 3,
+	adBigInt	= 20,
+	adUnsignedTinyInt	= 17,
+	adUnsignedSmallInt	= 18,
+	adUnsignedInt	= 19,
+	adUnsignedBigInt	= 21,
+	adSingle	= 4,
+	adDouble	= 5,
+	adCurrency	= 6,
+	adDecimal	= 14,
+	adNumeric	= 131,
+	adBoolean	= 11,
+	adError	= 10,
+	adUserDefined	= 132,
+	adVariant	= 12,
+	adIDispatch	= 9,
+	adIUnknown	= 13,	
+	adGUID	= 72,
+	adDate	= 7,
+	adDBDate	= 133,
+	adDBTime	= 134,
+	adDBTimeStamp	= 135,
+	adBSTR	= 8,
+	adChar	= 129,
+	adVarChar	= 200,
+	adLongVarChar	= 201,
+	adWChar	= 130,
+	adVarWChar	= 202,
+	adLongVarWChar	= 203,
+	adBinary	= 128,
+	adVarBinary	= 204,
+	adLongVarBinary	= 205,
+	adChapter	= 136,
+	adFileTime	= 64,
+	adDBFileTime	= 137,
+	adPropVariant	= 138,
+	adVarNumeric	= 139
+*/
+	function MetaType($t,$len=-1)
+	{
+		switch ($t) {
+		case 12: // variant
+		case 8: // bstr
+		case 129: //char
+		case 130: //wc
+		case 200: // varc
+		case 202:// varWC
+		case 128: // bin
+		case 204: // varBin
+		case 72: // guid
+			if ($len <= $this->blobSize) return 'C';
+		
+		case 201:
+		case 203:
+			return 'X';
+		case 128:
+		case 204:
+		case 205:
+			 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,
+		case 4://adBigInt	= 20,
+		case 17://adUnsignedTinyInt	= 17,
+		case 18://adUnsignedSmallInt	= 18,
+		case 19://adUnsignedInt	= 19,
+		case 20://adUnsignedBigInt	= 21,
+			return 'I';
+		default: return 'N';
+		}
+	}
+	
+	// time stamp not supported yet
+	function _fetch()
+	{	
+		$rs = $this->_queryID;
+		if ($rs->EOF) return false;
+		$this->fields = array();
+	
+		if (!$this->_tarr) {
+			$tarr = array();
+			$flds = array();
+			for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
+				$f = $rs->Fields($i);
+				$flds[] = $f;
+				$tarr[] = $f->Type;
+			}
+			// bind types and flds only once
+			$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++) {
+
+			switch($t) {
+				
+			case 133:// A date value (yyyymmdd) 
+				$val = $f->value;
+				$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
+				break;
+			case 7: // adDate
+				$this->fields[] = date('Y-m-d',(integer)$f->value);
+				break;
+			case 1: // null
+				$this->fields[] = false;
+				break;
+			case 6: // currency is not supported properly;
+				print '<br><b>'.$f->Name.': currency type not supported by PHP</b><br>';
+				$this->fields[] = (float) $f->value;
+				break;
+			default:
+				$this->fields[] = $f->value; 
+				break;
+			}
+			//print " $f->value $t, ";
+			$f = next($this->_flds);
+			$t = next($this->_tarr);
+		} // 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(false);
+		}
+		return true;
+	}
+	
+	
+	function _close() {
+		$this->_flds = false;
+		$this->_queryID = false;	
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-ado_access.inc.php b/libraries/adodb/adodb-ado_access.inc.php
new file mode 100755
index 00000000..3a087e3b
--- /dev/null
+++ b/libraries/adodb/adodb-ado_access.inc.php
@@ -0,0 +1,38 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+Released under both BSD license and Lesser GPL library license. 
+Whenever there is any discrepancy between the two licenses, 
+the BSD license will take precedence. See License.txt. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://php.weblogs.com/
+  
+    Microsoft Access ADO data driver. Requires ADO and ODBC. Works only on MS Windows.
+*/
+
+if (!defined('_ADODB_ADO_LAYER')) {
+	include(ADODB_DIR."/adodb-ado.inc.php");
+}
+
+class  ADODB_ado_access extends ADODB_ado {	
+	var $databaseType = 'ado_access';
+	var $hasTop = true;		// support mssql SELECT TOP 10 * FROM TABLE
+	var $fmtDate = "#Y-m-d#";
+	var $fmtTimeStamp = "#Y-m-d h:i:sA#";// note no comma
+
+	function BeginTrans() { return false;}
+
+}
+
+ 
+class  ADORecordSet_ado_access extends ADORecordSet_ado {	
+	
+	var $databaseType = "ado_access";		
+	
+	function ADORecordSet_ado_access(&$id)
+	{
+		return $this->ADORecordSet_ado($id);
+	}
+}
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-ado_mssql.inc.php b/libraries/adodb/adodb-ado_mssql.inc.php
new file mode 100755
index 00000000..024da4ca
--- /dev/null
+++ b/libraries/adodb/adodb-ado_mssql.inc.php
@@ -0,0 +1,36 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://php.weblogs.com/
+  
+  Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client. 
+  Works only on MS Windows.
+  
+  It is normally better to use the mssql driver directly because it is much faster. 
+  This file is only a technology demonstration and for test purposes.
+*/
+
+if (!defined('_ADODB_ADO_LAYER')) {
+	include(ADODB_DIR."/adodb-ado.inc.php");
+}
+
+class  ADODB_ado_mssql extends ADODB_ado {	
+var $databaseType = 'ado_mssql';
+var $hasTop = true;
+}
+ 
+class  ADORecordSet_ado_mssql extends ADORecordSet_ado {	
+	
+	var $databaseType = 'ado_mssql';
+	
+	function ADORecordSet_ado_mssql(&$id)
+	{
+		return $this->ADORecordSet_ado($id);
+	}
+}
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-cryptsession.php b/libraries/adodb/adodb-cryptsession.php
new file mode 100755
index 00000000..e13c2e42
--- /dev/null
+++ b/libraries/adodb/adodb-cryptsession.php
@@ -0,0 +1,245 @@
+<?php
+/*
+V1.31 20 August 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	Made table name configurable - by David Johnson djohnson@inpro.net
+    Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
+  Set tabs to 4 for best viewing.
+  
+  Latest version of ADODB is available at http://php.weblogs.com/adodb
+  ======================================================================
+  
+ This file provides PHP4 session management using the ADODB database
+wrapper library.
+ 
+ Example
+ =======
+ 
+ 	GLOBAL $HTTP_SESSION_VARS;
+	include('adodb.inc.php');
+	include('adodb-session.php');
+	session_start();
+	session_register('AVAR');
+	$HTTP_SESSION_VARS['AVAR'] += 1;
+	print "<p>\$HTTP_SESSION_VARS['AVAR']={$HTTP_SESSION_VARS['AVAR']}</p>";
+
+ 
+ Installation
+ ============
+ 1. Create a new database in MySQL or Access "sessions" like
+so:
+ 
+  create table sessions (
+       SESSKEY char(32) not null,
+       EXPIRY int(11) unsigned not null,
+       DATA text not null,
+      primary key (sesskey)
+  );
+  
+  2. Then define the following parameters in this file:
+  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
+	$ADODB_SESSION_CONNECT='server to connect to';
+	$ADODB_SESSION_USER ='user';
+	$ADODB_SESSION_PWD ='password';
+	$ADODB_SESSION_DB ='database';
+	$ADODB_SESSION_TBL = 'sessions'
+	
+  3. Recommended is PHP 4.0.2 or later. There are documented
+session bugs in 
+     earlier versions of PHP.
+
+*/
+
+
+include_once('crypt.inc.php');
+
+if (!defined('_ADODB_LAYER')) {
+	include ('adodb.inc.php');
+}
+
+
+
+if (!defined('ADODB_SESSION')) {
+
+ define('ADODB_SESSION',1);
+ 
+GLOBAL 	$ADODB_SESSION_CONNECT, 
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_LIFE,
+	$ADODB_SESS_DEBUG,
+	$ADODB_SESS_INSERT; 
+
+	//$ADODB_SESS_DEBUG = true;
+	
+	/* SET THE FOLLOWING PARAMETERS */
+if (empty($ADODB_SESSION_DRIVER)) {
+	$ADODB_SESSION_DRIVER='mysql';
+	$ADODB_SESSION_CONNECT='serverName';
+	$ADODB_SESSION_USER ='PhpSessions';
+	$ADODB_SESSION_PWD ='sessions';
+	$ADODB_SESSION_DB ='sessions';
+}
+if (empty($ADODB_SESSION_TBL)){
+	$ADODB_SESSION_TBL = 'sessions';
+}
+
+
+function ADODB_Session_Key() 
+{
+$ADODB_CRYPT_KEY = 'CRYPTED ADODB SESSIONS ROCK!';
+
+	/* USE THIS FUNCTION TO CREATE THE ENCRYPTION KEY FOR CRYPTED SESSIONS	*/
+	/* Crypt the used key, $ADODB_CRYPT_KEY as key and session_ID as SALT	*/
+	return crypt($ADODB_CRYPT_KEY, session_ID());
+}
+
+$ADODB_SESS_LIFE = get_cfg_var('session.gc_maxlifetime');
+if ($ADODB_SESS_LIFE <= 1) {
+	// bug in PHP 4.0.3 pl 1  -- how about other versions?
+	//print "<h3>Session Error: PHP.INI setting <i>session.gc_maxlifetime</i>not set: $ADODB_SESS_LIFE</h3>";
+	$ADODB_SESS_LIFE=1440;
+}
+
+function adodb_sess_open($save_path, $session_name) 
+{
+GLOBAL 	$ADODB_SESSION_CONNECT, 
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_DEBUG;
+	
+	$ADODB_SESS_INSERT = false;
+	
+	if (isset($ADODB_SESS_CONN)) return true;
+	
+	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
+	if (!empty($ADODB_SESS_DEBUG)) {
+		$ADODB_SESS_CONN->debug = true;
+		print" conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ";
+	}
+	return $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+	
+}
+
+function adodb_sess_close() 
+{
+global $ADODB_SESS_CONN;
+
+	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
+	return true;
+}
+
+function adodb_sess_read($key) 
+{
+$Crypt = new MD5Crypt;
+global $ADODB_SESS_CONN,$ADODB_SESS_INSERT,$ADODB_SESSION_TBL;
+	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
+	if ($rs) {
+		if ($rs->EOF) {
+			$ADODB_SESS_INSERT = true;
+			$v = '';
+		} else {
+			// Decrypt session data
+			$v = rawurldecode($Crypt->Decrypt($rs->fields[0], ADODB_Session_Key()));
+		}
+		$rs->Close();
+		return $v;
+	}
+	else $ADODB_SESS_INSERT = true;
+	
+	return false;
+}
+
+function adodb_sess_write($key, $val) 
+{
+$Crypt = new MD5Crypt;
+	global $ADODB_SESS_INSERT,$ADODB_SESS_CONN, $ADODB_SESS_LIFE, $ADODB_SESSION_TBL;
+
+	$expiry = time() + $ADODB_SESS_LIFE;
+
+	// encrypt session data..	
+	$val = $Crypt->Encrypt(rawurlencode($val), ADODB_Session_Key());
+	$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry,data='$val' WHERE sesskey='$key'";
+	$rs = $ADODB_SESS_CONN->Execute($qry);
+	if ($rs) $rs->Close();
+	else print '<p>Session Update: '.$ADODB_SESS_CONN->ErrorMsg().'</p>';
+	
+	if ($ADODB_SESS_INSERT || $rs === false) {
+		$qry = "INSERT INTO $ADODB_SESSION_TBL(sesskey,expiry,data) VALUES ('$key',$expiry,'$val')";
+		$rs = $ADODB_SESS_CONN->Execute($qry);
+		if ($rs) $rs->Close();
+		else print '<p>Session Insert: '.$ADODB_SESS_CONN->ErrorMsg().'</p>';
+	}
+	// bug in access driver (could be odbc?) means that info is not commited
+	// properly unless select statement executed in Win2000
+	if ($ADODB_SESS_CONN->databaseType == 'access') $rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
+
+	return isset($rs);
+}
+
+function adodb_sess_destroy($key) 
+{
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL;
+
+	$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
+	$rs = $ADODB_SESS_CONN->Execute($qry);
+	if ($rs) $rs->Close();
+	return $rs;
+}
+
+function adodb_sess_gc($maxlifetime) {
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL;
+
+	$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
+	$rs = $ADODB_SESS_CONN->Execute($qry);
+	if ($rs) $rs->Close();
+	
+	// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
+	if (defined('ADODB_SESSION_OPTIMIZE'))
+	{
+		switch( $ADODB_SESSION_DRIVER ) {
+			case 'mysql':
+			case 'mysqlt':
+				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
+				break;
+			case 'postgresql':
+			case 'postgresql7':
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
+				break;
+		}
+	}
+	
+	return true;
+}
+
+session_module_name('user'); 
+session_set_save_handler(
+	"adodb_sess_open",
+	"adodb_sess_close",
+	"adodb_sess_read",
+	"adodb_sess_write",
+	"adodb_sess_destroy",
+	"adodb_sess_gc");
+}
+
+/*  TEST SCRIPT -- UNCOMMENT */
+/*
+if (0) {
+GLOBAL $HTTP_SESSION_VARS;
+
+	session_start();
+	session_register('AVAR');
+	$HTTP_SESSION_VARS['AVAR'] += 1;
+	print "<p>\$HTTP_SESSION_VARS['AVAR']={$HTTP_SESSION_VARS['AVAR']}</p>";
+}
+*/
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-csv.inc.php b/libraries/adodb/adodb-csv.inc.php
new file mode 100755
index 00000000..e056df09
--- /dev/null
+++ b/libraries/adodb/adodb-csv.inc.php
@@ -0,0 +1,147 @@
+<?php
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 4.
+  
+  Currently unsupported: MetaDatabases, MetaTables and MetaColumns, and also inputarr in Execute.
+  Native types have been converted to MetaTypes.
+  Transactions not supported yet.
+*/ 
+
+if (! defined("_ADODB_CSV_LAYER")) {
+ define("_ADODB_CSV_LAYER", 1 );
+
+class ADODB_csv extends ADOConnection {
+	var $databaseType = 'csv';
+    var $hasInsertID = true;
+    var $hasAffectedRows = true;	
+	var $fmtTimeStamp = "'Y-m-d H:i:s'";
+	var $_affectedrows=0;
+	var $_insertid=0;
+	var $_url;
+	var $replaceQuote = "''"; // string to use to replace quotes
+	
+	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)
+	{
+		$this->_url = $argHostname;
+		return true;	
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_url = $argHostname;
+		return true;
+	}
+	
+ 	function &MetaColumns($table) 
+	{
+		return false;
+	}
+		
+		
+	// parameters use PostgreSQL convention, not MySQL
+	function &SelectLimit($sql,$nrows=-1,$offset=-1,$arg3=false)
+	{
+		$url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&$offset=&offset&arg3=".urlencode($arg3);
+		$err = false;
+		$rs = csv2rs($url,$err,false);
+		if ($this->debug) print "$url<br><i>$err</i><br>";
+
+		$at = strpos($err,'::::');
+		if ($at === false) {		
+			$this->_errorMsg = $err;
+			$this->_errorNo = (integer)$err;
+		} else {
+			$this->_errorMsg = substr($err,$at+4,1024);
+			$this->_errorNo = -9999;
+		}
+		if (is_object($rs)) {
+			$rs->databaseType='csv';
+		}
+		return $rs;
+	}
+	
+	// returns queryID or false
+	function Execute($sql,$inputarr=false,$arg3=false)
+	{
+		$url =  $this->_url.'?sql='.urlencode($sql);
+		if ($arg3) $url .= "&arg3=".urlencode($arg3);
+		$err = false;
+		
+		$rs = csv2rs($url,$err,false);
+		if ($this->debug) print urldecode($url)."<br><i>$err</i><br>";
+		$at = strpos($err,'::::');
+		if ($at === false) {		
+			$this->_errorMsg = $err;
+			$this->_errorNo = (integer)$err;
+		} else {
+			$this->_errorMsg = substr($err,$at+4,1024);
+			$this->_errorNo = -9999;
+		}
+		if (is_object($rs)) {
+			$this->_affectedrows = $rs->affectedrows;
+			$this->_insertid = $rs->insertid;
+			$rs->databaseType='csv';
+		}
+		return $rs;
+	}
+
+	/*	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() 
+	{
+		return $this->_errorNo;
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		return true;
+	}
+} // class
+
+class ADORecordset_csv extends ADORecordset {
+	function ADORecordset_csv($id)
+	{
+		$this->ADORecordset($id);
+	}
+	
+	function _close()
+	{
+		return true;
+	}
+}
+
+} // define
+	
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-db2.inc.php b/libraries/adodb/adodb-db2.inc.php
new file mode 100755
index 00000000..7bf57026
--- /dev/null
+++ b/libraries/adodb/adodb-db2.inc.php
@@ -0,0 +1,163 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://php.weblogs.com/
+  
+  DB2 data driver. Requires ODBC.
+ 
+From phpdb list:
+
+Hi Andrew,
+
+thanks a lot for your help. Today we discovered what
+our real problem was:
+
+After "playing" a little bit with the php-scripts that try
+to connect to the IBM DB2, we set the optional parameter
+Cursortype when calling odbc_pconnect(....).
+
+And the exciting thing: When we set the cursor type
+to SQL_CUR_USE_ODBC Cursor Type, then
+the whole query speed up from 1 till 10 seconds
+to 0.2 till 0.3 seconds for 100 records. Amazing!!!
+
+Therfore, PHP is just almost fast as calling the DB2
+from Servlets using JDBC (don't take too much care
+about the speed at whole: the database was on a
+completely other location, so the whole connection
+was made over a slow network connection).
+
+I hope this helps when other encounter the same
+problem when trying to connect to DB2 from
+PHP.
+
+Kind regards,
+Christian Szardenings
+
+2 Oct 2001
+Mark Newnham has discovered that the SQL_CUR_USE_ODBC is not supported by 
+IBM's DB2 ODBC driver, so this must be a 3rd party ODBC driver.
+
+From the IBM CLI Reference:
+
+SQL_ATTR_ODBC_CURSORS (DB2 CLI v5) 
+This connection attribute is defined by ODBC, but is not supported by DB2
+CLI. Any attempt to set or get this attribute will result in an SQLSTATE of
+HYC00 (Driver not capable). 
+
+A 32-bit option specifying how the Driver Manager uses the ODBC cursor
+library. 
+
+So I guess this means the message below was related to using a 3rd party
+odbc driver.
+
+*/
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+	include(ADODB_DIR."/adodb-odbc.inc.php");
+}
+if (!defined('ADODB_DB2')){
+define('ADODB_DB2',1);
+class ADODB_DB2 extends ADODB_odbc {
+	var $databaseType = "db2";	
+	var $concat_operator = 'CONCAT';
+	//var $curmode = SQL_CUR_USE_ODBC;
+
+// returns true or false
+// curmode is not properly supported by DB2 odbc driver according to Mark Newnham
+	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+	
+		$php_errormsg = '';
+		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
+		$this->_errorMsg = $php_errormsg;
+
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+	// returns true or false
+	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+		$php_errormsg = '';
+		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword);
+		$this->_errorMsg = $php_errormsg;
+		
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+	
+	function &SelectLimit($sql,$nrows=-1,$offset=-1,$arg3=false)
+	{
+		if ($offset <= 0) {
+		// could also use " OPTIMIZE FOR $nrows ROWS "
+			$sql .=  " FETCH FIRST $nrows ROWS ONLY ";
+			return $this->Execute($sql,false,$arg3);
+		} else
+			return ADOConnection::SelectLimit($sql,$nrows,$offset,$arg3);
+	}
+	
+};
+ 
+
+class  ADORecordSet_db2 extends ADORecordSet_odbc {	
+	
+	var $databaseType = "db2";		
+	
+	function ADORecordSet_db2($id)
+	{
+		$this->ADORecordSet_odbc($id);
+	}
+
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		switch (strtoupper($t)) {
+		case 'VARCHAR':
+		case 'CHAR':
+		case 'CHARACTER':
+			if ($len <= $this->blobSize) return 'C';
+		
+		case 'LONGCHAR':
+		case 'TEXT':
+		case 'CLOB':
+		case 'DBCLOB': // double-byte
+			return 'X';
+		
+		case 'BLOB':
+		case 'GRAPHIC':
+		case 'VARGRAPHIC':
+			return 'B';
+			
+		case 'DATE':
+			return 'D';
+		
+		case 'TIME':
+		case 'TIMESTAMP':
+			return 'T';
+		
+		//case 'BOOLEAN': 
+		//case 'BIT':
+		//	return 'L';
+			
+		//case 'COUNTER':
+		//	return 'R';
+			
+		case 'INT':
+		case 'INTEGER':
+		case 'BIGINT':
+		case 'SMALLINT':
+			return 'I';
+			
+		default: return 'N';
+		}
+	}
+}
+
+} //define
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-errorhandler.inc.php b/libraries/adodb/adodb-errorhandler.inc.php
new file mode 100755
index 00000000..71e7449c
--- /dev/null
+++ b/libraries/adodb/adodb-errorhandler.inc.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @version V1.53 13 Nov 2001  (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
+ *
+ * Set tabs to 4 for best viewing.
+ *
+ * Latest version is available at http://php.weblogs.com
+ *
+*/
+
+define('ADODB_ERROR_HANDLER','ADODB_Error_Handler');
+
+  /**
+* Default Error Handler. This will be called with the following params
+*
+* @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 $errmsg	the native error msg from the database
+* @param $p1		$fn specific parameter - see below
+* @param $P2		$fn specific parameter - see below
+	*/
+function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
+{
+	switch($fn) {
+	case 'EXECUTE':
+		$sql = $p1;
+		$inputparams = $p2;
+
+		$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n";
+		break;
+
+	case 'PCONNECT':
+	case 'CONNECT':
+		$host = $p1;
+		$database = $p2;
+
+		$s = "$dbms error: [$errno: $errmsg] in $fn($host, ?, ?, $database)\n";
+		break;
+	default:
+		$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
+		break;
+	}
+	/*
+	* Log connection error somewhere
+	*	0 message is sent to PHP's system logger, using the Operating System's system
+	*		logging mechanism or a file, depending on what the error_log configuration
+	*		directive is set to.
+	*	1 message is sent by email to the address in the destination parameter.
+	*		This is the only message type where the fourth parameter, extra_headers is used.
+	*		This message type uses the same internal function as mail() does.
+	*	2 message is sent through the PHP debugging connection.
+	*		This option is only available if remote debugging has been enabled.
+	*		In this case, the destination parameter specifies the host name or IP address
+	*		and optionally, port number, of the socket receiving the debug information.
+	*	3 message is appended to the file destination
+	*/
+	if (defined('ADODB_ERROR_LOG_TYPE')) {
+		$t = date('Y-m-d H:i:s');
+		if (defined('ADODB_ERROR_LOG_DEST'))
+			error_log("($t) $s", ADODB_ERROR_LOG_TYPE, ADODB_ERROR_LOG_DEST);
+		else
+			error_log("($t) $s", ADODB_ERROR_LOG_TYPE);
+	}
+
+
+	//print "<p>$s</p>";
+	trigger_error($s,E_USER_ERROR);
+}
+?>
diff --git a/libraries/adodb/adodb-errorpear.inc.php b/libraries/adodb/adodb-errorpear.inc.php
new file mode 100755
index 00000000..19b049f2
--- /dev/null
+++ b/libraries/adodb/adodb-errorpear.inc.php
@@ -0,0 +1,86 @@
+<?php
+/** 
+ * @version V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+ *
+ * Set tabs to 4 for best viewing.
+ * 
+ * Latest version is available at http://php.weblogs.com
+ * 
+*/
+include_once('PEAR.php');
+
+define('ADODB_ERROR_HANDLER','ADODB_Error_PEAR');
+
+/*
+* Enabled the following if you want to terminate scripts when an error occurs
+*/
+//PEAR::setErrorHandling (PEAR_ERROR_DIE);
+
+/*
+* Name of the PEAR_Error derived class to call.
+*/
+if (!defined('ADODB_PEAR_ERROR_CLASS')) define('ADODB_PEAR_ERROR_CLASS','PEAR_Error');
+
+/*
+* Store the last PEAR_Error object here
+*/
+global $ADODB_Last_PEAR_Error; $ADODB_Last_PEAR_Error = false;
+
+  /**
+* Error Handler with PEAR support. This will be called with the following params
+*
+* @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 $errmsg	the native error msg from the database
+* @param $p1		$fn specific parameter - see below
+* @param $P2		$fn specific parameter - see below
+	*/
+function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
+{
+global $ADODB_Last_PEAR_Error;
+	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'], 
+		$errmsg);
+		
+	//print "<p>!$s</p>";
+}
+
+/**
+* Returns last PEAR_Error object. This error might be for an error that
+* occured several sql statements ago.
+*/
+function &ADODB_PEAR_Error()
+{
+global $ADODB_Last_PEAR_Error;
+
+	return $ADODB_Last_PEAR_Error;
+}
+		
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-fbsql.inc.php b/libraries/adodb/adodb-fbsql.inc.php
new file mode 100755
index 00000000..a1f894f4
--- /dev/null
+++ b/libraries/adodb/adodb-fbsql.inc.php
@@ -0,0 +1,251 @@
+<?php
+/*
+ @version V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+ Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+ Contribution by Frank M. Kromann <frank@frontbase.com>. 
+  Set tabs to 8.
+*/ 
+
+if (! defined("_ADODB_FBSQL_LAYER")) {
+ define("_ADODB_FBSQL_LAYER", 1 );
+
+class ADODB_fbsql extends ADOConnection {
+	var $databaseType = 'fbsql';
+        var $hasInsertID = true;
+        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 _insertid()
+        {
+                return fbsql_insert_id($this->_connectionID);
+        }
+        
+        function _affectedrows()
+        {
+                return fbsql_affected_rows($this->_connectionID);
+        }
+  
+  	function &MetaDatabases()
+	{
+		$qid = fbsql_list_dbs($this->_connectionID);
+		$arr = array();
+		$i = 0;
+		$max = fbsql_num_rows($qid);
+		while ($i < $max) {
+			$arr[] = fbsql_tablename($qid,$i);
+			$i += 1;
+		}
+		return $arr;
+	}
+
+	// returns concatenated string
+	function Concat()
+	{
+		$s = "";
+		$arr = func_get_args();
+		$first = true;
+
+		foreach($arr as $a) {
+			if ($first) {
+				$s = $a;
+				$first = false;
+			} else $s .= ','.$a;
+		}
+		if (sizeof($s) > 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;	
+	}
+	
+	// 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;	
+	}
+	
+ 	function &MetaColumns($table) 
+	{
+		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];
+					$fld->max_length = $query_array[2];
+				} else {
+					$fld->max_length = -1;
+				}
+				$fld->not_null = ($rs->fields[2] != 'YES');
+				$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;	
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+		
+	// returns true or false
+	function SelectDB($dbName) 
+	{
+		$this->databaseName = $dbName;
+		if ($this->_connectionID) {
+			return @fbsql_select_db($dbName,$this->_connectionID);		
+		}
+		else return false;	
+	}
+	
+	
+	// returns queryID or false
+	function _query($sql,$inputarr)
+	{
+		return fbsql_query("$sql;",$this->_connectionID);
+	}
+
+	/*	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() 
+	{
+		return @fbsql_errno($this->_connectionID);
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		return @fbsql_close($this->_connectionID);
+	}
+		
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_fbsql extends ADORecordSet{	
+	
+	var $databaseType = "fbsql";
+	var $canSeek = true;
+	
+	function ADORecordSet_fbsql($queryID) {
+		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) {
+		if ($fieldOffset != -1) {
+			$o =  @fbsql_fetch_field($this->_queryID, $fieldOffset);
+			//$o->max_length = -1; // fbsql returns the max length less spaces -- so it is unrealiable
+			$f = @fbsql_field_flags($this->_queryID,$fieldOffset);
+			$o->binary = (strpos($f,'binary')!== false);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			$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);
+		return ($this->fields == true);
+	}
+	
+	function _close() {
+		return @fbsql_free_result($this->_queryID);		
+	}
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		$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': 
+			if ($len <= $this->blobSize) return 'C';
+			
+		// so we have to check whether binary...
+		case 'IMAGE':
+		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 WITH TIME ZONE': return 'T';
+		
+		case 'PRIMARY_KEY':
+			return 'R';
+		case 'INTEGER':
+		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/libraries/adodb/adodb-ibase.inc.php b/libraries/adodb/adodb-ibase.inc.php
new file mode 100755
index 00000000..2e5e7e7f
--- /dev/null
+++ b/libraries/adodb/adodb-ibase.inc.php
@@ -0,0 +1,349 @@
+<?php
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.  
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+
+  Latest version is available at http://php.weblogs.com/
+  
+  Interbase data driver. Requires interbase client. Works on Windows and Unix.
+
+  3 Jan 2001 -- suggestions by Hans-Peter Oeri <kampfcaspar75@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,...)");
+*/
+
+class ADODB_ibase extends ADOConnection {
+    var $databaseType = "ibase";
+    var $replaceQuote = "\'"; // string to use to replace quotes
+    var $fmtDate = "'Y-m-d'";
+    var $fmtTimeStamp = "'Y-m-d, H:i:s'";
+    var $concat_operator='||';
+    var $_transactionID;
+	var $metaTablesSQL = "select rdb\$relation_name from rdb\$relations where rdb\$relation_name not like 'RDB\$%'";
+	var $metaColumnsSQL = "select a.rdb\$field_name,b.rdb\$field_type,b.rdb\$field_length from rdb\$relation_fields a join rdb\$fields b on a.rdb\$field_source=b.rdb\$field_name where rdb\$relation_name ='%s'";
+	var $ibasetrans = IBASE_DEFAULT;
+	var $hasGenID = true;
+	var $_bindInputArray = true;
+	
+	// note the generator starts from 0, unlike others which start from 1
+	var $_genIDSQL = "SELECT Gen_ID(%s,1) FROM RDB\$DATABASE";
+	var $_genSeqSQL = "INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('%s'))";
+
+    function ADODB_ibase() 
+	{
+        ibase_timefmt('%Y-%m-%d');
+  	}
+
+    function BeginTrans()
+	{      
+		//return false; // currently not working properly
+		
+            $this->autoCommit = false;
+     		$this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
+	      	return $this->_transactionID;
+	}
+	
+	function CommitTrans()
+	{
+		$ret = false;
+		$this->autoCommit = true;
+		if ($this->_transactionID) {
+               		//print ' commit ';
+			$ret = ibase_commit($this->_transactionID);
+		}
+		$this->_transactionID = false;
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+		$ret = false;
+		$this->autoCommit = true;
+		if ($this->_transactionID) 
+	              $ret = ibase_rollback($this->_transactionID);
+		$this->_transactionID = false;   
+		
+		return $ret;
+	}
+
+        function SelectDB($dbName) {
+               return false;
+        }
+
+	function _handleerror()
+	{
+		$this->_errorMsg = ibase_errmsg($this->_connectionID);
+	}
+
+        function ErrorNo() {
+		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
+		else return 0;
+        }
+	
+        function ErrorMsg() {
+                return $this->_errorMsg;
+        }
+	
+        // returns true or false
+        function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+        {  
+		if ($this->charSet)
+			$this->_connectionID = ibase_connect($argHostname,$argUsername,$argPassword,$this->charSet);
+	        else        
+			$this->_connectionID = ibase_connect($argHostname,$argUsername,$argPassword);
+              	
+		if ($this->_connectionID === false) {
+			$this->_handleerror();
+			return false;
+		}
+		
+                return true;
+        }
+        // returns true or false
+        function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+        {
+			if ($this->charSet)
+				$this->_connectionID = ibase_pconnect($argHostname,$argUsername,$argPassword,$this->charSet);
+	        else        
+				$this->_connectionID = ibase_pconnect($argHostname,$argUsername,$argPassword);
+          	     
+	       	if ($this->_connectionID === false) {
+				$this->_handleerror();
+				return false;
+			}
+          
+            return true;
+        }
+
+        // returns query ID if successful, otherwise false
+        function _query($sql,$iarr=false)
+        { 
+		if (!$this->autoCommit && $this->_transactionID) {
+			if (is_array($iarr)) {	
+				switch(sizeof($iarr)) {
+				case 1: $ret = ibase_query($this->_transactionID,$sql,$iarr[0]); break;
+				case 2: $ret = ibase_query($this->_transactionID,$sql,$iarr[0],$iarr[1]); break;
+				case 3: $ret = ibase_query($this->_transactionID,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
+				case 4: $ret = ibase_query($this->_transactionID,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+				default: print "<p>Too many parameters to ibase query $sql</p>";
+				case 5: $ret = ibase_query($this->_transactionID,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+				}
+			} else $ret = ibase_query($this->_transactionID,$sql); 
+		} else {
+			if (is_array($iarr)) {
+				switch(sizeof($iarr)) {
+				case 1: $ret = ibase_query($this->_connectionID,$sql,$iarr[0]); break;
+				case 2: $ret = ibase_query($this->_connectionID,$sql,$iarr[0],$iarr[1]); break;
+				case 3: $ret = ibase_query($this->_connectionID,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
+				case 4: $ret = ibase_query($this->_connectionID,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+				default: print "<p>Too many parameters to ibase query $sql</p>";
+				case 5: $ret = ibase_query($this->_connectionID,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+				
+				} 
+			} else $ret = ibase_query($this->_connectionID,$sql);
+            if ($ret === true) ibase_commit($this->_connectionID);
+		}
+		$this->_handleerror();
+        return $ret;
+    }
+
+     // returns true or false
+     function _close()
+     {       
+        if ($this->autoCommit) ibase_commit($this->_connectionID);
+		else ibase_rollback($this->_connectionID);
+
+        return @ibase_close($this->_connectionID);
+     }
+	
+        // returns array of ADOFieldObjects for current table
+	function &MetaColumns($table) 
+	{
+	
+		if ($this->metaColumnsSQL) {
+		
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+			if ($rs === false) return false;
+
+			$retarr = array();
+			while (!$rs->EOF) { //print_r($rs->fields);
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$tt = $rs->fields[1];
+				switch($tt)
+				{
+				case 7:
+				case 8:
+				case 9:$tt = 'INTEGER'; break;
+				case 10:
+				case 27:
+				case 11:$tt = 'FLOAT'; break;
+				default:
+				case 40:
+				case 14:$tt = 'CHAR'; break;
+				case 35:$tt = 'DATE'; break;
+				case 37:$tt = 'VARCHAR'; break;
+				case 261:$tt = 'BLOB'; break;
+				case 13:
+				case 35:$tt = 'TIMESTAMP'; break;
+				}
+				$fld->type = $tt;
+				$fld->max_length = $rs->fields[2];
+				$retarr[strtoupper($fld->name)] = $fld;	
+				
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+	
+	// warning - this code is experimental and might not be available in the future
+	function &BlobEncode( $blob ) 
+	{
+		$blobid = ibase_blob_create( $this->_connectionID);
+		ibase_blob_add( $blobid, $blob );
+		return ibase_blob_close( $blobid );
+	}
+	
+	// warning - this code is experimental and might not be available in the future
+	function &BlobDecode( $blob ) 
+	{
+		$blobid = ibase_blob_open( $blob );
+		$realblob = ibase_blob_get( $blobid,299999); // 2nd param is max size of blob -- Kevin Boillet <kevinboillet@yahoo.fr>
+		ibase_blob_close( $blobid );
+
+		return( $realblob );
+	} 
+	
+	/*
+		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);
+		$blob_id_str = ibase_blob_close($blob_id);
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
+	}
+}
+
+/*--------------------------------------------------------------------------------------
+         Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_ibase extends ADORecordSet 
+{
+
+    var $databaseType = "ibase";
+	var $bind=false;
+	
+        function ADORecordset_ibase($id)
+        {
+                return $this->ADORecordSet($id);
+        }
+
+        /*        Returns: an object containing field information.
+                Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+                fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+                fetchField() is retrieved.        */
+
+        function &FetchField($fieldOffset = -1)
+        {
+                 $fld = new ADOFieldObject;
+                 $ibf = ibase_field_info($this->_queryID,$fieldOffset);
+                 $fld->name = $ibf['name'];
+				 if (empty($fld->name)) $fld->name = $ibf['alias'];
+                 $fld->type = $ibf['type'];
+                 $fld->max_length = $ibf['length'];
+                 if ($this->debug) print_r($fld);
+                 return $fld;
+        }
+
+        function _initrs()
+        {
+                $this->_numOfRows = -1;
+                $this->_numOfFields = @ibase_num_fields($this->_queryID);
+        }
+
+        function _seek($row)
+        {
+                return false;
+        }
+
+        function _fetch() {
+
+                $f = ibase_fetch_row($this->_queryID); 
+                if ($f === false) return false;
+                $this->fields = $f;
+                return true;
+        }
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+		
+	}
+	
+	
+        function _close() 
+		{
+                return @ibase_free_result($this->_queryID);
+        }
+
+        function MetaType($t,$len=-1)
+        {
+                switch (strtoupper($t)) {
+		case 'CHAR':
+			return 'C';
+			
+              
+		case 'TEXT':
+		case 'VARCHAR':
+                case 'VARYING':
+                        if ($len <= $this->blobSize) return 'C';
+			return 'X';
+		  case 'BLOB':
+                        return 'B';
+               
+                 case 'TIMESTAMP':
+                 case 'DATE': return 'D';
+                
+                //case 'T': return 'T';
+
+                //case 'L': return 'L';
+		case 'INT': 
+		case 'SHORT':
+		case 'INTEGER': return 'I';
+                default: return 'N';
+                }
+        }
+}
+?>
diff --git a/libraries/adodb/adodb-mssql.inc.php b/libraries/adodb/adodb-mssql.inc.php
new file mode 100755
index 00000000..b1c3a631
--- /dev/null
+++ b/libraries/adodb/adodb-mssql.inc.php
@@ -0,0 +1,279 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://php.weblogs.com/
+  
+  Native mssql driver. Requires mssql client. Works on Windows. 
+  To configure for Unix, see 
+   	http://phpbuilder.com/columns/alberto20000919.php3
+	
+  To configure datetime, look for and modify sqlcommn.loc, 
+  	typically found in c:\mssql\install
+  alternatively use 
+  	CONVERT(char(12),datecol,120)
+*/
+
+
+class ADODB_mssql extends ADOConnection {
+	var $databaseType = "mssql";	
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $fmtDate = "'Y-m-d'";
+	var $fmtTimeStamp = "'Y-m-d h:i:sA'";
+	var $hasInsertID = true;
+        var $hasAffectedRows = true;
+	var $metaTablesSQL="select name from sysobjects where type='U' or type='V' and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE'))";
+	var $metaColumnsSQL = "select c.name,t.name,c.length from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
+	var $hasTop = true;		// support mssql SELECT TOP 10 * FROM TABLE
+	var $_hastrans = false;
+	
+	function ADODB_mssql() {			
+	}
+
+        // might require begintrans -- committrans
+        function _insertid()
+        {
+                $rs = $this->Execute('select @@identity');
+                if ($rs == false || $rs->EOF) return false;
+               $id = $rs->fields[0];
+               $rs->Close();
+               return $id;
+        }
+          // might require begintrans -- committrans
+        function _affectedrows()
+        {
+                $rs = $this->Execute('select @@rowcount');
+                if ($rs == false || $rs->EOF) return false;
+               $id = $rs->fields[0];
+               $rs->Close();
+               return $id;
+        }
+        function BeginTrans()
+	{       
+		$this->_hastrans = true;
+        $this->Execute('BEGIN TRAN');
+        return true;
+	}
+	// Reserved for future expansion
+	function CommitTrans()
+	{
+		$this->_hastrans = false;
+        $this->Execute('COMMIT TRAN');
+        return true;
+	}
+	// Reserved for future expansion
+	function RollbackTrans()
+	{
+		$this->_hastrans = false;
+        $this->Execute('ROLLBACK TRAN');
+        return true;
+	}
+	
+	
+	//From: Fernando Moreira <FMoreira@imediata.pt>
+        function MetaDatabases() 
+		{ 
+                if(@mssql_select_db("master")) { 
+                         $qry="select name from sysdatabases where name <> 'master'"; 
+                         if($rs=@mssql_query($qry)){ 
+                                 $tmpAr=$ar=array(); 
+                                 while($tmpAr=@mssql_fetch_row($rs)) 
+                                         $ar[]=$tmpAr[0]; 
+                                @mssql_select_db($this->databaseName); 
+                                 if(sizeof($ar)) 
+                                         return($ar); 
+                                 else 
+                                         return(false); 
+                         } else { 
+                                 @mssql_select_db($this->databaseName); 
+                                 return(false); 
+                         } 
+                 } 
+                 return(false); 
+        } 
+
+	function SelectDB($dbName) 
+	{
+		$this->databaseName = $dbName;
+		if ($this->_connectionID) {
+			return @mssql_select_db($dbName);		
+		}
+		else return false;	
+	}
+	/*	Returns: the last error message from previous database operation
+		Note: This function is NOT available for Microsoft SQL Server.	*/
+	function ErrorMsg() 
+	{
+		$this->_errorMsg = mssql_get_last_message();
+		return $this->_errorMsg;
+	}
+	
+	function ErrorNo() 
+	{
+		$id = @mssql_query("select @@ERROR",$this->_connectionID);
+		if (!$id) return false;
+		$arr = mssql_fetch_array($id);
+		@mssql_free_result($id);
+		if (is_array($arr)) return $arr[0];
+       else return -1;
+	}
+	
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		//$this->Execute('SET DATEFORMAT ymd');
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		//$this->Execute('SET DATEFORMAT ymd');
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr)
+	{
+		$val= mssql_query($sql,$this->_connectionID);
+		return $val;
+	}
+	
+	// returns true or false
+	function _close()
+	{ 
+		if ($this->_hastrans) $this->RollbackTrans();
+		return @mssql_close($this->_connectionID);
+	}
+	
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+global $ADODB_mssql_mths;
+$ADODB_mssql_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+
+class ADORecordset_mssql extends ADORecordSet {	
+
+	var $databaseType = "mssql";
+	var $canSeek = true;
+	// _mths works only in non-localised system
+		
+	function ADORecordset_mssql($id)
+	{
+		return $this->ADORecordSet($id);
+	}
+	
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+	/*	Returns: an object containing field information. 
+		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+		fetchField() is retrieved.	*/
+
+	function FetchField($fieldOffset = -1) 
+	{
+		if ($fieldOffset != -1) {
+			return @mssql_fetch_field($this->_queryID, $fieldOffset);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			return @mssql_fetch_field($this->_queryID);
+		}
+		return null;
+	}
+	
+	function _initrs()
+	{
+	GLOBAL $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1;
+		$this->_numOfFields = @mssql_num_fields($this->_queryID);
+	}
+	
+	function _seek($row) 
+	{
+		return @mssql_data_seek($this->_queryID, $row);
+	}
+
+	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
+	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
+	function _fetch($ignore_fields=false) 
+	{
+		$this->fields = @mssql_fetch_array($this->_queryID);
+		//print_r($this->fields);
+		return (!empty($this->fields));
+	}
+	
+	/*	close() only needs to be called if you are worried about using too much memory while your script
+		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
+
+	function _close() {
+		return @mssql_free_result($this->_queryID);		
+	}
+
+	// mssql uses a default date like Dec 30 2000 12:00AM
+	function UnixDate($v)
+	{
+	global $ADODB_mssql_mths;
+	
+		//Dec 30 2000 12:00AM
+		if (!ereg( "([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}))"
+			,$v, $rr)) return parent::UnixDate($v);
+			
+		if ($rr[3] <= 1970) return 0;
+		
+		$themth = substr(strtoupper($rr[1]),0,3);
+		$themth = $ADODB_mssql_mths[$themth];
+		if ($themth <= 0) return false;
+		// h-m-s-MM-DD-YY
+		return  mktime(0,0,0,$themth,$rr[2],$rr[3]);
+	}
+	
+	function UnixTimeStamp($v)
+	{
+	global $ADODB_mssql_mths;
+	
+		//Dec 30 2000 12:00AM
+		if (!ereg( "([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})"
+			,$v, $rr)) return parent::UnixTimeStamp($v);
+		if ($rr[3] <= 1970) return 0;
+		
+		$themth = substr(strtoupper($rr[1]),0,3);
+		$themth = $ADODB_mssql_mths[$themth];
+		if ($themth <= 0) return false;
+		
+		if (strtoupper($rr[6]) == 'P') {
+			if ($rr[4]<12) $rr[4] += 12;
+		} else {
+			if ($rr[4]==12) $rr[4] = 0;
+		}
+		// h-m-s-MM-DD-YY
+		return  mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
+	}
+}
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-mysql.inc.php b/libraries/adodb/adodb-mysql.inc.php
new file mode 100755
index 00000000..c3c2e7d6
--- /dev/null
+++ b/libraries/adodb/adodb-mysql.inc.php
@@ -0,0 +1,352 @@
+<?php
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 8.
+  
+  MySQL code that does not support transactions. Use mysqlt if you need transactions.
+  Requires mysql client. Works on Windows and Unix.
+  
+ 28 Feb 2001: MetaColumns bug fix - suggested by  Freek Dijkstra (phpeverywhere@macfreek.com)
+*/ 
+
+if (! defined("_ADODB_MYSQL_LAYER")) {
+ define("_ADODB_MYSQL_LAYER", 1 );
+
+class ADODB_mysql extends ADOConnection {
+	var $databaseType = 'mysql';
+    var $hasInsertID = true;
+    var $hasAffectedRows = true;	
+	var $metaTablesSQL = "SHOW TABLES";	
+	var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
+	var $fmtTimeStamp = "'Y-m-d H:i:s'";
+	var $hasLimit = true;
+	var $hasMoveFirst = true;
+	var $hasGenID = true;
+	
+	function ADODB_mysql() 
+	{			
+	}
+	
+    function _insertid()
+    {
+            return mysql_insert_id($this->_connectionID);
+    }
+    
+    function _affectedrows()
+    {
+            return mysql_affected_rows($this->_connectionID);
+    }
+  
+ 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
+	// Reference on Last_Insert_ID on the recommended way to simulate sequences
+ 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
+	var $_genSeqSQL = "create table %s (id int not null)";
+	var $_genSeq2SQL = "insert into %s values (0)";
+	
+	function GenID($seqname='adodbseq')
+	{
+		if (!$this->hasGenID) return false;
+		
+		$getnext = sprintf($this->_genIDSQL,$seqname);
+		$rs = @$this->Execute($getnext);
+		if (!$rs) {
+			$u = strtoupper($seqname);
+			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
+			$this->Execute(sprintf($this->_genSeq2SQL,$seqname));
+			$rs = $this->Execute($getnext);
+		}
+		$this->genID = mysql_insert_id($this->_connectionID);
+		
+		if ($rs) $rs->Close();
+		
+		return $this->genID;
+	}
+	
+  	function &MetaDatabases()
+	{
+		$qid = mysql_list_dbs($this->_connectionID);
+		$arr = array();
+		$i = 0;
+		$max = mysql_num_rows($qid);
+		while ($i < $max) {
+			$arr[] = mysql_tablename($qid,$i);
+			$i += 1;
+		}
+		return $arr;
+	}
+
+	// returns concatenated string
+	function Concat()
+	{
+		$s = "";
+		$arr = func_get_args();
+		$first = true;
+		/*
+		foreach($arr as $a) {
+			if ($first) {
+				$s = $a;
+				$first = false;
+			} else $s .= ','.$a;
+		}*/
+		
+		// suggestion by andrew005@mnogo.ru
+	        $s = implode(',',$arr); 
+		if (strlen($s) > 0) return "CONCAT($s)";
+		else return '';
+	}
+	
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+ 	function &MetaColumns($table) 
+	{
+		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];
+					$fld->max_length = $query_array[2];
+				} else {
+					$fld->max_length = -1;
+				}
+				$fld->not_null = ($rs->fields[2] != 'YES');
+				$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;	
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+		
+	// returns true or false
+	function SelectDB($dbName) 
+	{
+		$this->databaseName = $dbName;
+		if ($this->_connectionID) {
+			return @mysql_select_db($dbName,$this->_connectionID);		
+		}
+		else return false;	
+	}
+	
+	// parameters use PostgreSQL convention, not MySQL
+	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $arg3=false,$secs=0)
+	{
+		$offsetStr =($offset>=0) ? "$offset," : '';
+		
+		return ($secs) ? $this->CacheExecute($secs,$sql." LIMIT $offsetStr$nrows",$inputarr,$arg3)
+			: $this->Execute($sql." LIMIT $offsetStr$nrows",$inputarr,$arg3);
+		
+	}
+	
+	// returns queryID or false
+	function _query($sql,$inputarr)
+	{
+	global $ADODB_COUNTRECS;
+		if($ADODB_COUNTRECS) return mysql_query($sql,$this->_connectionID);
+		else return mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
+	}
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	{
+		if (!empty($this->_connectionID)) $this->_errorMsg = @mysql_error();
+		else $this->_errorMsg = @mysql_error($this->_connectionID);
+	    return $this->_errorMsg;
+	}
+	
+	/*	Returns: the last error number from previous database operation	*/	
+	function ErrorNo() 
+	{
+			if (empty($this->_connectionID))  return @mysql_errno();
+			else return @mysql_errno($this->_connectionID);
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		@mysql_close($this->_connectionID);
+		$this->_connectionID = false;
+	}
+		
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_mysql extends ADORecordSet{	
+	
+	var $databaseType = "mysql";
+	var $canSeek = true;
+	
+	function ADORecordSet_mysql($queryID) {
+	GLOBAL $ADODB_FETCH_MODE;
+	
+		switch ($ADODB_FETCH_MODE)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+		default:
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:$this->fetchMode = MYSQL_BOTH; break;
+		}
+	
+		$this->ADORecordSet($queryID);	
+	}
+	
+	function _initrs()
+	{
+	GLOBAL $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS) ? @mysql_num_rows($this->_queryID):-1;
+		$this->_numOfFields = @mysql_num_fields($this->_queryID);
+	}
+	
+	function &FetchField($fieldOffset = -1) {
+		if ($fieldOffset != -1) {
+			$o =  @mysql_fetch_field($this->_queryID, $fieldOffset);
+			$f = @mysql_field_flags($this->_queryID,$fieldOffset);
+			$o->max_length = @mysql_field_len($this->_queryID,$fieldOffset); // suggested by: Jim Nicholson (jnich@att.com)
+			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
+			$o->binary = (strpos($f,'binary')!== false);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			$o = @mysql_fetch_field($this->_queryID);
+			$o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich@att.com)
+			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
+		}
+		
+		return $o;
+	}
+
+	function &GetRowAssoc($upper=true)
+	{
+		if ($this->fetchMode == MYSQL_ASSOC && !$upper) return $rs->fields;
+		return ADORecordSet::GetRowAssoc($upper);
+	}
+	
+	
+	function _seek($row)
+	{
+		return @mysql_data_seek($this->_queryID,$row);
+	}
+	
+	/*function &FetchRow()
+	{
+		if ($this->EOF) return false;
+		
+		$arr = $this->fields;
+		$this->_currentRow++;
+			// using & below slows things down by 20%!
+		$this->fields = @mysql_fetch_array($this->_queryID,$this->fetchMode);
+			
+		if (is_array($this->fields)) return $arr;
+		$this->EOF = true;
+		return false;
+	}*/
+	
+	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+		if (!$this->EOF) {		
+			$this->_currentRow++;
+			// using & below slows things down by 20%!
+			$this->fields = @mysql_fetch_array($this->_queryID,$this->fetchMode);
+			
+			if (is_array($this->fields)) return true;
+			$this->EOF = true;
+		}
+		return false;
+	}	
+	
+	function _fetch()
+	{
+		$this->fields = @mysql_fetch_array($this->_queryID,$this->fetchMode);
+		return (is_array($this->fields));
+	}
+	
+	function _close() {
+		@mysql_free_result($this->_queryID);	
+		$this->_queryID = false;	
+	}
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'STRING': 
+		case 'CHAR':
+		case 'VARCHAR': 
+		case 'TINYBLOB': 
+		case 'TINYTEXT': 
+		case 'ENUM': 
+		case 'SET': 
+			if ($len <= $this->blobSize) return 'C';
+			
+		case 'TEXT':
+		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 'BLOB':
+		case 'MEDIUMBLOB':
+			return !empty($fieldobj->binary) ? 'B' : 'X';
+			
+		case 'DATE': return 'D';
+		
+		case 'DATETIME':
+		case 'TIMESTAMP': return 'T';
+		
+		case 'INT': 
+		case 'INTEGER':
+		case 'BIGINT':
+		case 'TINYINT':
+		case 'MEDIUMINT':
+		case 'SMALLINT': 
+			
+			if (!empty($fieldobj->primary_key)) return 'R';
+			else return 'I';
+		
+		default: return 'N';
+		}
+	}
+
+}
+}
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-mysqlt.inc.php b/libraries/adodb/adodb-mysqlt.inc.php
new file mode 100755
index 00000000..3b1a72bd
--- /dev/null
+++ b/libraries/adodb/adodb-mysqlt.inc.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 8.
+  
+  MySQL code that supports transactions. For MySQL 3.23 or later.
+  Code from James Poon <jpoon88@yahoo.com>
+  
+  Requires mysql client. Works on Windows and Unix.
+*/
+
+
+include_once(ADODB_DIR."/adodb-mysql.inc.php");
+
+
+class ADODB_mysqlt extends ADODB_mysql {
+	var $databaseType = 'mysqlt';
+	
+	function BeginTrans()
+	{       
+		$this->Execute('SET AUTOCOMMIT=0');
+		$this->Execute('BEGIN');
+		return true;
+	}
+	
+	function CommitTrans()
+	{
+		$this->Execute('COMMIT');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return true;
+	}
+	
+	function RollbackTrans()
+	{
+		$this->Execute('ROLLBACK');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return true;
+	}
+	
+}
+
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
+	var $databaseType = "mysqlt";
+	
+	function ADORecordSet_mysqlt($queryID) {
+		return $this->ADORecordSet_mysql($queryID);
+	}
+}
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-oci8.inc.php b/libraries/adodb/adodb-oci8.inc.php
new file mode 100755
index 00000000..98f62ef3
--- /dev/null
+++ b/libraries/adodb/adodb-oci8.inc.php
@@ -0,0 +1,503 @@
+<?php
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim. 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://php.weblogs.com/
+  
+  Code contributed by George Fourlanos <fou@infomap.gr>
+  
+  13 Nov 2000 jlim - removed all ora_* references.
+*/
+
+/*
+NLS_Date_Format
+Allows you to use a date format other than the Oracle Lite default. When a literal
+character string appears where a date value is expected, the Oracle Lite database
+tests the string to see if it matches the formats of Oracle, SQL-92, or the value
+specified for this parameter in the POLITE.INI file. Setting this parameter also
+defines the default format used in the TO_CHAR or TO_DATE functions when no
+other format string is supplied.
+For Oracle the default is dd-mon-yy or dd-mon-yyyy, and for SQL-92 the default is
+yy-mm-dd or yyyy-mm-dd.
+Using 'RR' in the format forces two-digit years less than or equal to 49 to be
+interpreted as years in the 21st century (2000–2049), and years over 50 as years in
+the 20th century (1950–1999). Setting the RR format as the default for all two-digit
+year entries allows you to become year-2000 compliant. For example:
+NLS_DATE_FORMAT='RR-MM-DD'
+You can also modify the date format using the ALTER SESSION command. See the
+Oracle Lite SQL Reference for more information.
+*/
+class ADODB_oci8 extends ADOConnection {
+    var $databaseType = 'oci8';
+	var $dataProvider = 'oci8';
+    var $replaceQuote = "''"; // string to use to replace quotes
+    var $concat_operator='||';
+	var $_stmt;
+	var $_commit = OCI_COMMIT_ON_SUCCESS;
+	var $_initdate = true; // init date to YYYY-MM-DD
+	var $metaTablesSQL = "select table_name from cat where table_type in ('TABLE','VIEW')";
+	var $metaColumnsSQL = "select cname,coltype,width from col where tname='%s' order by colno";
+	var $_bindInputArray = true;
+	var $hasGenID = true;
+	var $_genIDSQL = "SELECT %s.nextval FROM DUAL";
+	var $_genSeqSQL = "CREATE SEQUENCE %s";
+	var $hasAffectedRows = true;
+	
+    function ADODB_oci8() {
+    }
+	
+	function Affected_Rows()
+	{
+		return OCIRowCount($this->_stmt);
+	}
+	
+	// format and return date string in database date format
+	function DBDate($d)
+	{
+		return 'TO_DATE('.date($this->fmtDate,$d).",'YYYY-MM-DD')";
+	}
+	
+	// format and return date string in database timestamp format
+	function DBTimeStamp($ts)
+	{
+		return 'TO_DATE('.date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
+	}
+	
+    function BeginTrans()
+	{      
+         $this->autoCommit = false;
+         $this->_commit = OCI_DEFAULT;
+         return true;
+	}
+	
+	function CommitTrans()
+	{
+        $ret = OCIcommit($this->_connectionID);
+	    $this->_commit = OCI_COMMIT_ON_SUCCESS;
+	    $this->autoCommit = true;
+	    return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+        $ret = OCIrollback($this->_connectionID);
+		$this->_commit = OCI_COMMIT_ON_SUCCESS;
+	    $this->autoCommit = true;
+		return $ret;
+	}
+        
+    function SelectDB($dbName) 
+	{
+        return false;
+    }
+
+	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
+        function ErrorMsg() 
+		{
+			$arr = @OCIerror($this->_stmt);
+			if ($arr === false) {
+				$arr = @OCIerror($this->_connectionID);
+				if ($arr === false) $arr = @OCIError();
+				if ($arr === false) return '';
+			}
+            $this->_errorMsg = $arr['message'];
+            return $this->_errorMsg;
+        }
+	
+	function ErrorNo() 
+	{
+		if (is_resource($this->_stmt))
+			$arr = @ocierror($this->_stmt);
+		else {
+			$arr = @ocierror($this->_connectionID);
+			if ($arr === false) $arr = @ocierror();
+			if ($arr == false) return '';
+		}
+        return $arr['code'];
+    }
+/*
+NATSOFT.DOMAIN =
+  (DESCRIPTION =
+    (ADDRESS_LIST =
+      (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
+    )
+    (CONNECT_DATA =
+      (SERVICE_NAME = natsoft.domain)
+    )
+  )
+*/
+  
+        // returns true or false
+    function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+    {
+		         
+    	if($argHostname) { // added by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
+        	if(strpos($argHostname,":")) {
+				$argHostinfo=explode(":",$argHostname);
+               	$argHostname=$argHostinfo[0];
+                $argHostport=$argHostinfo[1];
+         	} else {
+    			$argHostport="1521";
+   			}
+
+			$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+				.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
+    	}
+				
+ 		//if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
+        $this->_connectionID = OCIlogon($argUsername,$argPassword, $argDatabasename);
+        if ($this->_connectionID === false) return false;
+		if ($this->_initdate) {
+			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD'");
+		}
+        return true;
+   	}
+        // returns true or false
+    function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if($argHostname) { // added by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
+        	if(strpos($argHostname,":")) {
+				$argHostinfo=explode(":",$argHostname);
+               	$argHostname=$argHostinfo[0];
+                $argHostport=$argHostinfo[1];
+         	} else {
+    			$argHostport="1521";
+   			}
+
+			$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+				.")(PORT=".$argHostport."))(CONNECT_DATA=(SERVICE_NAME=".$argDatabasename.")))";
+    	}
+		$this->_connectionID = OCIplogon($argUsername,$argPassword, $argDatabasename);
+        if ($this->_connectionID === false) return false;
+		if ($this->_initdate) {
+			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD'");
+		}
+        return true;
+	}
+
+	
+	/**
+	* Usage:
+	* Store BLOBs and CLOBs
+	*
+	* Example: to store $var in a blob
+	*
+	*	$conn->Execute('insert into TABLE (id,ablobb) values(12,empty_blob())');
+	*	$conn->UpdateBlob('TABLE', 'COLUMN', $var, 'ID=1', 'BLOB');
+	*	
+	*	$blobtype supports 'BLOB' and 'CLOB'
+	*
+	*  to get length of LOB:
+	*  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
+	*/
+
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		switch(strtoupper($blobtype)) {
+		default: print "<b>UpdateBlob</b>: Unknown blobtype=$blobtype<br>"; return false;
+		case 'BLOB': $type = OCI_B_BLOB; break;
+		case 'CLOB': $type = OCI_B_CLOB; break;
+		}
+		
+		$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+		
+		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
+		$arr['blob'] = array($desc,-1,$type);
+		
+		$this->BeginTrans();
+		$rs = $this->Execute($sql,$arr);
+		$rez = !empty($rs);
+		$desc->save($val);
+		$desc->free();
+		$this->CommitTrans();
+		
+		if ($rez) $rs->Close();
+		return $rez;
+	}
+	
+	/*
+		Example of usage:
+		
+		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
+	*/
+	function &Prepare($sql)
+	{
+		return $sql;
+	/*
+	## doesn't work reliably, so emulate
+		if ($this->debug) {
+			print "<hr>($this->databaseType): ".htmlspecialchars($sql)."<hr>";
+		}
+		return OCIParse($this->_connectionID,$sql);
+	*/
+	}
+	
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr)
+	{
+		//if (!is_resource($sql))
+		$stmt=OCIParse($this->_connectionID,$sql);
+		//else $stmt = $sql;
+		
+		$this->_stmt = $stmt;
+		if (!$stmt) return false;
+		if (is_array($inputarr)) {
+			foreach($inputarr as $k => $v) {
+				if (is_array($v)) {
+					OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+					//print_r($v);
+				} else {
+					$len = -1;
+					if ($inputarr[$k] === ' ') $len = 1;
+					OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+					//print " :$k $len ";
+				}
+			}
+		}
+		if (OCIExecute($stmt,$this->_commit)) {
+		   /* Now this could be an Update/Insert or Delete */
+			if (strtoupper(substr($sql,0,6)) !== 'SELECT') return true;
+			return $stmt;
+		}
+	    return false;
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		if (!$this->autoCommit) OCIRollback($this->_connectionID);
+		OCILogoff($this->_connectionID);
+		$this->_stmt = false;
+		$this->_connectionID = false;
+	}
+
+	function MetaPrimaryKeys($table)
+	{
+	// tested with oracle 8.1.7
+		$table = strtoupper($table);
+		$sql = "SELECT /*+ RULE */ distinct b.column_name
+   FROM ALL_CONSTRAINTS a
+      , ALL_CONS_COLUMNS b
+  WHERE ( UPPER(b.table_name) = ('$table'))
+    AND (UPPER(a.table_name) = ('$table') and a.constraint_type = 'P')
+    AND (a.constraint_name = b.constraint_name)";
+ 		$rs = $this->Execute($sql);
+		if ($rs && !$rs->EOF) {
+			$arr = $rs->GetArray();
+			$a = array();
+			foreach($arr as $v) {
+				$a[] = $v[0];
+			}
+			return $a;
+		}
+		else return false;
+	}
+
+}
+
+/*--------------------------------------------------------------------------------------
+         Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oci8 extends ADORecordSet {
+
+    var $databaseType = 'oci8';
+	var $bind=false;
+	var $_fieldobjs;
+	
+        function ADORecordset_oci8($queryID)
+        {
+		global $ADODB_FETCH_MODE;
+		
+		switch ($ADODB_FETCH_MODE)
+		{
+		default:
+		case ADODB_FETCH_NUM: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		}
+	
+		
+		$this->_inited = true;
+		$this->_queryID = $queryID;
+		$this->fields = array();
+		if ($queryID) {
+			$this->_currentRow = 0;
+			$this->EOF = !$this->_fetch();
+			@$this->_initrs();
+		} else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+			$this->EOF = true;
+		}
+        }
+
+
+
+        /*        Returns: an object containing field information.
+                Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+                fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+                fetchField() is retrieved.        */
+
+        function &_FetchField($fieldOffset = -1)
+        {
+                 $fld = new ADOFieldObject;
+		 		 $fieldOffset += 1;
+                 $fld->name =OCIcolumnname($this->_queryID, $fieldOffset);
+                 $fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
+                 $fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
+				 if ($fld->type == 'NUMBER') {
+				 	//$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
+					$sc = OCIColumnScale($this->_queryID, $fieldOffset);
+					if ($sc == 0) $fld->type = 'INT';
+				 }
+                 return $fld;
+        }
+	
+	/* For some reason, OCIcolumnname fails when called after _initrs() so we cache it */
+	function &FetchField($fieldOffset = -1)
+	{
+		return $this->_fieldobjs[$fieldOffset];
+	}
+	
+	/**
+	 * return recordset as a 2-dimensional array.
+	 *
+	 * @param [nRows]  is the number of rows to return. -1 means every row.
+	 *
+	 * @return an array indexed by the rows (0-based) from the recordset
+	 */
+	function &GetArray($nRows = -1) 
+	{
+		$results = array();
+		/*if ($nRows == -1) {
+		 // doesnt work becoz it creates 2D array by column instead of row
+			$n = OCIFetchStatement($this->_queryID,$results);
+			print_r($results);
+			$this->EOF = true;
+			$this->_currentRow = $n;
+			return $results;
+		}*/
+		
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nRows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+	
+	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+		if (!$this->EOF) {		
+			$this->_currentRow++;
+			if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
+				return true;
+			
+			$this->EOF = true;
+		}
+		return false;
+	}	
+	
+	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
+	function &GetArrayLimit($nrows,$offset=-1) 
+	{
+		if ($offset <= 0) return $this->GetArray($nrows);
+		for ($i=1; $i < $offset; $i++) 
+			if (!@OCIFetch($this->_queryID)) return array();
+			
+		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return array();
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nrows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+		
+	}
+	
+        function _initrs()
+        {
+            $this->_numOfRows = -1;
+            $this->_numOfFields = OCInumcols($this->_queryID);
+			if ($this->_numOfFields>0) {
+				$this->_fieldobjs = array();
+				$max = $this->_numOfFields;
+				for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
+			}
+		//print_r($this->_fieldobjs);
+        }
+
+	
+        function _seek($row)
+        {
+                return false;
+        }
+
+        function _fetch() {
+                return @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
+        }
+
+        /*        close() only needs to be called if you are worried about using too much memory while your script
+                is running. All associated result memory for the specified result identifier will automatically be freed.        */
+
+        function _close() {
+              OCIFreeStatement($this->_queryID);
+			  $this->_queryID = false;
+        }
+
+        function MetaType($t,$len=-1)
+        {
+ 		switch (strtoupper($t)) {
+	        case 'VARCHAR':
+	        case 'VARCHAR2':
+	        case 'CHAR':
+			case 'VARBINARY':
+			case 'BINARY':
+	                        if ($len <= $this->blobSize) return 'C';
+	        case 'LONG':
+			case 'LONG VARCHAR':
+			case 'CLOB';
+				return 'X';
+				
+			case 'LONG RAW':
+			case 'LONG VARBINARY':
+			case 'BLOB':
+	              return 'B';
+	
+	        case 'DATE': return 'D';
+	
+	        //case 'T': return 'T';
+	
+	        case 'BIT': return 'L';
+			case 'INT': 
+			case 'SMALLINT':
+			case 'INTEGER': return 'I';
+            default: return 'N';
+            }
+        }
+}
+?>
diff --git a/libraries/adodb/adodb-odbc.inc.php b/libraries/adodb/adodb-odbc.inc.php
new file mode 100755
index 00000000..dda609da
--- /dev/null
+++ b/libraries/adodb/adodb-odbc.inc.php
@@ -0,0 +1,369 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://php.weblogs.com/
+  
+  Requires ODBC. Works on Windows and Unix.
+*/
+  define("_ADODB_ODBC_LAYER", 1 );
+	 
+/*--------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------*/
+
+  
+class ADODB_odbc extends ADOConnection {
+	var $databaseType = "odbc";	
+	var $fmtDate = "'Y-m-d'";
+	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $dataProvider = "odbc";
+	var $hasAffectedRows = true;
+	var $binmode = ODBC_BINMODE_RETURN;
+	//var $longreadlen = 8000; // default number of chars to return for a Blob/Long field
+	var $_bindInputArray = false;      
+	var $_haserrorfunctions = false;
+	var $curmode = SQL_CUR_USE_DRIVER; // See sqlext.h, SQL_CUR_DEFAULT == SQL_CUR_USE_DRIVER == 2L
+	
+	function ADODB_odbc() 
+	{ 	
+		$this->_haserrorfunctions = (strnatcmp(PHP_VERSION,'4.0.5')>=0);
+	}
+
+	function ErrorMsg()
+	{
+		if ($this->_haserrorfunctions) {
+	//	print_r($this->_connectionID);
+			if (empty($this->_connectionID)) return @odbc_errormsg();
+			return @odbc_errormsg($this->_connectionID);
+		} else return ADOConnection::ErrorMsg();
+	}
+	function ErrorNo()
+	{
+		if ($this->_haserrorfunctions) {
+			if (empty($this->_connectionID)) $e = @odbc_error(); 
+			else $e = @odbc_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();
+	}
+	
+	
+	// returns true or false
+	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+	
+		$php_errormsg = '';
+		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
+		$this->_errorMsg = $php_errormsg;
+
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+	
+	// returns true or false
+	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+		$php_errormsg = '';
+		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
+		$this->_errorMsg = $php_errormsg;
+		
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+
+	function BeginTrans()
+	{       
+        return odbc_autocommit($this->_connectionID,false);
+	}
+	
+	function CommitTrans()
+	{
+        $ret = odbc_commit($this->_connectionID);
+		odbc_autocommit($this->_connectionID,true);
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+        $ret = odbc_rollback($this->_connectionID);
+		odbc_autocommit($this->_connectionID,true);
+		return $ret;
+	}
+	
+	function &MetaTables()
+	{
+		$qid = odbc_tables($this->_connectionID);
+		$rs = new ADORecordSet_odbc($qid);
+		//print_r($rs);
+		$arr = &$rs->GetArray();
+		$rs->Close();
+		$arr2 = array();
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if ($arr[$i][2]) $arr2[] = $arr[$i][2];
+		}
+		return $arr2;
+	}
+	
+/*
+/ SQL data type codes /
+#define	SQL_UNKNOWN_TYPE	0
+#define SQL_CHAR            1
+#define SQL_NUMERIC         2
+#define SQL_DECIMAL         3
+#define SQL_INTEGER         4
+#define SQL_SMALLINT        5
+#define SQL_FLOAT           6
+#define SQL_REAL            7
+#define SQL_DOUBLE          8
+#if (ODBCVER >= 0x0300)
+#define SQL_DATETIME        9
+#endif
+#define SQL_VARCHAR        12
+
+/ One-parameter shortcuts for date/time data types /
+#if (ODBCVER >= 0x0300)
+#define SQL_TYPE_DATE      91
+#define SQL_TYPE_TIME      92
+#define SQL_TYPE_TIMESTAMP 93
+*/
+	function ODBCTypes($t)
+	{
+		switch ((integer)$t) {
+		case 1:	
+		case 12:
+		case 0:
+			return 'C';
+		case -1: //text
+			return 'X';
+		case -4: //image
+			return 'B';
+				
+		case 91:
+		case 11:
+			return 'D';
+			
+		case 92:
+		case 93:
+		case 9:	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)
+	{
+		$table = strtoupper($table);
+		
+	/* // for some reason, cannot view only 1 table with odbc_columns -- bug?
+		$qid = odbc_tables($this->_connectionID);
+		$rs = new ADORecordSet_odbc($qid);
+		if (!$rs) return false;
+		while (!$rs->EOF) {
+			if ($table == strtoupper($rs->fields[2])) {
+				$q = $rs->fields[0];
+				$o = $rs->fields[1];
+				break;
+			}
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		
+		$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
+	*/
+		$qid = odbc_columns($this->_connectionID);
+		$rs = new ADORecordSet_odbc($qid);
+		if (!$rs) return false;
+		
+		$retarr = array();
+		while (!$rs->EOF) {
+			if (strtoupper($rs->fields[2]) == $table) {
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[3];
+				$fld->type = $this->ODBCTypes($rs->fields[4]);
+				$fld->max_length = $rs->fields[7];
+				$retarr[strtoupper($fld->name)] = $fld;	
+			} else if (sizeof($retarr)>0)
+				break;
+			$rs->MoveNext();
+		}
+		$rs->Close(); //-- crashes 4.03pl1 -- why?
+		
+		return $retarr;
+	}
+	
+	function &Prepare($sql)
+	{
+		if ($this->debug) {
+			print "<hr>($this->databaseType): ".htmlspecialchars($sql)."<hr>";
+		}
+		return odbc_prepare($this->_connectionID,$sql);
+	}
+
+	/* returns queryID or false */
+	function _query($sql,$inputarr=false) 
+	{
+	GLOBAL $php_errormsg;
+		$php_errormsg = '';
+		$this->_error = '';
+		
+		if ($inputarr) {
+			if (is_resource($sql)) $stmtid = $sql;
+			else $stmtid = odbc_prepare($this->_connectionID,$sql);
+			if ($stmtid == false) {
+				$this->_errorMsg = $php_errormsg;
+				return false;
+			}
+			//print_r($inputarr);
+			if (! odbc_execute($stmtid,$inputarr)) {
+				@odbc_free_result($stmtid);
+				return false;
+			}
+			
+		} else
+			$stmtid = odbc_exec($this->_connectionID,$sql);
+		
+		if ($stmtid) {
+			odbc_binmode($stmtid,$this->binmode);
+			odbc_longreadlen($stmtid,$this->maxblobsize);
+		}
+		$this->_errorMsg = $php_errormsg;
+		return $stmtid;
+	}
+
+	/*
+		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')
+	{
+		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		return @odbc_close($this->_connectionID);
+	}
+	
+        function _affectedrows()
+        {
+                return  odbc_num_rows($this->_queryID);
+        }
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_odbc extends ADORecordSet {	
+	
+	var $bind = false;
+	var $databaseType = "odbc";		
+	var $dataProvider = "odbc";
+	
+	function ADORecordSet_odbc($id)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$this->fetchMode = $ADODB_FETCH_MODE;
+		return $this->ADORecordSet($id);
+	}
+
+
+	// returns the field object
+	function &FetchField($fieldOffset = -1) {
+		
+		$off=$fieldOffset+1; // offsets begin at 1
+		
+		$o= new ADOFieldObject();
+		$o->name = @odbc_field_name($this->_queryID,$off);
+		$o->type = @odbc_field_type($this->_queryID,$off);
+		$o->max_length = @odbc_field_len($this->_queryID,$off);
+		
+		return $o;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+		
+	}
+	
+		
+	function _initrs()
+	{
+		$this->_numOfRows = @odbc_num_rows($this->_queryID);
+		$this->_numOfFields = @odbc_num_fields($this->_queryID);
+	}	
+	
+	function _seek($row)
+	{
+		return false;
+	}
+	
+	function MoveNext() 
+	{
+		if ($this->_numOfRows != 0 && !$this->EOF) {		
+			$this->_currentRow++;
+			$row = 0;
+			if (odbc_fetch_into($this->_queryID,$row,$this->fields)) return true;
+		}
+		$this->EOF = true;
+		return false;
+	}	
+	
+	function _fetch()
+	{
+		$row = 0;
+		$rez = odbc_fetch_into($this->_queryID,$row,$this->fields);
+		if ($rez && $this->fetchMode == ADODB_FETCH_ASSOC) {
+			$this->fields = $this->GetRowAssoc(false);
+		}
+		return $rez;
+	}
+	
+	function _close() {
+		
+		return @odbc_free_result($this->_queryID);		
+	}
+	
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-odbc_mssql.inc.php b/libraries/adodb/adodb-odbc_mssql.inc.php
new file mode 100755
index 00000000..80452814
--- /dev/null
+++ b/libraries/adodb/adodb-odbc_mssql.inc.php
@@ -0,0 +1,38 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://php.weblogs.com/
+  
+  MSSQL support via ODBC. Requires ODBC. Works on Windows and Unix. 
+  For Unix configuration, see http://phpbuilder.com/columns/alberto20000919.php3
+*/
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+	include(ADODB_DIR."/adodb-odbc.inc.php");
+}
+
+ 
+class  ADODB_odbc_mssql extends ADODB_odbc {	
+	var $databaseType = 'odbc_mssql';
+	var $fmtDate = "'Y-m-d'";
+	var $fmtTimeStamp = "'Y-m-d h:i:sA'";
+	var $_bindInputArray = true;
+	var $hasTop = true;		// support mssql/interbase SELECT TOP 10 * FROM TABLE
+
+} 
+ 
+class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {	
+	
+	var $databaseType = 'odbc_mssql';
+	
+	function ADORecordSet_odbc_mssql($id)
+	{
+		return $this->ADORecordSet_odbc($id);
+	}
+}
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-odbc_oracle.inc.php b/libraries/adodb/adodb-odbc_oracle.inc.php
new file mode 100755
index 00000000..5d8301f3
--- /dev/null
+++ b/libraries/adodb/adodb-odbc_oracle.inc.php
@@ -0,0 +1,104 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://php.weblogs.com/
+  
+  Oracle support via ODBC. Requires ODBC. Works on Windows. 
+*/
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+	include(ADODB_DIR."/adodb-odbc.inc.php");
+}
+
+ 
+class  ADODB_odbc_oracle extends ADODB_odbc {	
+	var $databaseType = 'odbc_oracle';
+ 	var $replaceQuote = "''"; // string to use to replace quotes
+    var $concat_operator='||';
+	var $fmtDate = "'Y-m-d 00:00:00'"; 
+	var $fmtTimeStamp = "'Y-m-d h:i:sA'";
+	var $metaTablesSQL = 'select table_name from cat';
+	var $metaColumnsSQL = "select cname,coltype,width from col where tname='%s' order by colno";
+	//var $_bindInputArray = false;
+	
+	function &MetaTables() 
+	{
+		if ($this->metaTablesSQL) {
+			$rs = $this->Execute($this->metaTablesSQL);
+			if ($rs === false) return false;
+			$arr = $rs->GetArray();
+			$arr2 = array();
+			for ($i=0; $i < sizeof($arr); $i++) {
+				$arr2[] = $arr[$i][0];
+			}
+			$rs->Close();
+			return $arr2;
+		}
+		return false;
+	}
+	
+    function &MetaColumns($table) 
+	{
+		if (!empty($this->metaColumnsSQL)) {
+		
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+			if ($rs === false) return false;
+
+			$retarr = array();
+			while (!$rs->EOF) { //print_r($rs->fields);
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$fld->type = $rs->fields[1];
+				$fld->max_length = $rs->fields[2];
+				$retarr[strtoupper($fld->name)] = $fld;	
+				
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+
+	// returns true or false
+	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+	
+		$php_errormsg = '';
+		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
+		$this->_errorMsg = $php_errormsg;
+		
+		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+	// returns true or false
+	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+		$php_errormsg = '';
+		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
+		$this->_errorMsg = $php_errormsg;
+		
+		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+} 
+ 
+class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {	
+	
+	var $databaseType = 'odbc_oracle';
+	
+	function ADORecordSet_odbc_oracle($id)
+	{
+		return $this->ADORecordSet_odbc($id);
+	}
+}
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-oracle.inc.php b/libraries/adodb/adodb-oracle.inc.php
new file mode 100755
index 00000000..5dce538e
--- /dev/null
+++ b/libraries/adodb/adodb-oracle.inc.php
@@ -0,0 +1,243 @@
+<?php
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+
+  Latest version is available at http://php.weblogs.com/
+  
+  Oracle data driver. Requires Oracle client. Works on Windows and Unix and Oracle 7 and 8.
+  
+  If you are using Oracle 8, use the oci8 driver as ErrorMsg() and ErrorNo() work properly,
+  
+*/
+
+// select table_name from cat -- MetaTables
+// 
+class ADODB_oracle extends ADOConnection {
+    var $databaseType = "oracle";
+    var $replaceQuote = "\'"; // string to use to replace quotes
+    var $concat_operator='||';
+	var $_curs;
+	var $_initdate = true; // init date to YYYY-MM-DD
+	var $metaTablesSQL = 'select table_name from cat';	
+	var $metaColumnsSQL = "select cname,coltype,width from col where tname='%s' order by colno";
+      
+	function ADODB_oracle() 
+	{
+    }
+
+	// format and return date string in database date format
+	function DBDate($d)
+	{
+		return 'TO_DATE('.date($this->fmtDate,$d).",'YYYY-MM-DD')";
+	}
+	
+	// format and return date string in database timestamp format
+	function DBTimeStamp($ts)
+	{
+		return 'TO_DATE('.date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD, HH:RR:SSAM')";
+	}
+	
+        function BeginTrans()
+	{      
+               $this->autoCommit = false;
+               ora_commitoff($this->_connectionID);
+               return true;
+	}
+	
+	function CommitTrans()
+	{
+           $ret = ora_commit($this->_connectionID);
+	       ora_commiton($this->_connectionID);
+	       return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+                $ret = ora_rollback($this->_connectionID);
+                ora_commiton($this->_connectionID);
+		return $ret;
+	}
+        
+        function SelectDB($dbName) {
+               return false;
+        }
+
+	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
+        function ErrorMsg() {
+                $this->_errorMsg = @ora_error($this->_curs);
+		if (!$this->_errorMsg) $this->_errorMsg = @ora_error($this->_connectionID);
+                return $this->_errorMsg;
+        }
+	
+	function ErrorNo() {
+                $err = @ora_errorcode($this->_curs);
+		if (!$err) return @ora_errorcode($this->_connectionID);
+        }
+	
+
+        // returns true or false
+        function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+        {
+		if ($argHostname) putenv("ORACLE_HOME=$argHostname");
+		//if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
+                $this->_connectionID = ora_logon($argUsername,$argPassword);
+                if ($this->_connectionID === false) return false;
+                if ($this->autoCommit) ora_commiton($this->_connectionID);
+		if ($this->_initdate) $this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD'");
+
+                return true;
+        }
+        // returns true or false
+        function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+        {
+		if ($argHostname) putenv("ORACLE_HOME=$argHostname");
+		//if ($argHostname) print "<p>PConnect: 1st argument should be left blank for $this->databaseType</p>";
+                $this->_connectionID = ora_plogon($argUsername,$argPassword);
+                if ($this->_connectionID === false) return false;
+                if ($this->autoCommit) ora_commiton($this->_connectionID);
+		if ($this->_initdate) $this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD'");
+
+                return true;
+        }
+
+        // returns query ID if successful, otherwise false
+        function _query($sql,$inputarr)
+        {
+                 $curs = ora_open($this->_connectionID);
+		 
+		 if ($curs === false) return false;
+		$this->_curs = $curs;
+		if (!ora_parse($curs,$sql)) return false;
+		if (ora_exec($curs)) return $curs;
+		
+		 @ora_close($curs);
+                 return false;
+        }
+
+        // returns true or false
+        function _close()
+        {
+		if (!$this->autoCommit) ora_rollback($this->_connectionID);
+                return @ora_close($this->_connectionID);
+        }
+
+
+}
+
+/*--------------------------------------------------------------------------------------
+         Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oracle extends ADORecordSet {
+
+        var $databaseType = "oracle";
+	var $bind = false;
+	
+        function ADORecordset_oracle($queryID)
+        {
+		$this->_queryID = $queryID;
+	
+		$this->_inited = true;
+		$this->fields = array();
+		if ($queryID) {
+			$this->_currentRow = 0;
+			$this->EOF = !$this->_fetch();
+			@$this->_initrs();
+		} else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+			$this->EOF = true;
+		}
+		
+ 		return $this->_queryID;
+        }
+
+
+
+        /*        Returns: an object containing field information.
+                Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+                fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+                fetchField() is retrieved.        */
+
+        function FetchField($fieldOffset = -1)
+        {
+                 $fld = new ADOFieldObject;
+                 $fld->name = ora_columnname($this->_queryID, $fieldOffset);
+                 $fld->type = ora_columntype($this->_queryID, $fieldOffset);
+                 $fld->max_length = ora_columnsize($this->_queryID, $fieldOffset);
+                 return $fld;
+        }
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+		
+	}
+	
+        function _initrs()
+        {
+                $this->_numOfRows = -1;
+                $this->_numOfFields = @ora_numcols($this->_queryID);
+        }
+
+	
+        function _seek($row)
+        {
+                return false;
+        }
+
+        function _fetch($ignore_fields=false) {
+	// should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
+                return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS);
+        }
+
+        /*        close() only needs to be called if you are worried about using too much memory while your script
+                is running. All associated result memory for the specified result identifier will automatically be freed.        */
+
+        function _close() {
+                return @ora_close($this->_queryID);
+        }
+
+        function MetaType($t,$len=-1)
+        {
+                switch (strtoupper($t)) {
+                case 'VARCHAR':
+                case 'VARCHAR2':
+                case 'CHAR':
+		case 'VARBINARY':
+		case 'BINARY':
+                        if ($len <= $this->blobSize) return 'C';
+                case 'LONG':
+		case 'LONG VARCHAR':
+		case 'CLOB':
+			return 'X';
+                case 'LONG RAW':
+		case 'LONG VARBINARY':
+		case 'BLOB':
+                        return 'B';
+
+                case 'DATE': return 'D';
+
+                //case 'T': return 'T';
+
+                case 'BIT': return 'L';
+		case 'INT': 
+		case 'SMALLINT':
+		case 'INTEGER': return 'I';
+                default: return 'N';
+                }
+        }
+}
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-pear.inc.php b/libraries/adodb/adodb-pear.inc.php
new file mode 100755
index 00000000..6d8385d9
--- /dev/null
+++ b/libraries/adodb/adodb-pear.inc.php
@@ -0,0 +1,348 @@
+<?php
+/** 
+ * @version V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+ * Whenever there is any discrepancy between the two licenses, 
+ * the BSD license will take precedence. 
+ *
+ * Set tabs to 4 for best viewing.
+ * 
+ * PEAR DB Emulation Layer for ADODB.
+ *
+ * The following code is modelled on PEAR DB code by Stig Bakken <ssb@fast.no>                                   |
+ * and Tomas V.V.Cox <cox@idecnet.com>    
+ */
+
+ /*
+ We support:
+ 
+ DB_Common
+ ---------
+ 	query - returns PEAR_Error on error
+	limitQuery - return PEAR_Error on error
+	prepare - does not return PEAR_Error on error
+	execute - does not return PEAR_Error on error
+	setFetchMode - supports ASSOC and ORDERED
+	errorNative
+	quote
+	nextID
+	free
+	
+ DB_Result
+ ---------
+ 	numRows - returns -1 if not supported
+	numCols
+	fetchInto - does not support passing of fetchmode
+	fetchRows - does not support passing of fetchmode
+	free
+ */
+ 
+define('ADODB_PEAR',dirname(__FILE__));
+require_once "PEAR.php";
+require_once ADODB_PEAR."/adodb-errorpear.inc.php";
+require_once ADODB_PEAR."/adodb.inc.php";
+
+if (!defined('DB_OK')) {
+define("DB_OK",    0);
+define("DB_ERROR",-1);
+/**
+ * This is a special constant that tells DB the user hasn't specified
+ * any particular get mode, so the default should be used.
+ */
+
+define('DB_FETCHMODE_DEFAULT', 0);
+
+/**
+ * Column data indexed by numbers, ordered from 0 and up
+ */
+
+define('DB_FETCHMODE_ORDERED', 1);
+
+/**
+ * Column data indexed by column names
+ */
+
+define('DB_FETCHMODE_ASSOC', 2);
+
+/* for compatibility */
+
+define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED);
+define('DB_GETMODE_ASSOC',   DB_FETCHMODE_ASSOC);
+
+/**
+ * these are constants for the tableInfo-function
+ * they are bitwised or'ed. so if there are more constants to be defined
+ * in the future, adjust DB_TABLEINFO_FULL accordingly
+ */
+
+define('DB_TABLEINFO_ORDER', 1);
+define('DB_TABLEINFO_ORDERTABLE', 2);
+define('DB_TABLEINFO_FULL', 3);
+}
+
+/**
+ * The main "DB" class is simply a container class with some static
+ * methods for creating DB objects as well as some utility functions
+ * common to all parts of DB.
+ *
+ */
+
+class DB
+{
+    /**
+     * Create a new DB object for the specified database type
+     *
+     * @param $type string database type, for example "mysql"
+     *
+     * @return object a newly created DB object, or a DB error code on
+     * error
+     */
+
+    function &factory($type)
+    {
+        @include_once("adodb-$type.inc.php");
+
+        $classname = "DB_${type}";
+
+        if (!class_exists($classname)) {
+            return PEAR::raiseError(null, DB_ERROR_NOT_FOUND,
+                                    null, null, null, 'DB_Error', true);
+        }
+
+        @$obj =& new $classname;
+
+        return $obj;
+    }
+
+    /**
+     * Create a new DB object and connect to the specified database
+     *
+     * @param $dsn mixed "data source name", see the DB::parseDSN
+     * method for a description of the dsn format.  Can also be
+     * specified as an array of the format returned by DB::parseDSN.
+     *
+     * @param $options mixed if boolean (or scalar), tells whether
+     * this connection should be persistent (for backends that support
+     * this).  This parameter can also be an array of options, see
+     * DB_common::setOption for more information on connection
+     * options.
+     *
+     * @return object a newly created DB connection object, or a DB
+     * error object on error
+     *
+     * @see DB::parseDSN
+     * @see DB::isError
+     */
+    function &connect($dsn, $options = false)
+    {
+        if (is_array($dsn)) {
+            $dsninfo = $dsn;
+        } else {
+            $dsninfo = DB::parseDSN($dsn);
+        }
+		switch ($dsninfo["phptype"]) {
+			case 'pgsql': 	$type = 'postgres7'; break;
+			default: 		$type = $dsninfo["phptype"]; break;
+		}
+
+        if (is_array($options) && isset($options["debug"]) &&
+            $options["debug"] >= 2) {
+            // expose php errors with sufficient debug level
+             @include_once("adodb-$type.inc.php");
+        } else {
+             @include_once("adodb-$type.inc.php");
+        }
+
+        @$obj =& NewADOConnection($type);
+
+        if (is_array($options)) {
+            $persist = !empty($options['persistent']);
+        } else {
+           	$persist = true;
+        }
+
+		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) return ADODB_PEAR_Error();
+        return $obj;
+    }
+
+    /**
+     * Return the DB API version
+     *
+     * @return int the DB API version number
+     */
+    function apiVersion()
+    {
+        return 2;
+    }
+
+    /**
+     * Tell whether a result code from a DB method is an error
+     *
+     * @param $value int result code
+     *
+     * @return bool whether $value is an error
+     */
+    function isError($value)
+    {
+        return (is_object($value) &&
+                (get_class($value) == 'db_error' ||
+                 is_subclass_of($value, 'db_error')));
+    }
+
+
+    /**
+     * Tell whether a result code from a DB method is a warning.
+     * Warnings differ from errors in that they are generated by DB,
+     * and are not fatal.
+     *
+     * @param $value mixed result value
+     *
+     * @return bool whether $value is a warning
+     */
+    function isWarning($value)
+    {
+        return is_object($value) &&
+            (get_class( $value ) == "db_warning" ||
+             is_subclass_of($value, "db_warning"));
+    }
+
+    /**
+     * Parse a data source name
+     *
+     * @param $dsn string Data Source Name to be parsed
+     *
+     * @return array an associative array with the following keys:
+     *
+     *  phptype: Database backend used in PHP (mysql, odbc etc.)
+     *  dbsyntax: Database used with regards to SQL syntax etc.
+     *  protocol: Communication protocol to use (tcp, unix etc.)
+     *  hostspec: Host specification (hostname[:port])
+     *  database: Database to use on the DBMS server
+     *  username: User name for login
+     *  password: Password for login
+     *
+     * The format of the supplied DSN is in its fullest form:
+     *
+     *  phptype(dbsyntax)://username:password@protocol+hostspec/database
+     *
+     * Most variations are allowed:
+     *
+     *  phptype://username:password@protocol+hostspec:110//usr/db_file.db
+     *  phptype://username:password@hostspec/database_name
+     *  phptype://username:password@hostspec
+     *  phptype://username@hostspec
+     *  phptype://hostspec/database
+     *  phptype://hostspec
+     *  phptype(dbsyntax)
+     *  phptype
+     *
+     * @author Tomas V.V.Cox <cox@idecnet.com>
+     */
+    function parseDSN($dsn)
+    {
+        if (is_array($dsn)) {
+            return $dsn;
+        }
+
+        $parsed = array(
+            'phptype'  => false,
+            'dbsyntax' => false,
+            'protocol' => false,
+            'hostspec' => false,
+            'database' => false,
+            'username' => false,
+            'password' => false
+        );
+
+        // Find phptype and dbsyntax
+        if (($pos = strpos($dsn, '://')) !== false) {
+            $str = substr($dsn, 0, $pos);
+            $dsn = substr($dsn, $pos + 3);
+        } else {
+            $str = $dsn;
+            $dsn = NULL;
+        }
+
+        // Get phptype and dbsyntax
+        // $str => phptype(dbsyntax)
+        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
+            $parsed['phptype'] = $arr[1];
+            $parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
+        } else {
+            $parsed['phptype'] = $str;
+            $parsed['dbsyntax'] = $str;
+        }
+
+        if (empty($dsn)) {
+            return $parsed;
+        }
+
+        // Get (if found): username and password
+        // $dsn => username:password@protocol+hostspec/database
+        if (($at = strpos($dsn,'@')) !== false) {
+            $str = substr($dsn, 0, $at);
+            $dsn = substr($dsn, $at + 1);
+            if (($pos = strpos($str, ':')) !== false) {
+                $parsed['username'] = urldecode(substr($str, 0, $pos));
+                $parsed['password'] = urldecode(substr($str, $pos + 1));
+            } else {
+                $parsed['username'] = urldecode($str);
+            }
+        }
+
+        // Find protocol and hostspec
+        // $dsn => protocol+hostspec/database
+        if (($pos=strpos($dsn, '/')) !== false) {
+            $str = substr($dsn, 0, $pos);
+            $dsn = substr($dsn, $pos + 1);
+        } else {
+            $str = $dsn;
+            $dsn = NULL;
+        }
+
+        // Get protocol + hostspec
+        // $str => protocol+hostspec
+        if (($pos=strpos($str, '+')) !== false) {
+            $parsed['protocol'] = substr($str, 0, $pos);
+            $parsed['hostspec'] = urldecode(substr($str, $pos + 1));
+        } else {
+            $parsed['hostspec'] = urldecode($str);
+        }
+
+        // Get dabase if any
+        // $dsn => database
+        if (!empty($dsn)) {
+            $parsed['database'] = $dsn;
+        }
+
+        return $parsed;
+    }
+
+    /**
+     * Load a PHP database extension if it is not loaded already.
+     *
+     * @access public
+     *
+     * @param $name the base name of the extension (without the .so or
+     * .dll suffix)
+     *
+     * @return bool true if the extension was already or successfully
+     * loaded, false if it could not be loaded
+     */
+    function assertExtension($name)
+    {
+        if (!extension_loaded($name)) {
+            $dlext = (substr(PHP_OS, 0, 3) == 'WIN') ? '.dll' : '.so';
+            @dl($name . $dlext);
+        }
+        if (!extension_loaded($name)) {
+            return false;
+        }
+        return true;
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-postgres.inc.php b/libraries/adodb/adodb-postgres.inc.php
new file mode 100755
index 00000000..4ccff2f6
--- /dev/null
+++ b/libraries/adodb/adodb-postgres.inc.php
@@ -0,0 +1,377 @@
+<?php
+/*
+ V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 8.
+  
+  Original version derived from Alberto Cerezal (acerezalp@dbnet.es) - DBNet Informatica & Comunicaciones. 
+  08 Nov 2000 jlim - Minor corrections, removing mysql stuff
+  09 Nov 2000 jlim - added insertid support suggested by "Christopher Kings-Lynne" <chriskl@familyhealth.com.au>
+                    jlim - changed concat operator to || and data types to MetaType to match documented pgsql types 
+	     	see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm  
+  22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" <raser@mail.zen.com.tw>
+  27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" <leen@wirehub.nl>
+  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk. 
+  31 Jan 2001 jlim - finally installed postgresql. testing
+  01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
+*/
+
+class ADODB_postgres extends ADOConnection{
+	var $databaseType = 'postgres';
+    var $hasInsertID = true;
+    var $_resultid = false;
+  	var $concat_operator='||';
+	var $metaTablesSQL = "select tablename from pg_tables where tablename not like 'pg_%' order by 1";
+
+/*
+# show tables and views suggestion
+"SELECT c.relname AS tablename FROM pg_class c 
+	WHERE (c.relhasrules AND (EXISTS (
+		SELECT r.rulename FROM pg_rewrite r WHERE r.ev_class = c.oid AND bpchar(r.ev_type) = '1'
+		))) OR (c.relkind = 'v') AND c.relname NOT LIKE 'pg_%' 
+UNION 
+SELECT tablename FROM pg_tables WHERE tablename NOT LIKE 'pg_%' ORDER BY 1"
+*/
+	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull FROM pg_class c, pg_attribute a,pg_type t WHERE relkind = 'r' AND c.relname='%s' AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+	// get primary key etc -- from Freek Dijkstra
+	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
+	
+	var $_hastrans = false;
+	var $hasAffectedRows = true;
+	var $hasTop = false;		
+	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
+	// below suggested by Freek Dijkstra 
+	var $true = 't';		// string that represents TRUE for a database
+	var $false = 'f';		// string that represents FALSE for a database
+	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
+	var $fmtTimeStamp = "'Y-m-d h:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
+	var $hasMoveFirst = true;
+	var $hasGenID = true;
+	var $_genIDSQL = "SELECT NEXTVAL('%s')";
+	var $_genSeqSQL = "CREATE SEQUENCE %s";
+	
+	// The last (fmtTimeStamp is not entirely correct: 
+	// PostgreSQL also has support for time zones, 
+	// and writes these time in this format: "2001-03-01 18:59:26+02". 
+	// There is no code for the "+02" time zone information, so I just left that out. 
+	// I'm not familiar enough with both ADODB as well as Postgres 
+	// to know what the concequences are. The other values are correct (wheren't in 0.94)
+	// -- Freek Dijkstra 
+
+	function ADODB_postgres() 
+	{
+	}
+	
+	// get the last id - never tested
+	function pg_insert_id($tablename,$fieldname)
+	{
+		$result=pg_exec($this->_connectionID, "SELECT last_value FROM ${tablename}_${fieldname}_seq");
+		if ($result) {
+			$arr = @pg_fetch_row($result,0);
+			pg_freeresult($result);
+			if (isset($arr[0])) return $arr[0];
+		}
+		return false;
+	}
+	
+/* Warning from http://www.php.net/manual/function.pg-getlastoid.php:
+Using a OID as a unique identifier is not generally wise. 
+Unless you are very careful, you might end up with a tuple having 
+a different OID if a database must be reloaded. */
+    function _insertid()
+    {
+	    return pg_getlastoid($this->_resultid);
+    }
+
+// I get this error with PHP before 4.0.6 - jlim
+// Warning: This compilation does not support pg_cmdtuples() in d:/inetpub/wwwroot/php/adodb/adodb-postgres.inc.php on line 44
+   function _affectedrows()
+   {
+       return pg_cmdtuples($this->_resultid);      
+   }
+
+	
+		// returns true/false
+	function BeginTrans()
+	{
+		$this->_hastrans = true;
+		return @pg_Exec($this->_connectionID, "begin");
+	}
+
+	// returns true/false. 
+	function CommitTrans()
+	{
+		$this->_hastrans = false;
+		return @pg_Exec($this->_connectionID, "commit");
+	}
+	
+	// returns true/false
+	function RollbackTrans()
+	{
+		$this->_hastrans = false;
+		return @pg_Exec($this->_connectionID, "rollback");
+	}
+
+	// converts table to lowercase 
+         function &MetaColumns($table) 
+	{
+		if (!empty($this->metaColumnsSQL)) {
+			// the following is the only difference -- we lowercase it
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtolower($table)));
+			if ($rs === false) return false;
+			
+			if (!empty($this->metaKeySQL)) {
+				// If we want the primary keys, we have to issue a separate query
+				// Of course, a modified version of the metaColumnsSQL query using a 
+				// LEFT JOIN would have been much more elegant, but postgres does 
+				// not support OUTER JOINS. So here is the clumsy way.
+				$rskey = $this->Execute(sprintf($this->metaKeySQL,strtolower($table)));
+				// fetch all result in once for performance.
+				$keys = $rskey->GetArray();
+				$rskey->Close();
+				unset($rskey);
+			}
+
+			$retarr = array();
+			while (!$rs->EOF) { //print_r($rs->fields);
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$fld->type = $rs->fields[1];
+				$fld->max_length = $rs->fields[2];
+				if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
+				if ($fld->max_length <= 0) $fld->max_length = -1;
+				
+				//Freek
+				if ($rs->fields[4] == $this->true) {
+					$fld->not_null = true;
+				}
+				
+				// Freek
+				if (is_array($keys)) {
+					reset ($keys);
+					while (list($x,$key) = each($keys)) {
+						if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true) 
+							$fld->primary_key = true;
+						if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true) 
+							$fld->unique = true; // What name is more compatible?
+					}
+				}
+				
+				$retarr[strtoupper($fld->name)] = $fld;	
+				
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+
+
+	// returns true or false
+	//
+	// examples:
+	// 	$db->Connect("host=host1 user=user1 password=secret port=4341");
+	// 	$db->Connect('host1','user1','secret');
+	function _connect($str,$user='',$pwd='',$db='')
+	{           
+		if ($user || $pwd || $db) {
+           	if ($str)  {
+			 	$host = split(":", $str);
+				if ($host[0]) $str = "host=$host[0]";
+				else $str = 'localhost';
+				if (isset($host[1])) $str .= " port=$host[1]";
+			}
+           		if ($user) $str .= " user=".$user;
+           		if ($pwd)  $str .= " password=".$pwd;
+			if ($db)   $str .= " dbname=".$db;
+		}
+		
+		//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
+		$this->_connectionID = pg_connect($str);
+		if ($this->_connectionID === false) return false;
+		$this->Execute("set datestyle='ISO'");
+                return true;
+	}
+	
+	// returns true or false
+	//
+	// examples:
+	// 	$db->PConnect("host=host1 user=user1 password=secret port=4341");
+	// 	$db->PConnect('host1','user1','secret');
+	function _pconnect($str,$user='',$pwd='',$db='')
+	{
+		if ($user || $pwd || $db) {
+           		if ($str)  {
+			 	$host = split(":", $str);
+				if ($host[0]) $str = "host=$host[0]";
+				else $str = 'localhost';
+				if (isset($host[1])) $str .= " port=$host[1]";
+			}
+           		if ($user) $str .= " user=".$user;
+           		if ($pwd)  $str .= " password=".$pwd;
+			if ($db)   $str .= " dbname=".$db;
+		}//print $str;
+		$this->_connectionID = pg_pconnect($str);
+		if ($this->_connectionID === false) return false;
+		$this->Execute("set datestyle='ISO'");
+		return true;
+	}
+
+	// returns queryID or false
+	function _query($sql,$inputarr)
+	{
+                $this->_resultid= pg_Exec($this->_connectionID,$sql);
+                return $this->_resultid;
+	}
+	
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	{
+		if (empty($this->_connectionID)) $this->_errorMsg = @pg_errormessage();
+		else $this->_errorMsg = @pg_errormessage($this->_connectionID);
+	    return $this->_errorMsg;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		if ($this->_hastrans) $this->RollbackTrans();
+		@pg_close($this->_connectionID);
+		$this->_resultid = false;
+		$this->_connectionID = false;
+		return true;
+	}
+		
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_postgres extends ADORecordSet{
+
+	var $databaseType = "postgres";
+	var $canSeek = true;
+	function ADORecordSet_postgres($queryID) {
+	global $ADODB_FETCH_MODE;
+	
+		switch ($ADODB_FETCH_MODE)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
+		default:
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:$this->fetchMode = PGSQL_BOTH; break;
+		}
+	
+		$this->ADORecordSet($queryID);
+	}
+	
+	function &GetRowAssoc($upper=true)
+	{
+		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $rs->fields;
+		return ADORecordSet::GetRowAssoc($upper);
+	}
+
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($this->_queryID):-1;
+		$this->_numOfFields = @pg_numfields($this->_queryID);
+	}
+
+	function &FetchField($fieldOffset = 0) 
+	{
+		$off=$fieldOffset; // offsets begin at 0
+		
+		$o= new ADOFieldObject();
+		$o->name = @pg_fieldname($this->_queryID,$off);
+		$o->type = @pg_fieldtype($this->_queryID,$off);
+		$o->max_length = @pg_fieldsize($this->_queryID,$off);
+		//print_r($o);		
+		//print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
+		return $o;	
+	}
+
+	function _seek($row)
+	{
+		return @pg_fetch_row($this->_queryID,$row);
+	}
+	
+	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+		if (!$this->EOF) {		
+			$this->_currentRow++;
+			$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+			if (is_array($this->fields)) return true;
+		}
+		$this->EOF = true;
+		return false;
+	}	
+	function _fetch()
+	{
+		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+		return (is_array($this->fields));
+	}
+
+	function _close() {
+		return @pg_freeresult($this->_queryID);
+	}
+
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		switch (strtoupper($t)) {
+	            case 'CHAR':
+	            case 'CHARACTER':
+	            case 'VARCHAR':
+	            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':
+	            	return 'T';
+	            
+	            case 'SMALLINT': 
+	            case 'BIGINT': 
+	            case 'INTEGER': 
+	            case 'INT8': 
+	            case 'INT4':
+	            case 'INT2':
+	            	if (isset($fieldobj) &&
+				empty($fieldobj->primary_key) && empty($fieldobj->unique)) return 'I';
+				
+	            case 'OID':
+	            case 'SERIAL':
+	            	return 'R';
+				
+	             default:
+	             	return 'N';
+	        }
+	}
+
+}
+?>
diff --git a/libraries/adodb/adodb-postgres7.inc.php b/libraries/adodb/adodb-postgres7.inc.php
new file mode 100755
index 00000000..d5293277
--- /dev/null
+++ b/libraries/adodb/adodb-postgres7.inc.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 4.
+  
+  Postgres7 support.
+  28 Feb 2001: Currently indicate that we support LIMIT
+*/
+
+include_once(ADODB_DIR."/adodb-postgres.inc.php");
+
+class ADODB_postgres7 extends ADODB_postgres {
+	var $databaseType = 'postgres7';	
+	var $hasLimit = true;	// set to true for pgsql 6.5+ only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
+
+	function ADODB_postgres7() 
+	{
+	}
+
+	// the following should be compat with postgresql 7.2, 
+	// which makes obsolete the LIMIT limit,offset syntax
+	 function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$arg3=false,$secs2cache=0) 
+	 {
+	  $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
+	  $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
+	  return $secs2cache ?
+	   $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr,$arg3)
+	  :
+	   $this->Execute($sql."$limitStr$offsetStr",$inputarr,$arg3);
+	 }
+ 
+ 	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+		if (!$this->EOF) {		
+			$this->_currentRow++;
+			$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+			if (is_array($this->fields)) return true;
+		}
+		$this->EOF = true;
+		return false;
+	}	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_postgres7 extends ADORecordSet_postgres{
+
+	var $databaseType = "postgres7";
+
+	function ADORecordSet_postgres7($queryID) 
+	{
+		$this->ADORecordSet_postgres($queryID);
+	}
+
+}
+?>
diff --git a/libraries/adodb/adodb-proxy.inc.php b/libraries/adodb/adodb-proxy.inc.php
new file mode 100755
index 00000000..02a6fca4
--- /dev/null
+++ b/libraries/adodb/adodb-proxy.inc.php
@@ -0,0 +1,28 @@
+<?php
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 4.
+  
+  Synonym for csv driver.
+*/ 
+
+if (! defined("_ADODB_PROXY_LAYER")) {
+	 define("_ADODB_PROXY_LAYER", 1 );
+	 include(ADODB_DIR."/adodb-csv.inc.php");
+	 
+	class ADODB_proxy extends ADODB_csv {
+		var $databaseType = 'proxy';
+	    
+		function ADODB_proxy() 
+		{
+		}
+	}
+	class ADORecordset_proxy extends ADORecordset_csv {
+	var $databaseType = "proxy";		
+	};
+} // define
+	
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-session.php b/libraries/adodb/adodb-session.php
new file mode 100755
index 00000000..821c1a74
--- /dev/null
+++ b/libraries/adodb/adodb-session.php
@@ -0,0 +1,228 @@
+<?php
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	Made table name configurable - by David Johnson djohnson@inpro.net
+
+  Set tabs to 4 for best viewing.
+  
+  Latest version of ADODB is available at http://php.weblogs.com/adodb
+  ======================================================================
+  
+ This file provides PHP4 session management using the ADODB database
+wrapper library.
+ 
+ Example
+ =======
+ 
+ 	GLOBAL $HTTP_SESSION_VARS;
+	include('adodb.inc.php');
+	include('adodb-session.php');
+	session_start();
+	session_register('AVAR');
+	$HTTP_SESSION_VARS['AVAR'] += 1;
+	print "<p>\$HTTP_SESSION_VARS['AVAR']={$HTTP_SESSION_VARS['AVAR']}</p>";
+
+ 
+ Installation
+ ============
+ 1. Create a new database in MySQL or Access "sessions" like
+so:
+ 
+  create table sessions (
+       SESSKEY char(32) not null,
+       EXPIRY int(11) unsigned not null,
+       DATA text not null,
+      primary key (sesskey)
+  );
+  
+  2. Then define the following parameters in this file:
+  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
+	$ADODB_SESSION_CONNECT='server to connect to';
+	$ADODB_SESSION_USER ='user';
+	$ADODB_SESSION_PWD ='password';
+	$ADODB_SESSION_DB ='database';
+	$ADODB_SESSION_TBL = 'sessions'
+	
+  3. Recommended is PHP 4.0.2 or later. There are documented
+session bugs in 
+     earlier versions of PHP.
+
+*/
+
+if (!defined('_ADODB_LAYER')) {
+	include ('adodb.inc.php');
+}
+
+
+
+if (!defined('ADODB_SESSION')) {
+
+ define('ADODB_SESSION',1);
+ 
+GLOBAL 	$ADODB_SESSION_CONNECT, 
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_LIFE,
+	$ADODB_SESS_DEBUG,
+	$ADODB_SESS_INSERT; 
+
+	//$ADODB_SESS_DEBUG = true;
+	
+	/* SET THE FOLLOWING PARAMETERS */
+if (empty($ADODB_SESSION_DRIVER)) {
+	$ADODB_SESSION_DRIVER='mysql';
+	$ADODB_SESSION_CONNECT='localhost';
+	$ADODB_SESSION_USER ='root';
+	$ADODB_SESSION_PWD ='';
+	$ADODB_SESSION_DB ='xphplens_2';
+}
+if (empty($ADODB_SESSION_TBL)){
+	$ADODB_SESSION_TBL = 'sessions';
+}
+
+$ADODB_SESS_LIFE = get_cfg_var('session.gc_maxlifetime');
+if ($ADODB_SESS_LIFE <= 1) {
+	// bug in PHP 4.0.3 pl 1  -- how about other versions?
+	//print "<h3>Session Error: PHP.INI setting <i>session.gc_maxlifetime</i>not set: $ADODB_SESS_LIFE</h3>";
+	$ADODB_SESS_LIFE=1440;
+}
+
+function adodb_sess_open($save_path, $session_name) 
+{
+GLOBAL 	$ADODB_SESSION_CONNECT, 
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_DEBUG;
+	
+	$ADODB_SESS_INSERT = false;
+	
+	if (isset($ADODB_SESS_CONN)) return true;
+	
+	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
+	if (!empty($ADODB_SESS_DEBUG)) {
+		$ADODB_SESS_CONN->debug = true;
+		print" conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ";
+	}
+	return $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+	
+}
+
+function adodb_sess_close() 
+{
+global $ADODB_SESS_CONN;
+
+	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
+	return true;
+}
+
+function adodb_sess_read($key) 
+{
+global $ADODB_SESS_CONN,$ADODB_SESS_INSERT,$ADODB_SESSION_TBL;
+	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
+	if ($rs) {
+		if ($rs->EOF) {
+			$ADODB_SESS_INSERT = true;
+			$v = '';
+		} else 
+			$v = rawurldecode($rs->fields[0]);
+			
+		$rs->Close();
+		return $v;
+	}
+	else $ADODB_SESS_INSERT = true;
+	
+	return false;
+}
+
+function adodb_sess_write($key, $val) 
+{
+	global $ADODB_SESS_INSERT,$ADODB_SESS_CONN, $ADODB_SESS_LIFE, $ADODB_SESSION_TBL;
+
+	$expiry = time() + $ADODB_SESS_LIFE;
+	
+	$val = rawurlencode($val);
+	$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry,data='$val' WHERE sesskey='$key'";
+	$rs = $ADODB_SESS_CONN->Execute($qry);
+	if ($rs) $rs->Close();
+	else print '<p>Session Update: '.$ADODB_SESS_CONN->ErrorMsg().'</p>';
+	
+	if ($ADODB_SESS_INSERT || $rs === false) {
+		$qry = "INSERT INTO $ADODB_SESSION_TBL(sesskey,expiry,data) VALUES ('$key',$expiry,'$val')";
+		$rs = $ADODB_SESS_CONN->Execute($qry);
+		if ($rs) $rs->Close();
+		else print '<p>Session Insert: '.$ADODB_SESS_CONN->ErrorMsg().'</p>';
+	}
+	// bug in access driver (could be odbc?) means that info is not commited
+	// properly unless select statement executed in Win2000
+	if ($ADODB_SESS_CONN->databaseType == 'access') $rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
+
+	return isset($rs);
+}
+
+function adodb_sess_destroy($key) 
+{
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL;
+
+	$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
+	$rs = $ADODB_SESS_CONN->Execute($qry);
+	if ($rs) $rs->Close();
+	return $rs;
+}
+
+function adodb_sess_gc($maxlifetime) {
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL;
+
+	$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
+	$rs = $ADODB_SESS_CONN->Execute($qry);
+	if ($rs) $rs->Close();
+	
+	// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
+	if (defined('ADODB_SESSION_OPTIMIZE'))
+	{
+		switch( $ADODB_SESSION_DRIVER ) {
+			case 'mysql':
+			case 'mysqlt':
+				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
+				break;
+			case 'postgresql':
+			case 'postgresql7':
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
+				break;
+		}
+	}
+	
+	return true;
+}
+
+session_module_name('user'); 
+session_set_save_handler(
+	"adodb_sess_open",
+	"adodb_sess_close",
+	"adodb_sess_read",
+	"adodb_sess_write",
+	"adodb_sess_destroy",
+	"adodb_sess_gc");
+}
+
+/*  TEST SCRIPT -- UNCOMMENT */
+
+if (0) {
+GLOBAL $HTTP_SESSION_VARS;
+
+	session_start();
+	session_register('AVAR');
+	$HTTP_SESSION_VARS['AVAR'] += 1;
+	print "<p>\$HTTP_SESSION_VARS['AVAR']={$HTTP_SESSION_VARS['AVAR']}</p>";
+}
+
+?>
diff --git a/libraries/adodb/adodb-sybase.inc.php b/libraries/adodb/adodb-sybase.inc.php
new file mode 100755
index 00000000..1bd01b00
--- /dev/null
+++ b/libraries/adodb/adodb-sybase.inc.php
@@ -0,0 +1,215 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim. 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/
+  
+  Sybase driver contributed by Toni (toni.tunkkari@finebyte.com)
+*/
+ 
+class ADODB_sybase extends ADOConnection {
+	var $databaseType = "sybase";	
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $fmtDate = "'Y-m-d H:i:s'";
+	var $fmtTimeStamp = "'Y-m-d H:i:s'";
+	var $hasInsertID = true;
+        var $hasAffectedRows = true;
+  	var $metaTablesSQL="select name from sysobjects where type='U' or type='V'";
+	var $metaColumnsSQL = "select c.name,t.name,c.length from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
+	var $concat_operator = '+'; 
+	
+	function ADODB_sybase() {			
+	}
+ 
+        // might require begintrans -- committrans
+        function _insertid()
+        {
+                $rs = $this->Execute('select @@identity');
+                if ($rs == false || $rs->EOF) return false;
+               $id = $rs->fields[0];
+               $rs->Close();
+               return $id;
+        }
+          // might require begintrans -- committrans
+        function _affectedrows()
+        {
+                $rs = $this->Execute('select @@rowcount');
+                if ($rs == false || $rs->EOF) return false;
+               $id = $rs->fields[0];
+               $rs->Close();
+               return $id;
+        }
+
+              
+        function BeginTrans()
+	{       
+               $this->Execute('BEGIN TRAN');
+               return true;
+	}
+	
+	function CommitTrans()
+	{
+                $this->Execute('COMMIT TRAN');
+                return true;
+	}
+	
+	function RollbackTrans()
+	{
+                $this->Execute('ROLLBACK TRAN');
+                return true;
+	}
+	
+        
+	function SelectDB($dbName) {
+		$this->databaseName = $dbName;
+		if ($this->_connectionID) {
+			return @sybase_select_db($dbName);		
+		}
+		else return false;	
+	}
+
+	/*	Returns: the last error message from previous database operation
+		Note: This function is NOT available for Microsoft SQL Server.	*/	
+
+	function ErrorMsg() {
+		$this->_errorMsg = sybase_get_last_message();
+		return $this->_errorMsg;
+	}
+
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr)
+	{
+		//@sybase_free_result($this->_queryID);
+		return sybase_query($sql,$this->_connectionID);
+	}
+	
+	// returns true or false
+	function _close()
+	{ 
+		return @sybase_close($this->_connectionID);
+	}
+	
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+global $ADODB_sybase_mths;
+$ADODB_sybase_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+
+class ADORecordset_sybase extends ADORecordSet {	
+
+	var $databaseType = "sybase";
+	var $canSeek = true;
+	// _mths works only in non-localised system
+	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);	
+	
+	function ADORecordset_sybase($id)
+	{
+		return $this->ADORecordSet($id);
+	}
+	
+
+	/*	Returns: an object containing field information. 
+		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+		fetchField() is retrieved.	*/
+	function &FetchField($fieldOffset = -1) 
+	{
+		if ($fieldOffset != -1) {
+			$o = @sybase_fetch_field($this->_queryID, $fieldOffset);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			$o = @sybase_fetch_field($this->_queryID);
+		}
+		// older versions of PHP did not support type, only numeric
+		if ($o && !isset($o->type)) $o->type = ($o->numeric) ? 'float' : 'varchar';
+		return $o;
+	}
+	
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @sybase_num_rows($this->_queryID):-1;
+		$this->_numOfFields = @sybase_num_fields($this->_queryID);
+	}
+	
+	function _seek($row) 
+	{
+		return @sybase_data_seek($this->_queryID, $row);
+	}		
+
+	function _fetch($ignore_fields=false) {
+		$this->fields = @sybase_fetch_array($this->_queryID);
+		return ($this->fields == true);
+	}
+	
+	/*	close() only needs to be called if you are worried about using too much memory while your script
+		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
+	function _close() {
+		return @sybase_free_result($this->_queryID);		
+	}
+	
+	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
+	function UnixDate($v)
+	{
+	global $ADODB_sybase_mths;
+		//Dec 30 2000 12:00AM
+		// added fix by Toni for day 15 Mar 2001
+		if (!ereg( "([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}))"
+			,$v, $rr)) return parent::UnixDate($v);
+			
+		if ($rr[3] <= 1970) return 0;
+		
+		$themth = substr(strtoupper($rr[1]),0,3);
+		$themth = $ADODB_sybase_mths[$themth];
+		if ($themth <= 0) return false;
+		// h-m-s-MM-DD-YY
+		return  mktime(0,0,0,$themth,$rr[2],$rr[3]);
+	}
+	
+	function UnixTimeStamp($v)
+	{
+	global $ADODB_sybase_mths;
+		//Dec 30 2000 12:00AM
+		if (!ereg( "([A-Za-z]{3})[-/\. ]([0-9]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})"
+			,$v, $rr)) return parent::UnixTimeStamp($v);
+		if ($rr[3] <= 1970) return 0;
+		
+		$themth = substr(strtoupper($rr[1]),0,3);
+		$themth = $ADODB_sybase_mths[$themth];
+		if ($themth <= 0) return false;
+		
+		if (strtoupper($rr[6]) == 'P') {
+			if ($rr[4]<12) $rr[4] += 12;
+		} else {
+			if ($rr[4]==12) $rr[4] = 0;
+		}
+		// h-m-s-MM-DD-YY
+		return  mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb-vfp.inc.php b/libraries/adodb/adodb-vfp.inc.php
new file mode 100755
index 00000000..dcde32cf
--- /dev/null
+++ b/libraries/adodb/adodb-vfp.inc.php
@@ -0,0 +1,79 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://php.weblogs.com/
+  
+  Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
+*/
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+	include(ADODB_DIR."/adodb-odbc.inc.php");
+}
+if (!defined('ADODB_VFP')){
+define('ADODB_VFP',1);
+class ADODB_vfp extends ADODB_odbc {
+	var $databaseType = "vfp";	
+	var $fmtDate = "{^Y-m-d}";
+	var $fmtTimeStamp = "{^Y-m-d, h:i:sA}";
+	var $replaceQuote = "'+chr(39)+'" ;
+	var $true = '.T.';
+	var $false = '.F.';
+	var $hasTop = true;		// support mssql SELECT TOP 10 * FROM TABLE
+
+	function BeginTrans() { return false;}
+
+	// quote string to be sent back to database
+	function qstr($s,$nofixquotes=false)
+	{
+		if (!$nofixquotes) return  "'".str_replace("\r\n","'+chr(13)+'",str_replace("'",$this->replaceQuote,$s))."'";
+		return "'".$s."'";
+	}
+	
+	// TOP requires ORDER BY for VFP
+	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$arg3=false,$secs2cache=0)
+	{
+		if (!preg_match('/ORDER[ \t\r\n]+BY/i',$sql)) $sql .= ' ORDER BY 1';
+		return ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$arg3,$secs2cache);
+	}
+	
+};
+ 
+
+class  ADORecordSet_vfp extends ADORecordSet_odbc {	
+	
+	var $databaseType = "vfp";		
+
+	
+	function ADORecordSet_vfp($id)
+	{
+		return $this->ADORecordSet_odbc($id);
+	}
+
+	function MetaType($t,$len=-1)
+	{
+		switch (strtoupper($t)) {
+		case 'C':
+			if ($len <= $this->blobSize) return 'C';
+		case 'M':
+			return 'X';
+			 
+		case 'D': return 'D';
+		
+		case 'T': return 'T';
+		
+		case 'L': return 'L';
+		
+		case 'I': return 'I';
+		
+		default: return 'N';
+		}
+	}
+}
+
+} //define
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb.gif b/libraries/adodb/adodb.gif
new file mode 100755
index 0000000000000000000000000000000000000000..47b6f2d42a1b530ce904b99a2b932fdbd6f5c27b
GIT binary patch
literal 1089
zcmb7<{ZrC+0DwP$3Wz4Y<_juc6{5tq^p-kn%3Qv$J5D{dW|GM8B}HfR<!&Cn?0l`5
zQsz5~pi#c0Y3YR$V%j7jsWo5bvDJL{#Fsp47Mp*<p5LFl=Lrfq@9jg20rucE_zzDy
zy-ls&M59yXa=EiJySG;f03#sax~=Vx<>imHS}m1Y3jkHAd|OoX(8s52a8SkLJ=19R
z8H_pr;>^u6uvjJlp_!SY>S}RVSPdG@Adw1UVj5(!1rLv6ESBZ#TMht4BAHE16+%#c
zYwJXQe$TOE46%5TN^P{V$^yXeGYo!|^FM(;=;)dOS3o}Uj-G&?R&u@cK|om`uRZH|
zns1A;(<{!MK*n7ls%On0b#HFCYlC8C&nhzMJMSuhfYEZo51te#w*Jww3k%R_2xo3i
zLE)pxWQfDD)7MA+Qp>I567aRPc#^Tby|rC)2V}!-f(YEsP6PsJXo#}G5~03+<OmXu
z!JHT!mrhJtTZ|)(CMS;J<??9^YQ#yZnjbYEaHvF!<pvX`kV>J@8@HZ-JIzW>i3=~J
zZ;(6t^NWTFx-nJGL|8048xwq}Z=6unTa3iYi*xZMFq-~Q)YPM!_Wf~&{{AZoG+qx@
zYTzwrk|9s56n8Mpyjt&<Jc13zLonHSZQ9&v*%W&^9${b^xHe~@rajetAJ=#I+GA-j
z3uAYXQXz+(<6)jqoQF4=GneR<c}*;^1UHnse>+dw-u!~=8WA4o-!B{ydl4+Z5qWjF
zi7`5ei+Fr@Sjxd#${)ltV`G<}9{$R|lc$*#$QN7^)c34cFK0m)Yvd8G5q)hw`o*6H
z$h3zl9I@&|^n;#PIzM}a4!!77-w>oajxOia&r09Df*dipUHD+-aZ5%4>w{txQ}I(y
zfz6&<{q{_yAm$VMZ`t$Xmci@$3$T~oMoRA4kB4dLia!TAQR8ZYDx>NwPmQ?p@`vhl
zIGqg;7m{w7W*Xa$wIEg=U(@ogwg}$G>#39_HQBq3OBmGf-M2QmnoAuEex{QuTplDM
zgh!6Ebl<>c&^*{pOo;MI%&BHNzsS=SP>Rh8QB6US(L)aK+rKALZrc@djJ|@^2TATE
zp8k5tjow_&s8h9vu<O$7B*Oai=GYE5TJ^Q%`izf#9W9v_yB!T|_}uqRNe&gkdHMS%
zms>ORtXKG4X)IH4i;_<g)}9+?-e{V(y322*`X&oG-LcGep^1p8TjDX(Da!mURMf>1
zT8V^w;@YX!79u3%kC@D@@}KRLuXl^>D%W6(_$YtaUnJ+0zUt4b_giO075AHDCRi6e
z+iW~%V7g*0esfr`le{X(Va!WVj%r$&TiLsNTO)`2>szA$N!GOO5hYTnjNPu08l2hC
zjA4Vw9>Ku_N($=aL81i}m$R`wfiETROghzsy8#y#3pGx7w6QbgUK+lI3IO2Ce*p+p
B)@%R(

literal 0
HcmV?d00001

diff --git a/libraries/adodb/adodb.inc.php b/libraries/adodb/adodb.inc.php
new file mode 100755
index 00000000..299a4f9f
--- /dev/null
+++ b/libraries/adodb/adodb.inc.php
@@ -0,0 +1,2332 @@
+<?php 
+
+/** 
+ * @version V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+ *
+ * Set tabs to 4 for best viewing.
+ * 
+ * Latest version is available at http://php.weblogs.com
+ * 
+ * This is the main include file for ADODB.
+ * It has all the generic functionality of ADODB. 
+ * Database specific drivers are stored in the adodb-*.inc.php files.
+ *
+ * Requires PHP4.01pl2 or later because it uses include_once
+*/
+
+ if (!defined('_ADODB_LAYER')) {
+ 	define('_ADODB_LAYER',1);
+	
+	define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;</p>');
+	
+	define('ADODB_FETCH_DEFAULT',0);
+	define('ADODB_FETCH_NUM',1);
+	define('ADODB_FETCH_ASSOC',2);
+	define('ADODB_FETCH_BOTH',3);
+	
+	GLOBAL 
+		$ADODB_vers, 		// database version
+		$ADODB_Database, 	// last database driver used
+		$ADODB_COUNTRECS,	// count number of records returned - slows down query
+		$ADODB_CACHE_DIR,	// directory to cache recordsets
+	 	$ADODB_FETCH_MODE;	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
+	/** 
+	 * SET THE VALUE BELOW TO THE DIRECTORY WHERE THIS FILE RESIDES
+	 * ADODB_RootPath has been renamed ADODB_DIR 
+	 */
+	if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__));
+	
+	if (!isset($ADODB_CACHE_DIR)) $ADODB_CACHE_DIR = '/tmp';
+	else if (strpos($ADODB_CACHE_DIR,':/') !== false) die("Illegal \$ADODB_CACHE_DIR");
+	
+	//==============================================================================================	
+	// CHANGE NOTHING BELOW UNLESS YOU ARE CODING
+	//==============================================================================================	
+
+	// using PHPCONFIG protocol overrides ADODB_DIR
+	//if (isset($PHPCONFIG_DIR)) $ADODB_DIR=$PHPCONFIG_DIR.'/../adodb';
+
+	srand(((double)microtime())*1000000);
+	/**
+	 * Name of last database driver loaded into memory.
+	 */
+	$ADODB_Database = '';
+	
+	/**
+	 * ADODB version as a string.
+	 */
+	$ADODB_vers = 'V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+
+	/**
+	 * Determines whether recordset->RecordCount() is used. 
+	 * Set to false for highest performance -- RecordCount() will always return -1 then.
+	 */
+	$ADODB_COUNTRECS = true; 
+
+	/**
+	 * Helper class for FetchFields -- holds info on a column
+	 */
+	class ADOFieldObject { 
+		var $name = '';
+		var $max_length=0;
+		var $type="";
+	}
+
+	
+	/**
+	 * Connection object. For connecting to databases, and executing queries.
+	 */ 
+	class ADOConnection {
+	/*
+	 * 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 $password = ''; 	// Password for the username
+	var $debug = false; 	// if set to true will output sql statements
+	var $maxblobsize = 8000; // maximum size of blobs or large text fields -- some databases die otherwise like foxpro
+	var $concat_operator = '+'; 	// default concat operator -- change to || for Oracle/Interbase	
+	var $fmtDate = "'Y-m-d'"; 	// used by DBDate() as the default date format used by the database
+	var $fmtTimeStamp = "'Y-m-d, h:i:s A'"; // used by DBTimeStamp as the default timestamp fmt.
+	var $true = '1'; 		// string that represents TRUE for a database
+	var $false = '0'; 		// string that represents FALSE for a database
+	var $replaceQuote = "\\'"; 	// string to use to replace quotes
+    var $hasInsertID = false; 	// supports autoincrement ID?
+    var $hasAffectedRows = false; 	// supports affected rows for update/delete?
+    var $autoCommit = true; 
+	var $charSet=false; 		// character set to use - only for interbase
+	var $metaTablesSQL = '';
+	var $hasTop = false;		// support mssql/access SELECT TOP 10 * FROM TABLE
+	var $hasLimit = false;		// support pgsql/mysql SELECT * FROM TABLE LIMIT 10
+	var $readOnly = false; 		// this is a readonly database ?
+	var $hasMoveFirst = false;
+	var $hasGenID = false; // can generate sequences using GenID();
+	var $genID = false; // sequence id used by GenID();
+	var $raiseErrorFn = false;
+	
+	/*
+	 * PRIVATE VARS
+	 */
+	var $_connectionID	= false;	// The returned link identifier whenever a successful database connection is made.	*/
+		
+	var $_errorMsg = '';		// A variable which was used to keep the returned last error message.  The value will
+					//then returned by the errorMsg() function	
+						
+	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.
+	
+	/**
+	 * Constructor
+	 */
+	function ADOConnection()			
+	{
+		die('Virtual Class -- cannot instantiate');
+	}
+	
+	/**
+	 * Connect to database
+	 *
+	 * @param [argHostname]		Host to connect to
+	 * @param [argUsername]		Userid to login
+	 * @param [argPassword]		Associated password
+	 * @param [argDatabaseName]	database
+	 *
+	 * @return true or false
+	 */	  
+	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") {
+		if ($argHostname != "") $this->host = $argHostname;
+		if ($argUsername != "") $this->user = $argUsername;
+		if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
+		
+		if ($this->_connect($this->host, $this->user, $this->password, $this->database))
+			return true;
+			
+		if ($fn = $this->raiseErrorFn) {
+			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$this->ErrorMsg(),$this->host,$this->database);
+		}
+		if ($this->debug) print $this->host.': '.$this->ErrorMsg().'<br>';
+		
+		return false;
+	}	
+	
+	/**
+	 * Establish persistent connect to database
+	 *
+	 * @param [argHostname]		Host to connect to
+	 * @param [argUsername]		Userid to login
+	 * @param [argPassword]		Associated password
+	 * @param [argDatabaseName]	database
+	 *
+	 * @return return true or false
+	 */	
+	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
+	{
+		if ($argHostname != "") $this->host = $argHostname;
+		if ($argUsername != "") $this->user = $argUsername;
+		if ($argPassword != "") $this->password = $argPassword;
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;			
+			
+		if ($this->_pconnect($this->host, $this->user, $this->password, $this->database)) {
+			$this->_isPersistentConnection = true;	
+			return true;			
+		}
+		if ($fn = $this->raiseErrorFn) {
+			$fn($this->databaseType,'PCONNECT', $this->ErrorNo(),$this->ErrorMsg(),$this->host,$this->database);
+		}
+		if ($this->debug) print $this->host.': '.$this->ErrorMsg().'<br>';
+		
+		return false;
+	}
+	
+	/**
+	 * Should prepare the sql statement and return the stmt resource.
+	 * For databases that do not support this, we return the $sql. To ensure
+	 * compatibility with databases that do not support prepare:
+	 *
+	 *   $stmt = $db->Prepare("insert into table (id, name) values (?,?)");
+	 *   $db->Execute($stmt,array(1,'Jill')) or die('insert failed');
+	 *   $db->Execute($stmt,array(2,'Joe')) or die('insert failed');
+	 *
+	 * @param sql	SQL to send to database
+	 *
+	 * @return return TRUE or FALSE, or the $sql.
+	 *
+	 */	
+	function Prepare($sql)
+	{
+		return $sql;
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally. 
+	*/
+	function Quote($s)
+	{
+		return $this->qstr($s);
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally. 
+	*/
+	function ErrorNative()
+    {
+        return $this->ErrorNo();
+    }
+
+   /**
+	* PEAR DB Compat - do not use internally. 
+	*/
+    function nextId($seq_name)
+	{
+		return $this->GenID($seq_name);
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally. 
+	*
+	* Appears that the fetch modes for NUMERIC and ASSOC are identical!
+	*/
+	function SetFetchMode($mode)
+	{
+	global $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = $mode;
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally. 
+	*/
+	function &Query($sql, $inputarr=false)
+	{
+		$rs = &$this->Execute($sql, $inputarr);
+		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+		return $rs;
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally
+	*/
+	function &LimitQuery($sql, $offset, $count)
+	{
+		$rs = &$this->SelectLimit($sql, $count, $offset); // swap 
+		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+		return $rs;
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally
+	*/
+	function Free()
+	{
+		return $this->Close();
+	}
+	
+	/**
+	 * Execute SQL 
+	 *
+	 * @param sql		SQL statement to execute
+	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
+	 * @param [arg3]	reserved for john lim for future use
+	 * @return 		RecordSet or false
+	 */
+	function &Execute($sql,$inputarr=false,$arg3=false) 
+	{
+		if (!$this->_bindInputArray && $inputarr) {
+			$sqlarr = explode('?',$sql);
+			$sql = '';
+			$i = 0;
+			foreach($inputarr as $v) {
+
+				$sql .= $sqlarr[$i];
+				// from Ron Baldwin <ron.baldwin@sourceprose.com>
+				// Only quote string types	
+				if (gettype($v) == 'string')
+					$sql .= "'".$v."'";
+				else if ($v === null)
+					$sql .= 'NULL';
+				else
+					$sql .= $v;
+				$i += 1;
+	
+			}
+			$sql .= $sqlarr[$i];
+			if ($i+1 != sizeof($sqlarr))	print "Input Array does not match ?: ".htmlspecialchars($sql);
+			$inputarr = false;
+		}
+		
+		if ($this->debug) {
+			$ss = '';
+			if ($inputarr) {
+				//$inputarr[7] = '2003-01-01';
+				foreach ($inputarr as $kk => $vv)  {
+					if (is_string($vv) && strlen($vv)>100) $vv = substr($vv,0,64).'...';
+					$ss .= "($kk=>'$vv') ";
+				}
+				$ss = "[ $ss ]";
+			}
+			print "<hr>($this->databaseType): ".htmlspecialchars($sql)." &nbsp; <code>$ss</code><hr>";
+			$this->_queryID = $this->_query($sql,$inputarr,$arg3);
+			if ($this->databaseType == 'mssql') { // ErrorNo is a slow function call in mssql
+				if($this->ErrorMsg()) {
+					$err = $this->ErrorNo();
+					if ($err) print $err.': '.$this->ErrorMsg().'<br>';
+				}
+			} else 
+				if ($this->ErrorNo()) print $this->ErrorNo().': '.$this->ErrorMsg().'<br>';
+				
+		} else 
+			$this->_queryID =@$this->_query($sql,$inputarr,$arg3);
+		
+		if ($this->_queryID === false) {
+			if ($fn = $this->raiseErrorFn) {
+				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr);
+			}
+			return false;
+		} else if ($this->_queryID === true){
+			$rs = new ADORecordSet_empty();
+			return $rs;
+		}
+		$rsclass = "ADORecordSet_".$this->databaseType;
+		
+		$rs = new $rsclass($this->_queryID); // &new not supported by older PHP versions
+		$rs->Init();
+		//$this->_insertQuery(&$rs); PHP4 handles closing automatically
+
+		if (is_string($sql)) $rs->sql = $sql;
+		return $rs;
+	}
+	
+	/**
+	 * Generates a sequence id and stores it in $this->genID;
+	 * GenID is only available if $this->hasGenID = true;
+	 *
+	 * @seqname		name of sequence to use
+	 * 
+	 * @return		false if not supported, otherwise a sequence id
+	 */
+	
+	function GenID($seqname='adodbseq')
+	{
+		if (!$this->hasGenID) return false;
+		
+		$getnext = sprintf($this->_genIDSQL,$seqname);
+		$rs = @$this->Execute($getnext);
+		if (!$rs) {
+			$u = strtoupper($seqname);
+			$createseq = 
+			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
+			$rs = $this->Execute($getnext);
+		}
+		if ($rs && !$rs->EOF) $this->genID = (integer) $rs->fields[0];
+		else $this->genID = false;
+		
+		if ($rs) $rs->Close();
+		
+		return $this->genID;
+	}
+	
+	
+	/**
+	 * @return  the last inserted ID. Not all databases support this.
+	 */ 
+        function Insert_ID()
+        {
+                if ($this->hasInsertID) return $this->_insertid();
+                if ($this->debug) print '<p>Insert_ID error</p>';
+                return false;
+        }
+	
+        /**
+	 * @return  # rows affected by UPDATE/DELETE
+	 */ 
+        function Affected_Rows()
+        {
+                if ($this->hasAffectedRows) {
+                       $val = $this->_affectedrows();
+                       return ($val < 0) ? false : $val;
+                }
+                        
+                if ($this->debug) print '<p>Affected_Rows error</p>';
+                return false;
+        }
+	
+        /**
+	 * @return  the last error message
+	 */
+	function ErrorMsg()
+	{
+		return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
+	}
+	
+	
+	/**
+	 * @return the last error number. Normally 0 means no error.
+	 */
+	function ErrorNo() 
+	{
+		return ($this->_errorMsg) ? -1 : 0;
+	}
+	
+	/**
+	 * @returns an array with the primary key columns in it.
+	 */
+	function MetaPrimaryKeys($table)
+	{
+		return false;
+	}
+	
+	/**
+	 * Choose a database to connect to. Many databases do not support this.
+	 *
+	 * @param dbName 	is the name of the database to select
+	 * @return 		true or false
+	 */
+	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, and FIRST_ROWS CBO hint for Oracle 8+
+	* 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 [rows]		is the number of rows to get
+	* @param [inputarr]	array of bind variables
+	* @param [arg3]		is a private parameter only used by jlim
+	* @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,$arg3=false,$secs2cache=0)
+	{
+		if ($this->hasTop && $nrows > 0 && $offset <= 0) {
+		// suggested by Reinhard Balling. Access requires top after distinct 
+			$sql = eregi_replace(
+			'(^select[\\t\\n ]*(distinct|distinctrow )?)','\\1 top '.$nrows.' ',$sql);
+			if ($secs2cache>0) return $this->CacheExecute($secs2cache, $sql,$inputarr,$arg3);
+			else return $this->Execute($sql,$inputarr,$arg3);
+		} else if ($this->dataProvider == 'oci8') {
+			$sql = eregi_replace('^select','SELECT /*+FIRST_ROWS*/',$sql);
+			if ($offset <= 0) {
+				/*if (preg_match('/\bwhere\b/i',$sql)) {
+					$sql = preg_replace('/where/i',"where rownum <= $nrows and ",$sql);
+				} else*/ 
+				// doesn't work becoz sort is after rownum is executed - also preg_replace
+				// is a heuristic that might not work if there is an or
+					$sql = "select * from ($sql) where rownum <= :lens_sellimit_rownum";
+					$inputarr['lens_sellimit_rownum'] = $nrows;
+			}/* else {
+				# THIS DOES NOT WORK -- WHY?
+					$sql = "select * from ($sql) where rownum between :lens_sellimit_rownum1 and :lens_sellimit_rownum2";
+					$end = $offset+$nrows;
+					if ($offset < $end) {
+						$inputarr['lens_sellimit_rownum1'] = $offset;
+						$inputarr['lens_sellimit_rownum2'] = $end;
+					} else {
+						$inputarr['lens_sellimit_rownum1'] = $end;
+						$inputarr['lens_sellimit_rownum2'] = $offset;
+					}
+					$offset = -1;
+					$this->debug=true;
+			}*/
+		}
+		if ($secs2cache>0) $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr,$arg3);
+		else $rs = &$this->Execute($sql,$inputarr,$arg3);
+		if ($rs && !$rs->EOF) {
+			return $this->_rs2rs($rs,$nrows,$offset);
+		}
+		//print_r($rs);
+		return $rs;
+	}
+	
+	/**
+	* Convert recordset to an array recordset
+	* input recordset's cursor should be at beginning, and
+	* old $rs will be closed.
+	*
+	* @param rs			the recordset to copy
+	* @param [nrows]  	number of rows to retrieve (optional)
+	* @param [offset] 	offset by number of rows (optional)
+	* @return 			the new recordset
+	*/
+	function &_rs2rs(&$rs,$nrows=-1,$offset=-1)
+	{
+		
+		$arr = &$rs->GetArrayLimit($nrows,$offset);
+		$flds = array();
+		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++)
+			$flds[] = &$rs->FetchField($i);
+		
+		$rs->Close();
+		$rs2 = new ADORecordSet_array();
+			
+		$rs2->InitArrayFields($arr,$flds);
+		return $rs2;
+	}
+	
+	/**
+	* Return first element of first row of sql statement. Recordset is disposed
+	* for you.
+	*
+	* @param sql			SQL statement
+	* @param [inputarr]		input bind array
+	*/
+	function GetOne($sql,$inputarr=false)
+	{
+		$rs = $this->Execute($sql,$inputarr);
+		if ($rs && !$rs->EOF) {
+			$rs->Close();
+			return $rs->fields[0];
+		}
+		return false;
+	}
+	
+	/**
+	* Return all rows. Compat with PEAR DB
+	*
+	* @param sql			SQL statement
+	* @param [inputarr]		input bind array
+	*/
+	function GetAll($sql,$inputarr=false)
+	{
+		$rs = $this->Execute($sql,$inputarr);
+		if (!$rs) 
+			if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+			else return false;
+		return $rs->GetArray();
+	}
+	
+	/**
+	* Return one row of sql statement. Recordset is disposed for you.
+	*
+	* @param sql			SQL statement
+	* @param [inputarr]		input bind array
+	*/
+	function GetRow($sql,$inputarr=false)
+	{
+		$rs = $this->Execute($sql,$inputarr);
+		if ($rs && !$rs->EOF) {
+			$rs->Close();
+			return $rs->fields;
+		}
+		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. 
+	*  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
+	* @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 [arg3]		is a private parameter only used by jlim
+	* @return		the recordset ($rs->databaseType == 'array')
+ 	*/
+	function &CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false, $arg3=false)
+    	{
+		return $this->SelectLimit($sql,$nrows,$offset,$inputarr,$arg3,$secs2cache);
+	}
+	
+	function CacheFlush($sql)
+	{
+		$f = $this->_gencachename($sql);
+		adodb_write_file($f,'');
+		@unlink($f);
+	}
+	
+	function _gencachename($sql)
+	{
+	global $ADODB_CACHE_DIR;
+	
+		return $ADODB_CACHE_DIR.'/adodb_'.md5($sql.$this->databaseType.$this->database.$this->user).'.cache';
+	}
+	/**
+	 * Execute SQL, caching recordsets.
+	 *
+	 * @param secs2cache	seconds to cache data, set to 0 to force query
+	 * @param sql		SQL statement to execute
+	 * @param [inputarr]	holds the input data  to bind to
+	 * @param [arg3]	reserved for john lim for future use
+	 * @return 		RecordSet or false
+	 */
+	function &CacheExecute($secs2cache,$sql,$inputarr=false,$arg3=false)
+	{
+		// cannot cache if $inputarr set
+		if ($inputarr) return $this->Execute($sql, $inputarr, $arg3); 
+		
+		$md5file = $this->_gencachename($sql);
+		$err = '';
+		
+		if ($secs2cache > 0)$rs = &csv2rs($md5file,$err,$secs2cache);
+		else {
+			$err='Timeout 1';
+			$rs = false;
+		}
+		
+		if (!$rs) {
+			if ($this->debug) print " $md5file cache failure: $err<br>";
+			$rs = &$this->Execute($sql,$inputarr,$arg3);
+			if ($rs) {
+				$eof = $rs->EOF;
+				$rs = &$this->_rs2rs($rs);
+				$txt = &rs2csv($rs,false,$sql);
+				
+				if (!adodb_write_file($md5file,$txt,$this->debug) && $this->debug) print ' Cache write error<br>';
+				if ($rs->EOF && !$eof) {
+					$rs = &csv2rs($md5file,$err);
+				}
+			} else
+				@unlink($md5file);
+		}else if ($this->debug){ 
+			$ttl = $rs->timeCreated + $secs2cache - time();
+			print " $md5file success ttl=$ttl<br>";
+		}
+		return $rs;
+	}
+	
+    /**
+	 * 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.
+	 *
+	 * "Jonathan Younger" <jyounger@unilab.com>
+  	 */
+	function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false)
+	{
+		if (!$rs) {
+			printf(ADODB_BAD_RS,'GetUpdateSQL');
+			return false;
+		}
+	
+		// Get the table name from the existing query.
+		eregi("FROM ([]0-9a-z_\[-]*)", $rs->sql, $tableName);
+
+		// Get the full where clause excluding the word "WHERE" from
+		// the existing query.
+		eregi("WHERE ([]0-9a-z=' \(\)\[\t\r\n_-]*)", $rs->sql, $whereClause);
+
+		// updateSQL will contain the full update query when all
+		// processing has completed.
+		$updateSQL = "UPDATE " . $tableName[1] . " SET ";
+		
+		// Loop through all of the fields in the recordset
+		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
+		
+			// Get the field from the recordset
+			$field = $rs->FetchField($i);
+
+			// If the recordset field is one
+			// of the fields passed in then process.
+			if (isset($arrFields[$field->name])) {
+
+				// 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 ($forceUpdate || strcmp($rs->fields[$i], $arrFields[$field->name])) {
+					// Set the counter for the number of fields that will be updated.
+					$fieldUpdatedCount++;
+
+					// Based on the datatype of the field
+					// Format the value properly for the database
+					switch($rs->MetaType($field->type)) {
+						case "C":
+						case "X":
+							$updateSQL .= $field->name . " = " . $this->qstr($arrFields[$field->name]) . ", ";
+							break;
+						case "D":
+							$updateSQL .= $field->name . " = " . $this->DBDate($arrFields[$field->name]) . ", ";
+       						break;
+						case "T":
+							$updateSQL .= $field->name . " = " . $this->DBTimeStamp($arrFields[$field->name]) . ", ";
+							break;
+						default:
+							$updateSQL .= $field->name . " = " . $arrFields[$field->name] . ", ";
+							break;
+					};
+				};
+    		};
+		};
+
+		// If there were any modified fields then build the rest of the update query.
+		if ($fieldUpdatedCount > 0 || $forceUpdate) {
+			// Strip off the comma and space on the end of the update query.
+			$updateSQL = substr($updateSQL, 0, -2);
+
+			// If the recordset has a where clause then use that same where clause
+			// for the update.
+			if ($whereClause[1]) $updateSQL .= " WHERE " . $whereClause[1];
+
+			return $updateSQL;
+		} else {
+			return false;
+   		};
+	}
+
+
+	/**
+	 * Generates an Insert 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.
+  	 */
+	function GetInsertSQL(&$rs, $arrFields)
+	{
+		if (!$rs) {
+			printf(ADODB_BAD_RS,'GetInsertSQL');
+			return false;
+		}
+		// Get the table name from the existing query.
+		eregi("FROM ([0-9a-z_-]*)", $rs->sql, $tableName);
+
+		// Loop through all of the fields in the recordset
+		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
+
+			// Get the field from the recordset
+			$field = $rs->FetchField($i);
+			// If the recordset field is one
+			// of the fields passed in then process.
+			if (isset($arrFields[$field->name])) {
+	
+				// Set the counter for the number of fields that will be inserted.
+				$fieldInsertedCount++;
+
+				// Get the name of the fields to insert
+				$fields .= $field->name . ", ";
+
+				// Based on the datatype of the field
+				// Format the value properly for the database
+				switch($rs->MetaType($field->type)) {
+					case "C":
+					case "X":
+						$values .= $this->qstr($arrFields[$field->name]) . ", ";
+						break;
+					case "D":
+						$values .= $this->DBDate($arrFields[$field->name]) . ", ";
+						break;
+					case "T":
+						$values .= $this->DBTimeStamp($arrFields[$field->name]) . ", ";
+						break;
+					default:
+						$values .= $arrFields[$field->name] . ", ";
+						break;
+				};
+    		};
+      	};
+
+		// If there were any inserted fields then build the rest of the insert query.
+		if ($fieldInsertedCount > 0) {
+
+			// Strip off the comma and space on the end of both the fields
+			// and their values.
+			$fields = substr($fields, 0, -2);
+			$values = substr($values, 0, -2);
+
+			// Append the fields and their values to the insert query.
+			$insertSQL = "INSERT INTO " . $tableName[1] . " ( $fields ) VALUES ( $values )";
+
+			return $insertSQL;
+
+		} else {
+			return false;
+   		};
+	}
+
+	/**
+	* Usage:
+	*	UpdateBlob('TABLE', 'COLUMN', $var, 'ID=1', 'BLOB');
+	*	
+	*	$blobtype supports 'BLOB' and 'CLOB'
+	*
+	*	$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')
+	{
+		$sql = "UPDATE $table SET $column=".$this->qstr($val)." where $where";
+		$rs = $this->Execute($sql);
+		
+		$rez = !empty($rs);
+		if ($rez) $rs->Close();
+		return $rez;
+	}
+	
+	/**
+	* Usage:
+	*	UpdateBlob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
+	*
+	*	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
+	*	$conn->UpdateClob('clobtable','clobcol',$clob,'id=1');
+	*/
+	function UpdateClob($table,$column,$val,$where)
+	{
+		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
+	}
+	
+	
+	function BlankRecordSet($id=false)
+	{
+		$rsclass = "ADORecordSet_".$this->databaseType;
+		return new $rsclass($id);
+	}
+	
+ 	
+	/**
+	 * Close Connection
+	 */
+	function Close() 
+	{
+		return $this->_close();
+		
+		// "Simon Lee" <simon@mediaroad.com> reports that persistent connections need 
+		// to be closed too!
+		//if ($this->_isPersistentConnection != true) return $this->_close();
+		//else return true;	
+	}
+	
+	/**
+	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
+	 *
+	 * @return true if succeeded or false if database does not support transactions
+	 */
+	function BeginTrans() {return false;}
+	
+	/**
+	 * If database does not support transactions, always return true as data always commited
+	 *
+	 * @return true/false.
+	 */
+	function CommitTrans() 
+	{ return true;}
+	
+	/**
+	 * If database does not support transactions, rollbacks always fail, so return false
+	 *
+	 * @return true/false.
+	 */
+	function RollbackTrans() 
+	{ return false;}
+
+
+        /**
+	 * return the databases that the driver can connect to. 
+	 * Some databases will return an empty array.
+	 *
+	 * @return an array of database names.
+	 */
+        function &MetaDatabases() 
+		{return false;}
+        
+	/**
+	 * @return  array of tables for current database.
+	 */ 
+    function &MetaTables() 
+	{
+		if ($this->metaTablesSQL) {
+			$rs = $this->Execute($this->metaTablesSQL);
+			if ($rs === false) return false;
+			$arr = $rs->GetArray();
+			$arr2 = array();
+			for ($i=0; $i < sizeof($arr); $i++) {
+				$arr2[] = $arr[$i][0];
+			}
+			$rs->Close();
+			return $arr2;
+		}
+		return false;
+	}
+	
+	/**
+	 * List columns in a database as an array of ADOFieldObjects. 
+	 * See top of file for definition of object.
+	 *
+	 * @params table	table name to query
+	 *
+	 * @return  array of ADOFieldObjects for current table.
+	 */ 
+    function &MetaColumns($table) 
+	{
+	
+		if (!empty($this->metaColumnsSQL)) {
+		
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+			if ($rs === false) return false;
+
+			$retarr = array();
+			while (!$rs->EOF) { //print_r($rs->fields);
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$fld->type = $rs->fields[1];
+				$fld->max_length = $rs->fields[2];
+				$retarr[strtoupper($fld->name)] = $fld;	
+				
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+      
+        	
+	/**
+	 * Different SQL databases used different methods to combine strings together.
+	 * 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.
+	 *
+	 * @param d	a date in Unix date time format.
+	 *
+	 * @return  date string in database date format
+	 */
+	function DBDate($d)
+	{
+	// note that we are limited to 1970 to 2038
+		return date($this->fmtDate,$d);
+	}
+	
+	/**
+	 * Converts a timestamp "ts" to a string that the database can understand.
+	 *
+	 * @param ts	a timestamp in Unix date time format.
+	 *
+	 * @return  timestamp string in database timestamp format
+	 */
+	function DBTimeStamp($ts)
+	{
+		return date($this->fmtTimeStamp,$ts);
+	}
+	
+	/**
+	 * Converts a timestamp "ts" to a string that the database can understand.
+	 * 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.
+	 *
+	 * @return  quoted string to be sent back to database
+	 */
+	function qstr($s,$magic_quotes=false)
+	{	
+	$nofixquotes=false;
+		if (!$magic_quotes) {
+		
+			if ($this->replaceQuote[0] == '\\'){
+				$s = str_replace('\\','\\\\',$s);
+			}
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
+		}
+		
+		// undo magic quotes for "
+		$s = str_replace('\\"','"',$s);
+		
+		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
+			return "'$s'";
+		else {// change \' to '' for sybase/mssql
+			$s = str_replace('\\\\','\\',$s);
+			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.
+	*
+	* See readme.htm#ex8 for an example of usage.
+	*
+	* @param sql
+	* @param nrows		is the number of rows per page to get
+	* @param page		is the page number to get (1-based)
+	* @param [inputarr]	array of bind variables
+	* @param [arg3]		is a private parameter only used by jlim
+	* @param [secs2cache]		is a private parameter only used by jlim
+	* @return		the recordset ($rs->databaseType == 'array')
+	*
+	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
+	*
+	*/
+	
+function &PageExecute($sql, $nrows, $page, $inputarr=false, $arg3=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 
+	// the last page number.
+	$pagecounter = $page + 1;
+	$pagecounteroffset = ($pagecounter * $nrows) - $nrows;
+	if ($secs2cache>0) $rstest = &$this->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr, $arg3);
+	else $rstest = &$this->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $arg3, $secs2cache);
+	if ($rstest) {
+		while ($rstest->EOF && $pagecounter>0) {
+			$atlastpage = true;
+			$pagecounter--;
+			$pagecounteroffset = $pagecounter * ($nrows-1);
+			if ($secs2cache>0) $rstest = &$this->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr, $arg3);
+			else $rstest = &$this->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $arg3, $secs2cache);
+		}
+		$rstest->Close();
+	}
+	if ($atlastpage) {	// If we are at the last page or beyond it, we are going to retrieve it
+		$page = $pagecounter;
+		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 = $page * ($nrows-1);
+	if ($secs2cache > 0) $rsreturn = &$this->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr, $arg3);
+	else $rsreturn = &$this->SelectLimit($sql, $nrows, $offset, $inputarr, $arg3, $secs2cache);
+	
+	// Before returning the RecordSet, we set the pagination properties we need
+	if ($rsreturn) {
+		$rsreturn->AbsolutePage($page);
+		$rsreturn->AtFirstPage($atfirstpage);
+		$rsreturn->AtLastPage($atlastpage);
+	}
+	return $rsreturn;
+
+	}
+	
+		
+	/**
+	* 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
+	* @param nrows		is the number of rows per page to get
+	* @param page		is the page number to get (1-based)
+	* @param [inputarr]	array of bind variables
+	* @param [arg3]		is a private parameter only used by jlim
+	* @return		the recordset ($rs->databaseType == 'array')
+	*/
+	function &CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false, $arg3=false) {
+		return $this->PageExecute($sql, $nrows, $page, $inputarr, $arg3,$secs2cache);
+	}
+
+} // end class ADOConnection
+	
+	
+	
+	//==============================================================================================	
+	
+	/**
+	* Used by ADORecordSet->FetchObj()
+	*/
+	class ADOFetchObj {
+	};
+	
+	
+	/**
+	* Lightweight recordset when there are no records to be returned
+	*/
+	class ADORecordSet_empty
+	{
+		var $dataProvider = 'empty';
+		var $EOF = true;
+		var $_numOfRows = 0;
+		var $fields = false;
+		var $f = false;
+		function RowCount() {return 0;}
+		function RecordCount() {return 0;}
+		function Close(){return true;}
+	}
+	
+	/**
+	 * 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 (not known).
+	 */
+	class ADORecordSet {
+	/*
+	 * public variables	
+	 */
+	var $dataProvider = "native";
+	var $fields = false; // holds the current row data
+	var $f = false;
+	var $blobSize = 64; 	// any varchar/char field this size or greater is treated as a blob
+				// in other words, we use a text area for editting.
+	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 $emptyTimeStamp = '&nbsp;'; // what to display when $time==0
+	var $emptyDate = '&nbsp;'; // what to display when $time==0
+	var $debug = false;
+	var $timeCreated=0; 	// datetime in Unix format rs created -- for cached recordsets
+
+	var $bind = false; 	// used by Fields() to hold array - should be private?
+	var $fetchMode;		// default fetch mode
+	/*
+	 *	private variables	
+	 */
+	var $_numOfRows = -1;	
+	var $_numOfFields = -1;	
+	var $_queryID = -1;	/* This variable keeps the result link identifier.	*/
+	var $_currentRow = -1;	/* This variable keeps the current row in the Recordset.	*/
+	var $_closed = false; 	/* has recordset been closed */
+	var $_inited = false; 	/* Init() should only be called once */
+	var $_obj; 		/* Used by FetchObj */
+	var $_names;
+	
+	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 */
+
+	
+	/**
+	 * Constructor
+	 *
+	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
+	 *
+	 */
+	function ADORecordSet(&$queryID) 
+	{
+		$this->_queryID = $queryID;
+		$this->f = &$this->fields;
+	}
+	
+	function Init()
+	{
+		if ($this->_inited) return;
+		$this->_inited = true;
+		
+		if ($this->_queryID) @$this->_initrs();
+		else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+		}
+		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
+			$this->_currentRow = 0;
+			$this->EOF = ($this->_fetch() === false);
+		} else 
+			$this->EOF = true;
+	}
+	/**
+	 * Generate a <SELECT> string from a recordset, and return the string.
+	 * 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.
+	 *
+	 * @param name  		name of <SELECT>
+	 * @param [defstr]		the value to hilite. Use an array for multiple hilites for listbox.
+	 * @param [blank1stItem]	true to leave the 1st item in list empty
+	 * @param [multiple]		true for listbox, false for popup
+	 * @param [size]		#rows to show for listbox. not used by popup
+	 * @param [selectAttr]		additional attributes to defined for <SELECT>.
+	 *				useful for holding javascript onChange='...' handlers.
+	 & @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
+	 *
+	 * changes by glen.davies@cce.ac.nz to support multiple hilited items
+	 */
+	 
+	function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
+			$size=0, $selectAttr='',$compareFields0=true)
+	{
+		$hasvalue = false;
+
+		if ($multiple or is_array($defstr)) {
+			if ($size==0) $size=5;
+			$attr = " multiple size=$size";
+			if (!strpos($name,'[]')) $name .= '[]';
+		} else if ($size) $attr = " size=$size";
+		else $attr ='';
+		
+				
+		$s = "<select name=\"$name\"$attr $selectAttr>";
+		if ($blank1stItem) $s .= "\n<option></option>";
+	
+		if ($this->FieldCount() > 1) $hasvalue=true;
+		else $compareFields0 = true;
+		
+		while(!$this->EOF) {
+			$zval = trim($this->fields[0]);
+			$selected = trim($this->fields[$compareFields0 ? 0 : 1]);
+			
+			if ($blank1stItem && $zval=="") {
+				$this->MoveNext();
+				continue;
+			}
+			if ($hasvalue) 
+				$value = 'value="'.htmlspecialchars(trim($this->fields[1])).'"';
+			
+			
+			if (is_array($defstr))  {
+				
+				if (in_array($selected,$defstr)) 
+					$s .= "<option selected $value>".htmlspecialchars($zval).'</option>';
+				else 
+					$s .= "\n<option ".$value.'>'.htmlspecialchars($zval).'</option>';
+			}
+			else {
+				if (strcasecmp($selected,$defstr)==0) 
+					$s .= "<option selected $value>".htmlspecialchars($zval).'</option>';
+				else 
+					$s .= "\n<option ".$value.'>'.htmlspecialchars($zval).'</option>';
+			}
+			$this->MoveNext();
+		} // while
+		
+		return $s ."\n</select>\n";
+	}
+	/**
+	 * Generate a <SELECT> string from a recordset, and return the string.
+	 * 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='')	
+	{
+		return ADORecordSet::GetMenu($name,$defstr,$blank1stItem,$multiple,$size, $selectAttr,false);
+	}
+
+
+	/**
+	 * return recordset as a 2-dimensional array.
+	 *
+	 * @param [nRows]  is the number of rows to return. -1 means every row.
+	 *
+	 * @return an array indexed by the rows (0-based) from the recordset
+	 */
+	function &GetArray($nRows = -1) 
+	{
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nRows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+	/**
+	 * return recordset as a 2-dimensional array. 
+	 * Helper function for ADOConnection->SelectLimit()
+	 *
+	 * @param offset	is the row to start calculations from (1-based)
+	 * @param [nrows]	is the number of rows to return
+	 *
+	 * @return an array indexed by the rows (0-based) from the recordset
+	 */
+	function &GetArrayLimit($nrows,$offset=-1) 
+	{
+		if ($offset <= 0) return $this->GetArray($nrows);
+		$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.
+	 *
+	 * @param [nRows]  is the number of rows to return. -1 means every row.
+	 *
+	 * @return an array indexed by the rows (0-based) from the recordset
+	 */
+	function &GetRows($nRows = -1) 
+	{
+		return $this->GetArray($nRows);
+	}
+	
+	/**
+	 * 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.
+	 *
+	 * @param [force_array] has only meaning if we have 2 data columns. If false, a 1 dimensional
+	 * 	array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
+	 * 	read the source.
+	 *
+	 * @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) {
+		$cols = $this->_numOfFields;
+		if ($cols < 2) {
+			return false;
+		}
+		$results = array();
+		if ($cols > 2 || $force_array) {
+			while (!$this->EOF) {
+				$results[trim($this->fields[0])] = array_slice($this->fields, 1);
+				$this->MoveNext();
+			}
+		} else {
+			// return scalar values
+			while (!$this->EOF) {
+			// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
+				$val = ''.$this->fields[1]; 
+				$results[trim($this->fields[0])] = $val;
+				$this->MoveNext();
+			}
+		}
+		return $results; 
+	}
+	
+	/**
+	 *
+	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
+	 * @param fmt 	is the format to apply to it, using date()
+	 *
+	 * @return a timestamp formated as user desires
+	 */
+	function UserTimeStamp($v,$fmt='Y-m-d H:i:s')
+	{
+		$tt = $this->UnixTimeStamp($v);
+		// $tt == -1 if pre 1970
+		if (($tt === false || $tt == -1) && $v != false) return $v;
+		if ($tt == 0) return $this->emptyTimeStamp;
+		
+		return date($fmt,$tt);
+	}
+	
+       /**
+	 * @param v  	is the character date in YYYY-MM-DD format
+	 * @param fmt 	is the format to apply to it, using date()
+	 *
+	 * @return a date formated as user desires
+	 */
+	function UserDate($v,$fmt='Y-m-d')
+	{
+		$tt = $this->UnixDate($v);
+		// $tt == -1 if pre 1970
+		if (($tt === false || $tt == -1) && $v != false) return $v;
+		else if ($tt == 0) return $this->emptyDate;
+		else if ($tt == -1) { // pre-1970
+		}
+		return date($fmt,$tt);
+	
+	}
+	
+	/**
+	 * @param $v is a date string in YYYY-MM-DD format
+	 *
+	 * @return date in unix timestamp format, or 0 if before 1970, or false if invalid date format
+	 */
+	function UnixDate($v)
+	{
+		if (!ereg( "([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})", 
+			$v, $rr)) return false;
+			
+		if ($rr[1] <= 1970) return 0;
+		// h-m-s-MM-DD-YY
+		return mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+	}
+	
+
+	
+	/**
+	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
+	 *
+	 * @return date in unix timestamp format, or 0 if before 1970, or false if invalid date format
+	 */
+	function UnixTimeStamp($v)
+	{
+		if (!ereg( "([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ]?([0-9]{1,2}):?([0-9]{1,2}):?([0-9]{1,2})", 
+			$v, $rr)) return false;
+		
+		if ($rr[1] <= 1970 && $rr[2]<= 1) return 0;
+		// h-m-s-MM-DD-YY
+		return  mktime($rr[4],$rr[5],$rr[6],$rr[2],$rr[3],$rr[1]);
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally
+	*/
+	function Free()
+	{
+		return $this->Close();
+	}
+	
+	/**
+	* PEAR DB compat, number of rows
+	*/
+	function NumRows()
+	{
+		return $this->_numOfRows;
+	}
+	
+	/**
+	* PEAR DB compat, number of cols
+	*/
+	function NumCols()
+	{
+		return $this->_numOfCols;
+	}
+	
+	/**
+	* Fetch a row, returning false if no more rows. 
+	* This is PEAR DB compat mode.
+	*
+	* @return false or array containing the current record
+	*/
+	function &FetchRow()
+	{
+		if ($this->EOF) return false;
+		$arr = $this->fields;
+		$this->MoveNext();
+		return $arr;
+	}
+	
+	/**
+	* Fetch a row, returning PEAR_Error if no more rows. 
+	* This is PEAR DB compat mode.
+	*
+	* @return false or array containing the current record
+	*/
+	function FetchInto(&$arr)
+	{
+		if ($this->EOF) return new PEAR_Error('EOF',-1);;
+		$arr = $this->fields;
+		$this->MoveNext();
+		return 0; // DB_OK
+	}
+	
+	/**
+	 * Move to the first row in the recordset. Many databases do NOT support this.
+	 *
+	 * @return true or false
+	 */
+	function MoveFirst() 
+	{
+		if ($this->_currentRow == 0) return true;
+		return $this->Move(0);			
+	}			
+
+	/**
+	 * Move to the last row in the recordset. 
+	 *
+	 * @return true or false
+	 */
+	function MoveLast() 
+	{
+		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
+                while (!$this->EOF) $this->MoveNext();
+		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() 
+	{
+		if (!$this->EOF) {
+			$this->_currentRow++;
+			if ($this->_fetch()) return true;
+		}
+		$this->EOF = true;
+		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).
+	 *
+	 * @param rowNumber is the row to move to (0-based)
+	 *
+	 * @return true if there still rows available, or false if there are no more rows (EOF).
+	 */
+	function Move($rowNumber = 0) 
+	{
+		if ($rowNumber == $this->_currentRow) return true;
+		if ($rowNumber > $this->_numOfRows)
+       		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-1;
+   
+        if ($this->canSeek) {
+        	if ($this->_seek($rowNumber)) {
+				$this->_currentRow = $rowNumber;
+				if ($this->_fetch()) {
+					$this->EOF = false;	
+                                   //  $this->_currentRow += 1;			
+					return true;
+				}
+			} else 
+				return false;
+        } else {
+            if ($rowNumber < $this->_currentRow) return false;
+            while (! $this->EOF && $this->_currentRow < $rowNumber) {
+				$this->_currentRow++;
+                if (!$this->_fetch()) $this->EOF = true;
+			}
+            return !($this->EOF);
+        }
+		
+		$this->fields = null;	
+		$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
+	 */
+	function Fields($colname)
+	{
+		return $this->fields[$colname];
+	}
+	
+  /**
+   * 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.
+   */
+	function &GetRowAssoc($upper=true)
+	{
+	 
+	   	if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[($upper) ? strtoupper($o->name) : $o->name] = $i;
+			}
+		}
+		
+		$record = array();
+		foreach($this->bind as $k => $v) {
+            $record[$k] = $this->fields[$v];
+        }
+
+        return $record;
+    }
+	
+	/**
+	 * Clean up 
+	 *
+	 * @return true or false
+	 */
+	function Close() 
+	{
+		if (!$this->_closed) {
+			$this->_closed = true;
+			return $this->_close();		
+		} else
+			return true;
+	}
+	
+	/**
+	 * synonyms RecordCount and RowCount	
+	 *
+	 * @return the number of rows or -1 if this is not supported
+	 */
+	function RecordCount() {return $this->_numOfRows;}
+	
+	/**
+	 * synonyms RecordCount and RowCount	
+	 *
+	 * @return the number of rows or -1 if this is not supported
+	 */
+	function RowCount() {return $this->_numOfRows;} 
+	
+	
+	/**
+	 * @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;}   
+
+
+	/**
+	 * Get the ADOFieldObject of a specific column.
+	 *
+	 * @param fieldoffset	is the column position to access(0-based).
+	 *
+	 * @return the ADOFieldObject for that column, or false.
+	 */
+	function &FetchField($fieldoffset) 
+	{
+		// must be defined by child class
+	}	
+	
+	/**
+	* Return the fields array of the current row as an object for convenience.
+	* 
+	* @param $isupper to set the object property names to uppercase
+	*
+	* @return the object with the properties set to the fields of the current row
+	*/
+	function &FetchObject($isupper=true)
+	{
+		if (empty($this->_obj)) {
+			$this->_obj = new ADOFetchObj();
+			$this->_names = array();
+			for ($i=0; $i <$this->_numOfFields; $i++) {
+				$f = $this->FetchField($i);
+				$this->_names[] = $f->name;
+			}
+		}
+		$i = 0;
+		$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.
+	* 
+	* @param $isupper to set the object property names to uppercase
+	*
+	* @return the object with the properties set to the fields of the current row,
+	* 	or false if EOF
+	*
+	* Fixed bug reported by tim@orotech.net
+	*/
+	function &FetchNextObject($isupper=true)
+	{
+		$o = false;
+		if ($this->_numOfRows != 0 && !$this->EOF) {
+			$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
+	 * type to our standardised version which uses 1 character codes:
+	 *
+	 * @param t  is the type passed in. Normally is ADOFieldObject->type.
+	 * @param len is the maximum length of that field. This is because we treat character
+	 * 	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: 
+	 *	C for character < 200 chars
+	 *	X for teXt (>= 200 chars)
+	 *	B for Binary
+	 * 	N for numeric floating point
+	 *	D for date
+	 *	T for timestamp
+	 * 	L for logical/Boolean
+	 *	I for integer
+	 *	R for autoincrement counter/integer
+	 * 
+	 *
+	*/
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		switch (strtoupper($t)) {
+		case 'VARCHAR':
+		case 'VARCHAR2':
+		case 'CHAR':
+		case 'STRING':
+		case 'C':
+		case 'NCHAR':
+		case 'NVARCHAR':
+		case 'VARYING':
+		case 'BPCHAR':
+			if (!empty($this)) if ($len <= $this->blobSize) return 'C';
+			else if ($len <= 250) return 'C';
+		
+		case 'LONGCHAR':
+		case 'TEXT':
+		case 'M':
+		case 'X':
+		case 'CLOB':
+		case 'LONG':
+			return 'X';
+		
+		case 'BLOB':
+		case 'NTEXT':
+		case 'BINARY':
+		case 'VARBINARY':
+		case 'LONGBINARY':
+		case 'B':
+			return 'B';
+			
+		case 'DATE':
+		case 'D':
+			return 'D';
+		
+		
+		case 'TIME':
+		case 'TIMESTAMP':
+		case 'DATETIME':
+		case 'T':
+			return 'T';
+		
+		case 'BOOLEAN': 
+		case 'BIT':
+		case 'L':
+			return 'L';
+			
+		case 'COUNTER':
+		case 'R':
+			return 'R';
+			
+		case 'INT':
+		case 'INTEGER':
+		case 'SHORT':
+		case 'TINYINT':
+		case 'SMALLINT':
+		case 'I':
+			if (!empty($fieldobj->primary_key)) return 'R';
+			return 'I';
+			
+		default: return 'N';
+		}
+	}
+	
+	function _close() {}
+	
+	/**
+	 * set/returns the current recordset page when paginating
+	 */
+	function AbsolutePage($page=-1)
+	{
+		if ($page != -1) $this->_currentPage = $page;
+		return $this->_currentPage;
+	}
+	
+	/**
+	 * set/returns the status of the atFirstPage flag when paginating
+	 */
+	function AtFirstPage($status=false)
+	{
+		if ($status != false) $this->_atFirstPage = $status;
+		return $this->_atFirstPage;
+	}
+	
+	/**
+	 * set/returns the status of the atLastPage flag when paginating
+	 */
+	function AtLastPage($status=false)
+	{
+		if ($status != false) $this->_atLastPage = $status;
+		return $this->_atLastPage;
+	}
+} // end class ADORecordSet
+	
+	//==============================================================================================	
+	
+	/**
+	 * 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.
+	 */
+	
+	class ADORecordSet_array extends ADORecordSet
+	{
+		var $databaseType = "array";
+	
+		var $_array; 	// holds the 2-dimensional data array
+		var $_types;	// the array of types of each column (C B I L M)
+		var $_colnames;	// names of each column in array
+		var $_skiprow1;	// skip 1st row because it holds column names
+		var $_fieldarr; // holds array of field objects
+		var $canSeek = true;
+		var $affectedrows = false;
+		var $insertid = false;
+		var $sql = '';
+		/**
+		 * Constructor
+		 *
+		 */
+		function ADORecordSet_array($fakeid=1)
+		{
+			$this->ADORecordSet($fakeid); // fake queryID
+		}
+		
+		
+		/**
+		 * Setup the Array. Later we will have XML-Data and CSV handlers
+		 *
+		 * @param array		is a 2-dimensional array holding the data.
+		 *			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 
+		 *			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.
+		 */
+		function InitArray(&$array,$typearr,$colnames=false)
+		{
+			$this->_array = $array;
+			$this->_types = &$typearr;	
+			if ($colnames) {
+				$this->_skiprow1 = false;
+				$this->_colnames = $colnames;
+			} else $this->_colnames = $array[0];
+			
+			$this->Init();
+		}
+		/**
+		 * 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 
+		 *			unless paramter $colnames is used.
+		 * @param fieldarr	holds an array of ADOFieldObject's.
+		 */
+		function InitArrayFields(&$array,&$fieldarr)
+		{
+			$this->_array = &$array;
+			$this->_skiprow1= false;
+			if ($fieldarr) {
+				$this->_fieldobjects = &$fieldarr;
+			} 
+			
+			$this->Init();
+		}
+		
+		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)
+		{
+			if (!$this->bind) {
+				$this->bind = array();
+				for ($i=0; $i < $this->_numOfFields; $i++) {
+					$o = $this->FetchField($i);
+					$this->bind[strtoupper($o->name)] = $i;
+				}
+			}
+			
+			 return $this->fields[$this->bind[strtoupper($colname)]];
+		}
+		
+		function &FetchField($fieldOffset = -1) 
+		{
+			if (isset($this->_fieldobjects)) {
+				return $this->_fieldobjects[$fieldOffset];
+			}
+			$o =  new ADOFieldObject();
+			$o->name = $this->_colnames[$fieldOffset];
+			$o->type =  $this->_types[$fieldOffset];
+			$o->max_length = -1; // length not known
+			
+			return $o;
+		}
+			
+		function _seek($row)
+		{
+			return true;
+		}
+		
+		function _fetch()
+		{
+			$pos = $this->_currentRow;
+			
+			if ($this->_skiprow1) {
+				if ($this->_numOfRows <= $pos-1) return false;
+				$pos += 1;
+			} else {
+				if ($this->_numOfRows <= $pos) return false;
+			}
+			
+			$this->fields = $this->_array[$pos];
+			return true;
+		}
+		
+		function _close() 
+		{
+			return true;	
+		}
+		
+		
+	
+	} // ADORecordSet_array
+
+	//==============================================================================================	
+	// HELPER FUNCTIONS
+	//==============================================================================================			
+	
+    /**
+	 * Synonym for ADOLoadCode.
+	 *
+	 * @deprecated
+	 */
+	function ADOLoadDB($dbType) { return ADOLoadCode($dbType);}
+        
+    /**
+	 * Load the code for a specific database driver
+	 */
+    function ADOLoadCode($dbType) 
+	{
+	GLOBAL $ADODB_Database;
+	
+		if (!$dbType) return false;
+		$ADODB_Database = strtolower($dbType);
+		switch ($ADODB_Database) {
+			case 'maxsql': $ADODB_Database = 'mysqlt'; break;
+			case 'pgsql': $ADODB_Database = 'postgres7'; break;
+		}
+		include_once(ADODB_DIR."/adodb-$ADODB_Database.inc.php");		
+		return true;		
+	}
+
+	/**
+	 * synonym for ADONewConnection for people who cannot remember the correct name
+	 */
+	function &NewADOConnection($db='')
+	{
+		return ADONewConnection($db);
+	}
+	
+	/**
+	 * Instantiate a new Connection class for a specific database driver.
+	 *
+	 * @param [db]  is the database Connection object to create. If undefined,
+	 * 	use the last database driver that was loaded by ADOLoadCode().
+	 *
+	 * @return the freshly created instance of the Connection class.
+	 */
+	function &ADONewConnection($db='')
+	{
+	GLOBAL $ADODB_Database;
+	
+		if ($db) {
+			if ($ADODB_Database != $db) ADOLoadCode($db);
+		} else { 
+			if (!empty($ADODB_Database)) $db = $ADODB_Database;
+			else print "<p>ADONewConnection: No database driver defined</p>";
+		}
+		
+		$cls = 'ADODB_'.$db;
+		$obj = new $cls();
+		if (defined('ADODB_ERROR_HANDLER')) {
+			$obj->raiseErrorFn = ADODB_ERROR_HANDLER;
+		}
+		return $obj;
+	}
+	
+	/* High speed rs2csv 10% faster */
+	function & xrs2csv(&$rs)
+	{
+		return time()."\n".serialize($rs);
+	}
+	function & xcsv2rs($url,&$err,$timeout)
+	{
+		$t = filemtime($url);// this is cached - should we clearstatcache() ?
+		if ($t === false) {
+			$err = 'File not found 1';
+			return false;
+		}
+		
+		if (time() > $t + $timeout){
+			$err = " Timeout 1";
+			return false;
+		}
+		
+		$fp = @fopen($url,'r');
+		if (!$fp) {
+			$err = ' file not found ';
+			return false;
+		}
+		
+		flock($fp,LOCK_SH);
+		$t = fgets($fp,100);
+		if ($t === false){
+			fclose($fp);
+			$err =  " EOF 1 ";
+			return false;
+		}
+		/*
+		if (time() > ((integer)$t) + $timeout){
+			fclose($fp);
+			$err = " Timeout 2";
+			return false;
+		}*/
+		
+		$txt = &fread($fp,1999999); // Increase if EOF 2 error returned
+		fclose($fp);
+		$o = @unserialize($txt);
+		if (!is_object($o)) {
+			$err = " EOF 2";
+			return false;
+		}
+		$o->timeCreated = $t;
+		return $o;
+	}
+	
+	/**
+ 	 * convert a recordset into CSV format
+	 *
+	 * @param rs	the recordset
+	 *
+	 * @return	the CSV formated data
+	 */
+	function &rs2csv(&$rs,$conn=false,$sql='')
+	{
+		$max =  $rs->FieldCount();
+		if ($sql) $sql = urlencode($sql);
+		// metadata setup
+		
+		if ($max <= 0 || $rs->EOF) { // no data returned
+			if (is_object($conn)) {
+        			$sql .= ','.$conn->Affected_Rows();
+				$sql .= ','.$conn->Insert_ID();
+			} else
+				$sql .= ',,';
+			
+			$text = "====-1,0,$sql\n";
+			return $text;
+		} else {
+			$tt = ($rs->timeCreated) ? $rs->timeCreated : time();
+			$line = "====0,$tt,$sql\n";
+		}
+		// column definitions
+		for($i=0; $i < $max; $i++) {
+			$o = $rs->FetchField($i);
+			$line .= urlencode($o->name).':'.$rs->MetaType($o->type,$o->max_length).":$o->max_length,";
+		}
+		$text = substr($line,0,strlen($line)-1)."\n";
+		
+		
+		// get data
+		if ($rs->databaseType == 'array') {
+			$text .= serialize($rs->_array);
+		} else {
+			$rows = array();
+			while (!$rs->EOF) {	
+				$rows[] = $rs->fields;
+				$rs->MoveNext();
+			} 
+			$text .= serialize($rows);
+		}
+		$rs->MoveFirst();
+		return $text;
+	}
+
+	
+/**
+* Open CSV file and convert it into Data. 
+*
+* @param url  		file/ftp/http url
+* @param err		returns the error message
+* @param timeout	dispose if recordset has been alive for $timeout secs
+*
+* @return		recordset, or false if error occured. If no
+*			error occurred in sql INSERT/UPDATE/DELETE, 
+*			empty recordset is returned
+*/
+	function &csv2rs($url,&$err,$timeout=0)
+	{
+		$fp = @fopen($url,'r');
+		$err = false;
+		if (!$fp) {
+			$err = $url.'file/URL not found';
+			return false;
+		}
+		flock($fp, LOCK_SH);
+		$arr = array();
+		$ttl = 0;
+		
+		if ($meta = fgetcsv ($fp, 8192, ",")) {
+			// check if error message
+			if (substr($meta[0],0,4) === '****') {
+				$err = trim(substr($meta[0],4,1024));
+				fclose($fp);
+				return false;
+			}
+			// check for meta data
+			// $meta[0] is -1 means return an empty recordset
+			// $meta[1] contains a time 
+	
+			if (substr($meta[0],0,4) ===  '====') {
+			
+				if ($meta[0] == "====-1") {
+					if (sizeof($meta) < 5) {
+						$err = "Corrupt first line for format -1";
+						fclose($fp);
+						return false;
+					}
+					fclose($fp);
+					
+					if ($timeout > 0) {
+						$err = ' Timeout for insert/update/delete illegal';
+						return false;
+					}
+					$val = 1;
+					$rs = new ADORecordSet($val);
+					$rs->EOF = true;
+					$rs->_numOfFields=0;
+					$rs->sql = urldecode($meta[2]);
+					$rs->affectedrows = (integer)$meta[3];
+					$rs->insertid = $meta[4];	
+					$rs->aa = '100';
+					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.
+			# Would require probabilistic blocking write 
+			#
+			# -2 sec before timeout, give processes 1/16 chance of writing to file with blocking io
+			# -1 sec after timeout give processes 1/4 chance of writing with blocking
+			# +0 sec after timeout, give processes 100% chance writing with blocking
+				if (sizeof($meta) > 1) {
+					if($timeout >0){ 
+						$tdiff = $meta[1]+$timeout - time();
+						if ($tdiff <= 2) {
+							switch($tdiff) {
+							case 2: 
+								if ((rand() & 15) == 0) {
+									fclose($fp);
+									$err = "Timeout 2";
+									return false;
+								}
+								break;
+							case 1:
+								if ((rand() & 3) == 0) {
+									fclose($fp);
+									$err = "Timeout 1";
+									return false;
+								}
+								break;
+							default: 
+								fclose($fp);
+								$err = "Timeout 0";
+								return false;
+							} // switch
+							
+						} // if check flush cache
+					}// (timeout>0)
+					$ttl = $meta[1];
+				}
+				$meta = fgetcsv($fp, 8192, ",");
+				if (!$meta) {
+					fclose($fp);
+					$err = "Unexpected EOF 1";
+					return false;
+				}
+			}
+
+			// Get Column definitions
+			$flds = array();
+			foreach($meta as $o) {
+				$o2 = explode(':',$o);
+				if (sizeof($o2)!=3) {
+					$arr[] = $meta;
+					$flds = false;
+					break;
+				}
+				$fld = new ADOFieldObject();
+				$fld->name = urldecode($o2[0]);
+				$fld->type = $o2[1];
+				$fld->max_length = $o2[2];
+				$flds[] = $fld;
+			}
+		} else {
+			fclose($fp);
+			$err = "Recordset had unexpected EOF 2";
+			//print "$url ";print_r($meta);
+			//die();
+			return false;
+		}
+		
+		// slurp in the data
+		$text = fread($fp,1999999);
+		fclose($fp);
+		//$text = substr($text,0,44);
+		$arr = @unserialize($text);
+		
+		//var_dump($arr);
+		if (!is_array($arr)) {
+			$err = "Recordset had unexpected EOF 3";
+			return false;
+		}
+		$rs = new ADORecordSet_array();
+		$rs->timeCreated = $ttl;
+		$rs->InitArrayFields($arr,$flds);
+		return $rs;
+	}
+
+	function adodb_write_file($filename, $contents,$debug=false)
+	{ 
+	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
+	# So to simulate locking, we assume that rename is an atomic operation.
+	# First we delete $filename, then we create a $tempfile write to it and 
+	# rename to the desired $filename. If the rename works, then we successfully 
+	# modified the file exclusively.
+	# What a stupid need - having to simulate locking.
+	# Risks:
+	# 1. $tempfile name is not unique -- very very low
+	# 2. unlink($filename) fails -- ok, rename will fail
+	# 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs
+	# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and  cache updated
+		if (strpos(strtoupper(PHP_OS),'WIN') !== false) {
+			// skip the decimal place
+			$mtime = substr(str_replace(' ','_',microtime()),2); 
+			// unlink will let some latencies develop, so uniqid() is more random
+			@unlink($filename);
+			// getmypid() actually returns 0 on Win98 - never mind!
+			$tmpname = $filename.uniqid($mtime).getmypid();
+			if (!($fd = fopen($tmpname,'a'))) return false;
+			$ok = ftruncate($fd,0);			
+			if (!fwrite($fd,$contents)) $ok = false;
+			fclose($fd);
+			chmod($tmpname,0644);
+			if (!@rename($tmpname,$filename)) {
+				unlink($tmpname);
+				$ok = false;
+			}
+			if ($debug && !$ok) print " Rename $tmpname ".($ok? 'ok' : 'failed')." <br>";
+			return $ok;
+		}
+		if (!($fd = fopen($filename, 'a'))) return false;
+		if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
+			$ok = fwrite( $fd, $contents );
+			fclose($fd);
+			chmod($filename,0644);
+		}else {
+			fclose($fd);
+			if ($debug)print " Failed acquiring lock for $filename<br>";
+			$ok = false;
+		}
+	
+	       	return $ok;
+    	}
+		
+		
+
+
+} // defined
+?>
\ No newline at end of file
diff --git a/libraries/adodb/adodb.png b/libraries/adodb/adodb.png
new file mode 100755
index 0000000000000000000000000000000000000000..ad92e0969bfd971102f9c42fb37fe6d8cd5a490a
GIT binary patch
literal 29073
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
Nxov){)bPox{{ypd?Z5y4

literal 0
HcmV?d00001

diff --git a/libraries/adodb/benchmark.php b/libraries/adodb/benchmark.php
new file mode 100755
index 00000000..8c11e161
--- /dev/null
+++ b/libraries/adodb/benchmark.php
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<title>ADODB Benchmarks</title>
+</head> 
+
+<body>
+<?php 
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  
+  Benchmark code to test the speed to the ADODB library with different databases.
+  This is a simplistic benchmark to be used as the basis for further testing.
+  It should not be used as proof of the superiority of one database over the other.
+*/ 
+ 
+$testmssql = true;
+$testvfp = true;
+$testoracle = false;
+$testado = true; 
+$testibase = true;
+$testaccess = true;
+$testmysql = true;
+
+set_time_limit(240); // increase timeout
+
+include("tohtml.inc.php");
+include("adodb.inc.php");
+
+function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
+{
+GLOBAL $ADODB_version;
+
+
+	$max = 10;
+	$sql = 'select * from ADOXYZ';
+	
+	print "<h3>ADODB Version: $ADODB_version Host: <i>$db->host</i> &nbsp; Database: <i>$db->database</i></h3>";
+
+	// perform query once to cache results so we are only testing throughput 
+	$rs = $db->Execute($sql);	
+	$arr = $rs->GetArray();
+	//$db->debug = true;
+
+	$start = microtime();
+	for ($i=0; $i < $max; $i++) {
+		$rs = $db->Execute($sql);	
+		$arr = &$rs->GetArray();
+//                print $arr[0][1];
+	}
+	$end =  microtime();
+	
+	$start = explode(' ',$start);
+	$end = explode(' ',$end);
+	print_r($start);
+	print_r($end);
+      //  print_r($arr);
+	$total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]);
+	printf ("<p>seconds = %8.2f for %d iterations each with %d records</p>",$total,$max, sizeof($arr));
+
+?>
+	</p>
+	<table width=100% ><tr><td bgcolor=beige>&nbsp;</td></tr></table>
+	</p>
+<?php
+        $db->Close();
+}
+include("testdatabases.inc.php");
+AD
+?>
+
+
+</body>
+</html>
diff --git a/libraries/adodb/client.php b/libraries/adodb/client.php
new file mode 100755
index 00000000..1b4e1faa
--- /dev/null
+++ b/libraries/adodb/client.php
@@ -0,0 +1,194 @@
+<html>
+<body bgcolor=white>
+<?php
+/** 
+ * (c)2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+ * 
+ * set tabs to 8
+ */
+ 
+ // documentation on usage is at http://php.weblogs.com/adodb_csv
+ 
+include('./adodb.inc.php');
+include('./tohtml.inc.php');
+
+ function &send2server($url,$sql)
+ {
+	$url .= '?sql='.urlencode($sql);
+	print "<p>$url</p>";
+	$rs = csv2rs($url,$err);
+	if ($err) print $err;
+	return $rs;
+ }
+ 
+ function print_pre($s)
+ {
+ 	print "<pre>";print_r($s);print "</pre>";
+ }
+
+
+$serverURL = 'http://localhost/php/adodb/server.php';
+$testhttp = false;
+
+$sql1 = "insertz into products (productname) values ('testprod 1')";
+$sql2 = "insert into products (productname) values ('testprod 1')";
+$sql3 = "insert into products (productname) values ('testprod 2')";
+$sql4 = "delete from products where productid>80";
+$sql5 = 'select * from products';
+	
+if ($testhttp) {
+	print "<a href=#c>Client Driver Tests</a><p>";
+	print "<h3>Test Error</h3>";
+	$rs = send2server($serverURL,$sql1);
+	print_pre($rs);
+	print "<hr>";
+	
+	print "<h3>Test Insert</h3>";
+	
+	$rs = send2server($serverURL,$sql2);
+	print_pre($rs);
+	print "<hr>";
+	
+	print "<h3>Test Insert2</h3>";
+	
+	$rs = send2server($serverURL,$sql3);
+	print_pre($rs);
+	print "<hr>";
+	
+	print "<h3>Test Delete</h3>";
+	
+	$rs = send2server($serverURL,$sql4);
+	print_pre($rs);
+	print "<hr>";
+	
+	
+	print "<h3>Test Select</h3>";
+	$rs = send2server($serverURL,$sql5);
+	if ($rs) rs2html($rs);
+	
+	print "<hr>";
+}
+
+
+print "<a name=c><h1>CLIENT Driver Tests</h1>";
+$conn = ADONewConnection('csv');
+$conn->Connect($serverURL);
+$conn->debug = true;
+
+print "<h3>Bad SQL</h3>";
+
+$rs = $conn->Execute($sql1);
+
+print "<h3>Insert SQL 1</h3>";
+$rs = $conn->Execute($sql2);
+
+print "<h3>Insert SQL 2</h3>";
+$rs = $conn->Execute($sql3);
+
+print "<h3>Select SQL</h3>";
+$rs = $conn->Execute($sql5);
+if ($rs) rs2html($rs);
+
+print "<h3>Delete SQL</h3>";
+$rs = $conn->Execute($sql4);
+
+print "<h3>Select SQL</h3>";
+$rs = $conn->Execute($sql5);
+if ($rs) rs2html($rs);
+
+
+/* EXPECTED RESULTS FOR HTTP TEST:
+
+Test Insert
+http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
+
+adorecordset Object
+(
+    [dataProvider] => native
+    [fields] => 
+    [blobSize] => 64
+    [canSeek] => 
+    [EOF] => 1
+    [emptyTimeStamp] =>  
+    [emptyDate] =>  
+    [debug] => 
+    [timeToLive] => 0
+    [bind] => 
+    [_numOfRows] => -1
+    [_numOfFields] => 0
+    [_queryID] => 1
+    [_currentRow] => -1
+    [_closed] => 
+    [_inited] => 
+    [sql] => insert into products (productname) values ('testprod')
+    [affectedrows] => 1
+    [insertid] => 81
+)
+
+
+--------------------------------------------------------------------------------
+
+Test Insert2
+http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
+
+adorecordset Object
+(
+    [dataProvider] => native
+    [fields] => 
+    [blobSize] => 64
+    [canSeek] => 
+    [EOF] => 1
+    [emptyTimeStamp] =>  
+    [emptyDate] =>  
+    [debug] => 
+    [timeToLive] => 0
+    [bind] => 
+    [_numOfRows] => -1
+    [_numOfFields] => 0
+    [_queryID] => 1
+    [_currentRow] => -1
+    [_closed] => 
+    [_inited] => 
+    [sql] => insert into products (productname) values ('testprod')
+    [affectedrows] => 1
+    [insertid] => 82
+)
+
+
+--------------------------------------------------------------------------------
+
+Test Delete
+http://localhost/php/adodb/server.php?sql=delete+from+products+where+productid%3E80
+
+adorecordset Object
+(
+    [dataProvider] => native
+    [fields] => 
+    [blobSize] => 64
+    [canSeek] => 
+    [EOF] => 1
+    [emptyTimeStamp] =>  
+    [emptyDate] =>  
+    [debug] => 
+    [timeToLive] => 0
+    [bind] => 
+    [_numOfRows] => -1
+    [_numOfFields] => 0
+    [_queryID] => 1
+    [_currentRow] => -1
+    [_closed] => 
+    [_inited] => 
+    [sql] => delete from products where productid>80
+    [affectedrows] => 2
+    [insertid] => 0
+)
+
+[more stuff deleted]
+ .
+ . 
+ .
+*/
+?>
diff --git a/libraries/adodb/crypt.inc.php b/libraries/adodb/crypt.inc.php
new file mode 100755
index 00000000..d9368111
--- /dev/null
+++ b/libraries/adodb/crypt.inc.php
@@ -0,0 +1,60 @@
+<?php
+class MD5Crypt{
+        function keyED($txt,$encrypt_key){
+                $encrypt_key = md5($encrypt_key);
+                $ctr=0;
+                $tmp = "";
+                for ($i=0;$i<strlen($txt);$i++){
+                        if ($ctr==strlen($encrypt_key)) $ctr=0;
+                        $tmp.= substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1);
+                        $ctr++;
+                }
+                return $tmp;
+        }
+
+        function Encrypt($txt,$key){
+                srand((double)microtime()*1000000);
+                $encrypt_key = md5(rand(0,32000));
+                $ctr=0;
+                $tmp = "";
+                for ($i=0;$i<strlen($txt);$i++)
+                {
+                if ($ctr==strlen($encrypt_key)) $ctr=0;
+                $tmp.= substr($encrypt_key,$ctr,1) .
+                (substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1));
+                $ctr++;
+                }
+                return base64_encode($this->keyED($tmp,$key));
+        }
+
+        function Decrypt($txt,$key){
+                $txt = $this->keyED(base64_decode($txt),$key);
+                $tmp = "";
+                for ($i=0;$i<strlen($txt);$i++){
+                        $md5 = substr($txt,$i,1);
+                        $i++;
+                        $tmp.= (substr($txt,$i,1) ^ $md5);
+                }
+                return $tmp;
+        }
+
+        function RandPass()
+        {
+                $randomPassword = "";
+                srand((double)microtime()*1000000);
+                for($i=0;$i<8;$i++)
+                {
+                        $randnumber = rand(48,120);
+
+                        while (($randnumber >= 58 && $randnumber <= 64) || ($randnumber >= 91 && $randnumber <= 96))
+                        {
+                                $randnumber = rand(48,120);
+                        }
+
+                        $randomPassword .= chr($randnumber);
+                }
+                return $randomPassword;
+        }
+
+}
+?>
diff --git a/libraries/adodb/license.txt b/libraries/adodb/license.txt
new file mode 100755
index 00000000..752f0109
--- /dev/null
+++ b/libraries/adodb/license.txt
@@ -0,0 +1,161 @@
+This software is dual licensed using BSD-Style and LGPL. Where there is any discrepancy, the BSD-Style license will take precedence.
+
+BSD Style-License
+=================
+
+Copyright (c) 2000, 2001 John Lim
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 
+Neither the name of the John Lim nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+==========================================================
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999 
+ 
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+ 
+ 
+Preamble
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
+
+This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
+
+When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
+
+To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
+
+For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
+
+We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
+
+To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
+
+Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
+
+Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
+
+When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
+
+We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
+
+For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
+
+In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
+
+Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
+
+The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
+
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
+
+A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
+
+The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
+
+"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
+
+1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
+
+2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
+
+
+a) The modified work must itself be a software library. 
+b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
+c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
+d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. 
+(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
+
+In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
+
+3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
+
+Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
+
+This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
+
+4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
+
+If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
+
+5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
+
+However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
+
+When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
+
+If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
+
+Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
+
+6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
+
+You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
+
+
+a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
+b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
+c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
+d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
+e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
+For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
+
+It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
+
+7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
+
+
+a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
+b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
+8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
+
+9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
+
+10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
+
+11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
+
+12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
+
+13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
+
+Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
+
+14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+
+NO WARRANTY 
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+
+
+END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/libraries/adodb/readme.htm b/libraries/adodb/readme.htm
new file mode 100755
index 00000000..92d9b45a
--- /dev/null
+++ b/libraries/adodb/readme.htm
@@ -0,0 +1,1518 @@
+<html>
+<head>
+<title>ADODB Manual</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+  
+<body bgcolor="#FFFFFF">
+
+<h1>ADODB Library for PHP4</h1>
+<p>V1.53 13 Nov 2001 (c) 2000-2001 John Lim (jlim@natsoft.com.my)</p>
+<p>This software is dual licensed using BSD-Style and LGPL. 
+Where there is any discrepancy, the BSD-Style license will take precedence. 
+This means you can use it in proprietary and commercial products.</p>
+<p><a href="#intro"><b>Introduction</b></a><b><br>
+ <a href="#features">Unique Features</a><br>
+ <a href="#changes">Change Log</a></b><b><br>
+ <a href="#users">How People are using ADODB</a><br>
+ <a href="#bugs">Feature Requests and Bug Reports</a><br>
+ </b><b><a href="#install">Installation<br>
+ </a><a href="#coding">Initializing Code</a></b> <a href=#ADOLoadCode><font size="2">ADOLoadCode</font></a> 
+ <font size="2"><a href=#adonewconnection>ADONewConnection</a></font>
+  <font size="2"><a href=#adonewconnection>NewADOConnection</a></font><br>
+   <b> <a href="#drivers">Supported Databases</a></b><br>
+ <b> <a href="#quickstart">Tutorial</a></b><br>
+ <a href="#ex1">Example 1: Select</a><br>
+ <a href="#ex2">Example 2: Advanced Select</a><br>
+ <a href="#ex3">Example 3: Insert</a><br>
+ <a href="#ex4">Example 4: Debugging</a> &nbsp;<a href="#exrs2html">rs2html example</a><br>
+ <a href="#ex5">Example 5: MySQL and Menus</a><br>
+ <a href="#ex6">Example 6: Connecting to Multiple Databases at once</a> <br>
+ <a href="#ex7">Example 7: Generating Update and Insert SQL</a> <br>
+ <a href="#ex8">Example 8: Implementing Scrolling with Next and Previous</a> <br>
+<b> <a href="#errorhandling">Using Custom Error Handlers and PEAR_Error</a><br>
+ <a href="#caching">Caching</a></b></p>
+<p><a href="#ref"><b>Reference</b></a><br>
+  <a href="#ADOConnection"><b>ADOConnection</b></a>: <a href="#connect"><font size="2">Connect</font></a> 
+  <font size="2"><a href="#pconnect">PConnect</a> <a href="#execute">Execute</a> 
+  <a href="#cacheexecute">CacheExecute</a> <a href="#SelectLimit">SelectLimit</a> 
+  <a href="#cacheSelectLimit">CacheSelectLimit</a> <a href="#CacheFlush">CacheFlush</a> 
+  <a href="#Close">Close</a> <a href="#concat">Concat</a> <a href="#dbdate">DBDate</a> 
+  <a href="#dbtimestamp">DBTimeStamp</a> <a href="#qstr">qstr</a> <a href="#begintrans">BeginTrans</a> 
+  <a href="#committrans">CommitTrans</a> <a href="#rollbacktrans">RollbackTrans</a></font> 
+  <font size="2"><a href="#affected_rows">Affected_Rows</a> <a href="#inserted_id">Insert_ID</a></font> 
+  <font size="2"><a href="#errormsg">ErrorMsg</a> <a href="#errorno">ErrorNo</a> 
+  <a href="#metadatabases">MetaDatabases</a> <a href="#metatables">MetaTables 
+  </a><a href="#blankrecordset">BlankRecordSet</a> <a href="#metacolumns">MetaColumns</a> 
+  <a href="#genid">GenID</a> <a href="#getupdatesql">GetUpdateSQL</a> <a href="#getinsertsql">GetInsertSQL</a> 
+  <a href="#updateblob">UpdateBlob</a> <a href="#pageexecute">PageExecute</a> 
+  <a href="#cachepageexecute">CachePageExecute</a></font><br>
+  <a href="#ADORecordSet"><b>ADORecordSet</b></a>: <a href="#getassoc"><font size="2">GetAssoc</font></a> 
+  <font size="2"><a href="#getarray">GetArray</a> <a href="#getrows">GetRows</a> <a href="#getmenu">GetMenu</a> <a href="#getmenu2">GetMenu2</a>  
+  <a href="#userdate">UserDate</a> <a href="#usertimestamp">UserTimeStamp</a> 
+  <a href="#unixdate">UnixDate</a> <a href="#unixtimestamp">UnixTimeStamp</a> 
+  <a href="#move">Move</a> <a href="#movenext">MoveNext</a> <a href="#movefirst">MoveFirst</a> 
+  <a href="#movelast">MoveLast</a>  <a href="#getrowassoc">GetRowAssoc</a>  <a href="#fields">Fields</a> <a href="#fetchfield">FetchField</a> 
+  <a href="#currentrow">CurrentRow</a> <a href="#abspos">AbsolutePosition</a> 
+  <a href="#fieldcount">FieldCount</a> <a href="#recordcount">RecordCount</a> 
+  <a href="#fetchobject">FetchObject</a> <a href="#fetchnextobject">FetchNextObject</a> 
+  <a href="#rsclose">Close</a> <a href="#metatype">MetaType</a>
+  <a href="#atfirstpage">AtFirstPage</a>
+   <a href="#atlastpage">AtLastPage</a>
+    <a href="#absolutepage">AbsolutePage</a>
+	</font>  <br>
+  <a href="#rs2html"><b>rs2html</b></a>&nbsp; <a href="#exrs2html">example</a><br>
+  <a href="#adodiff">Differences between ADODB and ADO</a><br>
+  <a href="#driverguide"><b>Database Driver Guide<br>
+  </b></a> </p>
+<h2>Introduction<a name="intro"></a></h2>
+<p>PHP's database access functions are not standardised. 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.</p>
+<p>We currently support MySQL, Interbase, Oracle, Microsoft SQL Server, Sybase, 
+  PostgreSQL, FrontBase, Foxpro, Access, ADO and ODBC. We have had successful reports of connecting
+  to Progress and DB2 via ODBC. We hope more people 
+  will contribute drivers to support other databases.</p>
+<p>PHP4 supports session variables. You can store your session information using 
+  ADODB for true portability and scalability. See adodb-session.php for more information.</p>
+<h2>Unique Features of ADODB<a name="features"></a></h2>
+<ul>
+  <li><b>Easy for Windows programmers</b> to adapt to because many of the conventions 
+    are similar to Microsoft's ADO.</li>
+  <li>Unlike other PHP database classes which focus only on select statements, 
+    <b>we provide support code to handle inserts and updates which can be adapted 
+    to multiple databases quickly.</b> Methods are provided for date handling, 
+    string concatenation and string quoting characters for differing databases.</li>
+  <li>A<b> metatype system </b>is built in so that we can figure out that types 
+    such as CHAR, TEXT and STRING are equivalent in different databases.</li>
+  <li><b>Easy to port</b> because all the database dependant code are stored in 
+    stub functions. You do not need to port the core logic of the classes.</li>
+  <li><b>PHP4 session support</b>. See adodb-session.php.</li>
+</ul>
+<h2>Change Log<a name="Changes"></a></h2>
+<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()<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 2001</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 2001</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>
+<h2>How People are using ADODB<a name="users"></a></h2>
+Here are some examples of how people are using ADODB:
+<ul>
+<li><a href=http:#phplens.com/>PhpLens</a> 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><a href=http:#www.interakt.ro/phakt/>PHAkt: PHP Extension for DreamWeaver Ultradev</a> allows you to script PHP in the popular Web page editor. Database handling provided by ADODB.
+
+<li><a href=http:#www.andrew.cmu.edu/~rdanyliw/snort/snortacid.html>Analysis Console for Intrusion Databases</a> (ACID): 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><a href=http:#www.cccsoftware.org/>CCC</a> is a web based inventory /contact management / POS / job tracking / job billing system specially designed for computer service shops, but should be useful to anyone that needs accountability of any of any of the things listed. By Ryan Fox.
+</ul>
+
+<h2>Feature Requests and Bug Reports<a name="bugs"></a></h2>
+<p>Feature requests and bug reports can be emailed to <a href="mailto:jlim@natsoft.com.my">jlim@natsoft.com.my</a> 
+ or posted to <a href="http:#php.weblogs.com/discuss/msgReader$96">http:#php.weblogs.com/discuss/msgReader$96</a>.</p>
+<h2>Installation Guide<a name="install"></a></h2>
+<p>Make sure you are running PHP4.01pl2 or later (it uses require_once and include_once). 
+Unpack all the files into a directory accessible by your webserver. 
+</p>
+<p>To test you will need a database. Open <i>testdatabases.inc.php</i> and modify 
+ the connection parameters to suit your database. This script will create a new 
+ table in the database and perform various tests.</p>
+<p>That's it!</p>
+<h3>Code Initialization<a name="coding"></a></h3>
+<p>When running ADODB, at least two files are loaded. First is adodb.inc.php, 
+ which contains all functions used by all database classes. The code specific 
+ to a particular database is in the adodb-????.inc.php file.</p>
+<p>For example, to connect to a mysql database:</p>
+<pre>
+include('/path/to/set/here/adodb.inc.php');
+$conn = &amp;ADONewConnection('mysql');
+</pre>
+<p>Whenever you need to connect to a database, you create a Connection object 
+ using the <b><a name=adonewconnection>ADONewConnection</a></b>( ) function. 
+  ADONewConnection accepts one optional parameter, the &lt;database-name-here&gt;. 
+  If no parameter is specified, it will create a new ADOConnection for the last 
+  database loaded by ADOLoadCode( ). <b>NewADOConnection</b>( ) 
+  is the same function.</p>
+<p>At this point, you are not connected to the database. 
+You will use <code>$conn-><a href=#connect>Connect()</a></code> or 
+<code>$conn-><a href=#pconnect>PConnect()</a></code> to perform the actual connection.</p>
+<p>See the examples below in the Tutorial.</p>
+ <h3><a name=drivers></a>Databases Supported</h3>
+<table width="100%" border="1">
+  <tr valign="top"> 
+    <td><b>Name</b></td>
+    <td><b>Database</b></td>
+    <td><b><font size="2">RecordCount() usable</font></b></td>
+    <td><b>Prerequisites</b></td>
+    <td><b>Operating Systems</b></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>access</b></td>
+    <td>Microsoft Access. You need to create an ODBC DSN.</td>
+    <td>N</td>
+    <td>ODBC </td>
+    <td>Windows only</td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>ado</b></td>
+    <td>Generic ADO, not tuned for specific databases. Slower than ODBC, but allows 
+      DSN-less connections.</td>
+    <td>? depends on database</td>
+    <td>ADO and OLEDB provider</td>
+    <td>Windows only</td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>ado_access</b></td>
+    <td>Microsoft Access using ADO. Slower than ODBC, but allows DSN-less connections.</td>
+    <td>N</td>
+    <td>ADO and OLEDB provider for Access</td>
+    <td>Windows only</td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>vfp</b></td>
+    <td>Microsoft Visual FoxPro. You need to create an ODBC DSN.</td>
+    <td>N</td>
+    <td>ODBC</td>
+    <td>Windows only</td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>ibase</b></td>
+    <td>Interbase. Some users report you might need to use this<br>
+$db->PConnect('localhost:c:\ibase\employee.gdb', "sysdba", "masterkey") to connect.</td>
+    <td>N</td>
+    <td>Interbase client</td>
+    <td>Unix and Windows</td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>mssql</b></td>
+    <td> 
+      <p>Microsoft SQL Server 7.</p>
+    </td>
+    <td>Y</td>
+    <td>Mssql client</td>
+    <td> 
+      <p>Unix and Windows. <a href="http:#phpbuilder.com/columns/alberto20000919.php3"><br>
+        Unix install howto</a>.</p>
+    </td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>mysql</b></td>
+    <td>MySQL without transaction support (3.22)</td>
+    <td>Y</td>
+    <td>MySQL client</td>
+    <td>Unix and Windows</td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>mysqlt</b> or <b>maxsql</b></td>
+    <td>MySQL with transaction support (3.23)</td>
+    <td>Y</td>
+    <td>MySQL client</td>
+    <td>Unix and Windows</td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>oci8</b></td>
+    <td>Oracle 8. Has more functionality than <i>oracle</i> driver (Affected_Rows). 
+	You might have to putenv('ORACLE_HOME=...') before Connect/PConnect.<p>
+	There are 2 ways of connecting - 
+	with server IP and service name: <br>PConnect('serverip:1521','scott','tiger','service'), or
+	using an entry in the tnsnames.ora: <br>PConnect('', 'scott', 'tiger', 'tnsname').
+	</td>
+    <td>N</td>
+    <td>Oracle client</td>
+    <td>Unix and Windows</td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>odbc</b></td>
+    <td>Generic ODBC, not tuned for specific databases. 
+	To connect, use <br>PConnect('DSN','user','pwd').</td>
+    <td>? depends on database</td>
+    <td>ODBC</td>
+    <td>Unix and Windows. <a href="http:#phpbuilder.com/columns/alberto20000919.php3?page=4">Unix 
+      hints.</a></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>oracle</b></td>
+    <td>Oracle 7 or 8 support. Obsolete.</td>
+    <td>N</td>
+    <td>Oracle client</td>
+    <td>Unix and Windows</td>
+  </tr>
+  <tr valign="top"> 
+    <td><b>postgres</b></td>
+    <td>PostgreSQL which does not support LIMIT internally.</td>
+    <td>Y</td>
+    <td>PostgreSQL client</td>
+    <td>Unix and Windows. </td>
+  </tr>
+   <tr valign="top"> 
+    <td><b>postgres7</b></td>
+    <td>PostgreSQL which supports LIMIT and other version 7 functionality.</td>
+    <td>Y</td>
+    <td>PostgreSQL client</td>
+    <td>Unix and Windows. </td>
+  </tr>
+   <tr valign="top"> 
+    <td><b>sybase</b></td>
+    <td>Sybase. </td>
+    <td>Y</td>
+    <td>Sybase client</td>
+    <td> 
+      <p>Unix and Windows. <a href="http:#www.finebyte.com/docs/sybase/ASA-PHP-Linux.html">Unix 
+        hints</a>.</p>
+    </td>
+  </tr>
+     <tr valign="top"> 
+    <td><b>db2</b></td>
+    <td>DB2. Warning: this is experimental. Please email me if there are problems.</td>
+    <td>Y</td>
+    <td>DB2 CLI/ODBC interface</td>
+    <td> 
+      <p>Unix and Windows. <a href="http:#www.faqts.com/knowledge_base/view.phtml/aid/6283/fid/14">Unix 
+        install hints</a>.</p>
+    </td>
+  </tr>
+   
+     <tr valign="top"> 
+    <td><b>fbsql</b></td>
+    <td>FrontBase. Warning: this is experimental. Please email me if there are problems.</td>
+    <td>Y</td>
+    <td>?</td>
+    <td> 
+      <p>Unix and Windows</p>
+    </td>
+  </tr>
+</table>
+<p>RecordCount() usable indicates whether RecordCount() returns -1 instead of 
+  the number of rows when a SELECT statement is executed. For highest performance, 
+  disable RecordCount() by setting the global variable $ADODB_COUNTRECS=false. 
+  For the reason why, see the notes to <a href="http:#php.net/manual/function.sybase-num-rows.php">http:#php.net/manual/function.sybase-num-rows.php</a></p>
+<p>Other database drivers used for testing ADODB.</p>
+<table width="100%" border="0">
+ <tr valign="top"> 
+  <td width="9%"><b>ado_mssql</b></td>
+  <td width="88%">Microsoft SQL Server 7 using Microsoft ADO. This database driver 
+   is only for test purposes. Use the mssql driver instead.</td>
+ </tr>
+ <tr valign="top"> 
+  <td width="9%"><b>odbc_mssql</b></td>
+  <td width="88%">Microsoft SQL Server 7 using ODBC. This database driver is only 
+   for test purposes. Use the mssql driver instead.</td>
+ </tr>
+</table>
+
+<hr>
+<h1>Tutorial<a name="quickstart"></a></h1>
+<h3>Example 1: Select Statement<a name="ex1"></a></h3>
+<p>Task: Connect to the Access Northwind database, display the first 2 columns 
+  of each row.</p>
+<p>In this example, we create a ADOConnection object, which represents the connection 
+ to the database. The connection is initiated with <a href="#pconnect"><font face="Courier New, Courier, mono">PConnect</font></a>, 
+ which is a persistent connection. Whenever we want to query the database, we 
+ call the <font face="Courier New, Courier, mono">ADOConnection.<a href="#execute">Execute</a>()</font> 
+ function. This returns an ADORecordSet object which is actually a cursor that 
+ holds the current row in the array <font face="Courier New, Courier, mono">fields[]</font>. 
+ We use <font face="Courier New, Courier, mono"><a href="#movenext">MoveNext</a>()</font> 
+ to move from row to row.</p>
+<p>NB: A useful function that is not used in this example is 
+<font face="Courier New, Courier, mono"><a href="#selectlimit">SelectLimit</a></font>, which
+allows us to limit the number of rows shown.
+<pre>
+&lt;?
+<font face="Courier New, Courier, mono"><b>include</b>('adodb.inc.php');       # load code common to ADODB
+$<font color="#660000">conn</font> = &amp;ADONewConnection('access');    # create a connection
+$<font color="#660000">conn</font>->PConnect('northwind');   # connect to MS-Access, northwind db
+$<font color="#660000">recordSet</font> = &amp;$<font color="#660000">conn</font>->Execute('select * from products');
+
+<b>while</b> (!$<font color="#660000">recordSet</font>-&gt;EOF) &#123;
+	<b>print</b> $<font color="#660000">recordSet</font>->fields[0].' '.$<font color="#660000">recordSet</font>->fields[1].'&lt;BR&gt;';
+	$<font color="#660000">recordSet</font>-&gt;MoveNext();
+&#125;
+
+$<font color="#660000">recordSet</font>->Close(); # optional
+$<font color="#660000">conn</font>->Close(); # optional
+</font>
+?>
+</pre>
+<p>The $<font face="Courier New, Courier, mono">recordSet</font> returned stores 
+ the current row in the <font face="Courier New, Courier, mono">$recordSet-&gt;fields</font> 
+ array, indexed by column number (starting from zero). We use the <font face="Courier New, Courier, mono"><a href="#movenext">MoveNext</a>()</font> 
+ function to move to the next row. The <font face="Courier New, Courier, mono">EOF</font> 
+ property is set to true when end-of-file is reached. </p>
+<p>An associative array by column name is also provided by emulation; because 
+ some database extensions do not provide associative arrays, we have two functions,  
+ <font face="Courier New, Courier, mono">Fields()</font> and <font face="Courier New, Courier, mono">GetRowAssoc()</font> 
+ to emulate associative arrays. For example to access the ProductID field value, 
+ we can use <font face="Courier New, Courier, mono">$recordSet-&gt;<a href="#fields">Fields</a>('productID'). 
+ </font>Note that this is not an array, but a function. Column names for this 
+ function are case-insensitive.</p><p>
+ Alternatively, use
+ $recordSet-&gt;<font face="Courier New, Courier, mono"><a href=#getrowassoc>GetRowAssoc()</a></font> to return
+ an associative array where the element keys are the column names (upper-cased).
+  This is only available since ADODB 1.20.
+ </p>
+<p>To get the number of rows in the select statement, you can use <font face="Courier New, Courier, mono">$recordSet-&gt;<a href="#recordcount">RecordCount</a>()</font>. 
+ Note that it can return -1 if the number of rows returned cannot be determined.</p>
+<h3>Example 2: Advanced Select with Field Objects<a name="ex2"></a></h3>
+<p>Select a table, display the first two columns. If the second column is a date or timestamp, reformat the date to US format.</p>
+<pre>
+&lt;?
+<font face="Courier New, Courier, mono"><b>include</b>('adodb.inc.php');       # load code common to ADODB
+$<font color="#660000">conn</font> = &amp;ADONewConnection('access');    # create a connection
+$<font color="#660000">conn</font>->PConnect('northwind');   # connect to MS-Access, northwind db
+$<font color="#660000">recordSet</font> = &amp;$<font color="#660000">conn</font>->Execute('select CustomerID,OrderDate from Orders');
+
+<b>while</b> (!$<font color="#660000">recordSet</font>-&gt;EOF) &#123;
+	$<font color="#660000">fld</font> = <font color="#336600"><b>$</b><font color="#660000">recordSet</font><b>-&gt;FetchField</b></font><font color="#006600">(</font>1<font color="#006600">);</font>
+	$<font color="#660000">type</font> = <font color="#336600"><b>$</b><font color="#660000">recordSet</font><b>-&gt;MetaType</b></font>($fld-&gt;type);
+
+	<b>if</b> ( $<font color="#660000">type</font> == 'D' || $<font color="#660000">type</font> == 'T') 
+		<b>print</b> $<font color="#660000">recordSet</font>-&gt;fields[0].' '.
+			<b><font color="#336600">$</font></b><font color="#660000">recordSet</font><b><font color="#336600">-&gt;UserDate</font></b>($<font color="#660000">recordSet</font>-&gt;fields[1],'<b>m/d/Y</b>').'&lt;BR&gt;';
+	<b>else </b>
+		<b>print</b> $<font color="#660000">recordSet</font>->fields[0].' '.$<font color="#660000">recordSet</font>->fields[1].'&lt;BR&gt;';
+
+	$<font color="#660000">recordSet</font>-&gt;MoveNext();
+&#125;
+
+$<font color="#660000">recordSet</font>->Close(); # optional
+$<font color="#660000">conn</font>->Close(); # optional
+</font>
+?>
+</pre>
+<p>In this example, we check the field type of the second column using <font face="Courier New, Courier, mono"><a href="#fetchfield">FetchField</a>().</font> 
+ This returns an object with at least 3 fields.</p>
+<ul>
+ <li><b>name</b>: name of column</li>
+ <li> <b>type</b>: native field type of column</li>
+ <li> <b>max_length</b>: maximum length of field. Some databases such as MySQL 
+  do not return the maximum length of the field correctly. In these cases max_length 
+  will be set to -1.</li>
+</ul>
+<p>We then use <font face="Courier New, Courier, mono"><a href="#metatype">MetaType</a>()</font> 
+ to translate the native type to a <i>generic</i> type. Currently the following 
+ <i>generic</i> types are defined:</p>
+<ul>
+ <li><b>C</b>: character fields that should be shown in a &lt;input type=&quot;text&quot;&gt; 
+  tag.</li>
+ <li><b>X</b>: TeXt, large text fields that should be shown in a &lt;textarea&gt;</li>
+ <li><b>B</b>: Blobs, or Binary Large Objects. Typically images.
+ <li><b>D</b>: Date field</li>
+ <li><b>T</b>: Timestamp field</li>
+ <li><b>L</b>: Logical field (boolean or bit-field)</li>
+ <li><b>N</b>: Numeric field. Includes autoincrement, numeric, floating point, 
+  real and integer. </li>
+ <li><b>R</b>: Serial field. Includes serial, autoincrement integers. This works for selected databases. </li>
+</ul>
+<p>If the metatype is of type date or timestamp, then we print it using the user 
+ defined date format with <font face="Courier New, Courier, mono"><a href="#userdate">UserDate</a>(),</font> 
+ which converts the PHP SQL date string format to a user defined one. Another 
+ use for <font face="Courier New, Courier, mono"><a href="#metatype">MetaType</a>()</font> 
+ is data validation before doing an SQL insert or update.</p>
+<h3>Example 3: Inserting<a name="ex3"></a></h3>
+<p>Insert a row to the Orders table containing dates and strings that need to be quoted before they can be accepted by the database, eg: the single-quote in the word <i>John's</i>.</p>
+<pre>
+&lt;?
+<b>include</b>('adodb.inc.php');       # load code common to ADODB
+$<font color="#660000">conn</font> = &amp;ADONewConnection('access');    # create a connection
+$<font color="#660000">conn</font>->PConnect('northwind');   # connect to MS-Access, northwind db
+
+$<font color="#660000">shipto</font> = <font color="#006600"><b>$conn-&gt;qstr</b></font>(&quot;<i>John's Old Shoppe</i>&quot;);
+
+$<font color="#660000">sql</font> = &quot;insert into orders (customerID,EmployeeID,OrderDate,$shipto) &quot;;
+$<font color="#660000">sql</font> .= &quot;values ('ANATR',2,&quot;.<b><font color="#006600">$conn-&gt;DBDate(</font>time()<font color="#006600">)</font></b><font color="#006600">.</font>&quot;,$<font color="#660000">shipto</font>)&quot;;
+
+<b>if</b> ($<font color="#660000">conn</font>->Execute($<font color="#660000">sql</font>) <font color="#336600"><b>=== false</b></font>) &#123;
+	<b>print</b> 'error inserting: '.<font color="#336600"><b>$conn-&gt;ErrorMsg()</b></font>.'&lt;BR&gt;';
+&#125;
+?>
+</pre>
+<p>In this example, we see the advanced date and quote handling facilities of 
+  ADODB. The unix timestamp (which is a long integer) is appropriately formated 
+  for Access with <font face="Courier New, Courier, mono"><a href="#dbdate">DBDate</a>()</font>, 
+  and the right escape character is used for quoting the <i>John's Old Shoppe</i>, 
+  which is<b> </b><i>John'<b>'</b>s Old Shoppe</i> and not PHP's default <i>John\<b>'</b>s 
+  Old Shoppe</i> with <font face="Courier New, Courier, mono"><a href="#qstr">qstr</a>()</font>. 
+</p>
+<p>Observe the error-handling of the Execute statement. False is returned by<font face="Courier New, Courier, mono"> 
+ <a href="#execute">Execute</a>() </font>if an error occured. The error message 
+ for the last error that occurred is displayed in <font face="Courier New, Courier, mono"><a href="#errormsg">ErrorMsg</a>()</font>. 
+ Note: <i>php_track_errors</i> might have to be enabled for error messages to 
+ be saved.</p>
+<h3> Example 4: Debugging<a name="ex4"></a></h3>
+<pre>&lt;?
+
+<b>include</b>('adodb.inc.php');       # load code common to ADODB
+$<font color="#663300">conn</font> = &amp;ADONewConnection('access');    # create a connection
+$<font color="#663300">conn</font>->PConnect('northwind');   # connect to MS-Access, northwind db
+<font color="#000000">$<font color="#663300">shipto</font> = <b>$conn-&gt;qstr</b>(&quot;John's Old Shoppe&quot;);
+$<font color="#663300">sql</font> = &quot;insert into orders (customerID,EmployeeID,OrderDate,ShipName) &quot;;
+$<font color="#663300">sql</font> .= &quot;values ('ANATR',2,&quot;.$<font color="#663300">conn</font>-&gt;FormatDate(time()).&quot;,$shipto)&quot;;
+<b><font color="#336600">$<font color="#663300">conn</font>-&gt;debug = true;</font></b>
+<b>if</b> ($<font color="#663300">conn</font>->Execute($sql) <b>=== false</b>) <b>print</b> 'error inserting';</font>
+
+?&gt;
+</pre>
+<p>In the above example, we have turned on debugging by setting <b>debug = true</b>. 
+ This will display the SQL statement before execution, and also show any error 
+ messages. There is no need to call <font face="Courier New, Courier, mono"><a href="#errormsg">ErrorMsg</a>()</font> 
+ in this case. For displaying the recordset, see the <font face="Courier New, Courier, mono"><a href="#exrs2html">rs2html</a>() 
+ </font>example.</p>
+ <p>Also see the section on <a href=#errorhandling>Custom Error Handlers</a>.</p>
+<h3>Example 5: MySQL and Menus<a name="ex5"></a></h3>
+<p>Connect to MySQL database <i>agora</i>, and generate a &lt;select&gt; menu 
+ from an SQL statement where the &lt;option&gt; captions are in the 1st column, 
+ and the value to send back to the server is in the 2nd column.</p>
+<pre>&lt;?
+<b>include</b>('adodb.inc.php'); # load code common to ADODB
+$<font color="#663300">conn</font> = &amp;ADONewConnection('mysql');  # create a connection
+$<font color="#663300">conn</font>->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
+<font color="#000000">$<font color="#663300">sql</font> = 'select CustomerName, CustomerID from customers';
+$<font color="#663300">rs</font> = $<font color="#663300">conn</font>->Execute($sql);
+<b>print</b> <b><font color="#336600">$<font color="#663300">rs</font>-&gt;GetMenu('GetCust','Mary Rosli');
+?&gt;</font></b></font></pre>
+<p>Here we define a menu named GetCust, with the menu option 'Mary Rosli' selected. 
+ See <a href="#getmenu"><font face="Courier New, Courier, mono">GetMenu</font></a><font face="Courier New, Courier, mono">()</font>. 
+ We also have functions that return the recordset as an array: <font face="Courier New, Courier, mono"><a href="#getarray">GetArray</a>()</font>, 
+ and as an associative array with the key being the first column: <a href="#getassoc">GetAssoc</a>().</p>
+<h3>Example 6: Connecting to 2 Databases At Once<a name="ex6"></a></h3>
+<pre>&lt;?
+<b>include</b>('adodb.inc.php');     # load code common to ADODB
+$<font color="#663300">conn1</font> = &amp;ADONewConnection('mysql');  # create a mysql connection
+$<font color="#663300">conn2</font> = &amp;ADONewConnection('oracle');  # create a oracle connection
+
+$conn1-&gt;PConnect($server, $userid, $password, $database);
+$conn2-&gt;PConnect(false, $ora_userid, $ora_pwd, $tnsname);
+
+$conn1-&gt;Execute('insert ...');
+$conn2-&gt;Execute('update ...');
+?&gt;</pre>
+
+<h3>Example 7: Generating Update and Insert SQL<a name="ex7"></a></h3>
+ADODB 1.31 and later supports two new recordset functions: GetUpdateSQL( ) and 
+GetInsertSQL( ). This allow you to perform a "SELECT * FROM table query WHERE...",
+make a copy of the $rs->fields, modify the fields, and then generate the SQL to
+update or insert into the table automatically.
+<p>
+We show how the functions can be used when
+accessing a table with the following fields: (ID, FirstName, LastName, Created).
+<p>
+Before these functions can be called, you need to initialize the recordset by
+performing a select on the table. Idea and code by Jonathan Younger jyounger@unilab.com.
+<p>
+<pre>&lt;?
+#==============================================
+# SAMPLE GetUpdateSQL() and GetInsertSQL() code
+#==============================================
+include('adodb.inc.php');
+include('tohtml.inc.php');
+
+#==========================
+# This code tests an insert
+
+$sql = "SELECT * FROM ADOXYZ WHERE id = -1"; 
+# Select an empty record from the database 
+
+$conn = &ADONewConnection("mysql");  # create a connection
+$conn->debug=1;
+$conn->PConnect("localhost", "admin", "", "test"); # connect to MySQL, testdb
+$rs = $conn->Execute($sql); # Execute the query and get the empty recordset
+
+$record = array(); # Initialize an array to hold the record data to insert
+
+# Set the values for the fields in the record
+$record["firstname"] = "Bob";
+$record["lastname"] = "Smith";
+$record["created"] = time();
+
+# Pass the empty recordset and the array containing the data to insert
+# into the GetInsertSQL function. The function will process the data and return
+# a fully formatted insert sql statement.
+$insertSQL = $conn->GetInsertSQL($rs, $record);
+
+$conn->Execute($insertSQL); # Insert the record into the database
+
+#==========================
+# This code tests an update
+
+$sql = "SELECT * FROM ADOXYZ WHERE id = 1"; 
+# Select a record to update 
+
+$rs = $conn->Execute($sql); # Execute the query and get the existing record to update
+
+$record = array(); # Initialize an array to hold the record data to update
+
+# Set the values for the fields in the record
+$record["firstname"] = "Caroline";
+$record["lastname"] = "Smith"; # Update Caroline's lastname from Miranda to Smith
+
+# Pass the single record recordset and the array containing the data to update
+# into the GetUpdateSQL function. The function will process the data and return
+# a fully formatted update sql statement with the correct WHERE clause.
+# If the data has not changed, no recordset is returned
+$updateSQL = $conn->GetUpdateSQL($rs, $record);
+
+$conn->Execute($updateSQL); # Update the record in the database
+$conn->Close();
+?>
+</pre>
+<h3>Example 8: Implementing Scrolling with Next and Previous<a name="ex8"></a></h3>
+<p>
+Code and idea by Iván Oliva. <p>
+We use the HTTP Get variable $next_page to keep track of what page to go next and
+ store the current page in the session variable $curr_page.
+<p>
+We call the connection object's PageExecute() function to generate the appropriate recordset, 
+then use the recordset's AtFirstPage() and AtLastPage() functions to determine 
+whether to display the next and previous buttons. 
+
+<pre>
+&lt;?php
+include_once('adodb.inc.php');
+include_once('tohtml.inc.php');
+<b>session_register('curr_page');</b>
+
+$db = NewADOConnection('mysql');
+$db->Connect('localhost','root','','xphplens');
+<b>$num_of_rows_per_page = 10;
+$sql = 'select * from products';
+
+if (isset($HTTP_GET_VARS['next_page']))
+	$curr_page = $HTTP_GET_VARS['next_page'];
+if (empty($curr_page)) $curr_page = 1; ## at first page
+
+$rs = $db->PageExecute($sql, $num_of_rows_per_page, $curr_page);</b>
+if (!$rs) die('Query Failed');
+
+if (!$rs->EOF && (!$rs-><b>AtFirstPage</b>() || !$rs-><b>AtLastPage</b>())) {
+	if (!$rs-><b>AtFirstPage</b>()) {
+?>
+&lt;a href="&lt;?php echo $PHPSELF,'?next_page=',$rs-><b>AbsolutePage</b>() - 1 ?>">Previous page&lt;/a>
+&lt;?php
+	}
+	if (!$rs-><b>AtLastPage</b>()) {
+?>
+&lt;a href="&lt;?php echo $PHPSELF,'?next_page=',$rs-><b>AbsolutePage</b>() + 1 ?>">Next page&lt;/a>
+&lt;?php
+	}
+	rs2html($rs);
+}
+?>
+</pre>
+The above code can be found in the <i>testpaging.php</i> example included with this release.
+<p>
+<a name=errorhandling></a> 
+<h2>Using Custom Error Handlers and PEAR_Error</h2>
+Apart from the old $con->debug = true; way of debugging, ADODB 1.50 onwards provides 
+another way of handling errors using ADODB's configurable custom handlers. <p>
+ADODB provides two custom handlers which you can modify for your needs.
+The first one is in the <b>adodb-errorhandler.inc.php</b> file. This makes
+use of the standard PHP functions <a href=http://php.net/error_reporting>error_reporting</a>
+to control what error messages types to display,
+and <a href=http://php.net/trigger_error>trigger_error</a> which invokes the default
+PHP error handler.
+<p>
+Including the above file  will cause <i>trigger_error($errorstring,E_USER_ERROR)</i>
+to be called when Connect() or PConnect() fails, or a function that executes SQL statements such as
+ Execute() or SelectLimit() has an error. This file should be included before you create any 
+ ADOConnection objects.<p>
+ If you define error_reporting(0), no errors will be shown. 
+ If you set error_reporting(E_ALL), all errors will be displayed on the screen.
+ <pre>
+&lt;?php
+<b>error_reporting(E_ALL); # show any error messages triggered
+include('adodb-errorhandler.inc.php');</b>
+include('adodb.inc.php');
+include('tohtml.inc.php');
+$c = NewADOConnection('mysql');
+$c->PConnect('localhost','root','','northwind');
+$rs=$c->Execute('select * from productsz'); #invalid table productsz');
+if ($rs) $rs2html($rs);
+?>
+</pre>
+ <p>
+ If you want to log the error message, you can do so by defining the following optional
+  constants ADODB_ERROR_LOG_TYPE and ADODB_ERROR_LOG_DEST. ADODB_ERROR_LOG_TYPE is 
+  the error log message type (see <a href=http://php.net/error_log>error_log</a>
+  in the PHP manual). In this case we set 
+  it to 3, which means log to the file defined by the constant ADODB_ERROR_LOG_DEST.
+ <pre>
+&lt;?php
+<b>error_reporting(0); # do not echo any errors
+define('ADODB_ERROR_LOG_TYPE',3);
+define('ADODB_ERROR_LOG_DEST','C:\errors.log');
+include('adodb-errorhandler.inc.php');</b>
+include('adodb.inc.php');
+include('tohtml.inc.php');
+$c = NewADOConnection('mysql');
+$c->PConnect('localhost','root','','northwind');
+$rs=$c->Execute('select * from productsz'); #invalid table productsz');
+if ($rs) $rs2html($rs);
+?>
+</pre>
+The following message will be logged in the error.log file:
+<pre>
+(2001-10-28 14:20:38) mysql error: [1146: Table 'northwind.productsz' doesn't exist] in
+ EXECUTE("select * from productsz")
+</pre>
+The second error handler is <b>adodb-errorpear.inc.php</b>. 
+This will create a PEAR_Error derived object whenever an error occurs. 
+The last PEAR_Error object created can be retrieved using ADODB_Pear_Error().
+<pre>
+&lt;?php
+<b>include('adodb-errorpear.inc.php');</b>
+include('adodb.inc.php');
+include('tohtml.inc.php');
+$c = NewADOConnection('mysql');
+$c->PConnect('localhost','root','','northwind');
+$rs=$c->Execute('select * from productsz'); #invalid table productsz');
+if ($rs) $rs2html($rs);
+else {
+	<b>$e = ADODB_Pear_Error();
+	echo '&lt;p>',$e->message(),'&lt;/p>';</b>
+}
+?>
+</pre>
+You can use also a PEAR_Error derived class by defining the constant 
+ADODB_PEAR_ERROR_CLASS before the adodb-errorpear.inc.php file is included. And instead
+of retrieving the error message yourself with $e->message, you can set the default error handler
+ in the beginning of the PHP script to PEAR_ERROR_DIE, which will cause an error message to be printed, 
+ then halt script execution:
+<pre>
+include('PEAR.php');
+PEAR::setErrorHandling('PEAR_ERROR_DIE');
+</pre>
+<p>
+<a name=caching></a> 
+<h2>Caching of Recordsets</h2>
+<p>ADODB now supports caching of recordsets using the  CacheExecute( ), 
+CachePageExecute( ) and CacheSelectLimit( ) functions. There are similar to the
+non-cache functions, except that they take a new first parameter, $secs2cache.
+<p>
+  An example of use is the following: 
+<pre>
+<b>include</b>('adodb.inc.php'); # load code common to ADODB
+$ADODB_CACHE_DIR = '/usr/adodb_cache';
+$<font color="#663300">conn</font> = &amp;ADONewConnection('mysql');  # create a connection
+$<font color="#663300">conn</font>->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
+<font color="#000000">$<font color="#663300">sql</font> = 'select CustomerName, CustomerID from customers';
+$<font color="#663300">rs</font> = $<font color="#663300">conn</font>->CacheExecute(15,$sql);
+</font></pre>
+<font color="#000000"> The first parameter is the number of seconds to cache the 
+query. Subsequent calls to that query will used the cached version stored in $ADODB_CACHE_DIR. 
+To force a query and flush the cache, call CacheExecute() with the first parameter 
+set to zero. Alternatively, use CacheFlush($sql) call.
+<p>Windows Note: flock() is buggy in PHP 4.0.5 and earlier on Windows. So we use 
+  a non-blocking technique with rename(). 
+<hr>
+<h1>Class Reference<a name="Ref"></a></h1>
+<p>Function parameters with [ ] around them are optional.</p>
+<h2>$ADODB_FETCH_MODE</h2>
+<p>This is a global variable that determines how arrays are retrieved by Execute( 
+  ). You can change this variable between invocations of Execute( ) and the fetch 
+  mode will be modified.</p>
+<p>The following constants are defined:</p>
+  </font>
+<p><font color="#000000">define('ADODB_FETCH_DEFAULT',0);<br>
+  define('ADODB_FETCH_NUM',1);<br>
+  define('ADODB_FETCH_ASSOC',2);<br>
+  define('ADODB_FETCH_BOTH',3); </font><font color="#000000"></font></p>
+<font color="#000000">
+<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>
+<hr>
+<h3>ADOConnection Fields</h3>
+<p><b>databaseType</b>: Name of the database system we are connecting to. Eg. 
+  <b>odbc</b> or <b>mssql</b> or <b>mysql</b>.</p>
+<p><b>dataProvider</b>: The underlying mechanism used to connect to the database. 
+  Normally set to <b>native</b>, unless using <b>odbc</b> or <b>ado</b>.</p>
+<p><b>host: </b>Name of server or data source name (DSN) to connect to.</p>
+<p><b>database</b>: Name of the database or to connect to. If ado is used, it 
+  will hold the ado data provider.</p>
+<p><b>user</b>: Login id to connect to database. Password is not saved for security 
+  reasons.</p>
+<p><b>raiseErrorFn</b>: Allows you to define an error handling function. 
+See adodb-errorhandler.inc.php for an example.</p>
+<p><b>debug</b>: Set to <i>true</i> to make debug statements to appear.</p>
+<p><b>concat_operator</b>: Set to '+' or '||' normally. The operator used to concatenate 
+  strings in SQL. Used by the <b><a href="#concat">Concat</a></b> function.</p>
+<p><b>fmtDate</b>: The format used by the <b><a href="#dbdate">DBDate</a></b> 
+  function to send dates to the database. is '#Y-m-d#' for Microsoft Access, and 
+  '\'Y-m-d\'' for MySQL.</p>
+<p><b>fmtTimeStamp: </b>The format used by the <b><a href="#dbtimestamp">DBTimeStamp</a></b> 
+  function to send timestamps to the database. </p>
+<p><b>true</b>: The value used to represent true.Eg. '.T.'. for Foxpro, '1' for 
+  Microsoft SQL.</p>
+<p><b>false: </b> The value used to represent false. Eg. '.F.'. for Foxpro, '0' 
+  for Microsoft SQL.</p>
+<p><b>replaceQuote</b>: The string used to escape quotes. Eg. double single-quotes 
+  for Microsoft SQL, and backslash-quote for MySQL. Used by <a href="#qstr">qstr</a>.</p>
+<p><b>autoCommit</b>: indicates whether automatic commit is enabled. Default is 
+  true.</p>
+<p><b>charSet</b>: set the default charset to use. Currently only interbase supports 
+  this. </p>
+<p><b>metaTablesSQL</b>: SQL statement to return a list of available tables. Eg. 
+  <i>SHOW TABLES</i> in MySQL.</p>
+<p><b>genID</b>: The latest id generated by GenID() if supported by the database.</p>
+<hr>
+<h3>ADOConnection Main Functions</h3>
+<p><b>ADOConnection( )</b></p>
+<p>Constructor function. Do not call this directly. Use ADONewConnection( ) instead.</p>
+<p><b>Connect<a name="Connect"></a>($host,[$user],[$password],[$database])</b></p>
+<p>Non-persistent connect to data source or server $<b>host</b>, using userid 
+  $<b>user </b>and password $<b>password</b>. If the server supports multiple 
+  databases, connect to database $<b>database</b>. </p>
+ <p>Returns true/false depending on connection.</p>
+<p>ADO Note: If you are using a Microsoft ADO and not OLEDB, you can set the $database 
+  parameter to the OLEDB data provider you are using.</p>
+<p>PostgreSQL: An alternative way of connecting to the database is to pass the 
+  standard PostgreSQL connection string in the first parameter $host, and the 
+  other parameters will be ignored.</p>
+<p>For Oracle and Oci8, the $host variable holds the optional ORACLE_HOME variable. The
+$database variable holds the TNSName to use. The following connection strings work:
+ <pre> $conn->Connect(false, 'scott', 'tiger', 'OracleSID');
+ $conn->Connect('server:1521', 'scott', 'tiger', 'OracleDB');</pre>
+<p>There are many examples of connecting to a database at 
+<a href="http://php.weblogs.com/adodb">php.weblogs.com/adodb</a>, and in the 
+testdatabases.inc.php file included in the release.</p>
+<p><b>PConnect<a name="PConnect"></a>($host,[$user],[$password],[$database])</b></p>
+<p>Persistent connect to data source or server $<b>host</b>, using userid $<b>user</b> 
+  and password $<b>password</b>. If the server supports multiple databases, connect 
+  to database $<b>database</b>.</p>
+<p>Returns true/false depending on connection. See Connect( ) above for more info.</p>
+<p><b>Execute<a name="Execute"></a>($sql,$inputarr=false)</b></p>
+<p>Execute SQL statement $<b>sql</b> and return derived class of ADORecordSet 
+  if successful. Note that a record set is always returned on success, even if we are executing 
+  an insert or update statement.</p>
+<p>Returns derived class of ADORecordSet. Eg. if connecting via mysql, then ADORecordSet_mysql 
+  would be returned. False is returned if there was an error in executing the sql.</p>
+<p>The $inputarr parameter can be used for binding variables to parameters. Below 
+  is an Oracle example:</p>
+<pre>
+ $conn->Execute("SELECT * FROM TABLE WHERE COND=:val", array('val'=> $val));
+ </pre>
+<p>Another example, using ODBC,which uses the ? convention:</p>
+<pre>
+  $conn->Execute("SELECT * FROM TABLE WHERE COND=?", array($val));
+</pre>
+<i>Binding variables</i><br>
+Variable binding speeds the compilation and caching of SQL statements, leading 
+to higher performance. Currently Oracle and ODBC support variable binding. ODBC 
+style ? binding is emulated in databases that do not support binding. 
+<p> Variable binding in ODBC: 
+<pre>
+$rs = $db->Execute('select * from table where val=?', array('10'));
+</pre>
+Variable binding in Oracle: 
+<pre>
+$rs = $db->Execute('select name from table where val=:key', 
+  array('key' => 10));
+</pre>
+<p><b>CacheExecute<a name="CacheExecute"></a>($secs2cache,$sql,$inputarr=false)</b></p>
+<p>Similar to Execute, except that the recordset is cached for $secs2cache seconds 
+  in the $ADODB_CACHE_DIR directory. If CacheExecute() is called again with the 
+  same parameters, same database, same userid, same password, and the cached recordset 
+  has not expired, the cached recordset is returned. 
+<pre>
+  include('adodb.inc.php'); 
+  include('tohtml.inc.php');
+  $<b>ADODB_CACHE_DIR</b> = '/usr/local/adodbcache';
+  $conn = &ADONewConnection('mysql'); 
+  $conn->PConnect('localhost','userid','password','database');
+  $rs = $conn-><b>CacheExecute</b>(15, 'select * from table'); # cache 15 secs
+  rs2html($rs); /* recordset to html table */  
+</pre>
+<p></p>
+<p> If multiple calls to CacheExecute() are made and the recordset is still cached, 
+  the $secs2cache parameter does not prolong the time the recordset is cached 
+  (it is ignored). Use CacheExecute() only with SELECT statements.</p>
+<p>Performance note: I have done some benchmarks and found that they vary so greatly 
+  that it's better to talk about when caching is of benefit. When your database 
+  server is <i>much slower </i>than your Web server or the database is <i>very 
+  overloaded </i>then ADODB's caching is good because it reduces the load on your 
+  database server. If your database server is lightly loaded or much faster than 
+  your Web server, then caching could actually reduce performance. </p>
+<p><b>SelectLimit<a name="SelectLimit"></a>($sql,$numrows=-1,$offset=-1,$inputarr=false)</b></p>
+<p>Returns a recordset if successful. Returns false otherwise. Performs a select 
+  statement, simulating PostgreSQL's SELECT statement, LIMIT $numrows OFFSET $offset 
+  clause.</p>
+<p>In PostgreSQL, SELECT * FROM TABLE LIMIT 3 will return the first 3 records 
+  only. The equivalent is <code>$connection->SelectLimit('SELECT * FROM TABLE',3)</code>. 
+  This functionality is simulated for databases that do not possess this feature.</p>
+<p>And SELECT * FROM TABLE LIMIT 3 OFFSET 2 will return records 3, 4 and 5 (eg. 
+  after record 2, return 3 rows). The equivalent in ADODB is <code>$connection->SelectLimit('SELECT 
+  * FROM TABLE',3,2)</code>.</p>
+<p>Note that this is the <i>opposite</i> of MySQL's LIMIT clause. You can also 
+  set <code>$connection->SelectLimit('SELECT * FROM TABLE',-1,10)</code> to get 
+  rows 11 to the last row.</p>
+<p>The last parameter $inputarr is for databases that support variable binding 
+  such as Oracle oci8. This substantially reduces SQL compilation overhead. Below 
+  is an Oracle example:</p>
+<pre>
+ $conn->SelectLimit("SELECT * FROM TABLE WHERE COND=:val", 100,-1,array('val'=> $val));
+ </pre>
+<p>Ron Wilson reports that SelectLimit does not work with UNIONs and suggested 
+  the following solution for mssql: 
+<pre>
+>In addition, I found a way to structure the Select Union so that it will
+> work with the optimization in place.  It works under MS-SQL, don't know
+> about the others...  When updating the help file, you could use this as an
+> example of how to structure the SQL --
+<i>No it doesn't work with MySQL.</i>
+> 
+> Change:
+>  Select column1 From table1
+>  Union
+>  Select column2 From table2
+> 
+> To:
+>  Select * From (
+>   Select column1 From table1
+>   Union
+>   Select column2 From table2
+>   )
+>  As dummytable
+> 
+> Ron
+
+</pre>
+<p><b>CacheSelectLimit<a name="CacheSelectLimit"></a>($secs2cache,$sql,$numrows=-1,$offset=-1,$inputarr=false)</b></p>
+<p>Similar to SelectLimit, except that the recordset returned is cached for $secs2cache 
+  seconds in the $ADODB_CACHE_DIR directory. </p>
+<p><b>CacheFlush<a name="CacheFlush"></a>($sql)</b></p>
+<p>Flush (delete) any cached recordsets of the SQL statement $sql in $ADODB_CACHE_DIR.</p>
+<p><b>ErrorMsg<a name="ErrorMsg"></a>()</b></p>
+<p>Returns the last status or error message. This can return a string even if 
+  no error occurs. Use ErrorNo to check if an error has occurred.</p>
+<p>Note: If <b>debug</b> is enabled, the SQL error message is always displayed 
+  when the <b>Execute</b> function is called.</p>
+<p><b>ErrorNo<a name="errorno"></a>()</b></p>
+<p>Returns the last error number. Note that this is not supported by some databases 
+  such as ODBC, and in this case returns 0.</p>
+<p><b>GenID<a name="genid"></a>($seqName = 'adodbseq')</b></p>
+<p>Generate a sequence number. Works for interbase, mysql, postgresql, oci8 drivers 
+  currently. Uses $seqName as the name of the sequence. GenID() will automatically create
+  the sequence for you if it does not exist (provided the userid has permission to do so).</p>
+<p><b>UpdateBlob<a name="updateblob"></a>($table,$column,$val,$where,$blobtype='BLOB')</b></p>
+Allows you to store a blob (in $val) into $table into $column in a row at $where. 
+The $blobtype is an optional parameter, only useful for oci8; legal values for 
+oci8 are 'CLOB' and 'BLOB'. 
+<p> Usage: 
+<p> 
+<pre>
+	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+	$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
+</pre>
+<p> Returns true if succesful, false otherwise. Supported by MySQL, PostgreSQL, Oci8 
+  and Interbase drivers. Other drivers might work.</p>
+<p>Note that when an Interbase blob is retrieved using SELECT, it still needs to be decoded 
+using $connection->DecodeBlob($blob); to derive the original value.
+<p><b>GetUpdateSQL<a name="getupdatesql"></a>(&$rs, $arrFields, $forceUpdate=false)</b></p>
+<p>Generate SQL to update a table given a recordset $rs, and the modified fields 
+  of the array $arrFields (which must be an associative array holding the column 
+  names and the new values) are compared with the current recordset. If $forceUpdate 
+  is true, then we also generate the SQL even if $arrFields is identical to $rs-&gt;fields.	
+  Requires the recordset to be associative.</p>
+<p><b>GetInsertSQL<a name="getinsertsql"></a>(&$rs, $arrFields)</b></p>
+<p>Generate SQL to insert into a table given a recordset $rs. Requires the query 
+  to be associative.</p>
+<b>PageExecute<a name="pageexecute"></a>($sql, $nrows, $page, $inputarr=false)</b> 
+<p>Used for pagination of recordset. $page is 1-based. See <a href="#ex8">Example 
+  8</a>.</p>
+</font> 
+<p><font color="#000000"><b>CachePageExecute<a name="cachepageexecute"></a>($secs2cache, 
+  $sql, $nrows, $page, $inputarr=false)</b> </font></p>
+<p><font color="#000000">Used for pagination of recordset. $page is 1-baed. See 
+  <a href="#ex8">Example 8</a>. Caching version of PageExecute.</font></p>
+<font color="#000000"> 
+<p></p>
+<p><b>Close<a name="Close"></a>( )</b></p>
+<p>Close the database connection. PHP4 proudly states that we no longer have to 
+  clean up at the end of the connection because the reference counting mechanism 
+  of PHP4 will automatically clean up for us.</p>
+<p><b>BeginTrans<a name="Begintrans"></a>( )</b></p>
+<p>Begin a transaction. Turns off autoCommit. Returns true if successful. Some 
+  databases will always return false if transaction support is not available. 
+  Interbase, Oracle and MSSQL support transactions. Note that transaction support 
+  is not available for Microsoft ADO due to some bugs in PHP 4.02. Use the native 
+  transaction support of your RDBMS. Any open transactions will be rolled back 
+  when the connection is closed.</p>
+<p><b>CommitTrans<a name="CommitTrans"></a>( )</b></p>
+<p>End a transaction successfully. Returns true if successful. If the database 
+  does not support transactions, will return true also as data is always committed. 
+</p>
+<p><b>RollbackTrans<a name="RollbackTrans"></a>( )</b></p>
+<p>End a transaction, rollback all changes. Returns true if successful. If the 
+  database does not support transactions, will return false as data is never rollbacked. 
+</p>
+<hr>
+<h3>ADOConnection Utility Functions</h3>
+<p><b>BlankRecordSet<a name="blankrecordset"></a>([$queryid])</b></p>
+<p>Returns an empty recordset. This is useful if you require the use of some ADORecordSet 
+  utility function such as UnixDate.</p>
+<p><b>Concat<a name="Concat"></a>($s1,$s2,....)</b></p>
+<p>Generates the sql string used to concatenate $s1, $s2, etc together. Uses the 
+  string in the concat_operator field to generate the concatenation. Override 
+  this function if a concatenation operator is not used, eg. MySQL.</p>
+<p>Returns the concatenated string.</p>
+<p><b>DBDate<a name="DBDate"></a>($date)</b></p>
+<p>Format the $<b>date</b> in the format the database accepts. Uses the fmtDate 
+  field, which holds the format to use..</p>
+<p>Returns the date as a string.</p>
+<p><b>DBTimeStamp<a name="DBTimeStamp"></a>($ts)</b></p>
+<p>Format the timestamp $<b>ts</b> in the format the database accepts. Uses the 
+  fmtTimeStamp field, which holds the format to use..</p>
+<p>Returns the timestamp as a string.</p>
+<p><b>qstr<a name="qstr"></a>($s,[$magic_quotes_enabled</b>=false]<b>)</b></p>
+<p>Quotes a string to be sent to the database. The $<b>magic_quotes_enabled</b> 
+  parameter may look funny, but the idea is if you are quoting a string extracted 
+  from a POST/GET variable, then pass get_magic_quotes_gpc() as the second parameter. 
+  This will ensure that the variable is not quoted twice, once by <i>qstr</i> 
+  and once by the <i>magic_quotes_gpc</i>.</p>
+<p>Eg.<font face="Courier New, Courier, mono"> $s = $db-&gt;qstr(HTTP_GET_VARS['name'],get_magic_quotes_gpc());</font></p>
+<p>Returns the quoted string.</p>
+<p><b>Affected_Rows<a name="Affected_Rows"></a>( )</b></p>
+<p>Returns the number of rows affected by a update or delete statement. Returns 
+  false if function not supported.</p>
+<p>Only supported for MySQL, MSSQL and ODBC currently. This function might only 
+  give accurate results if you perform it in a transaction if you are using persistent 
+  connections. This is because the connection you are assigned for one Execute(&nbsp;) 
+  might differ from the next Execute(&nbsp;).</p>
+<p><b>Insert_ID<a name="Inserted_ID"></a>( )</b></p>
+<p>Returns the last autonumbering ID inserted. Returns false if function not supported. 
+</p>
+<p>Only supported for PostgreSQL, MySQL and MSSQL currently. PostgreSQL returns 
+  the OID, which can change on a database reload. This function might only give 
+  accurate results if you perform it in a transaction if you are using persistent 
+  connections. This is because the connection you are assigned for one Execute(&nbsp;) 
+  might differ from the next Execute(&nbsp;).</p>
+<p><b>MetaDatabases<a name="metadatabases"></a>()</b></p>
+<p>Returns a list of databases available on the server as an array. You have to 
+  connect to the server first. Only available for ODBC, MySQL and ADO.</p>
+<p><b>MetaTables<a name="metatables"></a>()</b></p>
+<p>Returns an array of tables and views for the current database as an array. 
+  The array should exclude system catalog tables if possible.</p>
+<p><b>MetaColumns<a name="metacolumns"></a>($table)</b></p>
+<p>Returns an array of ADOFieldObject's, one field object for every column of 
+  $table. Currently Sybase does not recognise date types, and ADO cannot identify 
+  the correct data type (so we default to varchar).. </p>
+<hr>
+<h2>ADORecordSet<a name="ADORecordSet"></a></h2>
+<p>When an SQL statement successfully is executed by <font face="Courier New, Courier, mono">ADOConnection-&gt;Execute($sql),</font>an 
+  ADORecordSet object is returned. This object contains a virtual cursor so we 
+  can move from row to row, functions to obtain information about the columns 
+  and column types, and helper functions to deal with formating the results to 
+  show to the user.</p>
+<h3>ADORecordSet Fields</h3>
+<p><b>fields: </b>Array containing the current row. This is not associative, but 
+  is an indexed array from 0 to columns-1. See also the function <b><a href="#fields">Fields</a></b>, 
+  which behaves like an associative array.</p>
+<p><b>dataProvider</b>: The underlying mechanism used to connect to the database. 
+  Normally set to <b>native</b>, unless using <b>odbc</b> or <b>ado</b>.</p>
+<p><b>blobSize</b>: Maximum size of a char, string or varchar object before it 
+  is treated as a Blob (Blob's should be shown with textarea's). See the <a href="#metatype">MetaType</a> 
+  function.</p>
+<p><b>sql</b>: Holds the sql statement used to generate this record set.</p>
+<p><b>canSeek</b>: Set to true if Move( ) function works.</p>
+<p><b>EOF</b>: True if we have scrolled the cursor past the last record.</p>
+<h3>ADORecordSet Functions</h3>
+<p><b>ADORecordSet( )</b></p>
+<p>Constructer. Normally you never call this function yourself.</p>
+<p><b>GetAssoc<a name="GetAssoc"></a>([$force_array])</b></p>
+<p>Generates an associative array from the recordset if the number of columns 
+  is greater than 2. The array is generated from the current cursor position till 
+  EOF. The first column of the recordset becomes the key to the rest of the array. 
+  If the columns is equal to two, then the key directly maps to the value unless 
+  $force_array is set to true, when an array is created for each key. Inspired 
+  by PEAR's getAssoc.</p>
+<p>Example:</p>
+<p>We have the following data in a recordset:</p>
+<p>row1: Apple, Fruit, Edible<br>
+  row2: Cactus, Plant, Inedible<br>
+  row3: Rose, Flower, Edible</p>
+<p>GetAssociation will generate the following associative array:</p>
+<p>Apple =&gt; [Fruit, Edible]<br>
+  Cactus =&gt; [Plant, Inedible]<br>
+  Rose =&gt; [Flower,Edible]</p>
+<p>Returns:</p>
+<p>The associative array, or false if an error occurs.</p>
+<p><b>GetArray<a name="GetArray"></a>([$number_of_rows])</b></p>
+<p>Generate an array from the current cursor position, indexed from 0 to $number_of_rows 
+  - 1. If $number_of_rows is undefined, till EOF.</p>
+<p><b>GetRows<a name="GetRows"></a>([$number_of_rows])</b></p>
+<p>Synonym for GetArray() for compatibility with Microsoft ADO.</p>
+<p> <b>GetMenu<a name="GetMenu"></a>($name, [$default_str=''], [$blank1stItem=true], 
+  [$multiple_select=false], [$size=0], [$moreAttr=''])</b></p>
+<p>Generate a HTML menu (&lt;select&gt;&lt;option&gt;&lt;option&gt;&lt;/select&gt;). 
+  The first column of the recordset (fields[0]) will hold the string to display 
+  in the option tags. If the recordset has more than 1 column, the second column 
+  (fields[1]) is the value to send back to the web server.. The menu will be given 
+  the name $<i>name</i>. 
+<p> If $<i>default_str</i> is defined, then if $<i>default_str</i> == fields[0], 
+  that field is selected. If $<i>blank1stItem</i> is true, the first option is 
+  empty. $<i>Default_str</i> can be array for a multiple select listbox.</p>
+<p>To get a listbox, set the $<i>size</i> to a non-zero value (or pass $default_str 
+  as an array). If $<i>multiple_select</i> is true then a listbox will be generated 
+  with $<i>size</i> items (or if $size==0, then 5 items) visible, and we will 
+  return an array to a server. Lastly use $<i>moreAttr </i> to add additional 
+  attributes such as javascript or styles. </p>
+<p>Menu Example 1: <code>GetMenu('menu1','A',true)</code> will generate a menu: 
+  <select name='menu1'>
+    <option> 
+    <option value=1 selected>A 
+    <option value=2>B 
+    <option value=3>C 
+  </select>
+  for the data (A,1), (B,2), (C,3). Also see <a href="#ex5">example 5</a>.</p>
+<p>Menu Example 2: For the same data, <code>GetMenu('menu1',array('A','B'),false)</code> 
+  will generate a menu with both A and B selected: <br>
+  <select name='menu1' multiple size=3>
+    <option value=1 selected>A 
+    <option value=2 selected>B 
+    <option value=3>C 
+  </select>
+<p> <b>GetMenu2<a name="GetMenu2"></a>($name, [$default_str=''], [$blank1stItem=true], 
+  [$multiple_select=false], [$size=0], [$moreAttr=''])</b></p>
+<p>This is nearly identical to GetMenu, except that the $<i>default_str</i> is 
+  matched to fields[1] (the option values).</p>
+<p>Menu Example 3: Given the data in menu example 2, <code>GetMenu2('menu1',array('1','2'),false)</code> 
+  will generate a menu with both A and B selected in menu example 2, but this 
+  time the selection is based on the 2nd column, which holds the values to return 
+  to the Web server. 
+<p><b>UserDate<a name="UserDate"></a>($str, [$fmt])</b></p>
+<p>Converts the date string $<b>str</b> to another format.UserDate calls UnixDate 
+  to parse $<b>str</b>, and $<b>fmt</b> defaults to Y-m-d if not defined.</p>
+<p><b>UserTimeStamp<a name="UserTimeStamp"></a>($str, [$fmt])</b></p>
+<p>Converts the timestamp string $<b>str</b> to another format. UserTimeStamp 
+  calls UnixTimeStamp to parse $<b>str</b>, and $<b>fmt</b> defaults to Y-m-d 
+  H:i:s if not defined.</p>
+<p><b>UnixDate<a name="unixdate"></a>($str)</b></p>
+<p>Parses the date string $<b>str</b> and returns it in unix mktime format (eg. 
+  a number indicating the seconds after January 1st, 1970). Expects the date to 
+  be in Y-m-d h:i:s format, except for Sybase and Microsoft SQL Server, where 
+  M d Y is also accepted (the 3 letter month strings are controlled by a global 
+  array, which might need localisation).</p>
+<p><b>UnixTimeStamp<a name="unixtimestamp"></a>($str)</b></p>
+<p>Parses the timestamp string $<b>str</b> and returns it in unix mktime format 
+  (eg. a number indicating the seconds after January 1st, 1970). Expects the date 
+  to be in Y-m-d H:i:s format, except for Sybase and Microsoft SQL Server, where 
+  M d Y h:i:sA is also accepted (the 3 letter month strings are controlled by 
+  a global array, which might need localisation)..</p>
+<p><b>MoveNext<a name="MoveNext"></a>( )</b></p>
+<p>Move the internal cursor to the next row. The <b>fields</b> array is automatically 
+  updated. Return false if unable to do so, otherwise true.. </p>
+<p><b>Move<a name="Move"></a>($to)</b></p>
+<p>Moves the internal cursor to a specific row $<b>to</b>. Rows are zero-based 
+  eg. 0 is the first row. The <b>fields</b> array is automatically updated. For 
+  databases that do not support scrolling internally, ADODB will simulate forward 
+  scrolling. Some databases do not support backward scrolling. If the $<b>to</b> 
+  position is after the EOF, $<b>to</b> will move to the end of the RecordSet 
+  for most databases. Some obscure databases using odbc might not behave this 
+  way.</p>
+<p>Note: This function uses <i>absolute positioning</i>, unlike Microsoft's ADO.</p>
+<p>Returns true or false. If false, the internal cursor is not moved in most implementations, 
+  so AbsolutePosition( ) will return the last cursor position before the Move( 
+  ). </p>
+<p><b>MoveFirst<a name="MoveFirst"></a>()</b></p>
+<p>Internally calls Move(0). Note that some databases do not support this function.</p>
+<p><b>MoveLast<a name="MoveLast"></a>()</b></p>
+<p>Internally calls Move(RecordCount()-1). Note that some databases do not support 
+  this function.</p>
+<p><b>GetRowAssoc</b><a name="getrowassoc"></a>($toUpper=true)</p>
+<p>Returns an associative array containing the current row. The keys to the array 
+  are the column names. The column names are upper-cased for easy access. To get 
+  the next row, you will still need to call MoveNext(). </p>
+<p>For example:<br>
+  Array ( [ID] => 1 [FIRSTNAME] => Caroline [LASTNAME] => Miranda [CREATED] => 
+  2001-07-05 ) </p>
+</font>
+<p><font color="#000000"><b>AbsolutePage<a name="absolutepage"></a>($page=-1) </b></font></p>
+<p>Returns the current page. Requires PageExecute()/CachePageExecute() to be called. See <a href=#ex8>Example 8</a>.</p>
+<font color="#000000"> 
+<p><b>AtFirstPage<a name="AtFirstPage">($status='')</a></b></p>
+<p>Returns true if at first page (1-based). Requires PageExecute()/CachePageExecute() to be called. See <a href=#ex8>Example 8</a>.</p>
+<p><b>AtLastPage<a name="AtLastPage">($status='')</a></b></p>
+<p>Returns true if at last page (1-based). Requires PageExecute()/CachePageExecute() to be called. See <a href=#ex8>Example 8</a>.</p>
+<p><b>Fields</b><a name="fields"></a>(<b>$colname</b>)</p>
+<p>Some database extensions (eg. MySQL) return arrays that are both associative 
+  and indexed if you use the native extensions. GetRowAssoc() does not return 
+  arrays that combine associative and indexed elements.</p>
+<p>Returns the value of the associated column $<b>colname</b> for the current 
+  row. The column name is case-insensitive.</p>
+<p><b>FetchField<a name="FetchField"></a>($column_number)</b></p>
+<p>Returns an object containing the <b>name</b>, <b>type</b> and <b>max_length</b> 
+  of the associated field. If the max_length cannot be determined reliably, it 
+  will be set to -1. The column numbers are zero-based. See <a href="#ex2">example 
+  2.</a></p>
+<p><b>FieldCount<a name="FieldCount"></a>( )</b></p>
+<p>Returns the number of fields (columns) in the record set.</p>
+<p><b>RecordCount<a name="RecordCount"></a>( )</b></p>
+<p>Returns the number of rows in the record set. Note that some databases do not 
+  support this, and will return -1. RowCount is a synonym for RecordCount.</p>
+<p>The following databases are known to return -1. Oci8, Oracle, Interbase.</p>
+<p><b>FetchObject<a name="FetchObject"></a>($toupper=true)</b></p>
+<p>Returns the current row as an object. If you set $toupper to true, then the 
+  object fields are set to upper-case. Note: The newer FetchNextObject() is the 
+  recommended way of accessing rows as objects. See below.</p>
+<p><b>FetchNextObject<a name="FetchNextObject"></a>($toupper=true)</b></p>
+<p>Gets the current row as an object and moves to the next row automatically. 
+  Returns false if at end-of-file. If you set $toupper to true, then the object 
+  fields are set to upper-case.</p>
+<pre>
+$rs = $db->Execute('select firstname,lastname from table');
+if ($rs) {
+	while ($o = $rs->FetchNextObject()) {
+		print "$o->FIRSTNAME, $o->LASTNAME&lt;BR>";
+	}
+}
+</pre>
+<p>There is some trade-off in speed in using FetchNextObject(). If performance 
+  is important, you should access rows with the <code>fields[]</code> array. 
+<p> 
+<p><b>CurrentRow<a name="CurrentRow"></a>( )</b></p>
+<p>Returns the current row of the record set. 0 is the first row.</p>
+<p><b>AbsolutePosition<a name="abspos"></a>( )</b></p>
+<p>Synonym for <b>CurrentRow</b> for compatibility with ADO. Returns the current 
+  row of the record set. 0 is the first row.</p>
+<p><b>MetaType<a name="MetaType"></a>($nativeDBType[,$field_max_length],[$fieldobj])</b></p>
+<p>Determine what <i>generic</i> meta type a database field type is given its 
+  native type $<b>nativeDBType</b> and the length of the field $<b>field_max_length</b>. 
+  Note that field_max_length can be -1 if it is not known. The field object returned 
+  by the database driver can be passed in $<b>fieldobj</b>. This is useful for 
+  databases such as <i>mysql</i> which has additional properties in the field 
+  object such as <i>primary_key</i>.</p>
+<p>Uses the field <b>blobSize</b> and compares it with $<b>field_max_length</b> 
+  to determine whether the character field is actually a blob.</p>
+<p>Returns:</p>
+<ul>
+  <li><b>C</b>: Character fields that should be shown in a &lt;input type=&quot;text&quot;&gt; 
+    tag. </li>
+  <li><b>B</b>: Blob, or large text fields that should be shown in a &lt;textarea&gt;</li>
+  <li><b>D</b>: Date field</li>
+  <li><b>T</b>: Timestamp field</li>
+  <li><b>L</b>: Logical field (boolean or bit-field)</li>
+  <li><b>N</b>: Numeric field. Includes decimal, numeric, floating point, and 
+    real. </li>
+  <li><b>I</b>: Integer field. </li>
+  <li><b>R</b>: Counter or Autoincrement field. Must be numeric.</li>
+</ul>
+<p><b>Close( )<a name="rsclose"></a></b></p>
+<p>Close the recordset.</p>
+<hr>
+<h3>function rs2html<a name="rs2html"></a>($adorecordset,[$tableheader_attributes], 
+  [$col_titles])</h3>
+<p>This is a standalone function (rs2html = recordset to html) that is similar 
+  to PHP's <i>odbc_result_all</i> function, it prints a ADORecordSet, $<b>adorecordset</b> 
+  as a HTML table. $<b>tableheader_attributes</b> allow you to control the table 
+  <i>cellpadding</i>, <i>cellspacing</i> and <i>border</i> attributes. Lastly 
+  you can replace the database column names with your own column titles with the 
+  array $<b>col_titles</b>. This is designed more as a quick debugging mechanism, 
+  not a production table recordset viewer.</p>
+<p>You will need to include the file <i>tohtml.inc.php</i>.</p>
+<p>Example of rs2html:<b><font color="#336600"><a name="exrs2html"></a></font></b></p>
+<pre><b><font color="#336600">&lt;?
+include('tohtml.inc.php')</font></b>; # load code common to ADODB 
+<b>include</b>('adodb.inc.php'); # load code common to ADODB 
+$<font color="#663300">conn</font> = &amp;ADONewConnection('mysql');   # create a connection 
+$<font color="#663300">conn</font>->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
+<font color="#000000">$<font color="#663300">sql</font> = 'select CustomerName, CustomerID from customers'; 
+$<font color="#663300">rs</font>   = $<font color="#663300">conn</font>->Execute($sql); 
+<font color="#336600"><b>rs2html</b></font><b>($<font color="#663300">rs</font>,'<i>border=2 cellpadding=3</i>',array('<i>Customer Name','Customer ID</i>'));
+?&gt;</b></font></pre>
+<hr>
+<h3>Differences Between this ADODB library and Microsoft ADO<a name="adodiff"></a></h3>
+<ol>
+  <li>ADODB only supports recordsets created by a connection object. Recordsets 
+    cannot be created independently.</li>
+  <li>ADO properties are implemented as functions in ADODB. This makes it easier 
+    to implement any enhanced ADO functionality in the future.</li>
+  <li>ADODB's <font face="Courier New, Courier, mono">ADORecordSet-&gt;Move()</font> 
+    uses absolute positioning, not relative. Bookmarks are not supported.</li>
+  <li><font face="Courier New, Courier, mono">ADORecordSet-&gt;AbsolutePosition() 
+    </font>cannot be used to move the record cursor.</li>
+  <li>ADO Parameter objects are not supported.</li>
+  <li>Recordset properties for paging records are available, but implemented as in <a href=#ex8>Example 8</a>.</li>
+</ol>
+<hr>
+<h1>Database Driver Guide<a name="DriverGuide"></a></h1>
+<p>This describes how to create a class to connect to a new database. To ensure 
+  there is no duplication of work, kindly email me at jlim@natsoft.com.my if you 
+  decide to create such a class.</p>
+<p>First decide on a name in lower case to call the database type. Let's say we 
+  call it xbase. </p>
+<p>Then we need to create two classes ADOConnection_xbase and ADORecordSet_xbase 
+  in the file adodb-xbase.inc.php.</p>
+<p>The simplest form of database driver is an adaptation of an existing ODBC driver. 
+  Then we just need to create the class <i>ADOConnection_xbase extends ADOConnection_odbc</i> 
+  to support the new <b>date</b> and <b>timestamp</b> formats, the <b>concatenation</b> 
+  operator used, <b>true</b> and <b>false</b>. For the<i> ADORecordSet_xbase extends 
+  ADORecordSet_odbc </i>we need to change the <b>MetaType</b> function. See<b> 
+  adodb-vfp.inc.php</b> as an example.</p>
+<p>More complicated is a totally new database driver that connects to a new PHP 
+  extension. Then you will need to implement several functions. Fortunately, you 
+  do not have to modify most of the complex code. You only need to override a 
+  few stub functions. See <b>adodb-mysql.inc.php</b> for example.</p>
+<p>The default date format of ADODB internally is YYYY-MM-DD (Ansi-92). All dates 
+  should be converted to that format when passing to an ADODB date function. See 
+  Oracle for an example how we use ALTER SESSION to change the default date format 
+  in _pconnect _connect.</p>
+<p><b>ADOConnection Functions to Override</b></p>
+<p>Defining a constructor for your ADOConnection derived function is optional. 
+  There is no need to call the base class constructor.</p>
+<p>_<b>connect</b>: Low level implementation of Connect. Returns true or false. 
+  Should set the _<b>connectionID</b>.</p>
+<p>_<b>pconnect:</b> Low level implemention of PConnect. Returns true or false. 
+  Should set the _<b>connectionID</b>.</p>
+<p>_<b>query</b>: Execute a query. Returns the queryID, or false.</p>
+<p>_<b>close: </b>Close the connection -- PHP should clean up all recordsets. 
+</p>
+<p><b>ErrorMsg</b>: Stores the error message in the private variable _errorMsg. 
+</p>
+<p>The ADOConnection functions BeginTrans( ), CommitTrans( ), RollbackTrans( ) 
+  are reserved for future expansion.</p>
+<p><b>ADOConnection Fields to Set</b></p>
+<p>_<b>bindInputArray</b>: Set to true if binding of parameters for SQL inserts 
+  and updates is allowed using ?, eg. as with ODBC.</p>
+<p><b>fmtDate</b></p>
+<p><b>fmtTimeStamp</b></p>
+<p><b>true</b></p>
+<p><b>false</b></p>
+<p><b>concat_operator</b></p>
+<p><b>replaceQuote</b></p>
+<p><b>hasLimit</b> support SELECT * FROM TABLE LIMIT 10 of MySQL.</p>
+<p><b>hasTop</b> support Microsoft style SELECT TOP 10 * FROM TABLE.</p>
+<p><b>ADORecordSet Functions to Override</b></p>
+<p>You will need to define a constructor for your ADORecordSet derived class that 
+  calls the parent class constructor.</p>
+<p><b>FetchField: </b> as documented above in ADORecordSet</p>
+<p>_<b>initrs</b>: low level initialization of the recordset: setup the _<b>numOfRows</b> 
+  and _<b>numOfFields</b> fields -- called by the constructor.</p>
+<p>_<b>seek</b>: seek to a particular row. Do not load the data into the fields 
+  array. This is done by _fetch. Returns true or false. Note that some implementations 
+  such as Interbase do not support seek. Set canSeek to false.</p>
+<p>_<b>fetch</b>: fetch a row using the database extension function and then move 
+  to the next row. Sets the <b>fields</b> array. If the parameter $ignore_fields 
+  is true then there is no need to populate the <b>fields</b> array, just move 
+  to the next row. then Returns true or false.</p>
+<p>_<b>close</b>: close the recordset</p>
+<p><b>Fields</b>: If the array row returned by the PHP extension is not an associative 
+  one, you will have to override this. See adodb-odbc.inc.php for an example. 
+  For databases such as MySQL and MSSQL where an associative array is returned, 
+  there is no need to override this function.</p>
+<p><b>ADOConnection Fields to Set</b></p>
+<p>canSeek: Set to true if the _seek function works.</p>
+<h2>ToDo:</h2>
+<p>See the <a href=http:#php.weblogs.com/adodb-todo-roadmap>RoadMap</a> article.</p>
+</font>
+</body>
+</html>
diff --git a/libraries/adodb/readme.txt b/libraries/adodb/readme.txt
new file mode 100755
index 00000000..62cd89ac
--- /dev/null
+++ b/libraries/adodb/readme.txt
@@ -0,0 +1,57 @@
+>> ADODB Library for PHP4
+
+(c) 2000, 2001 John Lim (jlim@natsoft.com.my) (jlim@natsoft.com.my)
+
+Released under both BSD and GNU Lesser GPL library license. 
+This means you can use it in proprietary products.
+ 
+ 
+>> Introduction
+
+PHP's database access functions are not standardised. 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.
+
+We currently support MySQL, Interbase, Sybase, PostgreSQL, Oracle, 
+Microsoft SQL server,  Foxpro ODBC, Access ODBC, generic ODBC and 
+Microsoft's ADO. We hope more people will contribute drivers to support 
+other databases.
+
+
+>> Documentation and Examples
+
+Refer to readme.htm for full documentation and examples. There is also a 
+tutorial tute.htm that contrasts ADODB code with mysql code.
+
+
+>>> Files
+Adodb.inc.php is the main file. You need to include only this file.
+
+Adodb-*.inc.php are the database specific driver code.
+
+Test.php contains a list of test commands to exercise the class library.
+
+Adodb-session.php is the PHP4 session handling code.
+
+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 simple SELECT 
+statement for databases described in testdatabases.inc.php. The benchmark
+tables are created in test.php.
+
+readme.htm is the main documentation.
+
+tute.htm is the tutorial.
+
+
+>> More Info
+
+For more information, including installation see readme.htm
+
+
+>> Feature Requests and Bug Reports
+
+Email to jlim@natsoft.com.my 
+
+ 
\ No newline at end of file
diff --git a/libraries/adodb/server.php b/libraries/adodb/server.php
new file mode 100755
index 00000000..9b58d266
--- /dev/null
+++ b/libraries/adodb/server.php
@@ -0,0 +1,92 @@
+<?php
+/** 
+ * (c)2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+ */
+ 
+/* Documentation on usage is at http://php.weblogs.com/adodb_csv
+ *
+ * Legal query string parameters:
+ * 
+ * sql = holds sql string
+ * nrows = number of rows to return 
+ * offset = skip offset rows of data
+ * 
+ * example:
+ *
+ * http://localhost/php/server.php?select+*+from+table&nrows=10&offset=2
+ */
+
+
+/* 
+ * Define the IP address you want to accept requests from 
+ * as a security measure. If blank we accept anyone promisciously!
+ */
+$ACCEPTIP = '';
+
+/*
+ * Connection parameters
+ */
+$driver = 'mysql';
+$host = 'mangrove'; // DSN for odbc
+$uid = 'root';
+$pwd = '';
+$database = 'xphplens';
+
+/*============================ DO NOT MODIFY BELOW HERE =================================*/
+// $sep must match csv2rs() in adodb.inc.php
+$sep = ' :::: ';
+
+include('./adodb.inc.php');
+
+function err($s)
+{
+	die('**** '.$s.' ');
+}
+
+// undo stupid magic quotes
+function undomq(&$m) 
+{
+	if (get_magic_quotes_gpc()) {
+		// undo the damage
+		$m = str_replace('\\\\','\\',$m);
+		$m = str_replace('\"','"',$m);
+		$m = str_replace('\\\'','\'',$m);
+		
+	}
+	return $m;
+}
+
+///////////////////////////////////////// DEFINITIONS
+
+
+if (isset($REMOTE_ADDR)) $remote = $REMOTE_ADDR; // Apache
+else $remote = $HTTP_SERVER_VARS["REMOTE_ADDR"]; // IIS
+ 
+if (empty($HTTP_GET_VARS['sql'])) err('No SQL');
+
+if (!empty($ACCEPTIP))
+ if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
+ 	err("Unauthorised client: '$remote'");
+
+
+$conn = &ADONewConnection($driver);
+if (!$conn->Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
+$sql = undomq($HTTP_GET_VARS['sql']);
+
+if (isset($HTTP_GET_VARS['nrows'])) {
+	$nrows = $HTTP_GET_VARS['nrows'];
+	$offset = isset($HTTP_GET_VARS['offset']) ? $HTTP_GET_VARS['offset'] : -1;
+	$rs = $conn->SelectLimit($sql,$nrows,$offset);
+} else 
+	$rs = $conn->Execute($sql);
+if ($rs){ 
+	//$rs->timeToLive = 1;
+	print rs2csv($rs,$conn,$sql);
+	$rs->Close();
+} else
+	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
+
+?>
\ No newline at end of file
diff --git a/libraries/adodb/test.php b/libraries/adodb/test.php
new file mode 100755
index 00000000..f7b3fe6a
--- /dev/null
+++ b/libraries/adodb/test.php
@@ -0,0 +1,436 @@
+<?php
+/* 
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+  Set tabs to 4 for best viewing.
+    
+  Latest version is available at http://php.weblogs.com/
+*/
+	
+?><html>
+<title>ADODB TEST</title>
+<body bgcolor=white>
+<H1>ADODB Test</H1>
+
+This script tests the following databases: Interbase, Oracle, Visual FoxPro, Microsoft Access (ODBC and ADO), MySQL, MSSQL (ODBC, native, ADO). 
+There is also support for Sybase, PostgreSQL.</p>
+For the latest version of ADODB, visit <a href=http://php.weblogs.com/ADODB>php.weblogs.com</a>.</p>
+<?php
+
+// Set the following control flags to true/false to enable testing for a particular database.
+
+//$testoracle = true;
+//$testibase = true;
+
+$testaccess = true;
+$testpostgres = true;
+$testmysql = true;
+//$testmssql = true;
+$testvfp = true;
+//$testado = true;
+
+error_reporting(63);
+
+set_time_limit(240); // increase timeout
+
+include("./tohtml.inc.php");
+include("./adodb.inc.php");		
+
+// the table creation code is specific to the database, so we allow the user 
+// to define their own table creation stuff
+function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
+{
+GLOBAL $ADODB_vers,$ADODB_CACHE_DIR;
+?>	<form>
+	</p>
+	<table width=100% ><tr><td bgcolor=beige>&nbsp;</td></tr></table>
+	</p>
+<?php  
+	$create =false;
+      	$ADODB_CACHE_DIR = dirname(TempNam('/tmp','testadodb'));
+	
+	$db->debug = false;
+	
+	$phpv = phpversion();
+	print "<h3>ADODB Version: $ADODB_vers Host: <i>$db->host</i> &nbsp; Database: <i>$db->database</i> &nbsp; PHP: $phpv</h3>";
+	$e = error_reporting(63-E_WARNING);
+	print "<p>Testing bad connection. Ignore following error msgs:<br>";
+	$db2 = ADONewConnection();
+	$rez = $db2->Connect("bad connection");
+	$err = $db2->ErrorMsg();
+	error_reporting($e);
+	
+	print "<i>Error='$err'</i></p>";
+	if ($rez) print "<b>Cannot check if connection failed.</b> The Connect() function returned true.</p>";
+	
+	$rs=$db->Execute('select * from adoxyz');
+	if($rs === false) $create = true;
+	else $rs->Close();
+	
+	//if ($db->databaseType !='vfp') $db->Execute("drop table ADOXYZ");
+        
+	if ($create) {
+                if ($db->databaseType == 'ibase') {
+                        print "<b>Please create the following table for testing:</b></p>$createtab</p>";
+                        return;
+                } else
+                        $db->Execute($createtab);
+        }
+	
+	$rs = &$db->Execute("delete from ADOXYZ"); // some ODBC drivers will fail the drop so we delete
+	if ($rs) {
+		if(! $rs->EOF)print "<b>Error: </b>RecordSet returned by Execute('delete...') should show EOF</p>";
+		$rs->Close();
+	} else print "err=".$db->ErrorMsg();
+	
+	print "<p>Test select on empty table</p>";
+	$rs = &$db->Execute("select * from ADOXYZ where id=9999");
+	if ($rs && !$rs->EOF) print "<b>Error: </b>RecordSet returned by Execute(select...') on empty table should show EOF</p>";
+	if ($rs) $rs->Close();
+	
+	
+	$db->debug=false;	
+	print "<p>Testing Commit: ";
+	$time = $db->DBDate(time());
+	if (!$db->BeginTrans()) print '<b>Transactions not supported</b></p>';
+	else { /* COMMIT */
+		$rs = $db->Execute("insert into ADOXYZ values (99,'Should Not','Exist (Commit)',$time)");
+		if ($rs && $db->CommitTrans()) {
+			$rs->Close();
+			$rs = &$db->Execute("select * from ADOXYZ where id=99");
+			if ($rs === false || $rs->EOF) {
+				print '<b>Data not saved</b></p>';
+				$rs = &$db->Execute("select * from ADOXYZ where id=99");
+				print_r($rs);
+				die();
+			} else print 'OK</p>';
+			if ($rs) $rs->Close();
+		} else
+			print "<b>Commit failed</b></p>";
+		
+		/* ROLLBACK */	
+		if (!$db->BeginTrans()) print "<p><b>Error in BeginTrans</b>()</p>";
+		print "<p>Testing Rollback: ";
+		$db->Execute("insert into ADOXYZ values (100,'Should Not','Exist (Rollback)',$time)");
+		if ($db->RollbackTrans()) {
+			$rs = $db->Execute("select * from ADOXYZ where id=100");
+			if ($rs && !$rs->EOF) print '<b>Fail: Data should rollback</b></p>';
+			else print 'OK</p>';
+			if ($rs) $rs->Close();
+		} else
+			print "<b>Commit failed</b></p>";
+			
+		$rs = &$db->Execute('delete from ADOXYZ where id>50');
+		if ($rs) $rs->Close();
+	}
+	
+	if (1) {
+		print "<p>Testing MetaTables() and MetaColumns()</p>";
+		$a = $db->MetaTables();
+		if ($a===false) print "<b>MetaTables not supported</b></p>";
+		else {
+			print "Array of tables: "; 
+			foreach($a as $v) print " ($v) ";
+			print '</p>';
+		}
+		$a = $db->MetaColumns('ADOXYZ');
+		if ($a===false) print "<b>MetaColumns not supported</b></p>";
+		else {
+			print "<p>Columns of ADOXYZ: ";
+			foreach($a as $v) print " ($v->name $v->type $v->max_length) ";
+		}
+	}
+	$rs = &$db->Execute('delete from ADOXYZ');
+	if ($rs) $rs->Close();
+	
+	$db->debug = false;
+	
+	print "<p>Inserting 50 rows</p>";
+
+	for ($i = 0; $i < 5; $i++) {	
+	
+	$time = $db->DBDate(time());
+	$db->debug = true;
+	switch($db->dataProvider){
+	case 'ado':
+	default:
+		
+		$arr = array(0=>'Caroline',1=>'Miranda');
+		$rs = $db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)",$arr);
+		if ($rs === false) print '<b>Error inserting with parameters</b><br>';
+        else $rs->Close();
+		break;
+
+	case 'oci8':
+		$arr = array('first'=>'Caroline','last'=>'Miranda');
+		$rs = $db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,:first,:last,$time)",$arr);
+		if ($rs === false) print '<b>Error inserting with parameters</b><br>';
+        else $rs->Close();
+		break;
+	/*
+	case 'odbc':
+	// currently there are bugs using parameters with ODBC with PHP 4
+		$rs=$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,'Caroline','Miranda',$time)");
+		if ($rs === false) print $rs->ErrorMsg.'<b>Error inserting Caroline</b><br>';
+                else $rs->Close();
+		break;*/
+	}
+	$db->debug = false;
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+1,'John','Lim',$time)");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+2,'Mary','Lamb',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+3,'George','Washington',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+4,'Mr. Alan','Tam',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+5,'Alan','Turing',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created)values ($i*10+6,'Serena','Williams',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+7,'Yat Sun','Sun',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+8,'Wai Hun','See',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+9,'Steven','Oey',$time )");
+	}
+        
+    $db->Execute('update ADOXYZ set id=id+1');
+    $nrows = $db->Affected_Rows();
+    if ($nrows === false) print "<p><b>Affected_Rows() not supported</b></p>";
+    else if ($nrows != 50)  print "<p><b>Affected_Rows() Error: $nrows returned (should be 50) </b></p>";
+    else print "<p>Affected_Rows() passed</p>";
+	$db->debug = false;
+
+ ///////////////////////////////
+ 	
+	$rs = &$db->Execute("select * from ADOXYZ order by id");
+	if ($rs) {
+		if ($rs->RecordCount() != 50) print "<p><b>RecordCount returns -1</b></p>";
+		if (isset($rs->fields['firstname'])) print '<p>The fields columns can be indexed by column name.</p>';
+		else print '<p>The fields columns <i>cannot</i> be indexed by column name.</p>';
+		rs2html($rs);
+	}
+	else print "<b>Error in Execute of SELECT</b></p>";
+	
+	print "<p>FetchObject/FetchNextObject Test</p>";
+	$rs = &$db->Execute('select * from ADOXYZ');
+	while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
+		if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
+			print_r($o);
+			print "<p><b>Firstname is not string</b></p>";
+			break;
+		}
+	}
+	
+	global $ADODB_FETCH_MODE;
+	$savefetch = $ADODB_FETCH_MODE;
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	print "<p>FETCH_MODE = ASSOC: Should get 1, Caroline</p>";
+	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
+	if ($rs && !$rs->EOF) {
+		if ($rs->fields['id'] != 1)  {print "<b>Error 1</b><br>"; print_r($rs->fields);};
+		if (trim($rs->fields['firstname']) != 'Caroline')  {print "<b>Error 2</b><br>"; print_r($rs->fields);};
+	}
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	print "<p>FETCH_MODE = NUM: Should get 1, Caroline</p>";
+	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
+	if ($rs && !$rs->EOF) {
+		if ($rs->fields[0] != 1)  {print "<b>Error 1</b><br>"; print_r($rs->fields);};
+		if (trim($rs->fields[1]) != 'Caroline')  {print "<b>Error 2</b><br>"; print_r($rs->fields);};
+
+	}
+	$ADODB_FETCH_MODE = $savefetch;
+	
+	print "<p>GetRowAssoc Upper: Should get 1, Caroline</p>";
+	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
+	if ($rs && !$rs->EOF) {
+		$arr = &$rs->GetRowAssoc();
+		if ($arr['ID'] != 1) {print "<b>Error 1</b><br>"; print_r($arr);};
+		if (trim($arr['FIRSTNAME']) != 'Caroline') {print "<b>Error 2</b><br>"; print_r($arr);};
+	}
+	print "<p>GetRowAssoc Lower: Should get 1, Caroline</p>";
+	$rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
+	if ($rs && !$rs->EOF) {
+		$arr = &$rs->GetRowAssoc(false);
+		if ($arr['id'] != 1) {print "<b>Error 1</b><br>"; print_r($arr);};
+		if (trim($arr['firstname']) != 'Caroline') {print "<b>Error 2</b><br>"; print_r($arr);};
+
+	}
+	
+	print "<p>SelectLimit Test 1: Should see Caroline, John and Mary</p>";
+	$rs = &$db->SelectLimit('select distinct * from ADOXYZ order by id',3);
+	if ($rs && !$rs->EOF) {
+		if (trim($rs->fields[1]) != 'Caroline') print "<b>Error 1</b><br>";
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'John') print "<b>Error 2</b><br>";
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'Mary') print "<b>Error 3</b><br>";
+		$rs->MoveNext();
+		if (! $rs->EOF) print "<b>Not EOF</b><br>";
+		//rs2html($rs);
+	}
+	else "<p><b>Failed SelectLimit Test 1</b></p>";
+	print "<p>SelectLimit Test 2: Should see Mary, George and Mr. Alan</p>";
+	$rs = &$db->SelectLimit('select * from ADOXYZ order by id',3,2);
+	if ($rs && !$rs->EOF) {
+		if (trim($rs->fields[1]) != 'Mary') print "<b>Error 1</b><br>";
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'George') print "<b>Error 2</b><br>";
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'Mr. Alan') print "<b>Error 3</b><br>";
+		$rs->MoveNext();
+		if (! $rs->EOF) print "<b>Not EOF</b><br>";
+	//	rs2html($rs);
+	}
+	else "<p><b>Failed SelectLimit Test 2</b></p>";
+	
+	print "<p>SelectLimit Test 3: Should see Wai Hun and Steven</p>";
+	$rs = &$db->SelectLimit('select * from ADOXYZ order by id',-1,48);
+	if ($rs && !$rs->EOF) {
+		if (trim($rs->fields[1]) != 'Wai Hun') print "<b>Error 1</b><br>";
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'Steven') print "<b>Error 2</b><br>";
+		$rs->MoveNext();
+		if (! $rs->EOF) print "<b>Not EOF</b><br>";
+		//rs2html($rs);
+	}
+	else "<p><b>Failed SelectLimit Test 3</b></p>";
+	
+        $rs = &$db->Execute("select * from ADOXYZ order by id");
+	print "<p>Testing Move()</p>";	
+	if (!$rs)print "<b>Failed Move SELECT</b></p>";
+	else {
+		if (!$rs->Move(2)) {
+			if (!$rs->canSeek) print "<p>$db->databaseType: <b>Move(), MoveFirst() nor MoveLast() not supported.</b></p>";
+			else print '<p><b>RecordSet->canSeek property should be set to false</b></p>';
+		} else {
+			$rs->MoveFirst();
+			if (trim($rs->Fields("firstname")) != 'Caroline') {
+				print "<p><b>$db->databaseType: MoveFirst failed -- probably cannot scroll backwards</b></p>";
+			}
+			else print "MoveFirst() OK<BR>";
+                        
+                        // Move(3) tests error handling -- MoveFirst should not move cursor
+			$rs->Move(3);
+			if (trim($rs->Fields("firstname")) != 'George') {
+				print '<p>'.$rs->Fields("id")."<b>$db->databaseType: Move(3) failed</b></p>";
+				print_r($rs);
+			} else print "Move(3) OK<BR>";
+                        
+            		$rs->Move(7);
+			if (trim($rs->Fields("firstname")) != 'Yat Sun') {
+				print '<p>'.$rs->Fields("id")."<b>$db->databaseType: Move(7) failed</b></p>";
+				print_r($rs);
+			} else print "Move(7) OK<BR>";
+
+			$rs->MoveLast();
+			if (trim($rs->Fields("firstname")) != 'Steven'){
+				 print '<p>'.$rs->Fields("id")."<b>$db->databaseType: MoveLast() failed</b></p>";
+				 print_r($rs);
+			}else print "MoveLast() OK<BR>";
+		}
+	}
+	
+ //	$db->debug=true;
+	print "<p>Testing concat: concat firstname and lastname</p>";
+	
+	if ($db->databaseType == 'postgres')
+		$rs = &$db->Execute("select distinct ".$db->Concat('(firstname',$db->qstr(' ').')','lastname')." from ADOXYZ");
+	else
+		$rs = &$db->Execute("select distinct ".$db->Concat('firstname',$db->qstr(' '),'lastname')." from ADOXYZ");
+	if ($rs) {
+		rs2html($rs);
+	} else print "<b>Failed Concat</b></p>";
+	
+	print "<hr>Testing GetArray() ";
+	$rs = &$db->Execute("select * from ADOXYZ order by id");
+	if ($rs) {
+		$arr = &$rs->GetArray(10);
+		if (sizeof($arr) != 10 || trim($arr[1][1]) != 'John' || trim($arr[1][2]) != 'Lim') print $arr[1][1].' '.$arr[1][2]."<b> &nbsp; ERROR</b><br>";
+		else print " OK<BR>";
+	}
+	
+	print "Testing FetchNextObject for 1 object ";
+	$rs = &$db->Execute("select distinct lastname,firstname from ADOXYZ where firstname='Caroline'");
+	$fcnt = 0;
+	if ($rs)
+	while ($o = $rs->FetchNextObject()) {
+		$fcnt += 1;	
+	}
+	if ($fcnt == 1) print " OK<BR>";
+	else print "<b>FAILED</b><BR>";
+	
+	print "Testing GetAssoc() ";
+	$rs = &$db->Execute("select distinct lastname,firstname from ADOXYZ");
+	if ($rs) {
+		$arr = $rs->GetAssoc();
+		if (trim($arr['See']) != 'Wai Hun') print $arr['See']." &nbsp; <b>ERROR</b><br>";
+		else print " OK<BR>";
+	}
+	
+	for ($loop=0; $loop < 1; $loop++) {
+	print "Testing GetMenu() and CacheExecute<BR>";
+	$db->debug = true;
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu('menu','Steven').'<BR>'; 
+	else print " Fail<BR>";
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu('menu','Steven',false).'<BR>';
+	else print " Fail<BR>";
+	
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print ' Multiple, Alan selected: '. $rs->GetMenu('menu','Alan',false,true).'<BR>';
+	else print " Fail<BR>";
+	print '</p><hr>';
+	
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print ' Multiple, Alan and George selected: '. $rs->GetMenu('menu',array('Alan','George'),false,true);
+	else print " Fail<BR>";
+	print '</p><hr>';
+	
+	print "Testing GetMenu2() <BR>";
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu2('menu',('Oey')).'<BR>'; 
+	else print " Fail<BR>";
+	$rs = &$db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu2('menu',('Oey'),false).'<BR>';
+	else print " Fail<BR>";
+	}
+	
+	$db->debug = false;
+	$rs1 = &$db->Execute("select id from ADOXYZ where id = 2 or id = 1 order by 1");
+	$rs2 = &$db->Execute("select id from ADOXYZ where id = 3 or id = 4 order by 1");
+	
+	if ($rs1) $rs1->MoveLast();
+	if ($rs2) $rs2->MoveLast();
+	
+
+	if (empty($rs1) || empty($rs2) || $rs1->fields[0] != 2 || $rs2->fields[0] != 4) {
+		$a = $rs1->fields[0];
+		$b = $rs2->fields[0];
+		print "<p><b>Error in multiple recordset test rs1=$a rs2=%b (should be rs1=2 rs2=4)</b></p>";
+	} else
+		print "<p>Testing multiple recordsets</p>";
+	$sql = "seleckt zcol from NoSuchTable_xyz";
+	print "<p>Testing execution of illegal statement: <i>$sql</i></p>";
+	if ($db->Execute($sql) === false) {
+		print "<p>This returns the following ErrorMsg(): <i>".$db->ErrorMsg()."</i> and ErrorNo(): ".$db->ErrorNo().'</p>';
+	} else 
+		print "<p><b>Error in error handling -- Execute() should return false</b></p>";
+
+	echo "<p> GenID test: ";
+	for ($i=1; $i <= 10; $i++)
+		echo  "($i: ",$db->GenID('abc'), ") ";
+	echo "<p>";
+?>
+	</p>
+	<table width=100% ><tr><td bgcolor=beige>&nbsp;</td></tr></table>
+	</p></form>
+<?php
+	if ($rs1) $rs1->Close();
+	if ($rs2) $rs2->Close();
+        if ($rs) $rs->Close();
+        $db->Close();
+}
+
+include('./testdatabases.inc.php');
+
+?>
+<p><i>ADODB Database Library  (c) 2000, 2001 John Lim. All rights reserved. Released under BSD and LGPL.</i></p>
+</body>
+</html>
diff --git a/libraries/adodb/test2.php b/libraries/adodb/test2.php
new file mode 100755
index 00000000..03b0e1d3
--- /dev/null
+++ b/libraries/adodb/test2.php
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<title>Untitled</title>
+</head>
+
+<body>
+<?php
+/*
+  V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 8.
+ */
+# test connecting to 2 MySQL databases simultaneously
+
+include("tohtml.inc.php");
+include("adodb.inc.php");	
+
+ADOLoadCode('mysql');
+
+$c1 = ADONewConnection('mysql');
+$c2 = ADONewConnection('mysql');
+
+if (!$c1->PConnect('flipper','','',"test")) 
+	die("Cannot connect to flipper");
+if (!$c2->PConnect('mangrove','root','',"northwind")) 
+	die("Cannot connect to mangrove");
+
+print "<h3>Flipper</h3>";
+$t = $c1->MetaTables(); # list all tables in DB
+print_r($t);
+# select * from last table in DB
+rs2html($c1->Execute("select * from ".$t[sizeof($t)-1])); 
+
+print "<h3>Mangrove</h3>";
+$t = $c2->MetaTables();
+print_r($t);
+rs2html($c2->Execute("select * from ".$t[sizeof($t)-1] ));
+
+print "<h3>Flipper</h3>";
+$t = $c1->MetaTables();
+print_r($t);
+rs2html($c1->Execute("select * from ".$t[sizeof($t)-1]));
+
+?>
+
+
+</body>
+</html>
diff --git a/libraries/adodb/test3.php b/libraries/adodb/test3.php
new file mode 100755
index 00000000..4e69d6ce
--- /dev/null
+++ b/libraries/adodb/test3.php
@@ -0,0 +1,30 @@
+<code>
+<?php
+/*
+  V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 8.
+ */
+#test Move
+include("adodb.inc.php");	
+
+$c1 = &ADONewConnection('postgres');
+if (!$c1->PConnect("susetikus","tester","test","test")) 
+	die("Cannot connect to database");
+
+# select * from last table in DB
+$rs = $c1->Execute("select * from adoxyz order by 1"); 
+
+$i = 0;
+$max = $rs->RecordCount();
+if ($max == -1) "RecordCount returns -1<br>";
+while (!$rs->EOF and $i < $max) {
+	$rs->Move($i);
+	print_r( $rs->fields);
+	print '<BR>';
+	$i++;
+}
+?>
+</code>
\ No newline at end of file
diff --git a/libraries/adodb/test4.php b/libraries/adodb/test4.php
new file mode 100755
index 00000000..59bb3852
--- /dev/null
+++ b/libraries/adodb/test4.php
@@ -0,0 +1,64 @@
+<?php
+
+
+function testsql()
+{
+
+include('adodb.inc.php');
+include('tohtml.inc.php');
+
+//==========================
+// This code tests an insert
+
+$sql = "SELECT * FROM ADOXYZ WHERE id = -1"; 
+// Select an empty record from the database 
+
+$conn = &ADONewConnection("mysql");  // create a connection
+$conn->debug=1;
+$conn->PConnect("localhost", "admin", "", "test"); // connect to MySQL, testdb
+$rs = $conn->Execute($sql); // Execute the query and get the empty recordset
+
+$record = array(); // Initialize an array to hold the record data to insert
+
+// Set the values for the fields in the record
+$record["firstname"] = "Bob";
+$record["lastname"] = "Smith";
+$record["created"] = time();
+
+// Pass the empty recordset and the array containing the data to insert
+// into the GetInsertSQL function. The function will process the data and return
+// a fully formatted insert sql statement.
+$insertSQL = $conn->GetInsertSQL($rs, $record);
+
+$conn->Execute($insertSQL); // Insert the record into the database
+
+
+
+//==========================
+// This code tests an update
+
+$sql = "SELECT * FROM ADOXYZ WHERE id = 1"; 
+// Select a record to update 
+
+$rs = $conn->Execute($sql); // Execute the query and get the existing record to update
+
+$record = array(); // Initialize an array to hold the record data to update
+
+// Set the values for the fields in the record
+$record["firstname"] = "Caroline";
+$record["lastname"] = "Smith"; // Update Caroline's lastname from Miranda to Smith
+
+
+// Pass the single record recordset and the array containing the data to update
+// into the GetUpdateSQL function. The function will process the data and return
+// a fully formatted update sql statement.
+// If the data has not changed, no recordset is returned
+$updateSQL = $conn->GetUpdateSQL($rs, $record);
+
+$conn->Execute($updateSQL); // Update the record in the database
+
+}
+
+
+testsql();
+?>
\ No newline at end of file
diff --git a/libraries/adodb/test5.php b/libraries/adodb/test5.php
new file mode 100755
index 00000000..e4c95f19
--- /dev/null
+++ b/libraries/adodb/test5.php
@@ -0,0 +1,35 @@
+<?php
+
+// Select an empty record from the database 
+
+include('adodb.inc.php');
+include('tohtml.inc.php');
+
+if (0) {
+	$conn = &ADONewConnection('mysql');
+	$conn->debug=1;
+	$conn->PConnect("localhost","root","","xphplens");
+	print $conn->databaseType.':'.$conn->GenID().'<br>';
+}
+
+if (0) {
+	$conn = &ADONewConnection("oci8");  // create a connection
+	$conn->debug=1;
+	$conn->PConnect("falcon", "scott", "tiger", "juris8.ecosystem.natsoft.com.my"); // connect to MySQL, testdb
+	print $conn->databaseType.':'.$conn->GenID();
+}
+
+if (0) {
+	$conn = &ADONewConnection("ibase");  // create a connection
+	$conn->debug=1;
+	$conn->Connect("localhost:c:\\Interbase\\Examples\\Database\\employee.gdb", "sysdba", "masterkey", ""); // connect to MySQL, testdb
+	print $conn->databaseType.':'.$conn->GenID().'<br>';
+}
+
+if (0) {
+	$conn = &ADONewConnection('postgres');
+	$conn->debug=1;
+	@$conn->PConnect("susetikus","tester","test","test");
+	print $conn->databaseType.':'.$conn->GenID().'<br>';
+}
+?>
diff --git a/libraries/adodb/testcache.php b/libraries/adodb/testcache.php
new file mode 100755
index 00000000..d0e3a0fd
--- /dev/null
+++ b/libraries/adodb/testcache.php
@@ -0,0 +1,20 @@
+<html>
+<body>
+<?php
+
+$ADODB_CACHE_DIR = dirname(tempnam('/tmp',''));
+include("adodb.inc.php");
+
+if (isset($access)) {
+	$db=ADONewConnection('access');
+	$db->PConnect('nwind');
+} else {
+	$db = ADONewConnection('mysql');
+	$db->PConnect('mangrove','root','','xphplens');
+}
+if (isset($cache)) $rs = $db->CacheExecute(120,'select * from products');
+else $rs = $db->Execute('select * from products');
+
+$arr = $rs->GetArray();
+print sizeof($arr);
+?>
\ No newline at end of file
diff --git a/libraries/adodb/testdatabases.inc.php b/libraries/adodb/testdatabases.inc.php
new file mode 100755
index 00000000..5841e806
--- /dev/null
+++ b/libraries/adodb/testdatabases.inc.php
@@ -0,0 +1,164 @@
+<?php
+  
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+*/ 
+ 
+ /* this file is used by the ADODB test program: test.php */
+ 
+// cannot test databases below, but we include them anyway to check
+// if they parse ok...
+ADOLoadCode("sybase");
+ADOLoadCode("postgres");
+ADOLoadCode("postgres7");
+
+if (!empty($testpostgres)) {
+	//ADOLoadCode("postgres");
+	$db = &ADONewConnection('postgres');
+	print "<h1>Connecting $db->databaseType...</h1>";
+	if (@$db->PConnect("susetikus","tester","test","test")) {
+		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname varchar,created date)");
+	}else
+		print "ERROR: PostgreSQL requires a database called test on server susetikus, user tester, password test.<BR>".$db->ErrorMsg();
+}
+if (!empty($testibase)) {
+	
+	$db = &ADONewConnection('ibase');
+	print "<h1>Connecting $db->databaseType...</h1>";
+	if (@$db->PConnect("localhost:c:\\interbase\\examples\\database\\employee.gdb", "sysdba", "masterkey", ""))
+		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname char(24),created date)");
+	 else print "ERROR: Interbase test requires a database called employee.gdb".'<BR>'.$db->ErrorMsg();
+	
+}
+
+// REQUIRES ODBC DSN CALLED nwind
+if (!empty($testaccess)) {
+
+	$db = &ADONewConnection('access');
+	print "<h1>Connecting $db->databaseType...</h1>";
+	
+	if (@$db->PConnect("northwind", "", "", ""))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	else print "ERROR: Access test requires a Windows ODBC DSN=nwind, Access driver";
+	
+}
+
+if (!empty($testaccess) && !empty($testado)) { // ADO ACCESS
+	
+	$db = &ADONewConnection("ado_access");
+	print "<h1>Connecting $db->databaseType...</h1>";
+	
+	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
+	$myDSN =  'PROVIDER=Microsoft.Jet.OLEDB.4.0;'
+		. 'DATA SOURCE=' . $access . ';';
+		//. 'USER ID=;PASSWORD=;';
+	
+	if (@$db->PConnect($myDSN, "", "", "")) {
+		print "ADO version=".$db->_connectionID->version."<br>";
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	} else print "ERROR: Access test requires a Access database $access".'<BR>'.$db->ErrorMsg();
+	
+}
+
+if (!empty($testvfp)) { // ODBC
+
+	
+	$db = &ADONewConnection('vfp');
+	print "<h1>Connecting $db->databaseType...</h1>";
+	if (@$db->PConnect("logos2", "", "", ""))
+		testdb($db,"create table d:\\inetpub\\wwwroot\\logos2\\data\\ADOXYZ (id int, firstname char(24), lastname char(24),created date)");
+	 else print "ERROR: Visual FoxPro test requires a Windows ODBC DSN=logos2, VFP driver";
+	
+}
+
+
+// REQUIRES MySQL server at localhost with database 'test'
+if (!empty($testmysql)) { // MYSQL
+	
+	$db = &ADONewConnection('mysqlt');
+	print "<h1>Connecting $db->databaseType...</h1>";
+	if (@$db->PConnect("localhost", "root", "", "test"))
+		testdb($db);
+	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
+	
+}
+
+ADOLoadCode("oci8");
+if (!empty($testoracle)) { 
+	
+	$db = ADONewConnection();
+	print "<h1>Connecting $db->databaseType...</h1>";
+	if ($db->PConnect("localhost:4321", "scott", "tiger", "natsoft.domain"))
+	//if ($db->PConnect("falcon", "scott", "tiger", "juris8.ecosystem.natsoft.com.my"))
+		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+	else print "ERROR: Oracle test requires an Oracle server setup with scott/tiger".'<BR>'.$db->ErrorMsg();
+
+}
+ADOLoadCode("oracle");
+if (!empty($testoracle)) { 
+	
+	$db = ADONewConnection();
+	print "<h1>Connecting $db->databaseType...</h1>";
+	if ($db->PConnect("", "scott", "tiger", "natsoft.domain"))
+		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+	else print "ERROR: Oracle test requires an Oracle server setup with scott/tiger".'<BR>'.$db->ErrorMsg();
+
+}
+
+
+ADOLoadCode("odbc_mssql");
+if (!empty($testmssql)) { // MS SQL Server via ODBC
+	
+	$db = ADONewConnection();
+	print "<h1>Connecting $db->databaseType...</h1>";
+	if (@$db->PConnect("lensengine", "sa", "", ""))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with DSN='lensengine', userid='sa', password=''";
+
+}
+
+ADOLoadCode("ado_mssql");
+
+if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru ODBC -- DSN-less
+	
+	$db = &ADONewConnection("ado_mssql");
+	print "<h1>Connecting DSN-less $db->databaseType...</h1>";
+	
+	$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
+		. "SERVER=mangrove;DATABASE=ai;UID=sa;PWD=;"  ;
+
+		
+	if (@$db->PConnect($myDSN, "", "", ""))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='mangrove', userid='sa', password='', database='ai'";
+	
+}
+
+
+ADOLoadCode("mssql");
+if (!empty($testmssql)) { // MS SQL Server -- the extension is buggy -- probably better to use ODBC
+	$db = ADONewConnection();
+	print "<h1>Connecting $db->databaseType...</h1>";
+	if (@$db->PConnect("mangrove", "sa", "", "ai"))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='192.168.0.1', userid='sa', password='', database='ai'".'<BR>'.$db->ErrorMsg();
+	
+}
+
+if (!empty($testmssql) && !empty($testado)) { // ADO ACCESS MSSQL with OLEDB provider
+
+	$db = &ADONewConnection("ado_mssql");
+	print "<h1>Connecting DSN-less OLEDB Provider $db->databaseType...</h1>";
+	
+	$myDSN="SERVER=mangrove;DATABASE=ai;";
+		
+	if (@$db->PConnect($myDSN, "sa", "", 'SQLOLEDB'))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='mangrove', userid='sa', password='', database='ai'";
+
+}
+
+?>
\ No newline at end of file
diff --git a/libraries/adodb/testoci8.php b/libraries/adodb/testoci8.php
new file mode 100755
index 00000000..fa8180e8
--- /dev/null
+++ b/libraries/adodb/testoci8.php
@@ -0,0 +1,43 @@
+<html>
+<body>
+<?php
+error_reporting(63);
+include("adodb.inc.php");
+include("tohtml.inc.php");
+
+if (1) {
+	$db = ADONewConnection('oci8');
+	$db->PConnect('','scott','tiger');
+	$db->debug = true;
+	$rs = &$db->Execute(
+		'select * from adoxyz where firstname=:first and trim(lastname)=:last',
+		array('first'=>'Caroline','last'=>'Miranda'));
+	if (!$rs) die("Empty RS");
+	if ($rs->EOF) die("EOF RS");
+	rs2html($rs);
+}
+if (1) {
+	$db = ADONewConnection('oci8');
+	$db->PConnect('','scott','tiger');
+	$db->debug = true;
+	$db->Execute("delete from emp where ename='John'");
+	print $db->Affected_Rows().'<BR>';
+	$stmt = &$db->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
+	$rs = $db->Execute($stmt,array('empno'=>4321,'ename'=>'John'));
+	// prepare not quite ready for prime time
+	//$rs = $db->Execute($stmt,array('empno'=>3775,'ename'=>'John'));
+	if (!$rs) die("Empty RS");
+}
+
+if (0) {
+	$db = ADONewConnection('odbc_oracle');
+	if (!$db->PConnect('local_oracle','scott','tiger')) die('fail connect');
+	$db->debug = true;
+	$rs = &$db->Execute(
+		'select * from adoxyz where firstname=? and trim(lastname)=?',
+		array('first'=>'Caroline','last'=>'Miranda'));
+	if (!$rs) die("Empty RS");
+	if ($rs->EOF) die("EOF RS");
+	rs2html($rs);
+}
+?>
\ No newline at end of file
diff --git a/libraries/adodb/testpaging.php b/libraries/adodb/testpaging.php
new file mode 100755
index 00000000..09c26810
--- /dev/null
+++ b/libraries/adodb/testpaging.php
@@ -0,0 +1,36 @@
+<?php
+error_reporting(63);
+include_once('adodb-pear.inc.php');
+include_once('tohtml.inc.php');
+session_register('curr_page');
+
+$db = NewADOConnection('mysql');
+$db->debug = true;
+//$db->Connect('localhost:4321','scott','tiger','natsoft.domain');
+$db->Connect('localhost','root','','xphplens');
+$num_of_rows_per_page = 10;
+$sql = "select * from adoxyz where firstname = 'John'";
+
+if (isset($HTTP_GET_VARS['next_page']))
+	$curr_page = $HTTP_GET_VARS['next_page'];
+if (empty($curr_page)) $curr_page = 1; ## at first page
+
+$rs = $db->CachePageExecute(15,$sql, $num_of_rows_per_page, $curr_page);
+if (!$rs) die('Query Failed');
+
+if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) {
+	if (!$rs->AtFirstPage()) {
+?>
+<a href="<?php echo $PHP_SELF,'?next_page=',$rs->AbsolutePage() - 1 ?>">Previous page</a>
+<?php
+	}
+	if (!$rs->AtLastPage()) {
+?>
+<a href="<?php echo $PHP_SELF,'?next_page=',$rs->AbsolutePage() + 1 ?>">Next page</a>
+<?php
+	}
+	rs2html($rs);
+}
+
+
+?>
diff --git a/libraries/adodb/testpear.php b/libraries/adodb/testpear.php
new file mode 100755
index 00000000..34bf4b7c
--- /dev/null
+++ b/libraries/adodb/testpear.php
@@ -0,0 +1,17 @@
+<?php
+include('adodb.inc.php');
+include('tohtml.inc.php');
+
+$db = NewADOConnection('pear');
+$db->databaseDriver = 'mysql';
+$db->debug = true;
+$db->Connect('localhost','root','','xphplens');
+$rs = $db->Execute('select * from products');
+rs2html($rs);
+
+print "<h3>Test Errors</h3>";
+$rs = $db->Execute('select * from productz');
+if ($rs) print "Recordset returned - wrong!<br>";
+
+$db->Connect('localhost','root','','nodb_xphplens');
+?>
\ No newline at end of file
diff --git a/libraries/adodb/testsessions.php b/libraries/adodb/testsessions.php
new file mode 100755
index 00000000..a935a242
--- /dev/null
+++ b/libraries/adodb/testsessions.php
@@ -0,0 +1,12 @@
+<?php
+
+GLOBAL $HTTP_SESSION_VARS;
+	include('adodb.inc.php');
+	include('adodb-session.php');
+	session_start();
+	session_register('AVAR');
+	$HTTP_SESSION_VARS['AVAR'] += 1;
+	$AVAR += 1;
+	print "<p>\$HTTP_SESSION_VARS['AVAR']={$HTTP_SESSION_VARS['AVAR']}</p>";
+	
+?>
\ No newline at end of file
diff --git a/libraries/adodb/tohtml.inc.php b/libraries/adodb/tohtml.inc.php
new file mode 100755
index 00000000..12044757
--- /dev/null
+++ b/libraries/adodb/tohtml.inc.php
@@ -0,0 +1,150 @@
+<?php 
+/*
+V1.53 13 Nov 2001 (c) 2000, 2001 John Lim (jlim@natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  
+  Some pretty-printing by Chris Oxenreider <oxenreid@state.net>
+*/ 
+  
+// specific code for tohtml
+GLOBAL $gSQLMaxRows,$gSQLBlockRows;
+	 
+$gSQLMaxRows = 1000; // max no of rows to download
+$gSQLBlockRows=20; // max no of rows per table block
+
+// RecordSet to HTML Table
+//------------------------------------------------------------
+// Convert a recordset to a html table. Multiple tables are generated
+// if the number of rows is > $gSQLBlockRows. This is because
+// web browsers normally require the whole table to be downloaded
+// before it can be rendered, so we break the output into several
+// smaller faster rendering tables.
+//
+// $rs: the recordset
+// $ztabhtml: the table tag attributes (optional)
+// $zheaderarray: contains the replacement strings for the headers (optional)
+//
+//  USAGE:
+//    include('adodb.inc.php');
+//    ADOLoadCode('mysql');
+//    $db = ADONewConnection();
+//    $db->Connect('mysql','userid','password','database');
+//    $rs = $db->Execute('select col1,col2,col3 from table');
+//  rs2html($rs, 'BORDER=2', array('Title1', 'Title2', 'Title3'));
+//    $rs->Close();
+//
+// RETURNS: number of rows displayed
+function rs2html(&$rs,$ztabhtml='',$zheaderarray="")
+{
+$s ='';$rows=0;$docnt = false;
+GLOBAL $gSQLMaxRows,$gSQLBlockRows;
+
+	if (!$rs) {
+		printf(ADODB_BAD_RS,'rs2html');
+		return false;
+	}
+	
+	if (! $ztabhtml) $ztabhtml = "BORDER='1' WIDTH='98%'";
+	else $docnt = true;
+	$typearr = array();
+	$ncols = $rs->FieldCount();
+    $hdr = "<TABLE COLS=$ncols $ztabhtml>\n\n";
+	
+	for ($i=0; $i < $ncols; $i++) {	
+		$field = $rs->FetchField($i);
+		if ($zheaderarray) $fname = $zheaderarray[$i];
+		else $fname = htmlspecialchars($field->name);	
+		$typearr[$i] = $rs->MetaType($field->type,$field->max_length);
+            
+		if (empty($fname)) $fname = '&nbsp;';
+		$hdr .= "<TH>$fname</TH>";
+         }
+
+		print $hdr."\n\n";
+	
+       	while (!$rs->EOF) {
+            $s .= "<TR>\n";
+            for ($i=0; $i < $ncols; $i++) {
+            $type = $typearr[$i];
+                        
+			switch($type) {
+			case 'T':
+				$s .= "	<TD>".$rs->UserTimeStamp($rs->fields[$i],"D d, M Y, h:i:s") ."&nbsp;</TD>\n";
+				break;
+			case 'D':
+				$s .= "	<TD>".$rs->UserDate($rs->fields[$i],"D d, M Y") ."&nbsp;</TD>\n";
+				break;
+			case 'I':
+			case 'N':
+				$s .= "	<TD align=right>".htmlspecialchars(trim($rs->fields[$i])) ."&nbsp;</TD>\n";
+                $s = stripslashes($s);
+                $s = urldecode($s);
+				break;
+			default:
+				$s .= "	<TD>".htmlspecialchars(trim($rs->fields[$i])) ."&nbsp;</TD>\n";
+                $s = stripslashes($s);
+                $s = urldecode($s);
+			}
+                }
+                $s .= "</TR>\n\n";
+               
+		$rows += 1;
+		if ($rows >= $gSQLMaxRows) {
+			$rows = "<p>Truncated at $gSQLMaxRows</p>";
+			break;
+		} // switch
+
+		$rs->MoveNext();
+		
+		// additional EOF check to prevent a widow header
+	        if (!$rs->EOF && $rows % $gSQLBlockRows == 0) {
+		
+			//if (connection_aborted()) break;// not needed as PHP aborts script, unlike ASP
+                        print $s . "</TABLE>\n\n";
+                        $s = $hdr;
+		}
+        } // while
+	
+       	print $s."</TABLE>\n\n";
+
+	if ($docnt) print "<H2>".$rows." Rows</H2>";
+	
+	return $rows;
+ }
+ 
+
+function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
+{
+	if (!$ztabhtml) $ztabhtml = 'BORDER=1';
+	
+	$s = "<TABLE $ztabhtml>";//';print_r($arr);
+
+	if ($zheaderarray) {
+		$s .= '<TR>';
+		for ($i=0; $i<sizeof($zheaderarray); $i++) {
+			$s .= "    <TD>{$zheaderarray[$i]}</TD>\n";
+		}
+		$s .= "\n</TR>";
+	}
+	
+	for ($i=0; $i<sizeof($arr); $i++) {
+		$s .= '<TR>';
+		$a = &$arr[$i];
+		if (is_array($a)) 
+			for ($j=0; $j<sizeof($a); $j++) {
+				$val = $a[$j];
+				if (empty($val)) $val = '&nbsp;';
+				$s .= "    <TD>$val</TD>\n";
+			}
+		else if ($a) {
+			$s .=  '    <TD>'.$a."</TD>\n";
+		} else $s .= "    <TD>&nbsp;</TD>\n";
+		$s .= "\n</TR>\n";
+	}
+	$s .= '</TABLE>';
+	print $s;
+}
+
+
diff --git a/libraries/adodb/tute.htm b/libraries/adodb/tute.htm
new file mode 100755
index 00000000..dbe7c3cc
--- /dev/null
+++ b/libraries/adodb/tute.htm
@@ -0,0 +1,273 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<title>Tutorial: Moving from MySQL to ADODB</title>
+</head>
+
+<body>
+<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 href="http://php.weblogs.com/adodb">http://php.weblogs.com/adodb</a></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>(&quot;localhost&quot;, &quot;root&quot;, &quot;password&quot;);
+<b>mysql_select_db</b>(&quot;mydb&quot;,$db);</font>
+<font color="#660000">$result = <b>mysql_query</b>(&quot;SELECT * FROM employees&quot;,$db)</font><code><font color="#663300">;
+if ($result === false) die(&quot;failed&quot;);</font></code> 
+<font color="#006666"><b>while</b> ($fields =<b> mysql_fetch_row</b>($result)) &#123;
+ <b>for</b> ($i=0, $max=sizeof($fields); $i &lt; $max; $i++) &#123;
+        <b>print</b> $fields[$i].' ';
+ &#125;
+ <b>print</b> &quot;&lt;br&gt;\n&quot;;
+&#125;</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(&quot;adodb.inc.php&quot;);</b>
+ $db = <b>NewADOConnection</b>('mysql');
+ $db-&gt;<b>Connect</b>(&quot;localhost&quot;, &quot;root&quot;, &quot;password&quot;, &quot;mydb&quot;);</font>
+ <font color="#663300">$result = $db-&gt;<b>Execute</b>(&quot;SELECT * FROM employees&quot;);
+ </font><font color="#663300"></font><code><font color="#663300">if ($result === false) die(&quot;failed&quot;)</font></code><code><font color="#663300">;</font></code>  
+ <font color="#006666"><b>while</b> (!$result-&gt;EOF) &#123;
+    <b>for</b> ($i=0, $max=$result-&gt;<b>FieldCount</b>(); $i &lt; $max; $i++)
+           <b>print</b> $result-&gt;fields[$i].' ';
+    $result-&gt;<b>MoveNext</b>();
+    <b>print</b> &quot;&lt;br&gt;\n&quot;;
+ &#125;</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(&quot;adodb.inc.php&quot;);</b>
+$db = <b>NewADOConnection</b>('mysql');
+$db-&gt;<b>Connect</b>(&quot;localhost&quot;, &quot;root&quot;, &quot;password&quot;, &quot;mydb&quot;);</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-&gt;Connect(). </code></p>
+<h3>Executing the SQL</h3>
+<p><code><font color="#663300">$result = $db-&gt;<b>Execute</b>(&quot;SELECT * 
+  FROM employees&quot;);<br>
+  if ($result === false) die(&quot;failed&quot;)</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-&gt;EOF) &#123;
+   <b>for</b> ($i=0, $max=$result-&gt;<b>FieldCount</b>(); $i &lt; $max; $i++)
+       <b>print</b> $result-&gt;fields[$i].' ';
+   $result-&gt;<b>MoveNext</b>();
+   <b>print</b> &quot;&lt;br&gt;\n&quot;;
+&#125;</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-&gt;fields[]</code> array is generated by the PHP database 
+  extension. Some database extensions do not index the array by field name (unlike 
+  MySQL). To guarantee portability, use <code>$result-&gt;Fields($fieldname)</code>. 
+  Note that this is a function, not an array. 
+<h3>Other Useful Functions</h3>
+<p><code>$recordset-&gt;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-&gt;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-&gt;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 = &amp;ADONewConnection('mysql'); 
+   $conn-&gt;PConnect('localhost','userid','password','database');
+   $rs = $conn-&gt;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 href="http://php.weblogs.com/adodb_manual">http://php.weblogs.com/adodb_manual</a></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 = &quot;INSERT INTO table (id, thedate,note) values (&quot; 
+   . $<b>ID</b> . ','
+   . $db-&gt;DBDate($<b>TheDate</b>) .','
+   . $db-&gt;qstr($<b>Note</b>).&quot;)&quot;;
+$db-&gt;Execute($sql);</pre>
+<p>ADODB also supports <code>$connection-&gt;Affected_Rows()</code> (returns the 
+  number of rows affected by last update or delete) and <code>$recordset-&gt;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-&gt;Execute(&quot;select adate from table&quot;);<br>$f0 = $recordset-&gt;FetchField(0);
+</pre>
+<p>Then <code>$f0-&gt;name</code> will hold <i>'adata'</i>, <code>$f0-&gt;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-&gt;Execute(&quot;select adate from table&quot;);<br>
+  $f0 = $recordset-&gt;FetchField(0);<br>
+  $type = $recordset-&gt;MetaType($f0-&gt;type, $f0-&gt;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 href="http://php.weblogs.com/adodb-sessions">http://php.weblogs.com/adodb-sessions</a></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>
+
+
+</body>
+</html>
diff --git a/public_html/browser.php b/public_html/browser.php
new file mode 100644
index 00000000..7acd0df9
--- /dev/null
+++ b/public_html/browser.php
@@ -0,0 +1,46 @@
+<?php
+
+	/**
+	 * Main object browser
+	 *
+	 * $Id: browser.php,v 1.1 2002/02/11 09:33:08 chriskl Exp $
+	 */
+
+	// Include application functions
+	include_once('../conf/config.inc');
+?>
+
+<html>
+<head>
+<title><?= $appName ?></title>
+<body>
+<?php
+
+	$databases = &$data->getDatabases();
+	while (!$databases->EOF) {
+		echo htmlspecialchars($databases->f['datname']), "<br>\n";
+		if ($data->hasTables())
+			echo "&nbsp;&nbsp;<a href=\"tables.php?database=", 
+				urlencode($databases->f['datname']), "\" target=detail>Tables</a><br>\n";
+		if ($data->hasViews())
+			echo "&nbsp;&nbsp;<a href=\"views.php\" target=detail>Views</a><br>\n";
+		if ($data->hasSequences())
+			echo "&nbsp;&nbsp;<a href=\"sequences.php\" target=detail>Sequences</a><br>\n";
+		if ($data->hasFunctions())
+			echo "&nbsp;&nbsp;<a href=\"functions.php\" target=detail>Functions</a><br>\n";
+		if ($data->hasTriggers())
+			echo "&nbsp;&nbsp;<a href=\"triggers.php\" target=detail>Triggers</a><br>\n";
+		if ($data->hasOperators())
+			echo "&nbsp;&nbsp;<a href=\"operators.php\" target=detail>Operators</a><br>\n";
+		if ($data->hasTypes())
+			echo "&nbsp;&nbsp;<a href=\"types.php\" target=detail>Types</a><br>\n";
+		if ($data->hasAggregates())
+			echo "&nbsp;&nbsp;<a href=\"aggregates.php\" target=detail>Aggregates</a><br>\n";
+		if ($data->hasRules())
+			echo "&nbsp;&nbsp;<a href=\"rules.php\" target=detail>Rules</a><br>\n";
+		$databases->moveNext();
+	}
+
+?>
+</body>
+</html>
diff --git a/public_html/databases.php b/public_html/databases.php
new file mode 100755
index 00000000..934d1025
--- /dev/null
+++ b/public_html/databases.php
@@ -0,0 +1,23 @@
+<?php
+
+	/**
+	 * List databases in a server
+	 * @param $webdbServerID The ID of the current server
+	 *
+	 * $Id: databases.php,v 1.1 2002/02/11 09:33:08 chriskl Exp $
+	 */
+
+	// Include application functions
+	include_once('../conf/config.inc');
+
+?>
+
+<html>
+<body>
+
+<h1><?= $appName ?></h1>
+
+<p><?= $appIntro ?></p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/public_html/index.php b/public_html/index.php
new file mode 100755
index 00000000..956cde9f
--- /dev/null
+++ b/public_html/index.php
@@ -0,0 +1,31 @@
+<?php
+
+	/**
+	 * Main access point to WebDB.
+	 *
+	 * $Id: index.php,v 1.1 2002/02/11 09:33:08 chriskl Exp $
+	 */
+
+	// Include application functions
+	include_once('../conf/config.inc');
+
+?>
+
+<html>
+<head>
+<title><?= $appName ?></title>
+</head>
+
+<frameset rows="50, *" border="0" frameborder="0">
+	<frame src="topbar.php" name="topbar">
+	<frameset cols="<?= $guiLeftFrameWidth ?>,*" border="0" frameborder="0">
+	  <frame src="browser.php" name="browser">
+	  <frame src="intro.php" name="detail">
+	</frameset>
+</frameset>
+<noframes>
+<body>
+	<?= $strNoFrames ?>
+</body>
+</noframes>
+</html>
\ No newline at end of file
diff --git a/public_html/intro.php b/public_html/intro.php
new file mode 100755
index 00000000..ffa2521d
--- /dev/null
+++ b/public_html/intro.php
@@ -0,0 +1,22 @@
+<?php
+
+	/**
+	 * Intro screen
+	 *
+	 * $Id: intro.php,v 1.1 2002/02/11 09:33:08 chriskl Exp $
+	 */
+
+	// Include application functions
+	include_once('../conf/config.inc');
+
+?>
+
+<html>
+<body>
+
+<h1><?= $appName ?></h1>
+
+<p><?= $appIntro ?></p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/public_html/login.php b/public_html/login.php
new file mode 100755
index 00000000..a8c03319
--- /dev/null
+++ b/public_html/login.php
@@ -0,0 +1,68 @@
+<?php
+
+	/**
+	 * Login screen
+	 *
+	 * $Id: login.php,v 1.1 2002/02/11 09:33:08 chriskl Exp $
+	 */
+
+	// Include application functions
+	include_once('../conf/config.inc');
+
+?>
+
+<html>
+	<head>
+	<title><?= $appName ?> :: <?= $strLogin ?></title>
+	</head>
+	
+	<body>
+		<h1><?= $appName ?> <?= $appVersion ?></h1>
+		<table border="0" cellpadding="0" cellspacing="0" width="350">
+			<tr height="115">
+				<td height="115" align="center" valign="middle">
+					<table border="0" cellpadding="2" cellspacing="0">
+						<form action="<?= $PHP_SELF ?>" method="post" name="login_form">
+						<tr>
+							<td class="form">Username:</td>
+							<td><input type="text" name="formUsername" value="<?php isset($webdbUsername) ? htmlspecialchars($webdbUsername) : '' ?>" size="24"></td>
+						</tr>
+						<tr>
+							<td class="form">Password:</td>
+							<td><input type="password" name="formPassword" size="24"></td>
+						</tr>
+						<tr>
+							<td class="form">Server:</td>
+							<td><select name="formServer">
+							<?php
+								for ($i = 0; $i < sizeof($confServers); $i++) {
+									echo "<option value=\"{$i}\">", htmlspecialchars($confServers[$i]['desc']), ' (',
+										htmlspecialchars($confServers[$i]['type']), ")</option>\n";
+								}
+							?>							
+							</select></td>
+						</tr>
+						<tr>
+							<td colspan="2" align="right" valign="middle">
+								<input type="submit" name="submitLogin" value="Login">
+							</td>
+						</tr>
+						</form>
+					</table>
+				</td>
+			</tr>
+		<script language=javascript>
+			var uname = document.login_form.set_username;
+			var pword = document.login_form.set_password;
+			if (uname.value == "") { 
+				uname.focus();
+			} else {
+				pword.focus();
+			}
+		</script>
+		</table>	
+    </td>
+  </tr>
+</table>
+</body>
+</html>
diff --git a/public_html/topbar.php b/public_html/topbar.php
new file mode 100755
index 00000000..aa23d196
--- /dev/null
+++ b/public_html/topbar.php
@@ -0,0 +1,24 @@
+<?php
+
+	/**
+	 * Top menu for WebDB
+	 *
+	 * $Id: topbar.php,v 1.1 2002/02/11 09:33:08 chriskl Exp $
+	 */
+
+	// Include application functions
+	include_once('../conf/config.inc');
+
+?>
+
+<html>
+
+<p>
+<a href="">Refresh</a> | 
+<a href="">Execute SQL</a> | 
+<a href="">Advanced</a> | 
+<a href="">Preferences</a> | 
+<a href="">Logout</a>
+</p>
+
+</html>
\ No newline at end of file
-- 
2.39.5