phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgwapi/inc/adodb adodb-csvlib.inc.php adodb-d...


From: Dave Hall
Subject: [Phpgroupware-cvs] phpgwapi/inc/adodb adodb-csvlib.inc.php adodb-d...
Date: Tue, 21 Feb 2006 13:47:44 +0000

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Dave Hall <address@hidden>      06/02/21 13:47:42

Modified files:
        inc/adodb      : adodb-csvlib.inc.php adodb-datadict.inc.php 
                         adodb-error.inc.php adodb-errorhandler.inc.php 
                         adodb-errorpear.inc.php 
                         adodb-exceptions.inc.php adodb-iterator.inc.php 
                         adodb-lib.inc.php adodb-pager.inc.php 
                         adodb-pear.inc.php adodb-perf.inc.php 
                         adodb-php4.inc.php adodb-time.inc.php 
                         adodb-xmlschema.inc.php adodb.inc.php 
                         pivottable.inc.php rsfilter.inc.php server.php 
                         toexport.inc.php tohtml.inc.php xmlschema.dtd 
        inc/adodb/contrib: toxmlrpc.inc.php 
        inc/adodb/datadict: datadict-access.inc.php datadict-db2.inc.php 
                            datadict-firebird.inc.php 
                            datadict-generic.inc.php 
                            datadict-ibase.inc.php 
                            datadict-informix.inc.php 
                            datadict-mssql.inc.php 
                            datadict-mysql.inc.php datadict-oci8.inc.php 
                            datadict-postgres.inc.php 
                            datadict-sapdb.inc.php 
                            datadict-sybase.inc.php 
        inc/adodb/docs : docs-adodb.htm docs-datadict.htm 
                         docs-oracle.htm docs-perf.htm docs-session.htm 
                         old-changelog.htm 
        inc/adodb/drivers: adodb-access.inc.php adodb-ado.inc.php 
                           adodb-ado5.inc.php adodb-ado_access.inc.php 
                           adodb-ado_mssql.inc.php 
                           adodb-borland_ibase.inc.php adodb-csv.inc.php 
                           adodb-db2.inc.php adodb-fbsql.inc.php 
                           adodb-firebird.inc.php adodb-ibase.inc.php 
                           adodb-informix.inc.php 
                           adodb-informix72.inc.php adodb-ldap.inc.php 
                           adodb-mssql.inc.php adodb-mssqlpo.inc.php 
                           adodb-mysql.inc.php adodb-mysqli.inc.php 
                           adodb-mysqlt.inc.php adodb-netezza.inc.php 
                           adodb-oci8.inc.php adodb-oci805.inc.php 
                           adodb-oci8po.inc.php adodb-odbc.inc.php 
                           adodb-odbc_mssql.inc.php 
                           adodb-odbc_oracle.inc.php adodb-odbtp.inc.php 
                           adodb-odbtp_unicode.inc.php 
                           adodb-oracle.inc.php adodb-pdo.inc.php 
                           adodb-postgres.inc.php 
                           adodb-postgres64.inc.php 
                           adodb-postgres7.inc.php adodb-proxy.inc.php 
                           adodb-sapdb.inc.php adodb-sqlanywhere.inc.php 
                           adodb-sqlite.inc.php adodb-sqlitepo.inc.php 
                           adodb-sybase.inc.php adodb-vfp.inc.php 
        inc/adodb/lang : adodb-ar.inc.php adodb-en.inc.php 
                         adodb-es.inc.php adodb-hu.inc.php 
                         adodb-nl.inc.php adodb-pl.inc.php 
                         adodb-ro.inc.php 
        inc/adodb/perf : perf-db2.inc.php perf-informix.inc.php 
                         perf-mssql.inc.php perf-mysql.inc.php 
                         perf-oci8.inc.php perf-postgres.inc.php 
        inc/adodb/session: adodb-compress-bzip2.php 
                           adodb-compress-gzip.php 
                           adodb-cryptsession.php 
                           adodb-encrypt-mcrypt.php 
                           adodb-encrypt-md5.php 
                           adodb-encrypt-secret.php 
                           adodb-session-clob.php adodb-session.php 
                           adodb-sessions.mysql.sql 
                           adodb-sessions.oracle.clob.sql 
                           adodb-sessions.oracle.sql crypt.inc.php 
        inc/adodb/tests: benchmark.php client.php pdo.php 
                         test-datadict.php test-pgblob.php test-php5.php 
                         test-xmlschema.php test.php test3.php test4.php 
                         test5.php test_rs_array.php testcache.php 
                         testdatabases.inc.php testmssql.php 
                         testoci8.php testoci8cursor.php testpaging.php 
                         testpear.php testsessions.php tmssql.php 
                         xmlschema.xml 
        inc/adodb/xsl  : remove-0.2.xsl 

Log message:
        update to latest and greatest from upstream 4.7.2 released 21-Feb-2006

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-csvlib.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-datadict.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-error.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-errorhandler.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-errorpear.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-exceptions.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-iterator.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-lib.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-pager.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-pear.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-perf.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-php4.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-time.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb-xmlschema.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/adodb.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/pivottable.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/rsfilter.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/server.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/toexport.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tohtml.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/xmlschema.dtd.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/contrib/toxmlrpc.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-access.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-db2.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-generic.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-informix.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/docs/docs-adodb.htm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/docs/docs-datadict.htm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/docs/docs-oracle.htm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/docs/docs-perf.htm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/docs/docs-session.htm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/docs/old-changelog.htm.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-access.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ado.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-csv.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-db2.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-informix.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/lang/adodb-ar.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/lang/adodb-en.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/lang/adodb-es.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/lang/adodb-hu.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/lang/adodb-nl.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/lang/adodb-pl.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/lang/adodb-ro.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/perf/perf-db2.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/perf/perf-informix.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/perf/perf-mssql.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/perf/perf-mysql.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/perf/perf-oci8.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/perf/perf-postgres.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-compress-bzip2.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-compress-gzip.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-cryptsession.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-encrypt-secret.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-session-clob.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-session.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/crypt.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/benchmark.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/client.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/pdo.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/test-datadict.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/test-pgblob.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/test-php5.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/test-xmlschema.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/test.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/test3.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/test4.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/test5.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/test_rs_array.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/testcache.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/testdatabases.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/testmssql.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/testoci8.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/testoci8cursor.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/testpaging.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/testpear.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/testsessions.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/tmssql.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/xmlschema.xml.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/xsl/remove-0.2.xsl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: phpgwapi/inc/adodb/adodb-csvlib.inc.php
diff -u phpgwapi/inc/adodb/adodb-csvlib.inc.php:1.2 
phpgwapi/inc/adodb/adodb-csvlib.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-csvlib.inc.php:1.2 Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-csvlib.inc.php     Tue Feb 21 13:47:41 2006
@@ -1,307 +1,312 @@
-<?php
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-global $ADODB_INCLUDED_CSV;
-$ADODB_INCLUDED_CSV = 1;
-
-/* 
-
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for CSV serialization. This is used by the csv/proxy driver and is 
the 
-  CacheExecute() serialization format. 
-  
-  ==== NOTE ====
-  Format documented at http://php.weblogs.com/ADODB_CSV
-  ==============
-*/
-
-       /**
-        * convert a recordset into special format
-        *
-        * @param rs    the recordset
-        *
-        * @return      the CSV formated data
-        */
-       function _rs2serialize(&$rs,$conn=false,$sql='')
-       {
-               $max = ($rs) ? $rs->FieldCount() : 0;
-               
-               if ($sql) $sql = urlencode($sql);
-               // metadata setup
-               
-               if ($max <= 0 || $rs->dataProvider == 'empty') { // is 
insert/update/delete
-                       if (is_object($conn)) {
-                               $sql .= ','.$conn->Affected_Rows();
-                               $sql .= ','.$conn->Insert_ID();
-                       } else
-                               $sql .= ',,';
-                       
-                       $text = "====-1,0,$sql\n";
-                       return $text;
-               }
-               $tt = ($rs->timeCreated) ? $rs->timeCreated : time();
-               
-               ## changed format from ====0 to ====1
-               $line = "====1,$tt,$sql\n";
-               
-               if ($rs->databaseType == 'array') {
-                       $rows =& $rs->_array;
-               } else {
-                       $rows = array();
-                       while (!$rs->EOF) {     
-                               $rows[] = $rs->fields;
-                               $rs->MoveNext();
-                       } 
-               }
-               
-               for($i=0; $i < $max; $i++) {
-                       $o =& $rs->FetchField($i);
-                       $flds[] = $o;
-               }
-       
-               $savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : 
$rs->fetchMode;
-               $rs =& new ADORecordSet_array();
-               $rs->InitArrayFields($rows,$flds);
-               $rs->fetchMode = $savefetch;
-               return $line.serialize($rs);
-       }
-
-       
-/**
-* 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)
-       {
-               $err = false;
-               $fp = @fopen($url,'rb');
-               if (!$fp) {
-                       $err = $url.' file/URL not found';
-                       return false;
-               }
-               flock($fp, LOCK_SH);
-               $arr = array();
-               $ttl = 0;
-               
-               if ($meta = fgetcsv($fp, 32000, ",")) {
-                       // check if error message
-                       if (strncmp($meta[0],'****',4) === 0) {
-                               $err = trim(substr($meta[0],4,1024));
-                               fclose($fp);
-                               return false;
-                       }
-                       // check for meta data
-                       // $meta[0] is -1 means return an empty recordset
-                       // $meta[1] contains a time 
-       
-                       if (strncmp($meta[0], '====',4) === 0) {
-                       
-                               if ($meta[0] == "====-1") {
-                                       if (sizeof($meta) < 5) {
-                                               $err = "Corrupt first line for 
format -1";
-                                               fclose($fp);
-                                               return false;
-                                       }
-                                       fclose($fp);
-                                       
-                                       if ($timeout > 0) {
-                                               $err = " Illegal Timeout 
$timeout ";
-                                               return false;
-                                       }
-                                       $rs->fields = array();
-                                       $rs->timeCreated = $meta[1];
-                                       $rs =& new ADORecordSet($val=true);
-                                       $rs->EOF = true;
-                                       $rs->_numOfFields=0;
-                                       $rs->sql = urldecode($meta[2]);
-                                       $rs->affectedrows = (integer)$meta[3];
-                                       $rs->insertid = $meta[4];       
-                                       return $rs;
-                               } 
-                       # Under high volume loads, we want only 1 
thread/process to _write_file
-                       # so that we don't have 50 processes queueing to write 
the same data.
-                       # We use probabilistic timeout, ahead of time.
-                       #
-                       # -4 sec before timeout, give processes 1/32 chance of 
timing out
-                       # -2 sec before timeout, give processes 1/16 chance of 
timing out
-                       # -1 sec after timeout give processes 1/4 chance of 
timing out
-                       # +0 sec after timeout, give processes 100% chance of 
timing out
-                               if (sizeof($meta) > 1) {
-                                       if($timeout >0){ 
-                                               $tdiff = (integer)( 
$meta[1]+$timeout - time());
-                                               if ($tdiff <= 2) {
-                                                       switch($tdiff) {
-                                                       case 4:
-                                                       case 3:
-                                                               if ((rand() & 
31) == 0) {
-                                                                       
fclose($fp);
-                                                                       $err = 
"Timeout 3";
-                                                                       return 
false;
-                                                               }
-                                                               break;
-                                                       case 2: 
-                                                               if ((rand() & 
15) == 0) {
-                                                                       
fclose($fp);
-                                                                       $err = 
"Timeout 2";
-                                                                       return 
false;
-                                                               }
-                                                               break;
-                                                       case 1:
-                                                               if ((rand() & 
3) == 0) {
-                                                                       
fclose($fp);
-                                                                       $err = 
"Timeout 1";
-                                                                       return 
false;
-                                                               }
-                                                               break;
-                                                       default: 
-                                                               fclose($fp);
-                                                               $err = "Timeout 
0";
-                                                               return false;
-                                                       } // switch
-                                                       
-                                               } // if check flush cache
-                                       }// (timeout>0)
-                                       $ttl = $meta[1];
-                               }
-                               
//================================================
-                               // new cache format - use serialize 
extensively...
-                               if ($meta[0] === '====1') {
-                                       // slurp in the data
-                                       $MAXSIZE = 128000;
-                                       
-                                       $text = fread($fp,$MAXSIZE);
-                                       if (strlen($text)) {
-                                               while ($txt = 
fread($fp,$MAXSIZE)) {
-                                                       $text .= $txt;
-                                               }
-                                       }
-                                       fclose($fp);
-                                       $rs = unserialize($text);
-                                       if (is_object($rs)) $rs->timeCreated = 
$ttl;
-                                       else {
-                                               $err = "Unable to unserialize 
recordset";
-                                               //echo 
htmlspecialchars($text),' !--END--!<p>';
-                                       }
-                                       return $rs;
-                               }
-                               
-                               $meta = false;
-                               $meta = fgetcsv($fp, 32000, ",");
-                               if (!$meta) {
-                                       fclose($fp);
-                                       $err = "Unexpected EOF 1";
-                                       return false;
-                               }
-                       }
-
-                       // Get Column definitions
-                       $flds = array();
-                       foreach($meta as $o) {
-                               $o2 = explode(':',$o);
-                               if (sizeof($o2)!=3) {
-                                       $arr[] = $meta;
-                                       $flds = false;
-                                       break;
-                               }
-                               $fld =& new ADOFieldObject();
-                               $fld->name = urldecode($o2[0]);
-                               $fld->type = $o2[1];
-                               $fld->max_length = $o2[2];
-                               $flds[] = $fld;
-                       }
-               } else {
-                       fclose($fp);
-                       $err = "Recordset had unexpected EOF 2";
-                       return false;
-               }
-               
-               // slurp in the data
-               $MAXSIZE = 128000;
-               
-               $text = '';
-               while ($txt = fread($fp,$MAXSIZE)) {
-                       $text .= $txt;
-               }
-                       
-               fclose($fp);
-               @$arr = unserialize($text);
-               //var_dump($arr);
-               if (!is_array($arr)) {
-                       $err = "Recordset had unexpected EOF (in serialized 
recordset)";
-                       if (get_magic_quotes_runtime()) $err .= ". Magic Quotes 
Runtime should be disabled!";
-                       return false;
-               }
-               $rs =& new ADORecordSet_array();
-               $rs->timeCreated = $ttl;
-               $rs->InitArrayFields($arr,$flds);
-               return $rs;
-       }
-       
-
-       /**
-       * Save a file $filename and its $contents (normally for caching) with 
file locking
-       */
-       function adodb_write_file($filename, $contents,$debug=false)
-       { 
-       # http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
-       # So to simulate locking, we assume that rename is an atomic operation.
-       # First we delete $filename, then we create a $tempfile write to it and 
-       # rename to the desired $filename. If the rename works, then we 
successfully 
-       # modified the file exclusively.
-       # What a stupid need - having to simulate locking.
-       # Risks:
-       # 1. $tempfile name is not unique -- very very low
-       # 2. unlink($filename) fails -- ok, rename will fail
-       # 3. adodb reads stale file because unlink fails -- ok, $rs timeout 
occurs
-       # 4. another process creates $filename between unlink() and rename() -- 
ok, rename() fails and  cache updated
-               if (strncmp(PHP_OS,'WIN',3) === 0) {
-                       // skip the decimal place
-                       $mtime = substr(str_replace(' ','_',microtime()),2); 
-                       // getmypid() actually returns 0 on Win98 - never mind!
-                       $tmpname = $filename.uniqid($mtime).getmypid();
-                       if (!($fd = fopen($tmpname,'a'))) return false;
-                       $ok = ftruncate($fd,0);                 
-                       if (!fwrite($fd,$contents)) $ok = false;
-                       fclose($fd);
-                       chmod($tmpname,0644);
-                       // the tricky moment
-                       @unlink($filename);
-                       if (address@hidden($tmpname,$filename)) {
-                               unlink($tmpname);
-                               $ok = false;
-                       }
-                       if (!$ok) {
-                               if ($debug) ADOConnection::outp( " Rename 
$tmpname ".($ok? 'ok' : 'failed'));
-                       }
-                       return $ok;
-               }
-               if (!($fd = fopen($filename, 'a'))) return false;
-               if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
-                       $ok = fwrite( $fd, $contents );
-                       fclose($fd);
-                       chmod($filename,0644);
-               }else {
-                       fclose($fd);
-                       if ($debug)ADOConnection::outp( " Failed acquiring lock 
for $filename<br>\n");
-                       $ok = false;
-               }
-       
-               return $ok;
-       }
+<?php
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+global $ADODB_INCLUDED_CSV;
+$ADODB_INCLUDED_CSV = 1;
+
+/* 
+
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Library for CSV serialization. This is used by the csv/proxy driver and is 
the 
+  CacheExecute() serialization format. 
+  
+  ==== NOTE ====
+  Format documented at http://php.weblogs.com/ADODB_CSV
+  ==============
+*/
+
+       /**
+        * convert a recordset into special format
+        *
+        * @param rs    the recordset
+        *
+        * @return      the CSV formated data
+        */
+       function _rs2serialize(&$rs,$conn=false,$sql='')
+       {
+               $max = ($rs) ? $rs->FieldCount() : 0;
+               
+               if ($sql) $sql = urlencode($sql);
+               // metadata setup
+               
+               if ($max <= 0 || $rs->dataProvider == 'empty') { // is 
insert/update/delete
+                       if (is_object($conn)) {
+                               $sql .= ','.$conn->Affected_Rows();
+                               $sql .= ','.$conn->Insert_ID();
+                       } else
+                               $sql .= ',,';
+                       
+                       $text = "====-1,0,$sql\n";
+                       return $text;
+               }
+               $tt = ($rs->timeCreated) ? $rs->timeCreated : time();
+               
+               ## changed format from ====0 to ====1
+               $line = "====1,$tt,$sql\n";
+               
+               if ($rs->databaseType == 'array') {
+                       $rows =& $rs->_array;
+               } else {
+                       $rows = array();
+                       while (!$rs->EOF) {     
+                               $rows[] = $rs->fields;
+                               $rs->MoveNext();
+                       } 
+               }
+               
+               for($i=0; $i < $max; $i++) {
+                       $o =& $rs->FetchField($i);
+                       $flds[] = $o;
+               }
+       
+               $savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : 
$rs->fetchMode;
+               $class = $rs->connection->arrayClass;
+               $rs2 = new $class();
+               $rs2->sql = $rs->sql;
+               $rs2->oldProvider = $rs->dataProvider; 
+               $rs2->InitArrayFields($rows,$flds);
+               $rs2->fetchMode = $savefetch;
+               return $line.serialize($rs2);
+       }
+
+       
+/**
+* Open CSV file and convert it into Data. 
+*
+* @param url           file/ftp/http url
+* @param err           returns the error message
+* @param timeout       dispose if recordset has been alive for $timeout secs
+*
+* @return              recordset, or false if error occured. If no
+*                      error occurred in sql INSERT/UPDATE/DELETE, 
+*                      empty recordset is returned
+*/
+       function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array')
+       {
+               $false = false;
+               $err = false;
+               $fp = @fopen($url,'rb');
+               if (!$fp) {
+                       $err = $url.' file/URL not found';
+                       return $false;
+               }
+               @flock($fp, LOCK_SH);
+               $arr = array();
+               $ttl = 0;
+               
+               if ($meta = fgetcsv($fp, 32000, ",")) {
+                       // check if error message
+                       if (strncmp($meta[0],'****',4) === 0) {
+                               $err = trim(substr($meta[0],4,1024));
+                               fclose($fp);
+                               return $false;
+                       }
+                       // check for meta data
+                       // $meta[0] is -1 means return an empty recordset
+                       // $meta[1] contains a time 
+       
+                       if (strncmp($meta[0], '====',4) === 0) {
+                       
+                               if ($meta[0] == "====-1") {
+                                       if (sizeof($meta) < 5) {
+                                               $err = "Corrupt first line for 
format -1";
+                                               fclose($fp);
+                                               return $false;
+                                       }
+                                       fclose($fp);
+                                       
+                                       if ($timeout > 0) {
+                                               $err = " Illegal Timeout 
$timeout ";
+                                               return $false;
+                                       }
+                                       
+                                       $rs = new $rsclass($val=true);
+                                       $rs->fields = array();
+                                       $rs->timeCreated = $meta[1];
+                                       $rs->EOF = true;
+                                       $rs->_numOfFields = 0;
+                                       $rs->sql = urldecode($meta[2]);
+                                       $rs->affectedrows = (integer)$meta[3];
+                                       $rs->insertid = $meta[4];       
+                                       return $rs;
+                               } 
+                       # Under high volume loads, we want only 1 
thread/process to _write_file
+                       # so that we don't have 50 processes queueing to write 
the same data.
+                       # We use probabilistic timeout, ahead of time.
+                       #
+                       # -4 sec before timeout, give processes 1/32 chance of 
timing out
+                       # -2 sec before timeout, give processes 1/16 chance of 
timing out
+                       # -1 sec after timeout give processes 1/4 chance of 
timing out
+                       # +0 sec after timeout, give processes 100% chance of 
timing out
+                               if (sizeof($meta) > 1) {
+                                       if($timeout >0){ 
+                                               $tdiff = (integer)( 
$meta[1]+$timeout - time());
+                                               if ($tdiff <= 2) {
+                                                       switch($tdiff) {
+                                                       case 4:
+                                                       case 3:
+                                                               if ((rand() & 
31) == 0) {
+                                                                       
fclose($fp);
+                                                                       $err = 
"Timeout 3";
+                                                                       return 
$false;
+                                                               }
+                                                               break;
+                                                       case 2: 
+                                                               if ((rand() & 
15) == 0) {
+                                                                       
fclose($fp);
+                                                                       $err = 
"Timeout 2";
+                                                                       return 
$false;
+                                                               }
+                                                               break;
+                                                       case 1:
+                                                               if ((rand() & 
3) == 0) {
+                                                                       
fclose($fp);
+                                                                       $err = 
"Timeout 1";
+                                                                       return 
$false;
+                                                               }
+                                                               break;
+                                                       default: 
+                                                               fclose($fp);
+                                                               $err = "Timeout 
0";
+                                                               return $false;
+                                                       } // switch
+                                                       
+                                               } // if check flush cache
+                                       }// (timeout>0)
+                                       $ttl = $meta[1];
+                               }
+                               
//================================================
+                               // new cache format - use serialize 
extensively...
+                               if ($meta[0] === '====1') {
+                                       // slurp in the data
+                                       $MAXSIZE = 128000;
+                                       
+                                       $text = fread($fp,$MAXSIZE);
+                                       if (strlen($text)) {
+                                               while ($txt = 
fread($fp,$MAXSIZE)) {
+                                                       $text .= $txt;
+                                               }
+                                       }
+                                       fclose($fp);
+                                       $rs = unserialize($text);
+                                       if (is_object($rs)) $rs->timeCreated = 
$ttl;
+                                       else {
+                                               $err = "Unable to unserialize 
recordset";
+                                               //echo 
htmlspecialchars($text),' !--END--!<p>';
+                                       }
+                                       return $rs;
+                               }
+                               
+                               $meta = false;
+                               $meta = fgetcsv($fp, 32000, ",");
+                               if (!$meta) {
+                                       fclose($fp);
+                                       $err = "Unexpected EOF 1";
+                                       return $false;
+                               }
+                       }
+
+                       // Get Column definitions
+                       $flds = array();
+                       foreach($meta as $o) {
+                               $o2 = explode(':',$o);
+                               if (sizeof($o2)!=3) {
+                                       $arr[] = $meta;
+                                       $flds = false;
+                                       break;
+                               }
+                               $fld = new ADOFieldObject();
+                               $fld->name = urldecode($o2[0]);
+                               $fld->type = $o2[1];
+                               $fld->max_length = $o2[2];
+                               $flds[] = $fld;
+                       }
+               } else {
+                       fclose($fp);
+                       $err = "Recordset had unexpected EOF 2";
+                       return $false;
+               }
+               
+               // slurp in the data
+               $MAXSIZE = 128000;
+               
+               $text = '';
+               while ($txt = fread($fp,$MAXSIZE)) {
+                       $text .= $txt;
+               }
+                       
+               fclose($fp);
+               @$arr = unserialize($text);
+               //var_dump($arr);
+               if (!is_array($arr)) {
+                       $err = "Recordset had unexpected EOF (in serialized 
recordset)";
+                       if (get_magic_quotes_runtime()) $err .= ". Magic Quotes 
Runtime should be disabled!";
+                       return $false;
+               }
+               $rs = new $rsclass();
+               $rs->timeCreated = $ttl;
+               $rs->InitArrayFields($arr,$flds);
+               return $rs;
+       }
+       
+
+       /**
+       * Save a file $filename and its $contents (normally for caching) with 
file locking
+       */
+       function adodb_write_file($filename, $contents,$debug=false)
+       { 
+       # http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
+       # So to simulate locking, we assume that rename is an atomic operation.
+       # First we delete $filename, then we create a $tempfile write to it and 
+       # rename to the desired $filename. If the rename works, then we 
successfully 
+       # modified the file exclusively.
+       # What a stupid need - having to simulate locking.
+       # Risks:
+       # 1. $tempfile name is not unique -- very very low
+       # 2. unlink($filename) fails -- ok, rename will fail
+       # 3. adodb reads stale file because unlink fails -- ok, $rs timeout 
occurs
+       # 4. another process creates $filename between unlink() and rename() -- 
ok, rename() fails and  cache updated
+               if (strncmp(PHP_OS,'WIN',3) === 0) {
+                       // skip the decimal place
+                       $mtime = substr(str_replace(' ','_',microtime()),2); 
+                       // getmypid() actually returns 0 on Win98 - never mind!
+                       $tmpname = $filename.uniqid($mtime).getmypid();
+                       if (!($fd = @fopen($tmpname,'a'))) return false;
+                       $ok = ftruncate($fd,0);                 
+                       if (!fwrite($fd,$contents)) $ok = false;
+                       fclose($fd);
+                       chmod($tmpname,0644);
+                       // the tricky moment
+                       @unlink($filename);
+                       if (address@hidden($tmpname,$filename)) {
+                               unlink($tmpname);
+                               $ok = false;
+                       }
+                       if (!$ok) {
+                               if ($debug) ADOConnection::outp( " Rename 
$tmpname ".($ok? 'ok' : 'failed'));
+                       }
+                       return $ok;
+               }
+               if (!($fd = @fopen($filename, 'a'))) return false;
+               if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
+                       $ok = fwrite( $fd, $contents );
+                       fclose($fd);
+                       chmod($filename,0644);
+               }else {
+                       fclose($fd);
+                       if ($debug)ADOConnection::outp( " Failed acquiring lock 
for $filename<br>\n");
+                       $ok = false;
+               }
+       
+               return $ok;
+       }
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-datadict.inc.php
diff -u phpgwapi/inc/adodb/adodb-datadict.inc.php:1.2 
phpgwapi/inc/adodb/adodb-datadict.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-datadict.inc.php:1.2       Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-datadict.inc.php   Tue Feb 21 13:47:42 2006
@@ -1,735 +1,784 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-       DOCUMENTATION:
-       
-               See adodb/tests/test-datadict.php for docs and examples.
-*/
-
-/*
-       Test script for parser
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-function Lens_ParseTest()
-{
-$str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps 
over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";
-print "<p>$str</p>";
-$a= Lens_ParseArgs($str);
-print "<pre>";
-print_r($a);
-print "</pre>";
-}
-
-
-if (!function_exists('ctype_alnum')) {
-       function ctype_alnum($text) {
-               return preg_match('/^[a-z0-9]*$/i', $text);
-       }
-}
-
-//Lens_ParseTest();
-
-/**
-       Parse arguments, treat "text" (text) and 'text' as quotation marks.
-       To escape, use "" or '' or ))
-       
-       Will read in "abc def" sans quotes, as: abc def
-       Same with 'abc def'.
-       However if `abc def`, then will read in as `abc def`
-       
-       @param endstmtchar    Character that indicates end of statement
-       @param tokenchars     Include the following characters in tokens apart 
from A-Z and 0-9 
-       @returns 2 dimensional array containing parsed tokens.
-*/
-function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
-{
-       $pos = 0;
-       $intoken = false;
-       $stmtno = 0;
-       $endquote = false;
-       $tokens = array();
-       $tokens[$stmtno] = array();
-       $max = strlen($args);
-       $quoted = false;
-       
-       while ($pos < $max) {
-               $ch = substr($args,$pos,1);
-               switch($ch) {
-               case ' ':
-               case "\t":
-               case "\n":
-               case "\r":
-                       if (!$quoted) {
-                               if ($intoken) {
-                                       $intoken = false;
-                                       $tokens[$stmtno][] = 
implode('',$tokarr);
-                               }
-                               break;
-                       }
-                       
-                       $tokarr[] = $ch;
-                       break;
-               
-               case '`':
-                       if ($intoken) $tokarr[] = $ch;
-               case '(':
-               case ')':       
-               case '"':
-               case "'":
-                       
-                       if ($intoken) {
-                               if (empty($endquote)) {
-                                       $tokens[$stmtno][] = 
implode('',$tokarr);
-                                       if ($ch == '(') $endquote = ')';
-                                       else $endquote = $ch;
-                                       $quoted = true;
-                                       $intoken = true;
-                                       $tokarr = array();
-                               } else if ($endquote == $ch) {
-                                       $ch2 = substr($args,$pos+1,1);
-                                       if ($ch2 == $endquote) {
-                                               $pos += 1;
-                                               $tokarr[] = $ch2;
-                                       } else {
-                                               $quoted = false;
-                                               $intoken = false;
-                                               $tokens[$stmtno][] = 
implode('',$tokarr);
-                                               $endquote = '';
-                                       }
-                               } else
-                                       $tokarr[] = $ch;
-                                       
-                       }else {
-                       
-                               if ($ch == '(') $endquote = ')';
-                               else $endquote = $ch;
-                               $quoted = true;
-                               $intoken = true;
-                               $tokarr = array();
-                               if ($ch == '`') $tokarr[] = '`';
-                       }
-                       break;
-                       
-               default:
-                       
-                       if (!$intoken) {
-                               if ($ch == $endstmtchar) {
-                                       $stmtno += 1;
-                                       $tokens[$stmtno] = array();
-                                       break;
-                               }
-                       
-                               $intoken = true;
-                               $quoted = false;
-                               $endquote = false;
-                               $tokarr = array();
-       
-                       }
-                       
-                       if ($quoted) $tokarr[] = $ch;
-                       else if (ctype_alnum($ch) || strpos($tokenchars,$ch) 
!== false) $tokarr[] = $ch;
-                       else {
-                               if ($ch == $endstmtchar) {                      
-                                       $tokens[$stmtno][] = 
implode('',$tokarr);
-                                       $stmtno += 1;
-                                       $tokens[$stmtno] = array();
-                                       $intoken = false;
-                                       $tokarr = array();
-                                       break;
-                               }
-                               $tokens[$stmtno][] = implode('',$tokarr);
-                               $tokens[$stmtno][] = $ch;
-                               $intoken = false;
-                       }
-               }
-               $pos += 1;
-       }
-       if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
-       
-       return $tokens;
-}
-
-
-class ADODB_DataDict {
-       var $connection;
-       var $debug = false;
-       var $dropTable = 'DROP TABLE %s';
-       var $renameTable = 'RENAME TABLE %s TO %s'; 
-       var $dropIndex = 'DROP INDEX %s';
-       var $addCol = ' ADD';
-       var $alterCol = ' ALTER COLUMN';
-       var $dropCol = ' DROP COLUMN';
-       var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s';    // 
table, old-column, new-column, column-definitions (not used by default)
-       var $nameRegex = '\w';
-       var $schema = false;
-       var $serverInfo = array();
-       var $autoIncrement = false;
-       var $dataProvider;
-       var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); 
// for changetablesql
-       var $blobSize = 100;    /// any varchar/char field this size or greater 
is treated as a blob
-                                                       /// in other words, we 
use a text area for editting.
-       
-       function GetCommentSQL($table,$col)
-       {
-               return false;
-       }
-       
-       function SetCommentSQL($table,$col,$cmt)
-       {
-               return false;
-       }
-       
-       function &MetaTables()
-       {
-               if (!$this->connection->IsConnected()) return array();
-               return $this->connection->MetaTables();
-       }
-       
-       function &MetaColumns($tab, $upper=true, $schema=false)
-       {
-               if (!$this->connection->IsConnected()) return array();
-               return $this->connection->MetaColumns($this->TableName($tab), 
$upper, $schema);
-       }
-       
-       function &MetaPrimaryKeys($tab,$owner=false,$intkey=false)
-       {
-               if (!$this->connection->IsConnected()) return array();
-               return 
$this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
-       }
-       
-       function &MetaIndexes($table, $primary = false, $owner = false)
-       {
-               if (!$this->connection->IsConnected()) return array();
-               return $this->connection->MetaIndexes($this->TableName($table), 
$primary, $owner);
-       }
-       
-       function MetaType($t,$len=-1,$fieldobj=false)
-       {
-               return ADORecordSet::MetaType($t,$len,$fieldobj);
-       }
-       
-       function NameQuote($name = NULL)
-       {
-               if (!is_string($name)) {
-                       return FALSE;
-               }
-               
-               $name = trim($name);
-               
-               if ( !is_object($this->connection) ) {
-                       return $name;
-               }
-               
-               $quote = $this->connection->nameQuote;
-               
-               // if name is of the form `name`, quote it
-               if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
-                       return $quote . $matches[1] . $quote;
-               }
-               
-               // if name contains special characters, quote it
-               if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
-                       return $quote . $name . $quote;
-               }
-               
-               return $name;
-       }
-       
-       function TableName($name)
-       {
-               if ( $this->schema ) {
-                       return $this->NameQuote($this->schema) .'.'. 
$this->NameQuote($name);
-               }
-               return $this->NameQuote($name);
-       }
-       
-       // Executes the sql array returned by GetTableSQL and GetIndexSQL
-       function ExecuteSQLArray($sql, $continueOnError = true)
-       {
-               $rez = 2;
-               $conn = &$this->connection;
-               $saved = $conn->debug;
-               foreach($sql as $line) {
-                       
-                       if ($this->debug) $conn->debug = true;
-                       $ok = $conn->Execute($line);
-                       $conn->debug = $saved;
-                       if (!$ok) {
-                               if ($this->debug) 
ADOConnection::outp($conn->ErrorMsg());
-                               if (!$continueOnError) return 0;
-                               $rez = 1;
-                       }
-               }
-               return $rez;
-       }
-       
-       /*
-               Returns the actual type given a character code.
-               
-               C:  varchar
-               X:  CLOB (character large object) or largest varchar size if 
CLOB is not supported
-               C2: Multibyte varchar
-               X2: Multibyte CLOB
-               
-               B:  BLOB (binary large object)
-               
-               D:  Date
-               T:  Date-time 
-               L:  Integer field suitable for storing booleans (0 or 1)
-               I:  Integer
-               F:  Floating point number
-               N:  Numeric or decimal number
-       */
-       
-       function ActualType($meta)
-       {
-               return $meta;
-       }
-       
-       function CreateDatabase($dbname,$options=false)
-       {
-               $options = $this->_Options($options);
-               $sql = array();
-               
-               $s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
-               if (isset($options[$this->upperName]))
-                       $s .= ' '.$options[$this->upperName];
-               
-               $sql[] = $s;
-               return $sql;
-       }
-       
-       /*
-        Generates the SQL to create index. Returns an array of sql strings.
-       */
-       function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
-       {
-               if (!is_array($flds)) {
-                       $flds = explode(',',$flds);
-               }
-               
-               foreach($flds as $key => $fld) {
-                       $flds[$key] = $this->NameQuote($fld);
-               }
-               
-               return $this->_IndexSQL($this->NameQuote($idxname), 
$this->TableName($tabname), $flds, $this->_Options($idxoptions));
-       }
-       
-       function DropIndexSQL ($idxname, $tabname = NULL)
-       {
-               return array(sprintf($this->dropIndex, 
$this->NameQuote($idxname), $this->TableName($tabname)));
-       }
-       
-       function SetSchema($schema)
-       {
-               $this->schema = $schema;
-       }
-       
-       function AddColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName ($tabname);
-               $sql = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               $alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-               foreach($lines as $v) {
-                       $sql[] = $alter . $v;
-               }
-               return $sql;
-       }
-       
-       /**
-        * Change the definition of one column
-        *
-        * As some DBM's can't do that on there own, you need to supply the 
complete defintion of the new table,
-        * to allow, recreating the table and copying the content over to the 
new table
-        * @param string $tabname table-name
-        * @param string $flds column-name and type for the changed column
-        * @param string $tableflds='' complete defintion of the new table, eg. 
for postgres, default ''
-        * @param array/string $tableoptions='' options for the new table see 
CreateTableSQL, default ''
-        * @return array with SQL strings
-        */
-       function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-       {
-               $tabname = $this->TableName ($tabname);
-               $sql = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-               foreach($lines as $v) {
-                       $sql[] = $alter . $v;
-               }
-               return $sql;
-       }
-       
-       /**
-        * Rename one column
-        *
-        * Some DBM's can only do this together with changeing the type of the 
column (even if that stays the same, eg. mysql)
-        * @param string $tabname table-name
-        * @param string $oldcolumn column-name to be renamed
-        * @param string $newcolumn new column-name
-        * @param string $flds='' complete column-defintion-string like for 
AddColumnSQL, only used by mysql atm., default=''
-        * @return array with SQL strings
-        */
-       function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
-       {
-               $tabname = $this->TableName ($tabname);
-               if ($flds) {
-                       list($lines,$pkey) = $this->_GenFields($flds);
-                       list(,$first) = each($lines);
-                       list(,$column_def) = split("[\t ]+",$first,2);
-               }
-               return 
array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
-       }
-               
-       /**
-        * Drop one column
-        *
-        * Some DBM's can't do that on there own, you need to supply the 
complete defintion of the new table,
-        * to allow, recreating the table and copying the content over to the 
new table
-        * @param string $tabname table-name
-        * @param string $flds column-name and type for the changed column
-        * @param string $tableflds='' complete defintion of the new table, eg. 
for postgres, default ''
-        * @param array/string $tableoptions='' options for the new table see 
CreateTableSQL, default ''
-        * @return array with SQL strings
-        */
-       function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-       {
-               $tabname = $this->TableName ($tabname);
-               if (!is_array($flds)) $flds = explode(',',$flds);
-               $sql = array();
-               $alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';
-               foreach($flds as $v) {
-                       $sql[] = $alter . $this->NameQuote($v);
-               }
-               return $sql;
-       }
-       
-       function DropTableSQL($tabname)
-       {
-               return array (sprintf($this->dropTable, 
$this->TableName($tabname)));
-       }
-       
-       function RenameTableSQL($tabname,$newname)
-       {
-               return array (sprintf($this->renameTable, 
$this->TableName($tabname),$this->TableName($newname)));
-       }       
-       
-       /*
-        Generate the SQL to create table. Returns an array of sql strings.
-       */
-       function CreateTableSQL($tabname, $flds, $tableoptions=false)
-       {
-               if (!$tableoptions) $tableoptions = array();
-               
-               list($lines,$pkey) = $this->_GenFields($flds, true);
-               
-               $taboptions = $this->_Options($tableoptions);
-               $tabname = $this->TableName ($tabname);
-               $sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
-               
-               $tsql = $this->_Triggers($tabname,$taboptions);
-               foreach($tsql as $s) $sql[] = $s;
-               
-               return $sql;
-       }
-       
-       function _GenFields($flds,$widespacing=false)
-       {
-               if (is_string($flds)) {
-                       $padding = '     ';
-                       $txt = $flds.$padding;
-                       $flds = array();
-                       $flds0 = Lens_ParseArgs($txt,',');
-                       $hasparam = false;
-                       foreach($flds0 as $f0) {
-                               $f1 = array();
-                               foreach($f0 as $token) {
-                                       switch (strtoupper($token)) {
-                                       case 'CONSTRAINT':
-                                       case 'DEFAULT': 
-                                               $hasparam = $token;
-                                               break;
-                                       default:
-                                               if ($hasparam) $f1[$hasparam] = 
$token;
-                                               else $f1[] = $token;
-                                               $hasparam = false;
-                                               break;
-                                       }
-                               }
-                               $flds[] = $f1;
-                               
-                       }
-               }
-               $this->autoIncrement = false;
-               $lines = array();
-               $pkey = array();
-               foreach($flds as $fld) {
-                       $fld = _array_change_key_case($fld);
-               
-                       $fname = false;
-                       $fdefault = false;
-                       $fautoinc = false;
-                       $ftype = false;
-                       $fsize = false;
-                       $fprec = false;
-                       $fprimary = false;
-                       $fnoquote = false;
-                       $fdefts = false;
-                       $fdefdate = false;
-                       $fconstraint = false;
-                       $fnotnull = false;
-                       $funsigned = false;
-                       
-                       //-----------------
-                       // Parse attributes
-                       foreach($fld as $attr => $v) {
-                               if ($attr == 2 && is_numeric($v)) $attr = 
'SIZE';
-                               else if (is_numeric($attr) && $attr > 1 && 
!is_numeric($v)) $attr = strtoupper($v);
-                               
-                               switch($attr) {
-                               case '0':
-                               case 'NAME':    $fname = $v; break;
-                               case '1':
-                               case 'TYPE':    $ty = $v; $ftype = 
$this->ActualType(strtoupper($v)); break;
-                               
-                               case 'SIZE':    
-                                                               $dotat = 
strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
-                                                               if ($dotat === 
false) $fsize = $v;
-                                                               else {
-                                                                       $fsize 
= substr($v,0,$dotat);
-                                                                       $fprec 
= substr($v,$dotat+1);
-                                                               }
-                                                               break;
-                               case 'UNSIGNED': $funsigned = true; break;
-                               case 'AUTOINCREMENT':
-                               case 'AUTO':    $fautoinc = true; $fnotnull = 
true; break;
-                               case 'KEY':
-                               case 'PRIMARY': $fprimary = $v; $fnotnull = 
true; break;
-                               case 'DEF':
-                               case 'DEFAULT': $fdefault = $v; break;
-                               case 'NOTNULL': $fnotnull = $v; break;
-                               case 'NOQUOTE': $fnoquote = $v; break;
-                               case 'DEFDATE': $fdefdate = $v; break;
-                               case 'DEFTIMESTAMP': $fdefts = $v; break;
-                               case 'CONSTRAINT': $fconstraint = $v; break;
-                               } //switch
-                       } // foreach $fld
-                       
-                       //--------------------
-                       // VALIDATE FIELD INFO
-                       if (!strlen($fname)) {
-                               if ($this->debug) 
ADOConnection::outp("Undefined NAME");
-                               return false;
-                       }
-                       
-                       $fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', 
$fname));
-                       $fname = $this->NameQuote($fname);
-                       
-                       if (!strlen($ftype)) {
-                               if ($this->debug) 
ADOConnection::outp("Undefined TYPE for field '$fname'");
-                               return false;
-                       } else {
-                               $ftype = strtoupper($ftype);
-                       }
-                       
-                       $ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
-                       
-                       if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull 
= false; // some blob types do not accept nulls
-                       
-                       if ($fprimary) $pkey[] = $fname;
-                       
-                       // some databases do not allow blobs to have defaults
-                       if ($ty == 'X') $fdefault = false;
-                       
-                       //--------------------
-                       // CONSTRUCT FIELD SQL
-                       if ($fdefts) {
-                               if (substr($this->connection->databaseType,0,5) 
== 'mysql') {
-                                       $ftype = 'TIMESTAMP';
-                               } else {
-                                       $fdefault = 
$this->connection->sysTimeStamp;
-                               }
-                       } else if ($fdefdate) {
-                               if (substr($this->connection->databaseType,0,5) 
== 'mysql') {
-                                       $ftype = 'TIMESTAMP';
-                               } else {
-                                       $fdefault = $this->connection->sysDate;
-                               }
-                       } else if (strlen($fdefault) && !$fnoquote)
-                               if ($ty == 'C' or $ty == 'X' or 
-                                       ( substr($fdefault,0,1) != "'" && 
!is_numeric($fdefault)))
-                                       if (strlen($fdefault) != 1 && 
substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
-                                               $fdefault = trim($fdefault);
-                                       else if (strtolower($fdefault) != 
'null')
-                                               $fdefault = 
$this->connection->qstr($fdefault);
-                       $suffix = 
$this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
-                       
-                       if ($widespacing) $fname = str_pad($fname,24);
-                       $lines[$fid] = $fname.' '.$ftype.$suffix;
-                       
-                       if ($fautoinc) $this->autoIncrement = true;
-               } // foreach $flds
-               
-               return array($lines,$pkey);
-       }
-       /*
-                GENERATE THE SIZE PART OF THE DATATYPE
-                       $ftype is the actual type
-                       $ty is the type defined originally in the DDL
-       */
-       function _GetSize($ftype, $ty, $fsize, $fprec)
-       {
-               if (strlen($fsize) && $ty != 'X' && $ty != 'B' && 
strpos($ftype,'(') === false) {
-                       $ftype .= "(".$fsize;
-                       if (strlen($fprec)) $ftype .= ",".$fprec;
-                       $ftype .= ')';
-               }
-               return $ftype;
-       }
-       
-       
-       // return string must begin with space
-       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-       {       
-               $suffix = '';
-               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               return $suffix;
-       }
-       
-       function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-       {
-               $sql = array();
-               
-               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
-                       $sql[] = sprintf ($this->dropIndex, $idxname);
-                       if ( isset($idxoptions['DROP']) )
-                               return $sql;
-               }
-               
-               if ( empty ($flds) ) {
-                       return $sql;
-               }
-               
-               $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-       
-               $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . 
$tabname . ' ';
-               
-               if ( isset($idxoptions[$this->upperName]) )
-                       $s .= $idxoptions[$this->upperName];
-               
-               if ( is_array($flds) )
-                       $flds = implode(', ',$flds);
-               $s .= '(' . $flds . ')';
-               $sql[] = $s;
-               
-               return $sql;
-       }
-       
-       function _DropAutoIncrement($tabname)
-       {
-               return false;
-       }
-       
-       function _TableSQL($tabname,$lines,$pkey,$tableoptions)
-       {
-               $sql = array();
-               
-               if (isset($tableoptions['REPLACE']) || isset 
($tableoptions['DROP'])) {
-                       $sql[] = sprintf($this->dropTable,$tabname);
-                       if ($this->autoIncrement) {
-                               $sInc = $this->_DropAutoIncrement($tabname);
-                               if ($sInc) $sql[] = $sInc;
-                       }
-                       if ( isset ($tableoptions['DROP']) ) {
-                               return $sql;
-                       }
-               }
-               $s = "CREATE TABLE $tabname (\n";
-               $s .= implode(",\n", $lines);
-               if (sizeof($pkey)>0) {
-                       $s .= ",\n                 PRIMARY KEY (";
-                       $s .= implode(", ",$pkey).")";
-               }
-               if (isset($tableoptions['CONSTRAINTS'])) 
-                       $s .= "\n".$tableoptions['CONSTRAINTS'];
-               
-               if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
-                       $s .= 
"\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
-               
-               $s .= "\n)";
-               if (isset($tableoptions[$this->upperName])) $s .= 
$tableoptions[$this->upperName];
-               $sql[] = $s;
-               
-               return $sql;
-       }
-       
-       /*
-               GENERATE TRIGGERS IF NEEDED
-               used when table has auto-incrementing field that is emulated 
using triggers
-       */
-       function _Triggers($tabname,$taboptions)
-       {
-               return array();
-       }
-       
-       /*
-               Sanitize options, so that array elements with no keys are 
promoted to keys
-       */
-       function _Options($opts)
-       {
-               if (!is_array($opts)) return array();
-               $newopts = array();
-               foreach($opts as $k => $v) {
-                       if (is_numeric($k)) $newopts[strtoupper($v)] = $v;
-                       else $newopts[strtoupper($k)] = $v;
-               }
-               return $newopts;
-       }
-       
-       /*
-       "Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
-       
-       This function changes/adds new fields to your table. You don't
-       have to know if the col is new or not. It will check on its own.
-       */
-       function ChangeTableSQL($tablename, $flds, $tableoptions = false)
-       {
-               // check table exists
-               $cols = &$this->MetaColumns($tablename);
-               if ( empty($cols)) { 
-                       return $this->CreateTableSQL($tablename, $flds, 
$tableoptions);
-               }
-               
-               // already exists, alter table instead
-               list($lines,$pkey) = $this->_GenFields($flds);
-               $alter = 'ALTER TABLE ' . $this->TableName($tablename);
-               foreach ( $lines as $id => $v ) {
-                       if ( isset($cols[$id]) && is_object($cols[$id]) ) {
-                       
-                               $flds = Lens_ParseArgs($v,',');
-                               
-                               //  We are trying to change the size of the 
field, if not allowed, simply ignore the request.
-                               if ($flds && 
in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) 
continue;         
-                       
-                               $sql[] = $alter . $this->alterCol . ' ' . $v;
-                       } else {
-                               $sql[] = $alter . $this->addCol . ' ' . $v;
-                       }
-               }
-               
-               return $sql;
-       }
-} // class
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+       DOCUMENTATION:
+       
+               See adodb/tests/test-datadict.php for docs and examples.
+*/
+
+/*
+       Test script for parser
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+function Lens_ParseTest()
+{
+$str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps 
over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";
+print "<p>$str</p>";
+$a= Lens_ParseArgs($str);
+print "<pre>";
+print_r($a);
+print "</pre>";
+}
+
+
+if (!function_exists('ctype_alnum')) {
+       function ctype_alnum($text) {
+               return preg_match('/^[a-z0-9]*$/i', $text);
+       }
+}
+
+//Lens_ParseTest();
+
+/**
+       Parse arguments, treat "text" (text) and 'text' as quotation marks.
+       To escape, use "" or '' or ))
+       
+       Will read in "abc def" sans quotes, as: abc def
+       Same with 'abc def'.
+       However if `abc def`, then will read in as `abc def`
+       
+       @param endstmtchar    Character that indicates end of statement
+       @param tokenchars     Include the following characters in tokens apart 
from A-Z and 0-9 
+       @returns 2 dimensional array containing parsed tokens.
+*/
+function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
+{
+       $pos = 0;
+       $intoken = false;
+       $stmtno = 0;
+       $endquote = false;
+       $tokens = array();
+       $tokens[$stmtno] = array();
+       $max = strlen($args);
+       $quoted = false;
+       $tokarr = array();
+       
+       while ($pos < $max) {
+               $ch = substr($args,$pos,1);
+               switch($ch) {
+               case ' ':
+               case "\t":
+               case "\n":
+               case "\r":
+                       if (!$quoted) {
+                               if ($intoken) {
+                                       $intoken = false;
+                                       $tokens[$stmtno][] = 
implode('',$tokarr);
+                               }
+                               break;
+                       }
+                       
+                       $tokarr[] = $ch;
+                       break;
+               
+               case '`':
+                       if ($intoken) $tokarr[] = $ch;
+               case '(':
+               case ')':       
+               case '"':
+               case "'":
+                       
+                       if ($intoken) {
+                               if (empty($endquote)) {
+                                       $tokens[$stmtno][] = 
implode('',$tokarr);
+                                       if ($ch == '(') $endquote = ')';
+                                       else $endquote = $ch;
+                                       $quoted = true;
+                                       $intoken = true;
+                                       $tokarr = array();
+                               } else if ($endquote == $ch) {
+                                       $ch2 = substr($args,$pos+1,1);
+                                       if ($ch2 == $endquote) {
+                                               $pos += 1;
+                                               $tokarr[] = $ch2;
+                                       } else {
+                                               $quoted = false;
+                                               $intoken = false;
+                                               $tokens[$stmtno][] = 
implode('',$tokarr);
+                                               $endquote = '';
+                                       }
+                               } else
+                                       $tokarr[] = $ch;
+                                       
+                       }else {
+                       
+                               if ($ch == '(') $endquote = ')';
+                               else $endquote = $ch;
+                               $quoted = true;
+                               $intoken = true;
+                               $tokarr = array();
+                               if ($ch == '`') $tokarr[] = '`';
+                       }
+                       break;
+                       
+               default:
+                       
+                       if (!$intoken) {
+                               if ($ch == $endstmtchar) {
+                                       $stmtno += 1;
+                                       $tokens[$stmtno] = array();
+                                       break;
+                               }
+                       
+                               $intoken = true;
+                               $quoted = false;
+                               $endquote = false;
+                               $tokarr = array();
+       
+                       }
+                       
+                       if ($quoted) $tokarr[] = $ch;
+                       else if (ctype_alnum($ch) || strpos($tokenchars,$ch) 
!== false) $tokarr[] = $ch;
+                       else {
+                               if ($ch == $endstmtchar) {                      
+                                       $tokens[$stmtno][] = 
implode('',$tokarr);
+                                       $stmtno += 1;
+                                       $tokens[$stmtno] = array();
+                                       $intoken = false;
+                                       $tokarr = array();
+                                       break;
+                               }
+                               $tokens[$stmtno][] = implode('',$tokarr);
+                               $tokens[$stmtno][] = $ch;
+                               $intoken = false;
+                       }
+               }
+               $pos += 1;
+       }
+       if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
+       
+       return $tokens;
+}
+
+
+class ADODB_DataDict {
+       var $connection;
+       var $debug = false;
+       var $dropTable = 'DROP TABLE %s';
+       var $renameTable = 'RENAME TABLE %s TO %s'; 
+       var $dropIndex = 'DROP INDEX %s';
+       var $addCol = ' ADD';
+       var $alterCol = ' ALTER COLUMN';
+       var $dropCol = ' DROP COLUMN';
+       var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s';    // 
table, old-column, new-column, column-definitions (not used by default)
+       var $nameRegex = '\w';
+       var $nameRegexBrackets = 'a-zA-Z0-9_\(\)';
+       var $schema = false;
+       var $serverInfo = array();
+       var $autoIncrement = false;
+       var $dataProvider;
+       var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); 
// for changetablesql
+       var $blobSize = 100;    /// any varchar/char field this size or greater 
is treated as a blob
+                                                       /// in other words, we 
use a text area for editting.
+       
+       function GetCommentSQL($table,$col)
+       {
+               return false;
+       }
+       
+       function SetCommentSQL($table,$col,$cmt)
+       {
+               return false;
+       }
+       
+       function MetaTables()
+       {
+               if (!$this->connection->IsConnected()) return array();
+               return $this->connection->MetaTables();
+       }
+       
+       function MetaColumns($tab, $upper=true, $schema=false)
+       {
+               if (!$this->connection->IsConnected()) return array();
+               return $this->connection->MetaColumns($this->TableName($tab), 
$upper, $schema);
+       }
+       
+       function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
+       {
+               if (!$this->connection->IsConnected()) return array();
+               return 
$this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
+       }
+       
+       function MetaIndexes($table, $primary = false, $owner = false)
+       {
+               if (!$this->connection->IsConnected()) return array();
+               return $this->connection->MetaIndexes($this->TableName($table), 
$primary, $owner);
+       }
+       
+       function MetaType($t,$len=-1,$fieldobj=false)
+       {
+               return ADORecordSet::MetaType($t,$len,$fieldobj);
+       }
+       
+       function NameQuote($name = NULL,$allowBrackets=false)
+       {
+               if (!is_string($name)) {
+                       return FALSE;
+               }
+               
+               $name = trim($name);
+               
+               if ( !is_object($this->connection) ) {
+                       return $name;
+               }
+               
+               $quote = $this->connection->nameQuote;
+               
+               // if name is of the form `name`, quote it
+               if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
+                       return $quote . $matches[1] . $quote;
+               }
+               
+               // if name contains special characters, quote it
+               $regex = ($allowBrackets) ? $this->nameRegexBrackets : 
$this->nameRegex;
+               
+               if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
+                       return $quote . $name . $quote;
+               }
+               
+               return $name;
+       }
+       
+       function TableName($name)
+       {
+               if ( $this->schema ) {
+                       return $this->NameQuote($this->schema) .'.'. 
$this->NameQuote($name);
+               }
+               return $this->NameQuote($name);
+       }
+       
+       // Executes the sql array returned by GetTableSQL and GetIndexSQL
+       function ExecuteSQLArray($sql, $continueOnError = true)
+       {
+               $rez = 2;
+               $conn = &$this->connection;
+               $saved = $conn->debug;
+               foreach($sql as $line) {
+                       
+                       if ($this->debug) $conn->debug = true;
+                       $ok = $conn->Execute($line);
+                       $conn->debug = $saved;
+                       if (!$ok) {
+                               if ($this->debug) 
ADOConnection::outp($conn->ErrorMsg());
+                               if (!$continueOnError) return 0;
+                               $rez = 1;
+                       }
+               }
+               return $rez;
+       }
+       
+       /*
+               Returns the actual type given a character code.
+               
+               C:  varchar
+               X:  CLOB (character large object) or largest varchar size if 
CLOB is not supported
+               C2: Multibyte varchar
+               X2: Multibyte CLOB
+               
+               B:  BLOB (binary large object)
+               
+               D:  Date
+               T:  Date-time 
+               L:  Integer field suitable for storing booleans (0 or 1)
+               I:  Integer
+               F:  Floating point number
+               N:  Numeric or decimal number
+       */
+       
+       function ActualType($meta)
+       {
+               return $meta;
+       }
+       
+       function CreateDatabase($dbname,$options=false)
+       {
+               $options = $this->_Options($options);
+               $sql = array();
+               
+               $s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
+               if (isset($options[$this->upperName]))
+                       $s .= ' '.$options[$this->upperName];
+               
+               $sql[] = $s;
+               return $sql;
+       }
+       
+       /*
+        Generates the SQL to create index. Returns an array of sql strings.
+       */
+       function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
+       {
+               if (!is_array($flds)) {
+                       $flds = explode(',',$flds);
+               }
+               
+               foreach($flds as $key => $fld) {
+                       # some indexes can use partial fields, eg. index first 
32 chars of "name" with NAME(32)
+                       $flds[$key] = 
$this->NameQuote($fld,$allowBrackets=true);
+               }
+               
+               return $this->_IndexSQL($this->NameQuote($idxname), 
$this->TableName($tabname), $flds, $this->_Options($idxoptions));
+       }
+       
+       function DropIndexSQL ($idxname, $tabname = NULL)
+       {
+               return array(sprintf($this->dropIndex, 
$this->NameQuote($idxname), $this->TableName($tabname)));
+       }
+       
+       function SetSchema($schema)
+       {
+               $this->schema = $schema;
+       }
+       
+       function AddColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName ($tabname);
+               $sql = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               $alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
+               foreach($lines as $v) {
+                       $sql[] = $alter . $v;
+               }
+               return $sql;
+       }
+       
+       /**
+        * Change the definition of one column
+        *
+        * As some DBM's can't do that on there own, you need to supply the 
complete defintion of the new table,
+        * to allow, recreating the table and copying the content over to the 
new table
+        * @param string $tabname table-name
+        * @param string $flds column-name and type for the changed column
+        * @param string $tableflds='' complete defintion of the new table, eg. 
for postgres, default ''
+        * @param array/string $tableoptions='' options for the new table see 
CreateTableSQL, default ''
+        * @return array with SQL strings
+        */
+       function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+       {
+               $tabname = $this->TableName ($tabname);
+               $sql = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+               foreach($lines as $v) {
+                       $sql[] = $alter . $v;
+               }
+               return $sql;
+       }
+       
+       /**
+        * Rename one column
+        *
+        * Some DBM's can only do this together with changeing the type of the 
column (even if that stays the same, eg. mysql)
+        * @param string $tabname table-name
+        * @param string $oldcolumn column-name to be renamed
+        * @param string $newcolumn new column-name
+        * @param string $flds='' complete column-defintion-string like for 
AddColumnSQL, only used by mysql atm., default=''
+        * @return array with SQL strings
+        */
+       function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
+       {
+               $tabname = $this->TableName ($tabname);
+               if ($flds) {
+                       list($lines,$pkey) = $this->_GenFields($flds);
+                       list(,$first) = each($lines);
+                       list(,$column_def) = split("[\t ]+",$first,2);
+               }
+               return 
array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
+       }
+               
+       /**
+        * Drop one column
+        *
+        * Some DBM's can't do that on there own, you need to supply the 
complete defintion of the new table,
+        * to allow, recreating the table and copying the content over to the 
new table
+        * @param string $tabname table-name
+        * @param string $flds column-name and type for the changed column
+        * @param string $tableflds='' complete defintion of the new table, eg. 
for postgres, default ''
+        * @param array/string $tableoptions='' options for the new table see 
CreateTableSQL, default ''
+        * @return array with SQL strings
+        */
+       function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+       {
+               $tabname = $this->TableName ($tabname);
+               if (!is_array($flds)) $flds = explode(',',$flds);
+               $sql = array();
+               $alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';
+               foreach($flds as $v) {
+                       $sql[] = $alter . $this->NameQuote($v);
+               }
+               return $sql;
+       }
+       
+       function DropTableSQL($tabname)
+       {
+               return array (sprintf($this->dropTable, 
$this->TableName($tabname)));
+       }
+       
+       function RenameTableSQL($tabname,$newname)
+       {
+               return array (sprintf($this->renameTable, 
$this->TableName($tabname),$this->TableName($newname)));
+       }       
+       
+       /*
+        Generate the SQL to create table. Returns an array of sql strings.
+       */
+       function CreateTableSQL($tabname, $flds, $tableoptions=false)
+       {
+               if (!$tableoptions) $tableoptions = array();
+               
+               list($lines,$pkey) = $this->_GenFields($flds, true);
+               
+               $taboptions = $this->_Options($tableoptions);
+               $tabname = $this->TableName ($tabname);
+               $sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
+               
+               $tsql = $this->_Triggers($tabname,$taboptions);
+               foreach($tsql as $s) $sql[] = $s;
+               
+               return $sql;
+       }
+       
+       function _GenFields($flds,$widespacing=false)
+       {
+               if (is_string($flds)) {
+                       $padding = '     ';
+                       $txt = $flds.$padding;
+                       $flds = array();
+                       $flds0 = Lens_ParseArgs($txt,',');
+                       $hasparam = false;
+                       foreach($flds0 as $f0) {
+                               $f1 = array();
+                               foreach($f0 as $token) {
+                                       switch (strtoupper($token)) {
+                                       case 'CONSTRAINT':
+                                       case 'DEFAULT': 
+                                               $hasparam = $token;
+                                               break;
+                                       default:
+                                               if ($hasparam) $f1[$hasparam] = 
$token;
+                                               else $f1[] = $token;
+                                               $hasparam = false;
+                                               break;
+                                       }
+                               }
+                               $flds[] = $f1;
+                               
+                       }
+               }
+               $this->autoIncrement = false;
+               $lines = array();
+               $pkey = array();
+               foreach($flds as $fld) {
+                       $fld = _array_change_key_case($fld);
+               
+                       $fname = false;
+                       $fdefault = false;
+                       $fautoinc = false;
+                       $ftype = false;
+                       $fsize = false;
+                       $fprec = false;
+                       $fprimary = false;
+                       $fnoquote = false;
+                       $fdefts = false;
+                       $fdefdate = false;
+                       $fconstraint = false;
+                       $fnotnull = false;
+                       $funsigned = false;
+                       
+                       //-----------------
+                       // Parse attributes
+                       foreach($fld as $attr => $v) {
+                               if ($attr == 2 && is_numeric($v)) $attr = 
'SIZE';
+                               else if (is_numeric($attr) && $attr > 1 && 
!is_numeric($v)) $attr = strtoupper($v);
+                               
+                               switch($attr) {
+                               case '0':
+                               case 'NAME':    $fname = $v; break;
+                               case '1':
+                               case 'TYPE':    $ty = $v; $ftype = 
$this->ActualType(strtoupper($v)); break;
+                               
+                               case 'SIZE':    
+                                                               $dotat = 
strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
+                                                               if ($dotat === 
false) $fsize = $v;
+                                                               else {
+                                                                       $fsize 
= substr($v,0,$dotat);
+                                                                       $fprec 
= substr($v,$dotat+1);
+                                                               }
+                                                               break;
+                               case 'UNSIGNED': $funsigned = true; break;
+                               case 'AUTOINCREMENT':
+                               case 'AUTO':    $fautoinc = true; $fnotnull = 
true; break;
+                               case 'KEY':
+                               case 'PRIMARY': $fprimary = $v; $fnotnull = 
true; break;
+                               case 'DEF':
+                               case 'DEFAULT': $fdefault = $v; break;
+                               case 'NOTNULL': $fnotnull = $v; break;
+                               case 'NOQUOTE': $fnoquote = $v; break;
+                               case 'DEFDATE': $fdefdate = $v; break;
+                               case 'DEFTIMESTAMP': $fdefts = $v; break;
+                               case 'CONSTRAINT': $fconstraint = $v; break;
+                               } //switch
+                       } // foreach $fld
+                       
+                       //--------------------
+                       // VALIDATE FIELD INFO
+                       if (!strlen($fname)) {
+                               if ($this->debug) 
ADOConnection::outp("Undefined NAME");
+                               return false;
+                       }
+                       
+                       $fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', 
$fname));
+                       $fname = $this->NameQuote($fname);
+                       
+                       if (!strlen($ftype)) {
+                               if ($this->debug) 
ADOConnection::outp("Undefined TYPE for field '$fname'");
+                               return false;
+                       } else {
+                               $ftype = strtoupper($ftype);
+                       }
+                       
+                       $ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
+                       
+                       if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull 
= false; // some blob types do not accept nulls
+                       
+                       if ($fprimary) $pkey[] = $fname;
+                       
+                       // some databases do not allow blobs to have defaults
+                       if ($ty == 'X') $fdefault = false;
+                       
+                       //--------------------
+                       // CONSTRUCT FIELD SQL
+                       if ($fdefts) {
+                               if (substr($this->connection->databaseType,0,5) 
== 'mysql') {
+                                       $ftype = 'TIMESTAMP';
+                               } else {
+                                       $fdefault = 
$this->connection->sysTimeStamp;
+                               }
+                       } else if ($fdefdate) {
+                               if (substr($this->connection->databaseType,0,5) 
== 'mysql') {
+                                       $ftype = 'TIMESTAMP';
+                               } else {
+                                       $fdefault = $this->connection->sysDate;
+                               }
+                       } else if ($fdefault !== false && !$fnoquote)
+                               if ($ty == 'C' or $ty == 'X' or 
+                                       ( substr($fdefault,0,1) != "'" && 
!is_numeric($fdefault)))
+                                       if (strlen($fdefault) != 1 && 
substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
+                                               $fdefault = trim($fdefault);
+                                       else if (strtolower($fdefault) != 
'null')
+                                               $fdefault = 
$this->connection->qstr($fdefault);
+                       $suffix = 
$this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
+                       
+                       if ($widespacing) $fname = str_pad($fname,24);
+                       $lines[$fid] = $fname.' '.$ftype.$suffix;
+                       
+                       if ($fautoinc) $this->autoIncrement = true;
+               } // foreach $flds
+               
+               return array($lines,$pkey);
+       }
+       /*
+                GENERATE THE SIZE PART OF THE DATATYPE
+                       $ftype is the actual type
+                       $ty is the type defined originally in the DDL
+       */
+       function _GetSize($ftype, $ty, $fsize, $fprec)
+       {
+               if (strlen($fsize) && $ty != 'X' && $ty != 'B' && 
strpos($ftype,'(') === false) {
+                       $ftype .= "(".$fsize;
+                       if (strlen($fprec)) $ftype .= ",".$fprec;
+                       $ftype .= ')';
+               }
+               return $ftype;
+       }
+       
+       
+       // return string must begin with space
+       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
+       {       
+               $suffix = '';
+               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               return $suffix;
+       }
+       
+       function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+       {
+               $sql = array();
+               
+               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
+                       $sql[] = sprintf ($this->dropIndex, $idxname);
+                       if ( isset($idxoptions['DROP']) )
+                               return $sql;
+               }
+               
+               if ( empty ($flds) ) {
+                       return $sql;
+               }
+               
+               $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+       
+               $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . 
$tabname . ' ';
+               
+               if ( isset($idxoptions[$this->upperName]) )
+                       $s .= $idxoptions[$this->upperName];
+               
+               if ( is_array($flds) )
+                       $flds = implode(', ',$flds);
+               $s .= '(' . $flds . ')';
+               $sql[] = $s;
+               
+               return $sql;
+       }
+       
+       function _DropAutoIncrement($tabname)
+       {
+               return false;
+       }
+       
+       function _TableSQL($tabname,$lines,$pkey,$tableoptions)
+       {
+               $sql = array();
+               
+               if (isset($tableoptions['REPLACE']) || isset 
($tableoptions['DROP'])) {
+                       $sql[] = sprintf($this->dropTable,$tabname);
+                       if ($this->autoIncrement) {
+                               $sInc = $this->_DropAutoIncrement($tabname);
+                               if ($sInc) $sql[] = $sInc;
+                       }
+                       if ( isset ($tableoptions['DROP']) ) {
+                               return $sql;
+                       }
+               }
+               $s = "CREATE TABLE $tabname (\n";
+               $s .= implode(",\n", $lines);
+               if (sizeof($pkey)>0) {
+                       $s .= ",\n                 PRIMARY KEY (";
+                       $s .= implode(", ",$pkey).")";
+               }
+               if (isset($tableoptions['CONSTRAINTS'])) 
+                       $s .= "\n".$tableoptions['CONSTRAINTS'];
+               
+               if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
+                       $s .= 
"\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
+               
+               $s .= "\n)";
+               if (isset($tableoptions[$this->upperName])) $s .= 
$tableoptions[$this->upperName];
+               $sql[] = $s;
+               
+               return $sql;
+       }
+       
+       /*
+               GENERATE TRIGGERS IF NEEDED
+               used when table has auto-incrementing field that is emulated 
using triggers
+       */
+       function _Triggers($tabname,$taboptions)
+       {
+               return array();
+       }
+       
+       /*
+               Sanitize options, so that array elements with no keys are 
promoted to keys
+       */
+       function _Options($opts)
+       {
+               if (!is_array($opts)) return array();
+               $newopts = array();
+               foreach($opts as $k => $v) {
+                       if (is_numeric($k)) $newopts[strtoupper($v)] = $v;
+                       else $newopts[strtoupper($k)] = $v;
+               }
+               return $newopts;
+       }
+       
+       /*
+       "Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
+       
+       This function changes/adds new fields to your table. You don't
+       have to know if the col is new or not. It will check on its own.
+       */
+       function ChangeTableSQL($tablename, $flds, $tableoptions = false)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+               if ($this->connection->fetchMode !== false) $savem = 
$this->connection->SetFetchMode(false);
+               
+               // check table exists
+               $save_handler = $this->connection->raiseErrorFn;
+               $this->connection->raiseErrorFn = '';
+               $cols = $this->MetaColumns($tablename);
+               $this->connection->raiseErrorFn = $save_handler;
+               
+               if (isset($savem)) $this->connection->SetFetchMode($savem);
+               $ADODB_FETCH_MODE = $save;
+               
+               if ( empty($cols)) { 
+                       return $this->CreateTableSQL($tablename, $flds, 
$tableoptions);
+               }
+               
+               if (is_array($flds)) {
+               // Cycle through the update fields, comparing
+               // existing fields to fields to update.
+               // if the Metatype and size is exactly the
+               // same, ignore - by Mark Newham
+                       $holdflds = array();
+                       foreach($flds as $k=>$v) {
+                               if ( isset($cols[$k]) && is_object($cols[$k]) ) 
{
+                                       // If already not allowing nulls, then 
don't change
+                                       $obj = $cols[$k];
+                                       if (isset($obj->not_null) && 
$obj->not_null)
+                                               $v = str_replace('NOT 
NULL','',$v);
+
+                                       $c = $cols[$k];
+                                       $ml = $c->max_length;
+                                       $mt = $this->MetaType($c->type,$ml);
+                                       if ($ml == -1) $ml = '';
+                                       if ($mt == 'X') $ml = $v['SIZE'];
+                                       if (($mt != $v['TYPE']) ||  $ml != 
$v['SIZE']) {
+                                               $holdflds[$k] = $v;
+                                       }
+                               } else {
+                                       $holdflds[$k] = $v;
+                               }               
+                       }
+                       $flds = $holdflds;
+               }
+       
+
+               // already exists, alter table instead
+               list($lines,$pkey) = $this->_GenFields($flds);
+               $alter = 'ALTER TABLE ' . $this->TableName($tablename);
+               $sql = array();
+
+               foreach ( $lines as $id => $v ) {
+                       if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+                       
+                               $flds = Lens_ParseArgs($v,',');
+                               
+                               //  We are trying to change the size of the 
field, if not allowed, simply ignore the request.
+                               if ($flds && 
in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) 
continue;         
+                       
+                               $sql[] = $alter . $this->alterCol . ' ' . $v;
+                       } else {
+                               $sql[] = $alter . $this->addCol . ' ' . $v;
+                       }
+               }
+               
+               return $sql;
+       }
+} // class
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-error.inc.php
diff -u phpgwapi/inc/adodb/adodb-error.inc.php:1.2 
phpgwapi/inc/adodb/adodb-error.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-error.inc.php:1.2  Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-error.inc.php      Tue Feb 21 13:47:42 2006
@@ -1,257 +1,258 @@
-<?php
-/** 
- * @version V4.54 5 Nov 2004 (c) 2000-2004 John Lim (address@hidden). All 
rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
- *
- * Set tabs to 4 for best viewing.
- * 
- * The following code is adapted from the PEAR DB error handling code.
- * Portions (c)1997-2002 The PHP Group.
- */
-
-
-if (!defined("DB_ERROR")) define("DB_ERROR",-1);
-
-if (!defined("DB_ERROR_SYNTAX")) {
-       define("DB_ERROR_SYNTAX",              -2);
-       define("DB_ERROR_CONSTRAINT",          -3);
-       define("DB_ERROR_NOT_FOUND",           -4);
-       define("DB_ERROR_ALREADY_EXISTS",      -5);
-       define("DB_ERROR_UNSUPPORTED",         -6);
-       define("DB_ERROR_MISMATCH",            -7);
-       define("DB_ERROR_INVALID",             -8);
-       define("DB_ERROR_NOT_CAPABLE",         -9);
-       define("DB_ERROR_TRUNCATED",          -10);
-       define("DB_ERROR_INVALID_NUMBER",     -11);
-       define("DB_ERROR_INVALID_DATE",       -12);
-       define("DB_ERROR_DIVZERO",            -13);
-       define("DB_ERROR_NODBSELECTED",       -14);
-       define("DB_ERROR_CANNOT_CREATE",      -15);
-       define("DB_ERROR_CANNOT_DELETE",      -16);
-       define("DB_ERROR_CANNOT_DROP",        -17);
-       define("DB_ERROR_NOSUCHTABLE",        -18);
-       define("DB_ERROR_NOSUCHFIELD",        -19);
-       define("DB_ERROR_NEED_MORE_DATA",     -20);
-       define("DB_ERROR_NOT_LOCKED",         -21);
-       define("DB_ERROR_VALUE_COUNT_ON_ROW", -22);
-       define("DB_ERROR_INVALID_DSN",        -23);
-       define("DB_ERROR_CONNECT_FAILED",     -24);
-       define("DB_ERROR_EXTENSION_NOT_FOUND",-25);
-       define("DB_ERROR_NOSUCHDB",           -25);
-       define("DB_ERROR_ACCESS_VIOLATION",   -26);
-}
-
-function adodb_errormsg($value)
-{
-global $ADODB_LANG,$ADODB_LANG_ARRAY;
-
-       if (empty($ADODB_LANG)) $ADODB_LANG = 'en';
-       if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == 
$ADODB_LANG) ;
-       else {
-               include_once(ADODB_DIR."/lang/adodb-$ADODB_LANG.inc.php");
-    }
-       return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : 
$ADODB_LANG_ARRAY[DB_ERROR];
-}
-
-function adodb_error($provider,$dbType,$errno)
-{
-       //var_dump($errno);
-       if (is_numeric($errno) && $errno == 0) return 0;
-       switch($provider) { 
-       case 'mysql': $map = adodb_error_mysql(); break;
-       
-       case 'oracle':
-       case 'oci8': $map = adodb_error_oci8(); break;
-       
-       case 'ibase': $map = adodb_error_ibase(); break;
-       
-       case 'odbc': $map = adodb_error_odbc(); break;
-       
-       case 'mssql':
-       case 'sybase': $map = adodb_error_mssql(); break;
-       
-       case 'informix': $map = adodb_error_ifx(); break;
-       
-       case 'postgres': return adodb_error_pg($errno); break;
-       
-       case 'sqlite': return $map = adodb_error_sqlite(); break;
-       default:
-               return DB_ERROR;
-       }       
-       //print_r($map);
-       //var_dump($errno);
-       if (isset($map[$errno])) return $map[$errno];
-       return DB_ERROR;
-}
-
-//**************************************************************************************
-
-function adodb_error_pg($errormsg)
-{
-       if (is_numeric($errormsg)) return (integer) $errormsg;
-    static $error_regexps = array(
-            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not 
exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
-            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate 
key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
-            '/divide by zero$/'                     => DB_ERROR_DIVZERO,
-            '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER,
-            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does 
not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD,
-            '/parser: parse error at or near \"/'   => DB_ERROR_SYNTAX,
-            '/referential integrity violation/'     => DB_ERROR_CONSTRAINT,
-                       '/Relation [\"\'].*[\"\'] already exists|Cannot insert 
a duplicate key into (a )?unique index.*|duplicate key violates unique 
constraint/'     
-                                => DB_ERROR_ALREADY_EXISTS
-        );
-       reset($error_regexps);
-    while (list($regexp,$code) = each($error_regexps)) {
-        if (preg_match($regexp, $errormsg)) {
-            return $code;
-        }
-    }
-    // Fall back to DB_ERROR if there was no mapping.
-    return DB_ERROR;
-}
-       
-function adodb_error_odbc()
-{
-static $MAP = array(
-            '01004' => DB_ERROR_TRUNCATED,
-            '07001' => DB_ERROR_MISMATCH,
-            '21S01' => DB_ERROR_MISMATCH,
-            '21S02' => DB_ERROR_MISMATCH,
-            '22003' => DB_ERROR_INVALID_NUMBER,
-            '22008' => DB_ERROR_INVALID_DATE,
-            '22012' => DB_ERROR_DIVZERO,
-            '23000' => DB_ERROR_CONSTRAINT,
-            '24000' => DB_ERROR_INVALID,
-            '34000' => DB_ERROR_INVALID,
-            '37000' => DB_ERROR_SYNTAX,
-            '42000' => DB_ERROR_SYNTAX,
-            'IM001' => DB_ERROR_UNSUPPORTED,
-            'S0000' => DB_ERROR_NOSUCHTABLE,
-            'S0001' => DB_ERROR_NOT_FOUND,
-            'S0002' => DB_ERROR_NOSUCHTABLE,
-            'S0011' => DB_ERROR_ALREADY_EXISTS,
-            'S0012' => DB_ERROR_NOT_FOUND,
-            'S0021' => DB_ERROR_ALREADY_EXISTS,
-            'S0022' => DB_ERROR_NOT_FOUND,
-                       'S1000' => DB_ERROR_NOSUCHTABLE,
-            'S1009' => DB_ERROR_INVALID,
-            'S1090' => DB_ERROR_INVALID,
-            'S1C00' => DB_ERROR_NOT_CAPABLE
-        );
-               return $MAP;
-}
-
-function adodb_error_ibase()
-{
-static $MAP = array(
-            -104 => DB_ERROR_SYNTAX,
-            -150 => DB_ERROR_ACCESS_VIOLATION,
-            -151 => DB_ERROR_ACCESS_VIOLATION,
-            -155 => DB_ERROR_NOSUCHTABLE,
-            -157 => DB_ERROR_NOSUCHFIELD,
-            -158 => DB_ERROR_VALUE_COUNT_ON_ROW,
-            -170 => DB_ERROR_MISMATCH,
-            -171 => DB_ERROR_MISMATCH,
-            -172 => DB_ERROR_INVALID,
-            -204 => DB_ERROR_INVALID,
-            -205 => DB_ERROR_NOSUCHFIELD,
-            -206 => DB_ERROR_NOSUCHFIELD,
-            -208 => DB_ERROR_INVALID,
-            -219 => DB_ERROR_NOSUCHTABLE,
-            -297 => DB_ERROR_CONSTRAINT,
-            -530 => DB_ERROR_CONSTRAINT,
-            -803 => DB_ERROR_CONSTRAINT,
-            -551 => DB_ERROR_ACCESS_VIOLATION,
-            -552 => DB_ERROR_ACCESS_VIOLATION,
-            -922 => DB_ERROR_NOSUCHDB,
-            -923 => DB_ERROR_CONNECT_FAILED,
-            -924 => DB_ERROR_CONNECT_FAILED
-        );
-               
-               return $MAP;
-}
-
-function adodb_error_ifx()
-{
-static $MAP = array(
-            '-201'    => DB_ERROR_SYNTAX,
-            '-206'    => DB_ERROR_NOSUCHTABLE,
-            '-217'    => DB_ERROR_NOSUCHFIELD,
-            '-329'    => DB_ERROR_NODBSELECTED,
-            '-1204'   => DB_ERROR_INVALID_DATE,
-            '-1205'   => DB_ERROR_INVALID_DATE,
-            '-1206'   => DB_ERROR_INVALID_DATE,
-            '-1209'   => DB_ERROR_INVALID_DATE,
-            '-1210'   => DB_ERROR_INVALID_DATE,
-            '-1212'   => DB_ERROR_INVALID_DATE
-       );
-          
-          return $MAP;
-}
-
-function adodb_error_oci8()
-{
-static $MAP = array(
-                        1 => DB_ERROR_ALREADY_EXISTS,
-            900 => DB_ERROR_SYNTAX,
-            904 => DB_ERROR_NOSUCHFIELD,
-            923 => DB_ERROR_SYNTAX,
-            942 => DB_ERROR_NOSUCHTABLE,
-            955 => DB_ERROR_ALREADY_EXISTS,
-            1476 => DB_ERROR_DIVZERO,
-            1722 => DB_ERROR_INVALID_NUMBER,
-            2289 => DB_ERROR_NOSUCHTABLE,
-            2291 => DB_ERROR_CONSTRAINT,
-            2449 => DB_ERROR_CONSTRAINT
-        );
-          
-       return $MAP;
-}
-
-function adodb_error_mssql()
-{
-static $MAP = array(
-                 208 => DB_ERROR_NOSUCHTABLE,
-          2601 => DB_ERROR_ALREADY_EXISTS
-       );
-          
-       return $MAP;
-}
-
-function adodb_error_sqlite()
-{
-static $MAP = array(
-                 1 => DB_ERROR_SYNTAX
-       );
-          
-       return $MAP;
-}
-
-function adodb_error_mysql()
-{
-static $MAP = array(
-           1004 => DB_ERROR_CANNOT_CREATE,
-           1005 => DB_ERROR_CANNOT_CREATE,
-           1006 => DB_ERROR_CANNOT_CREATE,
-           1007 => DB_ERROR_ALREADY_EXISTS,
-           1008 => DB_ERROR_CANNOT_DROP,
-                  1045 => DB_ERROR_ACCESS_VIOLATION,
-           1046 => DB_ERROR_NODBSELECTED,
-                  1049 => DB_ERROR_NOSUCHDB,
-           1050 => DB_ERROR_ALREADY_EXISTS,
-           1051 => DB_ERROR_NOSUCHTABLE,
-           1054 => DB_ERROR_NOSUCHFIELD,
-           1062 => DB_ERROR_ALREADY_EXISTS,
-           1064 => DB_ERROR_SYNTAX,
-           1100 => DB_ERROR_NOT_LOCKED,
-           1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
-           1146 => DB_ERROR_NOSUCHTABLE,
-           1048 => DB_ERROR_CONSTRAINT,
-                   2002 => DB_ERROR_CONNECT_FAILED
-       );
-          
-       return $MAP;
-}
+<?php
+/** 
+ * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). All 
rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+ * Whenever there is any discrepancy between the two licenses, 
+ * the BSD license will take precedence. 
+ *
+ * Set tabs to 4 for best viewing.
+ * 
+ * The following code is adapted from the PEAR DB error handling code.
+ * Portions (c)1997-2002 The PHP Group.
+ */
+
+
+if (!defined("DB_ERROR")) define("DB_ERROR",-1);
+
+if (!defined("DB_ERROR_SYNTAX")) {
+       define("DB_ERROR_SYNTAX",              -2);
+       define("DB_ERROR_CONSTRAINT",          -3);
+       define("DB_ERROR_NOT_FOUND",           -4);
+       define("DB_ERROR_ALREADY_EXISTS",      -5);
+       define("DB_ERROR_UNSUPPORTED",         -6);
+       define("DB_ERROR_MISMATCH",            -7);
+       define("DB_ERROR_INVALID",             -8);
+       define("DB_ERROR_NOT_CAPABLE",         -9);
+       define("DB_ERROR_TRUNCATED",          -10);
+       define("DB_ERROR_INVALID_NUMBER",     -11);
+       define("DB_ERROR_INVALID_DATE",       -12);
+       define("DB_ERROR_DIVZERO",            -13);
+       define("DB_ERROR_NODBSELECTED",       -14);
+       define("DB_ERROR_CANNOT_CREATE",      -15);
+       define("DB_ERROR_CANNOT_DELETE",      -16);
+       define("DB_ERROR_CANNOT_DROP",        -17);
+       define("DB_ERROR_NOSUCHTABLE",        -18);
+       define("DB_ERROR_NOSUCHFIELD",        -19);
+       define("DB_ERROR_NEED_MORE_DATA",     -20);
+       define("DB_ERROR_NOT_LOCKED",         -21);
+       define("DB_ERROR_VALUE_COUNT_ON_ROW", -22);
+       define("DB_ERROR_INVALID_DSN",        -23);
+       define("DB_ERROR_CONNECT_FAILED",     -24);
+       define("DB_ERROR_EXTENSION_NOT_FOUND",-25);
+       define("DB_ERROR_NOSUCHDB",           -25);
+       define("DB_ERROR_ACCESS_VIOLATION",   -26);
+}
+
+function adodb_errormsg($value)
+{
+global $ADODB_LANG,$ADODB_LANG_ARRAY;
+
+       if (empty($ADODB_LANG)) $ADODB_LANG = 'en';
+       if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == 
$ADODB_LANG) ;
+       else {
+               include_once(ADODB_DIR."/lang/adodb-$ADODB_LANG.inc.php");
+    }
+       return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : 
$ADODB_LANG_ARRAY[DB_ERROR];
+}
+
+function adodb_error($provider,$dbType,$errno)
+{
+       //var_dump($errno);
+       if (is_numeric($errno) && $errno == 0) return 0;
+       switch($provider) { 
+       case 'mysql': $map = adodb_error_mysql(); break;
+       
+       case 'oracle':
+       case 'oci8': $map = adodb_error_oci8(); break;
+       
+       case 'ibase': $map = adodb_error_ibase(); break;
+       
+       case 'odbc': $map = adodb_error_odbc(); break;
+       
+       case 'mssql':
+       case 'sybase': $map = adodb_error_mssql(); break;
+       
+       case 'informix': $map = adodb_error_ifx(); break;
+       
+       case 'postgres': return adodb_error_pg($errno); break;
+       
+       case 'sqlite': return $map = adodb_error_sqlite(); break;
+       default:
+               return DB_ERROR;
+       }       
+       //print_r($map);
+       //var_dump($errno);
+       if (isset($map[$errno])) return $map[$errno];
+       return DB_ERROR;
+}
+
+//**************************************************************************************
+
+function adodb_error_pg($errormsg)
+{
+       if (is_numeric($errormsg)) return (integer) $errormsg;
+    static $error_regexps = array(
+            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not 
exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
+            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate 
key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
+            '/divide by zero$/'                     => DB_ERROR_DIVZERO,
+            '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER,
+            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does 
not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD,
+            '/parser: parse error at or near \"/'   => DB_ERROR_SYNTAX,
+            '/referential integrity violation/'     => DB_ERROR_CONSTRAINT,
+                       '/Relation [\"\'].*[\"\'] already exists|Cannot insert 
a duplicate key into (a )?unique index.*|duplicate key violates unique 
constraint/'     
+                                => DB_ERROR_ALREADY_EXISTS
+        );
+       reset($error_regexps);
+    while (list($regexp,$code) = each($error_regexps)) {
+        if (preg_match($regexp, $errormsg)) {
+            return $code;
+        }
+    }
+    // Fall back to DB_ERROR if there was no mapping.
+    return DB_ERROR;
+}
+       
+function adodb_error_odbc()
+{
+static $MAP = array(
+            '01004' => DB_ERROR_TRUNCATED,
+            '07001' => DB_ERROR_MISMATCH,
+            '21S01' => DB_ERROR_MISMATCH,
+            '21S02' => DB_ERROR_MISMATCH,
+            '22003' => DB_ERROR_INVALID_NUMBER,
+            '22008' => DB_ERROR_INVALID_DATE,
+            '22012' => DB_ERROR_DIVZERO,
+            '23000' => DB_ERROR_CONSTRAINT,
+            '24000' => DB_ERROR_INVALID,
+            '34000' => DB_ERROR_INVALID,
+            '37000' => DB_ERROR_SYNTAX,
+            '42000' => DB_ERROR_SYNTAX,
+            'IM001' => DB_ERROR_UNSUPPORTED,
+            'S0000' => DB_ERROR_NOSUCHTABLE,
+            'S0001' => DB_ERROR_NOT_FOUND,
+            'S0002' => DB_ERROR_NOSUCHTABLE,
+            'S0011' => DB_ERROR_ALREADY_EXISTS,
+            'S0012' => DB_ERROR_NOT_FOUND,
+            'S0021' => DB_ERROR_ALREADY_EXISTS,
+            'S0022' => DB_ERROR_NOT_FOUND,
+                       'S1000' => DB_ERROR_NOSUCHTABLE,
+            'S1009' => DB_ERROR_INVALID,
+            'S1090' => DB_ERROR_INVALID,
+            'S1C00' => DB_ERROR_NOT_CAPABLE
+        );
+               return $MAP;
+}
+
+function adodb_error_ibase()
+{
+static $MAP = array(
+            -104 => DB_ERROR_SYNTAX,
+            -150 => DB_ERROR_ACCESS_VIOLATION,
+            -151 => DB_ERROR_ACCESS_VIOLATION,
+            -155 => DB_ERROR_NOSUCHTABLE,
+            -157 => DB_ERROR_NOSUCHFIELD,
+            -158 => DB_ERROR_VALUE_COUNT_ON_ROW,
+            -170 => DB_ERROR_MISMATCH,
+            -171 => DB_ERROR_MISMATCH,
+            -172 => DB_ERROR_INVALID,
+            -204 => DB_ERROR_INVALID,
+            -205 => DB_ERROR_NOSUCHFIELD,
+            -206 => DB_ERROR_NOSUCHFIELD,
+            -208 => DB_ERROR_INVALID,
+            -219 => DB_ERROR_NOSUCHTABLE,
+            -297 => DB_ERROR_CONSTRAINT,
+            -530 => DB_ERROR_CONSTRAINT,
+            -803 => DB_ERROR_CONSTRAINT,
+            -551 => DB_ERROR_ACCESS_VIOLATION,
+            -552 => DB_ERROR_ACCESS_VIOLATION,
+            -922 => DB_ERROR_NOSUCHDB,
+            -923 => DB_ERROR_CONNECT_FAILED,
+            -924 => DB_ERROR_CONNECT_FAILED
+        );
+               
+               return $MAP;
+}
+
+function adodb_error_ifx()
+{
+static $MAP = array(
+            '-201'    => DB_ERROR_SYNTAX,
+            '-206'    => DB_ERROR_NOSUCHTABLE,
+            '-217'    => DB_ERROR_NOSUCHFIELD,
+            '-329'    => DB_ERROR_NODBSELECTED,
+            '-1204'   => DB_ERROR_INVALID_DATE,
+            '-1205'   => DB_ERROR_INVALID_DATE,
+            '-1206'   => DB_ERROR_INVALID_DATE,
+            '-1209'   => DB_ERROR_INVALID_DATE,
+            '-1210'   => DB_ERROR_INVALID_DATE,
+            '-1212'   => DB_ERROR_INVALID_DATE
+       );
+          
+          return $MAP;
+}
+
+function adodb_error_oci8()
+{
+static $MAP = array(
+                        1 => DB_ERROR_ALREADY_EXISTS,
+            900 => DB_ERROR_SYNTAX,
+            904 => DB_ERROR_NOSUCHFIELD,
+            923 => DB_ERROR_SYNTAX,
+            942 => DB_ERROR_NOSUCHTABLE,
+            955 => DB_ERROR_ALREADY_EXISTS,
+            1476 => DB_ERROR_DIVZERO,
+            1722 => DB_ERROR_INVALID_NUMBER,
+            2289 => DB_ERROR_NOSUCHTABLE,
+            2291 => DB_ERROR_CONSTRAINT,
+            2449 => DB_ERROR_CONSTRAINT
+        );
+          
+       return $MAP;
+}
+
+function adodb_error_mssql()
+{
+static $MAP = array(
+                 208 => DB_ERROR_NOSUCHTABLE,
+          2601 => DB_ERROR_ALREADY_EXISTS
+       );
+          
+       return $MAP;
+}
+
+function adodb_error_sqlite()
+{
+static $MAP = array(
+                 1 => DB_ERROR_SYNTAX
+       );
+          
+       return $MAP;
+}
+
+function adodb_error_mysql()
+{
+static $MAP = array(
+           1004 => DB_ERROR_CANNOT_CREATE,
+           1005 => DB_ERROR_CANNOT_CREATE,
+           1006 => DB_ERROR_CANNOT_CREATE,
+           1007 => DB_ERROR_ALREADY_EXISTS,
+           1008 => DB_ERROR_CANNOT_DROP,
+                  1045 => DB_ERROR_ACCESS_VIOLATION,
+           1046 => DB_ERROR_NODBSELECTED,
+                  1049 => DB_ERROR_NOSUCHDB,
+           1050 => DB_ERROR_ALREADY_EXISTS,
+           1051 => DB_ERROR_NOSUCHTABLE,
+           1054 => DB_ERROR_NOSUCHFIELD,
+           1062 => DB_ERROR_ALREADY_EXISTS,
+           1064 => DB_ERROR_SYNTAX,
+           1100 => DB_ERROR_NOT_LOCKED,
+           1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
+           1146 => DB_ERROR_NOSUCHTABLE,
+           1048 => DB_ERROR_CONSTRAINT,
+                   2002 => DB_ERROR_CONNECT_FAILED,
+                       2005 => DB_ERROR_CONNECT_FAILED
+       );
+          
+       return $MAP;
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-errorhandler.inc.php
diff -u phpgwapi/inc/adodb/adodb-errorhandler.inc.php:1.2 
phpgwapi/inc/adodb/adodb-errorhandler.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-errorhandler.inc.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-errorhandler.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,79 +1,79 @@
-<?php
-/**
- * @version V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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
- *
-*/
-
-
-// added Claudio Bustos  clbustos#entelchile.net
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) 
define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
-
-if (!defined('ADODB_ERROR_HANDLER')) 
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
-* @param $thisConn     $current connection object - can be false if no 
connection object created
-*/
-function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1, $p2, 
&$thisConnection)
-{
-       if (error_reporting() == 0) return; // obey @ protocol
-       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,ADODB_ERROR_HANDLER_TYPE); 
-}
-?>
+<?php
+/**
+ * @version V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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
+ *
+*/
+
+
+// added Claudio Bustos  clbustos#entelchile.net
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) 
define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
+
+if (!defined('ADODB_ERROR_HANDLER')) 
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
+* @param $thisConn     $current connection object - can be false if no 
connection object created
+*/
+function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1, $p2, 
&$thisConnection)
+{
+       if (error_reporting() == 0) return; // obey @ protocol
+       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,ADODB_ERROR_HANDLER_TYPE); 
+}
+?>
Index: phpgwapi/inc/adodb/adodb-errorpear.inc.php
diff -u phpgwapi/inc/adodb/adodb-errorpear.inc.php:1.2 
phpgwapi/inc/adodb/adodb-errorpear.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-errorpear.inc.php:1.2      Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-errorpear.inc.php  Tue Feb 21 13:47:42 2006
@@ -1,88 +1,88 @@
-<?php
-/** 
- * @version V4.50 6 July 2004 (c) 2000-2004 John Lim (address@hidden). 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');
-
-if (!defined('ADODB_ERROR_HANDLER')) 
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;
-       
-       if (error_reporting() == 0) return; // obey @ protocol
-       switch($fn) {
-       case 'EXECUTE':
-               $sql = $p1;
-               $inputparams = $p2;
-               
-               $s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
-               break;
-               
-       case 'PCONNECT':
-       case 'CONNECT':
-               $host = $p1;
-               $database = $p2;
-               
-               $s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, 
'$database')";
-               break;
-               
-       default:
-               $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
-               break;
-       }
-       
-       $class = ADODB_PEAR_ERROR_CLASS;
-       $ADODB_Last_PEAR_Error = new $class($s, $errno,
-               $GLOBALS['_PEAR_default_error_mode'],
-               $GLOBALS['_PEAR_default_error_options'], 
-               $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;
-}
-               
+<?php
+/** 
+ * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). 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');
+
+if (!defined('ADODB_ERROR_HANDLER')) 
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;
+       
+       if (error_reporting() == 0) return; // obey @ protocol
+       switch($fn) {
+       case 'EXECUTE':
+               $sql = $p1;
+               $inputparams = $p2;
+               
+               $s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
+               break;
+               
+       case 'PCONNECT':
+       case 'CONNECT':
+               $host = $p1;
+               $database = $p2;
+               
+               $s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, 
'$database')";
+               break;
+               
+       default:
+               $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
+               break;
+       }
+       
+       $class = ADODB_PEAR_ERROR_CLASS;
+       $ADODB_Last_PEAR_Error = new $class($s, $errno,
+               $GLOBALS['_PEAR_default_error_mode'],
+               $GLOBALS['_PEAR_default_error_options'], 
+               $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
Index: phpgwapi/inc/adodb/adodb-exceptions.inc.php
diff -u phpgwapi/inc/adodb/adodb-exceptions.inc.php:1.2 
phpgwapi/inc/adodb/adodb-exceptions.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-exceptions.inc.php:1.2     Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-exceptions.inc.php Tue Feb 21 13:47:42 2006
@@ -1,80 +1,80 @@
-<?php
-
-/**
- * @version V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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
- *
- * Exception-handling code using PHP5 exceptions (try-catch-throw).
- */
-
-
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) 
define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
-define('ADODB_ERROR_HANDLER','adodb_throw');
-
-class ADODB_Exception extends Exception {
-var $dbms;
-var $fn;
-var $sql = '';
-var $params = '';
-var $host = '';
-var $database = '';
-       
-       function __construct($dbms, $fn, $errno, $errmsg, $p1, $p2, 
$thisConnection)
-       {
-               switch($fn) {
-               case 'EXECUTE':
-                       $this->sql = $p1;
-                       $this->params = $p2;
-                       $s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n";
-                       break;
-       
-               case 'PCONNECT':
-               case 'CONNECT':
-                       $user = $thisConnection->user;
-                       $s = "$dbms error: [$errno: $errmsg] in $fn($p1, 
'$user', '****', $p2)\n";
-                       break;
-               default:
-                       $s = "$dbms error: [$errno: $errmsg] in $fn($p1, 
$p2)\n";
-                       break;
-               }
-       
-               $this->dbms = $dbms;
-               $this->host = $thisConnection->host;
-               $this->database = $thisConnection->database;
-               $this->fn = $fn;
-               $this->msg = $errmsg;
-                               
-               if (!is_numeric($errno)) $errno = -1;
-               parent::__construct($s,$errno);
-       }
-}
-
-/**
-* 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_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
-{
-global $ADODB_EXCEPTION;
-       
-       if (error_reporting() == 0) return; // obey @ protocol
-       if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION;
-       else $errfn = 'ADODB_EXCEPTION';
-       throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, 
$thisConnection);
-}
-
-
+<?php
+
+/**
+ * @version V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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
+ *
+ * Exception-handling code using PHP5 exceptions (try-catch-throw).
+ */
+
+
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) 
define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
+define('ADODB_ERROR_HANDLER','adodb_throw');
+
+class ADODB_Exception extends Exception {
+var $dbms;
+var $fn;
+var $sql = '';
+var $params = '';
+var $host = '';
+var $database = '';
+       
+       function __construct($dbms, $fn, $errno, $errmsg, $p1, $p2, 
$thisConnection)
+       {
+               switch($fn) {
+               case 'EXECUTE':
+                       $this->sql = $p1;
+                       $this->params = $p2;
+                       $s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n";
+                       break;
+       
+               case 'PCONNECT':
+               case 'CONNECT':
+                       $user = $thisConnection->user;
+                       $s = "$dbms error: [$errno: $errmsg] in $fn($p1, 
'$user', '****', $p2)\n";
+                       break;
+               default:
+                       $s = "$dbms error: [$errno: $errmsg] in $fn($p1, 
$p2)\n";
+                       break;
+               }
+       
+               $this->dbms = $dbms;
+               $this->host = $thisConnection->host;
+               $this->database = $thisConnection->database;
+               $this->fn = $fn;
+               $this->msg = $errmsg;
+                               
+               if (!is_numeric($errno)) $errno = -1;
+               parent::__construct($s,$errno);
+       }
+}
+
+/**
+* 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_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
+{
+global $ADODB_EXCEPTION;
+       
+       if (error_reporting() == 0) return; // obey @ protocol
+       if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION;
+       else $errfn = 'ADODB_EXCEPTION';
+       throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, 
$thisConnection);
+}
+
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-iterator.inc.php
diff -u phpgwapi/inc/adodb/adodb-iterator.inc.php:1.2 
phpgwapi/inc/adodb/adodb-iterator.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-iterator.inc.php:1.2       Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-iterator.inc.php   Tue Feb 21 13:47:42 2006
@@ -1,84 +1,84 @@
-<?php
-
-/*
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Set tabs to 4.
-  
-  Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports 
iteration with 
-  the ADODB_Iterator class.
-  
-               $rs = $db->Execute("select * from adoxyz");
-               foreach($rs as $k => $v) {
-                       echo $k; print_r($v); echo "<br>";
-               }
-               
-               
-       Iterator code based on 
http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
- */
- 
-
- class ADODB_Iterator implements Iterator {
-
-    private $rs;
-
-    function __construct($rs) 
-       {
-        $this->rs = $rs;
-    }
-    function rewind() 
-       {
-        $this->rs->MoveFirst();
-    }
-
-       function valid() 
-       {
-        return !$this->rs->EOF;
-    }
-       
-    function key() 
-       {
-        return $this->rs->_currentRow;
-    }
-       
-    function current() 
-       {
-        return $this->rs->fields;
-    }
-       
-    function next() 
-       {
-        $this->rs->MoveNext();
-    }
-       
-       function __call($func, $params)
-       {
-               return call_user_func_array(array($this->rs, $func), $params);
-       }
-
-       
-       function hasMore()
-       {
-               return !$this->rs->EOF;
-       }
-
-}
-
-
-class ADODB_BASE_RS implements IteratorAggregate {
-    function getIterator() {
-        return new ADODB_Iterator($this);
-    }
-       
-       /* this is experimental - i don't really know what to return... */
-       function __toString()
-       {
-               include_once(ADODB_DIR.'/toexport.inc.php');
-               return _adodb_export($this,',',',',false,true);
-       }
-} 
-
+<?php
+
+/*
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  
+  Set tabs to 4.
+  
+  Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports 
iteration with 
+  the ADODB_Iterator class.
+  
+               $rs = $db->Execute("select * from adoxyz");
+               foreach($rs as $k => $v) {
+                       echo $k; print_r($v); echo "<br>";
+               }
+               
+               
+       Iterator code based on 
http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
+ */
+ 
+
+ class ADODB_Iterator implements Iterator {
+
+    private $rs;
+
+    function __construct($rs) 
+       {
+        $this->rs = $rs;
+    }
+    function rewind() 
+       {
+        $this->rs->MoveFirst();
+    }
+
+       function valid() 
+       {
+        return !$this->rs->EOF;
+    }
+       
+    function key() 
+       {
+        return $this->rs->_currentRow;
+    }
+       
+    function current() 
+       {
+        return $this->rs->fields;
+    }
+       
+    function next() 
+       {
+        $this->rs->MoveNext();
+    }
+       
+       function __call($func, $params)
+       {
+               return call_user_func_array(array($this->rs, $func), $params);
+       }
+
+       
+       function hasMore()
+       {
+               return !$this->rs->EOF;
+       }
+
+}
+
+
+class ADODB_BASE_RS implements IteratorAggregate {
+    function getIterator() {
+        return new ADODB_Iterator($this);
+    }
+       
+       /* this is experimental - i don't really know what to return... */
+       function __toString()
+       {
+               include_once(ADODB_DIR.'/toexport.inc.php');
+               return _adodb_export($this,',',',',false,true);
+       }
+} 
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-lib.inc.php
diff -u phpgwapi/inc/adodb/adodb-lib.inc.php:1.2 
phpgwapi/inc/adodb/adodb-lib.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-lib.inc.php:1.2    Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-lib.inc.php        Tue Feb 21 13:47:42 2006
@@ -1,892 +1,1021 @@
-<?php
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-global $ADODB_INCLUDED_LIB;
-$ADODB_INCLUDED_LIB = 1;
-
-/* 
- @version V4.54 5 Nov 2004 (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Less commonly used functions are placed here to reduce size of 
adodb.inc.php. 
-*/ 
-
-
-// Force key to upper. 
-// See also http://www.php.net/manual/en/function.array-change-key-case.php
-function _array_change_key_case($an_array)
-{
-       if (is_array($an_array)) {
-               $new_array = array();
-               foreach($an_array as $key=>$value)
-                       $new_array[strtoupper($key)] = $value;
-
-               return $new_array;
-   }
-
-       return $an_array;
-}
-
-function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, 
$has_autoinc)
-{
-               if (count($fieldArray) == 0) return 0;
-               $first = true;
-               $uSet = '';
-               
-               if (!is_array($keyCol)) {
-                       $keyCol = array($keyCol);
-               }
-               foreach($fieldArray as $k => $v) {
-                       if ($autoQuote && !is_numeric($v) and strncmp($v,"'",1) 
!== 0 and strcasecmp($v,'null')!=0) {
-                               $v = $zthis->qstr($v);
-                               $fieldArray[$k] = $v;
-                       }
-                       if (in_array($k,$keyCol)) continue; // skip UPDATE if 
is key
-                       
-                       if ($first) {
-                               $first = false;                 
-                               $uSet = "$k=$v";
-                       } else
-                               $uSet .= ",$k=$v";
-               }
-                
-               $where = false;
-               foreach ($keyCol as $v) {
-                       if ($where) $where .= " and $v=$fieldArray[$v]";
-                       else $where = "$v=$fieldArray[$v]";
-               }
-               
-               if ($uSet && $where) {
-                       $update = "UPDATE $table SET $uSet WHERE $where";
-
-                       $rs = $zthis->Execute($update);
-                       
-                       
-                       if ($rs) {
-                               if ($zthis->poorAffectedRows) {
-                               /*
-                                The Select count(*) wipes out any errors that 
the update would have returned. 
-                               
http://phplens.com/lens/lensforum/msgs.php?id=5696
-                               */
-                                       if ($zthis->ErrorNo()<>0) return 0;
-                                       
-                               # affected_rows == 0 if update field values 
identical to old values
-                               # for mysql - which is silly. 
-                       
-                                       $cnt = $zthis->GetOne("select count(*) 
from $table where $where");
-                                       if ($cnt > 0) return 1; // record 
already exists
-                               } else {
-                               
-                                       if (($zthis->Affected_Rows()>0)) return 
1;
-                               }
-                       } else
-                               return 0;
-               }
-               
-       //      print "<p>Error=".$this->ErrorNo().'<p>';
-               $first = true;
-               foreach($fieldArray as $k => $v) {
-                       if ($has_autoinc && in_array($k,$keyCol)) continue; // 
skip autoinc col
-                       
-                       if ($first) {
-                               $first = false;                 
-                               $iCols = "$k";
-                               $iVals = "$v";
-                       } else {
-                               $iCols .= ",$k";
-                               $iVals .= ",$v";
-                       }                               
-               }
-               $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; 
-               $rs = $zthis->Execute($insert);
-               return ($rs) ? 2 : 0;
-}
-
-// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM
-function _adodb_getmenu(&$zthis, 
$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) 
-               if (is_string($blank1stItem))  {
-                       $barr = explode(':',$blank1stItem);
-                       if (sizeof($barr) == 1) $barr[] = '';
-                       $s .= "\n<option 
value=\"".$barr[0]."\">".$barr[1]."</option>";
-               } else $s .= "\n<option></option>";
-
-       if ($zthis->FieldCount() > 1) $hasvalue=true;
-       else $compareFields0 = true;
-       
-       $value = '';
-       while(!$zthis->EOF) {
-               $zval = rtrim(reset($zthis->fields));
-               if (sizeof($zthis->fields) > 1) {
-                       if (isset($zthis->fields[1]))
-                               $zval2 = rtrim($zthis->fields[1]);
-                       else
-                               $zval2 = rtrim(next($zthis->fields));
-               }
-               $selected = ($compareFields0) ? $zval : $zval2;
-               
-               if ($blank1stItem && $zval=="") {
-                       $zthis->MoveNext();
-                       continue;
-               }
-               if ($hasvalue) 
-                       $value = " value='".htmlspecialchars($zval2)."'";
-               
-               if (is_array($defstr))  {
-                       
-                       if (in_array($selected,$defstr)) 
-                               $s .= "<option 
selected='selected'$value>".htmlspecialchars($zval).'</option>';
-                       else 
-                               $s .= 
"\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
-               }
-               else {
-                       if (strcasecmp($selected,$defstr)==0) 
-                               $s .= "<option 
selected='selected'$value>".htmlspecialchars($zval).'</option>';
-                       else
-                               $s .= 
"\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
-               }
-               $zthis->MoveNext();
-       } // while
-       
-       return $s ."\n</select>\n";
-}
-
-/*
-       Count the number of records this sql statement will return by using
-       query rewriting techniques...
-       
-       Does not work with UNIONs.
-*/
-function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) 
-{
-       $qryRecs = 0;
-       
-        if (preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || 
preg_match('/\s+GROUP\s+BY\s+/is',$sql)) {
-               // ok, has SELECT DISTINCT or GROUP BY so see if we can use a 
table alias
-               // but this is only supported by oracle and postgresql...
-               if ($zthis->dataProvider == 'oci8') {
-                       
-                       $rewritesql = 
preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
-                       $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)"; 
-                       
-               } else if ( $zthis->databaseType == 'postgres' || 
$zthis->databaseType == 'postgres7')  {
-                       
-                       $info = $zthis->ServerInfo();
-                       if (substr($info['version'],0,3) >= 7.1) { // good till 
version 999
-                               $rewritesql = 
preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
-                               $rewritesql = "SELECT COUNT(*) FROM 
($rewritesql) _ADODB_ALIAS_";
-                       }
-               }
-       } else { 
-               // now replace SELECT ... FROM with SELECT COUNT(*) FROM
-               
-               $rewritesql = preg_replace(
-                                       '/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT 
COUNT(*) FROM ',$sql);
-               
-               // fix by alexander zhukov, alex#unipack.ru, because count(*) 
and 'order by' fails 
-               // with mssql, access and postgresql. Also a good speedup 
optimization - skips sorting!
-               $rewritesql = 
preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql); 
-       }
-       
-       if (isset($rewritesql) && $rewritesql != $sql) {
-               if ($secs2cache) {
-                       // we only use half the time of secs2cache because the 
count can quickly
-                       // become inaccurate if new records are added
-                       $qryRecs = 
$zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr);
-                       
-               } else {
-                       $qryRecs = $zthis->GetOne($rewritesql,$inputarr);
-               }
-               if ($qryRecs !== false) return $qryRecs;
-       }
-       //--------------------------------------------
-       // query rewrite failed - so try slower way...
-       
-       // strip off unneeded ORDER BY if no UNION
-       if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
-       else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); 
-       
-       $rstest = &$zthis->Execute($rewritesql,$inputarr);
-       if ($rstest) {
-                       $qryRecs = $rstest->RecordCount();
-               if ($qryRecs == -1) { 
-               global $ADODB_EXTENSION;
-               // some databases will return -1 on MoveLast() - change to 
MoveNext()
-                       if ($ADODB_EXTENSION) {
-                               while(!$rstest->EOF) {
-                                       adodb_movenext($rstest);
-                               }
-                       } else {
-                               while(!$rstest->EOF) {
-                                       $rstest->MoveNext();
-                               }
-                       }
-                       $qryRecs = $rstest->_currentRow;
-               }
-               $rstest->Close();
-               if ($qryRecs == -1) return 0;
-       }
-       
-       return $qryRecs;
-}
-
-/*
-       Code originally from "Cornel G" <address@hidden>
-
-       This code will not work with SQL that has UNION in it   
-       
-       Also if you are using CachePageExecute(), there is a strong possibility 
that
-       data will get out of synch. use CachePageExecute() only with tables that
-       rarely change.
-*/
-function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, 
-                                               $inputarr=false, $secs2cache=0) 
-{
-       $atfirstpage = false;
-       $atlastpage = false;
-       $lastpageno=1;
-
-       // If an invalid nrows is supplied, 
-       // we assume a default value of 10 rows per page
-       if (!isset($nrows) || $nrows <= 0) $nrows = 10;
-
-       $qryRecs = false; //count records for no offset
-       
-       $qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache);
-       $lastpageno = (int) ceil($qryRecs / $nrows);
-       $zthis->_maxRecordCount = $qryRecs;
-       
-
-
-       // ***** Here we check whether $page is the last page or 
-       // whether we are trying to retrieve 
-       // a page number greater than the last page number.
-       if ($page >= $lastpageno) {
-               $page = $lastpageno;
-               $atlastpage = true;
-       }
-       
-       // If page number <= 1, then we are at the first page
-       if (empty($page) || $page <= 1) {       
-               $page = 1;
-               $atfirstpage = true;
-       }
-       
-       // We get the data we want
-       $offset = $nrows * ($page-1);
-       if ($secs2cache > 0) 
-               $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, 
$nrows, $offset, $inputarr);
-       else 
-               $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, 
$inputarr, $secs2cache);
-
-       
-       // Before returning the RecordSet, we set the pagination properties we 
need
-       if ($rsreturn) {
-               $rsreturn->_maxRecordCount = $qryRecs;
-               $rsreturn->rowsPerPage = $nrows;
-               $rsreturn->AbsolutePage($page);
-               $rsreturn->AtFirstPage($atfirstpage);
-               $rsreturn->AtLastPage($atlastpage);
-               $rsreturn->LastPageNo($lastpageno);
-       }
-       return $rsreturn;
-}
-
-// Iván Oliva version
-function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, 
$inputarr=false, $secs2cache=0) 
-{
-
-       $atfirstpage = false;
-       $atlastpage = false;
-       
-       if (!isset($page) || $page <= 1) {      // If page number <= 1, then we 
are at the first page
-               $page = 1;
-               $atfirstpage = true;
-       }
-       if ($nrows <= 0) $nrows = 10;   // If an invalid nrows is supplied, we 
assume a default value of 10 rows per page
-       
-       // ***** Here we check whether $page is the last page or whether we are 
trying to retrieve a page number greater than 
-       // the last page number.
-       $pagecounter = $page + 1;
-       $pagecounteroffset = ($pagecounter * $nrows) - $nrows;
-       if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, 
$sql, $nrows, $pagecounteroffset, $inputarr);
-       else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, 
$inputarr, $secs2cache);
-       if ($rstest) {
-               while ($rstest && $rstest->EOF && $pagecounter>0) {
-                       $atlastpage = true;
-                       $pagecounter--;
-                       $pagecounteroffset = $nrows * ($pagecounter - 1);
-                       $rstest->Close();
-                       if ($secs2cache>0) $rstest = 
&$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, 
$inputarr);
-                       else $rstest = &$zthis->SelectLimit($sql, $nrows, 
$pagecounteroffset, $inputarr, $secs2cache);
-               }
-               if ($rstest) $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 = $nrows * ($page-1);
-       if ($secs2cache > 0) $rsreturn = &$zthis->CacheSelectLimit($secs2cache, 
$sql, $nrows, $offset, $inputarr);
-       else $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, 
$secs2cache);
-       
-       // Before returning the RecordSet, we set the pagination properties we 
need
-       if ($rsreturn) {
-               $rsreturn->rowsPerPage = $nrows;
-               $rsreturn->AbsolutePage($page);
-               $rsreturn->AtFirstPage($atfirstpage);
-               $rsreturn->AtLastPage($atlastpage);
-       }
-       return $rsreturn;
-}
-
-function _adodb_getupdatesql(&$zthis,&$rs, 
$arrFields,$forceUpdate=false,$magicq=false,$force=2)
-{
-               if (!$rs) {
-                       printf(ADODB_BAD_RS,'GetUpdateSQL');
-                       return false;
-               }
-       
-               $fieldUpdatedCount = 0;
-               $arrFields = _array_change_key_case($arrFields);
-
-               $hasnumeric = isset($rs->fields[0]);
-               $setFields = '';
-               
-               // Loop through all of the fields in the recordset
-               for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
-                       // Get the field from the recordset
-                       $field = $rs->FetchField($i);
-
-                       // If the recordset field is one
-                       // of the fields passed in then process.
-                       $upperfname = strtoupper($field->name);
-                       if (adodb_key_exists($upperfname,$arrFields,$force)) {
-                               
-                               // If the existing field value in the recordset
-                               // is different from the value passed in then
-                               // go ahead and append the field name and new 
value to
-                               // the update query.
-                               
-                               if ($hasnumeric) $val = $rs->fields[$i];
-                               else if (isset($rs->fields[$upperfname])) $val 
= $rs->fields[$upperfname];
-                               else if (isset($rs->fields[$field->name])) $val 
=  $rs->fields[$field->name];
-                               else if 
(isset($rs->fields[strtolower($upperfname)])) $val =  
$rs->fields[strtolower($upperfname)];
-                               else $val = '';
-                               
-                       
-                               if ($forceUpdate || strcmp($val, 
$arrFields[$upperfname])) {
-                                       // Set the counter for the number of 
fields that will be updated.
-                                       $fieldUpdatedCount++;
-
-                                       // Based on the datatype of the field
-                                       // Format the value properly for the 
database
-                                       $type = $rs->MetaType($field->type);
-                                               
-
-                                       if ($type == 'null') {
-                                               $type = 'C';
-                                       }
-                                       
-                                       if (strpos($upperfname,' ') !== false)
-                                               $fnameq = 
$zthis->nameQuote.$upperfname.$zthis->nameQuote;
-                                       else
-                                               $fnameq = $upperfname;
-                                       
-                                       
-                // is_null requires php 4.0.4
-                //********************************************************//
-                if (is_null($arrFields[$upperfname])
-                                       || (empty($arrFields[$upperfname]) && 
strlen($arrFields[$upperfname]) == 0)
-                    || $arrFields[$upperfname] === 'null'
-                    )
-                {
-                    switch ($force) {
-
-                        //case 0:
-                        //    //Ignore empty values. This is allready handled 
in "adodb_key_exists" function.
-                        //break;
-
-                        case 1:
-                            //Set null
-                            $setFields .= $field->name . " = null, ";
-                        break;
-                                                       
-                        case 2:
-                            //Set empty
-                            $arrFields[$upperfname] = "";
-                            $setFields .= _adodb_column_sql($zthis, 'U', 
$type, $upperfname, $fnameq,$arrFields, $magicq);
-                        break;
-                                               default:
-                        case 3:
-                            //Set the value that was given in array, so you 
can give both null and empty values
-                            if (is_null($arrFields[$upperfname]) || 
$arrFields[$upperfname] === 'null') {
-                                $setFields .= $field->name . " = null, ";
-                            } else {
-                                $setFields .= _adodb_column_sql($zthis, 'U', 
$type, $upperfname, $fnameq,$arrFields, $magicq);
-                            }
-                        break;
-                    }
-                //********************************************************//
-                } else {
-                                               //we do this so each driver can 
customize the sql for
-                                               //DB specific column types. 
-                                               //Oracle needs BLOB types to be 
handled with a returning clause
-                                               //postgres has special needs as 
well
-                                               $setFields .= 
_adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,
-                                                                               
                                  $arrFields, $magicq);
-                                       }
-                               }
-                       }
-               }
-
-               // If there were any modified fields then build the rest of the 
update query.
-               if ($fieldUpdatedCount > 0 || $forceUpdate) {
-                                       // Get the table name from the existing 
query.
-                       preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", 
$rs->sql, $tableName);
-       
-                       // Get the full where clause excluding the word "WHERE" 
from
-                       // the existing query.
-                       preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause);
-                       
-                       $discard = false;
-                       // not a good hack, improvements?
-                       if ($whereClause) {
-                               if (preg_match('/\s(ORDER\s.*)/is', 
$whereClause[1], $discard));
-                               else if (preg_match('/\s(LIMIT\s.*)/is', 
$whereClause[1], $discard));
-                               else preg_match('/\s(FOR UPDATE.*)/is', 
$whereClause[1], $discard);
-                       } else
-                               $whereClause = array(false,false);
-                               
-                       if ($discard)
-                               $whereClause[1] = substr($whereClause[1], 0, 
strlen($whereClause[1]) - strlen($discard[1]));
-                       
-               $sql = 'UPDATE '.$tableName[1].' SET '.substr($setFields, 0, 
-2);
-               if (strlen($whereClause[1]) > 0) 
-                       $sql .= ' WHERE '.$whereClause[1];
-
-               return $sql;
-
-               } else {
-                       return false;
-       }
-}
-
-function adodb_key_exists($key, &$arr,$force=2)
-{
-       if ($force<=0) {
-               // the following is the old behaviour where null or empty 
fields are ignored
-               return (!empty($arr[$key])) || (isset($arr[$key]) && 
strlen($arr[$key])>0);
-       }
-
-       if (isset($arr[$key])) return true;
-       ## null check below
-       if (ADODB_PHPVER >= 0x4010) return array_key_exists($key,$arr);
-       return false;
-}
-
-/**
- * There is a special case of this function for the oci8 driver.
- * The proper way to handle an insert w/ a blob in oracle requires
- * a returning clause with bind variables and a descriptor blob.
- * 
- * 
- */
-function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2)
-{
-static $cacheRS = false;
-static $cacheSig = 0;
-static $cacheCols;
-
-       $tableName = '';
-       $values = '';
-       $fields = '';
-       $recordSet = null;
-       $arrFields = _array_change_key_case($arrFields);
-       $fieldInsertedCount = 0;
-       
-       if (is_string($rs)) {
-               //ok we have a table name
-               //try and get the column info ourself.
-               $tableName = $rs;                       
-       
-               //we need an object for the recordSet
-               //because we have to call MetaType.
-               //php can't do a $rsclass::MetaType()
-               $rsclass = $zthis->rsPrefix.$zthis->databaseType;
-               $recordSet =& new $rsclass(-1,$zthis->fetchMode);
-               $recordSet->connection = &$zthis;
-               
-               if (is_string($cacheRS) && $cacheRS == $rs) {
-                       $columns =& $cacheCols;
-               } else {
-                       $columns = $zthis->MetaColumns( $tableName );
-                       $cacheRS = $tableName;
-                       $cacheCols = $columns;
-               }
-       } else if (is_subclass_of($rs, 'adorecordset')) {
-               if (isset($rs->insertSig) && is_integer($cacheRS) && $cacheRS 
== $rs->insertSig) {
-                       $columns =& $cacheCols;
-               } else {
-                       for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) 
-                               $columns[] = $rs->FetchField($i);
-                       $cacheRS = $cacheSig;
-                       $cacheCols = $columns;
-                       $rs->insertSig = $cacheSig++;
-               }
-               $recordSet =& $rs;
-       
-       } else {
-               printf(ADODB_BAD_RS,'GetInsertSQL');
-               return false;
-       }
-
-       // Loop through all of the fields in the recordset
-       foreach( $columns as $field ) { 
-               $upperfname = strtoupper($field->name);
-               if (adodb_key_exists($upperfname,$arrFields,$force)) {
-                       $bad = false;
-                       if (strpos($upperfname,' ') !== false)
-                               $fnameq = 
$zthis->nameQuote.$upperfname.$zthis->nameQuote;
-                       else
-                               $fnameq = $upperfname;
-                       
-                       $type = $recordSet->MetaType($field->type);
-                       
-            /********************************************************/
-            if (is_null($arrFields[$upperfname])
-                || (empty($arrFields[$upperfname]) && 
strlen($arrFields[$upperfname]) == 0)
-                || $arrFields[$upperfname] === 'null'
-                               )
-               {
-                    switch ($force) {
-
-                        case 0: // we must always set null if missing
-                                                       $bad = true;
-                                                       break;
-                                                       
-                        case 1:
-                            $values  .= "null, ";
-                        break;
-               
-                        case 2:
-                            //Set empty
-                            $arrFields[$upperfname] = "";
-                            $values .= _adodb_column_sql($zthis, 'I', $type, 
$upperfname, $fnameq,$arrFields, $magicq);
-                        break;
-
-                                               default:
-                        case 3:
-                            //Set the value that was given in array, so you 
can give both null and empty values
-                                                       if 
(is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === 'null') { 
-                                                               $values  .= 
"null, ";
-                                                       } else {
-                                       $values .= _adodb_column_sql($zthis, 
'I', $type, $upperfname, $fnameq, $arrFields, $magicq);
-                                       }
-                               break;
-                       } // switch
-
-            /*********************************************************/
-                       } else {
-                               //we do this so each driver can customize the 
sql for
-                               //DB specific column types. 
-                               //Oracle needs BLOB types to be handled with a 
returning clause
-                               //postgres has special needs as well
-                               $values .= _adodb_column_sql($zthis, 'I', 
$type, $upperfname, $fnameq,
-                                                                               
           $arrFields, $magicq);
-                       }
-                       
-                       if ($bad) continue;
-                       // Set the counter for the number of fields that will 
be inserted.
-                       $fieldInsertedCount++;
-                       
-                       
-                       // Get the name of the fields to insert
-                       $fields .= $fnameq . ", ";
-               }
-       }
-
-
-       // If there were any inserted fields then build the rest of the insert 
query.
-       if ($fieldInsertedCount <= 0)  return false;
-       
-       // Get the table name from the existing query.
-       if (!$tableName) {
-               if (preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, 
$tableName))
-                       $tableName = $tableName[1];
-               else 
-                       return false;
-       }               
-
-       // 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.
-       return 'INSERT INTO '.$tableName.' ( '.$fields.' ) VALUES ( '.$values.' 
)';
-}
-
-
-/**
- * This private method is used to help construct
- * the update/sql which is generated by GetInsertSQL and GetUpdateSQL.
- * It handles the string construction of 1 column -> sql string based on
- * the column type.  We want to do 'safe' handling of BLOBs
- * 
- * @param string the type of sql we are trying to create
- *                'I' or 'U'. 
- * @param string column data type from the db::MetaType() method  
- * @param string the column name
- * @param array the column value
- * 
- * @return string
- * 
- */
-function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, 
$arrFields, $magicq) 
-{
-    $sql = '';
-    
-    // Based on the datatype of the field
-    // Format the value properly for the database
-    switch($type) {
-    case 'B':
-        //in order to handle Blobs correctly, we need
-        //to do some magic for Oracle
-
-        //we need to create a new descriptor to handle 
-        //this properly
-        if (!empty($zthis->hasReturningInto)) {
-            if ($action == 'I') {
-                $sql = 'empty_blob(), ';
-            } else {
-                $sql = $fnameq. '=empty_blob(), ';
-            }
-            //add the variable to the returning clause array
-            //so the user can build this later in
-            //case they want to add more to it
-            $zthis->_returningArray[$fname] = ':xx'.$fname.'xx';
-        } else if (empty($arrFields[$fname])){
-            if ($action == 'I') {
-                $sql = 'empty_blob(), ';
-            } else {
-                $sql = $fnameq. '=empty_blob(), ';
-            }            
-        } else {
-            //this is to maintain compatibility
-            //with older adodb versions.
-            $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, 
$arrFields, $magicq,false);
-        }
-        break;
-
-    case "X":
-        //we need to do some more magic here for long variables
-        //to handle these correctly in oracle.
-
-        //create a safe bind var name
-        //to avoid conflicts w/ dupes.
-       if (!empty($zthis->hasReturningInto)) {
-            if ($action == 'I') {
-                $sql = ':xx'.$fname.'xx, ';                
-            } else {
-                $sql = $fnameq.'=:xx'.$fname.'xx, ';
-            }
-            //add the variable to the returning clause array
-            //so the user can build this later in
-            //case they want to add more to it
-            $zthis->_returningArray[$fname] = ':xx'.$fname.'xx';
-        } else {
-            //this is to maintain compatibility
-            //with older adodb versions.
-            $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, 
$arrFields, $magicq,false);
-        }            
-        break;
-        
-    default:
-        $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq,  
$arrFields, $magicq,false);
-        break;
-    }
-    
-    return $sql;
-}    
-       
-function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, 
$arrFields, $magicq, $recurse=true) 
-{
-
-       if ($recurse) {
-               switch($zthis->dataProvider)  {
-               case 'postgres':
-                       if ($type == 'L') $type = 'C';
-                       break;
-               case 'oci8':
-                       return _adodb_column_sql_oci8($zthis, $action, $type, 
$fname, $fnameq, $arrFields, $magicq);
-                       
-               }
-       }
-       
-       $sql = '';
-               
-       switch($type) {
-               case "C":
-               case "X":
-               case 'B':
-                       if ($action == 'I') {
-                               $sql = $zthis->qstr($arrFields[$fname],$magicq) 
. ", ";
-                       } else {
-                               $sql .= $fnameq . "=" . 
$zthis->qstr($arrFields[$fname],$magicq) . ", ";
-                       }
-                 break;
-
-               case "D":
-                       if ($action == 'I') {
-                               $sql = $zthis->DBDate($arrFields[$fname]) . ", 
";
-                       } else {
-                               $sql .= $fnameq . "=" . 
$zthis->DBDate($arrFields[$fname]) . ", ";
-                       }
-                       break;
-
-               case "T":
-                       if ($action == 'I') {
-                               $sql = $zthis->DBTimeStamp($arrFields[$fname]) 
. ", ";
-                       } else {
-                               $sql .= $fnameq . "=" . 
$zthis->DBTimeStamp($arrFields[$fname]) . ", ";
-                       }
-                       break;
-
-               default:
-                       $val = $arrFields[$fname];
-                       if (empty($val)) $val = '0';
-
-
-                       if ($action == 'I') {
-                               $sql .= $val . ", ";
-                       } else {
-                               $sql .= $fnameq . "=" . $val  . ", ";
-                       }
-                       break;
-       }
-
-       return $sql;
-}
-
-
-
-function _adodb_debug_execute(&$zthis, $sql, $inputarr)
-{
-global $HTTP_SERVER_VARS;
-
-       $ss = '';
-       if ($inputarr) {
-               foreach($inputarr as $kk=>$vv) {
-                       if (is_string($vv) && strlen($vv)>64) $vv = 
substr($vv,0,64).'...';
-                       $ss .= "($kk=>'$vv') ";
-               }
-               $ss = "[ $ss ]";
-       }
-       $sqlTxt = str_replace(',',', ',is_array($sql) ? $sql[0] : $sql);
-
-       // check if running from browser or command-line
-       $inBrowser = isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']);
-       
-       if ($inBrowser) {
-               $ss = htmlspecialchars($ss);
-               if ($zthis->debug === -1)
-                       ADOConnection::outp( "<br>\n($zthis->databaseType): 
".htmlspecialchars($sqlTxt)." &nbsp; <code>$ss</code>\n<br>\n",false);
-               else 
-                       ADOConnection::outp( "<hr>\n($zthis->databaseType): 
".htmlspecialchars($sqlTxt)." &nbsp; <code>$ss</code>\n<hr>\n",false);
-       } else {
-               ADOConnection::outp("-----\n($zthis->databaseType): 
".$sqlTxt."\n-----\n",false);
-       }
-       
-       $qID = $zthis->_query($sql,$inputarr);
-       
-       /* 
-               Alexios Fakios notes that ErrorMsg() must be called before 
ErrorNo() for mssql
-               because ErrorNo() calls Execute('SELECT @ERROR'), causing 
recursion
-       */
-       if ($zthis->databaseType == 'mssql') { 
-       // ErrorNo is a slow function call in mssql, and not reliable in PHP 
4.0.6
-               if($emsg = $zthis->ErrorMsg()) {
-                       if ($err = $zthis->ErrorNo()) 
ADOConnection::outp($err.': '.$emsg);
-               }
-       } else if (!$qID) {
-               ADOConnection::outp($zthis->ErrorNo() .': '. 
$zthis->ErrorMsg());
-       }
-       
-       return $qID;
-}
-
-
-function _adodb_backtrace($printOrArr=true,$levels=9999)
-{
-       if (PHPVERSION() < 4.3) return '';
-        
-       $html =  (isset($_SERVER['HTTP_USER_AGENT']));
-       $fmt =  ($html) ? "</font><font color=#808080 size=-1> %% line %4d, 
file: <a href=\"file:/%s\">%s</a></font>" : "%% line %4d, file: %s";
-
-       $MAXSTRLEN = 64;
-
-       $s = ($html) ? '<pre align=left>' : '';
-       
-       if (is_array($printOrArr)) $traceArr = $printOrArr;
-       else $traceArr = debug_backtrace();
-       array_shift($traceArr);
-       array_shift($traceArr);
-       $tabs = sizeof($traceArr)-2;
-       
-       foreach ($traceArr as $arr) {
-               $levels -= 1;
-               if ($levels < 0) break;
-               
-               $args = array();
-               for ($i=0; $i < $tabs; $i++) $s .=  ($html) ? ' &nbsp; ' : "\t";
-               $tabs -= 1;
-               if ($html) $s .= '<font face="Courier New,Courier">';
-               if (isset($arr['class'])) $s .= $arr['class'].'.';
-               if (isset($arr['args']))
-                foreach($arr['args'] as $v) {
-                       if (is_null($v)) $args[] = 'null';
-                       else if (is_array($v)) $args[] = 
'Array['.sizeof($v).']';
-                       else if (is_object($v)) $args[] = 
'Object:'.get_class($v);
-                       else if (is_bool($v)) $args[] = $v ? 'true' : 'false';
-                       else {
-                               $v = (string) @$v;
-                               $str = 
htmlspecialchars(substr($v,0,$MAXSTRLEN));
-                               if (strlen($v) > $MAXSTRLEN) $str .= '...';
-                               $args[] = $str;
-                       }
-               }
-               $s .= $arr['function'].'('.implode(', ',$args).')';
-               
-               
-               $s .= @sprintf($fmt, 
$arr['line'],$arr['file'],basename($arr['file']));
-                       
-               $s .= "\n";
-       }       
-       if ($html) $s .= '</pre>';
-       if ($printOrArr) print $s;
-       
-       return $s;
-}
-
+<?php
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+global $ADODB_INCLUDED_LIB;
+$ADODB_INCLUDED_LIB = 1;
+
+/* 
+ @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). All 
rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Less commonly used functions are placed here to reduce size of 
adodb.inc.php. 
+*/ 
+
+
+// Force key to upper. 
+// See also http://www.php.net/manual/en/function.array-change-key-case.php
+function _array_change_key_case($an_array)
+{
+       if (is_array($an_array)) {
+               $new_array = array();
+               foreach($an_array as $key=>$value)
+                       $new_array[strtoupper($key)] = $value;
+
+               return $new_array;
+   }
+
+       return $an_array;
+}
+
+function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, 
$has_autoinc)
+{
+               if (count($fieldArray) == 0) return 0;
+               $first = true;
+               $uSet = '';
+               
+               if (!is_array($keyCol)) {
+                       $keyCol = array($keyCol);
+               }
+               foreach($fieldArray as $k => $v) {
+                       if ($autoQuote && !is_numeric($v) and strncmp($v,"'",1) 
!== 0 and strcasecmp($v,'null')!=0) {
+                               $v = $zthis->qstr($v);
+                               $fieldArray[$k] = $v;
+                       }
+                       if (in_array($k,$keyCol)) continue; // skip UPDATE if 
is key
+                       
+                       if ($first) {
+                               $first = false;                 
+                               $uSet = "$k=$v";
+                       } else
+                               $uSet .= ",$k=$v";
+               }
+                
+               $where = false;
+               foreach ($keyCol as $v) {
+                       if (isset($fieldArray[$v])) {
+                               if ($where) $where .= ' and 
'.$v.'='.$fieldArray[$v];
+                               else $where = $v.'='.$fieldArray[$v];
+                       }
+               }
+               
+               if ($uSet && $where) {
+                       $update = "UPDATE $table SET $uSet WHERE $where";
+
+                       $rs = $zthis->Execute($update);
+                       
+                       
+                       if ($rs) {
+                               if ($zthis->poorAffectedRows) {
+                               /*
+                                The Select count(*) wipes out any errors that 
the update would have returned. 
+                               
http://phplens.com/lens/lensforum/msgs.php?id=5696
+                               */
+                                       if ($zthis->ErrorNo()<>0) return 0;
+                                       
+                               # affected_rows == 0 if update field values 
identical to old values
+                               # for mysql - which is silly. 
+                       
+                                       $cnt = $zthis->GetOne("select count(*) 
from $table where $where");
+                                       if ($cnt > 0) return 1; // record 
already exists
+                               } else {
+                                       if (($zthis->Affected_Rows()>0)) return 
1;
+                               }
+                       } else
+                               return 0;
+               }
+               
+       //      print "<p>Error=".$this->ErrorNo().'<p>';
+               $first = true;
+               foreach($fieldArray as $k => $v) {
+                       if ($has_autoinc && in_array($k,$keyCol)) continue; // 
skip autoinc col
+                       
+                       if ($first) {
+                               $first = false;                 
+                               $iCols = "$k";
+                               $iVals = "$v";
+                       } else {
+                               $iCols .= ",$k";
+                               $iVals .= ",$v";
+                       }                               
+               }
+               $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; 
+               $rs = $zthis->Execute($insert);
+               return ($rs) ? 2 : 0;
+}
+
+// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM
+function _adodb_getmenu(&$zthis, 
$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) 
+               if (is_string($blank1stItem))  {
+                       $barr = explode(':',$blank1stItem);
+                       if (sizeof($barr) == 1) $barr[] = '';
+                       $s .= "\n<option 
value=\"".$barr[0]."\">".$barr[1]."</option>";
+               } else $s .= "\n<option></option>";
+
+       if ($zthis->FieldCount() > 1) $hasvalue=true;
+       else $compareFields0 = true;
+       
+       $value = '';
+    $optgroup = null;
+    $firstgroup = true;
+    $fieldsize = $zthis->FieldCount();
+       while(!$zthis->EOF) {
+               $zval = rtrim(reset($zthis->fields));
+
+               if ($blank1stItem && $zval=="") {
+                       $zthis->MoveNext();
+                       continue;
+               }
+
+        if ($fieldsize > 1) {
+                       if (isset($zthis->fields[1]))
+                               $zval2 = rtrim($zthis->fields[1]);
+                       else
+                               $zval2 = rtrim(next($zthis->fields));
+               }
+               $selected = ($compareFields0) ? $zval : $zval2;
+               
+        $group = '';
+               if ($fieldsize > 2) {
+            $group = rtrim($zthis->fields[2]);
+        }
+ 
+        if ($optgroup != $group) {
+            $optgroup = $group;
+            if ($firstgroup) {
+                $firstgroup = false;
+                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
+            } else {
+                $s .="\n</optgroup>";
+                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
+            }
+               }
+       
+               if ($hasvalue) 
+                       $value = " value='".htmlspecialchars($zval2)."'";
+               
+               if (is_array($defstr))  {
+                       
+                       if (in_array($selected,$defstr)) 
+                               $s .= "\n<option 
selected='selected'$value>".htmlspecialchars($zval).'</option>';
+                       else 
+                               $s .= 
"\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
+               }
+               else {
+                       if (strcasecmp($selected,$defstr)==0) 
+                               $s .= "\n<option 
selected='selected'$value>".htmlspecialchars($zval).'</option>';
+                       else
+                               $s .= 
"\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
+               }
+               $zthis->MoveNext();
+       } // while
+       
+    // closing last optgroup
+    if($optgroup != null) {
+        $s .= "\n</optgroup>";
+       }
+       return $s ."\n</select>\n";
+}
+
+// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM
+function _adodb_getmenu_gp(&$zthis, 
$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) 
+               if (is_string($blank1stItem))  {
+                       $barr = explode(':',$blank1stItem);
+                       if (sizeof($barr) == 1) $barr[] = '';
+                       $s .= "\n<option 
value=\"".$barr[0]."\">".$barr[1]."</option>";
+               } else $s .= "\n<option></option>";
+
+       if ($zthis->FieldCount() > 1) $hasvalue=true;
+       else $compareFields0 = true;
+       
+       $value = '';
+    $optgroup = null;
+    $firstgroup = true;
+    $fieldsize = sizeof($zthis->fields);
+       while(!$zthis->EOF) {
+               $zval = rtrim(reset($zthis->fields));
+
+               if ($blank1stItem && $zval=="") {
+                       $zthis->MoveNext();
+                       continue;
+               }
+
+        if ($fieldsize > 1) {
+                       if (isset($zthis->fields[1]))
+                               $zval2 = rtrim($zthis->fields[1]);
+                       else
+                               $zval2 = rtrim(next($zthis->fields));
+               }
+               $selected = ($compareFields0) ? $zval : $zval2;
+               
+        $group = '';
+               if (isset($zthis->fields[2])) {
+            $group = rtrim($zthis->fields[2]);
+        }
+ 
+        if ($optgroup != $group) {
+            $optgroup = $group;
+            if ($firstgroup) {
+                $firstgroup = false;
+                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
+            } else {
+                $s .="\n</optgroup>";
+                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
+            }
+               }
+       
+               if ($hasvalue) 
+                       $value = " value='".htmlspecialchars($zval2)."'";
+               
+               if (is_array($defstr))  {
+                       
+                       if (in_array($selected,$defstr)) 
+                               $s .= "\n<option 
selected='selected'$value>".htmlspecialchars($zval).'</option>';
+                       else 
+                               $s .= 
"\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
+               }
+               else {
+                       if (strcasecmp($selected,$defstr)==0) 
+                               $s .= "\n<option 
selected='selected'$value>".htmlspecialchars($zval).'</option>';
+                       else
+                               $s .= 
"\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
+               }
+               $zthis->MoveNext();
+       } // while
+       
+    // closing last optgroup
+    if($optgroup != null) {
+        $s .= "\n</optgroup>";
+       }
+       return $s ."\n</select>\n";
+}
+
+
+/*
+       Count the number of records this sql statement will return by using
+       query rewriting heuristics...
+       
+       Does not work with UNIONs, except with postgresql and oracle.
+       
+       Usage:
+       
+       $conn->Connect(...);
+       $cnt = _adodb_getcount($conn, $sql);
+       
+*/
+function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) 
+{
+       $qryRecs = 0;
+       
+        if (preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || 
+               preg_match('/\s+GROUP\s+BY\s+/is',$sql) || 
+               preg_match('/\s+UNION\s+/is',$sql)) {
+               // ok, has SELECT DISTINCT or GROUP BY so see if we can use a 
table alias
+               // but this is only supported by oracle and postgresql...
+               if ($zthis->dataProvider == 'oci8') {
+                       
+                       $rewritesql = 
preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
+                       
+                       // Allow Oracle hints to be used for query 
optimization, Chris Wrye
+                       if (preg_match('#/\\*+.*?\\*\\/#', $sql, $hint)) {
+                               $rewritesql = "SELECT ".$hint[0]." COUNT(*) 
FROM (".$rewritesql.")"; 
+                       } else
+                               $rewritesql = "SELECT COUNT(*) FROM 
(".$rewritesql.")"; 
+                       
+               } else if (strncmp($zthis->databaseType,'postgres',8) == 0)  {
+                       
+                       $info = $zthis->ServerInfo();
+                       if (substr($info['version'],0,3) >= 7.1) { // good till 
version 999
+                               $rewritesql = 
preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$sql);
+                               $rewritesql = "SELECT COUNT(*) FROM 
($rewritesql) _ADODB_ALIAS_";
+                       }
+               }
+       } else {
+               // now replace SELECT ... FROM with SELECT COUNT(*) FROM
+               $rewritesql = preg_replace(
+                                       '/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT 
COUNT(*) FROM ',$sql);
+
+               // fix by alexander zhukov, alex#unipack.ru, because count(*) 
and 'order by' fails 
+               // with mssql, access and postgresql. Also a good speedup 
optimization - skips sorting!
+               // also see http://phplens.com/lens/lensforum/msgs.php?id=12752
+               if (preg_match('/\sORDER\s+BY\s*\(/i',$rewritesql))
+                       $rewritesql = 
preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql);
+               else
+                       $rewritesql = 
preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$rewritesql);
+                
+       }
+       
+       if (isset($rewritesql) && $rewritesql != $sql) {
+               if ($secs2cache) {
+                       // we only use half the time of secs2cache because the 
count can quickly
+                       // become inaccurate if new records are added
+                       $qryRecs = 
$zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr);
+                       
+               } else {
+                       $qryRecs = $zthis->GetOne($rewritesql,$inputarr);
+               }
+               if ($qryRecs !== false) return $qryRecs;
+       }
+       //--------------------------------------------
+       // query rewrite failed - so try slower way...
+       
+       
+       // strip off unneeded ORDER BY if no UNION
+       if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
+       else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); 
+       
+       $rstest = &$zthis->Execute($rewritesql,$inputarr);
+       if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr);
+       
+       if ($rstest) {
+                       $qryRecs = $rstest->RecordCount();
+               if ($qryRecs == -1) { 
+               global $ADODB_EXTENSION;
+               // some databases will return -1 on MoveLast() - change to 
MoveNext()
+                       if ($ADODB_EXTENSION) {
+                               while(!$rstest->EOF) {
+                                       adodb_movenext($rstest);
+                               }
+                       } else {
+                               while(!$rstest->EOF) {
+                                       $rstest->MoveNext();
+                               }
+                       }
+                       $qryRecs = $rstest->_currentRow;
+               }
+               $rstest->Close();
+               if ($qryRecs == -1) return 0;
+       }
+       
+       return $qryRecs;
+}
+
+/*
+       Code originally from "Cornel G" <address@hidden>
+
+       This code might not work with SQL that has UNION in it  
+       
+       Also if you are using CachePageExecute(), there is a strong possibility 
that
+       data will get out of synch. use CachePageExecute() only with tables that
+       rarely change.
+*/
+function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, 
+                                               $inputarr=false, $secs2cache=0) 
+{
+       $atfirstpage = false;
+       $atlastpage = false;
+       $lastpageno=1;
+
+       // If an invalid nrows is supplied, 
+       // we assume a default value of 10 rows per page
+       if (!isset($nrows) || $nrows <= 0) $nrows = 10;
+
+       $qryRecs = false; //count records for no offset
+       
+       $qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache);
+       $lastpageno = (int) ceil($qryRecs / $nrows);
+       $zthis->_maxRecordCount = $qryRecs;
+       
+
+
+       // ***** Here we check whether $page is the last page or 
+       // whether we are trying to retrieve 
+       // a page number greater than the last page number.
+       if ($page >= $lastpageno) {
+               $page = $lastpageno;
+               $atlastpage = true;
+       }
+       
+       // If page number <= 1, then we are at the first page
+       if (empty($page) || $page <= 1) {       
+               $page = 1;
+               $atfirstpage = true;
+       }
+       
+       // We get the data we want
+       $offset = $nrows * ($page-1);
+       if ($secs2cache > 0) 
+               $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, 
$nrows, $offset, $inputarr);
+       else 
+               $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, 
$inputarr, $secs2cache);
+
+       
+       // Before returning the RecordSet, we set the pagination properties we 
need
+       if ($rsreturn) {
+               $rsreturn->_maxRecordCount = $qryRecs;
+               $rsreturn->rowsPerPage = $nrows;
+               $rsreturn->AbsolutePage($page);
+               $rsreturn->AtFirstPage($atfirstpage);
+               $rsreturn->AtLastPage($atlastpage);
+               $rsreturn->LastPageNo($lastpageno);
+       }
+       return $rsreturn;
+}
+
+// Iván Oliva version
+function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, 
$inputarr=false, $secs2cache=0) 
+{
+
+       $atfirstpage = false;
+       $atlastpage = false;
+       
+       if (!isset($page) || $page <= 1) {      // If page number <= 1, then we 
are at the first page
+               $page = 1;
+               $atfirstpage = true;
+       }
+       if ($nrows <= 0) $nrows = 10;   // If an invalid nrows is supplied, we 
assume a default value of 10 rows per page
+       
+       // ***** Here we check whether $page is the last page or whether we are 
trying to retrieve a page number greater than 
+       // the last page number.
+       $pagecounter = $page + 1;
+       $pagecounteroffset = ($pagecounter * $nrows) - $nrows;
+       if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, 
$sql, $nrows, $pagecounteroffset, $inputarr);
+       else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, 
$inputarr, $secs2cache);
+       if ($rstest) {
+               while ($rstest && $rstest->EOF && $pagecounter>0) {
+                       $atlastpage = true;
+                       $pagecounter--;
+                       $pagecounteroffset = $nrows * ($pagecounter - 1);
+                       $rstest->Close();
+                       if ($secs2cache>0) $rstest = 
&$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, 
$inputarr);
+                       else $rstest = &$zthis->SelectLimit($sql, $nrows, 
$pagecounteroffset, $inputarr, $secs2cache);
+               }
+               if ($rstest) $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 = $nrows * ($page-1);
+       if ($secs2cache > 0) $rsreturn = &$zthis->CacheSelectLimit($secs2cache, 
$sql, $nrows, $offset, $inputarr);
+       else $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, 
$secs2cache);
+       
+       // Before returning the RecordSet, we set the pagination properties we 
need
+       if ($rsreturn) {
+               $rsreturn->rowsPerPage = $nrows;
+               $rsreturn->AbsolutePage($page);
+               $rsreturn->AtFirstPage($atfirstpage);
+               $rsreturn->AtLastPage($atlastpage);
+       }
+       return $rsreturn;
+}
+
+function _adodb_getupdatesql(&$zthis,&$rs, 
$arrFields,$forceUpdate=false,$magicq=false,$force=2)
+{
+               if (!$rs) {
+                       printf(ADODB_BAD_RS,'GetUpdateSQL');
+                       return false;
+               }
+       
+               $fieldUpdatedCount = 0;
+               $arrFields = _array_change_key_case($arrFields);
+
+               $hasnumeric = isset($rs->fields[0]);
+               $setFields = '';
+               
+               // Loop through all of the fields in the recordset
+               for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
+                       // Get the field from the recordset
+                       $field = $rs->FetchField($i);
+
+                       // If the recordset field is one
+                       // of the fields passed in then process.
+                       $upperfname = strtoupper($field->name);
+                       if (adodb_key_exists($upperfname,$arrFields,$force)) {
+                               
+                               // If the existing field value in the recordset
+                               // is different from the value passed in then
+                               // go ahead and append the field name and new 
value to
+                               // the update query.
+                               
+                               if ($hasnumeric) $val = $rs->fields[$i];
+                               else if (isset($rs->fields[$upperfname])) $val 
= $rs->fields[$upperfname];
+                               else if (isset($rs->fields[$field->name])) $val 
=  $rs->fields[$field->name];
+                               else if 
(isset($rs->fields[strtolower($upperfname)])) $val =  
$rs->fields[strtolower($upperfname)];
+                               else $val = '';
+                               
+                       
+                               if ($forceUpdate || strcmp($val, 
$arrFields[$upperfname])) {
+                                       // Set the counter for the number of 
fields that will be updated.
+                                       $fieldUpdatedCount++;
+
+                                       // Based on the datatype of the field
+                                       // Format the value properly for the 
database
+                                       $type = $rs->MetaType($field->type);
+                                               
+
+                                       if ($type == 'null') {
+                                               $type = 'C';
+                                       }
+                                       
+                                       if (strpos($upperfname,' ') !== false)
+                                               $fnameq = 
$zthis->nameQuote.$upperfname.$zthis->nameQuote;
+                                       else
+                                               $fnameq = $upperfname;
+                                       
+                                       
+                // is_null requires php 4.0.4
+                //********************************************************//
+                if (is_null($arrFields[$upperfname])
+                                       || (empty($arrFields[$upperfname]) && 
strlen($arrFields[$upperfname]) == 0)
+                    || $arrFields[$upperfname] === 'null'
+                    )
+                {
+                    switch ($force) {
+
+                        //case 0:
+                        //    //Ignore empty values. This is allready handled 
in "adodb_key_exists" function.
+                        //break;
+
+                        case 1:
+                            //Set null
+                            $setFields .= $field->name . " = null, ";
+                        break;
+                                                       
+                        case 2:
+                            //Set empty
+                            $arrFields[$upperfname] = "";
+                            $setFields .= _adodb_column_sql($zthis, 'U', 
$type, $upperfname, $fnameq,$arrFields, $magicq);
+                        break;
+                                               default:
+                        case 3:
+                            //Set the value that was given in array, so you 
can give both null and empty values
+                            if (is_null($arrFields[$upperfname]) || 
$arrFields[$upperfname] === 'null') {
+                                $setFields .= $field->name . " = null, ";
+                            } else {
+                                $setFields .= _adodb_column_sql($zthis, 'U', 
$type, $upperfname, $fnameq,$arrFields, $magicq);
+                            }
+                        break;
+                    }
+                //********************************************************//
+                } else {
+                                               //we do this so each driver can 
customize the sql for
+                                               //DB specific column types. 
+                                               //Oracle needs BLOB types to be 
handled with a returning clause
+                                               //postgres has special needs as 
well
+                                               $setFields .= 
_adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,
+                                                                               
                                  $arrFields, $magicq);
+                                       }
+                               }
+                       }
+               }
+
+               // If there were any modified fields then build the rest of the 
update query.
+               if ($fieldUpdatedCount > 0 || $forceUpdate) {
+                                       // Get the table name from the existing 
query.
+                       if (!empty($rs->tableName)) $tableName = $rs->tableName;
+                       else {
+                               preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", 
$rs->sql, $tableName);
+                               $tableName = $tableName[1];
+                       }
+                       // Get the full where clause excluding the word "WHERE" 
from
+                       // the existing query.
+                       preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause);
+                       
+                       $discard = false;
+                       // not a good hack, improvements?
+                       if ($whereClause) {
+                       #var_dump($whereClause);
+                               if (preg_match('/\s(ORDER\s.*)/is', 
$whereClause[1], $discard));
+                               else if (preg_match('/\s(LIMIT\s.*)/is', 
$whereClause[1], $discard));
+                               else if (preg_match('/\s(FOR UPDATE.*)/is', 
$whereClause[1], $discard));
+                               else preg_match('/\s.*(\) WHERE .*)/is', 
$whereClause[1], $discard); # see 
http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976
+                       } else
+                               $whereClause = array(false,false);
+                               
+                       if ($discard)
+                               $whereClause[1] = substr($whereClause[1], 0, 
strlen($whereClause[1]) - strlen($discard[1]));
+                       
+                       $sql = 'UPDATE '.$tableName.' SET '.substr($setFields, 
0, -2);
+                       if (strlen($whereClause[1]) > 0) 
+                               $sql .= ' WHERE '.$whereClause[1];
+
+                       return $sql;
+
+               } else {
+                       return false;
+       }
+}
+
+function adodb_key_exists($key, &$arr,$force=2)
+{
+       if ($force<=0) {
+               // the following is the old behaviour where null or empty 
fields are ignored
+               return (!empty($arr[$key])) || (isset($arr[$key]) && 
strlen($arr[$key])>0);
+       }
+
+       if (isset($arr[$key])) return true;
+       ## null check below
+       if (ADODB_PHPVER >= 0x4010) return array_key_exists($key,$arr);
+       return false;
+}
+
+/**
+ * There is a special case of this function for the oci8 driver.
+ * The proper way to handle an insert w/ a blob in oracle requires
+ * a returning clause with bind variables and a descriptor blob.
+ * 
+ * 
+ */
+function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2)
+{
+static $cacheRS = false;
+static $cacheSig = 0;
+static $cacheCols;
+
+       $tableName = '';
+       $values = '';
+       $fields = '';
+       $recordSet = null;
+       $arrFields = _array_change_key_case($arrFields);
+       $fieldInsertedCount = 0;
+       
+       if (is_string($rs)) {
+               //ok we have a table name
+               //try and get the column info ourself.
+               $tableName = $rs;                       
+       
+               //we need an object for the recordSet
+               //because we have to call MetaType.
+               //php can't do a $rsclass::MetaType()
+               $rsclass = $zthis->rsPrefix.$zthis->databaseType;
+               $recordSet = new $rsclass(-1,$zthis->fetchMode);
+               $recordSet->connection = &$zthis;
+               
+               if (is_string($cacheRS) && $cacheRS == $rs) {
+                       $columns =& $cacheCols;
+               } else {
+                       $columns = $zthis->MetaColumns( $tableName );
+                       $cacheRS = $tableName;
+                       $cacheCols = $columns;
+               }
+       } else if (is_subclass_of($rs, 'adorecordset')) {
+               if (isset($rs->insertSig) && is_integer($cacheRS) && $cacheRS 
== $rs->insertSig) {
+                       $columns =& $cacheCols;
+               } else {
+                       for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) 
+                               $columns[] = $rs->FetchField($i);
+                       $cacheRS = $cacheSig;
+                       $cacheCols = $columns;
+                       $rs->insertSig = $cacheSig++;
+               }
+               $recordSet =& $rs;
+       
+       } else {
+               printf(ADODB_BAD_RS,'GetInsertSQL');
+               return false;
+       }
+
+       // Loop through all of the fields in the recordset
+       foreach( $columns as $field ) { 
+               $upperfname = strtoupper($field->name);
+               if (adodb_key_exists($upperfname,$arrFields,$force)) {
+                       $bad = false;
+                       if (strpos($upperfname,' ') !== false)
+                               $fnameq = 
$zthis->nameQuote.$upperfname.$zthis->nameQuote;
+                       else
+                               $fnameq = $upperfname;
+                       
+                       $type = $recordSet->MetaType($field->type);
+                       
+            /********************************************************/
+            if (is_null($arrFields[$upperfname])
+                || (empty($arrFields[$upperfname]) && 
strlen($arrFields[$upperfname]) == 0)
+                || $arrFields[$upperfname] === 'null'
+                               )
+               {
+                    switch ($force) {
+
+                        case 0: // we must always set null if missing
+                                                       $bad = true;
+                                                       break;
+                                                       
+                        case 1:
+                            $values  .= "null, ";
+                        break;
+               
+                        case 2:
+                            //Set empty
+                            $arrFields[$upperfname] = "";
+                            $values .= _adodb_column_sql($zthis, 'I', $type, 
$upperfname, $fnameq,$arrFields, $magicq);
+                        break;
+
+                                               default:
+                        case 3:
+                            //Set the value that was given in array, so you 
can give both null and empty values
+                                                       if 
(is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === 'null') { 
+                                                               $values  .= 
"null, ";
+                                                       } else {
+                                       $values .= _adodb_column_sql($zthis, 
'I', $type, $upperfname, $fnameq, $arrFields, $magicq);
+                                       }
+                               break;
+                       } // switch
+
+            /*********************************************************/
+                       } else {
+                               //we do this so each driver can customize the 
sql for
+                               //DB specific column types. 
+                               //Oracle needs BLOB types to be handled with a 
returning clause
+                               //postgres has special needs as well
+                               $values .= _adodb_column_sql($zthis, 'I', 
$type, $upperfname, $fnameq,
+                                                                               
           $arrFields, $magicq);
+                       }
+                       
+                       if ($bad) continue;
+                       // Set the counter for the number of fields that will 
be inserted.
+                       $fieldInsertedCount++;
+                       
+                       
+                       // Get the name of the fields to insert
+                       $fields .= $fnameq . ", ";
+               }
+       }
+
+
+       // If there were any inserted fields then build the rest of the insert 
query.
+       if ($fieldInsertedCount <= 0)  return false;
+       
+       // Get the table name from the existing query.
+       if (!$tableName) {
+               if (!empty($rs->tableName)) $tableName = $rs->tableName;
+               else if (preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", 
$rs->sql, $tableName))
+                       $tableName = $tableName[1];
+               else 
+                       return false;
+       }               
+
+       // 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.
+       return 'INSERT INTO '.$tableName.' ( '.$fields.' ) VALUES ( '.$values.' 
)';
+}
+
+
+/**
+ * This private method is used to help construct
+ * the update/sql which is generated by GetInsertSQL and GetUpdateSQL.
+ * It handles the string construction of 1 column -> sql string based on
+ * the column type.  We want to do 'safe' handling of BLOBs
+ * 
+ * @param string the type of sql we are trying to create
+ *                'I' or 'U'. 
+ * @param string column data type from the db::MetaType() method  
+ * @param string the column name
+ * @param array the column value
+ * 
+ * @return string
+ * 
+ */
+function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, 
$arrFields, $magicq) 
+{
+    $sql = '';
+    
+    // Based on the datatype of the field
+    // Format the value properly for the database
+    switch($type) {
+    case 'B':
+        //in order to handle Blobs correctly, we need
+        //to do some magic for Oracle
+
+        //we need to create a new descriptor to handle 
+        //this properly
+        if (!empty($zthis->hasReturningInto)) {
+            if ($action == 'I') {
+                $sql = 'empty_blob(), ';
+            } else {
+                $sql = $fnameq. '=empty_blob(), ';
+            }
+            //add the variable to the returning clause array
+            //so the user can build this later in
+            //case they want to add more to it
+            $zthis->_returningArray[$fname] = ':xx'.$fname.'xx';
+        } else if (empty($arrFields[$fname])){
+            if ($action == 'I') {
+                $sql = 'empty_blob(), ';
+            } else {
+                $sql = $fnameq. '=empty_blob(), ';
+            }            
+        } else {
+            //this is to maintain compatibility
+            //with older adodb versions.
+            $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, 
$arrFields, $magicq,false);
+        }
+        break;
+
+    case "X":
+        //we need to do some more magic here for long variables
+        //to handle these correctly in oracle.
+
+        //create a safe bind var name
+        //to avoid conflicts w/ dupes.
+       if (!empty($zthis->hasReturningInto)) {
+            if ($action == 'I') {
+                $sql = ':xx'.$fname.'xx, ';                
+            } else {
+                $sql = $fnameq.'=:xx'.$fname.'xx, ';
+            }
+            //add the variable to the returning clause array
+            //so the user can build this later in
+            //case they want to add more to it
+            $zthis->_returningArray[$fname] = ':xx'.$fname.'xx';
+        } else {
+            //this is to maintain compatibility
+            //with older adodb versions.
+            $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, 
$arrFields, $magicq,false);
+        }            
+        break;
+        
+    default:
+        $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq,  
$arrFields, $magicq,false);
+        break;
+    }
+    
+    return $sql;
+}    
+       
+function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, 
$arrFields, $magicq, $recurse=true) 
+{
+
+       if ($recurse) {
+               switch($zthis->dataProvider)  {
+               case 'postgres':
+                       if ($type == 'L') $type = 'C';
+                       break;
+               case 'oci8':
+                       return _adodb_column_sql_oci8($zthis, $action, $type, 
$fname, $fnameq, $arrFields, $magicq);
+                       
+               }
+       }
+               
+       switch($type) {
+               case "C":
+               case "X":
+               case 'B':
+                       $val = $zthis->qstr($arrFields[$fname],$magicq);
+                       break;
+
+               case "D":
+                       $val = $zthis->DBDate($arrFields[$fname]);
+                       break;
+
+               case "T":
+                       $val = $zthis->DBTimeStamp($arrFields[$fname]);
+                       break;
+
+               default:
+                       $val = $arrFields[$fname];
+                       if (empty($val)) $val = '0';
+                       break;
+       }
+
+       if ($action == 'I') return $val . ", ";
+       
+       
+       return $fnameq . "=" . $val  . ", ";
+       
+}
+
+
+
+function _adodb_debug_execute(&$zthis, $sql, $inputarr)
+{
+       $ss = '';
+       if ($inputarr) {
+               foreach($inputarr as $kk=>$vv) {
+                       if (is_string($vv) && strlen($vv)>64) $vv = 
substr($vv,0,64).'...';
+                       $ss .= "($kk=>'$vv') ";
+               }
+               $ss = "[ $ss ]";
+       }
+       $sqlTxt = is_array($sql) ? $sql[0] : $sql;
+       /*str_replace(', ','##1#__^LF',is_array($sql) ? $sql[0] : $sql);
+       $sqlTxt = str_replace(',',', ',$sqlTxt);
+       $sqlTxt = str_replace('##1#__^LF', ', ' ,$sqlTxt);
+       */
+       // check if running from browser or command-line
+       $inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
+       
+       $dbt = $zthis->databaseType;
+       if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType;
+       if ($inBrowser) {
+               if ($ss) {
+                       $ss = '<code>'.htmlspecialchars($ss).'</code>';
+               }
+               if ($zthis->debug === -1)
+                       ADOConnection::outp( "<br />\n($dbt): 
".htmlspecialchars($sqlTxt)." &nbsp; $ss\n<br />\n",false);
+               else 
+                       ADOConnection::outp( "<hr />\n($dbt): 
".htmlspecialchars($sqlTxt)." &nbsp; $ss\n<hr />\n",false);
+       } else {
+               ADOConnection::outp("-----\n($dbt): 
".$sqlTxt."\n-----\n",false);
+       }
+
+       $qID = $zthis->_query($sql,$inputarr);
+       
+       /* 
+               Alexios Fakios notes that ErrorMsg() must be called before 
ErrorNo() for mssql
+               because ErrorNo() calls Execute('SELECT @ERROR'), causing 
recursion
+       */
+       if ($zthis->databaseType == 'mssql') { 
+       // ErrorNo is a slow function call in mssql, and not reliable in PHP 
4.0.6
+               if($emsg = $zthis->ErrorMsg()) {
+                       if ($err = $zthis->ErrorNo()) 
ADOConnection::outp($err.': '.$emsg);
+               }
+       } else if (!$qID) {
+               ADOConnection::outp($zthis->ErrorNo() .': '. 
$zthis->ErrorMsg());
+       }
+       
+       if ($zthis->debug === 99) _adodb_backtrace(true,9999,2);
+       return $qID;
+}
+
+# pretty print the debug_backtrace function
+function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0)
+{
+       if (!function_exists('debug_backtrace')) return '';
+        
+       $html =  (isset($_SERVER['HTTP_USER_AGENT']));
+       $fmt =  ($html) ? "</font><font color=#808080 size=-1> %% line %4d, 
file: <a href=\"file:/%s\">%s</a></font>" : "%% line %4d, file: %s";
+
+       $MAXSTRLEN = 128;
+
+       $s = ($html) ? '<pre align=left>' : '';
+       
+       if (is_array($printOrArr)) $traceArr = $printOrArr;
+       else $traceArr = debug_backtrace();
+       array_shift($traceArr);
+       array_shift($traceArr);
+       $tabs = sizeof($traceArr)-2;
+       
+       foreach ($traceArr as $arr) {
+               if ($skippy) {$skippy -= 1; continue;}
+               $levels -= 1;
+               if ($levels < 0) break;
+               
+               $args = array();
+               for ($i=0; $i < $tabs; $i++) $s .=  ($html) ? ' &nbsp; ' : "\t";
+               $tabs -= 1;
+               if ($html) $s .= '<font face="Courier New,Courier">';
+               if (isset($arr['class'])) $s .= $arr['class'].'.';
+               if (isset($arr['args']))
+                foreach($arr['args'] as $v) {
+                       if (is_null($v)) $args[] = 'null';
+                       else if (is_array($v)) $args[] = 
'Array['.sizeof($v).']';
+                       else if (is_object($v)) $args[] = 
'Object:'.get_class($v);
+                       else if (is_bool($v)) $args[] = $v ? 'true' : 'false';
+                       else {
+                               $v = (string) @$v;
+                               $str = 
htmlspecialchars(substr($v,0,$MAXSTRLEN));
+                               if (strlen($v) > $MAXSTRLEN) $str .= '...';
+                               $args[] = $str;
+                       }
+               }
+               $s .= $arr['function'].'('.implode(', ',$args).')';
+               
+               
+               $s .= @sprintf($fmt, 
$arr['line'],$arr['file'],basename($arr['file']));
+                       
+               $s .= "\n";
+       }       
+       if ($html) $s .= '</pre>';
+       if ($printOrArr) print $s;
+       
+       return $s;
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-pager.inc.php
diff -u phpgwapi/inc/adodb/adodb-pager.inc.php:1.2 
phpgwapi/inc/adodb/adodb-pager.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-pager.inc.php:1.2  Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-pager.inc.php      Tue Feb 21 13:47:42 2006
@@ -1,287 +1,290 @@
-<?php
-
-/*
-       V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-         Released under both BSD license and Lesser GPL library license. 
-         Whenever there is any discrepancy between the two licenses, 
-         the BSD license will take precedence. 
-         Set tabs to 4 for best viewing.
-
-       This class provides recordset pagination with 
-       First/Prev/Next/Last links. 
-       
-       Feel free to modify this class for your own use as
-       it is very basic. To learn how to use it, see the 
-       example in adodb/tests/testpaging.php.
-       
-       "Pablo Costa" <address@hidden> implemented Render_PageLinks().
-       
-       Please note, this class is entirely unsupported, 
-       and no free support requests except for bug reports
-       will be entertained by the author.
-
-*/
-class ADODB_Pager {
-       var $id;        // unique id for pager (defaults to 'adodb')
-       var $db;        // ADODB connection object
-       var $sql;       // sql used
-       var $rs;        // recordset generated
-       var $curr_page; // current page number before Render() called, 
calculated in constructor
-       var $rows;              // number of rows per page
-    var $linksPerPage=10; // number of links per page in navigation bar
-    var $showPageLinks; 
-
-       var $gridAttributes = 'width=100% border=1 bgcolor=white';
-       
-       // Localize text strings here
-       var $first = '<code>|&lt;</code>';
-       var $prev = '<code>&lt;&lt;</code>';
-       var $next = '<code>>></code>';
-       var $last = '<code>>|</code>';
-       var $moreLinks = '...';
-       var $startLinks = '...';
-       var $gridHeader = false;
-       var $htmlSpecialChars = true;
-       var $page = 'Page';
-       var $linkSelectedColor = 'red';
-       var $cache = 0;  #secs to cache with CachePageExecute()
-       
-       //----------------------------------------------
-       // constructor
-       //
-       // $db  adodb connection object
-       // $sql sql statement
-       // $id  optional id to identify which pager, 
-       //              if you have multiple on 1 page. 
-       //              $id should be only be [a-z0-9]*
-       //
-       function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false)
-       {
-       global $HTTP_SERVER_VARS,$PHP_SELF,$HTTP_SESSION_VARS,$HTTP_GET_VARS;
-       
-               $curr_page = $id.'_curr_page';
-               if (empty($PHP_SELF)) $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
-               
-               $this->sql = $sql;
-               $this->id = $id;
-               $this->db = $db;
-               $this->showPageLinks = $showPageLinks;
-               
-               $next_page = $id.'_next_page';  
-               
-               if (isset($HTTP_GET_VARS[$next_page])) {
-                       $HTTP_SESSION_VARS[$curr_page] = 
$HTTP_GET_VARS[$next_page];
-               }
-               if (empty($HTTP_SESSION_VARS[$curr_page])) 
$HTTP_SESSION_VARS[$curr_page] = 1; ## at first page
-               
-               $this->curr_page = $HTTP_SESSION_VARS[$curr_page];
-               
-       }
-       
-       //---------------------------
-       // Display link to first page
-       function Render_First($anchor=true)
-       {
-       global $PHP_SELF;
-               if ($anchor) {
-       ?>
-               <a href="<?php echo 
$PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a> &nbsp; 
-       <?php
-               } else {
-                       print "$this->first &nbsp; ";
-               }
-       }
-       
-       //--------------------------
-       // Display link to next page
-       function render_next($anchor=true)
-       {
-       global $PHP_SELF;
-       
-               if ($anchor) {
-               ?>
-               <a href="<?php echo 
$PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php 
echo $this->next;?></a> &nbsp; 
-               <?php
-               } else {
-                       print "$this->next &nbsp; ";
-               }
-       }
-       
-       //------------------
-       // Link to last page
-       // 
-       // for better performance with large recordsets, you can set
-       // $this->db->pageExecuteCountRows = false, which disables
-       // last page counting.
-       function render_last($anchor=true)
-       {
-       global $PHP_SELF;
-       
-               if (!$this->db->pageExecuteCountRows) return;
-               
-               if ($anchor) {
-               ?>
-                       <a href="<?php echo 
$PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo 
$this->last;?></a> &nbsp; 
-               <?php
-               } else {
-                       print "$this->last &nbsp; ";
-               }
-       }
-       
-       //---------------------------------------------------
-       // original code by "Pablo Costa" <address@hidden> 
-        function render_pagelinks()
-        {
-        global $PHP_SELF;
-            $pages        = $this->rs->LastPageNo();
-            $linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages;
-            for($i=1; $i <= $pages; $i+=$linksperpage)
-            {
-                if($this->rs->AbsolutePage() >= $i)
-                {
-                    $start = $i;
-                }
-            }
-                       $numbers = '';
-            $end = $start+$linksperpage-1;
-                       $link = $this->id . "_next_page";
-            if($end > $pages) $end = $pages;
-                       
-                       
-                       if ($this->startLinks && $start > 1) {
-                               $pos = $start - 1;
-                               $numbers .= "<a 
href=$PHP_SELF?$link=$pos>$this->startLinks</a>  ";
-            } 
-                       
-                       for($i=$start; $i <= $end; $i++) {
-                if ($this->rs->AbsolutePage() == $i)
-                    $numbers .= "<font 
color=$this->linkSelectedColor><b>$i</b></font>  ";
-                else 
-                     $numbers .= "<a href=$PHP_SELF?$link=$i>$i</a>  ";
-            
-            }
-                       if ($this->moreLinks && $end < $pages) 
-                               $numbers .= "<a 
href=$PHP_SELF?$link=$i>$this->moreLinks</a>  ";
-            print $numbers . ' &nbsp; ';
-        }
-       // Link to previous page
-       function render_prev($anchor=true)
-       {
-       global $PHP_SELF;
-               if ($anchor) {
-       ?>
-               <a href="<?php echo 
$PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php 
echo $this->prev;?></a> &nbsp; 
-       <?php 
-               } else {
-                       print "$this->prev &nbsp; ";
-               }
-       }
-       
-       //--------------------------------------------------------
-       // Simply rendering of grid. You should override this for
-       // better control over the format of the grid
-       //
-       // We use output buffering to keep code clean and readable.
-       function RenderGrid()
-       {
-       global $gSQLBlockRows; // used by rs2html to indicate how many rows to 
display
-               include_once(ADODB_DIR.'/tohtml.inc.php');
-               ob_start();
-               $gSQLBlockRows = $this->rows;
-               
rs2html($this->rs,$this->gridAttributes,$this->gridHeader,$this->htmlSpecialChars);
-               $s = ob_get_contents();
-               ob_end_clean();
-               return $s;
-       }
-       
-       //-------------------------------------------------------
-       // Navigation bar
-       //
-       // we use output buffering to keep the code easy to read.
-       function RenderNav()
-       {
-               ob_start();
-               if (!$this->rs->AtFirstPage()) {
-                       $this->Render_First();
-                       $this->Render_Prev();
-               } else {
-                       $this->Render_First(false);
-                       $this->Render_Prev(false);
-               }
-        if ($this->showPageLinks){
-            $this->Render_PageLinks();
-        }
-               if (!$this->rs->AtLastPage()) {
-                       $this->Render_Next();
-                       $this->Render_Last();
-               } else {
-                       $this->Render_Next(false);
-                       $this->Render_Last(false);
-               }
-               $s = ob_get_contents();
-               ob_end_clean();
-               return $s;
-       }
-       
-       //-------------------
-       // This is the footer
-       function RenderPageCount()
-       {
-               if (!$this->db->pageExecuteCountRows) return '';
-               $lastPage = $this->rs->LastPageNo();
-               if ($lastPage == -1) $lastPage = 1; // check for empty rs.
-               if ($this->curr_page > $lastPage) $this->curr_page = 1;
-               return "<font size=-1>$this->page 
".$this->curr_page."/".$lastPage."</font>";
-       }
-       
-       //-----------------------------------
-       // Call this class to draw everything.
-       function Render($rows=10)
-       {
-       global $ADODB_COUNTRECS;
-       
-               $this->rows = $rows;
-               
-               $savec = $ADODB_COUNTRECS;
-               if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
-               if ($this->cache)
-                       $rs = 
&$this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
-               else
-                       $rs = 
&$this->db->PageExecute($this->sql,$rows,$this->curr_page);
-               $ADODB_COUNTRECS = $savec;
-               
-               $this->rs = &$rs;
-               if (!$rs) {
-                       print "<h3>Query failed: $this->sql</h3>";
-                       return;
-               }
-               
-               if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) 
-                       $header = $this->RenderNav();
-               else
-                       $header = "&nbsp;";
-               
-               $grid = $this->RenderGrid();
-               $footer = $this->RenderPageCount();
-               $rs->Close();
-               $this->rs = false;
-               
-               $this->RenderLayout($header,$grid,$footer);
-       }
-       
-       //------------------------------------------------------
-       // override this to control overall layout and formating
-       function RenderLayout($header,$grid,$footer,$attributes='border=1 
bgcolor=beige')
-       {
-               echo "<table ".$attributes."><tr><td>",
-                               $header,
-                       "</td></tr><tr><td>",
-                               $grid,
-                       "</td></tr><tr><td>",
-                               $footer,
-                       "</td></tr></table>";
-       }
-}
-
-
+<?php
+
+/*
+       V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+         Released under both BSD license and Lesser GPL library license. 
+         Whenever there is any discrepancy between the two licenses, 
+         the BSD license will take precedence. 
+         Set tabs to 4 for best viewing.
+
+       This class provides recordset pagination with 
+       First/Prev/Next/Last links. 
+       
+       Feel free to modify this class for your own use as
+       it is very basic. To learn how to use it, see the 
+       example in adodb/tests/testpaging.php.
+       
+       "Pablo Costa" <address@hidden> implemented Render_PageLinks().
+       
+       Please note, this class is entirely unsupported, 
+       and no free support requests except for bug reports
+       will be entertained by the author.
+
+*/
+class ADODB_Pager {
+       var $id;        // unique id for pager (defaults to 'adodb')
+       var $db;        // ADODB connection object
+       var $sql;       // sql used
+       var $rs;        // recordset generated
+       var $curr_page; // current page number before Render() called, 
calculated in constructor
+       var $rows;              // number of rows per page
+    var $linksPerPage=10; // number of links per page in navigation bar
+    var $showPageLinks; 
+
+       var $gridAttributes = 'width=100% border=1 bgcolor=white';
+       
+       // Localize text strings here
+       var $first = '<code>|&lt;</code>';
+       var $prev = '<code>&lt;&lt;</code>';
+       var $next = '<code>>></code>';
+       var $last = '<code>>|</code>';
+       var $moreLinks = '...';
+       var $startLinks = '...';
+       var $gridHeader = false;
+       var $htmlSpecialChars = true;
+       var $page = 'Page';
+       var $linkSelectedColor = 'red';
+       var $cache = 0;  #secs to cache with CachePageExecute()
+       
+       //----------------------------------------------
+       // constructor
+       //
+       // $db  adodb connection object
+       // $sql sql statement
+       // $id  optional id to identify which pager, 
+       //              if you have multiple on 1 page. 
+       //              $id should be only be [a-z0-9]*
+       //
+       function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false)
+       {
+       global $PHP_SELF;
+       
+               $curr_page = $id.'_curr_page';
+               if (empty($PHP_SELF)) $PHP_SELF = 
htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS 
attacks
+               
+               $this->sql = $sql;
+               $this->id = $id;
+               $this->db = $db;
+               $this->showPageLinks = $showPageLinks;
+               
+               $next_page = $id.'_next_page';  
+               
+               if (isset($_GET[$next_page])) {
+                       $_SESSION[$curr_page] = (integer) $_GET[$next_page];
+               }
+               if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## 
at first page
+               
+               $this->curr_page = $_SESSION[$curr_page];
+               
+       }
+       
+       //---------------------------
+       // Display link to first page
+       function Render_First($anchor=true)
+       {
+       global $PHP_SELF;
+               if ($anchor) {
+       ?>
+               <a href="<?php echo 
$PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a> &nbsp; 
+       <?php
+               } else {
+                       print "$this->first &nbsp; ";
+               }
+       }
+       
+       //--------------------------
+       // Display link to next page
+       function render_next($anchor=true)
+       {
+       global $PHP_SELF;
+       
+               if ($anchor) {
+               ?>
+               <a href="<?php echo 
$PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php 
echo $this->next;?></a> &nbsp; 
+               <?php
+               } else {
+                       print "$this->next &nbsp; ";
+               }
+       }
+       
+       //------------------
+       // Link to last page
+       // 
+       // for better performance with large recordsets, you can set
+       // $this->db->pageExecuteCountRows = false, which disables
+       // last page counting.
+       function render_last($anchor=true)
+       {
+       global $PHP_SELF;
+       
+               if (!$this->db->pageExecuteCountRows) return;
+               
+               if ($anchor) {
+               ?>
+                       <a href="<?php echo 
$PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo 
$this->last;?></a> &nbsp; 
+               <?php
+               } else {
+                       print "$this->last &nbsp; ";
+               }
+       }
+       
+       //---------------------------------------------------
+       // original code by "Pablo Costa" <address@hidden> 
+        function render_pagelinks()
+        {
+        global $PHP_SELF;
+            $pages        = $this->rs->LastPageNo();
+            $linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages;
+            for($i=1; $i <= $pages; $i+=$linksperpage)
+            {
+                if($this->rs->AbsolutePage() >= $i)
+                {
+                    $start = $i;
+                }
+            }
+                       $numbers = '';
+            $end = $start+$linksperpage-1;
+                       $link = $this->id . "_next_page";
+            if($end > $pages) $end = $pages;
+                       
+                       
+                       if ($this->startLinks && $start > 1) {
+                               $pos = $start - 1;
+                               $numbers .= "<a 
href=$PHP_SELF?$link=$pos>$this->startLinks</a>  ";
+            } 
+                       
+                       for($i=$start; $i <= $end; $i++) {
+                if ($this->rs->AbsolutePage() == $i)
+                    $numbers .= "<font 
color=$this->linkSelectedColor><b>$i</b></font>  ";
+                else 
+                     $numbers .= "<a href=$PHP_SELF?$link=$i>$i</a>  ";
+            
+            }
+                       if ($this->moreLinks && $end < $pages) 
+                               $numbers .= "<a 
href=$PHP_SELF?$link=$i>$this->moreLinks</a>  ";
+            print $numbers . ' &nbsp; ';
+        }
+       // Link to previous page
+       function render_prev($anchor=true)
+       {
+       global $PHP_SELF;
+               if ($anchor) {
+       ?>
+               <a href="<?php echo 
$PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php 
echo $this->prev;?></a> &nbsp; 
+       <?php 
+               } else {
+                       print "$this->prev &nbsp; ";
+               }
+       }
+       
+       //--------------------------------------------------------
+       // Simply rendering of grid. You should override this for
+       // better control over the format of the grid
+       //
+       // We use output buffering to keep code clean and readable.
+       function RenderGrid()
+       {
+       global $gSQLBlockRows; // used by rs2html to indicate how many rows to 
display
+               include_once(ADODB_DIR.'/tohtml.inc.php');
+               ob_start();
+               $gSQLBlockRows = $this->rows;
+               
rs2html($this->rs,$this->gridAttributes,$this->gridHeader,$this->htmlSpecialChars);
+               $s = ob_get_contents();
+               ob_end_clean();
+               return $s;
+       }
+       
+       //-------------------------------------------------------
+       // Navigation bar
+       //
+       // we use output buffering to keep the code easy to read.
+       function RenderNav()
+       {
+               ob_start();
+               if (!$this->rs->AtFirstPage()) {
+                       $this->Render_First();
+                       $this->Render_Prev();
+               } else {
+                       $this->Render_First(false);
+                       $this->Render_Prev(false);
+               }
+        if ($this->showPageLinks){
+            $this->Render_PageLinks();
+        }
+               if (!$this->rs->AtLastPage()) {
+                       $this->Render_Next();
+                       $this->Render_Last();
+               } else {
+                       $this->Render_Next(false);
+                       $this->Render_Last(false);
+               }
+               $s = ob_get_contents();
+               ob_end_clean();
+               return $s;
+       }
+       
+       //-------------------
+       // This is the footer
+       function RenderPageCount()
+       {
+               if (!$this->db->pageExecuteCountRows) return '';
+               $lastPage = $this->rs->LastPageNo();
+               if ($lastPage == -1) $lastPage = 1; // check for empty rs.
+               if ($this->curr_page > $lastPage) $this->curr_page = 1;
+               return "<font size=-1>$this->page 
".$this->curr_page."/".$lastPage."</font>";
+       }
+       
+       //-----------------------------------
+       // Call this class to draw everything.
+       function Render($rows=10)
+       {
+       global $ADODB_COUNTRECS;
+       
+               $this->rows = $rows;
+               
+               if ($this->db->dataProvider == 'informix') 
$this->db->cursorType = IFX_SCROLL;
+               
+               $savec = $ADODB_COUNTRECS;
+               if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
+               if ($this->cache)
+                       $rs = 
&$this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
+               else
+                       $rs = 
&$this->db->PageExecute($this->sql,$rows,$this->curr_page);
+               $ADODB_COUNTRECS = $savec;
+               
+               $this->rs = &$rs;
+               if (!$rs) {
+                       print "<h3>Query failed: $this->sql</h3>";
+                       return;
+               }
+               
+               if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) 
+                       $header = $this->RenderNav();
+               else
+                       $header = "&nbsp;";
+               
+               $grid = $this->RenderGrid();
+               $footer = $this->RenderPageCount();
+               
+               $this->RenderLayout($header,$grid,$footer);
+               
+               $rs->Close();
+               $this->rs = false;
+       }
+       
+       //------------------------------------------------------
+       // override this to control overall layout and formating
+       function RenderLayout($header,$grid,$footer,$attributes='border=1 
bgcolor=beige')
+       {
+               echo "<table ".$attributes."><tr><td>",
+                               $header,
+                       "</td></tr><tr><td>",
+                               $grid,
+                       "</td></tr><tr><td>",
+                               $footer,
+                       "</td></tr></table>";
+       }
+}
+
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-pear.inc.php
diff -u phpgwapi/inc/adodb/adodb-pear.inc.php:1.2 
phpgwapi/inc/adodb/adodb-pear.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-pear.inc.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-pear.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,369 +1,374 @@
-<?php
-/** 
- * @version V4.54 5 Nov 2004 (c) 2000-2004 John Lim (address@hidden). 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 
<address@hidden>                                                                
 |
- * and Tomas V.V.Cox <address@hidden>. Portions (c)1997-2002 The PHP Group.
- */
-
- /*
- 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
-       disconnect
-       
-       getOne
-       getAssoc
-       getRow
-       getCol
-       getAll
-       
- 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__));
-include_once "PEAR.php";
-include_once ADODB_PEAR."/adodb-errorpear.inc.php";
-include_once ADODB_PEAR."/adodb.inc.php";
-
-if (!defined('DB_OK')) {
-define("DB_OK",        1);
-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_DIR."/drivers/adodb-$type.inc.php");
-               $obj = &NewADOConnection($type);
-               if (!is_object($obj)) $obj =& new PEAR_Error('Unknown Database 
Driver: '.$dsninfo['phptype'],-1);
-               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;
-                       case 'ifx':             $type = 'informix9'; 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_object($obj)) {
-                       $obj =& new PEAR_Error('Unknown Database Driver: 
'.$dsninfo['phptype'],-1);
-                       return $obj;
-               }
-               if (is_array($options)) {
-                       foreach($options as $k => $v) {
-                               switch(strtolower($k)) {
-                               case 'persist':
-                               case 'persistent':      $persist = $v; break;
-                               #ibase
-                               case 'dialect':         $obj->dialect = $v; 
break;
-                               case 'charset':         $obj->charset = $v; 
break;
-                               case 'buffers':         $obj->buffers = $v; 
break;
-                               #ado
-                               case 'charpage':        $obj->charPage = $v; 
break;
-                               #mysql
-                               case 'clientflags': $obj->clientFlags = $v; 
break;
-                               }
-                       }
-               } else {
-                       $persist = false;
-               }
-
-               if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= 
':'.$dsninfo['socket'];
-               else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= 
':'.$dsninfo['port'];
-               
-               if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], 
$dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
-               else  $ok = $obj->Connect($dsninfo['hostspec'], 
$dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
-               
-               if (!$ok) $obj = ADODB_PEAR_Error();
-               return $obj;
-       }
-
-       /**
-        * 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)
-       {
-               if (!is_object($value)) return false;
-               $class = get_class($value);
-               return $class == 'pear_error' || is_subclass_of($value, 
'pear_error') || 
-                               $class == '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 false;
-               /*
-               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:address@hidden/database
-        *
-        * Most variations are allowed:
-        *
-        *  phptype://username:address@hidden:110//usr/db_file.db
-        *  phptype://username:address@hidden/database_name
-        *  phptype://username:address@hidden
-        *  phptype://address@hidden
-        *  phptype://hostspec/database
-        *  phptype://hostspec
-        *  phptype(dbsyntax)
-        *  phptype
-        *
-        * @author Tomas V.V.Cox <address@hidden>
-        */
-       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:address@hidden/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 = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : 
'.so';
-                       @dl($name . $dlext);
-               }
-               if (!extension_loaded($name)) {
-                       return false;
-               }
-               return true;
-       }
-}
-
+<?php
+/** 
+ * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). 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 
<address@hidden>                                                                
 |
+ * and Tomas V.V.Cox <address@hidden>. Portions (c)1997-2002 The PHP Group.
+ */
+
+ /*
+ 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
+       disconnect
+       
+       getOne
+       getAssoc
+       getRow
+       getCol
+       getAll
+       
+ 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__));
+include_once "PEAR.php";
+include_once ADODB_PEAR."/adodb-errorpear.inc.php";
+include_once ADODB_PEAR."/adodb.inc.php";
+
+if (!defined('DB_OK')) {
+define("DB_OK",        1);
+define("DB_ERROR",-1);
+
+// autoExecute constants
+define('DB_AUTOQUERY_INSERT', 1);
+define('DB_AUTOQUERY_UPDATE', 2);
+
+/**
+ * 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_DIR."/drivers/adodb-$type.inc.php");
+               $obj = &NewADOConnection($type);
+               if (!is_object($obj)) $obj =& new PEAR_Error('Unknown Database 
Driver: '.$dsninfo['phptype'],-1);
+               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;
+                       case 'ifx':             $type = 'informix9'; 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_object($obj)) {
+                       $obj =& new PEAR_Error('Unknown Database Driver: 
'.$dsninfo['phptype'],-1);
+                       return $obj;
+               }
+               if (is_array($options)) {
+                       foreach($options as $k => $v) {
+                               switch(strtolower($k)) {
+                               case 'persist':
+                               case 'persistent':      $persist = $v; break;
+                               #ibase
+                               case 'dialect':         $obj->dialect = $v; 
break;
+                               case 'charset':         $obj->charset = $v; 
break;
+                               case 'buffers':         $obj->buffers = $v; 
break;
+                               #ado
+                               case 'charpage':        $obj->charPage = $v; 
break;
+                               #mysql
+                               case 'clientflags': $obj->clientFlags = $v; 
break;
+                               }
+                       }
+               } else {
+                       $persist = false;
+               }
+
+               if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= 
':'.$dsninfo['socket'];
+               else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= 
':'.$dsninfo['port'];
+               
+               if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], 
$dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
+               else  $ok = $obj->Connect($dsninfo['hostspec'], 
$dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
+               
+               if (!$ok) $obj = ADODB_PEAR_Error();
+               return $obj;
+       }
+
+       /**
+        * 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)
+       {
+               if (!is_object($value)) return false;
+               $class = get_class($value);
+               return $class == 'pear_error' || is_subclass_of($value, 
'pear_error') || 
+                               $class == '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 false;
+               /*
+               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:address@hidden/database
+        *
+        * Most variations are allowed:
+        *
+        *  phptype://username:address@hidden:110//usr/db_file.db
+        *  phptype://username:address@hidden/database_name
+        *  phptype://username:address@hidden
+        *  phptype://address@hidden
+        *  phptype://hostspec/database
+        *  phptype://hostspec
+        *  phptype(dbsyntax)
+        *  phptype
+        *
+        * @author Tomas V.V.Cox <address@hidden>
+        */
+       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:address@hidden/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 = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : 
'.so';
+                       @dl($name . $dlext);
+               }
+               if (!extension_loaded($name)) {
+                       return false;
+               }
+               return true;
+       }
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-perf.inc.php
diff -u phpgwapi/inc/adodb/adodb-perf.inc.php:1.2 
phpgwapi/inc/adodb/adodb-perf.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-perf.inc.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-perf.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,915 +1,1053 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning.
-  
-  My apologies if you see code mixed with presentation. The presentation suits
-  my needs. If you want to separate code from presentation, be my guest. 
Patches
-  are welcome.
-  
-*/
-
-if (!defined(ADODB_DIR)) include_once(dirname(__FILE__).'/adodb.inc.php');
-include_once(ADODB_DIR.'/tohtml.inc.php');
-
-
-// avoids localization problems where , is used instead of .
-function adodb_round($n,$prec)
-{
-       return number_format($n, $prec, '.', '');
-}
-
-/* return microtime value as a float */
-function adodb_microtime()
-{
-       $t = microtime();
-       $t = explode(' ',$t);
-       return (float)$t[1]+ (float)$t[0];
-}
-
-/* sql code timing */
-function& adodb_log_sql(&$conn,$sql,$inputarr)
-{
-global $HTTP_SERVER_VARS;
-       
-    $perf_table = adodb_perf::table();
-       $conn->fnExecute = false;
-       $t0 = microtime();
-       $rs =& $conn->Execute($sql,$inputarr);
-       $t1 = microtime();
-
-       if (!empty($conn->_logsql)) {
-               $conn->_logsql = false; // disable logsql error simulation
-               $dbT = $conn->databaseType;
-               
-               $a0 = split(' ',$t0);
-               $a0 = (float)$a0[1]+(float)$a0[0];
-               
-               $a1 = split(' ',$t1);
-               $a1 = (float)$a1[1]+(float)$a1[0];
-               
-               $time = $a1 - $a0;
-       
-               if (!$rs) {
-                       $errM = $conn->ErrorMsg();
-                       $errN = $conn->ErrorNo();
-                       $conn->lastInsID = 0;
-                       $tracer = substr('ERROR: 
'.htmlspecialchars($errM),0,250);
-               } else {
-                       $tracer = '';
-                       $errM = '';
-                       $errN = 0;
-                       $dbg = $conn->debug;
-                       $conn->debug = false;
-                       if (!is_object($rs) || $rs->dataProvider == 'empty') 
-                               $conn->_affected = $conn->affected_rows(true);
-                       $conn->lastInsID = @$conn->Insert_ID();
-                       $conn->debug = $dbg;
-               }
-               if (isset($HTTP_SERVER_VARS['HTTP_HOST'])) {
-                       $tracer .= '<br>'.$HTTP_SERVER_VARS['HTTP_HOST'];
-                       if (isset($HTTP_SERVER_VARS['PHP_SELF'])) $tracer .= 
$HTTP_SERVER_VARS['PHP_SELF'];
-               } else 
-                       if (isset($HTTP_SERVER_VARS['PHP_SELF'])) $tracer .= 
'<br>'.$HTTP_SERVER_VARS['PHP_SELF'];
-               //$tracer .= (string) adodb_backtrace(false);
-               
-               $tracer = (string) substr($tracer,0,500);
-               
-               if (is_array($inputarr)) {
-                       if (is_array(reset($inputarr))) $params = 'Array 
sizeof='.sizeof($inputarr);
-                       else {
-                               $params = '';
-                               $params = implode(', ',$inputarr);
-                               if (strlen($params) >= 3000) $params = 
substr($params, 0, 3000);
-                       }
-               } else {
-                       $params = '';
-               }
-               
-               if (is_array($sql)) $sql = $sql[0];
-               $arr = array('b'=>trim(substr($sql,0,230)),
-                                       'c'=>substr($sql,0,3900), 
'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6));
-               //var_dump($arr);
-               $saved = $conn->debug;
-               $conn->debug = 0;
-               
-               $d = $conn->sysTimeStamp;
-               if (empty($d)) $d = date("'Y-m-d H:i:s'");
-               if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
-                       $isql = "insert into $perf_table 
values($d,:b,:c,:d,:e,:f)";
-               } else if ($dbT == 'odbc_mssql' || $dbT == 'informix') {
-                       $timer = $arr['f'];
-                       if ($dbT == 'informix') $sql2 = substr($sql2,0,230);
-
-                       $sql1 = $conn->qstr($arr['b']);
-                       $sql2 = $conn->qstr($arr['c']);
-                       $params = $conn->qstr($arr['d']);
-                       $tracer = $conn->qstr($arr['e']);
-                       
-                       $isql = "insert into $perf_table 
(created,sql0,sql1,params,tracer,timer) 
values($d,$sql1,$sql2,$params,$tracer,$timer)";
-                       if ($dbT == 'informix') $isql = str_replace(chr(10),' 
',$isql);
-                       $arr = false;
-               } else {
-                       $isql = "insert into $perf_table 
(created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)";
-               }
-
-               $ok = $conn->Execute($isql,$arr);
-               $conn->debug = $saved;
-               
-               if ($ok) {
-                       $conn->_logsql = true; 
-               } else {
-                       $err2 = $conn->ErrorMsg();
-                       $conn->_logsql = true; // enable logsql error simulation
-                       $perf =& NewPerfMonitor($conn);
-                       if ($perf) {
-                               if ($perf->CreateLogTable()) $ok = 
$conn->Execute($isql,$arr);
-                       } else {
-                               $ok = $conn->Execute("create table $perf_table (
-                               created varchar(50),
-                               sql0 varchar(250), 
-                               sql1 varchar(4000),
-                               params varchar(3000),
-                               tracer varchar(500),
-                               timer decimal(16,6))");
-                       }
-                       if (!$ok) {
-                               ADOConnection::outp( "<p><b>LOGSQL Insert 
Failed</b>: $isql<br>$err2</p>");
-                               $conn->_logsql = false;
-                       }
-               }
-               $conn->_errorMsg = $errM;
-               $conn->_errorCode = $errN;
-       } 
-       $conn->fnExecute = 'adodb_log_sql';
-       return $rs;
-}
-
-       
-/*
-The settings data structure is an associative array that database parameter 
per element.
-
-Each database parameter element in the array is itself an array consisting of:
-
-0: category code, used to group related db parameters
-1: either
-       a. sql string to retrieve value, eg. "select value from v\$parameter 
where name='db_block_size'", 
-       b. array holding sql string and field to look for, e.g. array('show 
variables','table_cache'),
-       c. a string prefixed by =, then a PHP method of the class is invoked, 
-               e.g. to invoke $this->GetIndexValue(), set this array element 
to '=GetIndexValue',
-2: description of the database parameter
-*/
-
-class adodb_perf {
-       var $conn;
-       var $color = '#F0F0F0';
-       var $table = '<table border=1 bgcolor=white>';
-       var $titles = 
'<tr><td><b>Parameter</b></td><td><b>Value</b></td><td><b>Description</b></td></tr>';
-       var $warnRatio = 90;
-       var $tablesSQL = false;
-       var $cliFormat = "%32s => %s \r\n";
-       var $sql1 = 'sql1';  // used for casting sql1 to text for mssql
-       var $explain = true;
-       var $helpurl = "<a 
href=http://phplens.com/adodb/reference.functions.fnexecute.and.fncacheexecute.properties.html#logsql>LogSQL
 help</a>";
-       var $createTableSQL = false;
-       var $maxLength = 2000;
-       
-    // Sets the tablename to be used            
-    function table($newtable = false)
-    {
-        static $_table;
-
-        if (!empty($newtable))  $_table = $newtable;
-               if (empty($_table)) $_table = 'adodb_logsql';
-        return $_table;
-    }
-
-       // returns array with info to calculate CPU Load
-       function _CPULoad()
-       {
-/*
-
-cpu  524152 2662 2515228 336057010
-cpu0 264339 1408 1257951 168025827
-cpu1 259813 1254 1257277 168031181
-page 622307 25475680
-swap 24 1891
-intr 890153570 868093576 6 0 4 4 0 6 1 2 0 0 0 124 0 8098760 2 13961053 0 0 0 
0 0 0 0 0 0 0 0 0 0 16 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
0 0 0 0 0
-disk_io: (3,0):(3144904,54369,610378,3090535,50936192) 
(3,1):(3630212,54097,633016,3576115,50951320)
-ctxt 66155838
-btime 1062315585
-processes 69293
-
-*/
-               // Algorithm is taken from
-               // 
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp
-               if (strncmp(PHP_OS,'WIN',3)==0) {
-                       @$c = new 
COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'");
-                       if (!$c) return false;
-                       
-                       $info[0] = $c->PercentProcessorTime;
-                       $info[1] = 0;
-                       $info[2] = 0;
-                       $info[3] = $c->TimeStamp_Sys100NS;
-                       //print_r($info);
-                       return $info;
-               }
-               
-               // Algorithm - Steve Blinch (BlitzAffe Online, 
http://www.blitzaffe.com)
-               $statfile = '/proc/stat';
-               if (!file_exists($statfile)) return false;
-               
-               $fd = fopen($statfile,"r");
-               if (!$fd) return false;
-               
-               $statinfo = explode("\n",fgets($fd, 1024));
-               fclose($fd);
-               foreach($statinfo as $line) {
-                       $info = explode(" ",$line);
-                       if($info[0]=="cpu") {
-                               array_shift($info);  // pop off "cpu"
-                               if(!$info[0]) array_shift($info); // pop off 
blank space (if any)
-                               return $info;
-                       }
-               }
-               
-               return false;
-               
-       }
-       
-       /* NOT IMPLEMENTED */
-       function MemInfo()
-       {
-               /*
-
-        total:    used:    free:  shared: buffers:  cached:
-Mem:  1055289344 917299200 137990144        0 165437440 599773184
-Swap: 2146775040 11055104 2135719936
-MemTotal:      1030556 kB
-MemFree:        134756 kB
-MemShared:           0 kB
-Buffers:        161560 kB
-Cached:         581384 kB
-SwapCached:       4332 kB
-Active:         494468 kB
-Inact_dirty:    322856 kB
-Inact_clean:     24256 kB
-Inact_target:   168316 kB
-HighTotal:      131064 kB
-HighFree:         1024 kB
-LowTotal:       899492 kB
-LowFree:        133732 kB
-SwapTotal:     2096460 kB
-SwapFree:      2085664 kB
-Committed_AS:   348732 kB
-               */
-       }
-       
-       
-       /*
-               Remember that this is client load, not db server load!
-       */
-       var $_lastLoad;
-       function CPULoad()
-       {
-               $info = $this->_CPULoad();
-               if (!$info) return false;
-                       
-               if (empty($this->_lastLoad)) {
-                       sleep(1);
-                       $this->_lastLoad = $info;
-                       $info = $this->_CPULoad();
-               }
-               
-               $last = $this->_lastLoad;
-               $this->_lastLoad = $info;
-               
-               $d_user = $info[0] - $last[0];
-               $d_nice = $info[1] - $last[1];
-               $d_system = $info[2] - $last[2];
-               $d_idle = $info[3] - $last[3];
-               
-               //printf("Delta - User: %f  Nice: %f  System: %f  Idle: 
%f<br>",$d_user,$d_nice,$d_system,$d_idle);
-
-               if (strncmp(PHP_OS,'WIN',3)==0) {
-                       if ($d_idle < 1) $d_idle = 1;
-                       return 100*(1-$d_user/$d_idle);
-               }else {
-                       $total=$d_user+$d_nice+$d_system+$d_idle;
-                       if ($total<1) $total=1;
-                       return 100*($d_user+$d_nice+$d_system)/$total; 
-               }
-       }
-       
-       function Tracer($sql)
-       {
-        $perf_table = adodb_perf::table();
-               $saveE = $this->conn->fnExecute;
-               $this->conn->fnExecute = false;
-                       
-               $sqlq = $this->conn->qstr($sql);
-               $arr = $this->conn->GetArray(
-"select count(*),tracer 
-       from $perf_table where sql1=$sqlq 
-       group by tracer
-       order by 1 desc");
-               $s = '';
-               if ($arr) {
-                       $s .= '<h3>Scripts Affected</h3>';
-                       foreach($arr as $k) {
-                               $s .= sprintf("%4d",$k[0]).' &nbsp; 
'.strip_tags($k[1]).'<br>';
-                       }
-               }
-               $this->conn->fnExecute = $saveE;
-               return $s;
-       }
-
-       /* 
-               Explain Plan for $sql.
-               If only a snippet of the $sql is passed in, then $partial will 
hold the crc32 of the 
-                       actual sql.
-       */
-       function Explain($sql,$partial=false)
-       {       
-               return false;
-       }
-       
-       function InvalidSQL($numsql = 10)
-       {
-       global $HTTP_GET_VARS;
-       
-               if (isset($HTTP_GET_VARS['sql'])) return;
-               $s = '<h3>Invalid SQL</h3>';
-               $saveE = $this->conn->fnExecute;
-               $this->conn->fnExecute = false;
-        $perf_table = adodb_perf::table();
-               $rs =& $this->conn->SelectLimit("select distinct 
count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' 
group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
-               $this->conn->fnExecute = $saveE;
-               if ($rs) {
-                       $s .= rs2html($rs,false,false,false,false);
-               } else
-                       return "<p>$this->helpurl. 
".$this->conn->ErrorMsg()."</p>";
-               
-               return $s;
-       }
-
-       
-       /*
-               This script identifies the longest running SQL
-       */      
-       function _SuspiciousSQL($numsql = 10)
-       {
-               global $ADODB_FETCH_MODE,$HTTP_GET_VARS;
-               
-            $perf_table = adodb_perf::table();
-                       $saveE = $this->conn->fnExecute;
-                       $this->conn->fnExecute = false;
-                       
-                       if (isset($HTTP_GET_VARS['exps']) && 
isset($HTTP_GET_VARS['sql'])) {
-                               $partial = !empty($HTTP_GET_VARS['part']);
-                               echo "<a 
name=explain></a>".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
-                       }
-                       
-                       if (isset($HTTP_GET_VARS['sql'])) return;
-                       $sql1 = $this->sql1;
-                       
-                       $save = $ADODB_FETCH_MODE;
-                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                       //$this->conn->debug=1;
-                       $rs =& $this->conn->SelectLimit(
-                       "select avg(timer) as 
avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
-                               from $perf_table
-                               where 
{$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP 
','INSER','COMMI','CREAT')
-                               and (tracer is null or tracer not like 
'ERROR:%')
-                               group by sql1
-                               order by 1 desc",$numsql);
-                       $ADODB_FETCH_MODE = $save;
-                       $this->conn->fnExecute = $saveE;
-                       
-                       if (!$rs) return "<p>$this->helpurl. 
".$this->conn->ErrorMsg()."</p>";
-                       $s = "<h3>Suspicious SQL</h3>
-<font size=1>The following SQL have high average execution times</font><br>
-<table border=1 bgcolor=white><tr><td><b>Avg 
Time</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
-                       $max = $this->maxLength;
-                       while (!$rs->EOF) {
-                               $sql = $rs->fields[1];
-                               $raw = urlencode($sql);
-                               if (strlen($raw)>$max-100) {
-                                       $sql2 = substr($sql,0,$max-500);
-                                       $raw = 
urlencode($sql2).'&part='.crc32($sql);
-                               }
-                               $prefix = "<a target=sql".rand()." 
href=\"?hidem=1&exps=1&sql=".$raw."&x#explain\">";
-                               $suffix = "</a>";
-                               if ($this->explain == false || 
strlen($prefix)>$max) {
-                                       $suffix = ' ... <i>String too long for 
GET parameter: '.strlen($prefix).'</i>';
-                                       $prefix = '';
-                               }
-                               $s .= 
"<tr><td>".adodb_round($rs->fields[0],6)."<td 
align=right>".$rs->fields[2]."<td><font 
size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
-                                       
"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
-                               $rs->MoveNext();
-                       }
-                       return $s."</table>";
-               
-       }
-       
-       function CheckMemory()
-       {
-               return '';
-       }
-       
-       
-       function SuspiciousSQL($numsql=10)
-       {
-               return adodb_perf::_SuspiciousSQL($numsql);
-       }
-
-       function ExpensiveSQL($numsql=10)
-       {
-               return adodb_perf::_ExpensiveSQL($numsql);
-       }
-
-       
-       /*
-               This reports the percentage of load on the instance due to the 
most 
-               expensive few SQL statements. Tuning these statements can often 
-               make huge improvements in overall system performance. 
-       */
-       function _ExpensiveSQL($numsql = 10)
-       {
-               global $HTTP_GET_VARS,$ADODB_FETCH_MODE;
-               
-            $perf_table = adodb_perf::table();
-                       $saveE = $this->conn->fnExecute;
-                       $this->conn->fnExecute = false;
-                       
-                       if (isset($HTTP_GET_VARS['expe']) && 
isset($HTTP_GET_VARS['sql'])) {
-                               $partial = !empty($HTTP_GET_VARS['part']);
-                               echo "<a 
name=explain></a>".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
-                       }
-                       
-                       if (isset($HTTP_GET_VARS['sql'])) return;
-                       
-                       $sql1 = $this->sql1;
-                       $save = $ADODB_FETCH_MODE;
-                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                       $rs =& $this->conn->SelectLimit(
-                       "select sum(timer) as total,$sql1,count(*),max(timer) 
as max_timer,min(timer) as min_timer
-                               from $perf_table
-                               where 
{$this->conn->upperCase}({$this->conn->substr}(sql0,1,5))  not in ('DROP 
','INSER','COMMI','CREAT')
-                               and (tracer is null or tracer not like 
'ERROR:%')
-                               group by sql1
-                               order by 1 desc",$numsql);
-                       
-                       $this->conn->fnExecute = $saveE;
-                       $ADODB_FETCH_MODE = $save;
-                       if (!$rs) return "<p>$this->helpurl. 
".$this->conn->ErrorMsg()."</p>";
-                       $s = "<h3>Expensive SQL</h3>
-<font size=1>Tuning the following SQL will reduce the server load 
substantially</font><br>
-<table border=1 
bgcolor=white><tr><td><b>Load</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
-                       $max = $this->maxLength;
-                       while (!$rs->EOF) {
-                               $sql = $rs->fields[1];
-                               $raw = urlencode($sql);
-                               if (strlen($raw)>$max-100) {
-                                       $sql2 = substr($sql,0,$max-500);
-                                       $raw = 
urlencode($sql2).'&part='.crc32($sql);
-                               }
-                               $prefix = "<a target=sqle".rand()." 
href=\"?hidem=1&expe=1&sql=".$raw."&x#explain\">";
-                               $suffix = "</a>";
-                               if($this->explain == false || 
strlen($prefix>$max)) {
-                                       $prefix = '';
-                                       $suffix = '';
-                               }
-                               $s .= 
"<tr><td>".adodb_round($rs->fields[0],6)."<td 
align=right>".$rs->fields[2]."<td><font 
size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
-                                       
"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
-                               $rs->MoveNext();
-                       }
-                       return $s."</table>";
-       }
-       
-       /*
-               Raw function to return parameter value from $settings.
-       */
-       function DBParameter($param)
-       {
-               if (empty($this->settings[$param])) return false;
-               $sql = $this->settings[$param][1];
-               return $this->_DBParameter($sql);
-       }
-       
-       /*
-               Raw function returning array of poll paramters
-       */
-       function &PollParameters()
-       {
-               $arr[0] = (float)$this->DBParameter('data cache hit ratio');
-               $arr[1] = (float)$this->DBParameter('data reads');
-               $arr[2] = (float)$this->DBParameter('data writes');
-               $arr[3] = (integer) $this->DBParameter('current connections');
-               return $arr;
-       }
-       
-       /*
-               Low-level Get Database Parameter
-       */
-       function _DBParameter($sql)
-       {
-               $savelog = $this->conn->LogSQL(false);
-               if (is_array($sql)) {
-               global $ADODB_FETCH_MODE;
-               
-                       $sql1 = $sql[0];
-                       $key = $sql[1];
-                       if (sizeof($sql)>2) $pos = $sql[2];
-                       else $pos = 1;
-                       if (sizeof($sql)>3) $coef = $sql[3];
-                       else $coef = false;
-                       $ret = false;
-                       $save = $ADODB_FETCH_MODE;
-                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                       $rs = $this->conn->Execute($sql1);
-                       $ADODB_FETCH_MODE = $save;
-                       if ($rs) {
-                               while (!$rs->EOF) {
-                                       $keyf = reset($rs->fields);
-                                       if (trim($keyf) == $key) {
-                                               $ret = $rs->fields[$pos];
-                                               if ($coef) $ret *= $coef;
-                                               break;
-                                       }
-                                       $rs->MoveNext();
-                               }
-                               $rs->Close();
-                       }
-                       $this->conn->LogSQL($savelog);
-                       return $ret;
-               } else {
-                       if (strncmp($sql,'=',1) == 0) {
-                               $fn = substr($sql,1);
-                               return $this->$fn();
-                       }
-                       $sql = 
str_replace('$DATABASE',$this->conn->database,$sql);
-                       $ret = $this->conn->GetOne($sql);
-                       $this->conn->LogSQL($savelog);
-                       
-                       return $ret;
-               }
-       }
-       
-       /*
-               Warn if cache ratio falls below threshold. Displayed in 
"Description" column.
-       */
-       function WarnCacheRatio($val)
-       {
-               if ($val < $this->warnRatio) 
-                        return '<font color=red><b>Cache ratio should be at 
least '.$this->warnRatio.'%</b></font>';
-               else return '';
-       }
-       
-       
/***********************************************************************************************/
-       //                                    HIGH LEVEL UI FUNCTIONS
-       
/***********************************************************************************************/
-
-       
-       function UI($pollsecs=5)
-       {
-       global $HTTP_GET_VARS,$HTTP_SERVER_VARS,$HTTP_POST_VARS;
-       
-    $perf_table = adodb_perf::table();
-       $conn = $this->conn;
-       
-       $app = $conn->host;
-       if ($conn->host && $conn->database) $app .= ', db=';
-       $app .= $conn->database;
-       
-       if ($app) $app .= ', ';
-       $savelog = $this->conn->LogSQL(false);  
-       $info = $conn->ServerInfo();
-       if (isset($HTTP_GET_VARS['clearsql'])) {
-               $this->conn->Execute("delete from $perf_table");
-       }
-       $this->conn->LogSQL($savelog);
-       
-       // magic quotes
-       
-       if (isset($HTTP_GET_VARS['sql']) && get_magic_quotes_gpc()) {
-               $_GET['sql'] = $HTTP_GET_VARS['sql'] = 
str_replace(array("\\'",'\"'),array("'",'"'),$HTTP_GET_VARS['sql']);
-       }
-       
-       if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = 
$_SESSION['ADODB_PERF_SQL'] = 10;
-       else  $nsql = $_SESSION['ADODB_PERF_SQL'];
-       
-       $app .= $info['description'];
-       
-       
-       if (isset($HTTP_GET_VARS['do'])) $do = $HTTP_GET_VARS['do'];
-       else if (isset($HTTP_POST_VARS['do'])) $do = $HTTP_POST_VARS['do'];
-        else if (isset($HTTP_GET_VARS['sql'])) $do = 'viewsql';
-        else $do = 'stats';
-        
-       if (isset($HTTP_GET_VARS['nsql'])) {
-               if ($HTTP_GET_VARS['nsql'] > 0) $nsql = 
$_SESSION['ADODB_PERF_SQL'] = (integer) $HTTP_GET_VARS['nsql'];
-       }
-       echo "<title>ADOdb Performance Monitor on $app</title><body 
bgcolor=white>";
-       if ($do == 'viewsql') $form = "<td><form># SQL:<input type=hidden 
value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input 
type=submit value=Go></td></form>";
-       else $form = "<td>&nbsp;</td>";
-       
-       $allowsql = !defined('ADODB_PERF_NO_RUN_SQL');
-       
-       if  (empty($HTTP_GET_VARS['hidem']))
-       echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
-       <b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance 
Monitor</b> <font size=1>for $app</font></tr><tr><td>
-       <a href=?do=stats><b>Performance Stats</b></a> &nbsp; <a 
href=?do=viewsql><b>View SQL</b></a>
-        &nbsp; <a href=?do=tables><b>View Tables</b></a> &nbsp; <a 
href=?do=poll><b>Poll Stats</b></a>",
-        $allowsql ? ' &nbsp; <a href=?do=dosql><b>Run SQL</b></a>' : '',
-        "$form",
-        "</tr></table>";
-
-        
-               switch ($do) {
-               default:
-               case 'stats':
-                       echo $this->HealthCheck();
-                       //$this->conn->debug=1;
-                       echo $this->CheckMemory();
-                       break;
-               case 'poll':
-                       echo "<iframe width=720 height=80% 
-                               
src=\"{$HTTP_SERVER_VARS['PHP_SELF']}?do=poll2&hidem=1\"></iframe>";
-                       break;
-               case 'poll2':
-                       echo "<pre>";
-                       $this->Poll($pollsecs);
-                       break;
-               
-               case 'dosql':
-                       if (!$allowsql) break;
-                       
-                       $this->DoSQLForm();
-                       break;
-               case 'viewsql':
-                       if (empty($HTTP_GET_VARS['hidem']))
-                               echo "&nbsp; <a 
href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";
-                       echo($this->SuspiciousSQL($nsql));
-                       echo($this->ExpensiveSQL($nsql));
-                       echo($this->InvalidSQL($nsql));
-                       break;
-               case 'tables': 
-                       echo $this->Tables(); break;
-               }
-               global $ADODB_vers;
-               echo "<p><div align=center><font size=1>$ADODB_vers Sponsored 
by <a href=http://phplens.com/>phpLens</a></font></div>";
-       }
-       
-       /*
-               Runs in infinite loop, returning real-time statistics
-       */
-       function Poll($secs=5)
-       {
-               $this->conn->fnExecute = false;
-               //$this->conn->debug=1;
-               if ($secs <= 1) $secs = 1;
-               echo "Accumulating statistics, every $secs 
seconds...\n";flush();
-               $arro =& $this->PollParameters();
-               $cnt = 0;
-               set_time_limit(0);
-               sleep($secs);
-               while (1) {
-
-                       $arr =& $this->PollParameters();
-                       
-                       $hits   = sprintf('%2.2f',$arr[0]);
-                       $reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
-                       $writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
-                       $sess = sprintf('%5d',$arr[3]);
-                       
-                       $load = $this->CPULoad();
-                       if ($load !== false) {
-                               $oslabel = 'WS-CPU%';
-                               $osval = sprintf(" %2.1f  ",(float) $load);
-                       }else {
-                               $oslabel = '';
-                               $osval = '';
-                       }
-                       if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   
Sess           Reads/s          Writes/s\n"; 
-                       $cnt += 1;
-                       echo date('H:i:s').'  '.$osval."$hits  $sess $reads 
$writes\n";
-                       flush();
-                       
-                       if (connection_aborted()|| connection_timeout()) return;
-                       
-                       sleep($secs);
-                       $arro = $arr;
-               }
-       }
-       
-       /*
-               Returns basic health check in a command line interface
-       */
-       function HealthCheckCLI()
-       {
-               return $this->HealthCheck(true);
-       }
-       
-               
-       /*
-               Returns basic health check as HTML
-       */
-       function HealthCheck($cli=false)
-       {
-               $saveE = $this->conn->fnExecute;
-               $this->conn->fnExecute = false; 
-               if ($cli) $html = '';
-               else $html = $this->table.'<tr><td 
colspan=3><h3>'.$this->conn->databaseType.'</h3></td></tr>'.$this->titles;
-               
-               $oldc = false;
-               $bgc = '';
-               foreach($this->settings as $name => $arr) {
-                       if ($arr === false) break;
-                       
-                       if (!is_string($name)) {
-                               if ($cli) $html .= " -- $arr -- \n";
-                               else $html .= "<tr bgcolor=$this->color><td 
colspan=3><i>$arr</i> &nbsp;</td></tr>";
-                               continue;
-                       }
-                       
-                       if (!is_array($arr)) break;
-                       $category = $arr[0];
-                       $how = $arr[1];
-                       if (sizeof($arr)>2) $desc = $arr[2];
-                       else $desc = ' &nbsp; ';
-                       
-                       
-                       if ($category == 'HIDE') continue;
-                       
-                       $val = $this->_DBParameter($how);
-                       
-                       if ($desc && strncmp($desc,"=",1) === 0) {
-                               $fn = substr($desc,1);
-                               $desc = $this->$fn($val);
-                       }
-                       
-                       if ($val === false) {
-                               $m = $this->conn->ErrorMsg();
-                               $val = "Error: $m"; 
-                       } else {
-                               if (is_numeric($val) && $val >= 256*1024) {
-                                       if ($val % (1024*1024) == 0) {
-                                               $val /= (1024*1024);
-                                               $val .= 'M';
-                                       } else if ($val % 1024 == 0) {
-                                               $val /= 1024;
-                                               $val .= 'K';
-                                       }
-                                       //$val = htmlspecialchars($val);
-                               }
-                       }
-                       if ($category != $oldc) {
-                               $oldc = $category;
-                               //$bgc = ($bgc == ' bgcolor='.$this->color) ? ' 
bgcolor=white' : ' bgcolor='.$this->color;
-                       }
-                       if (strlen($desc)==0) $desc = '&nbsp;';
-                       if (strlen($val)==0) $val = '&nbsp;';
-                       if ($cli) {
-                               $html  .= 
str_replace('&nbsp;','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
-                               
-                       }else {
-                               $html .= 
"<tr$bgc><td>".$name.'</td><td>'.$val.'</td><td>'.$desc."</td></tr>\n";
-                       }
-               }
-               
-               if (!$cli) $html .= "</table>\n";
-               $this->conn->fnExecute = $saveE;
-                       
-               return $html;   
-       }
-       
-       function Tables($orderby='1')
-       {
-               if (!$this->tablesSQL) return false;
-               
-               $savelog = $this->conn->LogSQL(false);
-               $rs = $this->conn->Execute($this->tablesSQL.' order by 
'.$orderby);
-               $this->conn->LogSQL($savelog);
-               $html = rs2html($rs,false,false,false,false);
-               return $html;
-       }
-       
-
-       function CreateLogTable()
-       {
-               if (!$this->createTableSQL) return false;
-               
-               $savelog = $this->conn->LogSQL(false);
-               $ok = $this->conn->Execute($this->createTableSQL);
-               $this->conn->LogSQL($savelog);
-               return ($ok) ? true : false;
-       }
-       
-       function DoSQLForm()
-       {
-       global 
$HTTP_SERVER_VARS,$HTTP_GET_VARS,$HTTP_POST_VARS,$HTTP_SESSION_VARS;
-       
-               $HTTP_VARS = array_merge($HTTP_GET_VARS,$HTTP_POST_VARS);
-               
-               $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
-               $sql = isset($HTTP_VARS['sql']) ? $HTTP_VARS['sql'] : '';
-
-               if (isset($HTTP_SESSION_VARS['phplens_sqlrows'])) $rows = 
$HTTP_SESSION_VARS['phplens_sqlrows'];
-               else $rows = 3;
-               
-               if (isset($HTTP_VARS['SMALLER'])) {
-                       $rows /= 2;
-                       if ($rows < 3) $rows = 3;
-                       $HTTP_SESSION_VARS['phplens_sqlrows'] = $rows;
-               }
-               if (isset($HTTP_VARS['BIGGER'])) {
-                       $rows *= 2;
-                       $HTTP_SESSION_VARS['phplens_sqlrows'] = $rows;
-               }
-               
-?>
-
-<form method="POST" action="<?php echo $PHP_SELF ?>">
-<table><tr>
-<td> Form size: <input type="submit" value=" &lt; " name="SMALLER"><input 
type="submit" value=" &gt; &gt; " name="BIGGER">
-</td>
-<td align=right>
-<input type="submit" value=" Run SQL Below " name="RUN"><input type=hidden 
name=do value=dosql>
-</td></tr>
-  <tr>
-  <td colspan=2><textarea rows=<?php print $rows; ?> name="sql" 
cols="80"><?php print htmlspecialchars($sql) ?></textarea>
-  </td>
-  </tr>
- </table>
-</form>
-
-<?php
-               if (!isset($HTTP_VARS['sql'])) return;
-               
-               $sql = $this->undomq(trim($sql));
-               if (substr($sql,strlen($sql)-1) === ';') {
-                       $print = true;
-                       $sqla = $this->SplitSQL($sql);
-               } else  {
-                       $print = false;
-                       $sqla = array($sql);
-               }
-               foreach($sqla as $sqls) {
-
-                       if (!$sqls) continue;
-                       
-                       if ($print) {
-                               print "<p>".htmlspecialchars($sqls)."</p>";
-                               flush();
-                       }
-                       $savelog = $this->conn->LogSQL(false);
-                       $rs = $this->conn->Execute($sqls);
-                       $this->conn->LogSQL($savelog);
-                       if ($rs && is_object($rs) && !$rs->EOF) {
-                               rs2html($rs);
-                               while ($rs->NextRecordSet()) {
-                                       print "<table width=98% 
bgcolor=#C0C0FF><tr><td>&nbsp;</td></tr></table>";
-                                       rs2html($rs);
-                               }
-                       } else {
-                               $e1 = (integer) $this->conn->ErrorNo();
-                               $e2 = $this->conn->ErrorMsg();
-                               if (($e1) || ($e2)) {
-                                       if (empty($e1)) $e1 = '-1'; // 
postgresql fix
-                                       print ' &nbsp; '.$e1.': '.$e2;
-                               } else {
-                                       print "<p>No Recordset 
returned<br></p>";
-                               }
-                       }
-               } // foreach
-       }
-       
-       function SplitSQL($sql)
-       {
-               $arr = explode(';',$sql);
-               return $arr;
-       }
-       
-       function undomq(&$m) 
-       {
-       if (get_magic_quotes_gpc()) {
-               // undo the damage
-               $m = str_replace('\\\\','\\',$m);
-               $m = str_replace('\"','"',$m);
-               $m = str_replace('\\\'','\'',$m);
-       }
-       return $m;
-}
-}
-
-
-
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Library for basic performance monitoring and tuning.
+  
+  My apologies if you see code mixed with presentation. The presentation suits
+  my needs. If you want to separate code from presentation, be my guest. 
Patches
+  are welcome.
+  
+*/
+
+if (!defined('ADODB_DIR')) include_once(dirname(__FILE__).'/adodb.inc.php');
+include_once(ADODB_DIR.'/tohtml.inc.php');
+
+define( 'ADODB_OPT_HIGH', 2);
+define( 'ADODB_OPT_LOW', 1);
+
+// returns in K the memory of current process, or 0 if not known
+function adodb_getmem()
+{
+       if (function_exists('memory_get_usage'))
+               return (integer) ((memory_get_usage()+512)/1024);
+       
+       $pid = getmypid();
+       
+       if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0) {
+               $output = array();
+       
+               exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output); 
+               return substr($output[5], strpos($output[5], ':') + 1);
+       } 
+       
+       /* Hopefully UNIX */
+       exec("ps --pid $pid --no-headers -o%mem,size", $output);
+       if (sizeof($output) == 0) return 0;
+       
+       $memarr = explode(' ',$output[0]);
+       if (sizeof($memarr)>=2) return (integer) $memarr[1];
+       
+       return 0;
+}
+
+// avoids localization problems where , is used instead of .
+function adodb_round($n,$prec)
+{
+       return number_format($n, $prec, '.', '');
+}
+
+/* return microtime value as a float */
+function adodb_microtime()
+{
+       $t = microtime();
+       $t = explode(' ',$t);
+       return (float)$t[1]+ (float)$t[0];
+}
+
+/* sql code timing */
+function& adodb_log_sql(&$conn,$sql,$inputarr)
+{
+       
+    $perf_table = adodb_perf::table();
+       $conn->fnExecute = false;
+       $t0 = microtime();
+       $rs =& $conn->Execute($sql,$inputarr);
+       $t1 = microtime();
+
+       if (!empty($conn->_logsql)) {
+               $conn->_logsql = false; // disable logsql error simulation
+               $dbT = $conn->databaseType;
+               
+               $a0 = split(' ',$t0);
+               $a0 = (float)$a0[1]+(float)$a0[0];
+               
+               $a1 = split(' ',$t1);
+               $a1 = (float)$a1[1]+(float)$a1[0];
+               
+               $time = $a1 - $a0;
+       
+               if (!$rs) {
+                       $errM = $conn->ErrorMsg();
+                       $errN = $conn->ErrorNo();
+                       $conn->lastInsID = 0;
+                       $tracer = substr('ERROR: 
'.htmlspecialchars($errM),0,250);
+               } else {
+                       $tracer = '';
+                       $errM = '';
+                       $errN = 0;
+                       $dbg = $conn->debug;
+                       $conn->debug = false;
+                       if (!is_object($rs) || $rs->dataProvider == 'empty') 
+                               $conn->_affected = $conn->affected_rows(true);
+                       $conn->lastInsID = @$conn->Insert_ID();
+                       $conn->debug = $dbg;
+               }
+               if (isset($_SERVER['HTTP_HOST'])) {
+                       $tracer .= '<br>'.$_SERVER['HTTP_HOST'];
+                       if (isset($_SERVER['PHP_SELF'])) $tracer .= 
$_SERVER['PHP_SELF'];
+               } else 
+                       if (isset($_SERVER['PHP_SELF'])) $tracer .= 
'<br>'.$_SERVER['PHP_SELF'];
+               //$tracer .= (string) adodb_backtrace(false);
+               
+               $tracer = (string) substr($tracer,0,500);
+               
+               if (is_array($inputarr)) {
+                       if (is_array(reset($inputarr))) $params = 'Array 
sizeof='.sizeof($inputarr);
+                       else {
+                               // Quote string parameters so we can see them 
in the
+                               // performance stats. This helps spot disabled 
indexes.
+                               $xar_params = $inputarr;
+                               foreach ($xar_params as $xar_param_key => 
$xar_param) {
+                                       if (gettype($xar_param) == 'string')
+                                       $xar_params[$xar_param_key] = '"' . 
$xar_param . '"';
+                               }
+                               $params = implode(', ', $xar_params);
+                               if (strlen($params) >= 3000) $params = 
substr($params, 0, 3000);
+                       }
+               } else {
+                       $params = '';
+               }
+               
+               if (is_array($sql)) $sql = $sql[0];
+               $arr = array('b'=>strlen($sql).'.'.crc32($sql),
+                                       'c'=>substr($sql,0,3900), 
'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6));
+               //var_dump($arr);
+               $saved = $conn->debug;
+               $conn->debug = 0;
+               
+               $d = $conn->sysTimeStamp;
+               if (empty($d)) $d = date("'Y-m-d H:i:s'");
+               if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
+                       $isql = "insert into $perf_table 
values($d,:b,:c,:d,:e,:f)";
+               } else if ($dbT == 'odbc_mssql' || $dbT == 'informix' || $dbT 
== 'odbtp') {
+                       $timer = $arr['f'];
+                       if ($dbT == 'informix') $sql2 = substr($sql2,0,230);
+
+                       $sql1 = $conn->qstr($arr['b']);
+                       $sql2 = $conn->qstr($arr['c']);
+                       $params = $conn->qstr($arr['d']);
+                       $tracer = $conn->qstr($arr['e']);
+                       
+                       $isql = "insert into $perf_table 
(created,sql0,sql1,params,tracer,timer) 
values($d,$sql1,$sql2,$params,$tracer,$timer)";
+                       if ($dbT == 'informix') $isql = str_replace(chr(10),' 
',$isql);
+                       $arr = false;
+               } else {
+                       $isql = "insert into $perf_table 
(created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)";
+               }
+
+               $ok = $conn->Execute($isql,$arr);
+               $conn->debug = $saved;
+               
+               if ($ok) {
+                       $conn->_logsql = true; 
+               } else {
+                       $err2 = $conn->ErrorMsg();
+                       $conn->_logsql = true; // enable logsql error simulation
+                       $perf =& NewPerfMonitor($conn);
+                       if ($perf) {
+                               if ($perf->CreateLogTable()) $ok = 
$conn->Execute($isql,$arr);
+                       } else {
+                               $ok = $conn->Execute("create table $perf_table (
+                               created varchar(50),
+                               sql0 varchar(250), 
+                               sql1 varchar(4000),
+                               params varchar(3000),
+                               tracer varchar(500),
+                               timer decimal(16,6))");
+                       }
+                       if (!$ok) {
+                               ADOConnection::outp( "<p><b>LOGSQL Insert 
Failed</b>: $isql<br>$err2</p>");
+                               $conn->_logsql = false;
+                       }
+               }
+               $conn->_errorMsg = $errM;
+               $conn->_errorCode = $errN;
+       } 
+       $conn->fnExecute = 'adodb_log_sql';
+       return $rs;
+}
+
+       
+/*
+The settings data structure is an associative array that database parameter 
per element.
+
+Each database parameter element in the array is itself an array consisting of:
+
+0: category code, used to group related db parameters
+1: either
+       a. sql string to retrieve value, eg. "select value from v\$parameter 
where name='db_block_size'", 
+       b. array holding sql string and field to look for, e.g. array('show 
variables','table_cache'),
+       c. a string prefixed by =, then a PHP method of the class is invoked, 
+               e.g. to invoke $this->GetIndexValue(), set this array element 
to '=GetIndexValue',
+2: description of the database parameter
+*/
+
+class adodb_perf {
+       var $conn;
+       var $color = '#F0F0F0';
+       var $table = '<table border=1 bgcolor=white>';
+       var $titles = 
'<tr><td><b>Parameter</b></td><td><b>Value</b></td><td><b>Description</b></td></tr>';
+       var $warnRatio = 90;
+       var $tablesSQL = false;
+       var $cliFormat = "%32s => %s \r\n";
+       var $sql1 = 'sql1';  // used for casting sql1 to text for mssql
+       var $explain = true;
+       var $helpurl = "<a 
href=http://phplens.com/adodb/reference.functions.fnexecute.and.fncacheexecute.properties.html#logsql>LogSQL
 help</a>";
+       var $createTableSQL = false;
+       var $maxLength = 2000;
+       
+    // Sets the tablename to be used            
+    function table($newtable = false)
+    {
+        static $_table;
+
+        if (!empty($newtable))  $_table = $newtable;
+               if (empty($_table)) $_table = 'adodb_logsql';
+        return $_table;
+    }
+
+       // returns array with info to calculate CPU Load
+       function _CPULoad()
+       {
+/*
+
+cpu  524152 2662 2515228 336057010
+cpu0 264339 1408 1257951 168025827
+cpu1 259813 1254 1257277 168031181
+page 622307 25475680
+swap 24 1891
+intr 890153570 868093576 6 0 4 4 0 6 1 2 0 0 0 124 0 8098760 2 13961053 0 0 0 
0 0 0 0 0 0 0 0 0 0 16 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
0 0 0 0 0
+disk_io: (3,0):(3144904,54369,610378,3090535,50936192) 
(3,1):(3630212,54097,633016,3576115,50951320)
+ctxt 66155838
+btime 1062315585
+processes 69293
+
+*/
+               // Algorithm is taken from
+               // 
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp
+               if (strncmp(PHP_OS,'WIN',3)==0) {
+                       if (PHP_VERSION == '5.0.0') return false;
+                       if (PHP_VERSION == '5.0.1') return false;
+                       if (PHP_VERSION == '5.0.2') return false;
+                       if (PHP_VERSION == '5.0.3') return false;
+                       if (PHP_VERSION == '4.3.10') return false; # see 
http://bugs.php.net/bug.php?id=31737
+                       
+                       @$c = new 
COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'");
+                       if (!$c) return false;
+                       
+                       $info[0] = $c->PercentProcessorTime;
+                       $info[1] = 0;
+                       $info[2] = 0;
+                       $info[3] = $c->TimeStamp_Sys100NS;
+                       //print_r($info);
+                       return $info;
+               }
+               
+               // Algorithm - Steve Blinch (BlitzAffe Online, 
http://www.blitzaffe.com)
+               $statfile = '/proc/stat';
+               if (!file_exists($statfile)) return false;
+               
+               $fd = fopen($statfile,"r");
+               if (!$fd) return false;
+               
+               $statinfo = explode("\n",fgets($fd, 1024));
+               fclose($fd);
+               foreach($statinfo as $line) {
+                       $info = explode(" ",$line);
+                       if($info[0]=="cpu") {
+                               array_shift($info);  // pop off "cpu"
+                               if(!$info[0]) array_shift($info); // pop off 
blank space (if any)
+                               return $info;
+                       }
+               }
+               
+               return false;
+               
+       }
+       
+       /* NOT IMPLEMENTED */
+       function MemInfo()
+       {
+               /*
+
+        total:    used:    free:  shared: buffers:  cached:
+Mem:  1055289344 917299200 137990144        0 165437440 599773184
+Swap: 2146775040 11055104 2135719936
+MemTotal:      1030556 kB
+MemFree:        134756 kB
+MemShared:           0 kB
+Buffers:        161560 kB
+Cached:         581384 kB
+SwapCached:       4332 kB
+Active:         494468 kB
+Inact_dirty:    322856 kB
+Inact_clean:     24256 kB
+Inact_target:   168316 kB
+HighTotal:      131064 kB
+HighFree:         1024 kB
+LowTotal:       899492 kB
+LowFree:        133732 kB
+SwapTotal:     2096460 kB
+SwapFree:      2085664 kB
+Committed_AS:   348732 kB
+               */
+       }
+       
+       
+       /*
+               Remember that this is client load, not db server load!
+       */
+       var $_lastLoad;
+       function CPULoad()
+       {
+               $info = $this->_CPULoad();
+               if (!$info) return false;
+                       
+               if (empty($this->_lastLoad)) {
+                       sleep(1);
+                       $this->_lastLoad = $info;
+                       $info = $this->_CPULoad();
+               }
+               
+               $last = $this->_lastLoad;
+               $this->_lastLoad = $info;
+               
+               $d_user = $info[0] - $last[0];
+               $d_nice = $info[1] - $last[1];
+               $d_system = $info[2] - $last[2];
+               $d_idle = $info[3] - $last[3];
+               
+               //printf("Delta - User: %f  Nice: %f  System: %f  Idle: 
%f<br>",$d_user,$d_nice,$d_system,$d_idle);
+
+               if (strncmp(PHP_OS,'WIN',3)==0) {
+                       if ($d_idle < 1) $d_idle = 1;
+                       return 100*(1-$d_user/$d_idle);
+               }else {
+                       $total=$d_user+$d_nice+$d_system+$d_idle;
+                       if ($total<1) $total=1;
+                       return 100*($d_user+$d_nice+$d_system)/$total; 
+               }
+       }
+       
+       function Tracer($sql)
+       {
+        $perf_table = adodb_perf::table();
+               $saveE = $this->conn->fnExecute;
+               $this->conn->fnExecute = false;
+               
+               global $ADODB_FETCH_MODE;
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->conn->fetchMode !== false) $savem = 
$this->conn->SetFetchMode(false);
+                               
+               $sqlq = $this->conn->qstr($sql);
+               $arr = $this->conn->GetArray(
+"select count(*),tracer 
+       from $perf_table where sql1=$sqlq 
+       group by tracer
+       order by 1 desc");
+               $s = '';
+               if ($arr) {
+                       $s .= '<h3>Scripts Affected</h3>';
+                       foreach($arr as $k) {
+                               $s .= sprintf("%4d",$k[0]).' &nbsp; 
'.strip_tags($k[1]).'<br>';
+                       }
+               }
+               
+               if (isset($savem)) $this->conn->SetFetchMode($savem);
+               $ADODB_CACHE_MODE = $save;
+               $this->conn->fnExecute = $saveE;
+               return $s;
+       }
+
+       /* 
+               Explain Plan for $sql.
+               If only a snippet of the $sql is passed in, then $partial will 
hold the crc32 of the 
+                       actual sql.
+       */
+       function Explain($sql,$partial=false)
+       {       
+               return false;
+       }
+       
+       function InvalidSQL($numsql = 10)
+       {
+       
+               if (isset($_GET['sql'])) return;
+               $s = '<h3>Invalid SQL</h3>';
+               $saveE = $this->conn->fnExecute;
+               $this->conn->fnExecute = false;
+        $perf_table = adodb_perf::table();
+               $rs =& $this->conn->SelectLimit("select distinct 
count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' 
group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
+               $this->conn->fnExecute = $saveE;
+               if ($rs) {
+                       $s .= rs2html($rs,false,false,false,false);
+               } else
+                       return "<p>$this->helpurl. 
".$this->conn->ErrorMsg()."</p>";
+               
+               return $s;
+       }
+
+       
+       /*
+               This script identifies the longest running SQL
+       */      
+       function _SuspiciousSQL($numsql = 10)
+       {
+               global $ADODB_FETCH_MODE;
+               
+            $perf_table = adodb_perf::table();
+                       $saveE = $this->conn->fnExecute;
+                       $this->conn->fnExecute = false;
+                       
+                       if (isset($_GET['exps']) && isset($_GET['sql'])) {
+                               $partial = !empty($_GET['part']);
+                               echo "<a 
name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
+                       }
+                       
+                       if (isset($_GET['sql'])) return;
+                       $sql1 = $this->sql1;
+                       
+                       $save = $ADODB_FETCH_MODE;
+                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+                       if ($this->conn->fetchMode !== false) $savem = 
$this->conn->SetFetchMode(false);
+                       //$this->conn->debug=1;
+                       $rs =& $this->conn->SelectLimit(
+                       "select avg(timer) as 
avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
+                               from $perf_table
+                               where 
{$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP 
','INSER','COMMI','CREAT')
+                               and (tracer is null or tracer not like 
'ERROR:%')
+                               group by sql1
+                               order by 1 desc",$numsql);
+                       if (isset($savem)) $this->conn->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+                       $this->conn->fnExecute = $saveE;
+                       
+                       if (!$rs) return "<p>$this->helpurl. 
".$this->conn->ErrorMsg()."</p>";
+                       $s = "<h3>Suspicious SQL</h3>
+<font size=1>The following SQL have high average execution times</font><br>
+<table border=1 bgcolor=white><tr><td><b>Avg 
Time</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
+                       $max = $this->maxLength;
+                       while (!$rs->EOF) {
+                               $sql = $rs->fields[1];
+                               $raw = urlencode($sql);
+                               if (strlen($raw)>$max-100) {
+                                       $sql2 = substr($sql,0,$max-500);
+                                       $raw = 
urlencode($sql2).'&part='.crc32($sql);
+                               }
+                               $prefix = "<a target=sql".rand()." 
href=\"?hidem=1&exps=1&sql=".$raw."&x#explain\">";
+                               $suffix = "</a>";
+                               if ($this->explain == false || 
strlen($prefix)>$max) {
+                                       $suffix = ' ... <i>String too long for 
GET parameter: '.strlen($prefix).'</i>';
+                                       $prefix = '';
+                               }
+                               $s .= 
"<tr><td>".adodb_round($rs->fields[0],6)."<td 
align=right>".$rs->fields[2]."<td><font 
size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
+                                       
"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
+                               $rs->MoveNext();
+                       }
+                       return $s."</table>";
+               
+       }
+       
+       function CheckMemory()
+       {
+               return '';
+       }
+       
+       
+       function SuspiciousSQL($numsql=10)
+       {
+               return adodb_perf::_SuspiciousSQL($numsql);
+       }
+
+       function ExpensiveSQL($numsql=10)
+       {
+               return adodb_perf::_ExpensiveSQL($numsql);
+       }
+
+       
+       /*
+               This reports the percentage of load on the instance due to the 
most 
+               expensive few SQL statements. Tuning these statements can often 
+               make huge improvements in overall system performance. 
+       */
+       function _ExpensiveSQL($numsql = 10)
+       {
+               global $ADODB_FETCH_MODE;
+               
+            $perf_table = adodb_perf::table();
+                       $saveE = $this->conn->fnExecute;
+                       $this->conn->fnExecute = false;
+                       
+                       if (isset($_GET['expe']) && isset($_GET['sql'])) {
+                               $partial = !empty($_GET['part']);
+                               echo "<a 
name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
+                       }
+                       
+                       if (isset($_GET['sql'])) return;
+                       
+                       $sql1 = $this->sql1;
+                       $save = $ADODB_FETCH_MODE;
+                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+                       if ($this->conn->fetchMode !== false) $savem = 
$this->conn->SetFetchMode(false);
+                       
+                       $rs =& $this->conn->SelectLimit(
+                       "select sum(timer) as total,$sql1,count(*),max(timer) 
as max_timer,min(timer) as min_timer
+                               from $perf_table
+                               where 
{$this->conn->upperCase}({$this->conn->substr}(sql0,1,5))  not in ('DROP 
','INSER','COMMI','CREAT')
+                               and (tracer is null or tracer not like 
'ERROR:%')
+                               group by sql1
+                               having count(*)>1
+                               order by 1 desc",$numsql);
+                       if (isset($savem)) $this->conn->SetFetchMode($savem);
+                       $this->conn->fnExecute = $saveE;
+                       $ADODB_FETCH_MODE = $save;
+                       if (!$rs) return "<p>$this->helpurl. 
".$this->conn->ErrorMsg()."</p>";
+                       $s = "<h3>Expensive SQL</h3>
+<font size=1>Tuning the following SQL could reduce the server load 
substantially</font><br>
+<table border=1 
bgcolor=white><tr><td><b>Load</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
+                       $max = $this->maxLength;
+                       while (!$rs->EOF) {
+                               $sql = $rs->fields[1];
+                               $raw = urlencode($sql);
+                               if (strlen($raw)>$max-100) {
+                                       $sql2 = substr($sql,0,$max-500);
+                                       $raw = 
urlencode($sql2).'&part='.crc32($sql);
+                               }
+                               $prefix = "<a target=sqle".rand()." 
href=\"?hidem=1&expe=1&sql=".$raw."&x#explain\">";
+                               $suffix = "</a>";
+                               if($this->explain == false || 
strlen($prefix>$max)) {
+                                       $prefix = '';
+                                       $suffix = '';
+                               }
+                               $s .= 
"<tr><td>".adodb_round($rs->fields[0],6)."<td 
align=right>".$rs->fields[2]."<td><font 
size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
+                                       
"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
+                               $rs->MoveNext();
+                       }
+                       return $s."</table>";
+       }
+       
+       /*
+               Raw function to return parameter value from $settings.
+       */
+       function DBParameter($param)
+       {
+               if (empty($this->settings[$param])) return false;
+               $sql = $this->settings[$param][1];
+               return $this->_DBParameter($sql);
+       }
+       
+       /*
+               Raw function returning array of poll paramters
+       */
+       function &PollParameters()
+       {
+               $arr[0] = (float)$this->DBParameter('data cache hit ratio');
+               $arr[1] = (float)$this->DBParameter('data reads');
+               $arr[2] = (float)$this->DBParameter('data writes');
+               $arr[3] = (integer) $this->DBParameter('current connections');
+               return $arr;
+       }
+       
+       /*
+               Low-level Get Database Parameter
+       */
+       function _DBParameter($sql)
+       {
+               $savelog = $this->conn->LogSQL(false);
+               if (is_array($sql)) {
+               global $ADODB_FETCH_MODE;
+               
+                       $sql1 = $sql[0];
+                       $key = $sql[1];
+                       if (sizeof($sql)>2) $pos = $sql[2];
+                       else $pos = 1;
+                       if (sizeof($sql)>3) $coef = $sql[3];
+                       else $coef = false;
+                       $ret = false;
+                       $save = $ADODB_FETCH_MODE;
+                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+                       if ($this->conn->fetchMode !== false) $savem = 
$this->conn->SetFetchMode(false);
+                       
+                       $rs = $this->conn->Execute($sql1);
+                       
+                       if (isset($savem)) $this->conn->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+                       if ($rs) {
+                               while (!$rs->EOF) {
+                                       $keyf = reset($rs->fields);
+                                       if (trim($keyf) == $key) {
+                                               $ret = $rs->fields[$pos];
+                                               if ($coef) $ret *= $coef;
+                                               break;
+                                       }
+                                       $rs->MoveNext();
+                               }
+                               $rs->Close();
+                       }
+                       $this->conn->LogSQL($savelog);
+                       return $ret;
+               } else {
+                       if (strncmp($sql,'=',1) == 0) {
+                               $fn = substr($sql,1);
+                               return $this->$fn();
+                       }
+                       $sql = 
str_replace('$DATABASE',$this->conn->database,$sql);
+                       $ret = $this->conn->GetOne($sql);
+                       $this->conn->LogSQL($savelog);
+                       
+                       return $ret;
+               }
+       }
+       
+       /*
+               Warn if cache ratio falls below threshold. Displayed in 
"Description" column.
+       */
+       function WarnCacheRatio($val)
+       {
+               if ($val < $this->warnRatio) 
+                        return '<font color=red><b>Cache ratio should be at 
least '.$this->warnRatio.'%</b></font>';
+               else return '';
+       }
+       
+       
/***********************************************************************************************/
+       //                                    HIGH LEVEL UI FUNCTIONS
+       
/***********************************************************************************************/
+
+       
+       function UI($pollsecs=5)
+       {
+       
+    $perf_table = adodb_perf::table();
+       $conn = $this->conn;
+       
+       $app = $conn->host;
+       if ($conn->host && $conn->database) $app .= ', db=';
+       $app .= $conn->database;
+       
+       if ($app) $app .= ', ';
+       $savelog = $this->conn->LogSQL(false);  
+       $info = $conn->ServerInfo();
+       if (isset($_GET['clearsql'])) {
+               $this->conn->Execute("delete from $perf_table");
+       }
+       $this->conn->LogSQL($savelog);
+       
+       // magic quotes
+       
+       if (isset($_GET['sql']) && get_magic_quotes_gpc()) {
+               $_GET['sql'] = $_GET['sql'] = 
str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']);
+       }
+       
+       if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = 
$_SESSION['ADODB_PERF_SQL'] = 10;
+       else  $nsql = $_SESSION['ADODB_PERF_SQL'];
+       
+       $app .= $info['description'];
+       
+       
+       if (isset($_GET['do'])) $do = $_GET['do'];
+       else if (isset($_POST['do'])) $do = $_POST['do'];
+        else if (isset($_GET['sql'])) $do = 'viewsql';
+        else $do = 'stats';
+        
+       if (isset($_GET['nsql'])) {
+               if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = 
(integer) $_GET['nsql'];
+       }
+       echo "<title>ADOdb Performance Monitor on $app</title><body 
bgcolor=white>";
+       if ($do == 'viewsql') $form = "<td><form># SQL:<input type=hidden 
value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input 
type=submit value=Go></td></form>";
+       else $form = "<td>&nbsp;</td>";
+       
+       $allowsql = !defined('ADODB_PERF_NO_RUN_SQL');
+       
+       if  (empty($_GET['hidem']))
+       echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
+       <b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance 
Monitor</b> <font size=1>for $app</font></tr><tr><td>
+       <a href=?do=stats><b>Performance Stats</b></a> &nbsp; <a 
href=?do=viewsql><b>View SQL</b></a>
+        &nbsp; <a href=?do=tables><b>View Tables</b></a> &nbsp; <a 
href=?do=poll><b>Poll Stats</b></a>",
+        $allowsql ? ' &nbsp; <a href=?do=dosql><b>Run SQL</b></a>' : '',
+        "$form",
+        "</tr></table>";
+
+        
+               switch ($do) {
+               default:
+               case 'stats':
+                       echo $this->HealthCheck();
+                       //$this->conn->debug=1;
+                       echo $this->CheckMemory();
+                       break;
+               case 'poll':
+                       echo "<iframe width=720 height=80% 
+                               
src=\"{$_SERVER['PHP_SELF']}?do=poll2&hidem=1\"></iframe>";
+                       break;
+               case 'poll2':
+                       echo "<pre>";
+                       $this->Poll($pollsecs);
+                       break;
+               
+               case 'dosql':
+                       if (!$allowsql) break;
+                       
+                       $this->DoSQLForm();
+                       break;
+               case 'viewsql':
+                       if (empty($_GET['hidem']))
+                               echo "&nbsp; <a 
href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";
+                       echo($this->SuspiciousSQL($nsql));
+                       echo($this->ExpensiveSQL($nsql));
+                       echo($this->InvalidSQL($nsql));
+                       break;
+               case 'tables': 
+                       echo $this->Tables(); break;
+               }
+               global $ADODB_vers;
+               echo "<p><div align=center><font size=1>$ADODB_vers Sponsored 
by <a href=http://phplens.com/>phpLens</a></font></div>";
+       }
+       
+       /*
+               Runs in infinite loop, returning real-time statistics
+       */
+       function Poll($secs=5)
+       {
+               $this->conn->fnExecute = false;
+               //$this->conn->debug=1;
+               if ($secs <= 1) $secs = 1;
+               echo "Accumulating statistics, every $secs 
seconds...\n";flush();
+               $arro =& $this->PollParameters();
+               $cnt = 0;
+               set_time_limit(0);
+               sleep($secs);
+               while (1) {
+
+                       $arr =& $this->PollParameters();
+                       
+                       $hits   = sprintf('%2.2f',$arr[0]);
+                       $reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
+                       $writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
+                       $sess = sprintf('%5d',$arr[3]);
+                       
+                       $load = $this->CPULoad();
+                       if ($load !== false) {
+                               $oslabel = 'WS-CPU%';
+                               $osval = sprintf(" %2.1f  ",(float) $load);
+                       }else {
+                               $oslabel = '';
+                               $osval = '';
+                       }
+                       if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   
Sess           Reads/s          Writes/s\n"; 
+                       $cnt += 1;
+                       echo date('H:i:s').'  '.$osval."$hits  $sess $reads 
$writes\n";
+                       flush();
+                       
+                       if (connection_aborted()) return;
+                       
+                       sleep($secs);
+                       $arro = $arr;
+               }
+       }
+       
+       /*
+               Returns basic health check in a command line interface
+       */
+       function HealthCheckCLI()
+       {
+               return $this->HealthCheck(true);
+       }
+       
+               
+       /*
+               Returns basic health check as HTML
+       */
+       function HealthCheck($cli=false)
+       {
+               $saveE = $this->conn->fnExecute;
+               $this->conn->fnExecute = false; 
+               if ($cli) $html = '';
+               else $html = $this->table.'<tr><td 
colspan=3><h3>'.$this->conn->databaseType.'</h3></td></tr>'.$this->titles;
+               
+               $oldc = false;
+               $bgc = '';
+               foreach($this->settings as $name => $arr) {
+                       if ($arr === false) break;
+                       
+                       if (!is_string($name)) {
+                               if ($cli) $html .= " -- $arr -- \n";
+                               else $html .= "<tr bgcolor=$this->color><td 
colspan=3><i>$arr</i> &nbsp;</td></tr>";
+                               continue;
+                       }
+                       
+                       if (!is_array($arr)) break;
+                       $category = $arr[0];
+                       $how = $arr[1];
+                       if (sizeof($arr)>2) $desc = $arr[2];
+                       else $desc = ' &nbsp; ';
+                       
+                       
+                       if ($category == 'HIDE') continue;
+                       
+                       $val = $this->_DBParameter($how);
+                       
+                       if ($desc && strncmp($desc,"=",1) === 0) {
+                               $fn = substr($desc,1);
+                               $desc = $this->$fn($val);
+                       }
+                       
+                       if ($val === false) {
+                               $m = $this->conn->ErrorMsg();
+                               $val = "Error: $m"; 
+                       } else {
+                               if (is_numeric($val) && $val >= 256*1024) {
+                                       if ($val % (1024*1024) == 0) {
+                                               $val /= (1024*1024);
+                                               $val .= 'M';
+                                       } else if ($val % 1024 == 0) {
+                                               $val /= 1024;
+                                               $val .= 'K';
+                                       }
+                                       //$val = htmlspecialchars($val);
+                               }
+                       }
+                       if ($category != $oldc) {
+                               $oldc = $category;
+                               //$bgc = ($bgc == ' bgcolor='.$this->color) ? ' 
bgcolor=white' : ' bgcolor='.$this->color;
+                       }
+                       if (strlen($desc)==0) $desc = '&nbsp;';
+                       if (strlen($val)==0) $val = '&nbsp;';
+                       if ($cli) {
+                               $html  .= 
str_replace('&nbsp;','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
+                               
+                       }else {
+                               $html .= 
"<tr$bgc><td>".$name.'</td><td>'.$val.'</td><td>'.$desc."</td></tr>\n";
+                       }
+               }
+               
+               if (!$cli) $html .= "</table>\n";
+               $this->conn->fnExecute = $saveE;
+                       
+               return $html;   
+       }
+       
+       function Tables($orderby='1')
+       {
+               if (!$this->tablesSQL) return false;
+               
+               $savelog = $this->conn->LogSQL(false);
+               $rs = $this->conn->Execute($this->tablesSQL.' order by 
'.$orderby);
+               $this->conn->LogSQL($savelog);
+               $html = rs2html($rs,false,false,false,false);
+               return $html;
+       }
+       
+
+       function CreateLogTable()
+       {
+               if (!$this->createTableSQL) return false;
+               
+               $savelog = $this->conn->LogSQL(false);
+               $ok = $this->conn->Execute($this->createTableSQL);
+               $this->conn->LogSQL($savelog);
+               return ($ok) ? true : false;
+       }
+       
+       function DoSQLForm()
+       {
+       
+               
+               $PHP_SELF = $_SERVER['PHP_SELF'];
+               $sql = isset($_REQUEST['sql']) ? $_REQUEST['sql'] : '';
+
+               if (isset($_SESSION['phplens_sqlrows'])) $rows = 
$_SESSION['phplens_sqlrows'];
+               else $rows = 3;
+               
+               if (isset($_REQUEST['SMALLER'])) {
+                       $rows /= 2;
+                       if ($rows < 3) $rows = 3;
+                       $_SESSION['phplens_sqlrows'] = $rows;
+               }
+               if (isset($_REQUEST['BIGGER'])) {
+                       $rows *= 2;
+                       $_SESSION['phplens_sqlrows'] = $rows;
+               }
+               
+?>
+
+<form method="POST" action="<?php echo $PHP_SELF ?>">
+<table><tr>
+<td> Form size: <input type="submit" value=" &lt; " name="SMALLER"><input 
type="submit" value=" &gt; &gt; " name="BIGGER">
+</td>
+<td align=right>
+<input type="submit" value=" Run SQL Below " name="RUN"><input type=hidden 
name=do value=dosql>
+</td></tr>
+  <tr>
+  <td colspan=2><textarea rows=<?php print $rows; ?> name="sql" 
cols="80"><?php print htmlspecialchars($sql) ?></textarea>
+  </td>
+  </tr>
+ </table>
+</form>
+
+<?php
+               if (!isset($_REQUEST['sql'])) return;
+               
+               $sql = $this->undomq(trim($sql));
+               if (substr($sql,strlen($sql)-1) === ';') {
+                       $print = true;
+                       $sqla = $this->SplitSQL($sql);
+               } else  {
+                       $print = false;
+                       $sqla = array($sql);
+               }
+               foreach($sqla as $sqls) {
+
+                       if (!$sqls) continue;
+                       
+                       if ($print) {
+                               print "<p>".htmlspecialchars($sqls)."</p>";
+                               flush();
+                       }
+                       $savelog = $this->conn->LogSQL(false);
+                       $rs = $this->conn->Execute($sqls);
+                       $this->conn->LogSQL($savelog);
+                       if ($rs && is_object($rs) && !$rs->EOF) {
+                               rs2html($rs);
+                               while ($rs->NextRecordSet()) {
+                                       print "<table width=98% 
bgcolor=#C0C0FF><tr><td>&nbsp;</td></tr></table>";
+                                       rs2html($rs);
+                               }
+                       } else {
+                               $e1 = (integer) $this->conn->ErrorNo();
+                               $e2 = $this->conn->ErrorMsg();
+                               if (($e1) || ($e2)) {
+                                       if (empty($e1)) $e1 = '-1'; // 
postgresql fix
+                                       print ' &nbsp; '.$e1.': '.$e2;
+                               } else {
+                                       print "<p>No Recordset 
returned<br></p>";
+                               }
+                       }
+               } // foreach
+       }
+       
+       function SplitSQL($sql)
+       {
+               $arr = explode(';',$sql);
+               return $arr;
+       }
+       
+       function undomq($m) 
+       {
+       if (get_magic_quotes_gpc()) {
+               // undo the damage
+               $m = str_replace('\\\\','\\',$m);
+               $m = str_replace('\"','"',$m);
+               $m = str_replace('\\\'','\'',$m);
+       }
+       return $m;
+}
+
+    
+   /************************************************************************/
+   
+    /** 
+     * Reorganise multiple table-indices/statistics/..
+     * OptimizeMode could be given by last Parameter
+     * 
+     * @example
+     *      <pre>
+     *          optimizeTables( 'tableA');
+     *      </pre>
+     *      <pre>
+     *          optimizeTables( 'tableA', 'tableB', 'tableC');
+     *      </pre>
+     *      <pre>
+     *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
+     *      </pre>
+     * 
+     * @param string table name of the table to optimize
+     * @param int mode optimization-mode
+     *      <code>ADODB_OPT_HIGH</code> for full optimization 
+     *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
+     *      Default is LOW <code>ADODB_OPT_LOW</code> 
+     * @author Markus Staab
+     * @return Returns <code>true</code> on success and <code>false</code> on 
error
+     */
+    function OptimizeTables()
+    {
+        $args = func_get_args();
+        $numArgs = func_num_args();
+        
+        if ( $numArgs == 0) return false;
+        
+        $mode = ADODB_OPT_LOW; 
+        $lastArg = $args[ $numArgs - 1];
+        if ( !is_string($lastArg)) {
+            $mode = $lastArg;
+            unset( $args[ $numArgs - 1]);
+        }
+        
+        foreach( $args as $table) {
+            $this->optimizeTable( $table, $mode);
+        }
+       }
+
+    /** 
+     * Reorganise the table-indices/statistics/.. depending on the given mode.
+     * Default Implementation throws an error.
+     * 
+     * @param string table name of the table to optimize
+     * @param int mode optimization-mode
+     *      <code>ADODB_OPT_HIGH</code> for full optimization 
+     *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
+     *      Default is LOW <code>ADODB_OPT_LOW</code> 
+     * @author Markus Staab
+     * @return Returns <code>true</code> on success and <code>false</code> on 
error
+     */
+    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
+    {
+        ADOConnection::outp( sprintf( "<p>%s: '%s' not implemented for driver 
'%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));
+        return false;
+    }
+    
+    /** 
+     * Reorganise current database.
+     * Default implementation loops over all <code>MetaTables()</code> and 
+     * optimize each using <code>optmizeTable()</code>
+     * 
+     * @author Markus Staab
+     * @return Returns <code>true</code> on success and <code>false</code> on 
error
+     */
+    function optimizeDatabase() 
+    {
+        $conn = $this->conn;
+        if ( !$conn) return false;
+        
+        $tables = $conn->MetaTables( 'TABLES');
+        if ( !$tables ) return false;
+
+        foreach( $tables as $table) {
+            if ( !$this->optimizeTable( $table)) {
+                return false;
+            }
+        }
+      
+        return true;
+    }
+    // end hack 
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-php4.inc.php
diff -u phpgwapi/inc/adodb/adodb-php4.inc.php:1.2 
phpgwapi/inc/adodb/adodb-php4.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-php4.inc.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-php4.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,16 +1,16 @@
-<?php
-
-/*
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Set tabs to 4.
-*/
-
-
-class ADODB_BASE_RS {
-}
-
+<?php
+
+/*
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  
+  Set tabs to 4.
+*/
+
+
+class ADODB_BASE_RS {
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-time.inc.php
diff -u phpgwapi/inc/adodb/adodb-time.inc.php:1.2 
phpgwapi/inc/adodb/adodb-time.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-time.inc.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-time.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,967 +1,1327 @@
-<?php
-/**
-ADOdb Date Library, part of the ADOdb abstraction library
-Download: http://php.weblogs.com/adodb_date_time_library
-
-PHP native date functions use integer timestamps for computations.
-Because of this, dates are restricted to the years 1901-2038 on Unix 
-and 1970-2038 on Windows due to integer overflow for dates beyond 
-those years. This library overcomes these limitations by replacing the 
-native function's signed integers (normally 32-bits) with PHP floating 
-point numbers (normally 64-bits).
-
-Dates from 100 A.D. to 3000 A.D. and later
-have been tested. The minimum is 100 A.D. as <100 will invoke the
-2 => 4 digit year conversion. The maximum is billions of years in the 
-future, but this is a theoretical limit as the computation of that year 
-would take too long with the current implementation of adodb_mktime().
-
-This library replaces native functions as follows:
-
-<pre>  
-       getdate()  with  adodb_getdate()
-       date()     with  adodb_date() 
-       gmdate()   with  adodb_gmdate()
-       mktime()   with  adodb_mktime()
-       gmmktime() with  adodb_gmmktime()
-</pre>
-       
-The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT, 
-and date() will convert from GMT to local time, but daylight savings is 
-not handled currently.
-
-This library is independant of the rest of ADOdb, and can be used
-as standalone code.
-
-PERFORMANCE
-
-For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside 
-the 32-bit signed integer range.
-
-GREGORIAN CORRECTION
-
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, 
-October 4, 1582 (Julian) was followed immediately by Friday, October 15, 
-1582 (Gregorian). 
-
-Since 0.06, we handle this correctly, so:
-
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) 
-       == 24 * 3600 (1 day)
-
-=============================================================================
-
-COPYRIGHT
-
-(c) 2003-2004 John Lim and released under BSD-style license except for code by 
-jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
-and originally found at http://www.php.net/manual/en/function.mktime.php
-
-=============================================================================
-
-BUG REPORTS
-
-These should be posted to the ADOdb forums at
-
-       http://phplens.com/lens/lensforum/topics.php?id=4
-
-=============================================================================
-
-FUNCTION DESCRIPTIONS
-
-
-FUNCTION adodb_getdate($date=false)
-
-Returns an array containing date information, as getdate(), but supports
-dates greater than 1901 to 2038.
-
-
-FUNCTION adodb_date($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted local date. If $timestamp is not defined, 
the
-current timestamp is used. Unlike the function date(), it supports dates
-outside the 1901 to 2038 range.
-
-The format fields that adodb_date supports:
-
-<pre>
-a - "am" or "pm" 
-A - "AM" or "PM" 
-d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
-D - day of the week, textual, 3 letters; e.g. "Fri" 
-F - month, textual, long; e.g. "January" 
-g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
-G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
-h - hour, 12-hour format; i.e. "01" to "12" 
-H - hour, 24-hour format; i.e. "00" to "23" 
-i - minutes; i.e. "00" to "59" 
-j - day of the month without leading zeros; i.e. "1" to "31" 
-l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  
-L - boolean for whether it is a leap year; i.e. "0" or "1" 
-m - month; i.e. "01" to "12" 
-M - month, textual, 3 letters; e.g. "Jan" 
-n - month without leading zeros; i.e. "1" to "12" 
-O - Difference to Greenwich time in hours; e.g. "+0200" 
-Q - Quarter, as in 1, 2, 3, 4 
-r - RFC 822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 
-s - seconds; i.e. "00" to "59" 
-S - English ordinal suffix for the day of the month, 2 characters; 
-                       i.e. "st", "nd", "rd" or "th" 
-t - number of days in the given month; i.e. "28" to "31"
-T - Timezone setting of this machine; e.g. "EST" or "MDT" 
-U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  
-w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
-Y - year, 4 digits; e.g. "1999" 
-y - year, 2 digits; e.g. "99" 
-z - day of the year; i.e. "0" to "365" 
-Z - timezone offset in seconds (i.e. "-43200" to "43200"). 
-                       The offset for timezones west of UTC is always 
negative, 
-                       and for those east of UTC is always positive. 
-</pre>
-
-Unsupported:
-<pre>
-B - Swatch Internet time 
-I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
-W - ISO-8601 week number of year, weeks starting on Monday 
-
-</pre>
-
-FUNCTION adodb_date2($fmt, $isoDateString = false)
-Same as adodb_date, but 2nd parameter accepts iso date, eg.
-
-  adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
-
-FUNCTION adodb_gmdate($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
-current timestamp is used. Unlike the function date(), it supports dates
-outside the 1901 to 2038 range.
-
-
-FUNCTION adodb_mktime($hr, $min, $sec [, $month, $day, $year])
-
-Converts a local date to a unix timestamp.  Unlike the function mktime(), it 
supports
-dates outside the 1901 to 2038 range. Differs from mktime() in that all 
parameters
-are currently compulsory.
-
-FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])
-
-Converts a gmt date to a unix timestamp.  Unlike the function gmmktime(), it 
supports
-dates outside the 1901 to 2038 range. Differs from gmmktime() in that all 
parameters
-are currently compulsory.
-
-=============================================================================
-
-NOTES
-
-Useful url for generating test timestamps:
-       http://www.4webhelp.net/us/timestamp.php
-
-Possible future optimizations include 
-
-a. Using an algorithm similar to Plauger's in "The Standard C Library" 
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 
-work outside 32-bit signed range, so i decided not to implement it.
-
-b. Iterate over a block of years (say 12) when searching for the 
-correct year.
-
-c. Implement daylight savings, which looks awfully complicated, see
-       http://webexhibits.org/daylightsaving/
-
-
-CHANGELOG
-- 18 July 2004 0.15
-All params in adodb_mktime were formerly compulsory. Now only the hour, min, 
secs is compulsory. This
-brings it more in line with mktime (still not identical).
-
-- 23 June 2004 0.14
-
-Allow you to define your own daylights savings function, adodb_daylight_sv.
-If the function is defined (somewhere in an include), then you can correct for 
daylights savings.
-
-In this example, we apply daylights savings in June or July, adding one hour. 
This is extremely
-unrealistic as it does not take into account time-zone, geographic location, 
current year.
-
-function adodb_daylight_sv(&$arr, $is_gmt)
-{
-       if ($is_gmt) return;
-       $m = $arr['mon'];
-       if ($m == 6 || $m == 7) $arr['hours'] += 1;
-}
-
-This is only called by adodb_date() and not by adodb_mktime(). 
-
-The format of $arr is
-Array ( 
-   [seconds] => 0 
-   [minutes] => 0 
-   [hours] => 0 
-   [mday] => 1      # day of month, eg 1st day of the month
-   [mon] => 2       # month (eg. Feb)
-   [year] => 2102 
-   [yday] => 31     # days in current year
-   [leap] =>        # true if leap year
-   [ndays] => 28    # no of days in current month
-   ) 
-   
-
-- 28 Apr 2004 0.13
-Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
-
-- 20 Mar 2004 0.12
-Fixed month calculation error in adodb_date. 2102-June-01 appeared as 
2102-May-32.
-
-- 26 Oct 2003 0.11
-Because of daylight savings problems (some systems apply daylight savings to 
-January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
-
-- 9 Aug 2003 0.10
-Fixed bug with dates after 2038. 
-See http://phplens.com/lens/lensforum/msgs.php?id=6980
-
-- 1 July 2003 0.09
-Added support for Q (Quarter).
-Added adodb_date2(), which accepts ISO date in 2nd param
-
-- 3 March 2003 0.08
-Added support for 'S' adodb_date() format char. Added constant 
ADODB_ALLOW_NEGATIVE_TS
-if you want PHP to handle negative timestamps between 1901 to 1969.
-
-- 27 Feb 2003 0.07
-All negative numbers handled by adodb now because of RH 7.3+ problems.
-See http://bugs.php.net/bug.php?id=20048&edit=2
-
-- 4 Feb 2003 0.06
-Fixed a typo, 1852 changed to 1582! This means that pre-1852 dates
-are now correctly handled.
-
-- 29 Jan 2003 0.05
-
-Leap year checking differs under Julian calendar (pre 1582). Also
-leap year code optimized by checking for most common case first.
-
-We also handle month overflow correctly in mktime (eg month set to 13).
-
-Day overflow for less than one month's days is supported.
-
-- 28 Jan 2003 0.04
-
-Gregorian correction handled. In PHP5, we might throw an error if 
-mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
-Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
-
-- 27 Jan 2003 0.03
-
-Fixed some more month problems due to gmt issues. Added constant 
ADODB_DATE_VERSION.
-Fixed calculation of days since start of year for <1970. 
-
-- 27 Jan 2003 0.02
-
-Changed _adodb_getdate() to inline leap year checking for better performance.
-Fixed problem with time-zones west of GMT +0000.
-
-- 24 Jan 2003 0.01
-
-First implementation.
-*/
-
-
-/* Initialization */
-
-/*
-       Version Number
-*/
-define('ADODB_DATE_VERSION',0.15);
-
-/*
-       We check for Windows as only +ve ints are accepted as dates on Windows.
-       
-       Apparently this problem happens also with Linux, RH 7.3 and later!
-       
-       glibc-2.2.5-34 and greater has been changed to return -1 for dates <
-       1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
-       echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
-       
-       References:
-        http://bugs.php.net/bug.php?id=20048&edit=2
-        
http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
-*/
-
-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
-
-function adodb_date_test_date($y1,$m)
-{
-       //print " $y1/$m ";
-       $t = adodb_mktime(0,0,0,$m,13,$y1);
-       if ("$y1-$m-13 00:00:00" != adodb_date('Y-n-d H:i:s',$t)) {
-               print "<b>$y1 error</b><br>";
-               return false;
-       }
-       return true;
-}
-/**
-        Test Suite
-*/
-function adodb_date_test()
-{
-       
-       error_reporting(E_ALL);
-       print "<h4>Testing adodb_date and adodb_mktime. 
version=".ADODB_DATE_VERSION. "</h4>";
-       @set_time_limit(0);
-       $fail = false;
-       
-       // This flag disables calling of PHP native functions, so we can 
properly test the code
-       if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
-       
-       $t = adodb_mktime(0,0,0);
-       if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in 
'.adodb_mktime(0,0,0).'<br>';
-       
-       $t = adodb_mktime(0,0,0,6,1,2102);
-       if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in 
'.adodb_date('Y-m-d',$t).'<br>';
-       
-       $t = adodb_mktime(0,0,0,2,1,2102);
-       if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in 
'.adodb_date('Y-m-d',$t).'<br>';
-       
-       
-       print "<p>Testing gregorian <=> julian conversion<p>";
-       $t = adodb_mktime(0,0,0,10,11,1492);
-       //http://www.holidayorigins.com/html/columbus_day.html - Friday check
-       if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in 
Columbus landing<br>';
-       
-       $t = adodb_mktime(0,0,0,2,29,1500);
-       if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian 
leap years<br>';
-       
-       $t = adodb_mktime(0,0,0,2,29,1700);
-       if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in 
gregorian leap years<br>';
-       
-       print  adodb_mktime(0,0,0,10,4,1582).' ';
-       print adodb_mktime(0,0,0,10,15,1582);
-       $diff = (adodb_mktime(0,0,0,10,15,1582) - 
adodb_mktime(0,0,0,10,4,1582));
-       if ($diff != 3600*24) print " <b>Error in gregorian correction = 
".($diff/3600/24)." days </b><br>";
-               
-       print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : 
'<b>Error</b>')."<br>";
-       print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : 
'<b>Error</b>')."<br>";
-       
-       print "<p>Testing overflow<p>";
-       
-       $t = adodb_mktime(0,0,0,3,33,1965);
-       if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day 
overflow 1 <br>';
-       $t = adodb_mktime(0,0,0,4,33,1971);
-       if (!(adodb_date('Y-m-d',$t) == '1971-05-03')) print 'Error in day 
overflow 2 <br>';
-       $t = adodb_mktime(0,0,0,1,60,1965);
-       if (!(adodb_date('Y-m-d',$t) == '1965-03-01')) print 'Error in day 
overflow 3 '.adodb_date('Y-m-d',$t).' <br>';
-       $t = adodb_mktime(0,0,0,12,32,1965);
-       if (!(adodb_date('Y-m-d',$t) == '1966-01-01')) print 'Error in day 
overflow 4 '.adodb_date('Y-m-d',$t).' <br>';
-       $t = adodb_mktime(0,0,0,12,63,1965);
-       if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day 
overflow 5 '.adodb_date('Y-m-d',$t).' <br>';
-       $t = adodb_mktime(0,0,0,13,3,1965);
-       if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth 
overflow 1 <br>';
-       
-       print "Testing 2-digit => 4-digit year conversion<p>";
-       if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";
-       if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010<br>";
-       if (adodb_year_digit_check(20) != 2020) print "Err 2-digit 2020<br>";
-       if (adodb_year_digit_check(30) != 2030) print "Err 2-digit 2030<br>";
-       if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940<br>";
-       if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>";
-       if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>";
-       
-       // Test string formating
-       print "<p>Testing date formating</p>";
-       $fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O 
\R\F\C822 r s t U w y Y z Z 2003';
-       $s1 = date($fmt,0);
-       $s2 = adodb_date($fmt,0);
-       if ($s1 != $s2) {
-               print " date() 0 failed<br>$s1<br>$s2<br>";
-       }
-       flush();
-       for ($i=100; --$i > 0; ) {
-
-               $ts = 3600.0*((rand()%60000)+(rand()%60000))+(rand()%60000);
-               $s1 = date($fmt,$ts);
-               $s2 = adodb_date($fmt,$ts);
-               //print "$s1 <br>$s2 <p>";
-               $pos = strcmp($s1,$s2);
-
-               if (($s1) != ($s2)) {
-                       for ($j=0,$k=strlen($s1); $j < $k; $j++) {
-                               if ($s1[$j] != $s2[$j]) {
-                                       print substr($s1,$j).' ';
-                                       break;
-                               }
-                       }
-                       print "<b>Error date(): $ts<br><pre> 
-&nbsp; \"$s1\" (date len=".strlen($s1).")
-&nbsp; \"$s2\" (adodb_date len=".strlen($s2).")</b></pre><br>";
-                       $fail = true;
-               }
-               
-               $a1 = getdate($ts);
-               $a2 = adodb_getdate($ts);
-               $rez = array_diff($a1,$a2);
-               if (sizeof($rez)>0) {
-                       print "<b>Error getdate() $ts</b><br>";
-                               print_r($a1);
-                       print "<br>";
-                               print_r($a2);
-                       print "<p>";
-                       $fail = true;
-               }
-       }
-       
-       // Test generation of dates outside 1901-2038
-       print "<p>Testing random dates between 100 and 4000</p>";
-       adodb_date_test_date(100,1);
-       for ($i=100; --$i >= 0;) {
-               $y1 = 100+rand(0,1970-100);
-               $m = rand(1,12);
-               adodb_date_test_date($y1,$m);
-               
-               $y1 = 3000-rand(0,3000-1970);
-               adodb_date_test_date($y1,$m);
-       }
-       print '<p>';
-       $start = 1960+rand(0,10);
-       $yrs = 12;
-       $i = 365.25*86400*($start-1970);
-       $offset = 36000+rand(10000,60000);
-       $max = 365*$yrs*86400;
-       $lastyear = 0;
-       
-       // we generate a timestamp, convert it to a date, and convert it back 
to a timestamp
-       // and check if the roundtrip broke the original timestamp value.
-       print "Testing $start to ".($start+$yrs).", or $max seconds, 
offset=$offset: ";
-       $cnt = 0;
-       for ($max += $i; $i < $max; $i += $offset) {
-               $ret = adodb_date('m,d,Y,H,i,s',$i);
-               $arr = explode(',',$ret);
-               if ($lastyear != $arr[2]) {
-                       $lastyear = $arr[2];
-                       print " $lastyear ";
-                       flush();
-               }
-               $newi = 
adodb_mktime($arr[3],$arr[4],$arr[5],$arr[0],$arr[1],$arr[2]);
-               if ($i != $newi) {
-                       print "Error at $i, adodb_mktime returned $newi ($ret)";
-                       $fail = true;
-                       break;
-               }
-               $cnt += 1;
-       }
-       echo "Tested $cnt dates<br>";
-       if (!$fail) print "<p>Passed !</p>";
-       else print "<p><b>Failed</b> :-(</p>";
-}
-
-/**
-       Returns day of week, 0 = Sunday,... 6=Saturday. 
-       Algorithm from PEAR::Date_Calc
-*/
-function adodb_dow($year, $month, $day)
-{
-/*
-Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 
and 
-proclaimed that from that time onwards 3 days would be dropped from the 
calendar 
-every 400 years.
-
-Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 
15, 1582 (Gregorian). 
-*/
-       if ($year <= 1582) {
-               if ($year < 1582 || 
-                       ($year == 1582 && ($month < 10 || ($month == 10 && $day 
< 15)))) $greg_correction = 3;
-                else
-                       $greg_correction = 0;
-       } else
-               $greg_correction = 0;
-       
-       if($month > 2)
-           $month -= 2;
-       else {
-           $month += 10;
-           $year--;
-       }
-       
-       $day =  ( floor((13 * $month - 1) / 5) +
-               $day + ($year % 100) +
-               floor(($year % 100) / 4) +
-               floor(($year / 100) / 4) - 2 *
-               floor($year / 100) + 77);
-       
-       return (($day - 7 * floor($day / 7))) + $greg_correction;
-}
-
-
-/**
- Checks for leap year, returns true if it is. No 2-digit year check. Also 
- handles julian calendar correctly.
-*/
-function _adodb_is_leap_year($year) 
-{
-       if ($year % 4 != 0) return false;
-       
-       if ($year % 400 == 0) {
-               return true;
-       // if gregorian calendar (>1582), century not-divisible by 400 is not 
leap
-       } else if ($year > 1582 && $year % 100 == 0 ) {
-               return false;
-       } 
-       
-       return true;
-}
-
-/**
- checks for leap year, returns true if it is. Has 2-digit year check
-*/
-function adodb_is_leap_year($year) 
-{
-       return  _adodb_is_leap_year(adodb_year_digit_check($year));
-}
-
-/**
-       Fix 2-digit years. Works for any century.
-       Assumes that if 2-digit is more than 30 years in future, then previous 
century.
-*/
-function adodb_year_digit_check($y) 
-{
-       if ($y < 100) {
-       
-               $yr = (integer) date("Y");
-               $century = (integer) ($yr /100);
-               
-               if ($yr%100 > 50) {
-                       $c1 = $century + 1;
-                       $c0 = $century;
-               } else {
-                       $c1 = $century;
-                       $c0 = $century - 1;
-               }
-               $c1 *= 100;
-               // if 2-digit year is less than 30 years in future, set it to 
this century
-               // otherwise if more than 30 years in future, then we set 
2-digit year to the prev century.
-               if (($y + $c1) < $yr+30) $y = $y + $c1;
-               else $y = $y + $c0*100;
-       }
-       return $y;
-}
-
-/**
- get local time zone offset from GMT
-*/
-function adodb_get_gmt_diff() 
-{
-static $TZ;
-       if (isset($TZ)) return $TZ;
-       
-       $TZ = mktime(0,0,0,1,2,1970,0) - gmmktime(0,0,0,1,2,1970,0);
-       return $TZ;
-}
-
-/**
-       Returns an array with date info.
-*/
-function adodb_getdate($d=false,$fast=false)
-{
-       if ($d === false) return getdate();
-       if (!defined('ADODB_TEST_DATES')) {
-               if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit 
signed range
-                       if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if 
windows, must be +ve integer
-                               return @getdate($d);
-               }
-       }
-       return _adodb_getdate($d);
-}
-
-/**
-       Low-level function that returns the getdate() array. We have a special
-       $fast flag, which if set to true, will return fewer array values,
-       and is much faster as it does not calculate dow, etc.
-*/
-function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
-{
-       $d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff());
-       
-       $_day_power = 86400;
-       $_hour_power = 3600;
-       $_min_power = 60;
-       
-       if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, 
gregorian correction 
-       
-       $_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-       $_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-       
-       $d366 = $_day_power * 366;
-       $d365 = $_day_power * 365;
-       
-       if ($d < 0) {
-               $origd = $d;
-               // The valid range of a 32bit signed timestamp is typically 
from 
-               // Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 
GMT
-               for ($a = 1970 ; --$a >= 0;) {
-                       $lastd = $d;
-                       
-                       if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
-                       else $d += $d365;
-                       
-                       if ($d >= 0) {
-                               $year = $a;
-                               break;
-                       }
-               }
-               
-               $secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
-               
-               $d = $lastd;
-               $mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-               for ($a = 13 ; --$a > 0;) {
-                       $lastd = $d;
-                       $d += $mtab[$a] * $_day_power;
-                       if ($d >= 0) {
-                               $month = $a;
-                               $ndays = $mtab[$a];
-                               break;
-                       }
-               }
-               
-               $d = $lastd;
-               $day = $ndays + ceil(($d+1) / ($_day_power));
-
-               $d += ($ndays - $day+1)* $_day_power;
-               $hour = floor($d/$_hour_power);
-       
-       } else {
-               for ($a = 1970 ;; $a++) {
-                       $lastd = $d;
-                       
-                       if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
-                       else $d -= $d365;
-                       if ($d < 0) {
-                               $year = $a;
-                               break;
-                       }
-               }
-               $secsInYear = $lastd;
-               $d = $lastd;
-               $mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-               for ($a = 1 ; $a <= 12; $a++) {
-                       $lastd = $d;
-                       $d -= $mtab[$a] * $_day_power;
-                       if ($d < 0) {
-                               $month = $a;
-                               $ndays = $mtab[$a];
-                               break;
-                       }
-               }
-               $d = $lastd;
-               $day = ceil(($d+1) / $_day_power);
-               $d = $d - ($day-1) * $_day_power;
-               $hour = floor($d /$_hour_power);
-       }
-       
-       $d -= $hour * $_hour_power;
-       $min = floor($d/$_min_power);
-       $secs = $d - $min * $_min_power;
-       if ($fast) {
-               return array(
-               'seconds' => $secs,
-               'minutes' => $min,
-               'hours' => $hour,
-               'mday' => $day,
-               'mon' => $month,
-               'year' => $year,
-               'yday' => floor($secsInYear/$_day_power),
-               'leap' => $leaf,
-               'ndays' => $ndays
-               );
-       }
-       
-       
-       $dow = adodb_dow($year,$month,$day);
-
-       return array(
-               'seconds' => $secs,
-               'minutes' => $min,
-               'hours' => $hour,
-               'mday' => $day,
-               'wday' => $dow,
-               'mon' => $month,
-               'year' => $year,
-               'yday' => floor($secsInYear/$_day_power),
-               'weekday' => gmdate('l',$_day_power*(3+$dow)),
-               'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),
-               0 => $origd
-       );
-}
-
-function adodb_gmdate($fmt,$d=false)
-{
-       return adodb_date($fmt,$d,true);
-}
-
-// accepts unix timestamp and iso date format in $d
-function adodb_date2($fmt, $d=false, $is_gmt=false)
-{
-       if ($d !== false) {
-               if (!preg_match( 
-                       "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ 
-]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
-                       ($d), $rr)) return adodb_date($fmt,false,$is_gmt);
-
-               if ($rr[1] <= 100 && $rr[2]<= 1) return 
adodb_date($fmt,false,$is_gmt);
-       
-               // h-m-s-MM-DD-YY
-               if (!isset($rr[5])) $d = 
adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-               else $d = 
@adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
-       }
-       
-       return adodb_date($fmt,$d,$is_gmt);
-}
-
-
-/**
-       Return formatted date based on timestamp $d
-*/
-function adodb_date($fmt,$d=false,$is_gmt=false)
-{
-static $daylight;
-
-       if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
-       if (!defined('ADODB_TEST_DATES')) {
-               if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit 
signed range
-                       if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if 
windows, must be +ve integer
-                               return ($is_gmt)? @gmdate($fmt,$d): 
@date($fmt,$d);
-
-               }
-       }
-       $_day_power = 86400;
-       
-       $arr = _adodb_getdate($d,true,$is_gmt);
-       if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
-       if ($daylight) adodb_daylight_sv($arr, $is_gmt);
-       
-       $year = $arr['year'];
-       $month = $arr['mon'];
-       $day = $arr['mday'];
-       $hour = $arr['hours'];
-       $min = $arr['minutes'];
-       $secs = $arr['seconds'];
-       
-       $max = strlen($fmt);
-       $dates = '';
-       
-       /*
-               at this point, we have the following integer vars to manipulate:
-               $year, $month, $day, $hour, $min, $secs
-       */
-       for ($i=0; $i < $max; $i++) {
-               switch($fmt[$i]) {
-               case 'T': $dates .= date('T');break;
-               // YEAR
-               case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
-               case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
-               
-                       $dates .= 
gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '         
-                               . ($day<10?' '.$day:$day) . ' 
'.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
-                       
-                       if ($hour < 10) $dates .= '0'.$hour; else $dates .= 
$hour; 
-                       
-                       if ($min < 10) $dates .= ':0'.$min; else $dates .= 
':'.$min;
-                       
-                       if ($secs < 10) $dates .= ':0'.$secs; else $dates .= 
':'.$secs;
-                       
-                       $gmt = adodb_get_gmt_diff();
-                       $dates .= sprintf(' 
%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;
-                               
-               case 'Y': $dates .= $year; break;
-               case 'y': $dates .= substr($year,strlen($year)-2,2); break;
-               // MONTH
-               case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= 
$month; break;
-               case 'Q': $dates .= ($month+3)>>2; break;
-               case 'n': $dates .= $month; break;
-               case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); 
break;
-               case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); 
break;
-               // DAY
-               case 't': $dates .= $arr['ndays']; break;
-               case 'z': $dates .= $arr['yday']; break;
-               case 'w': $dates .= adodb_dow($year,$month,$day); break;
-               case 'l': $dates .= 
gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-               case 'D': $dates .= 
gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-               case 'j': $dates .= $day; break;
-               case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; 
break;
-               case 'S': 
-                       $d10 = $day % 10;
-                       if ($d10 == 1) $dates .= 'st';
-                       else if ($d10 == 2 && $day != 12) $dates .= 'nd';
-                       else if ($d10 == 3) $dates .= 'rd';
-                       else $dates .= 'th';
-                       break;
-                       
-               // HOUR
-               case 'Z':
-                       $dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;
-               case 'O': 
-                       $gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();
-                       $dates .= 
sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;
-                       
-               case 'H': 
-                       if ($hour < 10) $dates .= '0'.$hour; 
-                       else $dates .= $hour; 
-                       break;
-               case 'h': 
-                       if ($hour > 12) $hh = $hour - 12; 
-                       else {
-                               if ($hour == 0) $hh = '12'; 
-                               else $hh = $hour;
-                       }
-                       
-                       if ($hh < 10) $dates .= '0'.$hh;
-                       else $dates .= $hh;
-                       break;
-                       
-               case 'G': 
-                       $dates .= $hour;
-                       break;
-                       
-               case 'g':
-                       if ($hour > 12) $hh = $hour - 12; 
-                       else {
-                               if ($hour == 0) $hh = '12'; 
-                               else $hh = $hour; 
-                       }
-                       $dates .= $hh;
-                       break;
-               // MINUTES
-               case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= 
$min; break;
-               // SECONDS
-               case 'U': $dates .= $d; break;
-               case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= 
$secs; break;
-               // AM/PM
-               // Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
-               case 'a':
-                       if ($hour>=12) $dates .= 'pm';
-                       else $dates .= 'am';
-                       break;
-               case 'A':
-                       if ($hour>=12) $dates .= 'PM';
-                       else $dates .= 'AM';
-                       break;
-               default:
-                       $dates .= $fmt[$i]; break;
-               // ESCAPE
-               case "\\": 
-                       $i++;
-                       if ($i < $max) $dates .= $fmt[$i];
-                       break;
-               }
-       }
-       return $dates;
-}
-
-/**
-       Returns a timestamp given a GMT/UTC time. 
-       Note that $is_dst is not implemented and is ignored.
-*/
-function 
adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
-{
-       return adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst,true);
-}
-
-/**
-       Return a timestamp given a local time. Originally by jackbbs.
-       Note that $is_dst is not implemented and is ignored.
-       
-       Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
-*/
-function 
adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false)
 
-{
-       if (!defined('ADODB_TEST_DATES')) {
-               // for windows, we don't check 1970 because with timezone 
differences, 
-               // 1 Jan 1970 could generate negative timestamp, which is 
illegal
-               if (1971 < $year && $year < 2038
-                       || $mon === false
-                       || !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && 
$year < 2038)
-                       )
-                               return $is_gmt?
-                                       
@gmmktime($hr,$min,$sec,$mon,$day,$year):
-                                       @mktime($hr,$min,$sec,$mon,$day,$year);
-       }
-       
-       $gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff();
-       
-       $hr = intval($hr);
-       $min = intval($min);
-       $sec = intval($sec);
-       $mon = intval($mon);
-       $day = intval($day);
-       $year = intval($year);
-       
-       
-       $year = adodb_year_digit_check($year);
-       
-       if ($mon > 12) {
-               $y = floor($mon / 12);
-               $year += $y;
-               $mon -= $y*12;
-       }
-       
-       $_day_power = 86400;
-       $_hour_power = 3600;
-       $_min_power = 60;
-       
-       $_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-       $_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-       
-       $_total_date = 0;
-       if ($year >= 1970) {
-               for ($a = 1970 ; $a <= $year; $a++) {
-                       $leaf = _adodb_is_leap_year($a);
-                       if ($leaf == true) {
-                               $loop_table = $_month_table_leaf;
-                               $_add_date = 366;
-                       } else {
-                               $loop_table = $_month_table_normal;
-                               $_add_date = 365;
-                       }
-                       if ($a < $year) { 
-                               $_total_date += $_add_date;
-                       } else {
-                               for($b=1;$b<$mon;$b++) {
-                                       $_total_date += $loop_table[$b];
-                               }
-                       }
-               }
-               $_total_date +=$day-1;
-               $ret = $_total_date * $_day_power + $hr * $_hour_power + $min * 
$_min_power + $sec + $gmt_different;
-       
-       } else {
-               for ($a = 1969 ; $a >= $year; $a--) {
-                       $leaf = _adodb_is_leap_year($a);
-                       if ($leaf == true) {
-                               $loop_table = $_month_table_leaf;
-                               $_add_date = 366;
-                       } else {
-                               $loop_table = $_month_table_normal;
-                               $_add_date = 365;
-                       }
-                       if ($a > $year) { $_total_date += $_add_date;
-                       } else {
-                               for($b=12;$b>$mon;$b--) {
-                                       $_total_date += $loop_table[$b];
-                               }
-                       }
-               }
-               $_total_date += $loop_table[$mon] - $day;
-               
-               $_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
-               $_day_time = $_day_power - $_day_time;
-               $ret = -( $_total_date * $_day_power + $_day_time - 
$gmt_different);
-               if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 
Oct 1582 - gregorian correction
-               else if ($ret < -12219321600) $ret = -12219321600; // if in 
limbo, reset to 15 Oct 1582.
-       } 
-       //print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
-       return $ret;
-}
-
+<?php
+/**
+ADOdb Date Library, part of the ADOdb abstraction library
+Download: http://phplens.com/phpeverywhere/
+
+PHP native date functions use integer timestamps for computations.
+Because of this, dates are restricted to the years 1901-2038 on Unix 
+and 1970-2038 on Windows due to integer overflow for dates beyond 
+those years. This library overcomes these limitations by replacing the 
+native function's signed integers (normally 32-bits) with PHP floating 
+point numbers (normally 64-bits).
+
+Dates from 100 A.D. to 3000 A.D. and later
+have been tested. The minimum is 100 A.D. as <100 will invoke the
+2 => 4 digit year conversion. The maximum is billions of years in the 
+future, but this is a theoretical limit as the computation of that year 
+would take too long with the current implementation of adodb_mktime().
+
+This library replaces native functions as follows:
+
+<pre>  
+       getdate()  with  adodb_getdate()
+       date()     with  adodb_date() 
+       gmdate()   with  adodb_gmdate()
+       mktime()   with  adodb_mktime()
+       gmmktime() with  adodb_gmmktime()
+       strftime() with  adodb_strftime()
+       strftime() with  adodb_gmstrftime()
+</pre>
+       
+The parameters are identical, except that adodb_date() accepts a subset
+of date()'s field formats. Mktime() will convert from local time to GMT, 
+and date() will convert from GMT to local time, but daylight savings is 
+not handled currently.
+
+This library is independant of the rest of ADOdb, and can be used
+as standalone code.
+
+PERFORMANCE
+
+For high speed, this library uses the native date functions where
+possible, and only switches to PHP code when the dates fall outside 
+the 32-bit signed integer range.
+
+GREGORIAN CORRECTION
+
+Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, 
+October 4, 1582 (Julian) was followed immediately by Friday, October 15, 
+1582 (Gregorian). 
+
+Since 0.06, we handle this correctly, so:
+
+adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) 
+       == 24 * 3600 (1 day)
+
+=============================================================================
+
+COPYRIGHT
+
+(c) 2003-2005 John Lim and released under BSD-style license except for code by 
+jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
+and originally found at http://www.php.net/manual/en/function.mktime.php
+
+=============================================================================
+
+BUG REPORTS
+
+These should be posted to the ADOdb forums at
+
+       http://phplens.com/lens/lensforum/topics.php?id=4
+
+=============================================================================
+
+FUNCTION DESCRIPTIONS
+
+
+** FUNCTION adodb_getdate($date=false)
+
+Returns an array containing date information, as getdate(), but supports
+dates greater than 1901 to 2038. The local date/time format is derived from a 
+heuristic the first time adodb_getdate is called. 
+        
+        
+** FUNCTION adodb_date($fmt, $timestamp = false)
+
+Convert a timestamp to a formatted local date. If $timestamp is not defined, 
the
+current timestamp is used. Unlike the function date(), it supports dates
+outside the 1901 to 2038 range.
+
+The format fields that adodb_date supports:
+
+<pre>
+       a - "am" or "pm" 
+       A - "AM" or "PM" 
+       d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
+       D - day of the week, textual, 3 letters; e.g. "Fri" 
+       F - month, textual, long; e.g. "January" 
+       g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
+       G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
+       h - hour, 12-hour format; i.e. "01" to "12" 
+       H - hour, 24-hour format; i.e. "00" to "23" 
+       i - minutes; i.e. "00" to "59" 
+       j - day of the month without leading zeros; i.e. "1" to "31" 
+       l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  
+       L - boolean for whether it is a leap year; i.e. "0" or "1" 
+       m - month; i.e. "01" to "12" 
+       M - month, textual, 3 letters; e.g. "Jan" 
+       n - month without leading zeros; i.e. "1" to "12" 
+       O - Difference to Greenwich time in hours; e.g. "+0200" 
+       Q - Quarter, as in 1, 2, 3, 4 
+       r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 
+       s - seconds; i.e. "00" to "59" 
+       S - English ordinal suffix for the day of the month, 2 characters; 
+                               i.e. "st", "nd", "rd" or "th" 
+       t - number of days in the given month; i.e. "28" to "31"
+       T - Timezone setting of this machine; e.g. "EST" or "MDT" 
+       U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  
+       w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
+       Y - year, 4 digits; e.g. "1999" 
+       y - year, 2 digits; e.g. "99" 
+       z - day of the year; i.e. "0" to "365" 
+       Z - timezone offset in seconds (i.e. "-43200" to "43200"). 
+                               The offset for timezones west of UTC is always 
negative, 
+                               and for those east of UTC is always positive. 
+</pre>
+
+Unsupported:
+<pre>
+       B - Swatch Internet time 
+       I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
+       W - ISO-8601 week number of year, weeks starting on Monday 
+
+</pre>
+
+
+** FUNCTION adodb_date2($fmt, $isoDateString = false)
+Same as adodb_date, but 2nd parameter accepts iso date, eg.
+
+  adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
+
+  
+** FUNCTION adodb_gmdate($fmt, $timestamp = false)
+
+Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
+current timestamp is used. Unlike the function date(), it supports dates
+outside the 1901 to 2038 range.
+
+
+** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year])
+
+Converts a local date to a unix timestamp.  Unlike the function mktime(), it 
supports
+dates outside the 1901 to 2038 range. All parameters are optional.
+
+
+** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])
+
+Converts a gmt date to a unix timestamp.  Unlike the function gmmktime(), it 
supports
+dates outside the 1901 to 2038 range. Differs from gmmktime() in that all 
parameters
+are currently compulsory.
+
+** FUNCTION adodb_gmstrftime($fmt, $timestamp = false)
+Convert a timestamp to a formatted GMT date.
+
+** FUNCTION adodb_strftime($fmt, $timestamp = false)
+
+Convert a timestamp to a formatted local date. Internally converts $fmt into 
+adodb_date format, then echo result.
+
+For best results, you can define the local date format yourself. Define a 
global
+variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
+adodb_date syntax, and 2nd element is the time format, also in adodb_date 
syntax.
+
+    eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
+       
+       Supported format codes:
+
+<pre>
+       %a - abbreviated weekday name according to the current locale 
+       %A - full weekday name according to the current locale 
+       %b - abbreviated month name according to the current locale 
+       %B - full month name according to the current locale 
+       %c - preferred date and time representation for the current locale 
+       %d - day of the month as a decimal number (range 01 to 31) 
+       %D - same as %m/%d/%y 
+       %e - day of the month as a decimal number, a single digit is preceded 
by a space (range ' 1' to '31') 
+       %h - same as %b
+       %H - hour as a decimal number using a 24-hour clock (range 00 to 23) 
+       %I - hour as a decimal number using a 12-hour clock (range 01 to 12) 
+       %m - month as a decimal number (range 01 to 12) 
+       %M - minute as a decimal number 
+       %n - newline character 
+       %p - either `am' or `pm' according to the given time value, or the 
corresponding strings for the current locale 
+       %r - time in a.m. and p.m. notation 
+       %R - time in 24 hour notation 
+       %S - second as a decimal number 
+       %t - tab character 
+       %T - current time, equal to %H:%M:%S 
+       %x - preferred date representation for the current locale without the 
time 
+       %X - preferred time representation for the current locale without the 
date 
+       %y - year as a decimal number without a century (range 00 to 99) 
+       %Y - year as a decimal number including the century 
+       %Z - time zone or name or abbreviation 
+       %% - a literal `%' character 
+</pre> 
+
+       Unsupported codes:
+<pre>
+       %C - century number (the year divided by 100 and truncated to an 
integer, range 00 to 99) 
+       %g - like %G, but without the century. 
+       %G - The 4-digit year corresponding to the ISO week number (see %V). 
+            This has the same format and value as %Y, except that if the ISO 
week number belongs 
+                to the previous or next year, that year is used instead. 
+       %j - day of the year as a decimal number (range 001 to 366) 
+       %u - weekday as a decimal number [1,7], with 1 representing Monday 
+       %U - week number of the current year as a decimal number, starting 
+           with the first Sunday as the first day of the first week 
+       %V - The ISO 8601:1988 week number of the current year as a decimal 
number, 
+            range 01 to 53, where week 1 is the first week that has at least 4 
days in the 
+                current year, and with Monday as the first day of the week. 
(Use %G or %g for 
+                the year component that corresponds to the week number for the 
specified timestamp.) 
+       %w - day of the week as a decimal, Sunday being 0 
+       %W - week number of the current year as a decimal number, starting with 
the 
+            first Monday as the first day of the first week 
+</pre>
+
+=============================================================================
+
+NOTES
+
+Useful url for generating test timestamps:
+       http://www.4webhelp.net/us/timestamp.php
+
+Possible future optimizations include 
+
+a. Using an algorithm similar to Plauger's in "The Standard C Library" 
+(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 
+work outside 32-bit signed range, so i decided not to implement it.
+
+b. Implement daylight savings, which looks awfully complicated, see
+       http://webexhibits.org/daylightsaving/
+
+
+CHANGELOG
+- 10 Feb 2006 0.23
+PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is 
changed from -0000 to +0000. 
+       In PHP4, we will still use -0000 for 100% compat with PHP4.
+
+- 08 Sept 2005 0.22
+In adodb_date2(), $is_gmt not supported properly. Fixed.
+
+- 18 July  2005 0.21
+In PHP 4.3.11, the 'r' format has changed. Leading 0 in day is added. Changed 
for compat.
+Added support for negative months in adodb_mktime().
+
+- 24 Feb 2005 0.20
+Added limited strftime/gmstrftime support. x10 improvement in performance of 
adodb_date().
+
+- 21 Dec 2004 0.17
+In adodb_getdate(), the timestamp was accidentally converted to gmt when 
$is_gmt is false. 
+Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
+
+- 17 Nov 2004 0.16
+Removed intval typecast in adodb_mktime() for secs, allowing:
+        adodb_mktime(0,0,0 + 2236672153,1,1,1934);
+Suggested by Ryan.
+
+- 18 July 2004 0.15
+All params in adodb_mktime were formerly compulsory. Now only the hour, min, 
secs is compulsory. 
+This brings it more in line with mktime (still not identical).
+
+- 23 June 2004 0.14
+
+Allow you to define your own daylights savings function, adodb_daylight_sv.
+If the function is defined (somewhere in an include), then you can correct for 
daylights savings.
+
+In this example, we apply daylights savings in June or July, adding one hour. 
This is extremely
+unrealistic as it does not take into account time-zone, geographic location, 
current year.
+
+function adodb_daylight_sv(&$arr, $is_gmt)
+{
+       if ($is_gmt) return;
+       $m = $arr['mon'];
+       if ($m == 6 || $m == 7) $arr['hours'] += 1;
+}
+
+This is only called by adodb_date() and not by adodb_mktime(). 
+
+The format of $arr is
+Array ( 
+   [seconds] => 0 
+   [minutes] => 0 
+   [hours] => 0 
+   [mday] => 1      # day of month, eg 1st day of the month
+   [mon] => 2       # month (eg. Feb)
+   [year] => 2102 
+   [yday] => 31     # days in current year
+   [leap] =>        # true if leap year
+   [ndays] => 28    # no of days in current month
+   ) 
+   
+
+- 28 Apr 2004 0.13
+Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
+
+- 20 Mar 2004 0.12
+Fixed month calculation error in adodb_date. 2102-June-01 appeared as 
2102-May-32.
+
+- 26 Oct 2003 0.11
+Because of daylight savings problems (some systems apply daylight savings to 
+January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
+
+- 9 Aug 2003 0.10
+Fixed bug with dates after 2038. 
+See http://phplens.com/lens/lensforum/msgs.php?id=6980
+
+- 1 July 2003 0.09
+Added support for Q (Quarter).
+Added adodb_date2(), which accepts ISO date in 2nd param
+
+- 3 March 2003 0.08
+Added support for 'S' adodb_date() format char. Added constant 
ADODB_ALLOW_NEGATIVE_TS
+if you want PHP to handle negative timestamps between 1901 to 1969.
+
+- 27 Feb 2003 0.07
+All negative numbers handled by adodb now because of RH 7.3+ problems.
+See http://bugs.php.net/bug.php?id=20048&edit=2
+
+- 4 Feb 2003 0.06
+Fixed a typo, 1852 changed to 1582! This means that pre-1852 dates
+are now correctly handled.
+
+- 29 Jan 2003 0.05
+
+Leap year checking differs under Julian calendar (pre 1582). Also
+leap year code optimized by checking for most common case first.
+
+We also handle month overflow correctly in mktime (eg month set to 13).
+
+Day overflow for less than one month's days is supported.
+
+- 28 Jan 2003 0.04
+
+Gregorian correction handled. In PHP5, we might throw an error if 
+mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
+Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
+
+- 27 Jan 2003 0.03
+
+Fixed some more month problems due to gmt issues. Added constant 
ADODB_DATE_VERSION.
+Fixed calculation of days since start of year for <1970. 
+
+- 27 Jan 2003 0.02
+
+Changed _adodb_getdate() to inline leap year checking for better performance.
+Fixed problem with time-zones west of GMT +0000.
+
+- 24 Jan 2003 0.01
+
+First implementation.
+*/
+
+
+/* Initialization */
+
+/*
+       Version Number
+*/
+define('ADODB_DATE_VERSION',0.23);
+
+/*
+       This code was originally for windows. But apparently this problem 
happens 
+       also with Linux, RH 7.3 and later!
+       
+       glibc-2.2.5-34 and greater has been changed to return -1 for dates <
+       1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
+       echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
+       
+       References:
+        http://bugs.php.net/bug.php?id=20048&edit=2
+        
http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
+*/
+
+if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
+
+function adodb_date_test_date($y1,$m,$d=13)
+{
+       $t = adodb_mktime(0,0,0,$m,$d,$y1);
+       $rez = adodb_date('Y-n-j H:i:s',$t);
+       if ("$y1-$m-$d 00:00:00" != $rez) {
+               print "<b>$y1 error, expected=$y1-$m-$d 00:00:00, 
adodb=$rez</b><br>";
+               return false;
+       }
+       return true;
+}
+
+function adodb_date_test_strftime($fmt)
+{
+       $s1 = strftime($fmt);
+       $s2 = adodb_strftime($fmt);
+       
+       if ($s1 == $s2) return true;
+       
+       echo "error for $fmt,  strftime=$s1, $adodb=$s2<br>";
+       return false;
+}
+
+/**
+        Test Suite
+*/
+function adodb_date_test()
+{
+       
+       error_reporting(E_ALL);
+       print "<h4>Testing adodb_date and adodb_mktime. 
version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."</h4>";
+       @set_time_limit(0);
+       $fail = false;
+       
+       // This flag disables calling of PHP native functions, so we can 
properly test the code
+       if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
+       
+       adodb_date_test_strftime('%Y %m %x %X');
+       adodb_date_test_strftime("%A %d %B %Y");
+       adodb_date_test_strftime("%H %M S");
+       
+       $t = adodb_mktime(0,0,0);
+       if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in 
'.adodb_mktime(0,0,0).'<br>';
+       
+       $t = adodb_mktime(0,0,0,6,1,2102);
+       if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in 
'.adodb_date('Y-m-d',$t).'<br>';
+       
+       $t = adodb_mktime(0,0,0,2,1,2102);
+       if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in 
'.adodb_date('Y-m-d',$t).'<br>';
+       
+       
+       print "<p>Testing gregorian <=> julian conversion<p>";
+       $t = adodb_mktime(0,0,0,10,11,1492);
+       //http://www.holidayorigins.com/html/columbus_day.html - Friday check
+       if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in 
Columbus landing<br>';
+       
+       $t = adodb_mktime(0,0,0,2,29,1500);
+       if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian 
leap years<br>';
+       
+       $t = adodb_mktime(0,0,0,2,29,1700);
+       if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in 
gregorian leap years<br>';
+       
+       print  adodb_mktime(0,0,0,10,4,1582).' ';
+       print adodb_mktime(0,0,0,10,15,1582);
+       $diff = (adodb_mktime(0,0,0,10,15,1582) - 
adodb_mktime(0,0,0,10,4,1582));
+       if ($diff != 3600*24) print " <b>Error in gregorian correction = 
".($diff/3600/24)." days </b><br>";
+               
+       print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : 
'<b>Error</b>')."<br>";
+       print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : 
'<b>Error</b>')."<br>";
+       
+       print "<p>Testing overflow<p>";
+       
+       $t = adodb_mktime(0,0,0,3,33,1965);
+       if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day 
overflow 1 <br>';
+       $t = adodb_mktime(0,0,0,4,33,1971);
+       if (!(adodb_date('Y-m-d',$t) == '1971-05-03')) print 'Error in day 
overflow 2 <br>';
+       $t = adodb_mktime(0,0,0,1,60,1965);
+       if (!(adodb_date('Y-m-d',$t) == '1965-03-01')) print 'Error in day 
overflow 3 '.adodb_date('Y-m-d',$t).' <br>';
+       $t = adodb_mktime(0,0,0,12,32,1965);
+       if (!(adodb_date('Y-m-d',$t) == '1966-01-01')) print 'Error in day 
overflow 4 '.adodb_date('Y-m-d',$t).' <br>';
+       $t = adodb_mktime(0,0,0,12,63,1965);
+       if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day 
overflow 5 '.adodb_date('Y-m-d',$t).' <br>';
+       $t = adodb_mktime(0,0,0,13,3,1965);
+       if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth 
overflow 1 <br>';
+       
+       print "Testing 2-digit => 4-digit year conversion<p>";
+       if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";
+       if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010<br>";
+       if (adodb_year_digit_check(20) != 2020) print "Err 2-digit 2020<br>";
+       if (adodb_year_digit_check(30) != 2030) print "Err 2-digit 2030<br>";
+       if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940<br>";
+       if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>";
+       if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>";
+       
+       // Test string formating
+       print "<p>Testing date formating</p>";
+       $fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O 
\R\F\C2822 r s t U w y Y z Z 2003';
+       $s1 = date($fmt,0);
+       $s2 = adodb_date($fmt,0);
+       if ($s1 != $s2) {
+               print " date() 0 failed<br>$s1<br>$s2<br>";
+       }
+       flush();
+       for ($i=100; --$i > 0; ) {
+
+               $ts = 3600.0*((rand()%60000)+(rand()%60000))+(rand()%60000);
+               $s1 = date($fmt,$ts);
+               $s2 = adodb_date($fmt,$ts);
+               //print "$s1 <br>$s2 <p>";
+               $pos = strcmp($s1,$s2);
+
+               if (($s1) != ($s2)) {
+                       for ($j=0,$k=strlen($s1); $j < $k; $j++) {
+                               if ($s1[$j] != $s2[$j]) {
+                                       print substr($s1,$j).' ';
+                                       break;
+                               }
+                       }
+                       print "<b>Error date(): $ts<br><pre> 
+&nbsp; \"$s1\" (date len=".strlen($s1).")
+&nbsp; \"$s2\" (adodb_date len=".strlen($s2).")</b></pre><br>";
+                       $fail = true;
+               }
+               
+               $a1 = getdate($ts);
+               $a2 = adodb_getdate($ts);
+               $rez = array_diff($a1,$a2);
+               if (sizeof($rez)>0) {
+                       print "<b>Error getdate() $ts</b><br>";
+                               print_r($a1);
+                       print "<br>";
+                               print_r($a2);
+                       print "<p>";
+                       $fail = true;
+               }
+       }
+       
+       // Test generation of dates outside 1901-2038
+       print "<p>Testing random dates between 100 and 4000</p>";
+       adodb_date_test_date(100,1);
+       for ($i=100; --$i >= 0;) {
+               $y1 = 100+rand(0,1970-100);
+               $m = rand(1,12);
+               adodb_date_test_date($y1,$m);
+               
+               $y1 = 3000-rand(0,3000-1970);
+               adodb_date_test_date($y1,$m);
+       }
+       print '<p>';
+       $start = 1960+rand(0,10);
+       $yrs = 12;
+       $i = 365.25*86400*($start-1970);
+       $offset = 36000+rand(10000,60000);
+       $max = 365*$yrs*86400;
+       $lastyear = 0;
+       
+       // we generate a timestamp, convert it to a date, and convert it back 
to a timestamp
+       // and check if the roundtrip broke the original timestamp value.
+       print "Testing $start to ".($start+$yrs).", or $max seconds, 
offset=$offset: ";
+       $cnt = 0;
+       for ($max += $i; $i < $max; $i += $offset) {
+               $ret = adodb_date('m,d,Y,H,i,s',$i);
+               $arr = explode(',',$ret);
+               if ($lastyear != $arr[2]) {
+                       $lastyear = $arr[2];
+                       print " $lastyear ";
+                       flush();
+               }
+               $newi = 
adodb_mktime($arr[3],$arr[4],$arr[5],$arr[0],$arr[1],$arr[2]);
+               if ($i != $newi) {
+                       print "Error at $i, adodb_mktime returned $newi ($ret)";
+                       $fail = true;
+                       break;
+               }
+               $cnt += 1;
+       }
+       echo "Tested $cnt dates<br>";
+       if (!$fail) print "<p>Passed !</p>";
+       else print "<p><b>Failed</b> :-(</p>";
+}
+
+/**
+       Returns day of week, 0 = Sunday,... 6=Saturday. 
+       Algorithm from PEAR::Date_Calc
+*/
+function adodb_dow($year, $month, $day)
+{
+/*
+Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 
and 
+proclaimed that from that time onwards 3 days would be dropped from the 
calendar 
+every 400 years.
+
+Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 
15, 1582 (Gregorian). 
+*/
+       if ($year <= 1582) {
+               if ($year < 1582 || 
+                       ($year == 1582 && ($month < 10 || ($month == 10 && $day 
< 15)))) $greg_correction = 3;
+                else
+                       $greg_correction = 0;
+       } else
+               $greg_correction = 0;
+       
+       if($month > 2)
+           $month -= 2;
+       else {
+           $month += 10;
+           $year--;
+       }
+       
+       $day =  floor((13 * $month - 1) / 5) +
+               $day + ($year % 100) +
+               floor(($year % 100) / 4) +
+               floor(($year / 100) / 4) - 2 *
+               floor($year / 100) + 77 + $greg_correction;
+       
+       return $day - 7 * floor($day / 7);
+}
+
+
+/**
+ Checks for leap year, returns true if it is. No 2-digit year check. Also 
+ handles julian calendar correctly.
+*/
+function _adodb_is_leap_year($year) 
+{
+       if ($year % 4 != 0) return false;
+       
+       if ($year % 400 == 0) {
+               return true;
+       // if gregorian calendar (>1582), century not-divisible by 400 is not 
leap
+       } else if ($year > 1582 && $year % 100 == 0 ) {
+               return false;
+       } 
+       
+       return true;
+}
+
+
+/**
+ checks for leap year, returns true if it is. Has 2-digit year check
+*/
+function adodb_is_leap_year($year) 
+{
+       return  _adodb_is_leap_year(adodb_year_digit_check($year));
+}
+
+/**
+       Fix 2-digit years. Works for any century.
+       Assumes that if 2-digit is more than 30 years in future, then previous 
century.
+*/
+function adodb_year_digit_check($y) 
+{
+       if ($y < 100) {
+       
+               $yr = (integer) date("Y");
+               $century = (integer) ($yr /100);
+               
+               if ($yr%100 > 50) {
+                       $c1 = $century + 1;
+                       $c0 = $century;
+               } else {
+                       $c1 = $century;
+                       $c0 = $century - 1;
+               }
+               $c1 *= 100;
+               // if 2-digit year is less than 30 years in future, set it to 
this century
+               // otherwise if more than 30 years in future, then we set 
2-digit year to the prev century.
+               if (($y + $c1) < $yr+30) $y = $y + $c1;
+               else $y = $y + $c0*100;
+       }
+       return $y;
+}
+
+/**
+ get local time zone offset from GMT
+*/
+function adodb_get_gmt_diff() 
+{
+static $TZ;
+       if (isset($TZ)) return $TZ;
+       
+       $TZ = mktime(0,0,0,1,2,1970,0) - gmmktime(0,0,0,1,2,1970,0);
+       return $TZ;
+}
+
+/**
+       Returns an array with date info.
+*/
+function adodb_getdate($d=false,$fast=false)
+{
+       if ($d === false) return getdate();
+       if (!defined('ADODB_TEST_DATES')) {
+               if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit 
signed range
+                       if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if 
windows, must be +ve integer
+                               return @getdate($d);
+               }
+       }
+       return _adodb_getdate($d);
+}
+
+/*
+// generate $YRS table for _adodb_getdate()
+function adodb_date_gentable($out=true)
+{
+
+       for ($i=1970; $i >= 1600; $i-=10) {
+               $s = adodb_gmmktime(0,0,0,1,1,$i);
+               echo "$i => $s,<br>";   
+       }
+}
+adodb_date_gentable();
+
+for ($i=1970; $i > 1500; $i--) {
+
+echo "<hr />$i ";
+       adodb_date_test_date($i,1,1);
+}
+
+*/
+
+
+$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
+$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+       
+function adodb_validdate($y,$m,$d)
+{
+global $_month_table_normal,$_month_table_leaf;
+
+       if (_adodb_is_leap_year($y)) $marr =& $_month_table_leaf;
+       else $marr =& $_month_table_normal;
+       
+       if ($m > 12 || $m < 1) return false;
+       
+       if ($d > 31 || $d < 1) return false;
+       
+       if ($marr[$m] < $d) return false;
+       
+       if ($y < 1000 && $y > 3000) return false;
+       
+       return true;
+}
+
+/**
+       Low-level function that returns the getdate() array. We have a special
+       $fast flag, which if set to true, will return fewer array values,
+       and is much faster as it does not calculate dow, etc.
+*/
+function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
+{
+static $YRS;
+global $_month_table_normal,$_month_table_leaf;
+
+       $d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff());
+       
+       $_day_power = 86400;
+       $_hour_power = 3600;
+       $_min_power = 60;
+       
+       if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, 
gregorian correction 
+       
+       $_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
+       $_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+       
+       $d366 = $_day_power * 366;
+       $d365 = $_day_power * 365;
+       
+       if ($d < 0) {
+               
+               if (empty($YRS)) $YRS = array(
+                       1970 => 0,
+                       1960 => -315619200,
+                       1950 => -631152000,
+                       1940 => -946771200,
+                       1930 => -1262304000,
+                       1920 => -1577923200,
+                       1910 => -1893456000,
+                       1900 => -2208988800,
+                       1890 => -2524521600,
+                       1880 => -2840140800,
+                       1870 => -3155673600,
+                       1860 => -3471292800,
+                       1850 => -3786825600,
+                       1840 => -4102444800,
+                       1830 => -4417977600,
+                       1820 => -4733596800,
+                       1810 => -5049129600,
+                       1800 => -5364662400,
+                       1790 => -5680195200,
+                       1780 => -5995814400,
+                       1770 => -6311347200,
+                       1760 => -6626966400,
+                       1750 => -6942499200,
+                       1740 => -7258118400,
+                       1730 => -7573651200,
+                       1720 => -7889270400,
+                       1710 => -8204803200,
+                       1700 => -8520336000,
+                       1690 => -8835868800,
+                       1680 => -9151488000,
+                       1670 => -9467020800,
+                       1660 => -9782640000,
+                       1650 => -10098172800,
+                       1640 => -10413792000,
+                       1630 => -10729324800,
+                       1620 => -11044944000,
+                       1610 => -11360476800,
+                       1600 => -11676096000);
+
+               if ($is_gmt) $origd = $d;
+               // The valid range of a 32bit signed timestamp is typically 
from 
+               // Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 
GMT
+               //
+               
+               # old algorithm iterates through all years. new algorithm does 
it in
+               # 10 year blocks
+               
+               /*
+               # old algo
+               for ($a = 1970 ; --$a >= 0;) {
+                       $lastd = $d;
+                       
+                       if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
+                       else $d += $d365;
+                       
+                       if ($d >= 0) {
+                               $year = $a;
+                               break;
+                       }
+               }
+               */
+               
+               $lastsecs = 0;
+               $lastyear = 1970;
+               foreach($YRS as $year => $secs) {
+                       if ($d >= $secs) {
+                               $a = $lastyear;
+                               break;
+                       }
+                       $lastsecs = $secs;
+                       $lastyear = $year;
+               }
+               
+               $d -= $lastsecs;
+               if (!isset($a)) $a = $lastyear;
+               
+               //echo ' yr=',$a,' ', $d,'.';
+               
+               for (; --$a >= 0;) {
+                       $lastd = $d;
+                       
+                       if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
+                       else $d += $d365;
+                       
+                       if ($d >= 0) {
+                               $year = $a;
+                               break;
+                       }
+               }
+               /**/
+               
+               $secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
+               
+               $d = $lastd;
+               $mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
+               for ($a = 13 ; --$a > 0;) {
+                       $lastd = $d;
+                       $d += $mtab[$a] * $_day_power;
+                       if ($d >= 0) {
+                               $month = $a;
+                               $ndays = $mtab[$a];
+                               break;
+                       }
+               }
+               
+               $d = $lastd;
+               $day = $ndays + ceil(($d+1) / ($_day_power));
+
+               $d += ($ndays - $day+1)* $_day_power;
+               $hour = floor($d/$_hour_power);
+       
+       } else {
+               for ($a = 1970 ;; $a++) {
+                       $lastd = $d;
+                       
+                       if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
+                       else $d -= $d365;
+                       if ($d < 0) {
+                               $year = $a;
+                               break;
+                       }
+               }
+               $secsInYear = $lastd;
+               $d = $lastd;
+               $mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
+               for ($a = 1 ; $a <= 12; $a++) {
+                       $lastd = $d;
+                       $d -= $mtab[$a] * $_day_power;
+                       if ($d < 0) {
+                               $month = $a;
+                               $ndays = $mtab[$a];
+                               break;
+                       }
+               }
+               $d = $lastd;
+               $day = ceil(($d+1) / $_day_power);
+               $d = $d - ($day-1) * $_day_power;
+               $hour = floor($d /$_hour_power);
+       }
+       
+       $d -= $hour * $_hour_power;
+       $min = floor($d/$_min_power);
+       $secs = $d - $min * $_min_power;
+       if ($fast) {
+               return array(
+               'seconds' => $secs,
+               'minutes' => $min,
+               'hours' => $hour,
+               'mday' => $day,
+               'mon' => $month,
+               'year' => $year,
+               'yday' => floor($secsInYear/$_day_power),
+               'leap' => $leaf,
+               'ndays' => $ndays
+               );
+       }
+       
+       
+       $dow = adodb_dow($year,$month,$day);
+
+       return array(
+               'seconds' => $secs,
+               'minutes' => $min,
+               'hours' => $hour,
+               'mday' => $day,
+               'wday' => $dow,
+               'mon' => $month,
+               'year' => $year,
+               'yday' => floor($secsInYear/$_day_power),
+               'weekday' => gmdate('l',$_day_power*(3+$dow)),
+               'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),
+               0 => $origd
+       );
+}
+
+function adodb_gmdate($fmt,$d=false)
+{
+       return adodb_date($fmt,$d,true);
+}
+
+// accepts unix timestamp and iso date format in $d
+function adodb_date2($fmt, $d=false, $is_gmt=false)
+{
+       if ($d !== false) {
+               if (!preg_match( 
+                       "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ 
-]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+                       ($d), $rr)) return adodb_date($fmt,false,$is_gmt);
+
+               if ($rr[1] <= 100 && $rr[2]<= 1) return 
adodb_date($fmt,false,$is_gmt);
+       
+               // h-m-s-MM-DD-YY
+               if (!isset($rr[5])) $d = 
adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1],false,$is_gmt);
+               else $d = 
@adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1],false,$is_gmt);
+       }
+       
+       return adodb_date($fmt,$d,$is_gmt);
+}
+
+
+/**
+       Return formatted date based on timestamp $d
+*/
+function adodb_date($fmt,$d=false,$is_gmt=false)
+{
+static $daylight;
+
+       if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
+       if (!defined('ADODB_TEST_DATES')) {
+               if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit 
signed range
+                       if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if 
windows, must be +ve integer
+                               return ($is_gmt)? @gmdate($fmt,$d): 
@date($fmt,$d);
+
+               }
+       }
+       $_day_power = 86400;
+       
+       $arr = _adodb_getdate($d,true,$is_gmt);
+       
+       if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
+       if ($daylight) adodb_daylight_sv($arr, $is_gmt);
+       
+       $year = $arr['year'];
+       $month = $arr['mon'];
+       $day = $arr['mday'];
+       $hour = $arr['hours'];
+       $min = $arr['minutes'];
+       $secs = $arr['seconds'];
+       
+       $max = strlen($fmt);
+       $dates = '';
+       
+       $isphp5 = PHP_VERSION >= 5;
+       
+       /*
+               at this point, we have the following integer vars to manipulate:
+               $year, $month, $day, $hour, $min, $secs
+       */
+       for ($i=0; $i < $max; $i++) {
+               switch($fmt[$i]) {
+               case 'T': $dates .= date('T');break;
+               // YEAR
+               case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
+               case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
+               
+                       // 4.3.11 uses '04 Jun 2004'
+                       // 4.3.8 uses  ' 4 Jun 2004'
+                       $dates .= 
gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '         
+                               . ($day<10?'0'.$day:$day) . ' 
'.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
+                       
+                       if ($hour < 10) $dates .= '0'.$hour; else $dates .= 
$hour; 
+                       
+                       if ($min < 10) $dates .= ':0'.$min; else $dates .= 
':'.$min;
+                       
+                       if ($secs < 10) $dates .= ':0'.$secs; else $dates .= 
':'.$secs;
+                       
+                       $gmt = adodb_get_gmt_diff();
+                       if ($isphp5) 
+                               $dates .= sprintf(' 
%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
+                       else
+                               $dates .= sprintf(' 
%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+                       break;
+                               
+               case 'Y': $dates .= $year; break;
+               case 'y': $dates .= substr($year,strlen($year)-2,2); break;
+               // MONTH
+               case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= 
$month; break;
+               case 'Q': $dates .= ($month+3)>>2; break;
+               case 'n': $dates .= $month; break;
+               case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); 
break;
+               case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); 
break;
+               // DAY
+               case 't': $dates .= $arr['ndays']; break;
+               case 'z': $dates .= $arr['yday']; break;
+               case 'w': $dates .= adodb_dow($year,$month,$day); break;
+               case 'l': $dates .= 
gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+               case 'D': $dates .= 
gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+               case 'j': $dates .= $day; break;
+               case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; 
break;
+               case 'S': 
+                       $d10 = $day % 10;
+                       if ($d10 == 1) $dates .= 'st';
+                       else if ($d10 == 2 && $day != 12) $dates .= 'nd';
+                       else if ($d10 == 3) $dates .= 'rd';
+                       else $dates .= 'th';
+                       break;
+                       
+               // HOUR
+               case 'Z':
+                       $dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;
+               case 'O': 
+                       $gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();
+                       
+                       if ($isphp5)
+                               $dates .= 
sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
+                       else
+                               $dates .= 
sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+                       break;
+                       
+               case 'H': 
+                       if ($hour < 10) $dates .= '0'.$hour; 
+                       else $dates .= $hour; 
+                       break;
+               case 'h': 
+                       if ($hour > 12) $hh = $hour - 12; 
+                       else {
+                               if ($hour == 0) $hh = '12'; 
+                               else $hh = $hour;
+                       }
+                       
+                       if ($hh < 10) $dates .= '0'.$hh;
+                       else $dates .= $hh;
+                       break;
+                       
+               case 'G': 
+                       $dates .= $hour;
+                       break;
+                       
+               case 'g':
+                       if ($hour > 12) $hh = $hour - 12; 
+                       else {
+                               if ($hour == 0) $hh = '12'; 
+                               else $hh = $hour; 
+                       }
+                       $dates .= $hh;
+                       break;
+               // MINUTES
+               case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= 
$min; break;
+               // SECONDS
+               case 'U': $dates .= $d; break;
+               case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= 
$secs; break;
+               // AM/PM
+               // Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
+               case 'a':
+                       if ($hour>=12) $dates .= 'pm';
+                       else $dates .= 'am';
+                       break;
+               case 'A':
+                       if ($hour>=12) $dates .= 'PM';
+                       else $dates .= 'AM';
+                       break;
+               default:
+                       $dates .= $fmt[$i]; break;
+               // ESCAPE
+               case "\\": 
+                       $i++;
+                       if ($i < $max) $dates .= $fmt[$i];
+                       break;
+               }
+       }
+       return $dates;
+}
+
+/**
+       Returns a timestamp given a GMT/UTC time. 
+       Note that $is_dst is not implemented and is ignored.
+*/
+function 
adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
+{
+       return adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst,true);
+}
+
+/**
+       Return a timestamp given a local time. Originally by jackbbs.
+       Note that $is_dst is not implemented and is ignored.
+       
+       Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
+*/
+function 
adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false)
 
+{
+       if (!defined('ADODB_TEST_DATES')) {
+
+               if ($mon === false) {
+                       return $is_gmt? @gmmktime($hr,$min,$sec): 
@mktime($hr,$min,$sec);
+               }
+               
+               // for windows, we don't check 1970 because with timezone 
differences, 
+               // 1 Jan 1970 could generate negative timestamp, which is 
illegal
+               if (1971 < $year && $year < 2038
+                       || !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && 
$year < 2038)
+                       ) {
+                               return $is_gmt ?
+                                       
@gmmktime($hr,$min,$sec,$mon,$day,$year):
+                                       @mktime($hr,$min,$sec,$mon,$day,$year);
+                       }
+       }
+       
+       $gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff();
+
+       /*
+       # disabled because some people place large values in $sec.
+       # however we need it for $mon because we use an array...
+       $hr = intval($hr);
+       $min = intval($min);
+       $sec = intval($sec);
+       */
+       $mon = intval($mon);
+       $day = intval($day);
+       $year = intval($year);
+       
+       
+       $year = adodb_year_digit_check($year);
+
+       if ($mon > 12) {
+               $y = floor($mon / 12);
+               $year += $y;
+               $mon -= $y*12;
+       } else if ($mon < 1) {
+               $y = ceil((1-$mon) / 12);
+               $year -= $y;
+               $mon += $y*12;
+       }
+       
+       $_day_power = 86400;
+       $_hour_power = 3600;
+       $_min_power = 60;
+       
+       $_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
+       $_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+       
+       $_total_date = 0;
+       if ($year >= 1970) {
+               for ($a = 1970 ; $a <= $year; $a++) {
+                       $leaf = _adodb_is_leap_year($a);
+                       if ($leaf == true) {
+                               $loop_table = $_month_table_leaf;
+                               $_add_date = 366;
+                       } else {
+                               $loop_table = $_month_table_normal;
+                               $_add_date = 365;
+                       }
+                       if ($a < $year) { 
+                               $_total_date += $_add_date;
+                       } else {
+                               for($b=1;$b<$mon;$b++) {
+                                       $_total_date += $loop_table[$b];
+                               }
+                       }
+               }
+               $_total_date +=$day-1;
+               $ret = $_total_date * $_day_power + $hr * $_hour_power + $min * 
$_min_power + $sec + $gmt_different;
+       
+       } else {
+               for ($a = 1969 ; $a >= $year; $a--) {
+                       $leaf = _adodb_is_leap_year($a);
+                       if ($leaf == true) {
+                               $loop_table = $_month_table_leaf;
+                               $_add_date = 366;
+                       } else {
+                               $loop_table = $_month_table_normal;
+                               $_add_date = 365;
+                       }
+                       if ($a > $year) { $_total_date += $_add_date;
+                       } else {
+                               for($b=12;$b>$mon;$b--) {
+                                       $_total_date += $loop_table[$b];
+                               }
+                       }
+               }
+               $_total_date += $loop_table[$mon] - $day;
+               
+               $_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
+               $_day_time = $_day_power - $_day_time;
+               $ret = -( $_total_date * $_day_power + $_day_time - 
$gmt_different);
+               if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 
Oct 1582 - gregorian correction
+               else if ($ret < -12219321600) $ret = -12219321600; // if in 
limbo, reset to 15 Oct 1582.
+       } 
+       //print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
+       return $ret;
+}
+
+function adodb_gmstrftime($fmt, $ts=false)
+{
+       return adodb_strftime($fmt,$ts,true);
+}
+
+// hack - convert to adodb_date
+function adodb_strftime($fmt, $ts=false,$is_gmt=false)
+{
+global $ADODB_DATE_LOCALE;
+
+       if (!defined('ADODB_TEST_DATES')) {
+               if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit 
signed range
+                       if (!defined('ADODB_NO_NEGATIVE_TS') || $ts >= 0) // if 
windows, must be +ve integer
+                               return ($is_gmt)? @gmstrftime($fmt,$ts): 
@strftime($fmt,$ts);
+
+               }
+       }
+       
+       if (empty($ADODB_DATE_LOCALE)) {
+               $tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 
1 am
+               $sep = substr($tstr,2,1);
+               $hasAM = strrpos($tstr,'M') !== false;
+               
+               $ADODB_DATE_LOCALE = array();
+               $ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 
'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';     
+               $ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
+                       
+       }
+       $inpct = false;
+       $fmtdate = '';
+       for ($i=0,$max = strlen($fmt); $i < $max; $i++) {
+               $ch = $fmt[$i];
+               if ($ch == '%') {
+                       if ($inpct) {
+                               $fmtdate .= '%';
+                               $inpct = false;
+                       } else
+                               $inpct = true;
+               } else if ($inpct) {
+               
+                       $inpct = false;
+                       switch($ch) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'E':
+                       case 'O':
+                               /* ignore format modifiers */
+                               $inpct = true; 
+                               break;
+                               
+                       case 'a': $fmtdate .= 'D'; break;
+                       case 'A': $fmtdate .= 'l'; break;
+                       case 'h':
+                       case 'b': $fmtdate .= 'M'; break;
+                       case 'B': $fmtdate .= 'F'; break;
+                       case 'c': $fmtdate .= 
$ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;
+                       case 'C': $fmtdate .= '\C?'; break; // century
+                       case 'd': $fmtdate .= 'd'; break;
+                       case 'D': $fmtdate .= 'm/d/y'; break;
+                       case 'e': $fmtdate .= 'j'; break;
+                       case 'g': $fmtdate .= '\g?'; break; //?
+                       case 'G': $fmtdate .= '\G?'; break; //?
+                       case 'H': $fmtdate .= 'H'; break;
+                       case 'I': $fmtdate .= 'h'; break;
+                       case 'j': $fmtdate .= '?z'; $parsej = true; break; // 
wrong as j=1-based, z=0-basd
+                       case 'm': $fmtdate .= 'm'; break;
+                       case 'M': $fmtdate .= 'i'; break;
+                       case 'n': $fmtdate .= "\n"; break;
+                       case 'p': $fmtdate .= 'a'; break;
+                       case 'r': $fmtdate .= 'h:i:s a'; break;
+                       case 'R': $fmtdate .= 'H:i:s'; break;
+                       case 'S': $fmtdate .= 's'; break;
+                       case 't': $fmtdate .= "\t"; break;
+                       case 'T': $fmtdate .= 'H:i:s'; break;
+                       case 'u': $fmtdate .= '?u'; $parseu = true; break; // 
wrong strftime=1-based, date=0-based
+                       case 'U': $fmtdate .= '?U'; $parseU = true; break;// 
wrong strftime=1-based, date=0-based
+                       case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
+                       case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
+                       case 'w': $fmtdate .= '?w'; $parseu = true; break; // 
wrong strftime=1-based, date=0-based
+                       case 'W': $fmtdate .= '?W'; $parseU = true; break;// 
wrong strftime=1-based, date=0-based
+                       case 'y': $fmtdate .= 'y'; break;
+                       case 'Y': $fmtdate .= 'Y'; break;
+                       case 'Z': $fmtdate .= 'T'; break;
+                       }
+               } else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && 
($ch) <= 'z' ))
+                       $fmtdate .= "\\".$ch;
+               else
+                       $fmtdate .= $ch;
+       }
+       //echo "fmt=",$fmtdate,"<br>";
+       if ($ts === false) $ts = time();
+       $ret = adodb_date($fmtdate, $ts, $is_gmt);
+       return $ret;
+}
+
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb-xmlschema.inc.php
diff -u phpgwapi/inc/adodb/adodb-xmlschema.inc.php:1.2 
phpgwapi/inc/adodb/adodb-xmlschema.inc.php:1.3
--- phpgwapi/inc/adodb/adodb-xmlschema.inc.php:1.2      Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb-xmlschema.inc.php  Tue Feb 21 13:47:42 2006
@@ -1,2194 +1,2221 @@
-<?php
-// Copyright (c) 2004 ars Cognita Inc., all rights reserved
-/* 
******************************************************************************
-    Released under both BSD license and Lesser GPL library license. 
-       Whenever there is any discrepancy between the two licenses, 
-       the BSD license will take precedence. 
-*******************************************************************************/
-/**
- * xmlschema is a class that allows the user to quickly and easily
- * build a database on any ADOdb-supported platform using a simple
- * XML schema.
- *
- * Last Editor: $Author: skwashd $
- * @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.2 $
- *
- * @package axmls
- * @tutorial getting_started.pkg
- */
-
-/**
-* Debug on or off
-*/
-if( !defined( 'XMLS_DEBUG' ) ) {
-       define( 'XMLS_DEBUG', FALSE );
-}
-
-/**
-* Default prefix key
-*/
-if( !defined( 'XMLS_PREFIX' ) ) {
-       define( 'XMLS_PREFIX', '%%P' );
-}
-
-/**
-* Maximum length allowed for object prefix
-*/
-if( !defined( 'XMLS_PREFIX_MAXLEN' ) ) {
-       define( 'XMLS_PREFIX_MAXLEN', 10 );
-}
-
-/**
-* Execute SQL inline as it is generated
-*/
-if( !defined( 'XMLS_EXECUTE_INLINE' ) ) {
-       define( 'XMLS_EXECUTE_INLINE', FALSE );
-}
-
-/**
-* Continue SQL Execution if an error occurs?
-*/
-if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) ) {
-       define( 'XMLS_CONTINUE_ON_ERROR', FALSE );
-}
-
-/**
-* Current Schema Version
-*/
-if( !defined( 'XMLS_SCHEMA_VERSION' ) ) {
-       define( 'XMLS_SCHEMA_VERSION', '0.2' );
-}
-
-/**
-* Default Schema Version.  Used for Schemas without an explicit version set.
-*/
-if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) ) {
-       define( 'XMLS_DEFAULT_SCHEMA_VERSION', '0.1' );
-}
-
-/**
-* Default Schema Version.  Used for Schemas without an explicit version set.
-*/
-if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) {
-       define( 'XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER' );
-}
-
-/**
-* Include the main ADODB library
-*/
-if( !defined( '_ADODB_LAYER' ) ) {
-       require( 'adodb.inc.php' );
-       require( 'adodb-datadict.inc.php' );
-}
-
-/**
-* Abstract DB Object. This class provides basic methods for database objects, 
such
-* as tables and indexes.
-*
-* @package axmls
-* @access private
-*/
-class dbObject {
-       
-       /**
-       * var object Parent
-       */
-       var $parent;
-       
-       /**
-       * var string current element
-       */
-       var $currentElement;
-       
-       /**
-       * NOP
-       */
-       function dbObject( &$parent, $attributes = NULL ) {
-               $this->parent =& $parent;
-       }
-       
-       /**
-       * XML Callback to process start elements
-       *
-       * @access private
-       */
-       function _tag_open( &$parser, $tag, $attributes ) {
-               
-       }
-       
-       /**
-       * XML Callback to process CDATA elements
-       *
-       * @access private
-       */
-       function _tag_cdata( &$parser, $cdata ) {
-               
-       }
-       
-       /**
-       * XML Callback to process end elements
-       *
-       * @access private
-       */
-       function _tag_close( &$parser, $tag ) {
-               
-       }
-       
-       function create() {
-               return array();
-       }
-       
-       /**
-       * Destroys the object
-       */
-       function destroy() {
-               unset( $this );
-       }
-       
-       /**
-       * Checks whether the specified RDBMS is supported by the current
-       * database object or its ranking ancestor.
-       *
-       * @param string $platform RDBMS platform name (from ADODB platform 
list).
-       * @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
-       */
-       function supportedPlatform( $platform = NULL ) {
-               return is_object( $this->parent ) ? 
$this->parent->supportedPlatform( $platform ) : TRUE;
-       }
-       
-       /**
-       * Returns the prefix set by the ranking ancestor of the database object.
-       *
-       * @param string $name Prefix string.
-       * @return string Prefix.
-       */
-       function prefix( $name = '' ) {
-               return is_object( $this->parent ) ? $this->parent->prefix( 
$name ) : $name;
-       }
-       
-       /**
-       * Extracts a field ID from the specified field.
-       *
-       * @param string $field Field.
-       * @return string Field ID.
-       */
-       function FieldID( $field ) {
-               return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
-       }
-}
-
-/**
-* Creates a table object in ADOdb's datadict format
-*
-* This class stores information about a database table. As charactaristics
-* of the table are loaded from the external source, methods and properties
-* of this class are used to build up the table description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbTable extends dbObject {
-       
-       /**
-       * @var string Table name
-       */
-       var $name;
-       
-       /**
-       * @var array Field specifier: Meta-information about each field
-       */
-       var $fields = array();
-       
-       /**
-       * @var array List of table indexes.
-       */
-       var $indexes = array();
-       
-       /**
-       * @var array Table options: Table-level options
-       */
-       var $opts = array();
-       
-       /**
-       * @var string Field index: Keeps track of which field is currently 
being processed
-       */
-       var $current_field;
-       
-       /**
-       * @var boolean Mark table for destruction
-       * @access private
-       */
-       var $drop_table;
-       
-       /**
-       * @var boolean Mark field for destruction (not yet implemented)
-       * @access private
-       */
-       var $drop_field = array();
-       
-       /**
-       * Iniitializes a new table object.
-       *
-       * @param string $prefix DB Object prefix
-       * @param array $attributes Array of table attributes.
-       */
-       function dbTable( &$parent, $attributes = NULL ) {
-               $this->parent =& $parent;
-               $this->name = $this->prefix($attributes['NAME']);
-       }
-       
-       /**
-       * XML Callback to process start elements. Elements currently 
-       * processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & 
DEFAULT. 
-       *
-       * @access private
-       */
-       function _tag_open( &$parser, $tag, $attributes ) {
-               $this->currentElement = strtoupper( $tag );
-               
-               switch( $this->currentElement ) {
-                       case 'INDEX':
-                               if( !isset( $attributes['PLATFORM'] ) OR 
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-                                       xml_set_object( $parser, 
$this->addIndex( $attributes ) );
-                               }
-                               break;
-                       case 'DATA':
-                               if( !isset( $attributes['PLATFORM'] ) OR 
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-                                       xml_set_object( $parser, 
$this->addData( $attributes ) );
-                               }
-                               break;
-                       case 'DROP':
-                               $this->drop();
-                               break;
-                       case 'FIELD':
-                               // Add a field
-                               $fieldName = $attributes['NAME'];
-                               $fieldType = $attributes['TYPE'];
-                               $fieldSize = isset( $attributes['SIZE'] ) ? 
$attributes['SIZE'] : NULL;
-                               $fieldOpts = isset( $attributes['OPTS'] ) ? 
$attributes['OPTS'] : NULL;
-                               
-                               $this->addField( $fieldName, $fieldType, 
$fieldSize, $fieldOpts );
-                               break;
-                       case 'KEY':
-                       case 'NOTNULL':
-                       case 'AUTOINCREMENT':
-                               // Add a field option
-                               $this->addFieldOpt( $this->current_field, 
$this->currentElement );
-                               break;
-                       case 'DEFAULT':
-                               // Add a field option to the table object
-                               
-                               // Work around ADOdb datadict issue that 
misinterprets empty strings.
-                               if( $attributes['VALUE'] == '' ) {
-                                       $attributes['VALUE'] = " '' ";
-                               }
-                               
-                               $this->addFieldOpt( $this->current_field, 
$this->currentElement, $attributes['VALUE'] );
-                               break;
-                       case 'DEFDATE':
-                       case 'DEFTIMESTAMP':
-                               // Add a field option to the table object
-                               $this->addFieldOpt( $this->current_field, 
$this->currentElement );
-                               break;
-                       default:
-                               // print_r( array( $tag, $attributes ) );
-               }
-       }
-       
-       /**
-       * XML Callback to process CDATA elements
-       *
-       * @access private
-       */
-       function _tag_cdata( &$parser, $cdata ) {
-               switch( $this->currentElement ) {
-                       // Table constraint
-                       case 'CONSTRAINT':
-                               if( isset( $this->current_field ) ) {
-                                       $this->addFieldOpt( 
$this->current_field, $this->currentElement, $cdata );
-                               } else {
-                                       $this->addTableOpt( $cdata );
-                               }
-                               break;
-                       // Table option
-                       case 'OPT':
-                               $this->addTableOpt( $cdata );
-                               break;
-                       default:
-                               
-               }
-       }
-       
-       /**
-       * XML Callback to process end elements
-       *
-       * @access private
-       */
-       function _tag_close( &$parser, $tag ) {
-               $this->currentElement = '';
-               
-               switch( strtoupper( $tag ) ) {
-                       case 'TABLE':
-                               $this->parent->addSQL( $this->create( 
$this->parent ) );
-                               xml_set_object( $parser, $this->parent );
-                               $this->destroy();
-                               break;
-                       case 'FIELD':
-                               unset($this->current_field);
-                               break;
-
-               }
-       }
-       
-       /**
-       * Adds an index to a table object
-       *
-       * @param array $attributes Index attributes
-       * @return object dbIndex object
-       */
-       function &addIndex( $attributes ) {
-               $name = strtoupper( $attributes['NAME'] );
-               $this->indexes[$name] =& new dbIndex( $this, $attributes );
-               return $this->indexes[$name];
-       }
-       
-       /**
-       * Adds data to a table object
-       *
-       * @param array $attributes Data attributes
-       * @return object dbData object
-       */
-       function &addData( $attributes ) {
-               if( !isset( $this->data ) ) {
-                       $this->data =& new dbData( $this, $attributes );
-               }
-               return $this->data;
-       }
-       
-       /**
-       * Adds a field to a table object
-       *
-       * $name is the name of the table to which the field should be added. 
-       * $type is an ADODB datadict field type. The following field types
-       * are supported as of ADODB 3.40:
-       *       - C:  varchar
-       *       - X:  CLOB (character large object) or largest varchar size
-       *          if CLOB is not supported
-       *       - C2: Multibyte varchar
-       *       - X2: Multibyte CLOB
-       *       - B:  BLOB (binary large object)
-       *       - D:  Date (some databases do not support this, and we return a 
datetime type)
-       *       - T:  Datetime or Timestamp
-       *       - L:  Integer field suitable for storing booleans (0 or 1)
-       *       - I:  Integer (mapped to I4)
-       *       - I1: 1-byte integer
-       *       - I2: 2-byte integer
-       *       - I4: 4-byte integer
-       *       - I8: 8-byte integer
-       *       - F:  Floating point number
-       *       - N:  Numeric or decimal number
-       *
-       * @param string $name Name of the table to which the field will be 
added.
-       * @param string $type   ADODB datadict field type.
-       * @param string $size   Field size
-       * @param array $opts    Field options array
-       * @return array Field specifier array
-       */
-       function addField( $name, $type, $size = NULL, $opts = NULL ) {
-               $field_id = $this->FieldID( $name );
-               
-               // Set the field index so we know where we are
-               $this->current_field = $field_id;
-               
-               // Set the field name (required)
-               $this->fields[$field_id]['NAME'] = $name;
-               
-               // Set the field type (required)
-               $this->fields[$field_id]['TYPE'] = $type;
-               
-               // Set the field size (optional)
-               if( isset( $size ) ) {
-                       $this->fields[$field_id]['SIZE'] = $size;
-               }
-               
-               // Set the field options
-               if( isset( $opts ) ) {
-                       $this->fields[$field_id]['OPTS'][] = $opts;
-               }
-       }
-       
-       /**
-       * Adds a field option to the current field specifier
-       *
-       * This method adds a field option allowed by the ADOdb datadict 
-       * and appends it to the given field.
-       *
-       * @param string $field  Field name
-       * @param string $opt ADOdb field option
-       * @param mixed $value Field option value
-       * @return array Field specifier array
-       */
-       function addFieldOpt( $field, $opt, $value = NULL ) {
-               if( !isset( $value ) ) {
-                       $this->fields[$this->FieldID( $field )]['OPTS'][] = 
$opt;
-               // Add the option and value
-               } else {
-                       $this->fields[$this->FieldID( $field )]['OPTS'][] = 
array( $opt => $value );
-               }
-       }
-       
-       /**
-       * Adds an option to the table
-       *
-       * This method takes a comma-separated list of table-level options
-       * and appends them to the table object.
-       *
-       * @param string $opt Table option
-       * @return array Options
-       */
-       function addTableOpt( $opt ) {
-               $this->opts[] = $opt;
-               
-               return $this->opts;
-       }
-       
-       /**
-       * Generates the SQL that will create the table in the database
-       *
-       * @param object $xmls adoSchema object
-       * @return array Array containing table creation SQL
-       */
-       function create( &$xmls ) {
-               $sql = array();
-               
-               // drop any existing indexes
-               if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( 
$this->name ) ) ) {
-                       foreach( $legacy_indexes as $index => $index_details ) {
-                               $sql[] = $xmls->dict->DropIndexSQL( $index, 
$this->name );
-                       }
-               }
-               
-               // remove fields to be dropped from table object
-               foreach( $this->drop_field as $field ) {
-                       unset( $this->fields[$field] );
-               }
-               
-               // if table exists
-               if( is_array( $legacy_fields = $xmls->dict->MetaColumns( 
$this->name ) ) ) {
-                       // drop table
-                       if( $this->drop_table ) {
-                               $sql[] = $xmls->dict->DropTableSQL( $this->name 
);
-                               
-                               return $sql;
-                       }
-                       
-                       // drop any existing fields not in schema
-                       foreach( $legacy_fields as $field_id => $field ) {
-                               if( !isset( $this->fields[$field_id] ) ) {
-                                       $sql[] = $xmls->dict->DropColumnSQL( 
$this->name, '`'.$field->name.'`' );
-                               }
-                       }
-               // if table doesn't exist
-               } else {
-                       if( $this->drop_table ) {
-                               return $sql;
-                       }
-                       
-                       $legacy_fields = array();
-               }
-               
-               // Loop through the field specifier array, building the 
associative array for the field options
-               $fldarray = array();
-               
-               foreach( $this->fields as $field_id => $finfo ) {
-                       // Set an empty size if it isn't supplied
-                       if( !isset( $finfo['SIZE'] ) ) {
-                               $finfo['SIZE'] = '';
-                       }
-                       
-                       // Initialize the field array with the type and size
-                       $fldarray[$field_id] = array(
-                               'NAME' => $finfo['NAME'],
-                               'TYPE' => $finfo['TYPE'],
-                               'SIZE' => $finfo['SIZE']
-                       );
-                       
-                       // Loop through the options array and add the field 
options. 
-                       if( isset( $finfo['OPTS'] ) ) {
-                               foreach( $finfo['OPTS'] as $opt ) {
-                                       // Option has an argument.
-                                       if( is_array( $opt ) ) {
-                                               $key = key( $opt );
-                                               $value = $opt[key( $opt )];
-                                               @$fldarray[$field_id][$key] .= 
$value;
-                                       // Option doesn't have arguments
-                                       } else {
-                                               $fldarray[$field_id][$opt] = 
$opt;
-                                       }
-                               }
-                       }
-               }
-               
-               if( empty( $legacy_fields ) ) {
-                       // Create the new table
-                       $sql[] = $xmls->dict->CreateTableSQL( $this->name, 
$fldarray, $this->opts );
-                       logMsg( end( $sql ), 'Generated CreateTableSQL' );
-               } else {
-                       // Upgrade an existing table
-                       logMsg( "Upgrading {$this->name} using 
'{$xmls->upgrade}'" );
-                       switch( $xmls->upgrade ) {
-                               // Use ChangeTableSQL
-                               case 'ALTER':
-                                       logMsg( 'Generated ChangeTableSQL 
(ALTERing table)' );
-                                       $sql[] = $xmls->dict->ChangeTableSQL( 
$this->name, $fldarray, $this->opts );
-                                       break;
-                               case 'REPLACE':
-                                       logMsg( 'Doing upgrade REPLACE 
(testing)' );
-                                       $sql[] = $xmls->dict->DropTableSQL( 
$this->name );
-                                       $sql[] = $xmls->dict->CreateTableSQL( 
$this->name, $fldarray, $this->opts );
-                                       break;
-                               // ignore table
-                               default:
-                                       return array();
-                       }
-               }
-               
-               foreach( $this->indexes as $index ) {
-                       $sql[] = $index->create( $xmls );
-               }
-               
-               if( isset( $this->data ) ) {
-                       $sql[] = $this->data->create( $xmls );
-               }
-               
-               return $sql;
-       }
-       
-       /**
-       * Marks a field or table for destruction
-       */
-       function drop() {
-               if( isset( $this->current_field ) ) {
-                       // Drop the current field
-                       logMsg( "Dropping field '{$this->current_field}' from 
table '{$this->name}'" );
-                       // $this->drop_field[$this->current_field] = 
$xmls->dict->DropColumnSQL( $this->name, $this->current_field );
-                       $this->drop_field[$this->current_field] = 
$this->current_field;
-               } else {
-                       // Drop the current table
-                       logMsg( "Dropping table '{$this->name}'" );
-                       // $this->drop_table = $xmls->dict->DropTableSQL( 
$this->name );
-                       $this->drop_table = TRUE;
-               }
-       }
-}
-
-/**
-* Creates an index object in ADOdb's datadict format
-*
-* This class stores information about a database index. As charactaristics
-* of the index are loaded from the external source, methods and properties
-* of this class are used to build up the index description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbIndex extends dbObject {
-       
-       /**
-       * @var string   Index name
-       */
-       var $name;
-       
-       /**
-       * @var array    Index options: Index-level options
-       */
-       var $opts = array();
-       
-       /**
-       * @var array    Indexed fields: Table columns included in this index
-       */
-       var $columns = array();
-       
-       /**
-       * @var boolean Mark index for destruction
-       * @access private
-       */
-       var $drop = FALSE;
-       
-       /**
-       * Initializes the new dbIndex object.
-       *
-       * @param object $parent Parent object
-       * @param array $attributes Attributes
-       *
-       * @internal
-       */
-       function dbIndex( &$parent, $attributes = NULL ) {
-               $this->parent =& $parent;
-               
-               $this->name = $this->prefix ($attributes['NAME']);
-       }
-       
-       /**
-       * XML Callback to process start elements
-       *
-       * Processes XML opening tags. 
-       * Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, 
FULLTEXT & HASH. 
-       *
-       * @access private
-       */
-       function _tag_open( &$parser, $tag, $attributes ) {
-               $this->currentElement = strtoupper( $tag );
-               
-               switch( $this->currentElement ) {
-                       case 'DROP':
-                               $this->drop();
-                               break;
-                       case 'CLUSTERED':
-                       case 'BITMAP':
-                       case 'UNIQUE':
-                       case 'FULLTEXT':
-                       case 'HASH':
-                               // Add index Option
-                               $this->addIndexOpt( $this->currentElement );
-                               break;
-                       default:
-                               // print_r( array( $tag, $attributes ) );
-               }
-       }
-       
-       /**
-       * XML Callback to process CDATA elements
-       *
-       * Processes XML cdata.
-       *
-       * @access private
-       */
-       function _tag_cdata( &$parser, $cdata ) {
-               switch( $this->currentElement ) {
-                       // Index field name
-                       case 'COL':
-                               $this->addField( $cdata );
-                               break;
-                       default:
-                               
-               }
-       }
-       
-       /**
-       * XML Callback to process end elements
-       *
-       * @access private
-       */
-       function _tag_close( &$parser, $tag ) {
-               $this->currentElement = '';
-               
-               switch( strtoupper( $tag ) ) {
-                       case 'INDEX':
-                               xml_set_object( $parser, $this->parent );
-                               break;
-               }
-       }
-       
-       /**
-       * Adds a field to the index
-       *
-       * @param string $name Field name
-       * @return string Field list
-       */
-       function addField( $name ) {
-               $this->columns[$this->FieldID( $name )] = $name;
-               
-               // Return the field list
-               return $this->columns;
-       }
-       
-       /**
-       * Adds options to the index
-       *
-       * @param string $opt Comma-separated list of index options.
-       * @return string Option list
-       */
-       function addIndexOpt( $opt ) {
-               $this->opts[] = $opt;
-               
-               // Return the options list
-               return $this->opts;
-       }
-       
-       /**
-       * Generates the SQL that will create the index in the database
-       *
-       * @param object $xmls adoSchema object
-       * @return array Array containing index creation SQL
-       */
-       function create( &$xmls ) {
-               if( $this->drop ) {
-                       return NULL;
-               }
-               
-               // eliminate any columns that aren't in the table
-               foreach( $this->columns as $id => $col ) {
-                       if( !isset( $this->parent->fields[$id] ) ) {
-                               unset( $this->columns[$id] );
-                       }
-               }
-               
-               return $xmls->dict->CreateIndexSQL( $this->name, 
$this->parent->name, $this->columns, $this->opts );
-       }
-       
-       /**
-       * Marks an index for destruction
-       */
-       function drop() {
-               $this->drop = TRUE;
-       }
-}
-
-/**
-* Creates a data object in ADOdb's datadict format
-*
-* This class stores information about table data.
-*
-* @package axmls
-* @access private
-*/
-class dbData extends dbObject {
-       
-       var $data = array();
-       
-       var $row;
-       
-       /**
-       * Initializes the new dbIndex object.
-       *
-       * @param object $parent Parent object
-       * @param array $attributes Attributes
-       *
-       * @internal
-       */
-       function dbData( &$parent, $attributes = NULL ) {
-               $this->parent =& $parent;
-       }
-       
-       /**
-       * XML Callback to process start elements
-       *
-       * Processes XML opening tags. 
-       * Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, 
FULLTEXT & HASH. 
-       *
-       * @access private
-       */
-       function _tag_open( &$parser, $tag, $attributes ) {
-               $this->currentElement = strtoupper( $tag );
-               
-               switch( $this->currentElement ) {
-                       case 'ROW':
-                               $this->row = count( $this->data );
-                               $this->data[$this->row] = array();
-                               break;
-                       case 'F':
-                               $this->addField($attributes);
-                       default:
-                               // print_r( array( $tag, $attributes ) );
-               }
-       }
-       
-       /**
-       * XML Callback to process CDATA elements
-       *
-       * Processes XML cdata.
-       *
-       * @access private
-       */
-       function _tag_cdata( &$parser, $cdata ) {
-               switch( $this->currentElement ) {
-                       // Index field name
-                       case 'F':
-                               $this->addData( $cdata );
-                               break;
-                       default:
-                               
-               }
-       }
-       
-       /**
-       * XML Callback to process end elements
-       *
-       * @access private
-       */
-       function _tag_close( &$parser, $tag ) {
-               $this->currentElement = '';
-               
-               switch( strtoupper( $tag ) ) {
-                       case 'DATA':
-                               xml_set_object( $parser, $this->parent );
-                               break;
-               }
-       }
-       
-       /**
-       * Adds a field to the index
-       *
-       * @param string $name Field name
-       * @return string Field list
-       */
-       function addField( $attributes ) {
-               if( isset( $attributes['NAME'] ) ) {
-                       $name = $attributes['NAME'];
-               } else {
-                       $name = count($this->data[$this->row]);
-               }
-               
-               // Set the field index so we know where we are
-               $this->current_field = $this->FieldID( $name );
-       }
-       
-       /**
-       * Adds options to the index
-       *
-       * @param string $opt Comma-separated list of index options.
-       * @return string Option list
-       */
-       function addData( $cdata ) {
-               if( !isset( $this->data[$this->row] ) ) {
-                       $this->data[$this->row] = array();
-               }
-               
-               if( !isset( $this->data[$this->row][$this->current_field] ) ) {
-                       $this->data[$this->row][$this->current_field] = '';
-               }
-               
-               $this->data[$this->row][$this->current_field] .= $cdata;
-       }
-       
-       /**
-       * Generates the SQL that will create the index in the database
-       *
-       * @param object $xmls adoSchema object
-       * @return array Array containing index creation SQL
-       */
-       function create( &$xmls ) {
-               $table = $xmls->dict->TableName($this->parent->name);
-               $table_field_count = count($this->parent->fields);
-               $sql = array();
-               
-               // eliminate any columns that aren't in the table
-               foreach( $this->data as $row ) {
-                       $table_fields = $this->parent->fields;
-                       $fields = array();
-                       
-                       foreach( $row as $field_id => $field_data ) {
-                               if( !array_key_exists( $field_id, $table_fields 
) ) {
-                                       if( is_numeric( $field_id ) ) {
-                                               $field_id = reset( array_keys( 
$table_fields ) );
-                                       } else {
-                                               continue;
-                                       }
-                               }
-                               
-                               $name = $table_fields[$field_id]['NAME'];
-                               
-                               switch( $table_fields[$field_id]['TYPE'] ) {
-                                       case 'C':
-                                       case 'C2':
-                                       case 'X':
-                                       case 'X2':
-                                               $fields[$name] = 
$xmls->db->qstr( $field_data );
-                                               break;
-                                       case 'I':
-                                       case 'I1':
-                                       case 'I2':
-                                       case 'I4':
-                                       case 'I8':
-                                               $fields[$name] = 
intval($field_data);
-                                               break;
-                                       default:
-                                               $fields[$name] = $field_data;
-                               }
-                               
-                               unset($table_fields[$field_id]);
-                       }
-                       
-                       // check that at least 1 column is specified
-                       if( empty( $fields ) ) {
-                               continue;
-                       }
-                       
-                       // check that no required columns are missing
-                       if( count( $fields ) < $table_field_count ) {
-                               foreach( $table_fields as $field ) {
-                                       if( ( in_array( 'NOTNULL', 
$field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 
'AUTOINCREMENT', $field['OPTS'] ) ) {
-                                               continue(2);
-                                       }
-                               }
-                       }
-                       
-                       $sql[] = 'INSERT INTO '. $table .' ('. implode( ',', 
array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
-               }
-               
-               return $sql;
-       }
-}
-
-/**
-* Creates the SQL to execute a list of provided SQL queries
-*
-* @package axmls
-* @access private
-*/
-class dbQuerySet extends dbObject {
-       
-       /**
-       * @var array    List of SQL queries
-       */
-       var $queries = array();
-       
-       /**
-       * @var string   String used to build of a query line by line
-       */
-       var $query;
-       
-       /**
-       * @var string   Query prefix key
-       */
-       var $prefixKey = '';
-       
-       /**
-       * @var boolean  Auto prefix enable (TRUE)
-       */
-       var $prefixMethod = 'AUTO';
-       
-       /**
-       * Initializes the query set.
-       *
-       * @param object $parent Parent object
-       * @param array $attributes Attributes
-       */
-       function dbQuerySet( &$parent, $attributes = NULL ) {
-               $this->parent =& $parent;
-                       
-               // Overrides the manual prefix key
-               if( isset( $attributes['KEY'] ) ) {
-                       $this->prefixKey = $attributes['KEY'];
-               }
-               
-               $prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? 
strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-               
-               // Enables or disables automatic prefix prepending
-               switch( $prefixMethod ) {
-                       case 'AUTO':
-                               $this->prefixMethod = 'AUTO';
-                               break;
-                       case 'MANUAL':
-                               $this->prefixMethod = 'MANUAL';
-                               break;
-                       case 'NONE':
-                               $this->prefixMethod = 'NONE';
-                               break;
-               }
-       }
-       
-       /**
-       * XML Callback to process start elements. Elements currently 
-       * processed are: QUERY. 
-       *
-       * @access private
-       */
-       function _tag_open( &$parser, $tag, $attributes ) {
-               $this->currentElement = strtoupper( $tag );
-               
-               switch( $this->currentElement ) {
-                       case 'QUERY':
-                               // Create a new query in a SQL queryset.
-                               // Ignore this query set if a platform is 
specified and it's different than the 
-                               // current connection platform.
-                               if( !isset( $attributes['PLATFORM'] ) OR 
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-                                       $this->newQuery();
-                               } else {
-                                       $this->discardQuery();
-                               }
-                               break;
-                       default:
-                               // print_r( array( $tag, $attributes ) );
-               }
-       }
-       
-       /**
-       * XML Callback to process CDATA elements
-       */
-       function _tag_cdata( &$parser, $cdata ) {
-               switch( $this->currentElement ) {
-                       // Line of queryset SQL data
-                       case 'QUERY':
-                               $this->buildQuery( $cdata );
-                               break;
-                       default:
-                               
-               }
-       }
-       
-       /**
-       * XML Callback to process end elements
-       *
-       * @access private
-       */
-       function _tag_close( &$parser, $tag ) {
-               $this->currentElement = '';
-               
-               switch( strtoupper( $tag ) ) {
-                       case 'QUERY':
-                               // Add the finished query to the open query set.
-                               $this->addQuery();
-                               break;
-                       case 'SQL':
-                               $this->parent->addSQL( $this->create( 
$this->parent ) );
-                               xml_set_object( $parser, $this->parent );
-                               $this->destroy();
-                               break;
-                       default:
-                               
-               }
-       }
-       
-       /**
-       * Re-initializes the query.
-       *
-       * @return boolean TRUE
-       */
-       function newQuery() {
-               $this->query = '';
-               
-               return TRUE;
-       }
-       
-       /**
-       * Discards the existing query.
-       *
-       * @return boolean TRUE
-       */
-       function discardQuery() {
-               unset( $this->query );
-               
-               return TRUE;
-       }
-       
-       /** 
-       * Appends a line to a query that is being built line by line
-       *
-       * @param string $data Line of SQL data or NULL to initialize a new query
-       * @return string SQL query string.
-       */
-       function buildQuery( $sql = NULL ) {
-               if( !isset( $this->query ) OR empty( $sql ) ) {
-                       return FALSE;
-               }
-               
-               $this->query .= $sql;
-               
-               return $this->query;
-       }
-       
-       /**
-       * Adds a completed query to the query list
-       *
-       * @return string        SQL of added query
-       */
-       function addQuery() {
-               if( !isset( $this->query ) ) {
-                       return FALSE;
-               }
-               
-               $this->queries[] = $return = trim($this->query);
-               
-               unset( $this->query );
-               
-               return $return;
-       }
-       
-       /**
-       * Creates and returns the current query set
-       *
-       * @param object $xmls adoSchema object
-       * @return array Query set
-       */
-       function create( &$xmls ) {
-               foreach( $this->queries as $id => $query ) {
-                       switch( $this->prefixMethod ) {
-                               case 'AUTO':
-                                       // Enable auto prefix replacement
-                                       
-                                       // Process object prefix.
-                                       // Evaluate SQL statements to prepend 
prefix to objects
-                                       $query = $this->prefixQuery( 
'/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, 
$xmls->objectPrefix );
-                                       $query = $this->prefixQuery( 
'/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, 
$xmls->objectPrefix );
-                                       $query = $this->prefixQuery( 
'/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, 
$xmls->objectPrefix );
-                                       
-                                       // SELECT statements aren't working yet
-                                       #$data = preg_replace( 
'/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 
$prefix\2 \3", $data );
-                                       
-                               case 'MANUAL':
-                                       // If prefixKey is set and has a value 
then we use it to override the default constant XMLS_PREFIX.
-                                       // If prefixKey is not set, we use the 
default constant XMLS_PREFIX
-                                       if( isset( $this->prefixKey ) AND( 
$this->prefixKey !== '' ) ) {
-                                               // Enable prefix override
-                                               $query = str_replace( 
$this->prefixKey, $xmls->objectPrefix, $query );
-                                       } else {
-                                               // Use default replacement
-                                               $query = str_replace( 
XMLS_PREFIX , $xmls->objectPrefix, $query );
-                                       }
-                       }
-                       
-                       $this->queries[$id] = trim( $query );
-               }
-               
-               // Return the query set array
-               return $this->queries;
-       }
-       
-       /**
-       * Rebuilds the query with the prefix attached to any objects
-       *
-       * @param string $regex Regex used to add prefix
-       * @param string $query SQL query string
-       * @param string $prefix Prefix to be appended to tables, indices, etc.
-       * @return string Prefixed SQL query string.
-       */
-       function prefixQuery( $regex, $query, $prefix = NULL ) {
-               if( !isset( $prefix ) ) {
-                       return $query;
-               }
-               
-               if( preg_match( $regex, $query, $match ) ) {
-                       $preamble = $match[1];
-                       $postamble = $match[5];
-                       $objectList = explode( ',', $match[3] );
-                       // $prefix = $prefix . '_';
-                       
-                       $prefixedList = '';
-                       
-                       foreach( $objectList as $object ) {
-                               if( $prefixedList !== '' ) {
-                                       $prefixedList .= ', ';
-                               }
-                               
-                               $prefixedList .= $prefix . trim( $object );
-                       }
-                       
-                       $query = $preamble . ' ' . $prefixedList . ' ' . 
$postamble;
-               }
-               
-               return $query;
-       }
-}
-
-/**
-* Loads and parses an XML file, creating an array of "ready-to-run" SQL 
statements
-* 
-* This class is used to load and parse the XML file, to create an array of SQL 
statements
-* that can be used to build a database, and to build the database using the 
SQL array.
-*
-* @tutorial getting_started.pkg
-*
-* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.2 $
-*
-* @package axmls
-*/
-class adoSchema {
-       
-       /**
-       * @var array    Array containing SQL queries to generate all objects
-       * @access private
-       */
-       var $sqlArray;
-       
-       /**
-       * @var object   ADOdb connection object
-       * @access private
-       */
-       var $db;
-       
-       /**
-       * @var object   ADOdb Data Dictionary
-       * @access private
-       */
-       var $dict;
-       
-       /**
-       * @var string Current XML element
-       * @access private
-       */
-       var $currentElement = '';
-       
-       /**
-       * @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing 
database
-       * @access private
-       */
-       var $upgrade = '';
-       
-       /**
-       * @var string Optional object prefix
-       * @access private
-       */
-       var $objectPrefix = '';
-       
-       /**
-       * @var long     Original Magic Quotes Runtime value
-       * @access private
-       */
-       var $mgq;
-       
-       /**
-       * @var long     System debug
-       * @access private
-       */
-       var $debug;
-       
-       /**
-       * @var string Regular expression to find schema version
-       * @access private
-       */
-       var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
-       
-       /**
-       * @var string Current schema version
-       * @access private
-       */
-       var $schemaVersion;
-       
-       /**
-       * @var int      Success of last Schema execution
-       */
-       var $success;
-       
-       /**
-       * @var bool     Execute SQL inline as it is generated
-       */
-       var $executeInline;
-       
-       /**
-       * @var bool     Continue SQL execution if errors occur
-       */
-       var $continueOnError;
-       
-       /**
-       * Creates an adoSchema object
-       *
-       * Creating an adoSchema object is the first step in processing an XML 
schema.
-       * The only parameter is an ADOdb database connection object, which must 
already
-       * have been created.
-       *
-       * @param object $db ADOdb database connection object.
-       */
-       function adoSchema( &$db ) {
-               // Initialize the environment
-               $this->mgq = get_magic_quotes_runtime();
-               set_magic_quotes_runtime(0);
-               
-               $this->db =& $db;
-               $this->debug = $this->db->debug;
-               $this->dict = NewDataDictionary( $this->db );
-               $this->sqlArray = array();
-               $this->schemaVersion = XMLS_SCHEMA_VERSION;
-               $this->executeInline( XMLS_EXECUTE_INLINE );
-               $this->continueOnError( XMLS_CONTINUE_ON_ERROR );
-               $this->setUpgradeMethod();
-       }
-       
-       /**
-       * Sets the method to be used for upgrading an existing database
-       *
-       * Use this method to specify how existing database objects should be 
upgraded.
-       * The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER 
attempts to
-       * alter each database object directly, REPLACE attempts to rebuild each 
object
-       * from scratch, BEST attempts to determine the best upgrade method for 
each
-       * object, and NONE disables upgrading.
-       *
-       * This method is not yet used by AXMLS, but exists for backward 
compatibility.
-       * The ALTER method is automatically assumed when the adoSchema object is
-       * instantiated; other upgrade methods are not currently supported.
-       *
-       * @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
-       * @returns string Upgrade method used
-       */
-       function SetUpgradeMethod( $method = '' ) {
-               if( !is_string( $method ) ) {
-                       return FALSE;
-               }
-               
-               $method = strtoupper( $method );
-               
-               // Handle the upgrade methods
-               switch( $method ) {
-                       case 'ALTER':
-                               $this->upgrade = $method;
-                               break;
-                       case 'REPLACE':
-                               $this->upgrade = $method;
-                               break;
-                       case 'BEST':
-                               $this->upgrade = 'ALTER';
-                               break;
-                       case 'NONE':
-                               $this->upgrade = 'NONE';
-                               break;
-                       default:
-                               // Use default if no legitimate method is 
passed.
-                               $this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
-               }
-               
-               return $this->upgrade;
-       }
-       
-       /**
-       * Enables/disables inline SQL execution.
-       *
-       * Call this method to enable or disable inline execution of the schema. 
If the mode is set to TRUE (inline execution),
-       * AXMLS applies the SQL to the database immediately as each schema 
entity is parsed. If the mode
-       * is set to FALSE (post execution), AXMLS parses the entire schema and 
you will need to call adoSchema::ExecuteSchema()
-       * to apply the schema to the database.
-       *
-       * @param bool $mode execute
-       * @return bool current execution mode
-       *
-       * @see ParseSchema(), ExecuteSchema()
-       */
-       function ExecuteInline( $mode = NULL ) {
-               if( is_bool( $mode ) ) {
-                       $this->executeInline = $mode;
-               }
-               
-               return $this->executeInline;
-       }
-       
-       /**
-       * Enables/disables SQL continue on error.
-       *
-       * Call this method to enable or disable continuation of SQL execution 
if an error occurs.
-       * If the mode is set to TRUE (continue), AXMLS will continue to apply 
SQL to the database, even if an error occurs.
-       * If the mode is set to FALSE (halt), AXMLS will halt execution of 
generated sql if an error occurs, though parsing
-       * of the schema will continue.
-       *
-       * @param bool $mode execute
-       * @return bool current continueOnError mode
-       *
-       * @see addSQL(), ExecuteSchema()
-       */
-       function ContinueOnError( $mode = NULL ) {
-               if( is_bool( $mode ) ) {
-                       $this->continueOnError = $mode;
-               }
-               
-               return $this->continueOnError;
-       }
-       
-       /**
-       * Loads an XML schema from a file and converts it to SQL.
-       *
-       * Call this method to load the specified schema (see the DTD for the 
proper format) from
-       * the filesystem and generate the SQL necessary to create the database 
described. 
-       * @see ParseSchemaString()
-       *
-       * @param string $file Name of XML schema file.
-       * @param bool $returnSchema Return schema rather than parsing.
-       * @return array Array of SQL queries, ready to execute
-       */
-       function ParseSchema( $filename, $returnSchema = FALSE ) {
-               return $this->ParseSchemaString( $this->ConvertSchemaFile( 
$filename ), $returnSchema );
-       }
-       
-       /**
-       * Loads an XML schema from a file and converts it to SQL.
-       *
-       * Call this method to load the specified schema from a file (see the 
DTD for the proper format) 
-       * and generate the SQL necessary to create the database described by 
the schema.
-       *
-       * @param string $file Name of XML schema file.
-       * @param bool $returnSchema Return schema rather than parsing.
-       * @return array Array of SQL queries, ready to execute.
-       *
-       * @deprecated Replaced by adoSchema::ParseSchema() and 
adoSchema::ParseSchemaString()
-       * @see ParseSchema(), ParseSchemaString()
-       */
-       function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
-               // Open the file
-               if( !($fp = fopen( $filename, 'r' )) ) {
-                       // die( 'Unable to open file' );
-                       return FALSE;
-               }
-               
-               // do version detection here
-               if( $this->SchemaFileVersion( $filename ) != 
$this->schemaVersion ) {
-                       return FALSE;
-               }
-               
-               if ( $returnSchema )
-               {
-                       return $xmlstring;
-               }
-               
-               $this->success = 2;
-               
-               $xmlParser = $this->create_parser();
-               
-               // Process the file
-               while( $data = fread( $fp, 4096 ) ) {
-                       if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
-                               die( sprintf(
-                                       "XML error: %s at line %d",
-                                       xml_error_string( xml_get_error_code( 
$xmlParser) ),
-                                       xml_get_current_line_number( $xmlParser)
-                               ) );
-                       }
-               }
-               
-               xml_parser_free( $xmlParser );
-               
-               return $this->sqlArray;
-       }
-       
-       /**
-       * Converts an XML schema string to SQL.
-       *
-       * Call this method to parse a string containing an XML schema (see the 
DTD for the proper format)
-       * and generate the SQL necessary to create the database described by 
the schema. 
-       * @see ParseSchema()
-       *
-       * @param string $xmlstring XML schema string.
-       * @param bool $returnSchema Return schema rather than parsing.
-       * @return array Array of SQL queries, ready to execute.
-       */
-       function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
-               if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-                       return FALSE;
-               }
-               
-               // do version detection here
-               if( $this->SchemaStringVersion( $xmlstring ) != 
$this->schemaVersion ) {
-                       return FALSE;
-               }
-               
-               if ( $returnSchema )
-               {
-                       return $xmlstring;
-               }
-               
-               $this->success = 2;
-               
-               $xmlParser = $this->create_parser();
-               
-               if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
-                       die( sprintf(
-                               "XML error: %s at line %d",
-                               xml_error_string( xml_get_error_code( 
$xmlParser) ),
-                               xml_get_current_line_number( $xmlParser)
-                       ) );
-               }
-               
-               xml_parser_free( $xmlParser );
-               
-               return $this->sqlArray;
-       }
-       
-       /**
-       * Loads an XML schema from a file and converts it to uninstallation SQL.
-       *
-       * Call this method to load the specified schema (see the DTD for the 
proper format) from
-       * the filesystem and generate the SQL necessary to remove the database 
described.
-       * @see RemoveSchemaString()
-       *
-       * @param string $file Name of XML schema file.
-       * @param bool $returnSchema Return schema rather than parsing.
-       * @return array Array of SQL queries, ready to execute
-       */
-       function RemoveSchema( $filename, $returnSchema = FALSE ) {
-               return $this->RemoveSchemaString( $this->ConvertSchemaFile( 
$filename ), $returnSchema );
-       }
-       
-       /**
-       * Converts an XML schema string to uninstallation SQL.
-       *
-       * Call this method to parse a string containing an XML schema (see the 
DTD for the proper format)
-       * and generate the SQL necessary to uninstall the database described by 
the schema. 
-       * @see RemoveSchema()
-       *
-       * @param string $schema XML schema string.
-       * @param bool $returnSchema Return schema rather than parsing.
-       * @return array Array of SQL queries, ready to execute.
-       */
-       function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-               
-               // grab current version
-               if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-                       return FALSE;
-               }
-               
-               return $this->ParseSchemaString( $this->TransformSchema( 
$schema, 'remove-' . $version), $returnSchema );
-       }
-       
-       /**
-       * Applies the current XML schema to the database (post execution).
-       *
-       * Call this method to apply the current schema (generally created by 
calling 
-       * ParseSchema() or ParseSchemaString() ) to the database (creating the 
tables, indexes, 
-       * and executing other SQL specified in the schema) after parsing.
-       * @see ParseSchema(), ParseSchemaString(), ExecuteInline()
-       *
-       * @param array $sqlArray Array of SQL statements that will be applied 
rather than
-       *               the current schema.
-       * @param boolean $continueOnErr Continue to apply the schema even if an 
error occurs.
-       * @returns integer 0 if failure, 1 if errors, 2 if successful.
-       */
-       function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
-               if( !is_bool( $continueOnErr ) ) {
-                       $continueOnErr = $this->ContinueOnError();
-               }
-               
-               if( !isset( $sqlArray ) ) {
-                       $sqlArray = $this->sqlArray;
-               }
-               
-               if( !is_array( $sqlArray ) ) {
-                       $this->success = 0;
-               } else {
-                       $this->success = $this->dict->ExecuteSQLArray( 
$sqlArray, $continueOnErr );
-               }
-               
-               return $this->success;
-       }
-       
-       /**
-       * Returns the current SQL array. 
-       *
-       * Call this method to fetch the array of SQL queries resulting from 
-       * ParseSchema() or ParseSchemaString(). 
-       *
-       * @param string $format Format: HTML, TEXT, or NONE (PHP array)
-       * @return array Array of SQL statements or FALSE if an error occurs
-       */
-       function PrintSQL( $format = 'NONE' ) {
-               return $this->getSQL( $format, $sqlArray );
-       }
-       
-       /**
-       * Saves the current SQL array to the local filesystem as a list of SQL 
queries.
-       *
-       * Call this method to save the array of SQL queries (generally 
resulting from a
-       * parsed XML schema) to the filesystem.
-       *
-       * @param string $filename Path and name where the file should be saved.
-       * @return boolean TRUE if save is successful, else FALSE. 
-       */
-       function SaveSQL( $filename = './schema.sql' ) {
-               
-               if( !isset( $sqlArray ) ) {
-                       $sqlArray = $this->sqlArray;
-               }
-               if( !isset( $sqlArray ) ) {
-                       return FALSE;
-               }
-               
-               $fp = fopen( $filename, "w" );
-               
-               foreach( $sqlArray as $key => $query ) {
-                       fwrite( $fp, $query . ";\n" );
-               }
-               fclose( $fp );
-       }
-       
-       /**
-       * Create an xml parser
-       *
-       * @return object PHP XML parser object
-       *
-       * @access private
-       */
-       function &create_parser() {
-               // Create the parser
-               $xmlParser = xml_parser_create();
-               xml_set_object( $xmlParser, $this );
-               
-               // Initialize the XML callback functions
-               xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' 
);
-               xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-               
-               return $xmlParser;
-       }
-       
-       /**
-       * XML Callback to process start elements
-       *
-       * @access private
-       */
-       function _tag_open( &$parser, $tag, $attributes ) {
-               switch( strtoupper( $tag ) ) {
-                       case 'TABLE':
-                               $this->obj = new dbTable( $this, $attributes );
-                               xml_set_object( $parser, $this->obj );
-                               break;
-                       case 'SQL':
-                               if( !isset( $attributes['PLATFORM'] ) OR 
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-                                       $this->obj = new dbQuerySet( $this, 
$attributes );
-                                       xml_set_object( $parser, $this->obj );
-                               }
-                               break;
-                       default:
-                               // print_r( array( $tag, $attributes ) );
-               }
-               
-       }
-       
-       /**
-       * XML Callback to process CDATA elements
-       *
-       * @access private
-       */
-       function _tag_cdata( &$parser, $cdata ) {
-       }
-       
-       /**
-       * XML Callback to process end elements
-       *
-       * @access private
-       * @internal
-       */
-       function _tag_close( &$parser, $tag ) {
-               
-       }
-       
-       /**
-       * Converts an XML schema string to the specified DTD version.
-       *
-       * Call this method to convert a string containing an XML schema to a 
different AXMLS
-       * DTD version. For instance, to convert a schema created for an pre-1.0 
version for 
-       * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If 
no DTD version 
-       * parameter is specified, the schema will be converted to the current 
DTD version. 
-       * If the newFile parameter is provided, the converted schema will be 
written to the specified
-       * file.
-       * @see ConvertSchemaFile()
-       *
-       * @param string $schema String containing XML schema that will be 
converted.
-       * @param string $newVersion DTD version to convert to.
-       * @param string $newFile File name of (converted) output file.
-       * @return string Converted XML schema or FALSE if an error occurs.
-       */
-       function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = 
NULL ) {
-               
-               // grab current version
-               if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-                       return FALSE;
-               }
-               
-               if( !isset ($newVersion) ) {
-                       $newVersion = $this->schemaVersion;
-               }
-               
-               if( $version == $newVersion ) {
-                       $result = $schema;
-               } else {
-                       $result = $this->TransformSchema( $schema, 'convert-' . 
$version . '-' . $newVersion);
-               }
-               
-               if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = 
fopen( $newFile, 'w' ) ) ) {
-                       fwrite( $fp, $result );
-                       fclose( $fp );
-               }
-               
-               return $result;
-       }
-       
-       /**
-       * Converts an XML schema file to the specified DTD version.
-       *
-       * Call this method to convert the specified XML schema file to a 
different AXMLS
-       * DTD version. For instance, to convert a schema created for an pre-1.0 
version for 
-       * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If 
no DTD version 
-       * parameter is specified, the schema will be converted to the current 
DTD version. 
-       * If the newFile parameter is provided, the converted schema will be 
written to the specified
-       * file.
-       * @see ConvertSchemaString()
-       *
-       * @param string $filename Name of XML schema file that will be 
converted.
-       * @param string $newVersion DTD version to convert to.
-       * @param string $newFile File name of (converted) output file.
-       * @return string Converted XML schema or FALSE if an error occurs.
-       */
-       function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = 
NULL ) {
-               
-               // grab current version
-               if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
-                       return FALSE;
-               }
-               
-               if( !isset ($newVersion) ) {
-                       $newVersion = $this->schemaVersion;
-               }
-               
-               if( $version == $newVersion ) {
-                       $result = file_get_contents( $filename );
-                       
-                       // remove unicode BOM if present
-                       if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 
187, 191 ) ) {
-                               $result = substr( $result, 3 );
-                       }
-               } else {
-                       $result = $this->TransformSchema( $filename, 'convert-' 
. $version . '-' . $newVersion, 'file' );
-               }
-               
-               if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = 
fopen( $newFile, 'w' ) ) ) {
-                       fwrite( $fp, $result );
-                       fclose( $fp );
-               }
-               
-               return $result;
-       }
-       
-       function TransformSchema( $schema, $xsl, $schematype='string' )
-       {
-               // Fail if XSLT extension is not available
-               if( ! function_exists( 'xslt_create' ) ) {
-                       return FALSE;
-               }
-               
-               $xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-               
-               // look for xsl
-               if( !is_readable( $xsl_file ) ) {
-                       return FALSE;
-               }
-               
-               switch( $schematype )
-               {
-                       case 'file':
-                               if( !is_readable( $schema ) ) {
-                                       return FALSE;
-                               }
-                               
-                               $schema = file_get_contents( $schema );
-                               break;
-                       case 'string':
-                       default:
-                               if( !is_string( $schema ) ) {
-                                       return FALSE;
-                               }
-               }
-               
-               $arguments = array (
-                       '/_xml' => $schema,
-                       '/_xsl' => file_get_contents( $xsl_file )
-               );
-               
-               // create an XSLT processor
-               $xh = xslt_create ();
-               
-               // set error handler
-               xslt_set_error_handler ($xh, array (&$this, 
'xslt_error_handler'));
-               
-               // process the schema
-               $result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, 
$arguments); 
-               
-               xslt_free ($xh);
-               
-               return $result;
-       }
-       
-       /**
-       * Processes XSLT transformation errors
-       *
-       * @param object $parser XML parser object
-       * @param integer $errno Error number
-       * @param integer $level Error level
-       * @param array $fields Error information fields
-       *
-       * @access private
-       */
-       function xslt_error_handler( $parser, $errno, $level, $fields ) {
-               if( is_array( $fields ) ) {
-                       $msg = array(
-                               'Message Type' => ucfirst( $fields['msgtype'] ),
-                               'Message Code' => $fields['code'],
-                               'Message' => $fields['msg'],
-                               'Error Number' => $errno,
-                               'Level' => $level
-                       );
-                       
-                       switch( $fields['URI'] ) {
-                               case 'arg:/_xml':
-                                       $msg['Input'] = 'XML';
-                                       break;
-                               case 'arg:/_xsl':
-                                       $msg['Input'] = 'XSL';
-                                       break;
-                               default:
-                                       $msg['Input'] = $fields['URI'];
-                       }
-                       
-                       $msg['Line'] = $fields['line'];
-               } else {
-                       $msg = array(
-                               'Message Type' => 'Error',
-                               'Error Number' => $errno,
-                               'Level' => $level,
-                               'Fields' => var_export( $fields, TRUE )
-                       );
-               }
-               
-               $error_details = $msg['Message Type'] . ' in XSLT 
Transformation' . "\n"
-                                          . '<table>' . "\n";
-               
-               foreach( $msg as $label => $details ) {
-                       $error_details .= '<tr><td><b>' . $label . ': 
</b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
-               }
-               
-               $error_details .= '</table>';
-               
-               trigger_error( $error_details, E_USER_ERROR );
-       }
-       
-       /**
-       * Returns the AXMLS Schema Version of the requested XML schema file.
-       *
-       * Call this method to obtain the AXMLS DTD version of the requested XML 
schema file.
-       * @see SchemaStringVersion()
-       *
-       * @param string $filename AXMLS schema file
-       * @return string Schema version number or FALSE on error
-       */
-       function SchemaFileVersion( $filename ) {
-               // Open the file
-               if( !($fp = fopen( $filename, 'r' )) ) {
-                       // die( 'Unable to open file' );
-                       return FALSE;
-               }
-               
-               // Process the file
-               while( $data = fread( $fp, 4096 ) ) {
-                       if( preg_match( $this->versionRegex, $data, $matches ) 
) {
-                               return !empty( $matches[2] ) ? $matches[2] : 
XMLS_DEFAULT_SCHEMA_VERSION;
-                       }
-               }
-               
-               return FALSE;
-       }
-       
-       /**
-       * Returns the AXMLS Schema Version of the provided XML schema string.
-       *
-       * Call this method to obtain the AXMLS DTD version of the provided XML 
schema string.
-       * @see SchemaFileVersion()
-       *
-       * @param string $xmlstring XML schema string
-       * @return string Schema version number or FALSE on error
-       */
-       function SchemaStringVersion( $xmlstring ) {
-               if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-                       return FALSE;
-               }
-               
-               if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
-                       return !empty( $matches[2] ) ? $matches[2] : 
XMLS_DEFAULT_SCHEMA_VERSION;
-               }
-               
-               return FALSE;
-       }
-       
-       /**
-       * Extracts an XML schema from an existing database.
-       *
-       * Call this method to create an XML schema string from an existing 
database.
-       * If the data parameter is set to TRUE, AXMLS will include the data 
from the database
-       * in the schema. 
-       *
-       * @param boolean $data Include data in schema dump
-       * @return string Generated XML schema
-       */
-       function ExtractSchema( $data = FALSE ) {
-               $old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-               
-               $schema = '<?xml version="1.0"?>' . "\n"
-                               . '<schema version="' . $this->schemaVersion . 
'">' . "\n";
-               
-               if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
-                       foreach( $tables as $table ) {
-                               $schema .= '    <table name="' . $table . '">' 
. "\n";
-                               
-                               // grab details from database
-                               $rs = $this->db->Execute( 'SELECT * FROM ' . 
$table . ' WHERE -1' );
-                               $fields = $this->db->MetaColumns( $table );
-                               $indexes = $this->db->MetaIndexes( $table );
-                               
-                               if( is_array( $fields ) ) {
-                                       foreach( $fields as $details ) {
-                                               $extra = '';
-                                               $content = array();
-                                               
-                                               if( $details->max_length > 0 ) {
-                                                       $extra .= ' size="' . 
$details->max_length . '"';
-                                               }
-                                               
-                                               if( $details->primary_key ) {
-                                                       $content[] = '<KEY/>';
-                                               } elseif( $details->not_null ) {
-                                                       $content[] = 
'<NOTNULL/>';
-                                               }
-                                               
-                                               if( $details->has_default ) {
-                                                       $content[] = '<DEFAULT 
value="' . $details->default_value . '"/>';
-                                               }
-                                               
-                                               if( $details->auto_increment ) {
-                                                       $content[] = 
'<AUTOINCREMENT/>';
-                                               }
-                                               
-                                               // this stops the creation of 
'R' columns,
-                                               // AUTOINCREMENT is used to 
create auto columns
-                                               $details->primary_key = 0;
-                                               $type = $rs->MetaType( $details 
);
-                                               
-                                               $schema .= '            <field 
name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
-                                               
-                                               if( !empty( $content ) ) {
-                                                       $schema .= "\n          
        " . implode( "\n                        ", $content ) . "\n             
";
-                                               }
-                                               
-                                               $schema .= '</field>' . "\n";
-                                       }
-                               }
-                               
-                               if( is_array( $indexes ) ) {
-                                       foreach( $indexes as $index => $details 
) {
-                                               $schema .= '            <index 
name="' . $index . '">' . "\n";
-                                               
-                                               if( $details['unique'] ) {
-                                                       $schema .= '            
        <UNIQUE/>' . "\n";
-                                               }
-                                               
-                                               foreach( $details['columns'] as 
$column ) {
-                                                       $schema .= '            
        <col>' . $column . '</col>' . "\n";
-                                               }
-                                               
-                                               $schema .= '            
</index>' . "\n";
-                                       }
-                               }
-                               
-                               if( $data ) {
-                                       $rs = $this->db->Execute( 'SELECT * 
FROM ' . $table );
-                                       
-                                       if( is_object( $rs ) ) {
-                                               $schema .= '            <data>' 
. "\n";
-                                               
-                                               while( $row = $rs->FetchRow() ) 
{
-                                                       foreach( $row as $key 
=> $val ) {
-                                                               $row[$key] = 
htmlentities($row);
-                                                       }
-                                                       
-                                                       $schema .= '            
        <row><f>' . implode( '</f><f>', $row ) . '</f></row>' . "\n";
-                                               }
-                                               
-                                               $schema .= '            
</data>' . "\n";
-                                       }
-                               }
-                               
-                               $schema .= '    </table>' . "\n";
-                       }
-               }
-               
-               $this->db->SetFetchMode( $old_mode );
-               
-               $schema .= '</schema>';
-               return $schema;
-       }
-       
-       /**
-       * Sets a prefix for database objects
-       *
-       * Call this method to set a standard prefix that will be prepended to 
all database tables 
-       * and indices when the schema is parsed. Calling setPrefix with no 
arguments clears the prefix.
-       *
-       * @param string $prefix Prefix that will be prepended.
-       * @param boolean $underscore If TRUE, automatically append an 
underscore character to the prefix.
-       * @return boolean TRUE if successful, else FALSE
-       */
-       function SetPrefix( $prefix = '', $underscore = TRUE ) {
-               switch( TRUE ) {
-                       // clear prefix
-                       case empty( $prefix ):
-                               logMsg( 'Cleared prefix' );
-                               $this->objectPrefix = '';
-                               return TRUE;
-                       // prefix too long
-                       case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
-                       // prefix contains invalid characters
-                       case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
-                               logMsg( 'Invalid prefix: ' . $prefix );
-                               return FALSE;
-               }
-               
-               if( $underscore AND substr( $prefix, -1 ) != '_' ) {
-                       $prefix .= '_';
-               }
-               
-               // prefix valid
-               logMsg( 'Set prefix: ' . $prefix );
-               $this->objectPrefix = $prefix;
-               return TRUE;
-       }
-       
-       /**
-       * Returns an object name with the current prefix prepended.
-       *
-       * @param string $name Name
-       * @return string        Prefixed name
-       *
-       * @access private
-       */
-       function prefix( $name = '' ) {
-               // if prefix is set
-               if( !empty( $this->objectPrefix ) ) {
-                       // Prepend the object prefix to the table name
-                       // prepend after quote if used
-                       return preg_replace( '/^(`?)(.+)$/', '$1' . 
$this->objectPrefix . '$2', $name );
-               }
-               
-               // No prefix set. Use name provided.
-               return $name;
-       }
-       
-       /**
-       * Checks if element references a specific platform
-       *
-       * @param string $platform Requested platform
-       * @returns boolean TRUE if platform check succeeds
-       *
-       * @access private
-       */
-       function supportedPlatform( $platform = NULL ) {
-               $regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
-               
-               if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
-                       logMsg( "Platform $platform is supported" );
-                       return TRUE;
-               } else {
-                       logMsg( "Platform $platform is NOT supported" );
-                       return FALSE;
-               }
-       }
-       
-       /**
-       * Clears the array of generated SQL.
-       *
-       * @access private
-       */
-       function clearSQL() {
-               $this->sqlArray = array();
-       }
-       
-       /**
-       * Adds SQL into the SQL array.
-       *
-       * @param mixed $sql SQL to Add
-       * @return boolean TRUE if successful, else FALSE.
-       *
-       * @access private
-       */      
-       function addSQL( $sql = NULL ) {
-               if( is_array( $sql ) ) {
-                       foreach( $sql as $line ) {
-                               $this->addSQL( $line );
-                       }
-                       
-                       return TRUE;
-               }
-               
-               if( is_string( $sql ) ) {
-                       $this->sqlArray[] = $sql;
-                       
-                       // if executeInline is enabled, and either no errors 
have occurred or continueOnError is enabled, execute SQL.
-                       if( $this->ExecuteInline() && ( $this->success == 2 || 
$this->ContinueOnError() ) ) {
-                               $saved = $this->db->debug;
-                               $this->db->debug = $this->debug;
-                               $ok = $this->db->Execute( $sql );
-                               $this->db->debug = $saved;
-                               
-                               if( !$ok ) {
-                                       if( $this->debug ) {
-                                               ADOConnection::outp( 
$this->db->ErrorMsg() );
-                                       }
-                                       
-                                       $this->success = 1;
-                               }
-                       }
-                       
-                       return TRUE;
-               }
-               
-               return FALSE;
-       }
-       
-       /**
-       * Gets the SQL array in the specified format.
-       *
-       * @param string $format Format
-       * @return mixed SQL
-       *       
-       * @access private
-       */
-       function getSQL( $format = NULL, $sqlArray = NULL ) {
-               if( !is_array( $sqlArray ) ) {
-                       $sqlArray = $this->sqlArray;
-               }
-               
-               if( !is_array( $sqlArray ) ) {
-                       return FALSE;
-               }
-               
-               switch( strtolower( $format ) ) {
-                       case 'string':
-                       case 'text':
-                               return !empty( $sqlArray ) ? implode( ";\n\n", 
$sqlArray ) . ';' : '';
-                       case'html':
-                               return !empty( $sqlArray ) ? nl2br( 
htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
-               }
-               
-               return $this->sqlArray;
-       }
-       
-       /**
-       * Destroys an adoSchema object.
-       *
-       * Call this method to clean up after an adoSchema object that is no 
longer in use.
-       * @deprecated adoSchema now cleans up automatically.
-       */
-       function Destroy() {
-               set_magic_quotes_runtime( $this->mgq );
-               unset( $this );
-       }
-}
-
-/**
-* Message logging function
-*
-* @access private
-*/
-function logMsg( $msg, $title = NULL, $force = FALSE ) {
-       if( XMLS_DEBUG or $force ) {
-               echo '<pre>';
-               
-               if( isset( $title ) ) {
-                       echo '<h3>' . htmlentities( $title ) . '</h3>';
-               }
-               
-               if( is_object( $this ) ) {
-                       echo '[' . get_class( $this ) . '] ';
-               }
-               
-               print_r( $msg );
-               
-               echo '</pre>';
-       }
-}
+<?php
+// Copyright (c) 2004 ars Cognita Inc., all rights reserved
+/* 
******************************************************************************
+    Released under both BSD license and Lesser GPL library license. 
+       Whenever there is any discrepancy between the two licenses, 
+       the BSD license will take precedence. 
+*******************************************************************************/
+/**
+ * xmlschema is a class that allows the user to quickly and easily
+ * build a database on any ADOdb-supported platform using a simple
+ * XML schema.
+ *
+ * Last Editor: $Author: skwashd $
+ * @author Richard Tango-Lowy & Dan Cech
+ * @version $Revision: 1.3 $
+ *
+ * @package axmls
+ * @tutorial getting_started.pkg
+ */
+ 
+function _file_get_contents($file) 
+{
+       if (function_exists('file_get_contents')) return 
file_get_contents($file);
+       
+       $f = fopen($file,'r');
+       if (!$f) return '';
+       $t = '';
+       
+       while ($s = fread($f,100000)) $t .= $s;
+       fclose($f);
+       return $t;
+}
+
+
+/**
+* Debug on or off
+*/
+if( !defined( 'XMLS_DEBUG' ) ) {
+       define( 'XMLS_DEBUG', FALSE );
+}
+
+/**
+* Default prefix key
+*/
+if( !defined( 'XMLS_PREFIX' ) ) {
+       define( 'XMLS_PREFIX', '%%P' );
+}
+
+/**
+* Maximum length allowed for object prefix
+*/
+if( !defined( 'XMLS_PREFIX_MAXLEN' ) ) {
+       define( 'XMLS_PREFIX_MAXLEN', 10 );
+}
+
+/**
+* Execute SQL inline as it is generated
+*/
+if( !defined( 'XMLS_EXECUTE_INLINE' ) ) {
+       define( 'XMLS_EXECUTE_INLINE', FALSE );
+}
+
+/**
+* Continue SQL Execution if an error occurs?
+*/
+if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) ) {
+       define( 'XMLS_CONTINUE_ON_ERROR', FALSE );
+}
+
+/**
+* Current Schema Version
+*/
+if( !defined( 'XMLS_SCHEMA_VERSION' ) ) {
+       define( 'XMLS_SCHEMA_VERSION', '0.2' );
+}
+
+/**
+* Default Schema Version.  Used for Schemas without an explicit version set.
+*/
+if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) ) {
+       define( 'XMLS_DEFAULT_SCHEMA_VERSION', '0.1' );
+}
+
+/**
+* Default Schema Version.  Used for Schemas without an explicit version set.
+*/
+if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) {
+       define( 'XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER' );
+}
+
+/**
+* Include the main ADODB library
+*/
+if( !defined( '_ADODB_LAYER' ) ) {
+       require( 'adodb.inc.php' );
+       require( 'adodb-datadict.inc.php' );
+}
+
+/**
+* Abstract DB Object. This class provides basic methods for database objects, 
such
+* as tables and indexes.
+*
+* @package axmls
+* @access private
+*/
+class dbObject {
+       
+       /**
+       * var object Parent
+       */
+       var $parent;
+       
+       /**
+       * var string current element
+       */
+       var $currentElement;
+       
+       /**
+       * NOP
+       */
+       function dbObject( &$parent, $attributes = NULL ) {
+               $this->parent =& $parent;
+       }
+       
+       /**
+       * XML Callback to process start elements
+       *
+       * @access private
+       */
+       function _tag_open( &$parser, $tag, $attributes ) {
+               
+       }
+       
+       /**
+       * XML Callback to process CDATA elements
+       *
+       * @access private
+       */
+       function _tag_cdata( &$parser, $cdata ) {
+               
+       }
+       
+       /**
+       * XML Callback to process end elements
+       *
+       * @access private
+       */
+       function _tag_close( &$parser, $tag ) {
+               
+       }
+       
+       function create() {
+               return array();
+       }
+       
+       /**
+       * Destroys the object
+       */
+       function destroy() {
+               unset( $this );
+       }
+       
+       /**
+       * Checks whether the specified RDBMS is supported by the current
+       * database object or its ranking ancestor.
+       *
+       * @param string $platform RDBMS platform name (from ADODB platform 
list).
+       * @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
+       */
+       function supportedPlatform( $platform = NULL ) {
+               return is_object( $this->parent ) ? 
$this->parent->supportedPlatform( $platform ) : TRUE;
+       }
+       
+       /**
+       * Returns the prefix set by the ranking ancestor of the database object.
+       *
+       * @param string $name Prefix string.
+       * @return string Prefix.
+       */
+       function prefix( $name = '' ) {
+               return is_object( $this->parent ) ? $this->parent->prefix( 
$name ) : $name;
+       }
+       
+       /**
+       * Extracts a field ID from the specified field.
+       *
+       * @param string $field Field.
+       * @return string Field ID.
+       */
+       function FieldID( $field ) {
+               return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
+       }
+}
+
+/**
+* Creates a table object in ADOdb's datadict format
+*
+* This class stores information about a database table. As charactaristics
+* of the table are loaded from the external source, methods and properties
+* of this class are used to build up the table description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbTable extends dbObject {
+       
+       /**
+       * @var string Table name
+       */
+       var $name;
+       
+       /**
+       * @var array Field specifier: Meta-information about each field
+       */
+       var $fields = array();
+       
+       /**
+       * @var array List of table indexes.
+       */
+       var $indexes = array();
+       
+       /**
+       * @var array Table options: Table-level options
+       */
+       var $opts = array();
+       
+       /**
+       * @var string Field index: Keeps track of which field is currently 
being processed
+       */
+       var $current_field;
+       
+       /**
+       * @var boolean Mark table for destruction
+       * @access private
+       */
+       var $drop_table;
+       
+       /**
+       * @var boolean Mark field for destruction (not yet implemented)
+       * @access private
+       */
+       var $drop_field = array();
+       
+       /**
+       * Iniitializes a new table object.
+       *
+       * @param string $prefix DB Object prefix
+       * @param array $attributes Array of table attributes.
+       */
+       function dbTable( &$parent, $attributes = NULL ) {
+               $this->parent =& $parent;
+               $this->name = $this->prefix($attributes['NAME']);
+       }
+       
+       /**
+       * XML Callback to process start elements. Elements currently 
+       * processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & 
DEFAULT. 
+       *
+       * @access private
+       */
+       function _tag_open( &$parser, $tag, $attributes ) {
+               $this->currentElement = strtoupper( $tag );
+               
+               switch( $this->currentElement ) {
+                       case 'INDEX':
+                               if( !isset( $attributes['PLATFORM'] ) OR 
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+                                       xml_set_object( $parser, 
$this->addIndex( $attributes ) );
+                               }
+                               break;
+                       case 'DATA':
+                               if( !isset( $attributes['PLATFORM'] ) OR 
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+                                       xml_set_object( $parser, 
$this->addData( $attributes ) );
+                               }
+                               break;
+                       case 'DROP':
+                               $this->drop();
+                               break;
+                       case 'FIELD':
+                               // Add a field
+                               $fieldName = $attributes['NAME'];
+                               $fieldType = $attributes['TYPE'];
+                               $fieldSize = isset( $attributes['SIZE'] ) ? 
$attributes['SIZE'] : NULL;
+                               $fieldOpts = isset( $attributes['OPTS'] ) ? 
$attributes['OPTS'] : NULL;
+                               
+                               $this->addField( $fieldName, $fieldType, 
$fieldSize, $fieldOpts );
+                               break;
+                       case 'KEY':
+                       case 'NOTNULL':
+                       case 'AUTOINCREMENT':
+                               // Add a field option
+                               $this->addFieldOpt( $this->current_field, 
$this->currentElement );
+                               break;
+                       case 'DEFAULT':
+                               // Add a field option to the table object
+                               
+                               // Work around ADOdb datadict issue that 
misinterprets empty strings.
+                               if( $attributes['VALUE'] == '' ) {
+                                       $attributes['VALUE'] = " '' ";
+                               }
+                               
+                               $this->addFieldOpt( $this->current_field, 
$this->currentElement, $attributes['VALUE'] );
+                               break;
+                       case 'DEFDATE':
+                       case 'DEFTIMESTAMP':
+                               // Add a field option to the table object
+                               $this->addFieldOpt( $this->current_field, 
$this->currentElement );
+                               break;
+                       default:
+                               // print_r( array( $tag, $attributes ) );
+               }
+       }
+       
+       /**
+       * XML Callback to process CDATA elements
+       *
+       * @access private
+       */
+       function _tag_cdata( &$parser, $cdata ) {
+               switch( $this->currentElement ) {
+                       // Table constraint
+                       case 'CONSTRAINT':
+                               if( isset( $this->current_field ) ) {
+                                       $this->addFieldOpt( 
$this->current_field, $this->currentElement, $cdata );
+                               } else {
+                                       $this->addTableOpt( $cdata );
+                               }
+                               break;
+                       // Table option
+                       case 'OPT':
+                               $this->addTableOpt( $cdata );
+                               break;
+                       default:
+                               
+               }
+       }
+       
+       /**
+       * XML Callback to process end elements
+       *
+       * @access private
+       */
+       function _tag_close( &$parser, $tag ) {
+               $this->currentElement = '';
+               
+               switch( strtoupper( $tag ) ) {
+                       case 'TABLE':
+                               $this->parent->addSQL( $this->create( 
$this->parent ) );
+                               xml_set_object( $parser, $this->parent );
+                               $this->destroy();
+                               break;
+                       case 'FIELD':
+                               unset($this->current_field);
+                               break;
+
+               }
+       }
+       
+       /**
+       * Adds an index to a table object
+       *
+       * @param array $attributes Index attributes
+       * @return object dbIndex object
+       */
+       function &addIndex( $attributes ) {
+               $name = strtoupper( $attributes['NAME'] );
+               $this->indexes[$name] =& new dbIndex( $this, $attributes );
+               return $this->indexes[$name];
+       }
+       
+       /**
+       * Adds data to a table object
+       *
+       * @param array $attributes Data attributes
+       * @return object dbData object
+       */
+       function &addData( $attributes ) {
+               if( !isset( $this->data ) ) {
+                       $this->data =& new dbData( $this, $attributes );
+               }
+               return $this->data;
+       }
+       
+       /**
+       * Adds a field to a table object
+       *
+       * $name is the name of the table to which the field should be added. 
+       * $type is an ADODB datadict field type. The following field types
+       * are supported as of ADODB 3.40:
+       *       - C:  varchar
+       *       - X:  CLOB (character large object) or largest varchar size
+       *          if CLOB is not supported
+       *       - C2: Multibyte varchar
+       *       - X2: Multibyte CLOB
+       *       - B:  BLOB (binary large object)
+       *       - D:  Date (some databases do not support this, and we return a 
datetime type)
+       *       - T:  Datetime or Timestamp
+       *       - L:  Integer field suitable for storing booleans (0 or 1)
+       *       - I:  Integer (mapped to I4)
+       *       - I1: 1-byte integer
+       *       - I2: 2-byte integer
+       *       - I4: 4-byte integer
+       *       - I8: 8-byte integer
+       *       - F:  Floating point number
+       *       - N:  Numeric or decimal number
+       *
+       * @param string $name Name of the table to which the field will be 
added.
+       * @param string $type   ADODB datadict field type.
+       * @param string $size   Field size
+       * @param array $opts    Field options array
+       * @return array Field specifier array
+       */
+       function addField( $name, $type, $size = NULL, $opts = NULL ) {
+               $field_id = $this->FieldID( $name );
+               
+               // Set the field index so we know where we are
+               $this->current_field = $field_id;
+               
+               // Set the field name (required)
+               $this->fields[$field_id]['NAME'] = $name;
+               
+               // Set the field type (required)
+               $this->fields[$field_id]['TYPE'] = $type;
+               
+               // Set the field size (optional)
+               if( isset( $size ) ) {
+                       $this->fields[$field_id]['SIZE'] = $size;
+               }
+               
+               // Set the field options
+               if( isset( $opts ) ) {
+                       $this->fields[$field_id]['OPTS'][] = $opts;
+               }
+       }
+       
+       /**
+       * Adds a field option to the current field specifier
+       *
+       * This method adds a field option allowed by the ADOdb datadict 
+       * and appends it to the given field.
+       *
+       * @param string $field  Field name
+       * @param string $opt ADOdb field option
+       * @param mixed $value Field option value
+       * @return array Field specifier array
+       */
+       function addFieldOpt( $field, $opt, $value = NULL ) {
+               if( !isset( $value ) ) {
+                       $this->fields[$this->FieldID( $field )]['OPTS'][] = 
$opt;
+               // Add the option and value
+               } else {
+                       $this->fields[$this->FieldID( $field )]['OPTS'][] = 
array( $opt => $value );
+               }
+       }
+       
+       /**
+       * Adds an option to the table
+       *
+       * This method takes a comma-separated list of table-level options
+       * and appends them to the table object.
+       *
+       * @param string $opt Table option
+       * @return array Options
+       */
+       function addTableOpt( $opt ) {
+               $this->opts[] = $opt;
+               
+               return $this->opts;
+       }
+       
+       /**
+       * Generates the SQL that will create the table in the database
+       *
+       * @param object $xmls adoSchema object
+       * @return array Array containing table creation SQL
+       */
+       function create( &$xmls ) {
+               $sql = array();
+               
+               // drop any existing indexes
+               if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( 
$this->name ) ) ) {
+                       foreach( $legacy_indexes as $index => $index_details ) {
+                               $sql[] = $xmls->dict->DropIndexSQL( $index, 
$this->name );
+                       }
+               }
+               
+               // remove fields to be dropped from table object
+               foreach( $this->drop_field as $field ) {
+                       unset( $this->fields[$field] );
+               }
+               
+               // if table exists
+               if( is_array( $legacy_fields = $xmls->dict->MetaColumns( 
$this->name ) ) ) {
+                       // drop table
+                       if( $this->drop_table ) {
+                               $sql[] = $xmls->dict->DropTableSQL( $this->name 
);
+                               
+                               return $sql;
+                       }
+                       
+                       // drop any existing fields not in schema
+                       foreach( $legacy_fields as $field_id => $field ) {
+                               if( !isset( $this->fields[$field_id] ) ) {
+                                       $sql[] = $xmls->dict->DropColumnSQL( 
$this->name, '`'.$field->name.'`' );
+                               }
+                       }
+               // if table doesn't exist
+               } else {
+                       if( $this->drop_table ) {
+                               return $sql;
+                       }
+                       
+                       $legacy_fields = array();
+               }
+               
+               // Loop through the field specifier array, building the 
associative array for the field options
+               $fldarray = array();
+               
+               foreach( $this->fields as $field_id => $finfo ) {
+                       // Set an empty size if it isn't supplied
+                       if( !isset( $finfo['SIZE'] ) ) {
+                               $finfo['SIZE'] = '';
+                       }
+                       
+                       // Initialize the field array with the type and size
+                       $fldarray[$field_id] = array(
+                               'NAME' => $finfo['NAME'],
+                               'TYPE' => $finfo['TYPE'],
+                               'SIZE' => $finfo['SIZE']
+                       );
+                       
+                       // Loop through the options array and add the field 
options. 
+                       if( isset( $finfo['OPTS'] ) ) {
+                               foreach( $finfo['OPTS'] as $opt ) {
+                                       // Option has an argument.
+                                       if( is_array( $opt ) ) {
+                                               $key = key( $opt );
+                                               $value = $opt[key( $opt )];
+                                               @$fldarray[$field_id][$key] .= 
$value;
+                                       // Option doesn't have arguments
+                                       } else {
+                                               $fldarray[$field_id][$opt] = 
$opt;
+                                       }
+                               }
+                       }
+               }
+               
+               if( empty( $legacy_fields ) ) {
+                       // Create the new table
+                       $sql[] = $xmls->dict->CreateTableSQL( $this->name, 
$fldarray, $this->opts );
+                       logMsg( end( $sql ), 'Generated CreateTableSQL' );
+               } else {
+                       // Upgrade an existing table
+                       logMsg( "Upgrading {$this->name} using 
'{$xmls->upgrade}'" );
+                       switch( $xmls->upgrade ) {
+                               // Use ChangeTableSQL
+                               case 'ALTER':
+                                       logMsg( 'Generated ChangeTableSQL 
(ALTERing table)' );
+                                       $sql[] = $xmls->dict->ChangeTableSQL( 
$this->name, $fldarray, $this->opts );
+                                       break;
+                               case 'REPLACE':
+                                       logMsg( 'Doing upgrade REPLACE 
(testing)' );
+                                       $sql[] = $xmls->dict->DropTableSQL( 
$this->name );
+                                       $sql[] = $xmls->dict->CreateTableSQL( 
$this->name, $fldarray, $this->opts );
+                                       break;
+                               // ignore table
+                               default:
+                                       return array();
+                       }
+               }
+               
+               foreach( $this->indexes as $index ) {
+                       $sql[] = $index->create( $xmls );
+               }
+               
+               if( isset( $this->data ) ) {
+                       $sql[] = $this->data->create( $xmls );
+               }
+               
+               return $sql;
+       }
+       
+       /**
+       * Marks a field or table for destruction
+       */
+       function drop() {
+               if( isset( $this->current_field ) ) {
+                       // Drop the current field
+                       logMsg( "Dropping field '{$this->current_field}' from 
table '{$this->name}'" );
+                       // $this->drop_field[$this->current_field] = 
$xmls->dict->DropColumnSQL( $this->name, $this->current_field );
+                       $this->drop_field[$this->current_field] = 
$this->current_field;
+               } else {
+                       // Drop the current table
+                       logMsg( "Dropping table '{$this->name}'" );
+                       // $this->drop_table = $xmls->dict->DropTableSQL( 
$this->name );
+                       $this->drop_table = TRUE;
+               }
+       }
+}
+
+/**
+* Creates an index object in ADOdb's datadict format
+*
+* This class stores information about a database index. As charactaristics
+* of the index are loaded from the external source, methods and properties
+* of this class are used to build up the index description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbIndex extends dbObject {
+       
+       /**
+       * @var string   Index name
+       */
+       var $name;
+       
+       /**
+       * @var array    Index options: Index-level options
+       */
+       var $opts = array();
+       
+       /**
+       * @var array    Indexed fields: Table columns included in this index
+       */
+       var $columns = array();
+       
+       /**
+       * @var boolean Mark index for destruction
+       * @access private
+       */
+       var $drop = FALSE;
+       
+       /**
+       * Initializes the new dbIndex object.
+       *
+       * @param object $parent Parent object
+       * @param array $attributes Attributes
+       *
+       * @internal
+       */
+       function dbIndex( &$parent, $attributes = NULL ) {
+               $this->parent =& $parent;
+               
+               $this->name = $this->prefix ($attributes['NAME']);
+       }
+       
+       /**
+       * XML Callback to process start elements
+       *
+       * Processes XML opening tags. 
+       * Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, 
FULLTEXT & HASH. 
+       *
+       * @access private
+       */
+       function _tag_open( &$parser, $tag, $attributes ) {
+               $this->currentElement = strtoupper( $tag );
+               
+               switch( $this->currentElement ) {
+                       case 'DROP':
+                               $this->drop();
+                               break;
+                       case 'CLUSTERED':
+                       case 'BITMAP':
+                       case 'UNIQUE':
+                       case 'FULLTEXT':
+                       case 'HASH':
+                               // Add index Option
+                               $this->addIndexOpt( $this->currentElement );
+                               break;
+                       default:
+                               // print_r( array( $tag, $attributes ) );
+               }
+       }
+       
+       /**
+       * XML Callback to process CDATA elements
+       *
+       * Processes XML cdata.
+       *
+       * @access private
+       */
+       function _tag_cdata( &$parser, $cdata ) {
+               switch( $this->currentElement ) {
+                       // Index field name
+                       case 'COL':
+                               $this->addField( $cdata );
+                               break;
+                       default:
+                               
+               }
+       }
+       
+       /**
+       * XML Callback to process end elements
+       *
+       * @access private
+       */
+       function _tag_close( &$parser, $tag ) {
+               $this->currentElement = '';
+               
+               switch( strtoupper( $tag ) ) {
+                       case 'INDEX':
+                               xml_set_object( $parser, $this->parent );
+                               break;
+               }
+       }
+       
+       /**
+       * Adds a field to the index
+       *
+       * @param string $name Field name
+       * @return string Field list
+       */
+       function addField( $name ) {
+               $this->columns[$this->FieldID( $name )] = $name;
+               
+               // Return the field list
+               return $this->columns;
+       }
+       
+       /**
+       * Adds options to the index
+       *
+       * @param string $opt Comma-separated list of index options.
+       * @return string Option list
+       */
+       function addIndexOpt( $opt ) {
+               $this->opts[] = $opt;
+               
+               // Return the options list
+               return $this->opts;
+       }
+       
+       /**
+       * Generates the SQL that will create the index in the database
+       *
+       * @param object $xmls adoSchema object
+       * @return array Array containing index creation SQL
+       */
+       function create( &$xmls ) {
+               if( $this->drop ) {
+                       return NULL;
+               }
+               
+               // eliminate any columns that aren't in the table
+               foreach( $this->columns as $id => $col ) {
+                       if( !isset( $this->parent->fields[$id] ) ) {
+                               unset( $this->columns[$id] );
+                       }
+               }
+               
+               return $xmls->dict->CreateIndexSQL( $this->name, 
$this->parent->name, $this->columns, $this->opts );
+       }
+       
+       /**
+       * Marks an index for destruction
+       */
+       function drop() {
+               $this->drop = TRUE;
+       }
+}
+
+/**
+* Creates a data object in ADOdb's datadict format
+*
+* This class stores information about table data.
+*
+* @package axmls
+* @access private
+*/
+class dbData extends dbObject {
+       
+       var $data = array();
+       
+       var $row;
+       
+       /**
+       * Initializes the new dbIndex object.
+       *
+       * @param object $parent Parent object
+       * @param array $attributes Attributes
+       *
+       * @internal
+       */
+       function dbData( &$parent, $attributes = NULL ) {
+               $this->parent =& $parent;
+       }
+       
+       /**
+       * XML Callback to process start elements
+       *
+       * Processes XML opening tags. 
+       * Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, 
FULLTEXT & HASH. 
+       *
+       * @access private
+       */
+       function _tag_open( &$parser, $tag, $attributes ) {
+               $this->currentElement = strtoupper( $tag );
+               
+               switch( $this->currentElement ) {
+                       case 'ROW':
+                               $this->row = count( $this->data );
+                               $this->data[$this->row] = array();
+                               break;
+                       case 'F':
+                               $this->addField($attributes);
+                       default:
+                               // print_r( array( $tag, $attributes ) );
+               }
+       }
+       
+       /**
+       * XML Callback to process CDATA elements
+       *
+       * Processes XML cdata.
+       *
+       * @access private
+       */
+       function _tag_cdata( &$parser, $cdata ) {
+               switch( $this->currentElement ) {
+                       // Index field name
+                       case 'F':
+                               $this->addData( $cdata );
+                               break;
+                       default:
+                               
+               }
+       }
+       
+       /**
+       * XML Callback to process end elements
+       *
+       * @access private
+       */
+       function _tag_close( &$parser, $tag ) {
+               $this->currentElement = '';
+               
+               switch( strtoupper( $tag ) ) {
+                       case 'DATA':
+                               xml_set_object( $parser, $this->parent );
+                               break;
+               }
+       }
+       
+       /**
+       * Adds a field to the index
+       *
+       * @param string $name Field name
+       * @return string Field list
+       */
+       function addField( $attributes ) {
+               if( isset( $attributes['NAME'] ) ) {
+                       $name = $attributes['NAME'];
+               } else {
+                       $name = count($this->data[$this->row]);
+               }
+               
+               // Set the field index so we know where we are
+               $this->current_field = $this->FieldID( $name );
+       }
+       
+       /**
+       * Adds options to the index
+       *
+       * @param string $opt Comma-separated list of index options.
+       * @return string Option list
+       */
+       function addData( $cdata ) {
+               if( !isset( $this->data[$this->row] ) ) {
+                       $this->data[$this->row] = array();
+               }
+               
+               if( !isset( $this->data[$this->row][$this->current_field] ) ) {
+                       $this->data[$this->row][$this->current_field] = '';
+               }
+               
+               $this->data[$this->row][$this->current_field] .= $cdata;
+       }
+       
+       /**
+       * Generates the SQL that will create the index in the database
+       *
+       * @param object $xmls adoSchema object
+       * @return array Array containing index creation SQL
+       */
+       function create( &$xmls ) {
+               $table = $xmls->dict->TableName($this->parent->name);
+               $table_field_count = count($this->parent->fields);
+               $sql = array();
+               
+               // eliminate any columns that aren't in the table
+               foreach( $this->data as $row ) {
+                       $table_fields = $this->parent->fields;
+                       $fields = array();
+                       
+                       foreach( $row as $field_id => $field_data ) {
+                               if( !array_key_exists( $field_id, $table_fields 
) ) {
+                                       if( is_numeric( $field_id ) ) {
+                                               $field_id = reset( array_keys( 
$table_fields ) );
+                                       } else {
+                                               continue;
+                                       }
+                               }
+                               
+                               $name = $table_fields[$field_id]['NAME'];
+                               
+                               switch( $table_fields[$field_id]['TYPE'] ) {
+                                       case 'C':
+                                       case 'C2':
+                                       case 'X':
+                                       case 'X2':
+                                               $fields[$name] = 
$xmls->db->qstr( $field_data );
+                                               break;
+                                       case 'I':
+                                       case 'I1':
+                                       case 'I2':
+                                       case 'I4':
+                                       case 'I8':
+                                               $fields[$name] = 
intval($field_data);
+                                               break;
+                                       default:
+                                               $fields[$name] = $field_data;
+                               }
+                               
+                               unset($table_fields[$field_id]);
+                       }
+                       
+                       // check that at least 1 column is specified
+                       if( empty( $fields ) ) {
+                               continue;
+                       }
+                       
+                       // check that no required columns are missing
+                       if( count( $fields ) < $table_field_count ) {
+                               foreach( $table_fields as $field ) {
+                                       if (isset( $field['OPTS'] ))
+                                               if( ( in_array( 'NOTNULL', 
$field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 
'AUTOINCREMENT', $field['OPTS'] ) ) {
+                                                       continue(2);
+                                               }
+                               }
+                       }
+                       
+                       $sql[] = 'INSERT INTO '. $table .' ('. implode( ',', 
array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
+               }
+               
+               return $sql;
+       }
+}
+
+/**
+* Creates the SQL to execute a list of provided SQL queries
+*
+* @package axmls
+* @access private
+*/
+class dbQuerySet extends dbObject {
+       
+       /**
+       * @var array    List of SQL queries
+       */
+       var $queries = array();
+       
+       /**
+       * @var string   String used to build of a query line by line
+       */
+       var $query;
+       
+       /**
+       * @var string   Query prefix key
+       */
+       var $prefixKey = '';
+       
+       /**
+       * @var boolean  Auto prefix enable (TRUE)
+       */
+       var $prefixMethod = 'AUTO';
+       
+       /**
+       * Initializes the query set.
+       *
+       * @param object $parent Parent object
+       * @param array $attributes Attributes
+       */
+       function dbQuerySet( &$parent, $attributes = NULL ) {
+               $this->parent =& $parent;
+                       
+               // Overrides the manual prefix key
+               if( isset( $attributes['KEY'] ) ) {
+                       $this->prefixKey = $attributes['KEY'];
+               }
+               
+               $prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? 
strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
+               
+               // Enables or disables automatic prefix prepending
+               switch( $prefixMethod ) {
+                       case 'AUTO':
+                               $this->prefixMethod = 'AUTO';
+                               break;
+                       case 'MANUAL':
+                               $this->prefixMethod = 'MANUAL';
+                               break;
+                       case 'NONE':
+                               $this->prefixMethod = 'NONE';
+                               break;
+               }
+       }
+       
+       /**
+       * XML Callback to process start elements. Elements currently 
+       * processed are: QUERY. 
+       *
+       * @access private
+       */
+       function _tag_open( &$parser, $tag, $attributes ) {
+               $this->currentElement = strtoupper( $tag );
+               
+               switch( $this->currentElement ) {
+                       case 'QUERY':
+                               // Create a new query in a SQL queryset.
+                               // Ignore this query set if a platform is 
specified and it's different than the 
+                               // current connection platform.
+                               if( !isset( $attributes['PLATFORM'] ) OR 
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+                                       $this->newQuery();
+                               } else {
+                                       $this->discardQuery();
+                               }
+                               break;
+                       default:
+                               // print_r( array( $tag, $attributes ) );
+               }
+       }
+       
+       /**
+       * XML Callback to process CDATA elements
+       */
+       function _tag_cdata( &$parser, $cdata ) {
+               switch( $this->currentElement ) {
+                       // Line of queryset SQL data
+                       case 'QUERY':
+                               $this->buildQuery( $cdata );
+                               break;
+                       default:
+                               
+               }
+       }
+       
+       /**
+       * XML Callback to process end elements
+       *
+       * @access private
+       */
+       function _tag_close( &$parser, $tag ) {
+               $this->currentElement = '';
+               
+               switch( strtoupper( $tag ) ) {
+                       case 'QUERY':
+                               // Add the finished query to the open query set.
+                               $this->addQuery();
+                               break;
+                       case 'SQL':
+                               $this->parent->addSQL( $this->create( 
$this->parent ) );
+                               xml_set_object( $parser, $this->parent );
+                               $this->destroy();
+                               break;
+                       default:
+                               
+               }
+       }
+       
+       /**
+       * Re-initializes the query.
+       *
+       * @return boolean TRUE
+       */
+       function newQuery() {
+               $this->query = '';
+               
+               return TRUE;
+       }
+       
+       /**
+       * Discards the existing query.
+       *
+       * @return boolean TRUE
+       */
+       function discardQuery() {
+               unset( $this->query );
+               
+               return TRUE;
+       }
+       
+       /** 
+       * Appends a line to a query that is being built line by line
+       *
+       * @param string $data Line of SQL data or NULL to initialize a new query
+       * @return string SQL query string.
+       */
+       function buildQuery( $sql = NULL ) {
+               if( !isset( $this->query ) OR empty( $sql ) ) {
+                       return FALSE;
+               }
+               
+               $this->query .= $sql;
+               
+               return $this->query;
+       }
+       
+       /**
+       * Adds a completed query to the query list
+       *
+       * @return string        SQL of added query
+       */
+       function addQuery() {
+               if( !isset( $this->query ) ) {
+                       return FALSE;
+               }
+               
+               $this->queries[] = $return = trim($this->query);
+               
+               unset( $this->query );
+               
+               return $return;
+       }
+       
+       /**
+       * Creates and returns the current query set
+       *
+       * @param object $xmls adoSchema object
+       * @return array Query set
+       */
+       function create( &$xmls ) {
+               foreach( $this->queries as $id => $query ) {
+                       switch( $this->prefixMethod ) {
+                               case 'AUTO':
+                                       // Enable auto prefix replacement
+                                       
+                                       // Process object prefix.
+                                       // Evaluate SQL statements to prepend 
prefix to objects
+                                       $query = $this->prefixQuery( 
'/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, 
$xmls->objectPrefix );
+                                       $query = $this->prefixQuery( 
'/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, 
$xmls->objectPrefix );
+                                       $query = $this->prefixQuery( 
'/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, 
$xmls->objectPrefix );
+                                       
+                                       // SELECT statements aren't working yet
+                                       #$data = preg_replace( 
'/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 
$prefix\2 \3", $data );
+                                       
+                               case 'MANUAL':
+                                       // If prefixKey is set and has a value 
then we use it to override the default constant XMLS_PREFIX.
+                                       // If prefixKey is not set, we use the 
default constant XMLS_PREFIX
+                                       if( isset( $this->prefixKey ) AND( 
$this->prefixKey !== '' ) ) {
+                                               // Enable prefix override
+                                               $query = str_replace( 
$this->prefixKey, $xmls->objectPrefix, $query );
+                                       } else {
+                                               // Use default replacement
+                                               $query = str_replace( 
XMLS_PREFIX , $xmls->objectPrefix, $query );
+                                       }
+                       }
+                       
+                       $this->queries[$id] = trim( $query );
+               }
+               
+               // Return the query set array
+               return $this->queries;
+       }
+       
+       /**
+       * Rebuilds the query with the prefix attached to any objects
+       *
+       * @param string $regex Regex used to add prefix
+       * @param string $query SQL query string
+       * @param string $prefix Prefix to be appended to tables, indices, etc.
+       * @return string Prefixed SQL query string.
+       */
+       function prefixQuery( $regex, $query, $prefix = NULL ) {
+               if( !isset( $prefix ) ) {
+                       return $query;
+               }
+               
+               if( preg_match( $regex, $query, $match ) ) {
+                       $preamble = $match[1];
+                       $postamble = $match[5];
+                       $objectList = explode( ',', $match[3] );
+                       // $prefix = $prefix . '_';
+                       
+                       $prefixedList = '';
+                       
+                       foreach( $objectList as $object ) {
+                               if( $prefixedList !== '' ) {
+                                       $prefixedList .= ', ';
+                               }
+                               
+                               $prefixedList .= $prefix . trim( $object );
+                       }
+                       
+                       $query = $preamble . ' ' . $prefixedList . ' ' . 
$postamble;
+               }
+               
+               return $query;
+       }
+}
+
+/**
+* Loads and parses an XML file, creating an array of "ready-to-run" SQL 
statements
+* 
+* This class is used to load and parse the XML file, to create an array of SQL 
statements
+* that can be used to build a database, and to build the database using the 
SQL array.
+*
+* @tutorial getting_started.pkg
+*
+* @author Richard Tango-Lowy & Dan Cech
+* @version $Revision: 1.3 $
+*
+* @package axmls
+*/
+class adoSchema {
+       
+       /**
+       * @var array    Array containing SQL queries to generate all objects
+       * @access private
+       */
+       var $sqlArray;
+       
+       /**
+       * @var object   ADOdb connection object
+       * @access private
+       */
+       var $db;
+       
+       /**
+       * @var object   ADOdb Data Dictionary
+       * @access private
+       */
+       var $dict;
+       
+       /**
+       * @var string Current XML element
+       * @access private
+       */
+       var $currentElement = '';
+       
+       /**
+       * @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing 
database
+       * @access private
+       */
+       var $upgrade = '';
+       
+       /**
+       * @var string Optional object prefix
+       * @access private
+       */
+       var $objectPrefix = '';
+       
+       /**
+       * @var long     Original Magic Quotes Runtime value
+       * @access private
+       */
+       var $mgq;
+       
+       /**
+       * @var long     System debug
+       * @access private
+       */
+       var $debug;
+       
+       /**
+       * @var string Regular expression to find schema version
+       * @access private
+       */
+       var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
+       
+       /**
+       * @var string Current schema version
+       * @access private
+       */
+       var $schemaVersion;
+       
+       /**
+       * @var int      Success of last Schema execution
+       */
+       var $success;
+       
+       /**
+       * @var bool     Execute SQL inline as it is generated
+       */
+       var $executeInline;
+       
+       /**
+       * @var bool     Continue SQL execution if errors occur
+       */
+       var $continueOnError;
+       
+       /**
+       * Creates an adoSchema object
+       *
+       * Creating an adoSchema object is the first step in processing an XML 
schema.
+       * The only parameter is an ADOdb database connection object, which must 
already
+       * have been created.
+       *
+       * @param object $db ADOdb database connection object.
+       */
+       function adoSchema( &$db ) {
+               // Initialize the environment
+               $this->mgq = get_magic_quotes_runtime();
+               set_magic_quotes_runtime(0);
+               
+               $this->db =& $db;
+               $this->debug = $this->db->debug;
+               $this->dict = NewDataDictionary( $this->db );
+               $this->sqlArray = array();
+               $this->schemaVersion = XMLS_SCHEMA_VERSION;
+               $this->executeInline( XMLS_EXECUTE_INLINE );
+               $this->continueOnError( XMLS_CONTINUE_ON_ERROR );
+               $this->setUpgradeMethod();
+       }
+       
+       /**
+       * Sets the method to be used for upgrading an existing database
+       *
+       * Use this method to specify how existing database objects should be 
upgraded.
+       * The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER 
attempts to
+       * alter each database object directly, REPLACE attempts to rebuild each 
object
+       * from scratch, BEST attempts to determine the best upgrade method for 
each
+       * object, and NONE disables upgrading.
+       *
+       * This method is not yet used by AXMLS, but exists for backward 
compatibility.
+       * The ALTER method is automatically assumed when the adoSchema object is
+       * instantiated; other upgrade methods are not currently supported.
+       *
+       * @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
+       * @returns string Upgrade method used
+       */
+       function SetUpgradeMethod( $method = '' ) {
+               if( !is_string( $method ) ) {
+                       return FALSE;
+               }
+               
+               $method = strtoupper( $method );
+               
+               // Handle the upgrade methods
+               switch( $method ) {
+                       case 'ALTER':
+                               $this->upgrade = $method;
+                               break;
+                       case 'REPLACE':
+                               $this->upgrade = $method;
+                               break;
+                       case 'BEST':
+                               $this->upgrade = 'ALTER';
+                               break;
+                       case 'NONE':
+                               $this->upgrade = 'NONE';
+                               break;
+                       default:
+                               // Use default if no legitimate method is 
passed.
+                               $this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
+               }
+               
+               return $this->upgrade;
+       }
+       
+       /**
+       * Enables/disables inline SQL execution.
+       *
+       * Call this method to enable or disable inline execution of the schema. 
If the mode is set to TRUE (inline execution),
+       * AXMLS applies the SQL to the database immediately as each schema 
entity is parsed. If the mode
+       * is set to FALSE (post execution), AXMLS parses the entire schema and 
you will need to call adoSchema::ExecuteSchema()
+       * to apply the schema to the database.
+       *
+       * @param bool $mode execute
+       * @return bool current execution mode
+       *
+       * @see ParseSchema(), ExecuteSchema()
+       */
+       function ExecuteInline( $mode = NULL ) {
+               if( is_bool( $mode ) ) {
+                       $this->executeInline = $mode;
+               }
+               
+               return $this->executeInline;
+       }
+       
+       /**
+       * Enables/disables SQL continue on error.
+       *
+       * Call this method to enable or disable continuation of SQL execution 
if an error occurs.
+       * If the mode is set to TRUE (continue), AXMLS will continue to apply 
SQL to the database, even if an error occurs.
+       * If the mode is set to FALSE (halt), AXMLS will halt execution of 
generated sql if an error occurs, though parsing
+       * of the schema will continue.
+       *
+       * @param bool $mode execute
+       * @return bool current continueOnError mode
+       *
+       * @see addSQL(), ExecuteSchema()
+       */
+       function ContinueOnError( $mode = NULL ) {
+               if( is_bool( $mode ) ) {
+                       $this->continueOnError = $mode;
+               }
+               
+               return $this->continueOnError;
+       }
+       
+       /**
+       * Loads an XML schema from a file and converts it to SQL.
+       *
+       * Call this method to load the specified schema (see the DTD for the 
proper format) from
+       * the filesystem and generate the SQL necessary to create the database 
described. 
+       * @see ParseSchemaString()
+       *
+       * @param string $file Name of XML schema file.
+       * @param bool $returnSchema Return schema rather than parsing.
+       * @return array Array of SQL queries, ready to execute
+       */
+       function ParseSchema( $filename, $returnSchema = FALSE ) {
+               return $this->ParseSchemaString( $this->ConvertSchemaFile( 
$filename ), $returnSchema );
+       }
+       
+       /**
+       * Loads an XML schema from a file and converts it to SQL.
+       *
+       * Call this method to load the specified schema from a file (see the 
DTD for the proper format) 
+       * and generate the SQL necessary to create the database described by 
the schema.
+       *
+       * @param string $file Name of XML schema file.
+       * @param bool $returnSchema Return schema rather than parsing.
+       * @return array Array of SQL queries, ready to execute.
+       *
+       * @deprecated Replaced by adoSchema::ParseSchema() and 
adoSchema::ParseSchemaString()
+       * @see ParseSchema(), ParseSchemaString()
+       */
+       function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
+               // Open the file
+               if( !($fp = fopen( $filename, 'r' )) ) {
+                       // die( 'Unable to open file' );
+                       return FALSE;
+               }
+               
+               // do version detection here
+               if( $this->SchemaFileVersion( $filename ) != 
$this->schemaVersion ) {
+                       return FALSE;
+               }
+               
+               if ( $returnSchema )
+               {
+                       $xmlstring = '';
+                       while( $data = fread( $fp, 100000 ) ) {
+                               $xmlstring .= $data;
+                       }
+                       return $xmlstring;
+               }
+               
+               $this->success = 2;
+               
+               $xmlParser = $this->create_parser();
+               
+               // Process the file
+               while( $data = fread( $fp, 4096 ) ) {
+                       if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
+                               die( sprintf(
+                                       "XML error: %s at line %d",
+                                       xml_error_string( xml_get_error_code( 
$xmlParser) ),
+                                       xml_get_current_line_number( $xmlParser)
+                               ) );
+                       }
+               }
+               
+               xml_parser_free( $xmlParser );
+               
+               return $this->sqlArray;
+       }
+       
+       /**
+       * Converts an XML schema string to SQL.
+       *
+       * Call this method to parse a string containing an XML schema (see the 
DTD for the proper format)
+       * and generate the SQL necessary to create the database described by 
the schema. 
+       * @see ParseSchema()
+       *
+       * @param string $xmlstring XML schema string.
+       * @param bool $returnSchema Return schema rather than parsing.
+       * @return array Array of SQL queries, ready to execute.
+       */
+       function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
+               if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+                       return FALSE;
+               }
+               
+               // do version detection here
+               if( $this->SchemaStringVersion( $xmlstring ) != 
$this->schemaVersion ) {
+                       return FALSE;
+               }
+               
+               if ( $returnSchema )
+               {
+                       return $xmlstring;
+               }
+               
+               $this->success = 2;
+               
+               $xmlParser = $this->create_parser();
+               
+               if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
+                       die( sprintf(
+                               "XML error: %s at line %d",
+                               xml_error_string( xml_get_error_code( 
$xmlParser) ),
+                               xml_get_current_line_number( $xmlParser)
+                       ) );
+               }
+               
+               xml_parser_free( $xmlParser );
+               
+               return $this->sqlArray;
+       }
+       
+       /**
+       * Loads an XML schema from a file and converts it to uninstallation SQL.
+       *
+       * Call this method to load the specified schema (see the DTD for the 
proper format) from
+       * the filesystem and generate the SQL necessary to remove the database 
described.
+       * @see RemoveSchemaString()
+       *
+       * @param string $file Name of XML schema file.
+       * @param bool $returnSchema Return schema rather than parsing.
+       * @return array Array of SQL queries, ready to execute
+       */
+       function RemoveSchema( $filename, $returnSchema = FALSE ) {
+               return $this->RemoveSchemaString( $this->ConvertSchemaFile( 
$filename ), $returnSchema );
+       }
+       
+       /**
+       * Converts an XML schema string to uninstallation SQL.
+       *
+       * Call this method to parse a string containing an XML schema (see the 
DTD for the proper format)
+       * and generate the SQL necessary to uninstall the database described by 
the schema. 
+       * @see RemoveSchema()
+       *
+       * @param string $schema XML schema string.
+       * @param bool $returnSchema Return schema rather than parsing.
+       * @return array Array of SQL queries, ready to execute.
+       */
+       function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
+               
+               // grab current version
+               if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+                       return FALSE;
+               }
+               
+               return $this->ParseSchemaString( $this->TransformSchema( 
$schema, 'remove-' . $version), $returnSchema );
+       }
+       
+       /**
+       * Applies the current XML schema to the database (post execution).
+       *
+       * Call this method to apply the current schema (generally created by 
calling 
+       * ParseSchema() or ParseSchemaString() ) to the database (creating the 
tables, indexes, 
+       * and executing other SQL specified in the schema) after parsing.
+       * @see ParseSchema(), ParseSchemaString(), ExecuteInline()
+       *
+       * @param array $sqlArray Array of SQL statements that will be applied 
rather than
+       *               the current schema.
+       * @param boolean $continueOnErr Continue to apply the schema even if an 
error occurs.
+       * @returns integer 0 if failure, 1 if errors, 2 if successful.
+       */
+       function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
+               if( !is_bool( $continueOnErr ) ) {
+                       $continueOnErr = $this->ContinueOnError();
+               }
+               
+               if( !isset( $sqlArray ) ) {
+                       $sqlArray = $this->sqlArray;
+               }
+               
+               if( !is_array( $sqlArray ) ) {
+                       $this->success = 0;
+               } else {
+                       $this->success = $this->dict->ExecuteSQLArray( 
$sqlArray, $continueOnErr );
+               }
+               
+               return $this->success;
+       }
+       
+       /**
+       * Returns the current SQL array. 
+       *
+       * Call this method to fetch the array of SQL queries resulting from 
+       * ParseSchema() or ParseSchemaString(). 
+       *
+       * @param string $format Format: HTML, TEXT, or NONE (PHP array)
+       * @return array Array of SQL statements or FALSE if an error occurs
+       */
+       function PrintSQL( $format = 'NONE' ) {
+               $sqlArray = null;
+               return $this->getSQL( $format, $sqlArray );
+       }
+       
+       /**
+       * Saves the current SQL array to the local filesystem as a list of SQL 
queries.
+       *
+       * Call this method to save the array of SQL queries (generally 
resulting from a
+       * parsed XML schema) to the filesystem.
+       *
+       * @param string $filename Path and name where the file should be saved.
+       * @return boolean TRUE if save is successful, else FALSE. 
+       */
+       function SaveSQL( $filename = './schema.sql' ) {
+               
+               if( !isset( $sqlArray ) ) {
+                       $sqlArray = $this->sqlArray;
+               }
+               if( !isset( $sqlArray ) ) {
+                       return FALSE;
+               }
+               
+               $fp = fopen( $filename, "w" );
+               
+               foreach( $sqlArray as $key => $query ) {
+                       fwrite( $fp, $query . ";\n" );
+               }
+               fclose( $fp );
+       }
+       
+       /**
+       * Create an xml parser
+       *
+       * @return object PHP XML parser object
+       *
+       * @access private
+       */
+       function &create_parser() {
+               // Create the parser
+               $xmlParser = xml_parser_create();
+               xml_set_object( $xmlParser, $this );
+               
+               // Initialize the XML callback functions
+               xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' 
);
+               xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
+               
+               return $xmlParser;
+       }
+       
+       /**
+       * XML Callback to process start elements
+       *
+       * @access private
+       */
+       function _tag_open( &$parser, $tag, $attributes ) {
+               switch( strtoupper( $tag ) ) {
+                       case 'TABLE':
+                               $this->obj = new dbTable( $this, $attributes );
+                               xml_set_object( $parser, $this->obj );
+                               break;
+                       case 'SQL':
+                               if( !isset( $attributes['PLATFORM'] ) OR 
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+                                       $this->obj = new dbQuerySet( $this, 
$attributes );
+                                       xml_set_object( $parser, $this->obj );
+                               }
+                               break;
+                       default:
+                               // print_r( array( $tag, $attributes ) );
+               }
+               
+       }
+       
+       /**
+       * XML Callback to process CDATA elements
+       *
+       * @access private
+       */
+       function _tag_cdata( &$parser, $cdata ) {
+       }
+       
+       /**
+       * XML Callback to process end elements
+       *
+       * @access private
+       * @internal
+       */
+       function _tag_close( &$parser, $tag ) {
+               
+       }
+       
+       /**
+       * Converts an XML schema string to the specified DTD version.
+       *
+       * Call this method to convert a string containing an XML schema to a 
different AXMLS
+       * DTD version. For instance, to convert a schema created for an pre-1.0 
version for 
+       * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If 
no DTD version 
+       * parameter is specified, the schema will be converted to the current 
DTD version. 
+       * If the newFile parameter is provided, the converted schema will be 
written to the specified
+       * file.
+       * @see ConvertSchemaFile()
+       *
+       * @param string $schema String containing XML schema that will be 
converted.
+       * @param string $newVersion DTD version to convert to.
+       * @param string $newFile File name of (converted) output file.
+       * @return string Converted XML schema or FALSE if an error occurs.
+       */
+       function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = 
NULL ) {
+               
+               // grab current version
+               if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+                       return FALSE;
+               }
+               
+               if( !isset ($newVersion) ) {
+                       $newVersion = $this->schemaVersion;
+               }
+               
+               if( $version == $newVersion ) {
+                       $result = $schema;
+               } else {
+                       $result = $this->TransformSchema( $schema, 'convert-' . 
$version . '-' . $newVersion);
+               }
+               
+               if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = 
fopen( $newFile, 'w' ) ) ) {
+                       fwrite( $fp, $result );
+                       fclose( $fp );
+               }
+               
+               return $result;
+       }
+       
+       // compat for pre-4.3 - jlim
+       function _file_get_contents($path)
+       {
+               if (function_exists('file_get_contents')) return 
file_get_contents($path);
+               return join('',file($path));
+       }
+       
+       /**
+       * Converts an XML schema file to the specified DTD version.
+       *
+       * Call this method to convert the specified XML schema file to a 
different AXMLS
+       * DTD version. For instance, to convert a schema created for an pre-1.0 
version for 
+       * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If 
no DTD version 
+       * parameter is specified, the schema will be converted to the current 
DTD version. 
+       * If the newFile parameter is provided, the converted schema will be 
written to the specified
+       * file.
+       * @see ConvertSchemaString()
+       *
+       * @param string $filename Name of XML schema file that will be 
converted.
+       * @param string $newVersion DTD version to convert to.
+       * @param string $newFile File name of (converted) output file.
+       * @return string Converted XML schema or FALSE if an error occurs.
+       */
+       function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = 
NULL ) {
+               
+               // grab current version
+               if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
+                       return FALSE;
+               }
+               
+               if( !isset ($newVersion) ) {
+                       $newVersion = $this->schemaVersion;
+               }
+               
+               if( $version == $newVersion ) {
+                       $result = _file_get_contents( $filename );
+                       
+                       // remove unicode BOM if present
+                       if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 
187, 191 ) ) {
+                               $result = substr( $result, 3 );
+                       }
+               } else {
+                       $result = $this->TransformSchema( $filename, 'convert-' 
. $version . '-' . $newVersion, 'file' );
+               }
+               
+               if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = 
fopen( $newFile, 'w' ) ) ) {
+                       fwrite( $fp, $result );
+                       fclose( $fp );
+               }
+               
+               return $result;
+       }
+       
+       function TransformSchema( $schema, $xsl, $schematype='string' )
+       {
+               // Fail if XSLT extension is not available
+               if( ! function_exists( 'xslt_create' ) ) {
+                       return FALSE;
+               }
+               
+               $xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
+               
+               // look for xsl
+               if( !is_readable( $xsl_file ) ) {
+                       return FALSE;
+               }
+               
+               switch( $schematype )
+               {
+                       case 'file':
+                               if( !is_readable( $schema ) ) {
+                                       return FALSE;
+                               }
+                               
+                               $schema = _file_get_contents( $schema );
+                               break;
+                       case 'string':
+                       default:
+                               if( !is_string( $schema ) ) {
+                                       return FALSE;
+                               }
+               }
+               
+               $arguments = array (
+                       '/_xml' => $schema,
+                       '/_xsl' => _file_get_contents( $xsl_file )
+               );
+               
+               // create an XSLT processor
+               $xh = xslt_create ();
+               
+               // set error handler
+               xslt_set_error_handler ($xh, array (&$this, 
'xslt_error_handler'));
+               
+               // process the schema
+               $result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, 
$arguments); 
+               
+               xslt_free ($xh);
+               
+               return $result;
+       }
+       
+       /**
+       * Processes XSLT transformation errors
+       *
+       * @param object $parser XML parser object
+       * @param integer $errno Error number
+       * @param integer $level Error level
+       * @param array $fields Error information fields
+       *
+       * @access private
+       */
+       function xslt_error_handler( $parser, $errno, $level, $fields ) {
+               if( is_array( $fields ) ) {
+                       $msg = array(
+                               'Message Type' => ucfirst( $fields['msgtype'] ),
+                               'Message Code' => $fields['code'],
+                               'Message' => $fields['msg'],
+                               'Error Number' => $errno,
+                               'Level' => $level
+                       );
+                       
+                       switch( $fields['URI'] ) {
+                               case 'arg:/_xml':
+                                       $msg['Input'] = 'XML';
+                                       break;
+                               case 'arg:/_xsl':
+                                       $msg['Input'] = 'XSL';
+                                       break;
+                               default:
+                                       $msg['Input'] = $fields['URI'];
+                       }
+                       
+                       $msg['Line'] = $fields['line'];
+               } else {
+                       $msg = array(
+                               'Message Type' => 'Error',
+                               'Error Number' => $errno,
+                               'Level' => $level,
+                               'Fields' => var_export( $fields, TRUE )
+                       );
+               }
+               
+               $error_details = $msg['Message Type'] . ' in XSLT 
Transformation' . "\n"
+                                          . '<table>' . "\n";
+               
+               foreach( $msg as $label => $details ) {
+                       $error_details .= '<tr><td><b>' . $label . ': 
</b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
+               }
+               
+               $error_details .= '</table>';
+               
+               trigger_error( $error_details, E_USER_ERROR );
+       }
+       
+       /**
+       * Returns the AXMLS Schema Version of the requested XML schema file.
+       *
+       * Call this method to obtain the AXMLS DTD version of the requested XML 
schema file.
+       * @see SchemaStringVersion()
+       *
+       * @param string $filename AXMLS schema file
+       * @return string Schema version number or FALSE on error
+       */
+       function SchemaFileVersion( $filename ) {
+               // Open the file
+               if( !($fp = fopen( $filename, 'r' )) ) {
+                       // die( 'Unable to open file' );
+                       return FALSE;
+               }
+               
+               // Process the file
+               while( $data = fread( $fp, 4096 ) ) {
+                       if( preg_match( $this->versionRegex, $data, $matches ) 
) {
+                               return !empty( $matches[2] ) ? $matches[2] : 
XMLS_DEFAULT_SCHEMA_VERSION;
+                       }
+               }
+               
+               return FALSE;
+       }
+       
+       /**
+       * Returns the AXMLS Schema Version of the provided XML schema string.
+       *
+       * Call this method to obtain the AXMLS DTD version of the provided XML 
schema string.
+       * @see SchemaFileVersion()
+       *
+       * @param string $xmlstring XML schema string
+       * @return string Schema version number or FALSE on error
+       */
+       function SchemaStringVersion( $xmlstring ) {
+               if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+                       return FALSE;
+               }
+               
+               if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
+                       return !empty( $matches[2] ) ? $matches[2] : 
XMLS_DEFAULT_SCHEMA_VERSION;
+               }
+               
+               return FALSE;
+       }
+       
+       /**
+       * Extracts an XML schema from an existing database.
+       *
+       * Call this method to create an XML schema string from an existing 
database.
+       * If the data parameter is set to TRUE, AXMLS will include the data 
from the database
+       * in the schema. 
+       *
+       * @param boolean $data Include data in schema dump
+       * @return string Generated XML schema
+       */
+       function ExtractSchema( $data = FALSE ) {
+               $old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
+               
+               $schema = '<?xml version="1.0"?>' . "\n"
+                               . '<schema version="' . $this->schemaVersion . 
'">' . "\n";
+               
+               if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
+                       foreach( $tables as $table ) {
+                               $schema .= '    <table name="' . $table . '">' 
. "\n";
+                               
+                               // grab details from database
+                               $rs = $this->db->Execute( 'SELECT * FROM ' . 
$table . ' WHERE 1=1' );
+                               $fields = $this->db->MetaColumns( $table );
+                               $indexes = $this->db->MetaIndexes( $table );
+                               
+                               if( is_array( $fields ) ) {
+                                       foreach( $fields as $details ) {
+                                               $extra = '';
+                                               $content = array();
+                                               
+                                               if( $details->max_length > 0 ) {
+                                                       $extra .= ' size="' . 
$details->max_length . '"';
+                                               }
+                                               
+                                               if( $details->primary_key ) {
+                                                       $content[] = '<KEY/>';
+                                               } elseif( $details->not_null ) {
+                                                       $content[] = 
'<NOTNULL/>';
+                                               }
+                                               
+                                               if( $details->has_default ) {
+                                                       $content[] = '<DEFAULT 
value="' . $details->default_value . '"/>';
+                                               }
+                                               
+                                               if( $details->auto_increment ) {
+                                                       $content[] = 
'<AUTOINCREMENT/>';
+                                               }
+                                               
+                                               // this stops the creation of 
'R' columns,
+                                               // AUTOINCREMENT is used to 
create auto columns
+                                               $details->primary_key = 0;
+                                               $type = $rs->MetaType( $details 
);
+                                               
+                                               $schema .= '            <field 
name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
+                                               
+                                               if( !empty( $content ) ) {
+                                                       $schema .= "\n          
        " . implode( "\n                        ", $content ) . "\n             
";
+                                               }
+                                               
+                                               $schema .= '</field>' . "\n";
+                                       }
+                               }
+                               
+                               if( is_array( $indexes ) ) {
+                                       foreach( $indexes as $index => $details 
) {
+                                               $schema .= '            <index 
name="' . $index . '">' . "\n";
+                                               
+                                               if( $details['unique'] ) {
+                                                       $schema .= '            
        <UNIQUE/>' . "\n";
+                                               }
+                                               
+                                               foreach( $details['columns'] as 
$column ) {
+                                                       $schema .= '            
        <col>' . $column . '</col>' . "\n";
+                                               }
+                                               
+                                               $schema .= '            
</index>' . "\n";
+                                       }
+                               }
+                               
+                               if( $data ) {
+                                       $rs = $this->db->Execute( 'SELECT * 
FROM ' . $table );
+                                       
+                                       if( is_object( $rs ) ) {
+                                               $schema .= '            <data>' 
. "\n";
+                                               
+                                               while( $row = $rs->FetchRow() ) 
{
+                                                       foreach( $row as $key 
=> $val ) {
+                                                               $row[$key] = 
htmlentities($val);
+                                                       }
+                                                       
+                                                       $schema .= '            
        <row><f>' . implode( '</f><f>', $row ) . '</f></row>' . "\n";
+                                               }
+                                               
+                                               $schema .= '            
</data>' . "\n";
+                                       }
+                               }
+                               
+                               $schema .= '    </table>' . "\n";
+                       }
+               }
+               
+               $this->db->SetFetchMode( $old_mode );
+               
+               $schema .= '</schema>';
+               return $schema;
+       }
+       
+       /**
+       * Sets a prefix for database objects
+       *
+       * Call this method to set a standard prefix that will be prepended to 
all database tables 
+       * and indices when the schema is parsed. Calling setPrefix with no 
arguments clears the prefix.
+       *
+       * @param string $prefix Prefix that will be prepended.
+       * @param boolean $underscore If TRUE, automatically append an 
underscore character to the prefix.
+       * @return boolean TRUE if successful, else FALSE
+       */
+       function SetPrefix( $prefix = '', $underscore = TRUE ) {
+               switch( TRUE ) {
+                       // clear prefix
+                       case empty( $prefix ):
+                               logMsg( 'Cleared prefix' );
+                               $this->objectPrefix = '';
+                               return TRUE;
+                       // prefix too long
+                       case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
+                       // prefix contains invalid characters
+                       case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
+                               logMsg( 'Invalid prefix: ' . $prefix );
+                               return FALSE;
+               }
+               
+               if( $underscore AND substr( $prefix, -1 ) != '_' ) {
+                       $prefix .= '_';
+               }
+               
+               // prefix valid
+               logMsg( 'Set prefix: ' . $prefix );
+               $this->objectPrefix = $prefix;
+               return TRUE;
+       }
+       
+       /**
+       * Returns an object name with the current prefix prepended.
+       *
+       * @param string $name Name
+       * @return string        Prefixed name
+       *
+       * @access private
+       */
+       function prefix( $name = '' ) {
+               // if prefix is set
+               if( !empty( $this->objectPrefix ) ) {
+                       // Prepend the object prefix to the table name
+                       // prepend after quote if used
+                       return preg_replace( '/^(`?)(.+)$/', '$1' . 
$this->objectPrefix . '$2', $name );
+               }
+               
+               // No prefix set. Use name provided.
+               return $name;
+       }
+       
+       /**
+       * Checks if element references a specific platform
+       *
+       * @param string $platform Requested platform
+       * @returns boolean TRUE if platform check succeeds
+       *
+       * @access private
+       */
+       function supportedPlatform( $platform = NULL ) {
+               $regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
+               
+               if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
+                       logMsg( "Platform $platform is supported" );
+                       return TRUE;
+               } else {
+                       logMsg( "Platform $platform is NOT supported" );
+                       return FALSE;
+               }
+       }
+       
+       /**
+       * Clears the array of generated SQL.
+       *
+       * @access private
+       */
+       function clearSQL() {
+               $this->sqlArray = array();
+       }
+       
+       /**
+       * Adds SQL into the SQL array.
+       *
+       * @param mixed $sql SQL to Add
+       * @return boolean TRUE if successful, else FALSE.
+       *
+       * @access private
+       */      
+       function addSQL( $sql = NULL ) {
+               if( is_array( $sql ) ) {
+                       foreach( $sql as $line ) {
+                               $this->addSQL( $line );
+                       }
+                       
+                       return TRUE;
+               }
+               
+               if( is_string( $sql ) ) {
+                       $this->sqlArray[] = $sql;
+                       
+                       // if executeInline is enabled, and either no errors 
have occurred or continueOnError is enabled, execute SQL.
+                       if( $this->ExecuteInline() && ( $this->success == 2 || 
$this->ContinueOnError() ) ) {
+                               $saved = $this->db->debug;
+                               $this->db->debug = $this->debug;
+                               $ok = $this->db->Execute( $sql );
+                               $this->db->debug = $saved;
+                               
+                               if( !$ok ) {
+                                       if( $this->debug ) {
+                                               ADOConnection::outp( 
$this->db->ErrorMsg() );
+                                       }
+                                       
+                                       $this->success = 1;
+                               }
+                       }
+                       
+                       return TRUE;
+               }
+               
+               return FALSE;
+       }
+       
+       /**
+       * Gets the SQL array in the specified format.
+       *
+       * @param string $format Format
+       * @return mixed SQL
+       *       
+       * @access private
+       */
+       function getSQL( $format = NULL, $sqlArray = NULL ) {
+               if( !is_array( $sqlArray ) ) {
+                       $sqlArray = $this->sqlArray;
+               }
+               
+               if( !is_array( $sqlArray ) ) {
+                       return FALSE;
+               }
+               
+               switch( strtolower( $format ) ) {
+                       case 'string':
+                       case 'text':
+                               return !empty( $sqlArray ) ? implode( ";\n\n", 
$sqlArray ) . ';' : '';
+                       case'html':
+                               return !empty( $sqlArray ) ? nl2br( 
htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
+               }
+               
+               return $this->sqlArray;
+       }
+       
+       /**
+       * Destroys an adoSchema object.
+       *
+       * Call this method to clean up after an adoSchema object that is no 
longer in use.
+       * @deprecated adoSchema now cleans up automatically.
+       */
+       function Destroy() {
+               set_magic_quotes_runtime( $this->mgq );
+               unset( $this );
+       }
+}
+
+/**
+* Message logging function
+*
+* @access private
+*/
+function logMsg( $msg, $title = NULL, $force = FALSE ) {
+       if( XMLS_DEBUG or $force ) {
+               echo '<pre>';
+               
+               if( isset( $title ) ) {
+                       echo '<h3>' . htmlentities( $title ) . '</h3>';
+               }
+               
+               if( is_object( $this ) ) {
+                       echo '[' . get_class( $this ) . '] ';
+               }
+               
+               print_r( $msg );
+               
+               echo '</pre>';
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/adodb.inc.php
diff -u phpgwapi/inc/adodb/adodb.inc.php:1.2 
phpgwapi/inc/adodb/adodb.inc.php:1.3
--- phpgwapi/inc/adodb/adodb.inc.php:1.2        Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/adodb.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,3733 +1,3961 @@
-<?php 
-/*
- * Set tabs to 4 for best viewing.
- * 
- * Latest version is available at http://adodb.sourceforge.net
- * 
- * This is the main include file for ADOdb.
- * Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
- *
- * The ADOdb files are formatted so that doxygen can be used to generate 
documentation.
- * Doxygen is a documentation generation tool and can be downloaded from 
http://doxygen.org/
- */
-
-/**
-       \mainpage       
-       
-        @version V4.54 5 Nov 2004  (c) 2000-2004 John Lim 
(jlim#natsoft.com.my). All rights reserved.
-
-       Released under both BSD license and Lesser GPL library license. You can 
choose which license
-       you prefer.
-       
-       PHP's database access functions are not standardised. This creates a 
need for a database 
-       class library to hide the differences between the different database 
API's (encapsulate 
-       the differences) so we can easily switch databases.
-
-       We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, 
Sybase SQL Anywhere, DB2,
-       Informix, PostgreSQL, FrontBase, Interbase (Firebird and Borland 
variants), Foxpro, Access,
-       ADO, SAP DB, SQLite and ODBC. We have had successful reports of 
connecting to Progress and
-       other databases via ODBC. 
-        
-       Latest Download at http://php.weblogs.com/adodb<br>
-       Manual is at http://php.weblogs.com/adodb_manual
-         
- */
- 
- if (!defined('_ADODB_LAYER')) {
-       define('_ADODB_LAYER',1);
-       
-       
//==============================================================================================
        
-       // CONSTANT DEFINITIONS
-       
//==============================================================================================
        
-
-
-       /** 
-        * Set ADODB_DIR to the directory where this file resides...
-        * This constant was formerly called $ADODB_RootPath
-        */
-       if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__));
-       
-       
//==============================================================================================
        
-       // GLOBAL VARIABLES
-       
//==============================================================================================
        
-
-       GLOBAL 
-               $ADODB_vers,            // database version
-               $ADODB_COUNTRECS,       // count number of records returned - 
slows down query
-               $ADODB_CACHE_DIR,       // directory to cache recordsets
-               $ADODB_EXTENSION,   // ADODB extension installed
-               $ADODB_COMPAT_FETCH, // If $ADODB_COUNTRECS and this is true, 
$rs->fields is available on EOF
-               $ADODB_FETCH_MODE;      // DEFAULT, NUM, ASSOC or BOTH. Default 
follows native driver default...
-       
-       
//==============================================================================================
        
-       // GLOBAL SETUP
-       
//==============================================================================================
        
-       
-       $ADODB_EXTENSION = defined('ADODB_EXTENSION');
-       
-       //********************************************************//
-       /*
-       Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
-       Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, 
nuko#mbnet.fi
-
-               0 = ignore empty fields. All empty fields in array are ignored.
-               1 = force null. All empty, php null and string 'null' fields 
are changed to sql NULL values.
-               2 = force empty. All empty, php null and string 'null' fields 
are changed to sql empty '' or 0 values.
-               3 = force value. Value is left as it is. Php null and string 
'null' are set to sql NULL values and empty fields '' are set to empty '' sql 
values.
-       */
-        define('ADODB_FORCE_IGNORE',0);
-        define('ADODB_FORCE_NULL',1);
-        define('ADODB_FORCE_EMPTY',2);
-        define('ADODB_FORCE_VALUE',3);
-    //********************************************************//
-
-
-       if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
-               
-               define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL 
invalid. Try using $connection->debug=true;</p>');
-       
-       // allow [ ] @ ` " and . in table names
-               define('ADODB_TABLE_REGEX','([]0-9a-z_\"address@hidden)');
-       
-       // prefetching used by oracle
-               if (!defined('ADODB_PREFETCH_ROWS')) 
define('ADODB_PREFETCH_ROWS',10);
-       
-       
-       /*
-       Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native 
case-names.
-       This currently works only with mssql, odbc, oci8po and ibase derived 
drivers.
-       
-               0 = assoc lowercase field names. $rs->fields['orderid']
-               1 = assoc uppercase field names. $rs->fields['ORDERID']
-               2 = use native-case field names. $rs->fields['OrderID']
-       */
-       
-               define('ADODB_FETCH_DEFAULT',0);
-               define('ADODB_FETCH_NUM',1);
-               define('ADODB_FETCH_ASSOC',2);
-               define('ADODB_FETCH_BOTH',3);
-               
-               if (!defined('TIMESTAMP_FIRST_YEAR')) 
define('TIMESTAMP_FIRST_YEAR',100);
-       
-               // PHP's version scheme makes converting to numbers difficult - 
workaround
-               $_adodb_ver = (float) PHP_VERSION;
-               if ($_adodb_ver >= 5.0) {
-                       define('ADODB_PHPVER',0x5000);
-               } else if ($_adodb_ver > 4.299999) { # 4.3
-                       define('ADODB_PHPVER',0x4300);
-               } else if ($_adodb_ver > 4.199999) { # 4.2
-                       define('ADODB_PHPVER',0x4200);
-               } else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
-                       define('ADODB_PHPVER',0x4050);
-               } else {
-                       define('ADODB_PHPVER',0x4000);
-               }
-       }
-       
-       //if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
-
-       
-       /**
-               Accepts $src and $dest arrays, replacing string $data
-       */
-       function ADODB_str_replace($src, $dest, $data)
-       {
-               if (ADODB_PHPVER >= 0x4050) return 
str_replace($src,$dest,$data);
-               
-               $s = reset($src);
-               $d = reset($dest);
-               while ($s !== false) {
-                       $data = str_replace($s,$d,$data);
-                       $s = next($src);
-                       $d = next($dest);
-               }
-               return $data;
-       }
-       
-       function ADODB_Setup()
-       {
-       GLOBAL 
-               $ADODB_vers,            // database version
-               $ADODB_COUNTRECS,       // count number of records returned - 
slows down query
-               $ADODB_CACHE_DIR,       // directory to cache recordsets
-               $ADODB_FETCH_MODE,
-               $ADODB_FORCE_TYPE;
-               
-               $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
-               $ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
-
-
-               if (!isset($ADODB_CACHE_DIR)) {
-                       $ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? 
$_ENV['TMP'] : '/tmp';
-               } else {
-                       // do not accept url based paths, eg. http:/ or ftp:/
-                       if (strpos($ADODB_CACHE_DIR,'://') !== false) 
-                               die("Illegal path http:// or ftp://";);
-               }
-               
-                       
-               // Initialize random number generator for randomizing cache 
flushes
-               srand(((double)microtime())*1000000);
-               
-               /**
-                * ADODB version as a string.
-                */
-               $ADODB_vers = 'V4.54 5 Nov 2004  (c) 2000-2004 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
-                * for databases that provide "virtual" recordcounts...
-                */
-               if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
-       }
-       
-       
-       
//==============================================================================================
        
-       // CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
-       
//==============================================================================================
        
-       
-       ADODB_Setup();
-
-       
//==============================================================================================
        
-       // CLASS ADOFieldObject
-       
//==============================================================================================
        
-       /**
-        * Helper class for FetchFields -- holds info on a column
-        */
-       class ADOFieldObject { 
-               var $name = '';
-               var $max_length=0;
-               var $type="";
-
-               // additional fields by dannym... (address@hidden)
-               var $not_null = false; 
-               // actually, this has already been built-in in the postgres, 
fbsql AND mysql module? ^-^
-               // so we can as well make not_null standard (leaving it at 
"false" does not harm anyways)
-
-               var $has_default = false; // this one I have done only in mysql 
and postgres for now ... 
-                       // others to come (dannym)
-               var $default_value; // default, if any, and supported. Check 
has_default first.
-       }
-       
-
-       
-       function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, 
&$thisConnection)
-       {
-               //print "Errorno ($fn errno=$errno m=$errmsg) ";
-               $thisConnection->_transOK = false;
-               if ($thisConnection->_oldRaiseFn) {
-                       $fn = $thisConnection->_oldRaiseFn;
-                       $fn($dbms, $fn, $errno, $errmsg, $p1, 
$p2,$thisConnection);
-               }
-       }
-       
-       
//==============================================================================================
        
-       // CLASS ADOConnection
-       
//==============================================================================================
        
-       
-       /**
-        * 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. For 
security, we no longer store it.
-       var $debug = false;             /// if set to true will output sql 
statements
-       var $maxblobsize = 262144;      /// maximum size of blobs or large text 
fields (262144 = 256K)-- some db's die otherwise like foxpro
-       var $concat_operator = '+'; /// default concat operator -- change to || 
for Oracle/Interbase    
-       var $substr = 'substr';         /// substring operator
-       var $length = 'length';         /// string length operator
-       var $random = 'rand()';         /// random function
-       var $upperCase = 'upper';               /// uppercase function
-       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 $nameQuote = '"';           /// string to use to quote identifiers 
and names
-       var $charSet=false;             /// character set to use - only for 
interbase, postgres and oci8
-       var $metaDatabasesSQL = '';
-       var $metaTablesSQL = '';
-       var $uniqueOrderBy = false; /// All order by columns have to be unique
-       var $emptyDate = '&nbsp;';
-       var $emptyTimeStamp = '&nbsp;';
-       var $lastInsID = false;
-       //--
-       var $hasInsertID = false;               /// supports autoincrement ID?
-       var $hasAffectedRows = false;   /// supports affected rows for 
update/delete?
-       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 
- used by phpLens
-       var $hasMoveFirst = false;  /// has ability to run MoveFirst(), 
scrolling backwards
-       var $hasGenID = false;          /// can generate sequences using 
GenID();
-       var $hasTransactions = true; /// has transactions
-       //--
-       var $genID = 0;                         /// sequence id used by GenID();
-       var $raiseErrorFn = false;      /// error function to call
-       var $isoDates = false; /// accepts dates in ISO format
-       var $cacheSecs = 3600; /// cache for 1 hour
-       var $sysDate = false; /// name of function that returns the current date
-       var $sysTimeStamp = false; /// name of function that returns the 
current timestamp
-       var $arrayClass = 'ADORecordSet_array'; /// name of class used to 
generate array recordsets, which are pre-downloaded recordsets
-       
-       var $noNullStrings = false; /// oracle specific stuff - if true ensures 
that '' is converted to ' '
-       var $numCacheHits = 0; 
-       var $numCacheMisses = 0;
-       var $pageExecuteCountRows = true;
-       var $uniqueSort = false; /// indicates that all fields in order by must 
be unique
-       var $leftOuter = false; /// operator to use for left outer join in 
WHERE clause
-       var $rightOuter = false; /// operator to use for right outer join in 
WHERE clause
-       var $ansiOuter = false; /// whether ansi outer join syntax supported
-       var $autoRollback = false; // autoRollback on PConnect().
-       var $poorAffectedRows = false; // affectedRows not working or unreliable
-       
-       var $fnExecute = false;
-       var $fnCacheExecute = false;
-       var $blobEncodeType = false; // false=not required, 'I'=encode to 
integer, 'C'=encode to char
-       var $rsPrefix = "ADORecordSet_";
-       
-       var $autoCommit = true;         /// do not modify this yourself - 
actually private
-       var $transOff = 0;                      /// temporarily disable 
transactions
-       var $transCnt = 0;                      /// count of nested transactions
-       
-       var $fetchMode=false;
-        //
-        // PRIVATE VARS
-        //
-       var $_oldRaiseFn =  false;
-       var $_transOK = null;
-       var $_connectionID      = false;        /// The returned link 
identifier whenever a successful database connection is made.     
-       var $_errorMsg = false;         /// A variable which was used to keep 
the returned last error message.  The value will
-                                                               /// then 
returned by the errorMsg() function    
-       var $_errorCode = false;        /// Last error code, not guaranteed to 
be used - only by oci8                                   
-       var $_queryID = false;          /// This variable keeps the last 
created result link identifier
-       
-       var $_isPersistentConnection = false;   /// A boolean variable to state 
whether its a persistent connection or normal connection.       */
-       var $_bindInputArray = false; /// set to true if 
ADOConnection.Execute() permits binding of array parameters.
-       var $_evalAll = false;
-       var $_affected = false;
-       var $_logsql = false;
-       
-
-       
-       /**
-        * Constructor
-        */
-       function ADOConnection()                        
-       {
-               die('Virtual Class -- cannot instantiate');
-       }
-       
-       function Version()
-       {
-       global $ADODB_vers;
-       
-               return (float) substr($ADODB_vers,1);
-       }
-       
-       /**
-               Get server version info...
-               
-               @returns An array with 2 elements: $arr['string'] is the 
description string, 
-                       and $arr[version] is the version (also a string).
-       */
-       function ServerInfo()
-       {
-               return array('description' => '', 'version' => '');
-       }
-       
-       function IsConnected()
-       {
-       return !empty($this->_connectionID);
-       }
-       
-       function _findvers($str)
-       {
-               if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return 
$arr[1];
-               else return '';
-       }
-       
-       /**
-       * All error messages go through this bottleneck function.
-       * You can define your own handler by defining the function name in 
ADODB_OUTP.
-       */
-       function outp($msg,$newline=true)
-       {
-       global $HTTP_SERVER_VARS,$ADODB_FLUSH,$ADODB_OUTP;
-       
-               if (defined('ADODB_OUTP')) {
-                       $fn = ADODB_OUTP;
-                       $fn($msg,$newline);
-                       return;
-               } else if (isset($ADODB_OUTP)) {
-                       $fn = $ADODB_OUTP;
-                       $fn($msg,$newline);
-                       return;
-               }
-               
-               if ($newline) $msg .= "<br>\n";
-               
-               if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']) || !$newline) 
echo $msg;
-               else echo strip_tags($msg);
-       
-               
-               if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); 
//  do not flush if output buffering enabled - useless - thx to Jesse Mullan 
-               
-       }
-       
-       function Time()
-       {
-               $rs =& $this->_Execute("select $this->sysTimeStamp");
-               if ($rs && !$rs->EOF) return 
$this->UnixTimeStamp(reset($rs->fields));
-               
-               return false;
-       }
-       
-       /**
-        * Connect to database
-        *
-        * @param [argHostname]         Host to connect to
-        * @param [argUsername]         Userid to login
-        * @param [argPassword]         Associated password
-        * @param [argDatabaseName]     database
-        * @param [forceNew]            force new connection
-        *
-        * @return true or false
-        */       
-       function Connect($argHostname = "", $argUsername = "", $argPassword = 
"", $argDatabaseName = "", $forceNew = false) 
-       {
-               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; 
        
-               
-               $this->_isPersistentConnection = false; 
-               if ($forceNew) {
-                       if ($this->_nconnect($this->host, $this->user, 
$this->password, $this->database)) return true;
-               } else {
-                        if ($this->_connect($this->host, $this->user, 
$this->password, $this->database)) return true;
-               }
-               
-               $err = $this->ErrorMsg();
-               if (empty($err)) $err = "Connection error to server 
'$argHostname' with user '$argUsername'";
-               if ($fn = $this->raiseErrorFn) 
-                       
$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-               
-               $this->_connectionID = false;
-               if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
-               return false;
-       }       
-       
-       function _nconnect($argHostname, $argUsername, $argPassword, 
$argDatabaseName)
-       {
-               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabaseName);
-       }
-       
-       
-       /**
-        * Always force a new connection to database - currently only works 
with oracle
-        *
-        * @param [argHostname]         Host to connect to
-        * @param [argUsername]         Userid to login
-        * @param [argPassword]         Associated password
-        * @param [argDatabaseName]     database
-        *
-        * @return true or false
-        */       
-       function NConnect($argHostname = "", $argUsername = "", $argPassword = 
"", $argDatabaseName = "") 
-       {
-               return $this->Connect($argHostname, $argUsername, $argPassword, 
$argDatabaseName, true);
-       }
-       
-       /**
-        * 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 (defined('ADODB_NEVER_PERSIST')) 
-                       return 
$this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
-               
-               if ($argHostname != "") $this->host = $argHostname;
-               if ($argUsername != "") $this->user = $argUsername;
-               if ($argPassword != "") $this->password = $argPassword;
-               if ($argDatabaseName != "") $this->database = $argDatabaseName; 
        
-                       
-               $this->_isPersistentConnection = true;  
-               if ($this->_pconnect($this->host, $this->user, $this->password, 
$this->database)) return true;
-               $err = $this->ErrorMsg();
-               if (empty($err)) {
-                       $err = "Connection error to server '$argHostname' with 
user '$argUsername'";
-               }       
-               if ($fn = $this->raiseErrorFn) {
-                       
$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-               }
-               
-               $this->_connectionID = false;
-               if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
-               return false;
-       }
-
-       // Format date column in sql string given an input format that 
understands Y M D
-       function SQLDate($fmt, $col=false)
-       {       
-               if (!$col) $col = $this->sysDate;
-               return $col; // child class implement
-       }
-       
-       /**
-        * Should prepare the sql statement and return the stmt resource.
-        * For databases that do not support this, we return the $sql. To ensure
-        * 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 FALSE, or the prepared statement, or the original sql 
if
-        *                      if the database does not support prepare.
-        *
-        */     
-       function Prepare($sql)
-       {
-               return $sql;
-       }
-
-       /**
-        * Some databases, eg. mssql require a different function for preparing
-        * stored procedures. So we cannot use Prepare().
-        *
-        * Should prepare the stored procedure  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:
-        *
-        * @param sql   SQL to send to database
-        *
-        * @return return FALSE, or the prepared statement, or the original sql 
if
-        *                      if the database does not support prepare.
-        *
-        */     
-       function PrepareSP($sql,$param=true)
-       {
-               return $this->Prepare($sql,$param);
-       }
-       
-       /**
-       * PEAR DB Compat
-       */
-       function Quote($s)
-       {
-               return $this->qstr($s,false);
-       }
-       
-       /**
-        Requested by "Karsten Dambekalns" <address@hidden>
-       */
-       function QMagic($s)
-       {
-               return $this->qstr($s,get_magic_quotes_gpc());
-       }
-
-       function q(&$s)
-       {
-               $s = $this->qstr($s,false);
-       }
-       
-       /**
-       * 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);
-       }
-
-       /**
-       *        Lock a row, will escalate and lock the table if row locking 
not supported
-       *       will normally free the lock at the end of the transaction
-       *
-       *  @param $table        name of table to lock
-       *  @param $where        where clause to use, eg: "WHERE row=12". If 
left empty, will escalate to table lock
-       */
-       function RowLock($table,$where)
-       {
-               return false;
-       }
-       
-       function CommitLock($table)
-       {
-               return $this->CommitTrans();
-       }
-       
-       function RollbackLock($table)
-       {
-               return $this->RollbackTrans();
-       }
-       
-       /**
-       * PEAR DB Compat - do not use internally. 
-       *
-       * The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are 
identical
-       *       for easy porting :-)
-       *
-       * @param mode   The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
-       * @returns              The previous fetch mode
-       */
-       function SetFetchMode($mode)
-       {       
-               $old = $this->fetchMode;
-               $this->fetchMode = $mode;
-               
-               if ($old === false) {
-               global $ADODB_FETCH_MODE;
-                       return $ADODB_FETCH_MODE;
-               }
-               return $old;
-       }
-       
-
-       /**
-       * PEAR DB Compat - do not use internally. 
-       */
-       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, $params=false)
-       {
-               $rs = &$this->SelectLimit($sql, $count, $offset, $params); 
-               if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-               return $rs;
-       }
-
-       
-       /**
-       * PEAR DB Compat - do not use internally
-       */
-       function Disconnect()
-       {
-               return $this->Close();
-       }
-       
-       /*
-                Returns placeholder for parameter, eg.
-                $DB->Param('a')
-                
-                will return ':a' for Oracle, and '?' for most other 
databases...
-                
-                For databases that require positioned params, eg $1, $2, $3 
for postgresql,
-                       pass in Param(false) before setting the first parameter.
-       */
-       function Param($name,$type='C')
-       {
-               return '?';
-       }
-       
-       /*
-               InParameter and OutParameter are self-documenting versions of 
Parameter().
-       */
-       function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-       {
-               return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
-       }
-       
-       /*
-       */
-       function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-       {
-               return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
-       
-       }
-       
-       /* 
-       Usage in oracle
-               $stmt = $db->Prepare('select * from table where id =:myid and 
group=:group');
-               $db->Parameter($stmt,$id,'myid');
-               $db->Parameter($stmt,$group,'group',64);
-               $db->Execute();
-               
-               @param $stmt Statement returned by Prepare() or PrepareSP().
-               @param $var PHP variable to bind to
-               @param $name Name of stored procedure variable name to bind to.
-               @param [$isOutput] Indicates direction of parameter 0/false=IN  
1=OUT  2= IN/OUT. This is ignored in oci8.
-               @param [$maxLen] Holds an maximum length of the variable.
-               @param [$type] The data type of $var. Legal values depend on 
driver.
-
-       */
-       function 
Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
-       {
-               return false;
-       }
-       
-       /**
-               Improved method of initiating a transaction. Used together with 
CompleteTrans().
-               Advantages include:
-               
-               a. StartTrans/CompleteTrans is nestable, unlike 
BeginTrans/CommitTrans/RollbackTrans.
-                  Only the outermost block is treated as a transaction.<br>
-               b. CompleteTrans auto-detects SQL errors, and will rollback on 
errors, commit otherwise.<br>
-               c. All BeginTrans/CommitTrans/RollbackTrans inside a 
StartTrans/CompleteTrans block
-                  are disabled, making it backward compatible.
-       */
-       function StartTrans($errfn = 'ADODB_TransMonitor')
-       {
-               if ($this->transOff > 0) {
-                       $this->transOff += 1;
-                       return;
-               }
-               
-               $this->_oldRaiseFn = $this->raiseErrorFn;
-               $this->raiseErrorFn = $errfn;
-               $this->_transOK = true;
-               
-               if ($this->debug && $this->transCnt > 0) 
ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
-               $this->BeginTrans();
-               $this->transOff = 1;
-       }
-       
-       
-       /**
-               Used together with StartTrans() to end a transaction. Monitors 
connection
-               for sql errors, and will commit or rollback as appropriate.
-               
-               @autoComplete if true, monitor sql errors and commit and 
rollback as appropriate, 
-               and if set to false force rollback even if no SQL error 
detected.
-               @returns true on commit, false on rollback.
-       */
-       function CompleteTrans($autoComplete = true)
-       {
-               if ($this->transOff > 1) {
-                       $this->transOff -= 1;
-                       return true;
-               }
-               $this->raiseErrorFn = $this->_oldRaiseFn;
-               
-               $this->transOff = 0;
-               if ($this->_transOK && $autoComplete) {
-                       if (!$this->CommitTrans()) {
-                               $this->_transOK = false;
-                               if ($this->debug) ADOConnection::outp("Smart 
Commit failed");
-                       } else
-                               if ($this->debug) ADOConnection::outp("Smart 
Commit occurred");
-               } else {
-                       $this->RollbackTrans();
-                       if ($this->debug) ADOCOnnection::outp("Smart Rollback 
occurred");
-               }
-               
-               return $this->_transOK;
-       }
-       
-       /*
-               At the end of a StartTrans/CompleteTrans block, perform a 
rollback.
-       */
-       function FailTrans()
-       {
-               if ($this->debug) 
-                       if ($this->transOff == 0) {
-                               ADOConnection::outp("FailTrans outside 
StartTrans/CompleteTrans");
-                       } else {
-                               ADOConnection::outp("FailTrans was called");
-                               adodb_backtrace();
-                       }
-               $this->_transOK = false;
-       }
-       
-       /**
-               Check if transaction has failed, only for Smart Transactions.
-       */
-       function HasFailedTrans()
-       {
-               if ($this->transOff > 0) return $this->_transOK == false;
-               return false;
-       }
-       
-       /**
-        * Execute SQL 
-        *
-        * @param sql           SQL statement to execute, or possibly an array 
holding prepared statement ($sql[0] will hold sql text)
-        * @param [inputarr]    holds the input data to bind to. Null elements 
will be set to null.
-        * @return              RecordSet or false
-        */
-       function &Execute($sql,$inputarr=false) 
-       {
-               if ($this->fnExecute) {
-                       $fn = $this->fnExecute;
-                       $ret =& $fn($this,$sql,$inputarr);
-                       if (isset($ret)) return $ret;
-               }
-               if ($inputarr) {
-                       if (!is_array($inputarr)) $inputarr = array($inputarr);
-                       
-                       $element0 = reset($inputarr);
-                       # is_object check because oci8 descriptors can be 
passed in
-                       $array_2d = is_array($element0) && 
!is_object(reset($element0));
-                       
-                       if (!is_array($sql) && !$this->_bindInputArray) {
-                               $sqlarr = explode('?',$sql);
-                                       
-                               if (!$array_2d) $inputarr = array($inputarr);
-                               foreach($inputarr as $arr) {
-                                       $sql = ''; $i = 0;
-                                       foreach($arr as $v) {
-                                               $sql .= $sqlarr[$i];
-                                               // from Ron Baldwin 
<ron.baldwin#sourceprose.com>
-                                               // Only quote string types      
-                                               if (gettype($v) == 'string')
-                                                       $sql .= $this->qstr($v);
-                                               else if ($v === null)
-                                                       $sql .= 'NULL';
-                                               else
-                                                       $sql .= $v;
-                                               $i += 1;
-                                       }
-                                       $sql .= $sqlarr[$i];
-                                       
-                                       if ($i+1 != sizeof($sqlarr))    
-                                               ADOConnection::outp( "Input 
Array does not match ?: ".htmlspecialchars($sql));
-               
-                                       $ret =& $this->_Execute($sql);
-                                       if (!$ret) return $ret;
-                               }       
-                       } else {
-                               if ($array_2d) {
-                                       $stmt = $this->Prepare($sql);
-                                       foreach($inputarr as $arr) {
-                                               $ret =& 
$this->_Execute($stmt,$arr);
-                                               if (!$ret) return $ret;
-                                       }
-                               } else {
-                                       $ret =& $this->_Execute($sql,$inputarr);
-                               }
-                       }
-               } else {
-                       $ret =& $this->_Execute($sql,false);
-               }
-
-               return $ret;
-       }
-       
-       
-       function &_Execute($sql,$inputarr=false)
-       {
-
-               if ($this->debug) {
-                       global $ADODB_INCLUDED_LIB;
-                       if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
-                       $this->_queryID = _adodb_debug_execute($this, 
$sql,$inputarr);
-               } else {
-                       $this->_queryID = @$this->_query($sql,$inputarr);
-               }
-               
-               /************************
-               // OK, query executed
-               *************************/
-
-               if ($this->_queryID === false) { // error handling if query 
fails
-                       if ($this->debug == 99) adodb_backtrace(true,5);        
-                       $fn = $this->raiseErrorFn;
-                       if ($fn) {
-                               
$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
-                       } 
-                       $false = false;
-                       return $false;
-               } 
-               
-               if ($this->_queryID === true) { // return simplified recordset 
for inserts/updates/deletes with lower overhead
-                       $rs =& new ADORecordSet_empty();
-                       return $rs;
-               }
-               
-               // return real recordset from select statement
-               $rsclass = $this->rsPrefix.$this->databaseType;
-               $rs =& new $rsclass($this->_queryID,$this->fetchMode);
-               $rs->connection = &$this; // Pablo suggestion
-               $rs->Init();
-               if (is_array($sql)) $rs->sql = $sql[0];
-               else $rs->sql = $sql;
-               if ($rs->_numOfRows <= 0) {
-               global $ADODB_COUNTRECS;
-                       if ($ADODB_COUNTRECS) {
-                               if (!$rs->EOF) { 
-                                       $rs = 
&$this->_rs2rs($rs,-1,-1,!is_array($sql));
-                                       $rs->_queryID = $this->_queryID;
-                               } else
-                                       $rs->_numOfRows = 0;
-                       }
-               }
-               return $rs;
-       }
-
-       function CreateSequence($seqname='adodbseq',$startID=1)
-       {
-               if (empty($this->_genSeqSQL)) return false;
-               return 
$this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
-       }
-
-       function DropSequence($seqname)
-       {
-               if (empty($this->_dropSeqSQL)) return false;
-               return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-       }
-
-       /**
-        * Generates a sequence id and stores it in $this->genID;
-        * GenID is only available if $this->hasGenID = true;
-        *
-        * @param seqname               name of sequence to use
-        * @param startID               if sequence does not exist, start at 
this ID
-        * @return              0 if not supported, otherwise a sequence id
-        */
-       function GenID($seqname='adodbseq',$startID=1)
-       {
-               if (!$this->hasGenID) {
-                       return 0; // formerly returns false pre 1.60
-               }
-               
-               $getnext = sprintf($this->_genIDSQL,$seqname);
-               
-               $holdtransOK = $this->_transOK;
-               @($rs = $this->Execute($getnext));
-               if (!$rs) {
-                       $this->_transOK = $holdtransOK; //if the status was ok 
before reset
-                       $createseq = 
$this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
-                       $rs = $this->Execute($getnext);
-               }
-               if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
-               else $this->genID = 0; // false
-       
-               if ($rs) $rs->Close();
-
-               return $this->genID;
-       }       
-
-       /**
-        * @param $table string name of the table, not needed by all databases 
(eg. mysql), default ''
-        * @param $column string name of the column, not needed by all 
databases (eg. mysql), default ''
-        * @return  the last inserted ID. Not all databases support this.
-        */ 
-       function Insert_ID($table='',$column='')
-       {
-               if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
-               if ($this->hasInsertID) return $this->_insertid($table,$column);
-               if ($this->debug) {
-                       ADOConnection::outp( '<p>Insert_ID error</p>');
-                       adodb_backtrace();
-               }
-               return false;
-       }
-
-
-       /**
-        * Portable Insert ID. Pablo Roca <pabloroca#mvps.org>
-        *
-        * @return  the last inserted ID. All databases support this. But aware 
possible
-        * problems in multiuser environments. Heavy test this before deploying.
-        */ 
-       function PO_Insert_ID($table="", $id="") 
-       {
-          if ($this->hasInsertID){
-                  return $this->Insert_ID($table,$id);
-          } else {
-                  return $this->GetOne("SELECT MAX($id) FROM $table");
-          }
-       }
-
-       /**
-       * @return # rows affected by UPDATE/DELETE
-       */ 
-       function Affected_Rows()
-       {
-               if ($this->hasAffectedRows) {
-                       if ($this->fnExecute === 'adodb_log_sql') {
-                               if ($this->_logsql && $this->_affected !== 
false) return $this->_affected;
-                       }
-                       $val = $this->_affectedrows();
-                       return ($val < 0) ? false : $val;
-               }
-                                 
-               if ($this->debug) ADOConnection::outp( '<p>Affected_Rows 
error</p>',false);
-               return false;
-       }
-       
-       
-       /**
-        * @return  the last error message
-        */
-       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;
-       }
-       
-       function MetaError($err=false)
-       {
-               include_once(ADODB_DIR."/adodb-error.inc.php");
-               if ($err === false) $err = $this->ErrorNo();
-               return 
adodb_error($this->dataProvider,$this->databaseType,$err);
-       }
-       
-       function MetaErrorMsg($errno)
-       {
-               include_once(ADODB_DIR."/adodb-error.inc.php");
-               return adodb_errormsg($errno);
-       }
-       
-       /**
-        * @returns an array with the primary key columns in it.
-        */
-       function MetaPrimaryKeys($table, $owner=false)
-       {
-       // owner not used in base class - see oci8
-               $p = array();
-               $objs =& $this->MetaColumns($table);
-               if ($objs) {
-                       foreach($objs as $v) {
-                               if (!empty($v->primary_key))
-                                       $p[] = $v->name;
-                       }
-               }
-               if (sizeof($p)) return $p;
-               if (function_exists('ADODB_VIEW_PRIMARYKEYS'))
-                       return ADODB_VIEW_PRIMARYKEYS($this->databaseType, 
$this->database, $table, $owner);
-               return false;
-       }
-       
-       /**
-        * @returns assoc array where keys are tables, and values are foreign 
keys
-        */
-       function MetaForeignKeys($table, $owner=false, $upper=false)
-       {
-               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 (when $this->hasTop is set)
-       * BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause 
already set
-       *
-       * @param sql
-       * @param [offset]       is the row to start calculations from (1-based)
-       * @param [nrows]                is the number of rows to get
-       * @param [inputarr]     array of bind variables
-       * @param [secs2cache]           is a private parameter only used by jlim
-       * @return               the recordset ($rs->databaseType == 'array')
-       */
-       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
-       {
-               if ($this->hasTop && $nrows > 0) {
-               // suggested by Reinhard Balling. Access requires top after 
distinct 
-                // Informix requires first before distinct - F Riosa
-                       $ismssql = (strpos($this->databaseType,'mssql') !== 
false);
-                       if ($ismssql) $isaccess = false;
-                       else $isaccess = (strpos($this->databaseType,'access') 
!== false);
-                       
-                       if ($offset <= 0) {
-                               
-                                       // access includes ties in result
-                                       if ($isaccess) {
-                                               $sql = preg_replace(
-                                               
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' 
',$sql);
-
-                                               if ($secs2cache>0) {
-                                                       $ret =& 
$this->CacheExecute($secs2cache, $sql,$inputarr);
-                                               } else {
-                                                       $ret =& 
$this->Execute($sql,$inputarr);
-                                               }
-                                               return $ret; // PHP5 fix
-                                       } else if ($ismssql){
-                                               $sql = preg_replace(
-                                               
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' 
',$sql);
-                                       } else {
-                                               $sql = preg_replace(
-                                               '/(^\s*select\s)/i','\\1 
'.$this->hasTop.' '.$nrows.' ',$sql);
-                                       }
-                       } else {
-                               $nn = $nrows + $offset;
-                               if ($isaccess || $ismssql) {
-                                       $sql = preg_replace(
-                                       
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nn.' 
',$sql);
-                               } else {
-                                       $sql = preg_replace(
-                                       '/(^\s*select\s)/i','\\1 
'.$this->hasTop.' '.$nn.' ',$sql);
-                               }
-                       }
-               }
-               
-               // if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is 
set, we buffer  rows
-               // 0 to offset-1 which will be discarded anyway. So we disable 
$ADODB_COUNTRECS.
-               global $ADODB_COUNTRECS;
-               
-               $savec = $ADODB_COUNTRECS;
-               $ADODB_COUNTRECS = false;
-                       
-               if ($offset>0){
-                       if ($secs2cache>0) $rs = 
&$this->CacheExecute($secs2cache,$sql,$inputarr);
-                       else $rs = &$this->Execute($sql,$inputarr);
-               } else {
-                       if ($secs2cache>0) $rs = 
&$this->CacheExecute($secs2cache,$sql,$inputarr);
-                       else $rs = &$this->Execute($sql,$inputarr);
-               }
-               $ADODB_COUNTRECS = $savec;
-               if ($rs && !$rs->EOF) {
-                       $rs =& $this->_rs2rs($rs,$nrows,$offset);
-               }
-               //print_r($rs);
-               return $rs;
-       }
-       
-       /**
-       * Create serializable recordset. Breaks rs link to connection.
-       *
-       * @param rs                     the recordset to serialize
-       */
-       function &SerializableRS(&$rs)
-       {
-               $rs2 =& $this->_rs2rs($rs);
-               $ignore = false;
-               $rs2->connection =& $ignore;
-               
-               return $rs2;
-       }
-       
-       /**
-       * Convert database recordset to an array recordset
-       * input recordset's cursor should be at beginning, and
-       * 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,$close=true)
-       {
-               if (! $rs) {
-                       $false = false;
-                       return $false;
-               }
-               $dbtype = $rs->databaseType;
-               if (!$dbtype) {
-                       $rs = &$rs;  // required to prevent crashing in 4.2.1, 
but does not happen in 4.3.1 -- why ?
-                       return $rs;
-               }
-               if (($dbtype == 'array' || $dbtype == 'csv') && $nrows == -1 && 
$offset == -1) {
-                       $rs->MoveFirst();
-                       $rs = &$rs; // required to prevent crashing in 4.2.1, 
but does not happen in 4.3.1-- why ?
-                       return $rs;
-               }
-               $flds = array();
-               for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
-                       $flds[] = $rs->FetchField($i);
-               }
-
-               $arr =& $rs->GetArrayLimit($nrows,$offset);
-               //print_r($arr);
-               if ($close) $rs->Close();
-               
-               $arrayClass = $this->arrayClass;
-               
-               $rs2 =& new $arrayClass();
-               $rs2->connection = &$this;
-               $rs2->sql = $rs->sql;
-               $rs2->dataProvider = $this->dataProvider;
-               $rs2->InitArrayFields($arr,$flds);
-               $rs2->fetchMode = isset($rs->adodbFetchMode) ? 
$rs->adodbFetchMode : $rs->fetchMode;
-               return $rs2;
-       }
-       
-       /*
-       * Return all rows. Compat with PEAR DB
-       */
-       function &GetAll($sql, $inputarr=false)
-       {
-               $arr =& $this->GetArray($sql,$inputarr);
-               return $arr;
-       }
-       
-       function &GetAssoc($sql, $inputarr=false,$force_array = false, 
$first2cols = false)
-       {
-               $rs =& $this->Execute($sql, $inputarr);
-               if (!$rs) {
-                       $false = false;
-                       return $false;
-               }
-               $arr =& $rs->GetAssoc($force_array,$first2cols);
-               return $arr;
-       }
-       
-       function &CacheGetAssoc($secs2cache, $sql=false, 
$inputarr=false,$force_array = false, $first2cols = false)
-       {
-               if (!is_numeric($secs2cache)) {
-                       $first2cols = $force_array;
-                       $force_array = $inputarr;
-               }
-               $rs =& $this->CacheExecute($secs2cache, $sql, $inputarr);
-               if (!$rs) {
-                       $false = false;
-                       return $false;
-               }
-               $arr =& $rs->GetAssoc($force_array,$first2cols);
-               return $arr;
-       }
-       
-       /**
-       * 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)
-       {
-       global $ADODB_COUNTRECS;
-               $crecs = $ADODB_COUNTRECS;
-               $ADODB_COUNTRECS = false;
-               
-               $ret = false;
-               $rs = &$this->Execute($sql,$inputarr);
-               if ($rs) {              
-                       if (!$rs->EOF) $ret = reset($rs->fields);
-                       $rs->Close();
-               }
-               $ADODB_COUNTRECS = $crecs;
-               return $ret;
-       }
-       
-       function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
-       {
-               $ret = false;
-               $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-               if ($rs) {              
-                       if (!$rs->EOF) $ret = reset($rs->fields);
-                       $rs->Close();
-               } 
-               
-               return $ret;
-       }
-       
-       function GetCol($sql, $inputarr = false, $trim = false)
-       {
-               $rv = false;
-               $rs = &$this->Execute($sql, $inputarr);
-               if ($rs) {
-                       $rv = array();
-                       if ($trim) {
-                               while (!$rs->EOF) {
-                                       $rv[] = trim(reset($rs->fields));
-                                       $rs->MoveNext();
-                               }
-                       } else {
-                               while (!$rs->EOF) {
-                                       $rv[] = reset($rs->fields);
-                                       $rs->MoveNext();
-                               }
-                       }
-                       $rs->Close();
-               }
-               return $rv;
-       }
-       
-       function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
-       {
-               $rv = false;
-               $rs = &$this->CacheExecute($secs, $sql, $inputarr);
-               if ($rs) {
-                       if ($trim) {
-                               while (!$rs->EOF) {
-                                       $rv[] = trim(reset($rs->fields));
-                                       $rs->MoveNext();
-                               }
-                       } else {
-                               while (!$rs->EOF) {
-                                       $rv[] = reset($rs->fields);
-                                       $rs->MoveNext();
-                               }
-                       }
-                       $rs->Close();
-               }
-               return $rv;
-       }
- 
-       /*
-               Calculate the offset of a date for a particular database and 
generate
-                       appropriate SQL. Useful for calculating future/past 
dates and storing
-                       in a database.
-                       
-               If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
-       */
-       function OffsetDate($dayFraction,$date=false)
-       {               
-               if (!$date) $date = $this->sysDate;
-               return  '('.$date.'+'.$dayFraction.')';
-       }
-       
-       
-       /**
-       *
-       * @param sql                    SQL statement
-       * @param [inputarr]             input bind array
-       */
-       function &GetArray($sql,$inputarr=false)
-       {
-       global $ADODB_COUNTRECS;
-               
-               $savec = $ADODB_COUNTRECS;
-               $ADODB_COUNTRECS = false;
-               $rs =& $this->Execute($sql,$inputarr);
-               $ADODB_COUNTRECS = $savec;
-               if (!$rs) 
-                       if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-                       else {
-                               $false = false;
-                               return $false;
-                       }
-               $arr =& $rs->GetArray();
-               $rs->Close();
-               return $arr;
-       }
-       
-       function &CacheGetAll($secs2cache,$sql=false,$inputarr=false)
-       {
-               return $this->CacheGetArray($secs2cache,$sql,$inputarr);
-       }
-       
-       function &CacheGetArray($secs2cache,$sql=false,$inputarr=false)
-       {
-       global $ADODB_COUNTRECS;
-               
-               $savec = $ADODB_COUNTRECS;
-               $ADODB_COUNTRECS = false;
-               $rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
-               $ADODB_COUNTRECS = $savec;
-               
-               if (!$rs) 
-                       if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-                       else {
-                               $false = false;
-                               return $false;
-                       }
-               $arr =& $rs->GetArray();
-               $rs->Close();
-               return $arr;
-       }
-       
-       
-       
-       /**
-       * 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)
-       {
-       global $ADODB_COUNTRECS;
-               $crecs = $ADODB_COUNTRECS;
-               $ADODB_COUNTRECS = false;
-               
-               $rs =& $this->Execute($sql,$inputarr);
-               
-               $ADODB_COUNTRECS = $crecs;
-               if ($rs) {
-                       if (!$rs->EOF) $arr = $rs->fields;
-                       else $arr = array();
-                       $rs->Close();
-                       return $arr;
-               }
-               
-               $false = false;
-               return $false;
-       }
-       
-       function &CacheGetRow($secs2cache,$sql=false,$inputarr=false)
-       {
-               $rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
-               if ($rs) {
-                       $arr = false;
-                       if (!$rs->EOF) $arr = $rs->fields;
-                       $rs->Close();
-                       return $arr;
-               }
-               $false = false;
-               return $false;
-       }
-       
-       /**
-       * Insert or replace a single record. Note: this is not the same as 
MySQL's replace. 
-       * ADOdb's Replace() uses update-insert semantics, not 
insert-delete-duplicates of MySQL.
-       * Also note that no table locking is done currently, so it is possible 
that the
-       * record be inserted twice by two programs...
-       *
-       * $this->Replace('products', array('prodname' =>"'Nails'","price" => 
3.99), 'prodname');
-       *
-       * $table                table name
-       * $fieldArray   associative array of data (you must quote strings 
yourself).
-       * $keyCol               the primary key field name or if compound key, 
array of field names
-       * autoQuote             set to true to use a hueristic to quote 
strings. Works with nulls and numbers
-       *                                       but does not work with dates 
nor SQL functions.
-       * has_autoinc   the primary key is an auto-inc field, so skip in insert.
-       *
-       * Currently blob replace not supported
-       *
-       * returns 0 = fail, 1 = update, 2 = insert 
-       */
-       
-       function Replace($table, $fieldArray, $keyCol, $autoQuote=false, 
$has_autoinc=false)
-       {
-               global $ADODB_INCLUDED_LIB;
-               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
-               
-               return _adodb_replace($this, $table, $fieldArray, $keyCol, 
$autoQuote, $has_autoinc);
-       }
-       
-       
-       /**
-       * Will select, getting rows from $offset (1-based), for $nrows. 
-       * This simulates the MySQL "select * from table limit $offset,$nrows" , 
and
-       * the PostgreSQL "select * from table limit $nrows offset $offset". 
Note that
-       * MySQL and PostgreSQL parameter ordering is the opposite of the other.
-       * eg. 
-       *  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 
3 (1-based)
-       *  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 
to 5 (1-based)
-       *
-       * BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP 
clause already set
-       *
-       * @param [secs2cache]   seconds to cache data, set to 0 to force query. 
This is optional
-       * @param sql
-       * @param [offset]       is the row to start calculations from (1-based)
-       * @param [nrows]        is the number of rows to get
-       * @param [inputarr]     array of bind variables
-       * @return               the recordset ($rs->databaseType == 'array')
-       */
-       function 
&CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
-       {       
-               if (!is_numeric($secs2cache)) {
-                       if ($sql === false) $sql = -1;
-                       if ($offset == -1) $offset = false;
-                                                                         // 
sql,       nrows, offset,inputarr
-                       $rs =& 
$this->SelectLimit($secs2cache,$sql,$nrows,$offset,$this->cacheSecs);
-               } else {
-                       if ($sql === false) ADOConnection::outp( "Warning: 
\$sql missing from CacheSelectLimit()");
-                       $rs =& 
$this->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-               }
-               return $rs;
-       }
-       
-       /**
-       * Flush cached recordsets that match a particular $sql statement. 
-       * If $sql == false, then we purge all files in the cache.
-       */
-       function CacheFlush($sql=false,$inputarr=false)
-       {
-       global $ADODB_CACHE_DIR;
-       
-               if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) {
-                       if (strncmp(PHP_OS,'WIN',3) === 0) {
-                               $cmd = 'del /s 
'.str_replace('/','\\',$ADODB_CACHE_DIR).'\adodb_*.cache';
-                       } else {
-                               $cmd = 'rm -rf 
'.$ADODB_CACHE_DIR.'/??/adodb_*.cache'; 
-                               // old version 'rm -f `find 
'.$ADODB_CACHE_DIR.' -name adodb_*.cache`';
-                       }
-                       if ($this->debug) {
-                               ADOConnection::outp( "CacheFlush: 
$cmd<br><pre>\n", system($cmd),"</pre>");
-                       } else {
-                               exec($cmd);
-                       }
-                       return;
-               } 
-               
-               global $ADODB_INCLUDED_CSV;
-               if (empty($ADODB_INCLUDED_CSV)) 
include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-               
-               $f = $this->_gencachename($sql.serialize($inputarr),false);
-               adodb_write_file($f,''); // is adodb_write_file needed?
-               if (address@hidden($f)) {
-                       if ($this->debug) ADOConnection::outp( "CacheFlush: 
failed for $f");
-               }
-       }
-       
-       /**
-       * Private function to generate filename for caching.
-       * Filename is generated based on:
-       *
-       *  - sql statement
-       *  - database type (oci8, ibase, ifx, etc)
-       *  - database name
-       *  - userid
-       *  - setFetchMode (adodb 4.23)
-       *
-       * When not in safe mode, we create 256 sub-directories in the cache 
directory ($ADODB_CACHE_DIR). 
-       * Assuming that we can have 50,000 files per directory with good 
performance, 
-       * then we can scale to 12.8 million unique cached recordsets. Wow!
-       */
-       function _gencachename($sql,$createdir)
-       {
-       global $ADODB_CACHE_DIR;
-       static $notSafeMode;
-               
-               if ($this->fetchMode === false) { 
-               global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               } else {
-                       $mode = $this->fetchMode;
-               }
-               $m = 
md5($sql.$this->databaseType.$this->database.$this->user.$mode);
-               
-               if (!isset($notSafeMode)) $notSafeMode = !ini_get('safe_mode');
-               $dir = ($notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($m,0,2) : 
$ADODB_CACHE_DIR;
-                       
-               if ($createdir && $notSafeMode && !file_exists($dir)) {
-                       $oldu = umask(0);
-                       if (!mkdir($dir,0771)) 
-                               if ($this->debug) ADOConnection::outp( "Unable 
to mkdir $dir for $sql");
-                       umask($oldu);
-               }
-               return $dir.'/adodb_'.$m.'.cache';
-       }
-       
-       
-       /**
-        * Execute SQL, caching recordsets.
-        *
-        * @param [secs2cache]  seconds to cache data, set to 0 to force query. 
-        *                                        This is an optional parameter.
-        * @param sql           SQL statement to execute
-        * @param [inputarr]    holds the input data  to bind to
-        * @return              RecordSet or false
-        */
-       function &CacheExecute($secs2cache,$sql=false,$inputarr=false)
-       {
-               if (!is_numeric($secs2cache)) {
-                       $inputarr = $sql;
-                       $sql = $secs2cache;
-                       $secs2cache = $this->cacheSecs;
-               }
-               global $ADODB_INCLUDED_CSV;
-               if (empty($ADODB_INCLUDED_CSV)) 
include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-               
-               if (is_array($sql)) $sql = $sql[0];
-                       
-               $md5file = $this->_gencachename($sql.serialize($inputarr),true);
-               $err = '';
-               
-               if ($secs2cache > 0){
-                       $rs = &csv2rs($md5file,$err,$secs2cache);
-                       $this->numCacheHits += 1;
-               } else {
-                       $err='Timeout 1';
-                       $rs = false;
-                       $this->numCacheMisses += 1;
-               }
-               if (!$rs) {
-               // no cached rs found
-                       if ($this->debug) {
-                               if (get_magic_quotes_runtime()) {
-                                       ADOConnection::outp("Please disable 
magic_quotes_runtime - it corrupts cache files :(");
-                               }
-                               if ($this->debug !== -1) ADOConnection::outp( " 
$md5file cache failure: $err (see sql below)");
-                       }
-                       
-                       $rs = &$this->Execute($sql,$inputarr);
-
-                       if ($rs) {
-                               $eof = $rs->EOF;
-                               $rs = &$this->_rs2rs($rs); // read entire 
recordset into memory immediately
-                               $txt = _rs2serialize($rs,false,$sql); // 
serialize
-               
-                               if 
(!adodb_write_file($md5file,$txt,$this->debug)) {
-                                       if ($fn = $this->raiseErrorFn) {
-                                               
$fn($this->databaseType,'CacheExecute',-32000,"Cache write 
error",$md5file,$sql,$this);
-                                       }
-                                       if ($this->debug) ADOConnection::outp( 
" Cache write error");
-                               }
-                               if ($rs->EOF && !$eof) {
-                                       $rs->MoveFirst();
-                                       //$rs = &csv2rs($md5file,$err);         
-                                       $rs->connection = &$this; // Pablo 
suggestion
-                               }  
-                               
-                       } else
-                               @unlink($md5file);
-               } else {
-                       $this->_errorMsg = '';
-                       $this->_errorCode = 0;
-                       
-                       if ($this->fnCacheExecute) {
-                               $fn = $this->fnCacheExecute;
-                               $fn($this, $secs2cache, $sql, $inputarr);
-                       }
-               // ok, set cached object found
-                       $rs->connection = &$this; // Pablo suggestion
-                       if ($this->debug){ 
-                       global $HTTP_SERVER_VARS;
-                                       
-                               $inBrowser = 
isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']);
-                               $ttl = $rs->timeCreated + $secs2cache - time();
-                               $s = is_array($sql) ? $sql[0] : $sql;
-                               if ($inBrowser) $s = 
'<i>'.htmlspecialchars($s).'</i>';
-                               
-                               ADOConnection::outp( " $md5file reloaded, 
ttl=$ttl [ $s ]");
-                       }
-               }
-               return $rs;
-       }
-       
-       
-       /**
-        * Generates an Update Query based on an existing recordset.
-        * $arrFields is an associative array of fields with the value
-        * that should be assigned.
-        *
-        * Note: This function should only be used on a recordset
-        *         that is run against a single table and sql should only 
-        *               be a simple select stmt with no groupby/orderby/limit
-        *
-        * "Jonathan Younger" <address@hidden>
-        */
-       function GetUpdateSQL(&$rs, 
$arrFields,$forceUpdate=false,$magicq=false,$force=null)
-       {
-               global $ADODB_INCLUDED_LIB;
-
-        //********************************************************//
-        //This is here to maintain compatibility
-        //with older adodb versions. Sets force type to force nulls if 
$forcenulls is set.
-               if (!isset($force)) {
-                               global $ADODB_FORCE_TYPE;
-                           $force = $ADODB_FORCE_TYPE;
-               }
-               //********************************************************//
-
-               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
-               return 
_adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
-       }
-
-
-       /**
-        * 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,$magicq=false,$force=null)
-       {       
-               global $ADODB_INCLUDED_LIB;
-               if (!isset($force)) {
-                       global $ADODB_FORCE_TYPE;
-                       $force = $ADODB_FORCE_TYPE;
-                       
-               }
-               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
-               return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
-       }
-       
-
-       /**
-       * Update a blob column, given a where clause. There are more 
sophisticated
-       * blob handling functions that we could have implemented, but all 
require
-       * a very complex API. Instead we have chosen something that is extremely
-       * simple to understand and use. 
-       *
-       * Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
-       *
-       * Usage to update a $blobvalue which has a primary key blob_id=1 into a 
-       * field blobtable.blobcolumn:
-       *
-       *       UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
-       *
-       * Insert example:
-       *
-       *       $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;
-       }
-
-       /**
-       * Usage:
-       *       UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
-       *       
-       *       $blobtype supports 'BLOB' and 'CLOB'
-       *
-       *       $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, 
null)');
-       *       $conn->UpdateBlob('blobtable','blobcol',$blobpath,'id=1');
-       */
-       function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
-       {
-               $fd = fopen($path,'rb');
-               if ($fd === false) return false;
-               $val = fread($fd,filesize($path));
-               fclose($fd);
-               return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
-       }
-       
-       function BlobDecode($blob)
-       {
-               return $blob;
-       }
-       
-       function BlobEncode($blob)
-       {
-               return $blob;
-       }
-       
-       function SetCharSet($charset)
-       {
-               return false;
-       }
-       
-       function IfNull( $field, $ifNull ) 
-       {
-               return " CASE WHEN $field is null THEN $ifNull ELSE $field END 
";
-       }
-       
-       function LogSQL($enable=true)
-       {
-               include_once(ADODB_DIR.'/adodb-perf.inc.php');
-               
-               if ($enable) $this->fnExecute = 'adodb_log_sql';
-               else $this->fnExecute = false;
-               
-               $old = $this->_logsql;  
-               $this->_logsql = $enable;
-               if ($enable && !$old) $this->_affected = false;
-               return $old;
-       }
-       
-       function GetCharSet()
-       {
-               return false;
-       }
-       
-       /**
-       * Usage:
-       *       UpdateClob('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');
-       }
-       
-       
-       /**
-       *  Change the SQL connection locale to a specified locale.
-       *  This is used to get the date formats written depending on the client 
locale.
-       */
-       function SetDateLocale($locale = 'En')
-       {
-               $this->locale = $locale;
-               switch ($locale)
-               {
-                       default:
-                       case 'En':
-                               $this->fmtDate="'Y-m-d'";
-                               $this->fmtTimeStamp = "'Y-m-d H:i:s'";
-                               break;
-       
-                       case 'Fr':
-                       case 'Ro':
-                       case 'It':
-                               $this->fmtDate="'d-m-Y'";
-                               $this->fmtTimeStamp = "'d-m-Y H:i:s'";
-                               break;
-                               
-                       case 'Ge':
-                               $this->fmtDate="'d.m.Y'";
-                               $this->fmtTimeStamp = "'d.m.Y H:i:s'";
-                               break;
-               }
-       }
-
-       
-       /**
-        * Close Connection
-        */
-       function Close()
-       {
-               $rez = $this->_close();
-               $this->_connectionID = false;
-               return $rez;
-       }
-       
-       /**
-        * Begin a Transaction. Must be followed by CommitTrans() or 
RollbackTrans().
-        *
-        * @return true if succeeded or false if database does not support 
transactions
-        */
-       function BeginTrans() {return false;}
-       
-       
-       /**
-        * If database does not support transactions, always return true as 
data always commited
-        *
-        * @param $ok  set to false to rollback transaction, true to commit
-        *
-        * @return true/false.
-        */
-       function CommitTrans($ok=true) 
-       { 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() 
-               {
-               global $ADODB_FETCH_MODE;
-               
-                       if ($this->metaDatabasesSQL) {
-                               $save = $ADODB_FETCH_MODE; 
-                               $ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-                               
-                               if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
-                               
-                               $arr = $this->GetCol($this->metaDatabasesSQL);
-                               if (isset($savem)) $this->SetFetchMode($savem);
-                               $ADODB_FETCH_MODE = $save; 
-                       
-                               return $arr;
-                       }
-                       
-                       return false;
-               }
-               
-       /**
-        * @param ttype can either be 'VIEW' or 'TABLE' or false. 
-        *              If false, both views and tables are returned.
-        *              "VIEW" returns only views
-        *              "TABLE" returns only tables
-        * @param showSchema returns the schema/user with the table name, eg. 
USER.TABLE
-        * @param mask  is the input mask - only supported by oci8 and 
postgresql
-        *
-        * @return  array of tables for current database.
-        */ 
-       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-       {
-       global $ADODB_FETCH_MODE;
-       
-               
-               $false = false;
-               if ($mask) {
-                       return $false;
-               }
-               if ($this->metaTablesSQL) {
-                       // complicated state saving by the need for backward 
compat
-                       $save = $ADODB_FETCH_MODE; 
-                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-                       
-                       if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
-                       
-                       $rs = $this->Execute($this->metaTablesSQL);
-                       if (isset($savem)) $this->SetFetchMode($savem);
-                       $ADODB_FETCH_MODE = $save; 
-                       
-                       if ($rs === false) return $false;
-                       $arr =& $rs->GetArray();
-                       $arr2 = array();
-                       
-                       if ($hast = ($ttype && isset($arr[0][1]))) { 
-                               $showt = strncmp($ttype,'T',1);
-                       }
-                       
-                       for ($i=0; $i < sizeof($arr); $i++) {
-                               if ($hast) {
-                                       if ($showt == 0) {
-                                               if (strncmp($arr[$i][1],'T',1) 
== 0) $arr2[] = trim($arr[$i][0]);
-                                       } else {
-                                               if (strncmp($arr[$i][1],'V',1) 
== 0) $arr2[] = trim($arr[$i][0]);
-                                       }
-                               } else
-                                       $arr2[] = trim($arr[$i][0]);
-                       }
-                       $rs->Close();
-                       return $arr2;
-               }
-               return $false;
-       }
-       
-       
-       function _findschema(&$table,&$schema)
-       {
-               if (!$schema && ($at = strpos($table,'.')) !== false) {
-                       $schema = substr($table,0,$at);
-                       $table = substr($table,$at+1);
-               }
-       }
-       
-       /**
-        * List columns in a database as an array of ADOFieldObjects. 
-        * See top of file for definition of object.
-        *
-        * @param table table name to query
-        * @param upper uppercase table name (required by some databases)
-        * @schema is optional database schema to use - not supported by all 
databases.
-        *
-        * @return  array of ADOFieldObjects for current table.
-        */
-       function &MetaColumns($table,$upper=true) 
-       {
-       global $ADODB_FETCH_MODE;
-               
-               $false = false;
-               
-               if (!empty($this->metaColumnsSQL)) {
-               
-                       $schema = false;
-                       $this->_findschema($table,$schema);
-               
-                       $save = $ADODB_FETCH_MODE;
-                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                       if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
-                       $rs = 
$this->Execute(sprintf($this->metaColumnsSQL,($upper)?strtoupper($table):$table));
-                       if (isset($savem)) $this->SetFetchMode($savem);
-                       $ADODB_FETCH_MODE = $save;
-                       if ($rs === false || $rs->EOF) return $false;
-
-                       $retarr = array();
-                       while (!$rs->EOF) { //print_r($rs->fields);
-                               $fld =& new ADOFieldObject();
-                               $fld->name = $rs->fields[0];
-                               $fld->type = $rs->fields[1];
-                               if (isset($rs->fields[3]) && $rs->fields[3]) {
-                                       if ($rs->fields[3]>0) $fld->max_length 
= $rs->fields[3];
-                                       $fld->scale = $rs->fields[4];
-                                       if ($fld->scale>0) $fld->max_length += 
1;
-                               } else
-                                       $fld->max_length = $rs->fields[2];
-                                       
-                               if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) 
$retarr[] = $fld;     
-                               else $retarr[strtoupper($fld->name)] = $fld;
-                               $rs->MoveNext();
-                       }
-                       $rs->Close();
-                       return $retarr; 
-               }
-               return $false;
-       }
-       
-    /**
-      * List indexes on a table as an array.
-      * @param table        table name to query
-      * @param primary include primary keys.
-         *
-      * @return array of indexes on current table.
-      */
-     function &MetaIndexes($table, $primary = false, $owner = false)
-     {
-                       $false = false;
-            return false;
-     }
-
-       /**
-        * List columns names in a table as an array. 
-        * @param table table name to query
-        *
-        * @return  array of column names for current table.
-        */ 
-       function &MetaColumnNames($table, $numIndexes=false) 
-       {
-               $objarr =& $this->MetaColumns($table);
-               if (!is_array($objarr)) {
-                       $false = false;
-                       return $false;
-               }
-               $arr = array();
-               if ($numIndexes) {
-                       $i = 0;
-                       foreach($objarr as $v) $arr[$i++] = $v->name;
-               } else
-                       foreach($objarr as $v) $arr[strtoupper($v->name)] = 
$v->name;
-               
-               return $arr;
-       }
-                       
-       /**
-        * Different SQL databases used different methods to combine strings 
together.
-        * This function provides a wrapper. 
-        * 
-        * 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)
-       {
-               if (empty($d) && $d !== 0) return 'null';
-
-               if (is_string($d) && !is_numeric($d)) {
-                       if ($d === 'null' || strncmp($d,"'",1) === 0) return $d;
-                       if ($this->isoDates) return "'$d'";
-                       $d = ADOConnection::UnixDate($d);
-               }
-
-               return adodb_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)
-       {
-               if (empty($ts) && $ts !== 0) return 'null';
-
-               # strlen(14) allows YYYYMMDDHHMMSS format
-               if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
-                       return adodb_date($this->fmtTimeStamp,$ts);
-               
-               if ($ts === 'null') return $ts;
-               if ($this->isoDates && strlen($ts) !== 14) return "'$ts'";
-               
-               $ts = ADOConnection::UnixTimeStamp($ts);
-               return adodb_date($this->fmtTimeStamp,$ts);
-       }
-       
-       /**
-        * Also in ADORecordSet.
-        * @param $v is a date string in YYYY-MM-DD format
-        *
-        * @return date in unix timestamp format, or 0 if before 
TIMESTAMP_FIRST_YEAR, or false if invalid date format
-        */
-       function UnixDate($v)
-       {
-               if (is_object($v)) {
-               // odbtp support
-               //( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 
[minute] => 44 [second] => 8 [fraction] => 0 )
-                       return 
adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
-               }
-       
-               if (is_numeric($v) && strlen($v) !== 8) return $v;
-               if (!preg_match( 
"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
-                       ($v), $rr)) return false;
-
-               if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
-               // h-m-s-MM-DD-YY
-               return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-       }
-       
-
-       /**
-        * Also in ADORecordSet.
-        * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
-        *
-        * @return date in unix timestamp format, or 0 if before 
TIMESTAMP_FIRST_YEAR, or false if invalid date format
-        */
-       function UnixTimeStamp($v)
-       {
-               if (is_object($v)) {
-               // odbtp support
-               //( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 
[minute] => 44 [second] => 8 [fraction] => 0 )
-                       return 
adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
-               }
-               
-               if (!preg_match( 
-                       "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ 
,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
-                       ($v), $rr)) return false;
-                       
-               if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-       
-               // h-m-s-MM-DD-YY
-               if (!isset($rr[5])) return  
adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-               return  
@adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
-       }
-       
-       /**
-        * Also in ADORecordSet.
-        *
-        * Format database date based on user defined format.
-        *
-        * @param v     is the character date in YYYY-MM-DD format, returned by 
database
-        * @param fmt   is the format to apply to it, using date()
-        *
-        * @return a date formated as user desires
-        */
-        
-       function UserDate($v,$fmt='Y-m-d',$gmt=false)
-       {
-               $tt = $this->UnixDate($v);
-
-               // $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-               if (($tt === false || $tt == -1) && $v != false) return $v;
-               else if ($tt == 0) return $this->emptyDate;
-               else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
-               }
-               
-               return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-       
-       }
-       
-               /**
-        *
-        * @param v     is the character timestamp in YYYY-MM-DD hh:mm:ss format
-        * @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',$gmt=false)
-       {
-               # strlen(14) allows YYYYMMDDHHMMSS format
-               if (is_numeric($v) && strlen($v)<14) return ($gmt) ? 
adodb_gmdate($fmt,$v) : adodb_date($fmt,$v);
-               $tt = $this->UnixTimeStamp($v);
-               // $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-               if (($tt === false || $tt == -1) && $v != false) return $v;
-               if ($tt == 0) return $this->emptyTimeStamp;
-               return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-       }
-       
-       /**
-       * Quotes a string, without prefixing nor appending quotes. 
-       */
-       function addq($s,$magic_quotes=false)
-       {
-               if (!$magic_quotes) {
-               
-                       if ($this->replaceQuote[0] == '\\'){
-                               // only since php 4.0.5
-                               $s = 
adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-                               //$s = str_replace("\0","\\\0", 
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);
-               }
-       }
-       
-       /**
-        * Correctly quotes a string so that all strings are escaped. We prefix 
and append
-        * to the string single-quotes.
-        * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-        * 
-        * @param s                     the string to quote
-        * @param [magic_quotes]        if $s is GET/POST var, set to 
get_magic_quotes_gpc().
-        *                              This undoes the stupidity of magic 
quotes for GPC.
-        *
-        * @return  quoted string to be sent back to database
-        */
-       function qstr($s,$magic_quotes=false)
-       {       
-               if (!$magic_quotes) {
-               
-                       if ($this->replaceQuote[0] == '\\'){
-                               // only since php 4.0.5
-                               $s = 
adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-                               //$s = str_replace("\0","\\\0", 
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 [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, 
$secs2cache=0) 
-       {
-               global $ADODB_INCLUDED_LIB;
-               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
-               if ($this->pageExecuteCountRows) $rs =& 
_adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache);
-               else $rs =& _adodb_pageexecute_no_last_page($this, $sql, 
$nrows, $page, $inputarr, $secs2cache);
-               return $rs;
-       }
-       
-               
-       /**
-       * Will select the supplied $page number from a recordset, given that it 
is paginated in pages of 
-       * $nrows rows per page. It also saves two boolean values saying if the 
given page is the first 
-       * and/or last one of the recordset. Added by Iván Oliva to provide 
recordset pagination.
-       *
-       * @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
-       * @return               the recordset ($rs->databaseType == 'array')
-       */
-       function &CachePageExecute($secs2cache, $sql, $nrows, 
$page,$inputarr=false) 
-       {
-               /*switch($this->dataProvider) {
-               case 'postgres':
-               case 'mysql': 
-                       break;
-               default: $secs2cache = 0; break;
-               }*/
-               $rs =& 
$this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache);
-               return $rs;
-       }
-
-} // end class ADOConnection
-       
-       
-       
-       
//==============================================================================================
        
-       // CLASS ADOFetchObj
-       
//==============================================================================================
        
-               
-       /**
-       * Internal placeholder for record objects. Used by 
ADORecordSet->FetchObj().
-       */
-       class ADOFetchObj {
-       };
-       
-       
//==============================================================================================
        
-       // CLASS ADORecordSet_empty
-       
//==============================================================================================
        
-       
-       /**
-       * Lightweight recordset when there are no records to be returned
-       */
-       class ADORecordSet_empty
-       {
-               var $dataProvider = 'empty';
-               var $databaseType = false;
-               var $EOF = true;
-               var $_numOfRows = 0;
-               var $fields = false;
-               var $connection = false;
-               function RowCount() {return 0;}
-               function RecordCount() {return 0;}
-               function PO_RecordCount(){return 0;}
-               function Close(){return true;}
-               function FetchRow() {return false;}
-               function FieldCount(){ return 0;}
-               function Init() {}
-       }
-       
-       
//==============================================================================================
        
-       // DATE AND TIME FUNCTIONS
-       
//==============================================================================================
        
-       include_once(ADODB_DIR.'/adodb-time.inc.php');
-       
-       
//==============================================================================================
        
-       // CLASS ADORecordSet
-       
//==============================================================================================
        
-
-       if (PHP_VERSION < 5) include_once(ADODB_DIR.'/adodb-php4.inc.php');
-       else include_once(ADODB_DIR.'/adodb-iterator.inc.php');
-   /**
-        * RecordSet class that represents the dataset returned by the database.
-        * To keep memory overhead low, this class holds only the current row 
in memory.
-        * No prefetching of data is done, so the RecordCount() can return -1 ( 
which
-        * means recordcount not known).
-        */
-       class ADORecordSet extends ADODB_BASE_RS {
-       /*
-        * public variables     
-        */
-       var $dataProvider = "native";
-       var $fields = false;    /// holds the current row data
-       var $blobSize = 100;    /// any varchar/char field this size or greater 
is treated as a blob
-                                                       /// in other words, we 
use a text area for editing.
-       var $canSeek = false;   /// indicates that seek is supported
-       var $sql;                               /// sql text
-       var $EOF = false;               /// Indicates that the current record 
position is after the last record in a Recordset object. 
-       
-       var $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
-       var $connection = false; /// the parent connection
-       /*
-        *      private variables       
-        */
-       var $_numOfRows = -1;   /** number of rows, or -1 */
-       var $_numOfFields = -1; /** number of fields in recordset */
-       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;                    /** Used by FetchObj */
-       
-       var $_currentPage = -1; /** Added by Iván Oliva to implement recordset 
pagination */
-       var $_atFirstPage = false;      /** Added by Iván Oliva to implement 
recordset pagination */
-       var $_atLastPage = false;       /** Added by Iván Oliva to implement 
recordset pagination */
-       var $_lastPageNo = -1; 
-       var $_maxRecordCount = 0;
-       var $datetime = false;
-       
-       /**
-        * Constructor
-        *
-        * @param queryID       this is the queryID returned by 
ADOConnection->_query()
-        *
-        */
-       function ADORecordSet($queryID) 
-       {
-               $this->_queryID = $queryID;
-       }
-       
-       
-       
-       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;
-                       if ($this->EOF = ($this->_fetch() === false)) {
-                               $this->_numOfRows = 0; // _numOfRows could be -1
-                       }
-               } else {
-                       $this->EOF = true;
-               }
-       }
-       
-       
-       /**
-        * Generate a SELECT tag string from a recordset, and return the string.
-        * If the recordset has 2 cols, we treat the 1st col as the containing 
-        * 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 tag
-        * @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 tag.
-        *                              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 address@hidden to support multiple hilited items
-        */
-       function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
-                       $size=0, $selectAttr='',$compareFields0=true)
-       {
-               global $ADODB_INCLUDED_LIB;
-               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
-               return _adodb_getmenu($this, 
$name,$defstr,$blank1stItem,$multiple,
-                       $size, $selectAttr,$compareFields0);
-       }
-       
-       /**
-        * Generate a SELECT tag string from a recordset, and return the string.
-        * If the recordset has 2 cols, we treat the 1st col as the containing 
-        * 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='')  
-       {
-               global $ADODB_INCLUDED_LIB;
-               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
-               return 
_adodb_getmenu($this,$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) 
-       {
-       global $ADODB_EXTENSION; if ($ADODB_EXTENSION) return 
adodb_getall($this,$nRows);
-               
-               $results = array();
-               $cnt = 0;
-               while (!$this->EOF && $nRows != $cnt) {
-                       $results[] = $this->fields;
-                       $this->MoveNext();
-                       $cnt++;
-               }
-               return $results;
-       }
-       
-       function &GetAll($nRows = -1)
-       {
-               $arr =& $this->GetArray($nRows);
-               return $arr;
-       }
-       
-       /*
-       * Some databases allow multiple recordsets to be returned. This function
-       * will return true if there is a next recordset, or false if no more.
-       */
-       function NextRecordSet()
-       {
-               return false;
-       }
-       
-       /**
-        * 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) {
-                       $arr =& $this->GetArray($nrows);
-                       return $arr;
-               } 
-               
-               $this->Move($offset);
-               
-               $results = array();
-               $cnt = 0;
-               while (!$this->EOF && $nrows != $cnt) {
-                       $results[$cnt++] = $this->fields;
-                       $this->MoveNext();
-               }
-               
-               return $results;
-       }
-       
-       
-       /**
-        * Synonym for GetArray() for compatibility with ADO.
-        *
-        * @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) 
-       {
-               $arr =& $this->GetArray($nRows);
-               return $arr;
-       }
-       
-       /**
-        * return whole recordset as a 2-dimensional associative array if there 
are more than 2 columns. 
-        * The first column is treated as the key and is not included in the 
array. 
-        * 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.
-        *
-        * @param [first2cols] means if there are more than 2 cols, ignore the 
remaining cols and 
-        * instead of returning array[col0] => array(remaining cols), return 
array[col0] => col1
-        *
-        * @return an associative array indexed by the first column of the 
array, 
-        *      or false if the  data has less than 2 cols.
-        */
-       function &GetAssoc($force_array = false, $first2cols = false) 
-       {
-       global $ADODB_EXTENSION;
-       
-               $cols = $this->_numOfFields;
-               if ($cols < 2) {
-                       $false = false;
-                       return $false;
-               }
-               $numIndex = isset($this->fields[0]);
-               $results = array();
-               
-               if (!$first2cols && ($cols > 2 || $force_array)) {
-                       if ($ADODB_EXTENSION) {
-                               if ($numIndex) {
-                                       while (!$this->EOF) {
-                                               
$results[trim($this->fields[0])] = array_slice($this->fields, 1);
-                                               adodb_movenext($this);
-                                       }
-                               } else {
-                                       while (!$this->EOF) {
-                                               
$results[trim(reset($this->fields))] = array_slice($this->fields, 1);
-                                               adodb_movenext($this);
-                                       }
-                               }
-                       } else {
-                               if ($numIndex) {
-                                       while (!$this->EOF) {
-                                               
$results[trim($this->fields[0])] = array_slice($this->fields, 1);
-                                               $this->MoveNext();
-                                       }
-                               } else {
-                                       while (!$this->EOF) {
-                                               
$results[trim(reset($this->fields))] = array_slice($this->fields, 1);
-                                               $this->MoveNext();
-                                       }
-                               }
-                       }
-               } else {
-                       if ($ADODB_EXTENSION) {
-                               // return scalar values
-                               if ($numIndex) {
-                                       while (!$this->EOF) {
-                                       // some bug in mssql PHP 4.02 -- 
doesn't handle references properly so we FORCE creating a new string
-                                               
$results[trim(($this->fields[0]))] = $this->fields[1];
-                                               adodb_movenext($this);
-                                       }
-                               } else {
-                                       while (!$this->EOF) {
-                                       // some bug in mssql PHP 4.02 -- 
doesn't handle references properly so we FORCE creating a new string
-                                               $v1 = 
trim(reset($this->fields));
-                                               $v2 = ''.next($this->fields); 
-                                               $results[$v1] = $v2;
-                                               adodb_movenext($this);
-                                       }
-                               }
-                       } else {
-                               if ($numIndex) {
-                                       while (!$this->EOF) {
-                                       // some bug in mssql PHP 4.02 -- 
doesn't handle references properly so we FORCE creating a new string
-                                               
$results[trim(($this->fields[0]))] = $this->fields[1];
-                                               $this->MoveNext();
-                                       }
-                               } else {
-                                       while (!$this->EOF) {
-                                       // some bug in mssql PHP 4.02 -- 
doesn't handle references properly so we FORCE creating a new string
-                                               $v1 = 
trim(reset($this->fields));
-                                               $v2 = ''.next($this->fields); 
-                                               $results[$v1] = $v2;
-                                               $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')
-       {
-               if (is_numeric($v) && strlen($v)<14) return adodb_date($fmt,$v);
-               $tt = $this->UnixTimeStamp($v);
-               // $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-               if (($tt === false || $tt == -1) && $v != false) return $v;
-               if ($tt === 0) return $this->emptyTimeStamp;
-               return adodb_date($fmt,$tt);
-       }
-       
-       
-       /**
-        * @param v     is the character date in YYYY-MM-DD format, returned by 
database
-        * @param fmt   is the format to apply to it, using date()
-        *
-        * @return a date formated as user desires
-        */
-       function UserDate($v,$fmt='Y-m-d')
-       {
-               $tt = $this->UnixDate($v);
-               // $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-               if (($tt === false || $tt == -1) && $v != false) return $v;
-               else if ($tt == 0) return $this->emptyDate;
-               else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
-               }
-               return adodb_date($fmt,$tt);
-       }
-       
-       
-       /**
-        * @param $v is a date string in YYYY-MM-DD format
-        *
-        * @return date in unix timestamp format, or 0 if before 
TIMESTAMP_FIRST_YEAR, or false if invalid date format
-        */
-       function UnixDate($v)
-       {
-               return ADOConnection::UnixDate($v);
-       }
-       
-
-       /**
-        * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
-        *
-        * @return date in unix timestamp format, or 0 if before 
TIMESTAMP_FIRST_YEAR, or false if invalid date format
-        */
-       function UnixTimeStamp($v)
-       {
-               return ADOConnection::UnixTimeStamp($v);
-       }
-       
-       
-       /**
-       * 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->_numOfFields;
-       }
-       
-       /**
-       * 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) {
-                       $false = false;
-                       return $false;
-               }
-               $arr = $this->fields;
-               $this->_currentRow++;
-               if (!$this->_fetch()) $this->EOF = true;
-               return $arr;
-       }
-       
-       
-       /**
-       * Fetch a row, returning PEAR_Error if no more rows. 
-       * This is PEAR DB compat mode.
-       *
-       * @return DB_OK or error object
-       */
-       function FetchInto(&$arr)
-       {
-               if ($this->EOF) return (defined('PEAR_ERROR_RETURN')) ? new 
PEAR_Error('EOF',-1): false;
-               $arr = $this->fields;
-               $this->MoveNext();
-               return 1; // DB_OK
-       }
-       
-       
-       /**
-        * Move to the first row in the recordset. Many databases do NOT 
support this.
-        *
-        * @return true or false
-        */
-       function MoveFirst() 
-       {
-               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);
-               if ($this->EOF) return false;
-               while (!$this->EOF) {
-                       $f = $this->fields;
-                       $this->MoveNext();
-               }
-               $this->fields = $f;
-               $this->EOF = false;
-               return true;
-       }
-       
-       
-       /**
-        * Move to next record in the recordset.
-        *
-        * @return true if there still rows available, or false if there are no 
more rows (EOF).
-        */
-       function MoveNext() 
-       {
-               if (!$this->EOF) {
-                       $this->_currentRow++;
-                       if ($this->_fetch()) return true;
-               }
-               $this->EOF = true;
-               /* -- tested error handling when scrolling cursor -- seems 
useless.
-               $conn = $this->connection;
-               if ($conn && $conn->raiseErrorFn && ($errno = 
$conn->ErrorNo())) {
-                       $fn = $conn->raiseErrorFn;
-                       
$fn($conn->databaseType,'MOVENEXT',$errno,$conn->ErrorMsg().' 
('.$this->sql.')',$conn->host,$conn->database);
-               }
-               */
-               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) 
-       {
-               $this->EOF = false;
-               if ($rowNumber == $this->_currentRow) return true;
-               if ($rowNumber >= $this->_numOfRows)
-                       if ($this->_numOfRows != -1) $rowNumber = 
$this->_numOfRows-2;
-                               
-               if ($this->canSeek) { 
-       
-                       if ($this->_seek($rowNumber)) {
-                               $this->_currentRow = $rowNumber;
-                               if ($this->_fetch()) {
-                                       return true;
-                               }
-                       } else {
-                               $this->EOF = true;
-                               return false;
-                       }
-               } else {
-                       if ($rowNumber < $this->_currentRow) return false;
-                       global $ADODB_EXTENSION;
-                       if ($ADODB_EXTENSION) {
-                               while (!$this->EOF && $this->_currentRow < 
$rowNumber) {
-                                       adodb_movenext($this);
-                               }
-                       } else {
-                       
-                               while (! $this->EOF && $this->_currentRow < 
$rowNumber) {
-                                       $this->_currentRow++;
-                                       
-                                       if (!$this->_fetch()) $this->EOF = true;
-                               }
-                       }
-                       return !($this->EOF);
-               }
-               
-               $this->fields = false;  
-               $this->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];
-       }
-       
-       function GetAssocKeys($upper=true)
-       {
-               $this->bind = array();
-               for ($i=0; $i < $this->_numOfFields; $i++) {
-                       $o =& $this->FetchField($i);
-                       if ($upper === 2) $this->bind[$o->name] = $i;
-                       else $this->bind[($upper) ? strtoupper($o->name) : 
strtolower($o->name)] = $i;
-               }
-       }
-       
-  /**
-   * Use associative array to get fields array for databases that do not 
support
-   * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
-   *
-   * If you don't want uppercase cols, set $ADODB_FETCH_MODE = 
ADODB_FETCH_ASSOC
-   * before you execute your SQL statement, and access $rs->fields['col'] 
directly.
-   *
-   * $upper  0 = lowercase, 1 = uppercase, 2 = whatever is returned by 
FetchField
-   */
-       function &GetRowAssoc($upper=1)
-       {
-               $record = array();
-        //     if (!$this->fields) return $record;
-               
-               if (!$this->bind) {
-                       $this->GetAssocKeys($upper);
-               }
-               
-               foreach($this->bind as $k => $v) {
-                       $record[$k] = $this->fields[$v];
-               }
-
-               return $record;
-       }
-       
-       
-       /**
-        * Clean up recordset
-        *
-        * @return true or false
-        */
-       function Close() 
-       {
-               // free connection object - this seems to globally free the 
object
-               // and not merely the reference, so don't do this...
-               // $this->connection = false; 
-               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;}
-       
-       
-       /*
-       * If we are using PageExecute(), this will return the maximum possible 
rows
-       * that can be returned when paging a recordset.
-       */
-       function MaxRecordCount()
-       {
-               return ($this->_maxRecordCount) ? $this->_maxRecordCount : 
$this->RecordCount();
-       }
-       
-       /**
-        * synonyms RecordCount and RowCount    
-        *
-        * @return the number of rows or -1 if this is not supported
-        */
-       function RowCount() {return $this->_numOfRows;} 
-       
-
-        /**
-        * Portable RecordCount. Pablo Roca <address@hidden>
-        *
-        * @return  the number of records from a previous SELECT. All databases 
support this.
-        *
-        * But aware possible problems in multiuser environments. For better 
speed the table
-        * must be indexed by the condition. Heavy test this before deploying.
-        */ 
-       function PO_RecordCount($table="", $condition="") {
-               
-               $lnumrows = $this->_numOfRows;
-               // the database doesn't support native recordcount, so we do a 
workaround
-               if ($lnumrows == -1 && $this->connection) {
-                       IF ($table) {
-                               if ($condition) $condition = " WHERE " . 
$condition; 
-                               $resultrows = 
&$this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
-                               if ($resultrows) $lnumrows = 
reset($resultrows->fields);
-                       }
-               }
-               return $lnumrows;
-       }
-       
-       /**
-        * @return the current row in the recordset. If at EOF, will return the 
last row. 0-based.
-        */
-       function CurrentRow() {return $this->_currentRow;}
-       
-       /**
-        * synonym for CurrentRow -- for ADO compat
-        *
-        * @return the current row in the recordset. If at EOF, will return the 
last row. 0-based.
-        */
-       function AbsolutePosition() {return $this->_currentRow;}
-       
-       /**
-        * @return the number of columns in the recordset. Some databases will 
set this to 0
-        * if no records are returned, others will return the number of columns 
in the query.
-        */
-       function FieldCount() {return $this->_numOfFields;}   
-
-
-       /**
-        * 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
-       }       
-       
-       /**
-        * Get the ADOFieldObjects of all columns in an array.
-        *
-        */
-       function& FieldTypesArray()
-       {
-               $arr = array();
-               for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
-                       $arr[] = $this->FetchField($i);
-               return $arr;
-       }
-       
-       /**
-       * Return the fields array of the current row as an object for 
convenience.
-       * The default case is lowercase field names.
-       *
-       * @return the object with the properties set to the fields of the 
current row
-       */
-       function &FetchObj()
-       {
-               $o =& $this->FetchObject(false);
-               return $o;
-       }
-       
-       /**
-       * Return the fields array of the current row as an object for 
convenience.
-       * The default case is uppercase.
-       * 
-       * @param $isupper to set the object property names to uppercase
-       *
-       * @return the object with the properties set to the fields of the 
current row
-       */
-       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.
-       * The default is lower-case field names.
-       * 
-       * @return the object with the properties set to the fields of the 
current row,
-       *       or false if EOF
-       *
-       * Fixed bug reported by address@hidden
-       */
-       function &FetchNextObj()
-       {
-               $o = $this->FetchNextObject(false);
-               return $o;
-       }
-       
-       
-       /**
-       * Return the fields array of the current row as an object for 
convenience. 
-       * The default is upper case field names.
-       * 
-       * @param $isupper to set the object property names to uppercase
-       *
-       * @return the object with the properties set to the fields of the 
current row,
-       *       or false if EOF
-       *
-       * Fixed bug reported by address@hidden
-       */
-       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 < 250 chars
-        *      X for teXt (>= 250 chars)
-        *      B for Binary
-        *      N for numeric or 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)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-       // changed in 2.32 to hashing instead of switch stmt for speed...
-       static $typeMap = array(
-               'VARCHAR' => 'C',
-               'VARCHAR2' => 'C',
-               'CHAR' => 'C',
-               'C' => 'C',
-               'STRING' => 'C',
-               'NCHAR' => 'C',
-               'NVARCHAR' => 'C',
-               'VARYING' => 'C',
-               'BPCHAR' => 'C',
-               'CHARACTER' => 'C',
-               'INTERVAL' => 'C',  # Postgres
-               ##
-               'LONGCHAR' => 'X',
-               'TEXT' => 'X',
-               'NTEXT' => 'X',
-               'M' => 'X',
-               'X' => 'X',
-               'CLOB' => 'X',
-               'NCLOB' => 'X',
-               'LVARCHAR' => 'X',
-               ##
-               'BLOB' => 'B',
-               'IMAGE' => 'B',
-               'BINARY' => 'B',
-               'VARBINARY' => 'B',
-               'LONGBINARY' => 'B',
-               'B' => 'B',
-               ##
-               'YEAR' => 'D', // mysql
-               'DATE' => 'D',
-               'D' => 'D',
-               ##
-               'TIME' => 'T',
-               'TIMESTAMP' => 'T',
-               'DATETIME' => 'T',
-               'TIMESTAMPTZ' => 'T',
-               'T' => 'T',
-               ##
-               'BOOL' => 'L',
-               'BOOLEAN' => 'L', 
-               'BIT' => 'L',
-               'L' => 'L',
-               ##
-               'COUNTER' => 'R',
-               'R' => 'R',
-               'SERIAL' => 'R', // ifx
-               'INT IDENTITY' => 'R',
-               ##
-               'INT' => 'I',
-               'INTEGER' => 'I',
-               'INTEGER UNSIGNED' => 'I',
-               'SHORT' => 'I',
-               'TINYINT' => 'I',
-               'SMALLINT' => 'I',
-               'I' => 'I',
-               ##
-               'LONG' => 'N', // interbase is numeric, oci8 is blob
-               'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
-               'DECIMAL' => 'N',
-               'DEC' => 'N',
-               'REAL' => 'N',
-               'DOUBLE' => 'N',
-               'DOUBLE PRECISION' => 'N',
-               'SMALLFLOAT' => 'N',
-               'FLOAT' => 'N',
-               'NUMBER' => 'N',
-               'NUM' => 'N',
-               'NUMERIC' => 'N',
-               'MONEY' => 'N',
-               
-               ## informix 9.2
-               'SQLINT' => 'I', 
-               'SQLSERIAL' => 'I', 
-               'SQLSMINT' => 'I', 
-               'SQLSMFLOAT' => 'N', 
-               'SQLFLOAT' => 'N', 
-               'SQLMONEY' => 'N', 
-               'SQLDECIMAL' => 'N', 
-               'SQLDATE' => 'D', 
-               'SQLVCHAR' => 'C', 
-               'SQLCHAR' => 'C', 
-               'SQLDTIME' => 'T', 
-               'SQLINTERVAL' => 'N', 
-               'SQLBYTES' => 'B', 
-               'SQLTEXT' => 'X' 
-               );
-               
-               $tmap = false;
-               $t = strtoupper($t);
-               $tmap = @$typeMap[$t];
-               switch ($tmap) {
-               case 'C':
-               
-                       // is the char field is too long, return as text 
field... 
-                       if ($this->blobSize >= 0) {
-                               if ($len > $this->blobSize) return 'X';
-                       } else if ($len > 250) {
-                               return 'X';
-                       }
-                       return 'C';
-                       
-               case 'I':
-                       if (!empty($fieldobj->primary_key)) return 'R';
-                       return 'I';
-               
-               case false:
-                       return 'N';
-                       
-               case 'B':
-                        if (isset($fieldobj->binary)) 
-                                return ($fieldobj->binary) ? 'B' : 'X';
-                       return 'B';
-               
-               case 'D':
-                       if (!empty($this->datetime)) return 'T';
-                       return 'D';
-                       
-               default: 
-                       if ($t == 'LONG' && $this->dataProvider == 'oci8') 
return 'B';
-                       return $tmap;
-               }
-       }
-       
-       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;
-       }
-       
-       function LastPageNo($page = false)
-       {
-               if ($page != false) $this->_lastPageNo = $page;
-               return $this->_lastPageNo;
-       }
-       
-       /**
-        * 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
-       
-       
//==============================================================================================
        
-       // CLASS ADORecordSet_array
-       
//==============================================================================================
        
-       
-       /**
-        * This class encapsulates the concept of a recordset created in memory
-        * as an array. This is useful for the creation of cached recordsets.
-        * 
-        * Note that the constructor is different from the standard ADORecordSet
-        */
-       
-       class ADORecordSet_array extends ADORecordSet
-       {
-               var $databaseType = 'array';
-
-               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 = '';
-               var $compat = false;
-               /**
-                * Constructor
-                *
-                */
-               function ADORecordSet_array($fakeid=1)
-               {
-               global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
-               
-                       // fetch() on EOF does not delete $this->fields
-                       $this->compat = !empty($ADODB_COMPAT_FETCH);
-                       $this->ADORecordSet($fakeid); // fake queryID           
-                       $this->fetchMode = $ADODB_FETCH_MODE;
-               }
-               
-               
-               /**
-                * Setup the array.
-                *
-                * @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->_skiprow1 = true;
-                               $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 &GetArray($nRows=-1)
-               {
-                       if ($nRows == -1 && $this->_currentRow <= 0 && 
!$this->_skiprow1) {
-                               return $this->_array;
-                       } else {
-                               $arr =& ADORecordSet::GetArray($nRows);
-                               return $arr;
-                       }
-               }
-               
-               function _initrs()
-               {
-                       $this->_numOfRows =  sizeof($this->_array);
-                       if ($this->_skiprow1) $this->_numOfRows -= 1;
-               
-                       $this->_numOfFields =(isset($this->_fieldobjects)) ?
-                                
sizeof($this->_fieldobjects):sizeof($this->_types);
-               }
-               
-               /* Use associative array to get fields array */
-               function Fields($colname)
-               {
-                       $mode = isset($this->adodbFetchMode) ? 
$this->adodbFetchMode : $this->fetchMode;
-                       if ($mode & ADODB_FETCH_ASSOC) {
-                               if (!isset($this->fields[$colname])) $colname = 
strtolower($colname);
-                               return $this->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)
-               {
-                       if (sizeof($this->_array) && 0 <= $row && $row < 
$this->_numOfRows) {
-                               $this->_currentRow = $row;
-                               if ($this->_skiprow1) $row += 1;
-                               $this->fields = $this->_array[$row];
-                               return true;
-                       }
-                       return false;
-               }
-               
-               function MoveNext() 
-               {
-                       if (!$this->EOF) {              
-                               $this->_currentRow++;
-                               
-                               $pos = $this->_currentRow;
-                               
-                               if ($this->_numOfRows <= $pos) {
-                                       if (!$this->compat) $this->fields = 
false;
-                               } else {
-                                       if ($this->_skiprow1) $pos += 1;
-                                       $this->fields = $this->_array[$pos];
-                                       return true;
-                               }               
-                               $this->EOF = true;
-                       }
-                       
-                       return false;
-               }       
-       
-               function _fetch()
-               {
-                       $pos = $this->_currentRow;
-                       
-                       if ($this->_numOfRows <= $pos) {
-                               if (!$this->compat) $this->fields = false;
-                               return false;
-                       }
-                       if ($this->_skiprow1) $pos += 1;
-                       $this->fields = $this->_array[$pos];
-                       return true;
-               }
-               
-               function _close() 
-               {
-                       return true;    
-               }
-       
-       } // ADORecordSet_array
-
-       
//==============================================================================================
        
-       // HELPER FUNCTIONS
-       
//==============================================================================================
                        
-       
-       /**
-        * Synonym for ADOLoadCode. Private function. Do not use.
-        *
-        * @deprecated
-        */
-       function ADOLoadDB($dbType) 
-       { 
-               return ADOLoadCode($dbType);
-       }
-               
-       /**
-        * Load the code for a specific database driver. Private function. Do 
not use.
-        */
-       function ADOLoadCode($dbType) 
-       {
-       global $ADODB_LASTDB;
-       
-               if (!$dbType) return false;
-               $db = strtolower($dbType);
-               switch ($db) {
-                       case 'ifx':
-                       case 'maxsql': $db = 'mysqlt'; break;
-                       case 'postgres':
-                       case 'pgsql': $db = 'postgres7'; break;
-               }
-               @include_once(ADODB_DIR."/drivers/adodb-".$db.".inc.php");
-               $ADODB_LASTDB = $db;
-               
-               $ok = class_exists("ADODB_" . $db);
-               if ($ok) return $db;
-               
-               print_r(get_declared_classes());
-               $file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
-               if (!file_exists($file)) ADOConnection::outp("Missing file: 
$file");
-               else ADOConnection::outp("Syntax error in file: $file");
-               return false;
-       }
-
-       /**
-        * synonym for ADONewConnection for people like me who cannot remember 
the correct name
-        */
-       function &NewADOConnection($db='')
-       {
-               $tmp =& ADONewConnection($db);
-               return $tmp;
-       }
-       
-       /**
-        * 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_NEWCONNECTION, $ADODB_LASTDB;
-               
-               if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
-               $errorfn = (defined('ADODB_ERROR_HANDLER')) ? 
ADODB_ERROR_HANDLER : false;
-               $false = false;
-               if (strpos($db,'://')) {
-                       $origdsn = $db;
-                       $dsna = @parse_url($db);
-                       if (!$dsna) {
-                               // special handling of oracle, which might not 
have host
-                               $db = str_replace('@/','@adodb-fakehost/',$db);
-                               $dsna = parse_url($db);
-                               if (!$dsna) return $false;
-                               $dsna['host'] = '';
-                       }
-                       $db = @$dsna['scheme'];
-                       if (!$db) return $false;
-                       $dsna['host'] = isset($dsna['host']) ? 
rawurldecode($dsna['host']) : '';
-                       $dsna['user'] = isset($dsna['user']) ? 
rawurldecode($dsna['user']) : '';
-                       $dsna['pass'] = isset($dsna['pass']) ? 
rawurldecode($dsna['pass']) : '';
-                       $dsna['path'] = isset($dsna['path']) ? 
rawurldecode(substr($dsna['path'],1)) : '';
-                       
-                       if (isset($dsna['query'])) {
-                               $opt1 = explode('&',$dsna['query']);
-                               foreach($opt1 as $k => $v) {
-                                       $arr = explode('=',$v);
-                                       $opt[$arr[0]] = isset($arr[1]) ? 
rawurldecode($arr[1]) : 1;
-                               }
-                       } else $opt = array();
-               }
-               
-       /*
-        *  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
-        */
-               if (!empty($ADODB_NEWCONNECTION)) {
-                       $obj = $ADODB_NEWCONNECTION($db);
-
-               } else {
-               
-                       if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
-                       if (empty($db)) $db = $ADODB_LASTDB;
-                       
-                       if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
-                       
-                       if (!$db) {
-                               if (isset($origdsn)) $db = $origdsn;
-                               if ($errorfn) {
-                                       // raise an error
-                                       $ignore = false;
-                                       $errorfn('ADONewConnection', 
'ADONewConnection', -998,
-                                                        "could not load the 
database driver for '$db'",
-                                                        $db,false,$ignore);
-                               } else
-                                        ADOConnection::outp( 
"<p>ADONewConnection: Unable to load database driver '$db'</p>",false);
-                                       
-                               return $false;
-                       }
-                       
-                       $cls = 'ADODB_'.$db;
-                       if (!class_exists($cls)) {
-                               adodb_backtrace();
-                               return $false;
-                       }
-                       
-                       $obj =& new $cls();
-               }
-               
-               # constructor should not fail
-               if ($obj) {
-                       if ($errorfn)  $obj->raiseErrorFn = $errorfn;
-                       if (isset($dsna)) {
-                       
-                               foreach($opt as $k => $v) {
-                                       switch(strtolower($k)) {
-                                       case 'persist':
-                                       case 'persistent':      $persist = $v; 
break;
-                                       case 'debug':           $obj->debug = 
(integer) $v; break;
-                                       #ibase
-                                       case 'dialect':         $obj->dialect = 
(integer) $v; break;
-                                       case 'charset':         $obj->charset = 
$v; break;
-                                       case 'buffers':         $obj->buffers = 
$v; break;
-                                       case 'fetchmode':   
$obj->SetFetchMode($v); break;
-                                       #ado
-                                       case 'charpage':        $obj->charPage 
= $v; break;
-                                       #mysql, mysqli
-                                       case 'clientflags': $obj->clientFlags = 
$v; break;
-                                       #mysqli
-                                       case 'port': $obj->port = $v; break;
-                                       case 'socket': $obj->socket = $v; break;
-                                       #oci8
-                                       case 'nls_date_format': 
$obj->NLS_DATE_FORMAT = $v; break;
-                                       }
-                               }
-                               if (empty($persist))
-                                       $ok = $obj->Connect($dsna['host'], 
$dsna['user'], $dsna['pass'], $dsna['path']);
-                               else
-                                       $ok = $obj->PConnect($dsna['host'], 
$dsna['user'], $dsna['pass'], $dsna['path']);
-                                       
-                               if (!$ok) return $false;
-                       }
-               }
-               return $obj;
-       }
-       
-       
-       
-       // $perf == true means called by NewPerfMonitor()
-       function _adodb_getdriver($provider,$drivername,$perf=false)
-       {
-               switch ($provider) {
-               case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return 
substr($drivername,6); 
-               case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return 
substr($drivername,5); 
-               case 'ado'  :   if (strncmp('ado_',$drivername,4)==0) return 
substr($drivername,4);
-               case 'native':  break;
-               default:
-                       return $provider;
-               }
-               
-               switch($drivername) {
-               case 'oracle': $drivername = 'oci8'; break;
-               case 'access': if ($perf) $drivername = ''; break;
-               case 'db2'   : break;
-               case 'sapdb' : break;
-               default:
-                       $drivername = 'generic';
-                       break;
-               }
-               return $drivername;
-       }
-       
-       function &NewPerfMonitor(&$conn)
-       {
-               $false = false;
-               $drivername = 
_adodb_getdriver($conn->dataProvider,$conn->databaseType,true);
-               if (!$drivername || $drivername == 'generic') return $false;
-               include_once(ADODB_DIR.'/adodb-perf.inc.php');
-               @include_once(ADODB_DIR."/perf/perf-$drivername.inc.php");
-               $class = "Perf_$drivername";
-               if (!class_exists($class)) return $false;
-               $perf =& new $class($conn);
-               
-               return $perf;
-       }
-       
-       function &NewDataDictionary(&$conn,$drivername=false)
-       {
-               $false = false;
-               if (!$drivername) $drivername = 
_adodb_getdriver($conn->dataProvider,$conn->databaseType);
-
-               include_once(ADODB_DIR.'/adodb-lib.inc.php');
-               include_once(ADODB_DIR.'/adodb-datadict.inc.php');
-               $path = ADODB_DIR."/datadict/datadict-$drivername.inc.php";
-
-               if (!file_exists($path)) {
-                       ADOConnection::outp("Database driver '$path' not 
available");
-                       return $false;
-               }
-               include_once($path);
-               $class = "ADODB2_$drivername";
-               $dict =& new $class();
-               $dict->dataProvider = $conn->dataProvider;
-               $dict->connection = &$conn;
-               $dict->upperName = strtoupper($drivername);
-               $dict->quote = $conn->nameQuote;
-               if (!empty($conn->_connectionID))
-                       $dict->serverInfo = $conn->ServerInfo();
-               
-               return $dict;
-       }
-
-
-       
-       /*
-               Perform a print_r, with pre tags for better formatting.
-       */
-       function adodb_pr($var,$as_string=false)
-       {
-               if ($as_string) ob_start();
-               
-               if (isset($_SERVER['HTTP_USER_AGENT'])) { 
-                       echo " <pre>\n";print_r($var);echo "</pre>\n";
-               } else
-                       print_r($var);
-                       
-               if ($as_string) {
-                       $s = ob_get_contents();
-                       ob_end_clean();
-                       return $s;
-               }
-       }
-       
-       /*
-               Perform a stack-crawl and pretty print it.
-               
-               @param printOrArr  Pass in a boolean to indicate print, or an 
$exception->trace array (assumes that print is true then).
-               @param levels Number of levels to display
-       */
-       function adodb_backtrace($printOrArr=true,$levels=9999)
-       {
-               global $ADODB_INCLUDED_LIB;
-               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
-               return _adodb_backtrace($printOrArr,$levels);
-       }
-       
-} // defined
-?>
\ No newline at end of file
+<?php 
+/*
+ * Set tabs to 4 for best viewing.
+ * 
+ * Latest version is available at http://adodb.sourceforge.net
+ * 
+ * This is the main include file for ADOdb.
+ * Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
+ *
+ * The ADOdb files are formatted so that doxygen can be used to generate 
documentation.
+ * Doxygen is a documentation generation tool and can be downloaded from 
http://doxygen.org/
+ */
+
+/**
+       \mainpage       
+       
+        @version V4.72 21 Feb 2006  (c) 2000-2006 John Lim 
(jlim#natsoft.com.my). All rights reserved.
+
+       Released under both BSD license and Lesser GPL library license. You can 
choose which license
+       you prefer.
+       
+       PHP's database access functions are not standardised. This creates a 
need for a database 
+       class library to hide the differences between the different database 
API's (encapsulate 
+       the differences) so we can easily switch databases.
+
+       We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, 
Sybase SQL Anywhere, DB2,
+       Informix, PostgreSQL, FrontBase, Interbase (Firebird and Borland 
variants), Foxpro, Access,
+       ADO, SAP DB, SQLite and ODBC. We have had successful reports of 
connecting to Progress and
+       other databases via ODBC.
+
+       Latest Download at http://adodb.sourceforge.net/
+         
+ */
+ 
+ if (!defined('_ADODB_LAYER')) {
+       define('_ADODB_LAYER',1);
+       
+       
//==============================================================================================
        
+       // CONSTANT DEFINITIONS
+       
//==============================================================================================
        
+
+
+       /** 
+        * Set ADODB_DIR to the directory where this file resides...
+        * This constant was formerly called $ADODB_RootPath
+        */
+       if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__));
+       
+       
//==============================================================================================
        
+       // GLOBAL VARIABLES
+       
//==============================================================================================
        
+
+       GLOBAL 
+               $ADODB_vers,            // database version
+               $ADODB_COUNTRECS,       // count number of records returned - 
slows down query
+               $ADODB_CACHE_DIR,       // directory to cache recordsets
+               $ADODB_EXTENSION,   // ADODB extension installed
+               $ADODB_COMPAT_FETCH, // If $ADODB_COUNTRECS and this is true, 
$rs->fields is available on EOF
+               $ADODB_FETCH_MODE;      // DEFAULT, NUM, ASSOC or BOTH. Default 
follows native driver default...
+       
+       
//==============================================================================================
        
+       // GLOBAL SETUP
+       
//==============================================================================================
        
+       
+       $ADODB_EXTENSION = defined('ADODB_EXTENSION');
+       
+       //********************************************************//
+       /*
+       Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
+       Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, 
nuko#mbnet.fi
+
+               0 = ignore empty fields. All empty fields in array are ignored.
+               1 = force null. All empty, php null and string 'null' fields 
are changed to sql NULL values.
+               2 = force empty. All empty, php null and string 'null' fields 
are changed to sql empty '' or 0 values.
+               3 = force value. Value is left as it is. Php null and string 
'null' are set to sql NULL values and empty fields '' are set to empty '' sql 
values.
+       */
+        define('ADODB_FORCE_IGNORE',0);
+        define('ADODB_FORCE_NULL',1);
+        define('ADODB_FORCE_EMPTY',2);
+        define('ADODB_FORCE_VALUE',3);
+    //********************************************************//
+
+
+       if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
+               
+               define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL 
invalid. Try using $connection->debug=true;</p>');
+       
+       // allow [ ] @ ` " and . in table names
+               define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"address@hidden)');
+       
+       // prefetching used by oracle
+               if (!defined('ADODB_PREFETCH_ROWS')) 
define('ADODB_PREFETCH_ROWS',10);
+       
+       
+       /*
+       Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native 
case-names.
+       This currently works only with mssql, odbc, oci8po and ibase derived 
drivers.
+       
+               0 = assoc lowercase field names. $rs->fields['orderid']
+               1 = assoc uppercase field names. $rs->fields['ORDERID']
+               2 = use native-case field names. $rs->fields['OrderID']
+       */
+       
+               define('ADODB_FETCH_DEFAULT',0);
+               define('ADODB_FETCH_NUM',1);
+               define('ADODB_FETCH_ASSOC',2);
+               define('ADODB_FETCH_BOTH',3);
+               
+               if (!defined('TIMESTAMP_FIRST_YEAR')) 
define('TIMESTAMP_FIRST_YEAR',100);
+       
+               // PHP's version scheme makes converting to numbers difficult - 
workaround
+               $_adodb_ver = (float) PHP_VERSION;
+               if ($_adodb_ver >= 5.0) {
+                       define('ADODB_PHPVER',0x5000);
+               } else if ($_adodb_ver > 4.299999) { # 4.3
+                       define('ADODB_PHPVER',0x4300);
+               } else if ($_adodb_ver > 4.199999) { # 4.2
+                       define('ADODB_PHPVER',0x4200);
+               } else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
+                       define('ADODB_PHPVER',0x4050);
+               } else {
+                       define('ADODB_PHPVER',0x4000);
+               }
+       }
+       
+       //if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
+
+       
+       /**
+               Accepts $src and $dest arrays, replacing string $data
+       */
+       function ADODB_str_replace($src, $dest, $data)
+       {
+               if (ADODB_PHPVER >= 0x4050) return 
str_replace($src,$dest,$data);
+               
+               $s = reset($src);
+               $d = reset($dest);
+               while ($s !== false) {
+                       $data = str_replace($s,$d,$data);
+                       $s = next($src);
+                       $d = next($dest);
+               }
+               return $data;
+       }
+       
+       function ADODB_Setup()
+       {
+       GLOBAL 
+               $ADODB_vers,            // database version
+               $ADODB_COUNTRECS,       // count number of records returned - 
slows down query
+               $ADODB_CACHE_DIR,       // directory to cache recordsets
+               $ADODB_FETCH_MODE,
+               $ADODB_FORCE_TYPE;
+               
+               $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
+               $ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
+
+
+               if (!isset($ADODB_CACHE_DIR)) {
+                       $ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? 
$_ENV['TMP'] : '/tmp';
+               } else {
+                       // do not accept url based paths, eg. http:/ or ftp:/
+                       if (strpos($ADODB_CACHE_DIR,'://') !== false) 
+                               die("Illegal path http:// or ftp://";);
+               }
+               
+                       
+               // Initialize random number generator for randomizing cache 
flushes
+               srand(((double)microtime())*1000000);
+               
+               /**
+                * ADODB version as a string.
+                */
+               $ADODB_vers = 'V4.72 21 Feb 2006  (c) 2000-2006 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
+                * for databases that provide "virtual" recordcounts...
+                */
+               if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
+       }
+       
+       
+       
//==============================================================================================
        
+       // CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
+       
//==============================================================================================
        
+       
+       ADODB_Setup();
+
+       
//==============================================================================================
        
+       // CLASS ADOFieldObject
+       
//==============================================================================================
        
+       /**
+        * Helper class for FetchFields -- holds info on a column
+        */
+       class ADOFieldObject { 
+               var $name = '';
+               var $max_length=0;
+               var $type="";
+/*
+               // additional fields by dannym... (address@hidden)
+               var $not_null = false; 
+               // actually, this has already been built-in in the postgres, 
fbsql AND mysql module? ^-^
+               // so we can as well make not_null standard (leaving it at 
"false" does not harm anyways)
+
+               var $has_default = false; // this one I have done only in mysql 
and postgres for now ... 
+                       // others to come (dannym)
+               var $default_value; // default, if any, and supported. Check 
has_default first.
+*/
+       }
+       
+
+       
+       function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, 
&$thisConnection)
+       {
+               //print "Errorno ($fn errno=$errno m=$errmsg) ";
+               $thisConnection->_transOK = false;
+               if ($thisConnection->_oldRaiseFn) {
+                       $fn = $thisConnection->_oldRaiseFn;
+                       $fn($dbms, $fn, $errno, $errmsg, $p1, 
$p2,$thisConnection);
+               }
+       }
+       
+       
//==============================================================================================
        
+       // CLASS ADOConnection
+       
//==============================================================================================
        
+       
+       /**
+        * 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. For 
security, we no longer store it.
+       var $debug = false;             /// if set to true will output sql 
statements
+       var $maxblobsize = 262144;      /// maximum size of blobs or large text 
fields (262144 = 256K)-- some db's die otherwise like foxpro
+       var $concat_operator = '+'; /// default concat operator -- change to || 
for Oracle/Interbase    
+       var $substr = 'substr';         /// substring operator
+       var $length = 'length';         /// string length ofperator
+       var $random = 'rand()';         /// random function
+       var $upperCase = 'upper';               /// uppercase function
+       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 $nameQuote = '"';           /// string to use to quote identifiers 
and names
+       var $charSet=false;             /// character set to use - only for 
interbase, postgres and oci8
+       var $metaDatabasesSQL = '';
+       var $metaTablesSQL = '';
+       var $uniqueOrderBy = false; /// All order by columns have to be unique
+       var $emptyDate = '&nbsp;';
+       var $emptyTimeStamp = '&nbsp;';
+       var $lastInsID = false;
+       //--
+       var $hasInsertID = false;               /// supports autoincrement ID?
+       var $hasAffectedRows = false;   /// supports affected rows for 
update/delete?
+       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 
- used by phpLens
+       var $hasMoveFirst = false;  /// has ability to run MoveFirst(), 
scrolling backwards
+       var $hasGenID = false;          /// can generate sequences using 
GenID();
+       var $hasTransactions = true; /// has transactions
+       //--
+       var $genID = 0;                         /// sequence id used by GenID();
+       var $raiseErrorFn = false;      /// error function to call
+       var $isoDates = false; /// accepts dates in ISO format
+       var $cacheSecs = 3600; /// cache for 1 hour
+       var $sysDate = false; /// name of function that returns the current date
+       var $sysTimeStamp = false; /// name of function that returns the 
current timestamp
+       var $arrayClass = 'ADORecordSet_array'; /// name of class used to 
generate array recordsets, which are pre-downloaded recordsets
+       
+       var $noNullStrings = false; /// oracle specific stuff - if true ensures 
that '' is converted to ' '
+       var $numCacheHits = 0; 
+       var $numCacheMisses = 0;
+       var $pageExecuteCountRows = true;
+       var $uniqueSort = false; /// indicates that all fields in order by must 
be unique
+       var $leftOuter = false; /// operator to use for left outer join in 
WHERE clause
+       var $rightOuter = false; /// operator to use for right outer join in 
WHERE clause
+       var $ansiOuter = false; /// whether ansi outer join syntax supported
+       var $autoRollback = false; // autoRollback on PConnect().
+       var $poorAffectedRows = false; // affectedRows not working or unreliable
+       
+       var $fnExecute = false;
+       var $fnCacheExecute = false;
+       var $blobEncodeType = false; // false=not required, 'I'=encode to 
integer, 'C'=encode to char
+       var $rsPrefix = "ADORecordSet_";
+       
+       var $autoCommit = true;         /// do not modify this yourself - 
actually private
+       var $transOff = 0;                      /// temporarily disable 
transactions
+       var $transCnt = 0;                      /// count of nested transactions
+       
+       var $fetchMode=false;
+        //
+        // PRIVATE VARS
+        //
+       var $_oldRaiseFn =  false;
+       var $_transOK = null;
+       var $_connectionID      = false;        /// The returned link 
identifier whenever a successful database connection is made.     
+       var $_errorMsg = false;         /// A variable which was used to keep 
the returned last error message.  The value will
+                                                               /// then 
returned by the errorMsg() function    
+       var $_errorCode = false;        /// Last error code, not guaranteed to 
be used - only by oci8                                   
+       var $_queryID = false;          /// This variable keeps the last 
created result link identifier
+       
+       var $_isPersistentConnection = false;   /// A boolean variable to state 
whether its a persistent connection or normal connection.       */
+       var $_bindInputArray = false; /// set to true if 
ADOConnection.Execute() permits binding of array parameters.
+       var $_evalAll = false;
+       var $_affected = false;
+       var $_logsql = false;
+
+       
+       /**
+        * Constructor
+        */
+       function ADOConnection()                        
+       {
+               die('Virtual Class -- cannot instantiate');
+       }
+       
+       function Version()
+       {
+       global $ADODB_vers;
+       
+               return (float) substr($ADODB_vers,1);
+       }
+       
+       /**
+               Get server version info...
+               
+               @returns An array with 2 elements: $arr['string'] is the 
description string, 
+                       and $arr[version] is the version (also a string).
+       */
+       function ServerInfo()
+       {
+               return array('description' => '', 'version' => '');
+       }
+       
+       function IsConnected()
+       {
+       return !empty($this->_connectionID);
+       }
+       
+       function _findvers($str)
+       {
+               if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return 
$arr[1];
+               else return '';
+       }
+       
+       /**
+       * All error messages go through this bottleneck function.
+       * You can define your own handler by defining the function name in 
ADODB_OUTP.
+       */
+       function outp($msg,$newline=true)
+       {
+       global $ADODB_FLUSH,$ADODB_OUTP;
+       
+               if (defined('ADODB_OUTP')) {
+                       $fn = ADODB_OUTP;
+                       $fn($msg,$newline);
+                       return;
+               } else if (isset($ADODB_OUTP)) {
+                       $fn = $ADODB_OUTP;
+                       $fn($msg,$newline);
+                       return;
+               }
+               
+               if ($newline) $msg .= "<br>\n";
+               
+               if (isset($_SERVER['HTTP_USER_AGENT']) || !$newline) echo $msg;
+               else echo strip_tags($msg);
+       
+               
+               if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); 
//  do not flush if output buffering enabled - useless - thx to Jesse Mullan 
+               
+       }
+       
+       function Time()
+       {
+               $rs =& $this->_Execute("select $this->sysTimeStamp");
+               if ($rs && !$rs->EOF) return 
$this->UnixTimeStamp(reset($rs->fields));
+               
+               return false;
+       }
+       
+       /**
+        * Connect to database
+        *
+        * @param [argHostname]         Host to connect to
+        * @param [argUsername]         Userid to login
+        * @param [argPassword]         Associated password
+        * @param [argDatabaseName]     database
+        * @param [forceNew]            force new connection
+        *
+        * @return true or false
+        */       
+       function Connect($argHostname = "", $argUsername = "", $argPassword = 
"", $argDatabaseName = "", $forceNew = false) 
+       {
+               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; 
        
+               
+               $this->_isPersistentConnection = false; 
+               if ($forceNew) {
+                       if ($rez=$this->_nconnect($this->host, $this->user, 
$this->password, $this->database)) return true;
+               } else {
+                        if ($rez=$this->_connect($this->host, $this->user, 
$this->password, $this->database)) return true;
+               }
+               if (isset($rez)) {
+                       $err = $this->ErrorMsg();
+                       if (empty($err)) $err = "Connection error to server 
'$argHostname' with user '$argUsername'";
+                       $ret = false;
+               } else {
+                       $err = "Missing extension for ".$this->dataProvider;
+                       $ret = 0;
+               }
+               if ($fn = $this->raiseErrorFn) 
+                       
$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
+               
+               
+               $this->_connectionID = false;
+               if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
+               return $ret;
+       }       
+       
+       function _nconnect($argHostname, $argUsername, $argPassword, 
$argDatabaseName)
+       {
+               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabaseName);
+       }
+       
+       
+       /**
+        * Always force a new connection to database - currently only works 
with oracle
+        *
+        * @param [argHostname]         Host to connect to
+        * @param [argUsername]         Userid to login
+        * @param [argPassword]         Associated password
+        * @param [argDatabaseName]     database
+        *
+        * @return true or false
+        */       
+       function NConnect($argHostname = "", $argUsername = "", $argPassword = 
"", $argDatabaseName = "") 
+       {
+               return $this->Connect($argHostname, $argUsername, $argPassword, 
$argDatabaseName, true);
+       }
+       
+       /**
+        * 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 (defined('ADODB_NEVER_PERSIST')) 
+                       return 
$this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
+               
+               if ($argHostname != "") $this->host = $argHostname;
+               if ($argUsername != "") $this->user = $argUsername;
+               if ($argPassword != "") $this->password = $argPassword;
+               if ($argDatabaseName != "") $this->database = $argDatabaseName; 
        
+                       
+               $this->_isPersistentConnection = true;  
+               if ($rez = $this->_pconnect($this->host, $this->user, 
$this->password, $this->database)) return true;
+               if (isset($rez)) {
+                       $err = $this->ErrorMsg();
+                       if (empty($err)) $err = "Connection error to server 
'$argHostname' with user '$argUsername'";
+                       $ret = false;
+               } else {
+                       $err = "Missing extension for ".$this->dataProvider;
+                       $ret = 0;
+               }
+               if ($fn = $this->raiseErrorFn) {
+                       
$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
+               }
+               
+               $this->_connectionID = false;
+               if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
+               return $ret;
+       }
+
+       // Format date column in sql string given an input format that 
understands Y M D
+       function SQLDate($fmt, $col=false)
+       {       
+               if (!$col) $col = $this->sysDate;
+               return $col; // child class implement
+       }
+       
+       /**
+        * Should prepare the sql statement and return the stmt resource.
+        * For databases that do not support this, we return the $sql. To ensure
+        * 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 FALSE, or the prepared statement, or the original sql 
if
+        *                      if the database does not support prepare.
+        *
+        */     
+       function Prepare($sql)
+       {
+               return $sql;
+       }
+       
+       /**
+        * Some databases, eg. mssql require a different function for preparing
+        * stored procedures. So we cannot use Prepare().
+        *
+        * Should prepare the stored procedure  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:
+        *
+        * @param sql   SQL to send to database
+        *
+        * @return return FALSE, or the prepared statement, or the original sql 
if
+        *                      if the database does not support prepare.
+        *
+        */     
+       function PrepareSP($sql,$param=true)
+       {
+               return $this->Prepare($sql,$param);
+       }
+       
+       /**
+       * PEAR DB Compat
+       */
+       function Quote($s)
+       {
+               return $this->qstr($s,false);
+       }
+       
+       /**
+        Requested by "Karsten Dambekalns" <address@hidden>
+       */
+       function QMagic($s)
+       {
+               return $this->qstr($s,get_magic_quotes_gpc());
+       }
+
+       function q(&$s)
+       {
+               $s = $this->qstr($s,false);
+       }
+       
+       /**
+       * 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);
+       }
+
+       /**
+       *        Lock a row, will escalate and lock the table if row locking 
not supported
+       *       will normally free the lock at the end of the transaction
+       *
+       *  @param $table        name of table to lock
+       *  @param $where        where clause to use, eg: "WHERE row=12". If 
left empty, will escalate to table lock
+       */
+       function RowLock($table,$where)
+       {
+               return false;
+       }
+       
+       function CommitLock($table)
+       {
+               return $this->CommitTrans();
+       }
+       
+       function RollbackLock($table)
+       {
+               return $this->RollbackTrans();
+       }
+       
+       /**
+       * PEAR DB Compat - do not use internally. 
+       *
+       * The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are 
identical
+       *       for easy porting :-)
+       *
+       * @param mode   The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
+       * @returns              The previous fetch mode
+       */
+       function SetFetchMode($mode)
+       {       
+               $old = $this->fetchMode;
+               $this->fetchMode = $mode;
+               
+               if ($old === false) {
+               global $ADODB_FETCH_MODE;
+                       return $ADODB_FETCH_MODE;
+               }
+               return $old;
+       }
+       
+
+       /**
+       * PEAR DB Compat - do not use internally. 
+       */
+       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, $params=false)
+       {
+               $rs = &$this->SelectLimit($sql, $count, $offset, $params); 
+               if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+               return $rs;
+       }
+
+       
+       /**
+       * PEAR DB Compat - do not use internally
+       */
+       function Disconnect()
+       {
+               return $this->Close();
+       }
+       
+       /*
+                Returns placeholder for parameter, eg.
+                $DB->Param('a')
+                
+                will return ':a' for Oracle, and '?' for most other 
databases...
+                
+                For databases that require positioned params, eg $1, $2, $3 
for postgresql,
+                       pass in Param(false) before setting the first parameter.
+       */
+       function Param($name,$type='C')
+       {
+               return '?';
+       }
+       
+       /*
+               InParameter and OutParameter are self-documenting versions of 
Parameter().
+       */
+       function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
+       {
+               return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
+       }
+       
+       /*
+       */
+       function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
+       {
+               return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
+       
+       }
+       
+       /* 
+       Usage in oracle
+               $stmt = $db->Prepare('select * from table where id =:myid and 
group=:group');
+               $db->Parameter($stmt,$id,'myid');
+               $db->Parameter($stmt,$group,'group',64);
+               $db->Execute();
+               
+               @param $stmt Statement returned by Prepare() or PrepareSP().
+               @param $var PHP variable to bind to
+               @param $name Name of stored procedure variable name to bind to.
+               @param [$isOutput] Indicates direction of parameter 0/false=IN  
1=OUT  2= IN/OUT. This is ignored in oci8.
+               @param [$maxLen] Holds an maximum length of the variable.
+               @param [$type] The data type of $var. Legal values depend on 
driver.
+
+       */
+       function 
Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
+       {
+               return false;
+       }
+       
+       /**
+               Improved method of initiating a transaction. Used together with 
CompleteTrans().
+               Advantages include:
+               
+               a. StartTrans/CompleteTrans is nestable, unlike 
BeginTrans/CommitTrans/RollbackTrans.
+                  Only the outermost block is treated as a transaction.<br>
+               b. CompleteTrans auto-detects SQL errors, and will rollback on 
errors, commit otherwise.<br>
+               c. All BeginTrans/CommitTrans/RollbackTrans inside a 
StartTrans/CompleteTrans block
+                  are disabled, making it backward compatible.
+       */
+       function StartTrans($errfn = 'ADODB_TransMonitor')
+       {
+               if ($this->transOff > 0) {
+                       $this->transOff += 1;
+                       return;
+               }
+               
+               $this->_oldRaiseFn = $this->raiseErrorFn;
+               $this->raiseErrorFn = $errfn;
+               $this->_transOK = true;
+               
+               if ($this->debug && $this->transCnt > 0) 
ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
+               $this->BeginTrans();
+               $this->transOff = 1;
+       }
+       
+       
+       /**
+               Used together with StartTrans() to end a transaction. Monitors 
connection
+               for sql errors, and will commit or rollback as appropriate.
+               
+               @autoComplete if true, monitor sql errors and commit and 
rollback as appropriate, 
+               and if set to false force rollback even if no SQL error 
detected.
+               @returns true on commit, false on rollback.
+       */
+       function CompleteTrans($autoComplete = true)
+       {
+               if ($this->transOff > 1) {
+                       $this->transOff -= 1;
+                       return true;
+               }
+               $this->raiseErrorFn = $this->_oldRaiseFn;
+               
+               $this->transOff = 0;
+               if ($this->_transOK && $autoComplete) {
+                       if (!$this->CommitTrans()) {
+                               $this->_transOK = false;
+                               if ($this->debug) ADOConnection::outp("Smart 
Commit failed");
+                       } else
+                               if ($this->debug) ADOConnection::outp("Smart 
Commit occurred");
+               } else {
+                       $this->_transOK = false;
+                       $this->RollbackTrans();
+                       if ($this->debug) ADOCOnnection::outp("Smart Rollback 
occurred");
+               }
+               
+               return $this->_transOK;
+       }
+       
+       /*
+               At the end of a StartTrans/CompleteTrans block, perform a 
rollback.
+       */
+       function FailTrans()
+       {
+               if ($this->debug) 
+                       if ($this->transOff == 0) {
+                               ADOConnection::outp("FailTrans outside 
StartTrans/CompleteTrans");
+                       } else {
+                               ADOConnection::outp("FailTrans was called");
+                               adodb_backtrace();
+                       }
+               $this->_transOK = false;
+       }
+       
+       /**
+               Check if transaction has failed, only for Smart Transactions.
+       */
+       function HasFailedTrans()
+       {
+               if ($this->transOff > 0) return $this->_transOK == false;
+               return false;
+       }
+       
+       /**
+        * Execute SQL 
+        *
+        * @param sql           SQL statement to execute, or possibly an array 
holding prepared statement ($sql[0] will hold sql text)
+        * @param [inputarr]    holds the input data to bind to. Null elements 
will be set to null.
+        * @return              RecordSet or false
+        */
+       function &Execute($sql,$inputarr=false) 
+       {
+               if ($this->fnExecute) {
+                       $fn = $this->fnExecute;
+                       $ret =& $fn($this,$sql,$inputarr);
+                       if (isset($ret)) return $ret;
+               }
+               if ($inputarr) {
+                       if (!is_array($inputarr)) $inputarr = array($inputarr);
+                       
+                       $element0 = reset($inputarr);
+                       # is_object check because oci8 descriptors can be 
passed in
+                       $array_2d = is_array($element0) && 
!is_object(reset($element0));
+                       
+                       if (!is_array($sql) && !$this->_bindInputArray) {
+                               $sqlarr = explode('?',$sql);
+                                       
+                               if (!$array_2d) $inputarr = array($inputarr);
+                               foreach($inputarr as $arr) {
+                                       $sql = ''; $i = 0;
+                                       foreach($arr as $v) {
+                                               $sql .= $sqlarr[$i];
+                                               // from Ron Baldwin 
<ron.baldwin#sourceprose.com>
+                                               // Only quote string types      
+                                               $typ = gettype($v);
+                                               if ($typ == 'string')
+                                                       $sql .= $this->qstr($v);
+                                               else if ($typ == 'double')
+                                                       $sql .= 
str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
+                                               else if ($typ == 'boolean')
+                                                       $sql .= $v ? 
$this->true : $this->false;
+                                               else if ($v === null)
+                                                       $sql .= 'NULL';
+                                               else
+                                                       $sql .= $v;
+                                               $i += 1;
+                                       }
+                                       if (isset($sqlarr[$i])) {
+                                               $sql .= $sqlarr[$i];
+                                               if ($i+1 != sizeof($sqlarr)) 
ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql));
+                                       } else if ($i != sizeof($sqlarr))       
+                                               ADOConnection::outp( "Input 
array does not match ?: ".htmlspecialchars($sql));
+               
+                                       $ret =& $this->_Execute($sql);
+                                       if (!$ret) return $ret;
+                               }       
+                       } else {
+                               if ($array_2d) {
+                                       if (is_string($sql))
+                                               $stmt = $this->Prepare($sql);
+                                       else
+                                               $stmt = $sql;
+                                               
+                                       foreach($inputarr as $arr) {
+                                               $ret =& 
$this->_Execute($stmt,$arr);
+                                               if (!$ret) return $ret;
+                                       }
+                               } else {
+                                       $ret =& $this->_Execute($sql,$inputarr);
+                               }
+                       }
+               } else {
+                       $ret =& $this->_Execute($sql,false);
+               }
+
+               return $ret;
+       }
+       
+       
+       function &_Execute($sql,$inputarr=false)
+       {
+               if ($this->debug) {
+                       global $ADODB_INCLUDED_LIB;
+                       if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
+                       $this->_queryID = _adodb_debug_execute($this, 
$sql,$inputarr);
+               } else {
+                       $this->_queryID = @$this->_query($sql,$inputarr);
+               }
+               
+               /************************
+               // OK, query executed
+               *************************/
+
+               if ($this->_queryID === false) { // error handling if query 
fails
+                       if ($this->debug == 99) adodb_backtrace(true,5);        
+                       $fn = $this->raiseErrorFn;
+                       if ($fn) {
+                               
$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
+                       } 
+                       $false = false;
+                       return $false;
+               } 
+               
+               if ($this->_queryID === true) { // return simplified recordset 
for inserts/updates/deletes with lower overhead
+                       $rs =& new ADORecordSet_empty();
+                       return $rs;
+               }
+               
+               // return real recordset from select statement
+               $rsclass = $this->rsPrefix.$this->databaseType;
+               $rs = new $rsclass($this->_queryID,$this->fetchMode);
+               $rs->connection = &$this; // Pablo suggestion
+               $rs->Init();
+               if (is_array($sql)) $rs->sql = $sql[0];
+               else $rs->sql = $sql;
+               if ($rs->_numOfRows <= 0) {
+               global $ADODB_COUNTRECS;
+                       if ($ADODB_COUNTRECS) {
+                               if (!$rs->EOF) { 
+                                       $rs = 
&$this->_rs2rs($rs,-1,-1,!is_array($sql));
+                                       $rs->_queryID = $this->_queryID;
+                               } else
+                                       $rs->_numOfRows = 0;
+                       }
+               }
+               return $rs;
+       }
+
+       function CreateSequence($seqname='adodbseq',$startID=1)
+       {
+               if (empty($this->_genSeqSQL)) return false;
+               return 
$this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
+       }
+
+       function DropSequence($seqname='adodbseq')
+       {
+               if (empty($this->_dropSeqSQL)) return false;
+               return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+       }
+
+       /**
+        * Generates a sequence id and stores it in $this->genID;
+        * GenID is only available if $this->hasGenID = true;
+        *
+        * @param seqname               name of sequence to use
+        * @param startID               if sequence does not exist, start at 
this ID
+        * @return              0 if not supported, otherwise a sequence id
+        */
+       function GenID($seqname='adodbseq',$startID=1)
+       {
+               if (!$this->hasGenID) {
+                       return 0; // formerly returns false pre 1.60
+               }
+               
+               $getnext = sprintf($this->_genIDSQL,$seqname);
+               
+               $holdtransOK = $this->_transOK;
+               
+               $save_handler = $this->raiseErrorFn;
+               $this->raiseErrorFn = '';
+               @($rs = $this->Execute($getnext));
+               $this->raiseErrorFn = $save_handler;
+               
+               if (!$rs) {
+                       $this->_transOK = $holdtransOK; //if the status was ok 
before reset
+                       $createseq = 
$this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
+                       $rs = $this->Execute($getnext);
+               }
+               if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
+               else $this->genID = 0; // false
+       
+               if ($rs) $rs->Close();
+
+               return $this->genID;
+       }       
+
+       /**
+        * @param $table string name of the table, not needed by all databases 
(eg. mysql), default ''
+        * @param $column string name of the column, not needed by all 
databases (eg. mysql), default ''
+        * @return  the last inserted ID. Not all databases support this.
+        */ 
+       function Insert_ID($table='',$column='')
+       {
+               if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
+               if ($this->hasInsertID) return $this->_insertid($table,$column);
+               if ($this->debug) {
+                       ADOConnection::outp( '<p>Insert_ID error</p>');
+                       adodb_backtrace();
+               }
+               return false;
+       }
+
+
+       /**
+        * Portable Insert ID. Pablo Roca <pabloroca#mvps.org>
+        *
+        * @return  the last inserted ID. All databases support this. But aware 
possible
+        * problems in multiuser environments. Heavy test this before deploying.
+        */ 
+       function PO_Insert_ID($table="", $id="") 
+       {
+          if ($this->hasInsertID){
+                  return $this->Insert_ID($table,$id);
+          } else {
+                  return $this->GetOne("SELECT MAX($id) FROM $table");
+          }
+       }
+
+       /**
+       * @return # rows affected by UPDATE/DELETE
+       */ 
+       function Affected_Rows()
+       {
+               if ($this->hasAffectedRows) {
+                       if ($this->fnExecute === 'adodb_log_sql') {
+                               if ($this->_logsql && $this->_affected !== 
false) return $this->_affected;
+                       }
+                       $val = $this->_affectedrows();
+                       return ($val < 0) ? false : $val;
+               }
+                                 
+               if ($this->debug) ADOConnection::outp( '<p>Affected_Rows 
error</p>',false);
+               return false;
+       }
+       
+       
+       /**
+        * @return  the last error message
+        */
+       function ErrorMsg()
+       {
+               if ($this->_errorMsg) return '!! 
'.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
+               else return '';
+       }
+       
+       
+       /**
+        * @return the last error number. Normally 0 means no error.
+        */
+       function ErrorNo() 
+       {
+               return ($this->_errorMsg) ? -1 : 0;
+       }
+       
+       function MetaError($err=false)
+       {
+               include_once(ADODB_DIR."/adodb-error.inc.php");
+               if ($err === false) $err = $this->ErrorNo();
+               return 
adodb_error($this->dataProvider,$this->databaseType,$err);
+       }
+       
+       function MetaErrorMsg($errno)
+       {
+               include_once(ADODB_DIR."/adodb-error.inc.php");
+               return adodb_errormsg($errno);
+       }
+       
+       /**
+        * @returns an array with the primary key columns in it.
+        */
+       function MetaPrimaryKeys($table, $owner=false)
+       {
+       // owner not used in base class - see oci8
+               $p = array();
+               $objs =& $this->MetaColumns($table);
+               if ($objs) {
+                       foreach($objs as $v) {
+                               if (!empty($v->primary_key))
+                                       $p[] = $v->name;
+                       }
+               }
+               if (sizeof($p)) return $p;
+               if (function_exists('ADODB_VIEW_PRIMARYKEYS'))
+                       return ADODB_VIEW_PRIMARYKEYS($this->databaseType, 
$this->database, $table, $owner);
+               return false;
+       }
+       
+       /**
+        * @returns assoc array where keys are tables, and values are foreign 
keys
+        */
+       function MetaForeignKeys($table, $owner=false, $upper=false)
+       {
+               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 (when $this->hasTop is set)
+       * BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause 
already set
+       *
+       * @param sql
+       * @param [offset]       is the row to start calculations from (1-based)
+       * @param [nrows]                is the number of rows to get
+       * @param [inputarr]     array of bind variables
+       * @param [secs2cache]           is a private parameter only used by jlim
+       * @return               the recordset ($rs->databaseType == 'array')
+       */
+       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
+       {
+               if ($this->hasTop && $nrows > 0) {
+               // suggested by Reinhard Balling. Access requires top after 
distinct 
+                // Informix requires first before distinct - F Riosa
+                       $ismssql = (strpos($this->databaseType,'mssql') !== 
false);
+                       if ($ismssql) $isaccess = false;
+                       else $isaccess = (strpos($this->databaseType,'access') 
!== false);
+                       
+                       if ($offset <= 0) {
+                               
+                                       // access includes ties in result
+                                       if ($isaccess) {
+                                               $sql = preg_replace(
+                                               
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' 
'.((integer)$nrows).' ',$sql);
+
+                                               if ($secs2cache>0) {
+                                                       $ret =& 
$this->CacheExecute($secs2cache, $sql,$inputarr);
+                                               } else {
+                                                       $ret =& 
$this->Execute($sql,$inputarr);
+                                               }
+                                               return $ret; // PHP5 fix
+                                       } else if ($ismssql){
+                                               $sql = preg_replace(
+                                               
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' 
'.((integer)$nrows).' ',$sql);
+                                       } else {
+                                               $sql = preg_replace(
+                                               '/(^\s*select\s)/i','\\1 
'.$this->hasTop.' '.((integer)$nrows).' ',$sql);
+                                       }
+                       } else {
+                               $nn = $nrows + $offset;
+                               if ($isaccess || $ismssql) {
+                                       $sql = preg_replace(
+                                       
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nn.' 
',$sql);
+                               } else {
+                                       $sql = preg_replace(
+                                       '/(^\s*select\s)/i','\\1 
'.$this->hasTop.' '.$nn.' ',$sql);
+                               }
+                       }
+               }
+               
+               // if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is 
set, we buffer  rows
+               // 0 to offset-1 which will be discarded anyway. So we disable 
$ADODB_COUNTRECS.
+               global $ADODB_COUNTRECS;
+               
+               $savec = $ADODB_COUNTRECS;
+               $ADODB_COUNTRECS = false;
+                       
+               if ($offset>0){
+                       if ($secs2cache>0) $rs = 
&$this->CacheExecute($secs2cache,$sql,$inputarr);
+                       else $rs = &$this->Execute($sql,$inputarr);
+               } else {
+                       if ($secs2cache>0) $rs = 
&$this->CacheExecute($secs2cache,$sql,$inputarr);
+                       else $rs = &$this->Execute($sql,$inputarr);
+               }
+               $ADODB_COUNTRECS = $savec;
+               if ($rs && !$rs->EOF) {
+                       $rs =& $this->_rs2rs($rs,$nrows,$offset);
+               }
+               //print_r($rs);
+               return $rs;
+       }
+       
+       /**
+       * Create serializable recordset. Breaks rs link to connection.
+       *
+       * @param rs                     the recordset to serialize
+       */
+       function &SerializableRS(&$rs)
+       {
+               $rs2 =& $this->_rs2rs($rs);
+               $ignore = false;
+               $rs2->connection =& $ignore;
+               
+               return $rs2;
+       }
+       
+       /**
+       * Convert database recordset to an array recordset
+       * input recordset's cursor should be at beginning, and
+       * 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,$close=true)
+       {
+               if (! $rs) {
+                       $false = false;
+                       return $false;
+               }
+               $dbtype = $rs->databaseType;
+               if (!$dbtype) {
+                       $rs = &$rs;  // required to prevent crashing in 4.2.1, 
but does not happen in 4.3.1 -- why ?
+                       return $rs;
+               }
+               if (($dbtype == 'array' || $dbtype == 'csv') && $nrows == -1 && 
$offset == -1) {
+                       $rs->MoveFirst();
+                       $rs = &$rs; // required to prevent crashing in 4.2.1, 
but does not happen in 4.3.1-- why ?
+                       return $rs;
+               }
+               $flds = array();
+               for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
+                       $flds[] = $rs->FetchField($i);
+               }
+
+               $arr =& $rs->GetArrayLimit($nrows,$offset);
+               //print_r($arr);
+               if ($close) $rs->Close();
+               
+               $arrayClass = $this->arrayClass;
+               
+               $rs2 = new $arrayClass();
+               $rs2->connection = &$this;
+               $rs2->sql = $rs->sql;
+               $rs2->dataProvider = $this->dataProvider;
+               $rs2->InitArrayFields($arr,$flds);
+               $rs2->fetchMode = isset($rs->adodbFetchMode) ? 
$rs->adodbFetchMode : $rs->fetchMode;
+               return $rs2;
+       }
+       
+       /*
+       * Return all rows. Compat with PEAR DB
+       */
+       function &GetAll($sql, $inputarr=false)
+       {
+               $arr =& $this->GetArray($sql,$inputarr);
+               return $arr;
+       }
+       
+       function &GetAssoc($sql, $inputarr=false,$force_array = false, 
$first2cols = false)
+       {
+               $rs =& $this->Execute($sql, $inputarr);
+               if (!$rs) {
+                       $false = false;
+                       return $false;
+               }
+               $arr =& $rs->GetAssoc($force_array,$first2cols);
+               return $arr;
+       }
+       
+       function &CacheGetAssoc($secs2cache, $sql=false, 
$inputarr=false,$force_array = false, $first2cols = false)
+       {
+               if (!is_numeric($secs2cache)) {
+                       $first2cols = $force_array;
+                       $force_array = $inputarr;
+               }
+               $rs =& $this->CacheExecute($secs2cache, $sql, $inputarr);
+               if (!$rs) {
+                       $false = false;
+                       return $false;
+               }
+               $arr =& $rs->GetAssoc($force_array,$first2cols);
+               return $arr;
+       }
+       
+       /**
+       * 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)
+       {
+       global $ADODB_COUNTRECS;
+               $crecs = $ADODB_COUNTRECS;
+               $ADODB_COUNTRECS = false;
+               
+               $ret = false;
+               $rs = &$this->Execute($sql,$inputarr);
+               if ($rs) {      
+                       if (!$rs->EOF) $ret = reset($rs->fields);
+                       $rs->Close();
+               }
+               $ADODB_COUNTRECS = $crecs;
+               return $ret;
+       }
+       
+       function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
+       {
+               $ret = false;
+               $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
+               if ($rs) {              
+                       if (!$rs->EOF) $ret = reset($rs->fields);
+                       $rs->Close();
+               } 
+               
+               return $ret;
+       }
+       
+       function GetCol($sql, $inputarr = false, $trim = false)
+       {
+               $rv = false;
+               $rs = &$this->Execute($sql, $inputarr);
+               if ($rs) {
+                       $rv = array();
+                       if ($trim) {
+                               while (!$rs->EOF) {
+                                       $rv[] = trim(reset($rs->fields));
+                                       $rs->MoveNext();
+                               }
+                       } else {
+                               while (!$rs->EOF) {
+                                       $rv[] = reset($rs->fields);
+                                       $rs->MoveNext();
+                               }
+                       }
+                       $rs->Close();
+               }
+               return $rv;
+       }
+       
+       function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
+       {
+               $rv = false;
+               $rs = &$this->CacheExecute($secs, $sql, $inputarr);
+               if ($rs) {
+                       if ($trim) {
+                               while (!$rs->EOF) {
+                                       $rv[] = trim(reset($rs->fields));
+                                       $rs->MoveNext();
+                               }
+                       } else {
+                               while (!$rs->EOF) {
+                                       $rv[] = reset($rs->fields);
+                                       $rs->MoveNext();
+                               }
+                       }
+                       $rs->Close();
+               }
+               return $rv;
+       }
+ 
+       /*
+               Calculate the offset of a date for a particular database and 
generate
+                       appropriate SQL. Useful for calculating future/past 
dates and storing
+                       in a database.
+                       
+               If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
+       */
+       function OffsetDate($dayFraction,$date=false)
+       {               
+               if (!$date) $date = $this->sysDate;
+               return  '('.$date.'+'.$dayFraction.')';
+       }
+       
+       
+       /**
+       *
+       * @param sql                    SQL statement
+       * @param [inputarr]             input bind array
+       */
+       function &GetArray($sql,$inputarr=false)
+       {
+       global $ADODB_COUNTRECS;
+               
+               $savec = $ADODB_COUNTRECS;
+               $ADODB_COUNTRECS = false;
+               $rs =& $this->Execute($sql,$inputarr);
+               $ADODB_COUNTRECS = $savec;
+               if (!$rs) 
+                       if (defined('ADODB_PEAR')) {
+                               $cls = ADODB_PEAR_Error();
+                               return $cls;
+                       } else {
+                               $false = false;
+                               return $false;
+                       }
+               $arr =& $rs->GetArray();
+               $rs->Close();
+               return $arr;
+       }
+       
+       function &CacheGetAll($secs2cache,$sql=false,$inputarr=false)
+       {
+               return $this->CacheGetArray($secs2cache,$sql,$inputarr);
+       }
+       
+       function &CacheGetArray($secs2cache,$sql=false,$inputarr=false)
+       {
+       global $ADODB_COUNTRECS;
+               
+               $savec = $ADODB_COUNTRECS;
+               $ADODB_COUNTRECS = false;
+               $rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
+               $ADODB_COUNTRECS = $savec;
+               
+               if (!$rs) 
+                       if (defined('ADODB_PEAR')) {
+                               $cls = ADODB_PEAR_Error();
+                               return $cls;
+                       } else {
+                               $false = false;
+                               return $false;
+                       }
+               $arr =& $rs->GetArray();
+               $rs->Close();
+               return $arr;
+       }
+       
+       
+       
+       /**
+       * 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)
+       {
+       global $ADODB_COUNTRECS;
+               $crecs = $ADODB_COUNTRECS;
+               $ADODB_COUNTRECS = false;
+               
+               $rs =& $this->Execute($sql,$inputarr);
+               
+               $ADODB_COUNTRECS = $crecs;
+               if ($rs) {
+                       if (!$rs->EOF) $arr = $rs->fields;
+                       else $arr = array();
+                       $rs->Close();
+                       return $arr;
+               }
+               
+               $false = false;
+               return $false;
+       }
+       
+       function &CacheGetRow($secs2cache,$sql=false,$inputarr=false)
+       {
+               $rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
+               if ($rs) {
+                       $arr = false;
+                       if (!$rs->EOF) $arr = $rs->fields;
+                       $rs->Close();
+                       return $arr;
+               }
+               $false = false;
+               return $false;
+       }
+       
+       /**
+       * Insert or replace a single record. Note: this is not the same as 
MySQL's replace. 
+       * ADOdb's Replace() uses update-insert semantics, not 
insert-delete-duplicates of MySQL.
+       * Also note that no table locking is done currently, so it is possible 
that the
+       * record be inserted twice by two programs...
+       *
+       * $this->Replace('products', array('prodname' =>"'Nails'","price" => 
3.99), 'prodname');
+       *
+       * $table                table name
+       * $fieldArray   associative array of data (you must quote strings 
yourself).
+       * $keyCol               the primary key field name or if compound key, 
array of field names
+       * autoQuote             set to true to use a hueristic to quote 
strings. Works with nulls and numbers
+       *                                       but does not work with dates 
nor SQL functions.
+       * has_autoinc   the primary key is an auto-inc field, so skip in insert.
+       *
+       * Currently blob replace not supported
+       *
+       * returns 0 = fail, 1 = update, 2 = insert 
+       */
+       
+       function Replace($table, $fieldArray, $keyCol, $autoQuote=false, 
$has_autoinc=false)
+       {
+               global $ADODB_INCLUDED_LIB;
+               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
+               
+               return _adodb_replace($this, $table, $fieldArray, $keyCol, 
$autoQuote, $has_autoinc);
+       }
+       
+       
+       /**
+       * Will select, getting rows from $offset (1-based), for $nrows. 
+       * This simulates the MySQL "select * from table limit $offset,$nrows" , 
and
+       * the PostgreSQL "select * from table limit $nrows offset $offset". 
Note that
+       * MySQL and PostgreSQL parameter ordering is the opposite of the other.
+       * eg. 
+       *  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 
3 (1-based)
+       *  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 
to 5 (1-based)
+       *
+       * BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP 
clause already set
+       *
+       * @param [secs2cache]   seconds to cache data, set to 0 to force query. 
This is optional
+       * @param sql
+       * @param [offset]       is the row to start calculations from (1-based)
+       * @param [nrows]        is the number of rows to get
+       * @param [inputarr]     array of bind variables
+       * @return               the recordset ($rs->databaseType == 'array')
+       */
+       function 
&CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
+       {       
+               if (!is_numeric($secs2cache)) {
+                       if ($sql === false) $sql = -1;
+                       if ($offset == -1) $offset = false;
+                                                                         // 
sql,       nrows, offset,inputarr
+                       $rs =& 
$this->SelectLimit($secs2cache,$sql,$nrows,$offset,$this->cacheSecs);
+               } else {
+                       if ($sql === false) ADOConnection::outp( "Warning: 
\$sql missing from CacheSelectLimit()");
+                       $rs =& 
$this->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+               }
+               return $rs;
+       }
+       
+       
+       /**
+       * Flush cached recordsets that match a particular $sql statement. 
+       * If $sql == false, then we purge all files in the cache.
+       */
+       
+       /**
+   * Flush cached recordsets that match a particular $sql statement. 
+   * If $sql == false, then we purge all files in the cache.
+    */
+       function CacheFlush($sql=false,$inputarr=false)
+       {
+       global $ADODB_CACHE_DIR;
+       
+               if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) {
+         /*if (strncmp(PHP_OS,'WIN',3) === 0)
+            $dir = str_replace('/', '\\', $ADODB_CACHE_DIR);
+         else */
+            $dir = $ADODB_CACHE_DIR;
+            
+         if ($this->debug) {
+            ADOConnection::outp( "CacheFlush: $dir<br><pre>\n", 
$this->_dirFlush($dir),"</pre>");
+         } else {
+            $this->_dirFlush($dir);
+         }
+         return;
+      } 
+      
+      global $ADODB_INCLUDED_CSV;
+      if (empty($ADODB_INCLUDED_CSV)) 
include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+      
+      $f = $this->_gencachename($sql.serialize($inputarr),false);
+      adodb_write_file($f,''); // is adodb_write_file needed?
+      if (address@hidden($f)) {
+         if ($this->debug) ADOConnection::outp( "CacheFlush: failed for $f");
+      }
+   }
+   
+   /**
+   * Private function to erase all of the files and subdirectories in a 
directory.
+   *
+   * Just specify the directory, and tell it if you want to delete the 
directory or just clear it out.
+   * Note: $kill_top_level is used internally in the function to flush 
subdirectories.
+   */
+   function _dirFlush($dir, $kill_top_level = false) {
+      if(!$dh = @opendir($dir)) return;
+      
+      while (($obj = readdir($dh))) {
+         if($obj=='.' || $obj=='..')
+            continue;
+                       
+         if (address@hidden($dir.'/'.$obj))
+                         $this->_dirFlush($dir.'/'.$obj, true);
+      }
+      if ($kill_top_level === true)
+         @rmdir($dir);
+      return true;
+   }
+   
+   
+       function xCacheFlush($sql=false,$inputarr=false)
+       {
+       global $ADODB_CACHE_DIR;
+       
+               if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) {
+                       if (strncmp(PHP_OS,'WIN',3) === 0) {
+                               $cmd = 'del /s 
'.str_replace('/','\\',$ADODB_CACHE_DIR).'\adodb_*.cache';
+                       } else {
+                               //$cmd = 'find "'.$ADODB_CACHE_DIR.'" -type f 
-maxdepth 1 -print0 | xargs -0 rm -f';
+                               $cmd = 'rm -rf 
'.$ADODB_CACHE_DIR.'/[0-9a-f][0-9a-f]/'; 
+                               // old version 'rm -f `find 
'.$ADODB_CACHE_DIR.' -name adodb_*.cache`';
+                       }
+                       if ($this->debug) {
+                               ADOConnection::outp( "CacheFlush: 
$cmd<br><pre>\n", system($cmd),"</pre>");
+                       } else {
+                               exec($cmd);
+                       }
+                       return;
+               } 
+               
+               global $ADODB_INCLUDED_CSV;
+               if (empty($ADODB_INCLUDED_CSV)) 
include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+               
+               $f = $this->_gencachename($sql.serialize($inputarr),false);
+               adodb_write_file($f,''); // is adodb_write_file needed?
+               if (address@hidden($f)) {
+                       if ($this->debug) ADOConnection::outp( "CacheFlush: 
failed for $f");
+               }
+       }
+       
+       /**
+       * Private function to generate filename for caching.
+       * Filename is generated based on:
+       *
+       *  - sql statement
+       *  - database type (oci8, ibase, ifx, etc)
+       *  - database name
+       *  - userid
+       *  - setFetchMode (adodb 4.23)
+       *
+       * When not in safe mode, we create 256 sub-directories in the cache 
directory ($ADODB_CACHE_DIR). 
+       * Assuming that we can have 50,000 files per directory with good 
performance, 
+       * then we can scale to 12.8 million unique cached recordsets. Wow!
+       */
+       function _gencachename($sql,$createdir)
+       {
+       global $ADODB_CACHE_DIR;
+       static $notSafeMode;
+               
+               if ($this->fetchMode === false) { 
+               global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               } else {
+                       $mode = $this->fetchMode;
+               }
+               $m = 
md5($sql.$this->databaseType.$this->database.$this->user.$mode);
+               
+               if (!isset($notSafeMode)) $notSafeMode = !ini_get('safe_mode');
+               $dir = ($notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($m,0,2) : 
$ADODB_CACHE_DIR;
+                       
+               if ($createdir && $notSafeMode && !file_exists($dir)) {
+                       $oldu = umask(0);
+                       if (!mkdir($dir,0771)) 
+                               if ($this->debug) ADOConnection::outp( "Unable 
to mkdir $dir for $sql");
+                       umask($oldu);
+               }
+               return $dir.'/adodb_'.$m.'.cache';
+       }
+       
+       
+       /**
+        * Execute SQL, caching recordsets.
+        *
+        * @param [secs2cache]  seconds to cache data, set to 0 to force query. 
+        *                                        This is an optional parameter.
+        * @param sql           SQL statement to execute
+        * @param [inputarr]    holds the input data  to bind to
+        * @return              RecordSet or false
+        */
+       function &CacheExecute($secs2cache,$sql=false,$inputarr=false)
+       {
+
+                       
+               if (!is_numeric($secs2cache)) {
+                       $inputarr = $sql;
+                       $sql = $secs2cache;
+                       $secs2cache = $this->cacheSecs;
+               }
+               
+               if (is_array($sql)) {
+                       $sqlparam = $sql;
+                       $sql = $sql[0];
+               } else
+                       $sqlparam = $sql;
+                       
+               global $ADODB_INCLUDED_CSV;
+               if (empty($ADODB_INCLUDED_CSV)) 
include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+               
+               $md5file = $this->_gencachename($sql.serialize($inputarr),true);
+               $err = '';
+               
+               if ($secs2cache > 0){
+                       $rs = 
&csv2rs($md5file,$err,$secs2cache,$this->arrayClass);
+                       $this->numCacheHits += 1;
+               } else {
+                       $err='Timeout 1';
+                       $rs = false;
+                       $this->numCacheMisses += 1;
+               }
+               if (!$rs) {
+               // no cached rs found
+                       if ($this->debug) {
+                               if (get_magic_quotes_runtime()) {
+                                       ADOConnection::outp("Please disable 
magic_quotes_runtime - it corrupts cache files :(");
+                               }
+                               if ($this->debug !== -1) ADOConnection::outp( " 
$md5file cache failure: $err (see sql below)");
+                       }
+                       
+                       $rs = &$this->Execute($sqlparam,$inputarr);
+
+                       if ($rs) {
+                               $eof = $rs->EOF;
+                               $rs = &$this->_rs2rs($rs); // read entire 
recordset into memory immediately
+                               $txt = _rs2serialize($rs,false,$sql); // 
serialize
+               
+                               if 
(!adodb_write_file($md5file,$txt,$this->debug)) {
+                                       if ($fn = $this->raiseErrorFn) {
+                                               
$fn($this->databaseType,'CacheExecute',-32000,"Cache write 
error",$md5file,$sql,$this);
+                                       }
+                                       if ($this->debug) ADOConnection::outp( 
" Cache write error");
+                               }
+                               if ($rs->EOF && !$eof) {
+                                       $rs->MoveFirst();
+                                       //$rs = &csv2rs($md5file,$err);         
+                                       $rs->connection = &$this; // Pablo 
suggestion
+                               }  
+                               
+                       } else
+                               @unlink($md5file);
+               } else {
+                       $this->_errorMsg = '';
+                       $this->_errorCode = 0;
+                       
+                       if ($this->fnCacheExecute) {
+                               $fn = $this->fnCacheExecute;
+                               $fn($this, $secs2cache, $sql, $inputarr);
+                       }
+               // ok, set cached object found
+                       $rs->connection = &$this; // Pablo suggestion
+                       if ($this->debug){ 
+                                       
+                               $inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
+                               $ttl = $rs->timeCreated + $secs2cache - time();
+                               $s = is_array($sql) ? $sql[0] : $sql;
+                               if ($inBrowser) $s = 
'<i>'.htmlspecialchars($s).'</i>';
+                               
+                               ADOConnection::outp( " $md5file reloaded, 
ttl=$ttl [ $s ]");
+                       }
+               }
+               return $rs;
+       }
+       
+       
+       /* 
+               Similar to PEAR DB's autoExecute(), except that 
+               $mode can be 'INSERT' or 'UPDATE' or DB_AUTOQUERY_INSERT or 
DB_AUTOQUERY_UPDATE
+               If $mode == 'UPDATE', then $where is compulsory as a safety 
measure.
+               
+               $forceUpdate means that even if the data has not changed, 
perform update.
+        */
+       function& AutoExecute($table, $fields_values, $mode = 'INSERT', $where 
= FALSE, $forceUpdate=true, $magicq=false) 
+       {
+               $sql = 'SELECT * FROM '.$table;  
+               if ($where!==FALSE) $sql .= ' WHERE '.$where;
+               else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE 
*/) {
+                       ADOConnection::outp('AutoExecute: Illegal mode=UPDATE 
with empty WHERE clause');
+                       return false;
+               }
+
+               $rs =& $this->SelectLimit($sql,1);
+               if (!$rs) return false; // table does not exist
+               $rs->tableName = $table;
+               
+               switch((string) $mode) {
+               case 'UPDATE':
+               case '2':
+                       $sql = $this->GetUpdateSQL($rs, $fields_values, 
$forceUpdate, $magicq);
+                       break;
+               case 'INSERT':
+               case '1':
+                       $sql = $this->GetInsertSQL($rs, $fields_values, 
$magicq);
+                       break;
+               default:
+                       ADOConnection::outp("AutoExecute: Unknown mode=$mode");
+                       return false;
+               }
+               $ret = false;
+               if ($sql) $ret = $this->Execute($sql);
+               if ($ret) $ret = true;
+               return $ret;
+       }
+       
+       
+       /**
+        * Generates an Update Query based on an existing recordset.
+        * $arrFields is an associative array of fields with the value
+        * that should be assigned.
+        *
+        * Note: This function should only be used on a recordset
+        *         that is run against a single table and sql should only 
+        *               be a simple select stmt with no groupby/orderby/limit
+        *
+        * "Jonathan Younger" <address@hidden>
+        */
+       function GetUpdateSQL(&$rs, 
$arrFields,$forceUpdate=false,$magicq=false,$force=null)
+       {
+               global $ADODB_INCLUDED_LIB;
+
+        //********************************************************//
+        //This is here to maintain compatibility
+        //with older adodb versions. Sets force type to force nulls if 
$forcenulls is set.
+               if (!isset($force)) {
+                               global $ADODB_FORCE_TYPE;
+                           $force = $ADODB_FORCE_TYPE;
+               }
+               //********************************************************//
+
+               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
+               return 
_adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
+       }
+
+       /**
+        * 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,$magicq=false,$force=null)
+       {       
+               global $ADODB_INCLUDED_LIB;
+               if (!isset($force)) {
+                       global $ADODB_FORCE_TYPE;
+                       $force = $ADODB_FORCE_TYPE;
+                       
+               }
+               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
+               return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
+       }
+       
+
+       /**
+       * Update a blob column, given a where clause. There are more 
sophisticated
+       * blob handling functions that we could have implemented, but all 
require
+       * a very complex API. Instead we have chosen something that is extremely
+       * simple to understand and use. 
+       *
+       * Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
+       *
+       * Usage to update a $blobvalue which has a primary key blob_id=1 into a 
+       * field blobtable.blobcolumn:
+       *
+       *       UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
+       *
+       * Insert example:
+       *
+       *       $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;
+       }
+
+       /**
+       * Usage:
+       *       UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
+       *       
+       *       $blobtype supports 'BLOB' and 'CLOB'
+       *
+       *       $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, 
null)');
+       *       $conn->UpdateBlob('blobtable','blobcol',$blobpath,'id=1');
+       */
+       function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+       {
+               $fd = fopen($path,'rb');
+               if ($fd === false) return false;
+               $val = fread($fd,filesize($path));
+               fclose($fd);
+               return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
+       }
+       
+       function BlobDecode($blob)
+       {
+               return $blob;
+       }
+       
+       function BlobEncode($blob)
+       {
+               return $blob;
+       }
+       
+       function SetCharSet($charset)
+       {
+               return false;
+       }
+       
+       function IfNull( $field, $ifNull ) 
+       {
+               return " CASE WHEN $field is null THEN $ifNull ELSE $field END 
";
+       }
+       
+       function LogSQL($enable=true)
+       {
+               include_once(ADODB_DIR.'/adodb-perf.inc.php');
+               
+               if ($enable) $this->fnExecute = 'adodb_log_sql';
+               else $this->fnExecute = false;
+               
+               $old = $this->_logsql;  
+               $this->_logsql = $enable;
+               if ($enable && !$old) $this->_affected = false;
+               return $old;
+       }
+       
+       function GetCharSet()
+       {
+               return false;
+       }
+       
+       /**
+       * Usage:
+       *       UpdateClob('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');
+       }
+       
+       // not the fastest implementation - quick and dirty - jlim
+       // for best performance, use the actual $rs->MetaType().
+       function MetaType($t,$len=-1,$fieldobj=false)
+       {
+               
+               if (empty($this->_metars)) {
+                       $rsclass = $this->rsPrefix.$this->databaseType;
+                       $this->_metars =& new $rsclass(false,$this->fetchMode); 
+                       $this->_metars->connection =& $this;
+               }
+               return $this->_metars->MetaType($t,$len,$fieldobj);
+       }
+       
+       
+       /**
+       *  Change the SQL connection locale to a specified locale.
+       *  This is used to get the date formats written depending on the client 
locale.
+       */
+       function SetDateLocale($locale = 'En')
+       {
+               $this->locale = $locale;
+               switch (strtoupper($locale))
+               {
+                       case 'EN':
+                               $this->fmtDate="'Y-m-d'";
+                               $this->fmtTimeStamp = "'Y-m-d H:i:s'";
+                               break;
+                               
+                       case 'US':
+                               $this->fmtDate = "'m-d-Y'";
+                               $this->fmtTimeStamp = "'m-d-Y H:i:s'";
+                               break;
+                               
+                       case 'NL':
+                       case 'FR':
+                       case 'RO':
+                       case 'IT':
+                               $this->fmtDate="'d-m-Y'";
+                               $this->fmtTimeStamp = "'d-m-Y H:i:s'";
+                               break;
+                               
+                       case 'GE':
+                               $this->fmtDate="'d.m.Y'";
+                               $this->fmtTimeStamp = "'d.m.Y H:i:s'";
+                               break;
+                               
+                       default:
+                               $this->fmtDate="'Y-m-d'";
+                               $this->fmtTimeStamp = "'Y-m-d H:i:s'";
+                               break;
+               }
+       }
+
+       
+       /**
+        * Close Connection
+        */
+       function Close()
+       {
+               $rez = $this->_close();
+               $this->_connectionID = false;
+               return $rez;
+       }
+       
+       /**
+        * Begin a Transaction. Must be followed by CommitTrans() or 
RollbackTrans().
+        *
+        * @return true if succeeded or false if database does not support 
transactions
+        */
+       function BeginTrans() {return false;}
+       
+       
+       /**
+        * If database does not support transactions, always return true as 
data always commited
+        *
+        * @param $ok  set to false to rollback transaction, true to commit
+        *
+        * @return true/false.
+        */
+       function CommitTrans($ok=true) 
+       { 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() 
+               {
+               global $ADODB_FETCH_MODE;
+               
+                       if ($this->metaDatabasesSQL) {
+                               $save = $ADODB_FETCH_MODE; 
+                               $ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
+                               
+                               if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
+                               
+                               $arr = $this->GetCol($this->metaDatabasesSQL);
+                               if (isset($savem)) $this->SetFetchMode($savem);
+                               $ADODB_FETCH_MODE = $save; 
+                       
+                               return $arr;
+                       }
+                       
+                       return false;
+               }
+               
+       /**
+        * @param ttype can either be 'VIEW' or 'TABLE' or false. 
+        *              If false, both views and tables are returned.
+        *              "VIEW" returns only views
+        *              "TABLE" returns only tables
+        * @param showSchema returns the schema/user with the table name, eg. 
USER.TABLE
+        * @param mask  is the input mask - only supported by oci8 and 
postgresql
+        *
+        * @return  array of tables for current database.
+        */ 
+       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+       {
+       global $ADODB_FETCH_MODE;
+       
+               
+               $false = false;
+               if ($mask) {
+                       return $false;
+               }
+               if ($this->metaTablesSQL) {
+                       $save = $ADODB_FETCH_MODE; 
+                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
+                       
+                       if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
+                       
+                       $rs = $this->Execute($this->metaTablesSQL);
+                       if (isset($savem)) $this->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save; 
+                       
+                       if ($rs === false) return $false;
+                       $arr =& $rs->GetArray();
+                       $arr2 = array();
+                       
+                       if ($hast = ($ttype && isset($arr[0][1]))) { 
+                               $showt = strncmp($ttype,'T',1);
+                       }
+                       
+                       for ($i=0; $i < sizeof($arr); $i++) {
+                               if ($hast) {
+                                       if ($showt == 0) {
+                                               if (strncmp($arr[$i][1],'T',1) 
== 0) $arr2[] = trim($arr[$i][0]);
+                                       } else {
+                                               if (strncmp($arr[$i][1],'V',1) 
== 0) $arr2[] = trim($arr[$i][0]);
+                                       }
+                               } else
+                                       $arr2[] = trim($arr[$i][0]);
+                       }
+                       $rs->Close();
+                       return $arr2;
+               }
+               return $false;
+       }
+       
+       
+       function _findschema(&$table,&$schema)
+       {
+               if (!$schema && ($at = strpos($table,'.')) !== false) {
+                       $schema = substr($table,0,$at);
+                       $table = substr($table,$at+1);
+               }
+       }
+       
+       /**
+        * List columns in a database as an array of ADOFieldObjects. 
+        * See top of file for definition of object.
+        *
+        * @param $table        table name to query
+        * @param $normalize    makes table name case-insensitive (required by 
some databases)
+        * @schema is optional database schema to use - not supported by all 
databases.
+        *
+        * @return  array of ADOFieldObjects for current table.
+        */
+       function &MetaColumns($table,$normalize=true) 
+       {
+       global $ADODB_FETCH_MODE;
+               
+               $false = false;
+               
+               if (!empty($this->metaColumnsSQL)) {
+               
+                       $schema = false;
+                       $this->_findschema($table,$schema);
+               
+                       $save = $ADODB_FETCH_MODE;
+                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+                       if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
+                       $rs = 
$this->Execute(sprintf($this->metaColumnsSQL,($normalize)?strtoupper($table):$table));
+                       if (isset($savem)) $this->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+                       if ($rs === false || $rs->EOF) return $false;
+
+                       $retarr = array();
+                       while (!$rs->EOF) { //print_r($rs->fields);
+                               $fld = new ADOFieldObject();
+                               $fld->name = $rs->fields[0];
+                               $fld->type = $rs->fields[1];
+                               if (isset($rs->fields[3]) && $rs->fields[3]) {
+                                       if ($rs->fields[3]>0) $fld->max_length 
= $rs->fields[3];
+                                       $fld->scale = $rs->fields[4];
+                                       if ($fld->scale>0) $fld->max_length += 
1;
+                               } else
+                                       $fld->max_length = $rs->fields[2];
+                                       
+                               if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) 
$retarr[] = $fld;     
+                               else $retarr[strtoupper($fld->name)] = $fld;
+                               $rs->MoveNext();
+                       }
+                       $rs->Close();
+                       return $retarr; 
+               }
+               return $false;
+       }
+       
+    /**
+      * List indexes on a table as an array.
+      * @param table  table name to query
+      * @param primary true to only show primary keys. Not actually used for 
most databases
+         *
+      * @return array of indexes on current table. Each element represents an 
index, and is itself an associative array.
+         
+                Array (
+                   [name_of_index] => Array
+                     (
+                 [unique] => true or false
+                 [columns] => Array
+                 (
+                       [0] => firstname
+                       [1] => lastname
+                 )
+               )               
+      */
+     function &MetaIndexes($table, $primary = false, $owner = false)
+     {
+                       $false = false;
+            return $false;
+     }
+
+       /**
+        * List columns names in a table as an array. 
+        * @param table table name to query
+        *
+        * @return  array of column names for current table.
+        */ 
+       function &MetaColumnNames($table, $numIndexes=false) 
+       {
+               $objarr =& $this->MetaColumns($table);
+               if (!is_array($objarr)) {
+                       $false = false;
+                       return $false;
+               }
+               $arr = array();
+               if ($numIndexes) {
+                       $i = 0;
+                       foreach($objarr as $v) $arr[$i++] = $v->name;
+               } else
+                       foreach($objarr as $v) $arr[strtoupper($v->name)] = 
$v->name;
+               
+               return $arr;
+       }
+                       
+       /**
+        * Different SQL databases used different methods to combine strings 
together.
+        * This function provides a wrapper. 
+        * 
+        * 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)
+       {
+               if (empty($d) && $d !== 0) return 'null';
+
+               if (is_string($d) && !is_numeric($d)) {
+                       if ($d === 'null' || strncmp($d,"'",1) === 0) return $d;
+                       if ($this->isoDates) return "'$d'";
+                       $d = ADOConnection::UnixDate($d);
+               }
+
+               return adodb_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)
+       {
+               if (empty($ts) && $ts !== 0) return 'null';
+
+               # strlen(14) allows YYYYMMDDHHMMSS format
+               if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
+                       return adodb_date($this->fmtTimeStamp,$ts);
+               
+               if ($ts === 'null') return $ts;
+               if ($this->isoDates && strlen($ts) !== 14) return "'$ts'";
+               
+               $ts = ADOConnection::UnixTimeStamp($ts);
+               return adodb_date($this->fmtTimeStamp,$ts);
+       }
+       
+       /**
+        * Also in ADORecordSet.
+        * @param $v is a date string in YYYY-MM-DD format
+        *
+        * @return date in unix timestamp format, or 0 if before 
TIMESTAMP_FIRST_YEAR, or false if invalid date format
+        */
+       function UnixDate($v)
+       {
+               if (is_object($v)) {
+               // odbtp support
+               //( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 
[minute] => 44 [second] => 8 [fraction] => 0 )
+                       return 
adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
+               }
+       
+               if (is_numeric($v) && strlen($v) !== 8) return $v;
+               if (!preg_match( 
"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
+                       ($v), $rr)) return false;
+
+               if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
+               // h-m-s-MM-DD-YY
+               return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+       }
+       
+
+       /**
+        * Also in ADORecordSet.
+        * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
+        *
+        * @return date in unix timestamp format, or 0 if before 
TIMESTAMP_FIRST_YEAR, or false if invalid date format
+        */
+       function UnixTimeStamp($v)
+       {
+               if (is_object($v)) {
+               // odbtp support
+               //( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 
[minute] => 44 [second] => 8 [fraction] => 0 )
+                       return 
adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
+               }
+               
+               if (!preg_match( 
+                       "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ 
,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+                       ($v), $rr)) return false;
+                       
+               if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
+       
+               // h-m-s-MM-DD-YY
+               if (!isset($rr[5])) return  
adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+               return  
@adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
+       }
+       
+       /**
+        * Also in ADORecordSet.
+        *
+        * Format database date based on user defined format.
+        *
+        * @param v     is the character date in YYYY-MM-DD format, returned by 
database
+        * @param fmt   is the format to apply to it, using date()
+        *
+        * @return a date formated as user desires
+        */
+        
+       function UserDate($v,$fmt='Y-m-d',$gmt=false)
+       {
+               $tt = $this->UnixDate($v);
+
+               // $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+               if (($tt === false || $tt == -1) && $v != false) return $v;
+               else if ($tt == 0) return $this->emptyDate;
+               else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
+               }
+               
+               return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
+       
+       }
+       
+               /**
+        *
+        * @param v     is the character timestamp in YYYY-MM-DD hh:mm:ss format
+        * @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',$gmt=false)
+       {
+               if (!isset($v)) return $this->emptyTimeStamp;
+               # strlen(14) allows YYYYMMDDHHMMSS format
+               if (is_numeric($v) && strlen($v)<14) return ($gmt) ? 
adodb_gmdate($fmt,$v) : adodb_date($fmt,$v);
+               $tt = $this->UnixTimeStamp($v);
+               // $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+               if (($tt === false || $tt == -1) && $v != false) return $v;
+               if ($tt == 0) return $this->emptyTimeStamp;
+               return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
+       }
+       
+       function escape($s,$magic_quotes=false)
+       {
+               return $this->addq($s,$magic_quotes);
+       }
+       
+       /**
+       * Quotes a string, without prefixing nor appending quotes. 
+       */
+       function addq($s,$magic_quotes=false)
+       {
+               if (!$magic_quotes) {
+               
+                       if ($this->replaceQuote[0] == '\\'){
+                               // only since php 4.0.5
+                               $s = 
adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+                               //$s = str_replace("\0","\\\0", 
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);
+               }
+       }
+       
+       /**
+        * Correctly quotes a string so that all strings are escaped. We prefix 
and append
+        * to the string single-quotes.
+        * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
+        * 
+        * @param s                     the string to quote
+        * @param [magic_quotes]        if $s is GET/POST var, set to 
get_magic_quotes_gpc().
+        *                              This undoes the stupidity of magic 
quotes for GPC.
+        *
+        * @return  quoted string to be sent back to database
+        */
+       function qstr($s,$magic_quotes=false)
+       {       
+               if (!$magic_quotes) {
+               
+                       if ($this->replaceQuote[0] == '\\'){
+                               // only since php 4.0.5
+                               $s = 
adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+                               //$s = str_replace("\0","\\\0", 
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 [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, 
$secs2cache=0) 
+       {
+               global $ADODB_INCLUDED_LIB;
+               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
+               if ($this->pageExecuteCountRows) $rs =& 
_adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache);
+               else $rs =& _adodb_pageexecute_no_last_page($this, $sql, 
$nrows, $page, $inputarr, $secs2cache);
+               return $rs;
+       }
+       
+               
+       /**
+       * Will select the supplied $page number from a recordset, given that it 
is paginated in pages of 
+       * $nrows rows per page. It also saves two boolean values saying if the 
given page is the first 
+       * and/or last one of the recordset. Added by Iván Oliva to provide 
recordset pagination.
+       *
+       * @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
+       * @return               the recordset ($rs->databaseType == 'array')
+       */
+       function &CachePageExecute($secs2cache, $sql, $nrows, 
$page,$inputarr=false) 
+       {
+               /*switch($this->dataProvider) {
+               case 'postgres':
+               case 'mysql': 
+                       break;
+               default: $secs2cache = 0; break;
+               }*/
+               $rs =& 
$this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache);
+               return $rs;
+       }
+
+} // end class ADOConnection
+       
+       
+       
+       
//==============================================================================================
        
+       // CLASS ADOFetchObj
+       
//==============================================================================================
        
+               
+       /**
+       * Internal placeholder for record objects. Used by 
ADORecordSet->FetchObj().
+       */
+       class ADOFetchObj {
+       };
+       
+       
//==============================================================================================
        
+       // CLASS ADORecordSet_empty
+       
//==============================================================================================
        
+       
+       /**
+       * Lightweight recordset when there are no records to be returned
+       */
+       class ADORecordSet_empty
+       {
+               var $dataProvider = 'empty';
+               var $databaseType = false;
+               var $EOF = true;
+               var $_numOfRows = 0;
+               var $fields = false;
+               var $connection = false;
+               function RowCount() {return 0;}
+               function RecordCount() {return 0;}
+               function PO_RecordCount(){return 0;}
+               function Close(){return true;}
+               function FetchRow() {return false;}
+               function FieldCount(){ return 0;}
+               function Init() {}
+       }
+       
+       
//==============================================================================================
        
+       // DATE AND TIME FUNCTIONS
+       
//==============================================================================================
        
+       include_once(ADODB_DIR.'/adodb-time.inc.php');
+       
+       
//==============================================================================================
        
+       // CLASS ADORecordSet
+       
//==============================================================================================
        
+
+       if (PHP_VERSION < 5) include_once(ADODB_DIR.'/adodb-php4.inc.php');
+       else include_once(ADODB_DIR.'/adodb-iterator.inc.php');
+   /**
+        * RecordSet class that represents the dataset returned by the database.
+        * To keep memory overhead low, this class holds only the current row 
in memory.
+        * No prefetching of data is done, so the RecordCount() can return -1 ( 
which
+        * means recordcount not known).
+        */
+       class ADORecordSet extends ADODB_BASE_RS {
+       /*
+        * public variables     
+        */
+       var $dataProvider = "native";
+       var $fields = false;    /// holds the current row data
+       var $blobSize = 100;    /// any varchar/char field this size or greater 
is treated as a blob
+                                                       /// in other words, we 
use a text area for editing.
+       var $canSeek = false;   /// indicates that seek is supported
+       var $sql;                               /// sql text
+       var $EOF = false;               /// Indicates that the current record 
position is after the last record in a Recordset object. 
+       
+       var $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
+       var $connection = false; /// the parent connection
+       /*
+        *      private variables       
+        */
+       var $_numOfRows = -1;   /** number of rows, or -1 */
+       var $_numOfFields = -1; /** number of fields in recordset */
+       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;                    /** Used by FetchObj */
+       
+       var $_currentPage = -1; /** Added by Iván Oliva to implement recordset 
pagination */
+       var $_atFirstPage = false;      /** Added by Iván Oliva to implement 
recordset pagination */
+       var $_atLastPage = false;       /** Added by Iván Oliva to implement 
recordset pagination */
+       var $_lastPageNo = -1; 
+       var $_maxRecordCount = 0;
+       var $datetime = false;
+       
+       /**
+        * Constructor
+        *
+        * @param queryID       this is the queryID returned by 
ADOConnection->_query()
+        *
+        */
+       function ADORecordSet($queryID) 
+       {
+               $this->_queryID = $queryID;
+       }
+       
+       
+       
+       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;
+                       if ($this->EOF = ($this->_fetch() === false)) {
+                               $this->_numOfRows = 0; // _numOfRows could be -1
+                       }
+               } else {
+                       $this->EOF = true;
+               }
+       }
+       
+       
+       /**
+        * Generate a SELECT tag string from a recordset, and return the string.
+        * If the recordset has 2 cols, we treat the 1st col as the containing 
+        * 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 tag
+        * @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 tag.
+        *                              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 address@hidden to support multiple hilited items
+        */
+       function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
+                       $size=0, $selectAttr='',$compareFields0=true)
+       {
+               global $ADODB_INCLUDED_LIB;
+               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
+               return _adodb_getmenu($this, 
$name,$defstr,$blank1stItem,$multiple,
+                       $size, $selectAttr,$compareFields0);
+       }
+       
+
+       
+       /**
+        * Generate a SELECT tag string from a recordset, and return the string.
+        * If the recordset has 2 cols, we treat the 1st col as the containing 
+        * 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 $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
+                       $size, $selectAttr,false);
+       }
+       
+       /*
+               Grouped Menu
+       */
+       function GetMenu3($name,$defstr='',$blank1stItem=true,$multiple=false,
+                       $size=0, $selectAttr='')
+       {
+               global $ADODB_INCLUDED_LIB;
+               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
+               return _adodb_getmenu_gp($this, 
$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) 
+       {
+       global $ADODB_EXTENSION; if ($ADODB_EXTENSION) {
+               $results = adodb_getall($this,$nRows);
+               return $results;
+       }
+               $results = array();
+               $cnt = 0;
+               while (!$this->EOF && $nRows != $cnt) {
+                       $results[] = $this->fields;
+                       $this->MoveNext();
+                       $cnt++;
+               }
+               return $results;
+       }
+       
+       function &GetAll($nRows = -1)
+       {
+               $arr =& $this->GetArray($nRows);
+               return $arr;
+       }
+       
+       /*
+       * Some databases allow multiple recordsets to be returned. This function
+       * will return true if there is a next recordset, or false if no more.
+       */
+       function NextRecordSet()
+       {
+               return false;
+       }
+       
+       /**
+        * 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) {
+                       $arr =& $this->GetArray($nrows);
+                       return $arr;
+               } 
+               
+               $this->Move($offset);
+               
+               $results = array();
+               $cnt = 0;
+               while (!$this->EOF && $nrows != $cnt) {
+                       $results[$cnt++] = $this->fields;
+                       $this->MoveNext();
+               }
+               
+               return $results;
+       }
+       
+       
+       /**
+        * Synonym for GetArray() for compatibility with ADO.
+        *
+        * @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) 
+       {
+               $arr =& $this->GetArray($nRows);
+               return $arr;
+       }
+       
+       /**
+        * return whole recordset as a 2-dimensional associative array if there 
are more than 2 columns. 
+        * The first column is treated as the key and is not included in the 
array. 
+        * 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.
+        *
+        * @param [first2cols] means if there are more than 2 cols, ignore the 
remaining cols and 
+        * instead of returning array[col0] => array(remaining cols), return 
array[col0] => col1
+        *
+        * @return an associative array indexed by the first column of the 
array, 
+        *      or false if the  data has less than 2 cols.
+        */
+       function &GetAssoc($force_array = false, $first2cols = false) 
+       {
+       global $ADODB_EXTENSION;
+       
+               $cols = $this->_numOfFields;
+               if ($cols < 2) {
+                       $false = false;
+                       return $false;
+               }
+               $numIndex = isset($this->fields[0]);
+               $results = array();
+               
+               if (!$first2cols && ($cols > 2 || $force_array)) {
+                       if ($ADODB_EXTENSION) {
+                               if ($numIndex) {
+                                       while (!$this->EOF) {
+                                               
$results[trim($this->fields[0])] = array_slice($this->fields, 1);
+                                               adodb_movenext($this);
+                                       }
+                               } else {
+                                       while (!$this->EOF) {
+                                               
$results[trim(reset($this->fields))] = array_slice($this->fields, 1);
+                                               adodb_movenext($this);
+                                       }
+                               }
+                       } else {
+                               if ($numIndex) {
+                                       while (!$this->EOF) {
+                                               
$results[trim($this->fields[0])] = array_slice($this->fields, 1);
+                                               $this->MoveNext();
+                                       }
+                               } else {
+                                       while (!$this->EOF) {
+                                               
$results[trim(reset($this->fields))] = array_slice($this->fields, 1);
+                                               $this->MoveNext();
+                                       }
+                               }
+                       }
+               } else {
+                       if ($ADODB_EXTENSION) {
+                               // return scalar values
+                               if ($numIndex) {
+                                       while (!$this->EOF) {
+                                       // some bug in mssql PHP 4.02 -- 
doesn't handle references properly so we FORCE creating a new string
+                                               
$results[trim(($this->fields[0]))] = $this->fields[1];
+                                               adodb_movenext($this);
+                                       }
+                               } else {
+                                       while (!$this->EOF) {
+                                       // some bug in mssql PHP 4.02 -- 
doesn't handle references properly so we FORCE creating a new string
+                                               $v1 = 
trim(reset($this->fields));
+                                               $v2 = ''.next($this->fields); 
+                                               $results[$v1] = $v2;
+                                               adodb_movenext($this);
+                                       }
+                               }
+                       } else {
+                               if ($numIndex) {
+                                       while (!$this->EOF) {
+                                       // some bug in mssql PHP 4.02 -- 
doesn't handle references properly so we FORCE creating a new string
+                                               
$results[trim(($this->fields[0]))] = $this->fields[1];
+                                               $this->MoveNext();
+                                       }
+                               } else {
+                                       while (!$this->EOF) {
+                                       // some bug in mssql PHP 4.02 -- 
doesn't handle references properly so we FORCE creating a new string
+                                               $v1 = 
trim(reset($this->fields));
+                                               $v2 = ''.next($this->fields); 
+                                               $results[$v1] = $v2;
+                                               $this->MoveNext();
+                                       }
+                               }
+                       }
+               }
+               
+               $ref =& $results; # workaround accelerator incompat with PHP 
4.4 :(
+               return $ref; 
+       }
+       
+       
+       /**
+        *
+        * @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')
+       {
+               if (is_numeric($v) && strlen($v)<14) return adodb_date($fmt,$v);
+               $tt = $this->UnixTimeStamp($v);
+               // $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+               if (($tt === false || $tt == -1) && $v != false) return $v;
+               if ($tt === 0) return $this->emptyTimeStamp;
+               return adodb_date($fmt,$tt);
+       }
+       
+       
+       /**
+        * @param v     is the character date in YYYY-MM-DD format, returned by 
database
+        * @param fmt   is the format to apply to it, using date()
+        *
+        * @return a date formated as user desires
+        */
+       function UserDate($v,$fmt='Y-m-d')
+       {
+               $tt = $this->UnixDate($v);
+               // $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+               if (($tt === false || $tt == -1) && $v != false) return $v;
+               else if ($tt == 0) return $this->emptyDate;
+               else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
+               }
+               return adodb_date($fmt,$tt);
+       }
+       
+       
+       /**
+        * @param $v is a date string in YYYY-MM-DD format
+        *
+        * @return date in unix timestamp format, or 0 if before 
TIMESTAMP_FIRST_YEAR, or false if invalid date format
+        */
+       function UnixDate($v)
+       {
+               return ADOConnection::UnixDate($v);
+       }
+       
+
+       /**
+        * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
+        *
+        * @return date in unix timestamp format, or 0 if before 
TIMESTAMP_FIRST_YEAR, or false if invalid date format
+        */
+       function UnixTimeStamp($v)
+       {
+               return ADOConnection::UnixTimeStamp($v);
+       }
+       
+       
+       /**
+       * 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->_numOfFields;
+       }
+       
+       /**
+       * 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) {
+                       $false = false;
+                       return $false;
+               }
+               $arr = $this->fields;
+               $this->_currentRow++;
+               if (!$this->_fetch()) $this->EOF = true;
+               return $arr;
+       }
+       
+       
+       /**
+       * Fetch a row, returning PEAR_Error if no more rows. 
+       * This is PEAR DB compat mode.
+       *
+       * @return DB_OK or error object
+       */
+       function FetchInto(&$arr)
+       {
+               if ($this->EOF) return (defined('PEAR_ERROR_RETURN')) ? new 
PEAR_Error('EOF',-1): false;
+               $arr = $this->fields;
+               $this->MoveNext();
+               return 1; // DB_OK
+       }
+       
+       
+       /**
+        * Move to the first row in the recordset. Many databases do NOT 
support this.
+        *
+        * @return true or false
+        */
+       function MoveFirst() 
+       {
+               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);
+               if ($this->EOF) return false;
+               while (!$this->EOF) {
+                       $f = $this->fields;
+                       $this->MoveNext();
+               }
+               $this->fields = $f;
+               $this->EOF = false;
+               return true;
+       }
+       
+       
+       /**
+        * Move to next record in the recordset.
+        *
+        * @return true if there still rows available, or false if there are no 
more rows (EOF).
+        */
+       function MoveNext() 
+       {
+               if (!$this->EOF) {
+                       $this->_currentRow++;
+                       if ($this->_fetch()) return true;
+               }
+               $this->EOF = true;
+               /* -- tested error handling when scrolling cursor -- seems 
useless.
+               $conn = $this->connection;
+               if ($conn && $conn->raiseErrorFn && ($errno = 
$conn->ErrorNo())) {
+                       $fn = $conn->raiseErrorFn;
+                       
$fn($conn->databaseType,'MOVENEXT',$errno,$conn->ErrorMsg().' 
('.$this->sql.')',$conn->host,$conn->database);
+               }
+               */
+               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) 
+       {
+               $this->EOF = false;
+               if ($rowNumber == $this->_currentRow) return true;
+               if ($rowNumber >= $this->_numOfRows)
+                       if ($this->_numOfRows != -1) $rowNumber = 
$this->_numOfRows-2;
+                               
+               if ($this->canSeek) { 
+       
+                       if ($this->_seek($rowNumber)) {
+                               $this->_currentRow = $rowNumber;
+                               if ($this->_fetch()) {
+                                       return true;
+                               }
+                       } else {
+                               $this->EOF = true;
+                               return false;
+                       }
+               } else {
+                       if ($rowNumber < $this->_currentRow) return false;
+                       global $ADODB_EXTENSION;
+                       if ($ADODB_EXTENSION) {
+                               while (!$this->EOF && $this->_currentRow < 
$rowNumber) {
+                                       adodb_movenext($this);
+                               }
+                       } else {
+                       
+                               while (! $this->EOF && $this->_currentRow < 
$rowNumber) {
+                                       $this->_currentRow++;
+                                       
+                                       if (!$this->_fetch()) $this->EOF = true;
+                               }
+                       }
+                       return !($this->EOF);
+               }
+               
+               $this->fields = false;  
+               $this->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];
+       }
+       
+       function GetAssocKeys($upper=true)
+       {
+               $this->bind = array();
+               for ($i=0; $i < $this->_numOfFields; $i++) {
+                       $o = $this->FetchField($i);
+                       if ($upper === 2) $this->bind[$o->name] = $i;
+                       else $this->bind[($upper) ? strtoupper($o->name) : 
strtolower($o->name)] = $i;
+               }
+       }
+       
+  /**
+   * Use associative array to get fields array for databases that do not 
support
+   * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
+   *
+   * If you don't want uppercase cols, set $ADODB_FETCH_MODE = 
ADODB_FETCH_ASSOC
+   * before you execute your SQL statement, and access $rs->fields['col'] 
directly.
+   *
+   * $upper  0 = lowercase, 1 = uppercase, 2 = whatever is returned by 
FetchField
+   */
+       function &GetRowAssoc($upper=1)
+       {
+               $record = array();
+        //     if (!$this->fields) return $record;
+               
+               if (!$this->bind) {
+                       $this->GetAssocKeys($upper);
+               }
+               
+               foreach($this->bind as $k => $v) {
+                       $record[$k] = $this->fields[$v];
+               }
+
+               return $record;
+       }
+       
+       
+       /**
+        * Clean up recordset
+        *
+        * @return true or false
+        */
+       function Close() 
+       {
+               // free connection object - this seems to globally free the 
object
+               // and not merely the reference, so don't do this...
+               // $this->connection = false; 
+               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;}
+       
+       
+       /*
+       * If we are using PageExecute(), this will return the maximum possible 
rows
+       * that can be returned when paging a recordset.
+       */
+       function MaxRecordCount()
+       {
+               return ($this->_maxRecordCount) ? $this->_maxRecordCount : 
$this->RecordCount();
+       }
+       
+       /**
+        * synonyms RecordCount and RowCount    
+        *
+        * @return the number of rows or -1 if this is not supported
+        */
+       function RowCount() {return $this->_numOfRows;} 
+       
+
+        /**
+        * Portable RecordCount. Pablo Roca <address@hidden>
+        *
+        * @return  the number of records from a previous SELECT. All databases 
support this.
+        *
+        * But aware possible problems in multiuser environments. For better 
speed the table
+        * must be indexed by the condition. Heavy test this before deploying.
+        */ 
+       function PO_RecordCount($table="", $condition="") {
+               
+               $lnumrows = $this->_numOfRows;
+               // the database doesn't support native recordcount, so we do a 
workaround
+               if ($lnumrows == -1 && $this->connection) {
+                       IF ($table) {
+                               if ($condition) $condition = " WHERE " . 
$condition; 
+                               $resultrows = 
&$this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
+                               if ($resultrows) $lnumrows = 
reset($resultrows->fields);
+                       }
+               }
+               return $lnumrows;
+       }
+       
+       /**
+        * @return the current row in the recordset. If at EOF, will return the 
last row. 0-based.
+        */
+       function CurrentRow() {return $this->_currentRow;}
+       
+       /**
+        * synonym for CurrentRow -- for ADO compat
+        *
+        * @return the current row in the recordset. If at EOF, will return the 
last row. 0-based.
+        */
+       function AbsolutePosition() {return $this->_currentRow;}
+       
+       /**
+        * @return the number of columns in the recordset. Some databases will 
set this to 0
+        * if no records are returned, others will return the number of columns 
in the query.
+        */
+       function FieldCount() {return $this->_numOfFields;}   
+
+
+       /**
+        * 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
+       }       
+       
+       /**
+        * Get the ADOFieldObjects of all columns in an array.
+        *
+        */
+       function& FieldTypesArray()
+       {
+               $arr = array();
+               for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
+                       $arr[] = $this->FetchField($i);
+               return $arr;
+       }
+       
+       /**
+       * Return the fields array of the current row as an object for 
convenience.
+       * The default case is lowercase field names.
+       *
+       * @return the object with the properties set to the fields of the 
current row
+       */
+       function &FetchObj()
+       {
+               $o =& $this->FetchObject(false);
+               return $o;
+       }
+       
+       /**
+       * Return the fields array of the current row as an object for 
convenience.
+       * The default case is uppercase.
+       * 
+       * @param $isupper to set the object property names to uppercase
+       *
+       * @return the object with the properties set to the fields of the 
current row
+       */
+       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;
+               if (PHP_VERSION >= 5) $o = clone($this->_obj);
+               else $o = $this->_obj;
+       
+               for ($i=0; $i <$this->_numOfFields; $i++) {
+                       $name = $this->_names[$i];
+                       if ($isupper) $n = strtoupper($name);
+                       else $n = $name;
+                       
+                       $o->$n = $this->Fields($name);
+               }
+               return $o;
+       }
+       
+       /**
+       * Return the fields array of the current row as an object for 
convenience.
+       * The default is lower-case field names.
+       * 
+       * @return the object with the properties set to the fields of the 
current row,
+       *       or false if EOF
+       *
+       * Fixed bug reported by address@hidden
+       */
+       function &FetchNextObj()
+       {
+               $o =& $this->FetchNextObject(false);
+               return $o;
+       }
+       
+       
+       /**
+       * Return the fields array of the current row as an object for 
convenience. 
+       * The default is upper case field names.
+       * 
+       * @param $isupper to set the object property names to uppercase
+       *
+       * @return the object with the properties set to the fields of the 
current row,
+       *       or false if EOF
+       *
+       * Fixed bug reported by address@hidden
+       */
+       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 < 250 chars
+        *      X for teXt (>= 250 chars)
+        *      B for Binary
+        *      N for numeric or 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)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+       // changed in 2.32 to hashing instead of switch stmt for speed...
+       static $typeMap = array(
+               'VARCHAR' => 'C',
+               'VARCHAR2' => 'C',
+               'CHAR' => 'C',
+               'C' => 'C',
+               'STRING' => 'C',
+               'NCHAR' => 'C',
+               'NVARCHAR' => 'C',
+               'VARYING' => 'C',
+               'BPCHAR' => 'C',
+               'CHARACTER' => 'C',
+               'INTERVAL' => 'C',  # Postgres
+               ##
+               'LONGCHAR' => 'X',
+               'TEXT' => 'X',
+               'NTEXT' => 'X',
+               'M' => 'X',
+               'X' => 'X',
+               'CLOB' => 'X',
+               'NCLOB' => 'X',
+               'LVARCHAR' => 'X',
+               ##
+               'BLOB' => 'B',
+               'IMAGE' => 'B',
+               'BINARY' => 'B',
+               'VARBINARY' => 'B',
+               'LONGBINARY' => 'B',
+               'B' => 'B',
+               ##
+               'YEAR' => 'D', // mysql
+               'DATE' => 'D',
+               'D' => 'D',
+               ##
+               'TIME' => 'T',
+               'TIMESTAMP' => 'T',
+               'DATETIME' => 'T',
+               'TIMESTAMPTZ' => 'T',
+               'T' => 'T',
+               ##
+               'BOOL' => 'L',
+               'BOOLEAN' => 'L', 
+               'BIT' => 'L',
+               'L' => 'L',
+               ##
+               'COUNTER' => 'R',
+               'R' => 'R',
+               'SERIAL' => 'R', // ifx
+               'INT IDENTITY' => 'R',
+               ##
+               'INT' => 'I',
+               'INT2' => 'I',
+               'INT4' => 'I',
+               'INT8' => 'I',
+               'INTEGER' => 'I',
+               'INTEGER UNSIGNED' => 'I',
+               'SHORT' => 'I',
+               'TINYINT' => 'I',
+               'SMALLINT' => 'I',
+               'I' => 'I',
+               ##
+               'LONG' => 'N', // interbase is numeric, oci8 is blob
+               'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
+               'DECIMAL' => 'N',
+               'DEC' => 'N',
+               'REAL' => 'N',
+               'DOUBLE' => 'N',
+               'DOUBLE PRECISION' => 'N',
+               'SMALLFLOAT' => 'N',
+               'FLOAT' => 'N',
+               'NUMBER' => 'N',
+               'NUM' => 'N',
+               'NUMERIC' => 'N',
+               'MONEY' => 'N',
+               
+               ## informix 9.2
+               'SQLINT' => 'I', 
+               'SQLSERIAL' => 'I', 
+               'SQLSMINT' => 'I', 
+               'SQLSMFLOAT' => 'N', 
+               'SQLFLOAT' => 'N', 
+               'SQLMONEY' => 'N', 
+               'SQLDECIMAL' => 'N', 
+               'SQLDATE' => 'D', 
+               'SQLVCHAR' => 'C', 
+               'SQLCHAR' => 'C', 
+               'SQLDTIME' => 'T', 
+               'SQLINTERVAL' => 'N', 
+               'SQLBYTES' => 'B', 
+               'SQLTEXT' => 'X' 
+               );
+               
+               $tmap = false;
+               $t = strtoupper($t);
+               $tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N';
+               switch ($tmap) {
+               case 'C':
+               
+                       // is the char field is too long, return as text 
field... 
+                       if ($this->blobSize >= 0) {
+                               if ($len > $this->blobSize) return 'X';
+                       } else if ($len > 250) {
+                               return 'X';
+                       }
+                       return 'C';
+                       
+               case 'I':
+                       if (!empty($fieldobj->primary_key)) return 'R';
+                       return 'I';
+               
+               case false:
+                       return 'N';
+                       
+               case 'B':
+                        if (isset($fieldobj->binary)) 
+                                return ($fieldobj->binary) ? 'B' : 'X';
+                       return 'B';
+               
+               case 'D':
+                       if (!empty($this->connection) && 
!empty($this->connection->datetime)) return 'T';
+                       return 'D';
+                       
+               default: 
+                       if ($t == 'LONG' && $this->dataProvider == 'oci8') 
return 'B';
+                       return $tmap;
+               }
+       }
+       
+       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;
+       }
+       
+       function LastPageNo($page = false)
+       {
+               if ($page != false) $this->_lastPageNo = $page;
+               return $this->_lastPageNo;
+       }
+       
+       /**
+        * 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
+       
+       
//==============================================================================================
        
+       // CLASS ADORecordSet_array
+       
//==============================================================================================
        
+       
+       /**
+        * This class encapsulates the concept of a recordset created in memory
+        * as an array. This is useful for the creation of cached recordsets.
+        * 
+        * Note that the constructor is different from the standard ADORecordSet
+        */
+       
+       class ADORecordSet_array extends ADORecordSet
+       {
+               var $databaseType = 'array';
+
+               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 = '';
+               var $compat = false;
+               /**
+                * Constructor
+                *
+                */
+               function ADORecordSet_array($fakeid=1)
+               {
+               global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
+               
+                       // fetch() on EOF does not delete $this->fields
+                       $this->compat = !empty($ADODB_COMPAT_FETCH);
+                       $this->ADORecordSet($fakeid); // fake queryID           
+                       $this->fetchMode = $ADODB_FETCH_MODE;
+               }
+               
+               
+               /**
+                * Setup the array.
+                *
+                * @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->_skiprow1 = true;
+                               $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 &GetArray($nRows=-1)
+               {
+                       if ($nRows == -1 && $this->_currentRow <= 0 && 
!$this->_skiprow1) {
+                               return $this->_array;
+                       } else {
+                               $arr =& ADORecordSet::GetArray($nRows);
+                               return $arr;
+                       }
+               }
+               
+               function _initrs()
+               {
+                       $this->_numOfRows =  sizeof($this->_array);
+                       if ($this->_skiprow1) $this->_numOfRows -= 1;
+               
+                       $this->_numOfFields =(isset($this->_fieldobjects)) ?
+                                
sizeof($this->_fieldobjects):sizeof($this->_types);
+               }
+               
+               /* Use associative array to get fields array */
+               function Fields($colname)
+               {
+                       $mode = isset($this->adodbFetchMode) ? 
$this->adodbFetchMode : $this->fetchMode;
+                       
+                       if ($mode & ADODB_FETCH_ASSOC) {
+                               if (!isset($this->fields[$colname])) $colname = 
strtolower($colname);
+                               return $this->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)
+               {
+                       if (sizeof($this->_array) && 0 <= $row && $row < 
$this->_numOfRows) {
+                               $this->_currentRow = $row;
+                               if ($this->_skiprow1) $row += 1;
+                               $this->fields = $this->_array[$row];
+                               return true;
+                       }
+                       return false;
+               }
+               
+               function MoveNext() 
+               {
+                       if (!$this->EOF) {              
+                               $this->_currentRow++;
+                               
+                               $pos = $this->_currentRow;
+                               
+                               if ($this->_numOfRows <= $pos) {
+                                       if (!$this->compat) $this->fields = 
false;
+                               } else {
+                                       if ($this->_skiprow1) $pos += 1;
+                                       $this->fields = $this->_array[$pos];
+                                       return true;
+                               }               
+                               $this->EOF = true;
+                       }
+                       
+                       return false;
+               }       
+       
+               function _fetch()
+               {
+                       $pos = $this->_currentRow;
+                       
+                       if ($this->_numOfRows <= $pos) {
+                               if (!$this->compat) $this->fields = false;
+                               return false;
+                       }
+                       if ($this->_skiprow1) $pos += 1;
+                       $this->fields = $this->_array[$pos];
+                       return true;
+               }
+               
+               function _close() 
+               {
+                       return true;    
+               }
+       
+       } // ADORecordSet_array
+
+       
//==============================================================================================
        
+       // HELPER FUNCTIONS
+       
//==============================================================================================
                        
+       
+       /**
+        * Synonym for ADOLoadCode. Private function. Do not use.
+        *
+        * @deprecated
+        */
+       function ADOLoadDB($dbType) 
+       { 
+               return ADOLoadCode($dbType);
+       }
+               
+       /**
+        * Load the code for a specific database driver. Private function. Do 
not use.
+        */
+       function ADOLoadCode($dbType) 
+       {
+       global $ADODB_LASTDB;
+       
+               if (!$dbType) return false;
+               $db = strtolower($dbType);
+               switch ($db) {
+                       case 'ado': 
+                               if (PHP_VERSION >= 5) $db = 'ado5';
+                               $class = 'ado'; 
+                               break;
+                       case 'ifx':
+                       case 'maxsql': $class = $db = 'mysqlt'; break;
+                       case 'postgres':
+                       case 'postgres8':
+                       case 'pgsql': $class = $db = 'postgres7'; break;
+                       default:
+                               $class = $db; break;
+               }
+               
+               $file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
+               @include_once($file);
+               $ADODB_LASTDB = $class;
+               if (class_exists("ADODB_" . $class)) return $class;
+               
+               //ADOConnection::outp(adodb_pr(get_declared_classes(),true));
+               if (!file_exists($file)) ADOConnection::outp("Missing file: 
$file");
+               else ADOConnection::outp("Syntax error in file: $file");
+               return false;
+       }
+
+       /**
+        * synonym for ADONewConnection for people like me who cannot remember 
the correct name
+        */
+       function &NewADOConnection($db='')
+       {
+               $tmp =& ADONewConnection($db);
+               return $tmp;
+       }
+       
+       /**
+        * 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_NEWCONNECTION, $ADODB_LASTDB;
+               
+               if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
+               $errorfn = (defined('ADODB_ERROR_HANDLER')) ? 
ADODB_ERROR_HANDLER : false;
+               $false = false;
+               if ($at = strpos($db,'://')) {
+                       $origdsn = $db;
+                       if (PHP_VERSION < 5) $dsna = @parse_url($db);
+                       else {
+                               $fakedsn = 'fake'.substr($db,$at);
+                               $dsna = @parse_url($fakedsn);
+                               $dsna['scheme'] = substr($db,0,$at);
+                       
+                               if (strncmp($db,'pdo',3) == 0) {
+                                       $sch = explode('_',$dsna['scheme']);
+                                       if (sizeof($sch)>1) {
+                                               $dsna['host'] = 
isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
+                                               $dsna['host'] = 
rawurlencode($sch[1].':host='.rawurldecode($dsna['host']));
+                                               $dsna['scheme'] = 'pdo';
+                                       }
+                               }
+                       }
+                       
+                       if (!$dsna) {
+                               // special handling of oracle, which might not 
have host
+                               $db = str_replace('@/','@adodb-fakehost/',$db);
+                               $dsna = parse_url($db);
+                               if (!$dsna) return $false;
+                               $dsna['host'] = '';
+                       }
+                       $db = @$dsna['scheme'];
+                       if (!$db) return $false;
+                       $dsna['host'] = isset($dsna['host']) ? 
rawurldecode($dsna['host']) : '';
+                       $dsna['user'] = isset($dsna['user']) ? 
rawurldecode($dsna['user']) : '';
+                       $dsna['pass'] = isset($dsna['pass']) ? 
rawurldecode($dsna['pass']) : '';
+                       $dsna['path'] = isset($dsna['path']) ? 
rawurldecode(substr($dsna['path'],1)) : ''; # strip off initial /
+                       
+                       if (isset($dsna['query'])) {
+                               $opt1 = explode('&',$dsna['query']);
+                               foreach($opt1 as $k => $v) {
+                                       $arr = explode('=',$v);
+                                       $opt[$arr[0]] = isset($arr[1]) ? 
rawurldecode($arr[1]) : 1;
+                               }
+                       } else $opt = array();
+               }
+       /*
+        *  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
+        */
+               if (!empty($ADODB_NEWCONNECTION)) {
+                       $obj = $ADODB_NEWCONNECTION($db);
+
+               } else {
+               
+                       if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
+                       if (empty($db)) $db = $ADODB_LASTDB;
+                       
+                       if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
+                       
+                       if (!$db) {
+                               if (isset($origdsn)) $db = $origdsn;
+                               if ($errorfn) {
+                                       // raise an error
+                                       $ignore = false;
+                                       $errorfn('ADONewConnection', 
'ADONewConnection', -998,
+                                                        "could not load the 
database driver for '$db'",
+                                                        $db,false,$ignore);
+                               } else
+                                        ADOConnection::outp( 
"<p>ADONewConnection: Unable to load database driver '$db'</p>",false);
+                                       
+                               return $false;
+                       }
+                       
+                       $cls = 'ADODB_'.$db;
+                       if (!class_exists($cls)) {
+                               adodb_backtrace();
+                               return $false;
+                       }
+                       
+                       $obj = new $cls();
+               }
+               
+               # constructor should not fail
+               if ($obj) {
+                       if ($errorfn)  $obj->raiseErrorFn = $errorfn;
+                       if (isset($dsna)) {
+                               if (isset($dsna['port'])) $obj->port = 
$dsna['port'];
+                               foreach($opt as $k => $v) {
+                                       switch(strtolower($k)) {
+                                       case 'new':
+                                                                               
$nconnect = true; $persist = true; break;
+                                       case 'persist':
+                                       case 'persistent':      $persist = $v; 
break;
+                                       case 'debug':           $obj->debug = 
(integer) $v; break;
+                                       #ibase
+                                       case 'role':            $obj->role = 
$v; break;
+                                       case 'dialect':         $obj->dialect = 
(integer) $v; break;
+                                       case 'charset':         $obj->charset = 
$v; $obj->charSet=$v; break;
+                                       case 'buffers':         $obj->buffers = 
$v; break;
+                                       case 'fetchmode':   
$obj->SetFetchMode($v); break;
+                                       #ado
+                                       case 'charpage':        $obj->charPage 
= $v; break;
+                                       #mysql, mysqli
+                                       case 'clientflags': $obj->clientFlags = 
$v; break;
+                                       #mysql, mysqli, postgres
+                                       case 'port': $obj->port = $v; break;
+                                       #mysqli
+                                       case 'socket': $obj->socket = $v; break;
+                                       #oci8
+                                       case 'nls_date_format': 
$obj->NLS_DATE_FORMAT = $v; break;
+                                       }
+                               }
+                               if (empty($persist))
+                                       $ok = $obj->Connect($dsna['host'], 
$dsna['user'], $dsna['pass'], $dsna['path']);
+                               else if (empty($nconnect))
+                                       $ok = $obj->PConnect($dsna['host'], 
$dsna['user'], $dsna['pass'], $dsna['path']);
+                               else
+                                       $ok = $obj->NConnect($dsna['host'], 
$dsna['user'], $dsna['pass'], $dsna['path']);
+                                       
+                               if (!$ok) return $false;
+                       }
+               }
+               return $obj;
+       }
+       
+       
+       
+       // $perf == true means called by NewPerfMonitor(), otherwise for data 
dictionary
+       function _adodb_getdriver($provider,$drivername,$perf=false)
+       {
+               switch ($provider) {
+               case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return 
substr($drivername,6); 
+               case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return 
substr($drivername,5); 
+               case 'ado'  :   if (strncmp('ado_',$drivername,4)==0) return 
substr($drivername,4);
+               case 'native':  break;
+               default:
+                       return $provider;
+               }
+               
+               switch($drivername) {
+               case 'mysqlt':
+               case 'mysqli': 
+                               $drivername='mysql'; 
+                               break;
+               case 'postgres7':
+               case 'postgres8':
+                               $drivername = 'postgres'; 
+                               break;  
+               case 'firebird15': $drivername = 'firebird'; break;
+               case 'oracle': $drivername = 'oci8'; break;
+               case 'access': if ($perf) $drivername = ''; break;
+               case 'db2'   : break;
+               case 'odbc_db2': $drivername = 'db2'; break;
+               case 'sapdb' : break;
+               default:
+                       $drivername = 'generic';
+                       break;
+               }
+               return $drivername;
+       }
+       
+       function &NewPerfMonitor(&$conn)
+       {
+               $false = false;
+               $drivername = 
_adodb_getdriver($conn->dataProvider,$conn->databaseType,true);
+               if (!$drivername || $drivername == 'generic') return $false;
+               include_once(ADODB_DIR.'/adodb-perf.inc.php');
+               @include_once(ADODB_DIR."/perf/perf-$drivername.inc.php");
+               $class = "Perf_$drivername";
+               if (!class_exists($class)) return $false;
+               $perf = new $class($conn);
+               
+               return $perf;
+       }
+       
+       function &NewDataDictionary(&$conn,$drivername=false)
+       {
+               $false = false;
+               if (!$drivername) $drivername = 
_adodb_getdriver($conn->dataProvider,$conn->databaseType);
+
+               include_once(ADODB_DIR.'/adodb-lib.inc.php');
+               include_once(ADODB_DIR.'/adodb-datadict.inc.php');
+               $path = ADODB_DIR."/datadict/datadict-$drivername.inc.php";
+
+               if (!file_exists($path)) {
+                       ADOConnection::outp("Database driver '$path' not 
available");
+                       return $false;
+               }
+               include_once($path);
+               $class = "ADODB2_$drivername";
+               $dict = new $class();
+               $dict->dataProvider = $conn->dataProvider;
+               $dict->connection = &$conn;
+               $dict->upperName = strtoupper($drivername);
+               $dict->quote = $conn->nameQuote;
+               if (!empty($conn->_connectionID))
+                       $dict->serverInfo = $conn->ServerInfo();
+               
+               return $dict;
+       }
+
+
+       
+       /*
+               Perform a print_r, with pre tags for better formatting.
+       */
+       function adodb_pr($var,$as_string=false)
+       {
+               if ($as_string) ob_start();
+               
+               if (isset($_SERVER['HTTP_USER_AGENT'])) { 
+                       echo " <pre>\n";print_r($var);echo "</pre>\n";
+               } else
+                       print_r($var);
+                       
+               if ($as_string) {
+                       $s = ob_get_contents();
+                       ob_end_clean();
+                       return $s;
+               }
+       }
+       
+       /*
+               Perform a stack-crawl and pretty print it.
+               
+               @param printOrArr  Pass in a boolean to indicate print, or an 
$exception->trace array (assumes that print is true then).
+               @param levels Number of levels to display
+       */
+       function adodb_backtrace($printOrArr=true,$levels=9999)
+       {
+               global $ADODB_INCLUDED_LIB;
+               if (empty($ADODB_INCLUDED_LIB)) 
include_once(ADODB_DIR.'/adodb-lib.inc.php');
+               return _adodb_backtrace($printOrArr,$levels);
+       }
+
+
+}
+?>
Index: phpgwapi/inc/adodb/contrib/toxmlrpc.inc.php
diff -u phpgwapi/inc/adodb/contrib/toxmlrpc.inc.php:1.2 
phpgwapi/inc/adodb/contrib/toxmlrpc.inc.php:1.3
--- phpgwapi/inc/adodb/contrib/toxmlrpc.inc.php:1.2     Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/contrib/toxmlrpc.inc.php Tue Feb 21 13:47:42 2006
@@ -1,157 +1,183 @@
-<?php
-    /**
-    * Helper functions to convert between ADODB recordset objects and XMLRPC 
values.
-    * Uses John Lim's AdoDB and Edd Dumbill's phpxmlrpc libs
-    * 
-    * @author Daniele Baroncelli
-    * @author Gaetano Giunta
-    * @copyright (c) 2003 Giunta/Baroncelli. All rights reserved.
-    * 
-    * @todo some more error checking here and there
-    * @todo document the xmlrpc-struct used to encode recordset info
-    */
-
-    /**
-    * Include the main libraries
-    */    
-    require_once('xmlrpc.inc');
-    require_once('adodb.inc.php');
-            
-    /**
-    * Builds an xmlrpc struct value out of an AdoDB recordset
-    */
-    function rs2xmlrpcval(&$adodbrs) {
-
-        $numfields = $adodbrs->FieldCount();
-        $numrecords = $adodbrs->RecordCount();
-
-        // build structure holding recordset information
-        $fieldstruct = array();
-        for ($i = 0; $i < $numfields; $i++) {
-            $fld = $adodbrs->FetchField($i);
-            $fieldarray = array();
-            if (isset($fld->name))
-                $fieldarray["name"] = new xmlrpcval ($fld->name);
-            if (isset($fld->type))
-                $fieldarray["type"] = new xmlrpcval ($fld->type);
-            if (isset($fld->max_length))
-                $fieldarray["max_length"] = new xmlrpcval ($fld->max_length, 
"int");
-            if (isset($fld->not_null))
-                $fieldarray["not_null"] = new xmlrpcval ($fld->not_null, 
"boolean");
-            if (isset($fld->has_default))
-                $fieldarray["has_default"] = new xmlrpcval ($fld->has_default, 
"boolean");
-            if (isset($fld->default_value))
-                $fieldarray["default_value"] = new xmlrpcval 
($fld->default_value);
-            $fieldstruct[$i] = new xmlrpcval ($fieldarray, "struct");
-        }
-        $fieldcount = new xmlrpcval ($numfields, "int");
-        $recordcount = new xmlrpcval ($numrecords, "int");
-        $sql = new xmlrpcval ($adodbrs->sql);
-        $fieldinfo = new xmlrpcval ($fieldstruct, "array");
-
-        $header = new xmlrpcval ( array(
-                "fieldcount" => $fieldcount,
-                "recordcount" => $recordcount,
-                "sql" => $sql,
-                "fieldinfo" => $fieldinfo
-                ), "struct");
-
-        // build structure containing recordset data
-        $rows = array();
-        while (!$adodbrs->EOF) {
-            $columns = array();
-            // This should work on all cases of fetch mode: assoc, num, both 
or default
-            if ($adodbrs->fetchMode == 'ADODB_FETCH_BOTH' || 
count($adodbrs->fields) == 2 * $adodbrs->FieldCount())
-                for ($i = 0; $i < $numfields; $i++)
-                    if ($columns[$i] === null)
-                        $columns[$i] = new xmlrpcval ('');
-                    else
-                        $columns[$i] = xmlrpc_encode ($adodbrs->fields[$i]);
-            else
-                foreach ($adodbrs->fields as $val)
-                    if ($val === null)
-                        $columns[$i] = new xmlrpcval ('');
-                    else
-                        $columns[] = xmlrpc_encode ($val);
-
-            $rows[] = new xmlrpcval ($columns, "array");
-
-            $adodbrs->MoveNext();
-        }
-        $body = new xmlrpcval ($rows, "array");
-
-        // put it all together and build final xmlrpc struct
-        $xmlrpcrs = new xmlrpcval ( array(
-                "header" => $header,
-                "body" => $body,
-                ), "struct");
-
-        return $xmlrpcrs;
-
-    }
-
-    /**
-    * Returns an xmlrpc struct value as string out of an AdoDB recordset
-    */    
-    function rs2xmlrpcstring (&$adodbrs) {
-        $xmlrpc = rs2xmlrpcval ($adodbrs);
-        if ($xmlrpc)
-          return $xmlrpc->serialize();
-        else
-          return null;
-    }
-
-    /**
-    * Given a well-formed xmlrpc struct object returns an AdoDB object
-    * 
-    * @todo add some error checking on the input value
-    */
-    function xmlrpcval2rs (&$xmlrpcval) {
-
-        $fields_array = array();
-        $data_array = array();
- 
-        // rebuild column information  
-        $header =& $xmlrpcval->structmem('header');
-        
-        $numfields = $header->structmem('fieldcount');
-        $numfields = $numfields->scalarval();
-        $numrecords = $header->structmem('recordcount');
-        $numrecords = $numrecords->scalarval();
-        $sqlstring = $header->structmem('sql');
-        $sqlstring = $sqlstring->scalarval();
-        
-        $fieldinfo =& $header->structmem('fieldinfo');
-        for ($i = 0; $i < $numfields; $i++) {
-            $temp =& $fieldinfo->arraymem($i);
-            $fld = new ADOFieldObject();
-            while (list($key,$value) = $temp->structeach()) {
-                if ($key == "name") $fld->name = $value->scalarval();
-                if ($key == "type") $fld->type = $value->scalarval();
-                if ($key == "max_length") $fld->max_length = 
$value->scalarval();
-                if ($key == "not_null") $fld->not_null = $value->scalarval();
-                if ($key == "has_default") $fld->has_default = 
$value->scalarval();
-                if ($key == "default_value") $fld->default_value = 
$value->scalarval();
-            } // while
-            $fields_array[] = $fld;
-        } // for
-
-        // fetch recordset information into php array
-        $body =& $xmlrpcval->structmem('body');
-        for ($i = 0; $i < $numrecords; $i++) {
-            $data_array[$i]= array();
-            $xmlrpcrs_row =& $body->arraymem($i);
-            for ($j = 0; $j < $numfields; $j++) {
-                $temp =& $xmlrpcrs_row->arraymem($j);
-                $data_array[$i][$j] = $temp->scalarval();
-            } // for j
-        } // for i
-
-        // finally build in-memory recordset object and return it
-        $rs = new ADORecordSet_array();
-        $rs->InitArrayFields($data_array,$fields_array);
-        return $rs;
-
-    }
-
-?>
+<?php
+    /**
+    * Helper functions to convert between ADODB recordset objects and XMLRPC 
values.
+    * Uses John Lim's AdoDB and Edd Dumbill's phpxmlrpc libs
+    * 
+    * @author Daniele Baroncelli
+    * @author Gaetano Giunta
+    * @copyright (c) 2003-2004 Giunta/Baroncelli. All rights reserved.
+    * 
+    * @todo some more error checking here and there
+    * @todo document the xmlrpc-struct used to encode recordset info
+    * @todo verify if using xmlrpc_encode($rs->GetArray()) would work with:
+    *       - ADODB_FETCH_BOTH
+    *       - null values
+    */
+
+    /**
+    * Include the main libraries
+    */    
+    require_once('xmlrpc.inc');
+    if (!defined('ADODB_DIR')) require_once('adodb.inc.php');
+            
+    /**
+    * Builds an xmlrpc struct value out of an AdoDB recordset
+    */
+    function rs2xmlrpcval(&$adodbrs) {
+
+        $header =& rs2xmlrpcval_header($adodbrs);
+        $body =& rs2xmlrpcval_body($adodbrs);
+
+        // put it all together and build final xmlrpc struct
+        $xmlrpcrs =& new xmlrpcval ( array(
+                "header" => $header,
+                "body" => $body,
+                ), "struct");
+
+        return $xmlrpcrs;
+
+    }
+
+    /**
+    * Builds an xmlrpc struct value describing an AdoDB recordset
+    */
+    function rs2xmlrpcval_header($adodbrs)
+    {
+        $numfields = $adodbrs->FieldCount();
+        $numrecords = $adodbrs->RecordCount();
+
+        // build structure holding recordset information
+        $fieldstruct = array();
+        for ($i = 0; $i < $numfields; $i++) {
+            $fld = $adodbrs->FetchField($i);
+            $fieldarray = array();
+            if (isset($fld->name))
+                $fieldarray["name"] =& new xmlrpcval ($fld->name);
+            if (isset($fld->type))
+                $fieldarray["type"] =& new xmlrpcval ($fld->type);
+            if (isset($fld->max_length))
+                $fieldarray["max_length"] =& new xmlrpcval ($fld->max_length, 
"int");
+            if (isset($fld->not_null))
+                $fieldarray["not_null"] =& new xmlrpcval ($fld->not_null, 
"boolean");
+            if (isset($fld->has_default))
+                $fieldarray["has_default"] =& new xmlrpcval 
($fld->has_default, "boolean");
+            if (isset($fld->default_value))
+                $fieldarray["default_value"] =& new xmlrpcval 
($fld->default_value);
+            $fieldstruct[$i] =& new xmlrpcval ($fieldarray, "struct");
+        }
+        $fieldcount =& new xmlrpcval ($numfields, "int");
+        $recordcount =& new xmlrpcval ($numrecords, "int");
+        $sql =& new xmlrpcval ($adodbrs->sql);
+        $fieldinfo =& new xmlrpcval ($fieldstruct, "array");
+
+        $header =& new xmlrpcval ( array(
+                "fieldcount" => $fieldcount,
+                "recordcount" => $recordcount,
+                "sql" => $sql,
+                "fieldinfo" => $fieldinfo
+                ), "struct");
+
+        return $header;
+    }
+
+    /**
+    * Builds an xmlrpc struct value out of an AdoDB recordset
+    * (data values only, no data definition)
+    */
+    function rs2xmlrpcval_body($adodbrs)
+    {
+        $numfields = $adodbrs->FieldCount();
+
+        // build structure containing recordset data
+        $adodbrs->MoveFirst();
+        $rows = array();
+        while (!$adodbrs->EOF) {
+            $columns = array();
+            // This should work on all cases of fetch mode: assoc, num, both 
or default
+            if ($adodbrs->fetchMode == 'ADODB_FETCH_BOTH' || 
count($adodbrs->fields) == 2 * $adodbrs->FieldCount())
+                for ($i = 0; $i < $numfields; $i++)
+                    if ($adodbrs->fields[$i] === null)
+                        $columns[$i] =& new xmlrpcval ('');
+                    else
+                        $columns[$i] =& xmlrpc_encode ($adodbrs->fields[$i]);
+            else
+                foreach ($adodbrs->fields as $val)
+                    if ($val === null)
+                        $columns[] =& new xmlrpcval ('');
+                    else
+                        $columns[] =& xmlrpc_encode ($val);
+
+            $rows[] =& new xmlrpcval ($columns, "array");
+
+            $adodbrs->MoveNext();
+        }
+        $body =& new xmlrpcval ($rows, "array");
+
+        return $body;    
+    }
+    
+    /**
+    * Returns an xmlrpc struct value as string out of an AdoDB recordset
+    */    
+    function rs2xmlrpcstring (&$adodbrs) {
+        $xmlrpc = rs2xmlrpcval ($adodbrs);
+        if ($xmlrpc)
+          return $xmlrpc->serialize();
+        else
+          return null;
+    }
+
+    /**
+    * Given a well-formed xmlrpc struct object returns an AdoDB object
+    * 
+    * @todo add some error checking on the input value
+    */
+    function xmlrpcval2rs (&$xmlrpcval) {
+
+        $fields_array = array();
+        $data_array = array();
+ 
+        // rebuild column information  
+        $header =& $xmlrpcval->structmem('header');
+        
+        $numfields = $header->structmem('fieldcount');
+        $numfields = $numfields->scalarval();
+        $numrecords = $header->structmem('recordcount');
+        $numrecords = $numrecords->scalarval();
+        $sqlstring = $header->structmem('sql');
+        $sqlstring = $sqlstring->scalarval();
+        
+        $fieldinfo =& $header->structmem('fieldinfo');
+        for ($i = 0; $i < $numfields; $i++) {
+            $temp =& $fieldinfo->arraymem($i);
+            $fld =& new ADOFieldObject();
+            while (list($key,$value) = $temp->structeach()) {
+                if ($key == "name") $fld->name = $value->scalarval();
+                if ($key == "type") $fld->type = $value->scalarval();
+                if ($key == "max_length") $fld->max_length = 
$value->scalarval();
+                if ($key == "not_null") $fld->not_null = $value->scalarval();
+                if ($key == "has_default") $fld->has_default = 
$value->scalarval();
+                if ($key == "default_value") $fld->default_value = 
$value->scalarval();
+            } // while
+            $fields_array[] = $fld;
+        } // for
+
+        // fetch recordset information into php array
+        $body =& $xmlrpcval->structmem('body');
+        for ($i = 0; $i < $numrecords; $i++) {
+            $data_array[$i]= array();
+            $xmlrpcrs_row =& $body->arraymem($i);
+            for ($j = 0; $j < $numfields; $j++) {
+                $temp =& $xmlrpcrs_row->arraymem($j);
+                $data_array[$i][$j] = $temp->scalarval();
+            } // for j
+        } // for i
+
+        // finally build in-memory recordset object and return it
+        $rs =& new ADORecordSet_array();
+        $rs->InitArrayFields($data_array,$fields_array);
+        return $rs;
+
+    }
+
+?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-access.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-access.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-access.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-access.inc.php:1.2     Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-access.inc.php Tue Feb 21 13:47:42 2006
@@ -1,95 +1,95 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_access extends ADODB_DataDict {
-       
-       var $databaseType = 'access';
-       var $seqField = false;
-       
-       
-       function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'TEXT';
-               case 'XL':
-               case 'X': return 'MEMO'; 
-               
-               case 'C2': return 'TEXT'; // up to 32K
-               case 'X2': return 'MEMO';
-               
-               case 'B': return 'BINARY';
-                       
-               case 'D': return 'DATETIME';
-               case 'T': return 'DATETIME';
-               
-               case 'L': return 'BYTE';
-               case 'I': return 'INTEGER';
-               case 'I1': return 'BYTE';
-               case 'I2': return 'SMALLINT';
-               case 'I4': return 'INTEGER';
-               case 'I8': return 'INTEGER';
-               
-               case 'F': return 'DOUBLE';
-               case 'N': return 'NUMERIC';
-               default:
-                       return $meta;
-               }
-       }
-       
-       // return string must begin with space
-       function _CreateSuffix($fname, &$ftype, 
$fnotnull,$fdefault,$fautoinc,$fconstraint)
-       {
-               if ($fautoinc) {
-                       $ftype = 'COUNTER';
-                       return '';
-               }
-               if (substr($ftype,0,7) == 'DECIMAL') $ftype = 'DECIMAL';
-               $suffix = '';
-               if (strlen($fdefault)) {
-                       //$suffix .= " DEFAULT $fdefault";
-                       if ($this->debug) ADOConnection::outp("Warning: Access 
does not supported DEFAULT values (field $fname)");
-               }
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               return $suffix;
-       }
-       
-       function CreateDatabase($dbname,$options=false)
-       {
-               return array();
-       }
-       
-       
-       function SetSchema($schema)
-       {
-       }
-
-       function AlterColumnSQL($tabname, $flds)
-       {
-               if ($this->debug) ADOConnection::outp("AlterColumnSQL not 
supported");
-               return array();
-       }
-       
-       
-       function DropColumnSQL($tabname, $flds)
-       {
-               if ($this->debug) ADOConnection::outp("DropColumnSQL not 
supported");
-               return array();
-       }
-       
-}
-
-
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_access extends ADODB_DataDict {
+       
+       var $databaseType = 'access';
+       var $seqField = false;
+       
+       
+       function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'TEXT';
+               case 'XL':
+               case 'X': return 'MEMO'; 
+               
+               case 'C2': return 'TEXT'; // up to 32K
+               case 'X2': return 'MEMO';
+               
+               case 'B': return 'BINARY';
+                       
+               case 'D': return 'DATETIME';
+               case 'T': return 'DATETIME';
+               
+               case 'L': return 'BYTE';
+               case 'I': return 'INTEGER';
+               case 'I1': return 'BYTE';
+               case 'I2': return 'SMALLINT';
+               case 'I4': return 'INTEGER';
+               case 'I8': return 'INTEGER';
+               
+               case 'F': return 'DOUBLE';
+               case 'N': return 'NUMERIC';
+               default:
+                       return $meta;
+               }
+       }
+       
+       // return string must begin with space
+       function _CreateSuffix($fname, &$ftype, 
$fnotnull,$fdefault,$fautoinc,$fconstraint)
+       {
+               if ($fautoinc) {
+                       $ftype = 'COUNTER';
+                       return '';
+               }
+               if (substr($ftype,0,7) == 'DECIMAL') $ftype = 'DECIMAL';
+               $suffix = '';
+               if (strlen($fdefault)) {
+                       //$suffix .= " DEFAULT $fdefault";
+                       if ($this->debug) ADOConnection::outp("Warning: Access 
does not supported DEFAULT values (field $fname)");
+               }
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               return $suffix;
+       }
+       
+       function CreateDatabase($dbname,$options=false)
+       {
+               return array();
+       }
+       
+       
+       function SetSchema($schema)
+       {
+       }
+
+       function AlterColumnSQL($tabname, $flds)
+       {
+               if ($this->debug) ADOConnection::outp("AlterColumnSQL not 
supported");
+               return array();
+       }
+       
+       
+       function DropColumnSQL($tabname, $flds)
+       {
+               if ($this->debug) ADOConnection::outp("DropColumnSQL not 
supported");
+               return array();
+       }
+       
+}
+
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-db2.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-db2.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-db2.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-db2.inc.php:1.2        Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-db2.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,143 +1,143 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_db2 extends ADODB_DataDict {
-       
-       var $databaseType = 'db2';
-       var $seqField = false;
-       
-       function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'VARCHAR';
-               case 'XL': return 'CLOB';
-               case 'X': return 'VARCHAR(3600)'; 
-
-               case 'C2': return 'VARCHAR'; // up to 32K
-               case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default 
page size too small
-
-               case 'B': return 'BLOB';
-
-               case 'D': return 'DATE';
-               case 'T': return 'TIMESTAMP';
-
-               case 'L': return 'SMALLINT';
-               case 'I': return 'INTEGER';
-               case 'I1': return 'SMALLINT';
-               case 'I2': return 'SMALLINT';
-               case 'I4': return 'INTEGER';
-               case 'I8': return 'BIGINT';
-
-               case 'F': return 'DOUBLE';
-               case 'N': return 'DECIMAL';
-               default:
-                       return $meta;
-               }
-       }
-       
-       // return string must begin with space
-       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-       {       
-               $suffix = '';
-               if ($fautoinc) return ' GENERATED ALWAYS AS IDENTITY'; # as 
identity start with 
-               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               return $suffix;
-       }
-
-       function AlterColumnSQL($tabname, $flds)
-       {
-               if ($this->debug) ADOConnection::outp("AlterColumnSQL not 
supported");
-               return array();
-       }
-       
-       
-       function DropColumnSQL($tabname, $flds)
-       {
-               if ($this->debug) ADOConnection::outp("DropColumnSQL not 
supported");
-               return array();
-       }
-       
-       
-       function xChangeTableSQL($tablename, $flds, $tableoptions = false)
-       {
-               
-               /**
-                 Allow basic table changes to DB2 databases
-                 DB2 will fatally reject changes to non character columns 
-
-               */
-               
-               $validTypes = array("CHAR","VARC");
-               $invalidTypes = array("BIGI","BLOB","CLOB","DATE", 
"DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
-               // check table exists
-               $cols = &$this->MetaColumns($tablename);
-               if ( empty($cols)) { 
-                       return $this->CreateTableSQL($tablename, $flds, 
$tableoptions);
-               }
-               
-               // already exists, alter table instead
-               list($lines,$pkey) = $this->_GenFields($flds);
-               $alter = 'ALTER TABLE ' . $this->TableName($tablename);
-               $sql = array();
-               
-               foreach ( $lines as $id => $v ) {
-                       if ( isset($cols[$id]) && is_object($cols[$id]) ) {
-                               /**
-                                 If the first field of $v is the fieldname, and
-                                 the second is the field type/size, we assume 
its an
-                                 attempt to modify the column size, so check 
that it is allowed
-                                 $v can have an indeterminate number of blanks 
between the
-                                 fields, so account for that too
-                                */
-                               $vargs = explode(' ' , $v);
-                               // assume that $vargs[0] is the field name.
-                               $i=0;
-                               // Find the next non-blank value;
-                               for ($i=1;$i<sizeof($vargs);$i++)
-                                       if ($vargs[$i] != '')
-                                               break;
-                               
-                               // if $vargs[$i] is one of the following, we 
are trying to change the
-                               // size of the field, if not allowed, simply 
ignore the request.
-                               if 
(in_array(substr($vargs[$i],0,4),$invalidTypes)) 
-                                       continue;
-                               // insert the appropriate DB2 syntax
-                               if 
(in_array(substr($vargs[$i],0,4),$validTypes)) {
-                                       
array_splice($vargs,$i,0,array('SET','DATA','TYPE'));
-                               }
-
-                               // Now Look for the NOT NULL statement as this 
is not allowed in
-                               // the ALTER table statement. If it is in 
there, remove it
-                               if (in_array('NOT',$vargs) && 
in_array('NULL',$vargs)) {
-                                       for ($i=1;$i<sizeof($vargs);$i++)
-                                       if ($vargs[$i] == 'NOT')
-                                               break;
-                                       array_splice($vargs,$i,2,'');
-                               }
-                               $v = implode(' ',$vargs);       
-                               $sql[] = $alter . $this->alterCol . ' ' . $v;
-                       } else {
-                               $sql[] = $alter . $this->addCol . ' ' . $v;
-                       }
-               }
-               
-               return $sql;
-       }
-       
-}
-
-
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_db2 extends ADODB_DataDict {
+       
+       var $databaseType = 'db2';
+       var $seqField = false;
+       
+       function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'VARCHAR';
+               case 'XL': return 'CLOB';
+               case 'X': return 'VARCHAR(3600)'; 
+
+               case 'C2': return 'VARCHAR'; // up to 32K
+               case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default 
page size too small
+
+               case 'B': return 'BLOB';
+
+               case 'D': return 'DATE';
+               case 'T': return 'TIMESTAMP';
+
+               case 'L': return 'SMALLINT';
+               case 'I': return 'INTEGER';
+               case 'I1': return 'SMALLINT';
+               case 'I2': return 'SMALLINT';
+               case 'I4': return 'INTEGER';
+               case 'I8': return 'BIGINT';
+
+               case 'F': return 'DOUBLE';
+               case 'N': return 'DECIMAL';
+               default:
+                       return $meta;
+               }
+       }
+       
+       // return string must begin with space
+       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
+       {       
+               $suffix = '';
+               if ($fautoinc) return ' GENERATED ALWAYS AS IDENTITY'; # as 
identity start with 
+               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               return $suffix;
+       }
+
+       function AlterColumnSQL($tabname, $flds)
+       {
+               if ($this->debug) ADOConnection::outp("AlterColumnSQL not 
supported");
+               return array();
+       }
+       
+       
+       function DropColumnSQL($tabname, $flds)
+       {
+               if ($this->debug) ADOConnection::outp("DropColumnSQL not 
supported");
+               return array();
+       }
+       
+       
+       function ChangeTableSQL($tablename, $flds, $tableoptions = false)
+       {
+               
+               /**
+                 Allow basic table changes to DB2 databases
+                 DB2 will fatally reject changes to non character columns 
+
+               */
+               
+               $validTypes = array("CHAR","VARC");
+               $invalidTypes = array("BIGI","BLOB","CLOB","DATE", 
"DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
+               // check table exists
+               $cols = &$this->MetaColumns($tablename);
+               if ( empty($cols)) { 
+                       return $this->CreateTableSQL($tablename, $flds, 
$tableoptions);
+               }
+               
+               // already exists, alter table instead
+               list($lines,$pkey) = $this->_GenFields($flds);
+               $alter = 'ALTER TABLE ' . $this->TableName($tablename);
+               $sql = array();
+               
+               foreach ( $lines as $id => $v ) {
+                       if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+                               /**
+                                 If the first field of $v is the fieldname, and
+                                 the second is the field type/size, we assume 
its an
+                                 attempt to modify the column size, so check 
that it is allowed
+                                 $v can have an indeterminate number of blanks 
between the
+                                 fields, so account for that too
+                                */
+                               $vargs = explode(' ' , $v);
+                               // assume that $vargs[0] is the field name.
+                               $i=0;
+                               // Find the next non-blank value;
+                               for ($i=1;$i<sizeof($vargs);$i++)
+                                       if ($vargs[$i] != '')
+                                               break;
+                               
+                               // if $vargs[$i] is one of the following, we 
are trying to change the
+                               // size of the field, if not allowed, simply 
ignore the request.
+                               if 
(in_array(substr($vargs[$i],0,4),$invalidTypes)) 
+                                       continue;
+                               // insert the appropriate DB2 syntax
+                               if 
(in_array(substr($vargs[$i],0,4),$validTypes)) {
+                                       
array_splice($vargs,$i,0,array('SET','DATA','TYPE'));
+                               }
+
+                               // Now Look for the NOT NULL statement as this 
is not allowed in
+                               // the ALTER table statement. If it is in 
there, remove it
+                               if (in_array('NOT',$vargs) && 
in_array('NULL',$vargs)) {
+                                       for ($i=1;$i<sizeof($vargs);$i++)
+                                       if ($vargs[$i] == 'NOT')
+                                               break;
+                                       array_splice($vargs,$i,2,'');
+                               }
+                               $v = implode(' ',$vargs);       
+                               $sql[] = $alter . $this->alterCol . ' ' . $v;
+                       } else {
+                               $sql[] = $alter . $this->addCol . ' ' . $v;
+                       }
+               }
+               
+               return $sql;
+       }
+       
+}
+
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php:1.2   Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php       Tue Feb 21 
13:47:42 2006
@@ -1,151 +1,151 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-
-class ADODB2_firebird15 extends ADODB_DataDict {
-       
-       var $databaseType = 'firebird15';
-       var $seqField = false;
-       var $seqPrefix = 'gen_';
-       var $blobSize = 40000;  
-       
-       function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'VARCHAR';
-               case 'XL':
-               case 'X': return 'VARCHAR(4000)'; 
-               
-               case 'C2': return 'VARCHAR'; // up to 32K
-               case 'X2': return 'VARCHAR(4000)';
-               
-               case 'B': return 'BLOB';
-                       
-               case 'D': return 'DATE';
-               case 'T': return 'TIMESTAMP';
-               
-               case 'L': return 'SMALLINT';
-               case 'I': return 'INTEGER';
-               case 'I1': return 'SMALLINT';
-               case 'I2': return 'SMALLINT';
-               case 'I4': return 'INTEGER';
-               case 'I8': return 'INTEGER';
-               
-               case 'F': return 'DOUBLE PRECISION';
-               case 'N': return 'DECIMAL';
-               default:
-                       return $meta;
-               }
-       }
-       
-       function NameQuote($name = NULL)
-       {
-               if (!is_string($name)) {
-                       return FALSE;
-               }
-               
-               $name = trim($name);
-               
-               if ( !is_object($this->connection) ) {
-                       return $name;
-               }
-               
-               $quote = $this->connection->nameQuote;
-               
-               // if name is of the form `name`, quote it
-               if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
-                       return $quote . $matches[1] . $quote;
-               }
-               
-               // if name contains special characters, quote it
-               if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
-                       return $quote . $name . $quote;
-               }
-               
-               return $quote . $name . $quote;
-       }
-
-       function CreateDatabase($dbname, $options=false)
-       {
-               $options = $this->_Options($options);
-               $sql = array();
-               
-               $sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS 
CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
-               
-               return $sql;
-       }
-       
-       function _DropAutoIncrement($t)
-       {
-               if (strpos($t,'.') !== false) {
-                       $tarr = explode('.',$t);
-                       return 'DROP GENERATOR '.$tarr[0].'."gen_'.$tarr[1].'"';
-               }
-               return 'DROP GENERATOR "GEN_'.$t;
-       }
-       
-
-       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-       {
-               $suffix = '';
-               
-               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               if ($fautoinc) $this->seqField = $fname;
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               
-               return $suffix;
-       }
-       
-/*
-CREATE or replace TRIGGER jaddress_insert
-before insert on jaddress
-for each row
-begin
-IF ( NEW."seqField" IS NULL OR NEW."seqField" = 0 ) THEN
-  NEW."seqField" = GEN_ID("GEN_tabname", 1);
-end;
-*/
-       function _Triggers($tabname,$tableoptions)
-       {       
-               if (!$this->seqField) return array();
-               
-               $tab1 = preg_replace( '/"/', '', $tabname );
-               if ($this->schema) {
-                       $t = strpos($tab1,'.');
-                       if ($t !== false) $tab = substr($tab1,$t+1);
-                       else $tab = $tab1;
-                       $seqField = $this->seqField;
-                       $seqname = $this->schema.'.'.$this->seqPrefix.$tab;
-                       $trigname = 
$this->schema.'.trig_'.$this->seqPrefix.$tab;
-               } else {
-                       $seqField = $this->seqField;
-                       $seqname = $this->seqPrefix.$tab1;
-                       $trigname = 'trig_'.$seqname;
-               }
-               if (isset($tableoptions['REPLACE']))
-               { $sql[] = "DROP GENERATOR \"$seqname\"";
-                 $sql[] = "CREATE GENERATOR \"$seqname\"";
-                 $sql[] = "ALTER TRIGGER \"$trigname\" BEFORE INSERT OR UPDATE 
AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = 
GEN_ID(\"$seqname\", 1); END";
-               }
-               else
-               { $sql[] = "CREATE GENERATOR \"$seqname\"";
-                 $sql[] = "CREATE TRIGGER \"$trigname\" FOR $tabname BEFORE 
INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) 
THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
-               }
-               
-               $this->seqField = false;
-               return $sql;
-       }
-
-}
-
-
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+class ADODB2_firebird extends ADODB_DataDict {
+       
+       var $databaseType = 'firebird';
+       var $seqField = false;
+       var $seqPrefix = 'gen_';
+       var $blobSize = 40000;  
+       
+       function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'VARCHAR';
+               case 'XL': return 'VARCHAR(32000)'; 
+               case 'X': return 'VARCHAR(4000)'; 
+               
+               case 'C2': return 'VARCHAR'; // up to 32K
+               case 'X2': return 'VARCHAR(4000)';
+               
+               case 'B': return 'BLOB';
+                       
+               case 'D': return 'DATE';
+               case 'T': return 'TIMESTAMP';
+               
+               case 'L': return 'SMALLINT';
+               case 'I': return 'INTEGER';
+               case 'I1': return 'SMALLINT';
+               case 'I2': return 'SMALLINT';
+               case 'I4': return 'INTEGER';
+               case 'I8': return 'INTEGER';
+               
+               case 'F': return 'DOUBLE PRECISION';
+               case 'N': return 'DECIMAL';
+               default:
+                       return $meta;
+               }
+       }
+       
+       function NameQuote($name = NULL)
+       {
+               if (!is_string($name)) {
+                       return FALSE;
+               }
+               
+               $name = trim($name);
+               
+               if ( !is_object($this->connection) ) {
+                       return $name;
+               }
+               
+               $quote = $this->connection->nameQuote;
+               
+               // if name is of the form `name`, quote it
+               if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
+                       return $quote . $matches[1] . $quote;
+               }
+               
+               // if name contains special characters, quote it
+               if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
+                       return $quote . $name . $quote;
+               }
+               
+               return $quote . $name . $quote;
+       }
+
+       function CreateDatabase($dbname, $options=false)
+       {
+               $options = $this->_Options($options);
+               $sql = array();
+               
+               $sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS 
CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
+               
+               return $sql;
+       }
+       
+       function _DropAutoIncrement($t)
+       {
+               if (strpos($t,'.') !== false) {
+                       $tarr = explode('.',$t);
+                       return 'DROP GENERATOR '.$tarr[0].'."gen_'.$tarr[1].'"';
+               }
+               return 'DROP GENERATOR "GEN_'.$t;
+       }
+       
+
+       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+       {
+               $suffix = '';
+               
+               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               if ($fautoinc) $this->seqField = $fname;
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               
+               return $suffix;
+       }
+       
+/*
+CREATE or replace TRIGGER jaddress_insert
+before insert on jaddress
+for each row
+begin
+IF ( NEW."seqField" IS NULL OR NEW."seqField" = 0 ) THEN
+  NEW."seqField" = GEN_ID("GEN_tabname", 1);
+end;
+*/
+       function _Triggers($tabname,$tableoptions)
+       {       
+               if (!$this->seqField) return array();
+               
+               $tab1 = preg_replace( '/"/', '', $tabname );
+               if ($this->schema) {
+                       $t = strpos($tab1,'.');
+                       if ($t !== false) $tab = substr($tab1,$t+1);
+                       else $tab = $tab1;
+                       $seqField = $this->seqField;
+                       $seqname = $this->schema.'.'.$this->seqPrefix.$tab;
+                       $trigname = 
$this->schema.'.trig_'.$this->seqPrefix.$tab;
+               } else {
+                       $seqField = $this->seqField;
+                       $seqname = $this->seqPrefix.$tab1;
+                       $trigname = 'trig_'.$seqname;
+               }
+               if (isset($tableoptions['REPLACE']))
+               { $sql[] = "DROP GENERATOR \"$seqname\"";
+                 $sql[] = "CREATE GENERATOR \"$seqname\"";
+                 $sql[] = "ALTER TRIGGER \"$trigname\" BEFORE INSERT OR UPDATE 
AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = 
GEN_ID(\"$seqname\", 1); END";
+               }
+               else
+               { $sql[] = "CREATE GENERATOR \"$seqname\"";
+                 $sql[] = "CREATE TRIGGER \"$trigname\" FOR $tabname BEFORE 
INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) 
THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
+               }
+               
+               $this->seqField = false;
+               return $sql;
+       }
+
+}
+
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-generic.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-generic.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-generic.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-generic.inc.php:1.2    Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-generic.inc.php        Tue Feb 21 
13:47:42 2006
@@ -1,125 +1,125 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_generic extends ADODB_DataDict {
-       
-       var $databaseType = 'generic';
-       var $seqField = false;
-       
-       
-       function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'VARCHAR';
-               case 'XL':
-               case 'X': return 'VARCHAR(250)';
-               
-               case 'C2': return 'VARCHAR';
-               case 'X2': return 'VARCHAR(250)';
-               
-               case 'B': return 'VARCHAR';
-                       
-               case 'D': return 'DATE';
-               case 'T': return 'DATE';
-               
-               case 'L': return 'DECIMAL(1)';
-               case 'I': return 'DECIMAL(10)';
-               case 'I1': return 'DECIMAL(3)';
-               case 'I2': return 'DECIMAL(5)';
-               case 'I4': return 'DECIMAL(10)';
-               case 'I8': return 'DECIMAL(20)';
-               
-               case 'F': return 'DECIMAL(32,8)';
-               case 'N': return 'DECIMAL';
-               default:
-                       return $meta;
-               }
-       }
-
-       function AlterColumnSQL($tabname, $flds)
-       {
-               if ($this->debug) ADOConnection::outp("AlterColumnSQL not 
supported");
-               return array();
-       }
-       
-       
-       function DropColumnSQL($tabname, $flds)
-       {
-               if ($this->debug) ADOConnection::outp("DropColumnSQL not 
supported");
-               return array();
-       }
-       
-}
-
-/*
-//db2
-       function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'VARCHAR';
-               case 'X': return 'VARCHAR'; 
-               
-               case 'C2': return 'VARCHAR'; // up to 32K
-               case 'X2': return 'VARCHAR';
-               
-               case 'B': return 'BLOB';
-                       
-               case 'D': return 'DATE';
-               case 'T': return 'TIMESTAMP';
-               
-               case 'L': return 'SMALLINT';
-               case 'I': return 'INTEGER';
-               case 'I1': return 'SMALLINT';
-               case 'I2': return 'SMALLINT';
-               case 'I4': return 'INTEGER';
-               case 'I8': return 'BIGINT';
-               
-               case 'F': return 'DOUBLE';
-               case 'N': return 'DECIMAL';
-               default:
-                       return $meta;
-               }
-       }
-       
-// ifx
-function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'VARCHAR';// 255
-               case 'X': return 'TEXT'; 
-               
-               case 'C2': return 'NVARCHAR';
-               case 'X2': return 'TEXT';
-               
-               case 'B': return 'BLOB';
-                       
-               case 'D': return 'DATE';
-               case 'T': return 'DATETIME';
-               
-               case 'L': return 'SMALLINT';
-               case 'I': return 'INTEGER';
-               case 'I1': return 'SMALLINT';
-               case 'I2': return 'SMALLINT';
-               case 'I4': return 'INTEGER';
-               case 'I8': return 'DECIMAL(20)';
-               
-               case 'F': return 'FLOAT';
-               case 'N': return 'DECIMAL';
-               default:
-                       return $meta;
-               }
-       }
-*/
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_generic extends ADODB_DataDict {
+       
+       var $databaseType = 'generic';
+       var $seqField = false;
+       
+       
+       function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'VARCHAR';
+               case 'XL':
+               case 'X': return 'VARCHAR(250)';
+               
+               case 'C2': return 'VARCHAR';
+               case 'X2': return 'VARCHAR(250)';
+               
+               case 'B': return 'VARCHAR';
+                       
+               case 'D': return 'DATE';
+               case 'T': return 'DATE';
+               
+               case 'L': return 'DECIMAL(1)';
+               case 'I': return 'DECIMAL(10)';
+               case 'I1': return 'DECIMAL(3)';
+               case 'I2': return 'DECIMAL(5)';
+               case 'I4': return 'DECIMAL(10)';
+               case 'I8': return 'DECIMAL(20)';
+               
+               case 'F': return 'DECIMAL(32,8)';
+               case 'N': return 'DECIMAL';
+               default:
+                       return $meta;
+               }
+       }
+
+       function AlterColumnSQL($tabname, $flds)
+       {
+               if ($this->debug) ADOConnection::outp("AlterColumnSQL not 
supported");
+               return array();
+       }
+       
+       
+       function DropColumnSQL($tabname, $flds)
+       {
+               if ($this->debug) ADOConnection::outp("DropColumnSQL not 
supported");
+               return array();
+       }
+       
+}
+
+/*
+//db2
+       function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'VARCHAR';
+               case 'X': return 'VARCHAR'; 
+               
+               case 'C2': return 'VARCHAR'; // up to 32K
+               case 'X2': return 'VARCHAR';
+               
+               case 'B': return 'BLOB';
+                       
+               case 'D': return 'DATE';
+               case 'T': return 'TIMESTAMP';
+               
+               case 'L': return 'SMALLINT';
+               case 'I': return 'INTEGER';
+               case 'I1': return 'SMALLINT';
+               case 'I2': return 'SMALLINT';
+               case 'I4': return 'INTEGER';
+               case 'I8': return 'BIGINT';
+               
+               case 'F': return 'DOUBLE';
+               case 'N': return 'DECIMAL';
+               default:
+                       return $meta;
+               }
+       }
+       
+// ifx
+function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'VARCHAR';// 255
+               case 'X': return 'TEXT'; 
+               
+               case 'C2': return 'NVARCHAR';
+               case 'X2': return 'TEXT';
+               
+               case 'B': return 'BLOB';
+                       
+               case 'D': return 'DATE';
+               case 'T': return 'DATETIME';
+               
+               case 'L': return 'SMALLINT';
+               case 'I': return 'INTEGER';
+               case 'I1': return 'SMALLINT';
+               case 'I2': return 'SMALLINT';
+               case 'I4': return 'INTEGER';
+               case 'I8': return 'DECIMAL(20)';
+               
+               case 'F': return 'FLOAT';
+               case 'N': return 'DECIMAL';
+               default:
+                       return $meta;
+               }
+       }
+*/
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php:1.2      Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php  Tue Feb 21 13:47:42 2006
@@ -1,67 +1,67 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_ibase extends ADODB_DataDict {
-       
-       var $databaseType = 'ibase';
-       var $seqField = false;
-       
-       
-       function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'VARCHAR';
-               case 'XL':
-               case 'X': return 'VARCHAR(4000)'; 
-               
-               case 'C2': return 'VARCHAR'; // up to 32K
-               case 'X2': return 'VARCHAR(4000)';
-               
-               case 'B': return 'BLOB';
-                       
-               case 'D': return 'DATE';
-               case 'T': return 'TIMESTAMP';
-               
-               case 'L': return 'SMALLINT';
-               case 'I': return 'INTEGER';
-               case 'I1': return 'SMALLINT';
-               case 'I2': return 'SMALLINT';
-               case 'I4': return 'INTEGER';
-               case 'I8': return 'INTEGER';
-               
-               case 'F': return 'DOUBLE PRECISION';
-               case 'N': return 'DECIMAL';
-               default:
-                       return $meta;
-               }
-       }
-
-       function AlterColumnSQL($tabname, $flds)
-       {
-               if ($this->debug) ADOConnection::outp("AlterColumnSQL not 
supported");
-               return array();
-       }
-       
-       
-       function DropColumnSQL($tabname, $flds)
-       {
-               if ($this->debug) ADOConnection::outp("DropColumnSQL not 
supported");
-               return array();
-       }
-       
-}
-
-
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_ibase extends ADODB_DataDict {
+       
+       var $databaseType = 'ibase';
+       var $seqField = false;
+       
+       
+       function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'VARCHAR';
+               case 'XL':
+               case 'X': return 'VARCHAR(4000)'; 
+               
+               case 'C2': return 'VARCHAR'; // up to 32K
+               case 'X2': return 'VARCHAR(4000)';
+               
+               case 'B': return 'BLOB';
+                       
+               case 'D': return 'DATE';
+               case 'T': return 'TIMESTAMP';
+               
+               case 'L': return 'SMALLINT';
+               case 'I': return 'INTEGER';
+               case 'I1': return 'SMALLINT';
+               case 'I2': return 'SMALLINT';
+               case 'I4': return 'INTEGER';
+               case 'I8': return 'INTEGER';
+               
+               case 'F': return 'DOUBLE PRECISION';
+               case 'N': return 'DECIMAL';
+               default:
+                       return $meta;
+               }
+       }
+
+       function AlterColumnSQL($tabname, $flds)
+       {
+               if ($this->debug) ADOConnection::outp("AlterColumnSQL not 
supported");
+               return array();
+       }
+       
+       
+       function DropColumnSQL($tabname, $flds)
+       {
+               if ($this->debug) ADOConnection::outp("DropColumnSQL not 
supported");
+               return array();
+       }
+       
+}
+
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-informix.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-informix.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-informix.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-informix.inc.php:1.2   Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-informix.inc.php       Tue Feb 21 
13:47:42 2006
@@ -1,80 +1,80 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_informix extends ADODB_DataDict {
-       
-       var $databaseType = 'informix';
-       var $seqField = false;
-       
-       
-       function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'VARCHAR';// 255
-               case 'XL':
-               case 'X': return 'TEXT'; 
-               
-               case 'C2': return 'NVARCHAR';
-               case 'X2': return 'TEXT';
-               
-               case 'B': return 'BLOB';
-                       
-               case 'D': return 'DATE';
-               case 'T': return 'DATETIME';
-               
-               case 'L': return 'SMALLINT';
-               case 'I': return 'INTEGER';
-               case 'I1': return 'SMALLINT';
-               case 'I2': return 'SMALLINT';
-               case 'I4': return 'INTEGER';
-               case 'I8': return 'DECIMAL(20)';
-               
-               case 'F': return 'FLOAT';
-               case 'N': return 'DECIMAL';
-               default:
-                       return $meta;
-               }
-       }
-
-       function AlterColumnSQL($tabname, $flds)
-       {
-               if ($this->debug) ADOConnection::outp("AlterColumnSQL not 
supported");
-               return array();
-       }
-       
-       
-       function DropColumnSQL($tabname, $flds)
-       {
-               if ($this->debug) ADOConnection::outp("DropColumnSQL not 
supported");
-               return array();
-       }
-       
-       // return string must begin with space
-       function _CreateSuffix($fname, &$ftype, 
$fnotnull,$fdefault,$fautoinc,$fconstraint)
-       {
-               if ($fautoinc) {
-                       $ftype = 'SERIAL';
-                       return '';
-               }
-               $suffix = '';
-               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               return $suffix;
-       }
-       
-}
-
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_informix extends ADODB_DataDict {
+       
+       var $databaseType = 'informix';
+       var $seqField = false;
+       
+       
+       function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'VARCHAR';// 255
+               case 'XL':
+               case 'X': return 'TEXT'; 
+               
+               case 'C2': return 'NVARCHAR';
+               case 'X2': return 'TEXT';
+               
+               case 'B': return 'BLOB';
+                       
+               case 'D': return 'DATE';
+               case 'T': return 'DATETIME';
+               
+               case 'L': return 'SMALLINT';
+               case 'I': return 'INTEGER';
+               case 'I1': return 'SMALLINT';
+               case 'I2': return 'SMALLINT';
+               case 'I4': return 'INTEGER';
+               case 'I8': return 'DECIMAL(20)';
+               
+               case 'F': return 'FLOAT';
+               case 'N': return 'DECIMAL';
+               default:
+                       return $meta;
+               }
+       }
+
+       function AlterColumnSQL($tabname, $flds)
+       {
+               if ($this->debug) ADOConnection::outp("AlterColumnSQL not 
supported");
+               return array();
+       }
+       
+       
+       function DropColumnSQL($tabname, $flds)
+       {
+               if ($this->debug) ADOConnection::outp("DropColumnSQL not 
supported");
+               return array();
+       }
+       
+       // return string must begin with space
+       function _CreateSuffix($fname, &$ftype, 
$fnotnull,$fdefault,$fautoinc,$fconstraint)
+       {
+               if ($fautoinc) {
+                       $ftype = 'SERIAL';
+                       return '';
+               }
+               $suffix = '';
+               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               return $suffix;
+       }
+       
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php:1.2      Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php  Tue Feb 21 13:47:42 2006
@@ -1,252 +1,254 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_mssql extends ADODB_DataDict {
-       var $databaseType = 'mssql';
-       var $dropIndex = 'DROP INDEX %2$s.%1$s';
-       var $renameTable = "EXEC sp_rename '%s','%s'";
-       var $renameColumn = "EXEC sp_rename '%s.%s','%s'";
-       //var $alterCol = ' ALTER COLUMN ';
-       
-       function MetaType($t,$len=-1,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               
-               $len = -1; // mysql max_length is not accurate
-               switch (strtoupper($t)) {
-
-               case 'INT': 
-               case 'INTEGER': return  'I';
-               case 'BIT':
-               case 'TINYINT': return  'I1';
-               case 'SMALLINT': return 'I2';
-               case 'BIGINT':  return  'I8';
-               
-               case 'REAL':
-               case 'FLOAT': return 'F';
-               default: return parent::MetaType($t,$len,$fieldobj);
-               }
-       }
-       
-       function ActualType($meta)
-       {
-               switch(strtoupper($meta)) {
-               case 'C': return 'VARCHAR';
-               case 'XL':
-               case 'X': return 'TEXT';
-               
-               case 'C2': return 'NVARCHAR';
-               case 'X2': return 'NTEXT';
-               
-               case 'B': return 'IMAGE';
-                       
-               case 'D': return 'DATETIME';
-               case 'T': return 'DATETIME';
-               case 'L': return 'BIT';
-               
-               case 'I': return 'INT'; 
-               case 'I1': return 'TINYINT';
-               case 'I2': return 'SMALLINT';
-               case 'I4': return 'INT';
-               case 'I8': return 'BIGINT';
-               
-               case 'F': return 'REAL';
-               case 'N': return 'NUMERIC';
-               default:
-                       return $meta;
-               }
-       }
-       
-       
-       function AddColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName ($tabname);
-               $f = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               $s = "ALTER TABLE $tabname $this->addCol";
-               foreach($lines as $v) {
-                       $f[] = "\n $v";
-               }
-               $s .= implode(', ',$f);
-               $sql[] = $s;
-               return $sql;
-       }
-       
-       /*
-       function AlterColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName ($tabname);
-               $sql = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               foreach($lines as $v) {
-                       $sql[] = "ALTER TABLE $tabname $this->alterCol $v";
-               }
-
-               return $sql;
-       }
-       */
-       
-       function DropColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName ($tabname);
-               if (!is_array($flds))
-                       $flds = explode(',',$flds);
-               $f = array();
-               $s = 'ALTER TABLE ' . $tabname;
-               foreach($flds as $v) {
-                       $f[] = "\n$this->dropCol ".$this->NameQuote($v);
-               }
-               $s .= implode(', ',$f);
-               $sql[] = $s;
-               return $sql;
-       }
-       
-       // return string must begin with space
-       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-       {       
-               $suffix = '';
-               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-               if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               else if ($suffix == '') $suffix .= ' NULL';
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               return $suffix;
-       }
-       
-       /*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
-        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
-
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
-
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
-
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
-        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
-
-
-       */
-       
-       /*
-       CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-               [ WITH < index_option > [ ,...n] ] 
-               [ ON filegroup ]
-               < index_option > :: = 
-                   { PAD_INDEX | 
-                       FILLFACTOR = fillfactor | 
-                       IGNORE_DUP_KEY | 
-                       DROP_EXISTING | 
-                   STATISTICS_NORECOMPUTE | 
-                   SORT_IN_TEMPDB  
-               }
-*/
-       function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-       {
-               $sql = array();
-               
-               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
-                       $sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-                       if ( isset($idxoptions['DROP']) )
-                               return $sql;
-               }
-               
-               if ( empty ($flds) ) {
-                       return $sql;
-               }
-               
-               $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-               $clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : 
'';
-               
-               if ( is_array($flds) )
-                       $flds = implode(', ',$flds);
-               $s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' 
ON ' . $tabname . ' (' . $flds . ')';
-               
-               if ( isset($idxoptions[$this->upperName]) )
-                       $s .= $idxoptions[$this->upperName];
-               
-
-               $sql[] = $s;
-               
-               return $sql;
-       }
-       
-       
-       function _GetSize($ftype, $ty, $fsize, $fprec)
-       {
-               switch ($ftype) {
-               case 'INT':
-               case 'SMALLINT':
-               case 'TINYINT':
-               case 'BIGINT':
-                       return $ftype;
-               }
-               if (strlen($fsize) && $ty != 'X' && $ty != 'B' && 
strpos($ftype,'(') === false) {
-                       $ftype .= "(".$fsize;
-                       if (strlen($fprec)) $ftype .= ",".$fprec;
-                       $ftype .= ')';
-               }
-               return $ftype;
-       }
-}
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_mssql extends ADODB_DataDict {
+       var $databaseType = 'mssql';
+       var $dropIndex = 'DROP INDEX %2$s.%1$s';
+       var $renameTable = "EXEC sp_rename '%s','%s'";
+       var $renameColumn = "EXEC sp_rename '%s.%s','%s'";
+
+       var $typeX = 'TEXT';  ## Alternatively, set it to VARCHAR(4000)
+       var $typeXL = 'TEXT';
+       
+       //var $alterCol = ' ALTER COLUMN ';
+       
+       function MetaType($t,$len=-1,$fieldobj=false)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               
+               $len = -1; // mysql max_length is not accurate
+               switch (strtoupper($t)) {
+               case 'R':
+               case 'INT': 
+               case 'INTEGER': return  'I';
+               case 'BIT':
+               case 'TINYINT': return  'I1';
+               case 'SMALLINT': return 'I2';
+               case 'BIGINT':  return  'I8';
+               
+               case 'REAL':
+               case 'FLOAT': return 'F';
+               default: return parent::MetaType($t,$len,$fieldobj);
+               }
+       }
+       
+       function ActualType($meta)
+       {
+               switch(strtoupper($meta)) {
+
+               case 'C': return 'VARCHAR';
+               case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
+               case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## 
could be varchar(8000), but we want compat with oracle
+               case 'C2': return 'NVARCHAR';
+               case 'X2': return 'NTEXT';
+               
+               case 'B': return 'IMAGE';
+                       
+               case 'D': return 'DATETIME';
+               case 'T': return 'DATETIME';
+               case 'L': return 'BIT';
+               
+               case 'R':               
+               case 'I': return 'INT'; 
+               case 'I1': return 'TINYINT';
+               case 'I2': return 'SMALLINT';
+               case 'I4': return 'INT';
+               case 'I8': return 'BIGINT';
+               
+               case 'F': return 'REAL';
+               case 'N': return 'NUMERIC';
+               default:
+                       return $meta;
+               }
+       }
+       
+       
+       function AddColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName ($tabname);
+               $f = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               $s = "ALTER TABLE $tabname $this->addCol";
+               foreach($lines as $v) {
+                       $f[] = "\n $v";
+               }
+               $s .= implode(', ',$f);
+               $sql[] = $s;
+               return $sql;
+       }
+       
+       /*
+       function AlterColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName ($tabname);
+               $sql = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               foreach($lines as $v) {
+                       $sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+               }
+
+               return $sql;
+       }
+       */
+       
+       function DropColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName ($tabname);
+               if (!is_array($flds))
+                       $flds = explode(',',$flds);
+               $f = array();
+               $s = 'ALTER TABLE ' . $tabname;
+               foreach($flds as $v) {
+                       $f[] = "\n$this->dropCol ".$this->NameQuote($v);
+               }
+               $s .= implode(', ',$f);
+               $sql[] = $s;
+               return $sql;
+       }
+       
+       // return string must begin with space
+       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
+       {       
+               $suffix = '';
+               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+               if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               else if ($suffix == '') $suffix .= ' NULL';
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               return $suffix;
+       }
+       
+       /*
+CREATE TABLE 
+    [ database_name.[ owner ] . | owner. ] table_name 
+    ( { < column_definition > 
+        | column_name AS computed_column_expression 
+        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
+    ) 
+
+[ ON { filegroup | DEFAULT } ] 
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+
+< column_definition > ::= { column_name data_type } 
+    [ COLLATE < collation_name > ] 
+    [ [ DEFAULT constant_expression ] 
+        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+    ] 
+    [ ROWGUIDCOL] 
+    [ < column_constraint > ] [ ...n ] 
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ NULL | NOT NULL ] 
+        | [ { PRIMARY KEY | UNIQUE } 
+            [ CLUSTERED | NONCLUSTERED ] 
+            [ WITH FILLFACTOR = fillfactor ] 
+            [ON {filegroup | DEFAULT} ] ] 
+        ] 
+        | [ [ FOREIGN KEY ] 
+            REFERENCES ref_table [ ( ref_column ) ] 
+            [ ON DELETE { CASCADE | NO ACTION } ] 
+            [ ON UPDATE { CASCADE | NO ACTION } ] 
+            [ NOT FOR REPLICATION ] 
+        ] 
+        | CHECK [ NOT FOR REPLICATION ] 
+        ( logical_expression ) 
+    } 
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ { PRIMARY KEY | UNIQUE } 
+        [ CLUSTERED | NONCLUSTERED ] 
+        { ( column [ ASC | DESC ] [ ,...n ] ) } 
+        [ WITH FILLFACTOR = fillfactor ] 
+        [ ON { filegroup | DEFAULT } ] 
+    ] 
+    | FOREIGN KEY 
+        [ ( column [ ,...n ] ) ] 
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
+        [ ON DELETE { CASCADE | NO ACTION } ] 
+        [ ON UPDATE { CASCADE | NO ACTION } ] 
+        [ NOT FOR REPLICATION ] 
+    | CHECK [ NOT FOR REPLICATION ] 
+        ( search_conditions ) 
+    } 
+
+
+       */
+       
+       /*
+       CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
+               [ WITH < index_option > [ ,...n] ] 
+               [ ON filegroup ]
+               < index_option > :: = 
+                   { PAD_INDEX | 
+                       FILLFACTOR = fillfactor | 
+                       IGNORE_DUP_KEY | 
+                       DROP_EXISTING | 
+                   STATISTICS_NORECOMPUTE | 
+                   SORT_IN_TEMPDB  
+               }
+*/
+       function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+       {
+               $sql = array();
+               
+               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
+                       $sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+                       if ( isset($idxoptions['DROP']) )
+                               return $sql;
+               }
+               
+               if ( empty ($flds) ) {
+                       return $sql;
+               }
+               
+               $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+               $clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : 
'';
+               
+               if ( is_array($flds) )
+                       $flds = implode(', ',$flds);
+               $s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' 
ON ' . $tabname . ' (' . $flds . ')';
+               
+               if ( isset($idxoptions[$this->upperName]) )
+                       $s .= $idxoptions[$this->upperName];
+               
+
+               $sql[] = $s;
+               
+               return $sql;
+       }
+       
+       
+       function _GetSize($ftype, $ty, $fsize, $fprec)
+       {
+               switch ($ftype) {
+               case 'INT':
+               case 'SMALLINT':
+               case 'TINYINT':
+               case 'BIGINT':
+                       return $ftype;
+               }
+       if ($ty == 'T') return $ftype;
+       return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php:1.2      Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php  Tue Feb 21 13:47:42 2006
@@ -1,181 +1,181 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_mysql extends ADODB_DataDict {
-       var $databaseType = 'mysql';
-       var $alterCol = ' MODIFY COLUMN';
-       var $alterTableAddIndex = true;
-       var $dropTable = 'DROP TABLE IF EXISTS %s'; // requires mysql 3.22 or 
later
-       
-       var $dropIndex = 'DROP INDEX %s ON %s';
-       var $renameColumn = 'ALTER TABLE %s CHANGE COLUMN %s %s %s';    // 
needs column-definition!
-       
-       function MetaType($t,$len=-1,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               $is_serial = is_object($fieldobj) && $fieldobj->primary_key && 
$fieldobj->auto_increment;
-               
-               $len = -1; // mysql max_length is not accurate
-               switch (strtoupper($t)) {
-               case 'STRING': 
-               case '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 'YEAR':
-               case 'DATE': return 'D';
-               
-               case 'TIME':
-               case 'DATETIME':
-               case 'TIMESTAMP': return 'T';
-               
-               case 'FLOAT':
-               case 'DOUBLE':
-                       return 'F';
-                       
-               case 'INT': 
-               case 'INTEGER': return $is_serial ? 'R' : 'I';
-               case 'TINYINT': return $is_serial ? 'R' : 'I1';
-               case 'SMALLINT': return $is_serial ? 'R' : 'I2';
-               case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
-               case 'BIGINT':  return $is_serial ? 'R' : 'I8';
-               default: return 'N';
-               }
-       }
-
-       function ActualType($meta)
-       {
-               switch(strtoupper($meta)) {
-               case 'C': return 'VARCHAR';
-               case 'XL':
-               case 'X': return 'LONGTEXT';
-               
-               case 'C2': return 'VARCHAR';
-               case 'X2': return 'LONGTEXT';
-               
-               case 'B': return 'LONGBLOB';
-                       
-               case 'D': return 'DATE';
-               case 'T': return 'DATETIME';
-               case 'L': return 'TINYINT';
-               
-               case 'R':
-               case 'I4':
-               case 'I': return 'INTEGER';
-               case 'I1': return 'TINYINT';
-               case 'I2': return 'SMALLINT';
-               case 'I8': return 'BIGINT';
-               
-               case 'F': return 'DOUBLE';
-               case 'N': return 'NUMERIC';
-               default:
-                       return $meta;
-               }
-       }
-       
-       // return string must begin with space
-       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-       {       
-               $suffix = '';
-               if ($funsigned) $suffix .= ' UNSIGNED';
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-               if ($fautoinc) $suffix .= ' AUTO_INCREMENT';
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               return $suffix;
-       }
-       
-       /*
-       CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name 
[(create_definition,...)]
-               [table_options] [select_statement]
-               create_definition:
-               col_name type [NOT NULL | NULL] [DEFAULT default_value] 
[AUTO_INCREMENT]
-               [PRIMARY KEY] [reference_definition]
-               or PRIMARY KEY (index_col_name,...)
-               or KEY [index_name] (index_col_name,...)
-               or INDEX [index_name] (index_col_name,...)
-               or UNIQUE [INDEX] [index_name] (index_col_name,...)
-               or FULLTEXT [INDEX] [index_name] (index_col_name,...)
-               or [CONSTRAINT symbol] FOREIGN KEY [index_name] 
(index_col_name,...)
-               [reference_definition]
-               or CHECK (expr)
-       */
-       
-       /*
-       CREATE [UNIQUE|FULLTEXT] INDEX index_name
-               ON tbl_name (col_name[(length)],... )
-       */
-       
-       function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-       {
-               $sql = array();
-               
-               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
-                       if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE 
$tabname DROP INDEX $idxname";
-                       else $sql[] = sprintf($this->dropIndex, $idxname, 
$tabname);
-
-                       if ( isset($idxoptions['DROP']) )
-                               return $sql;
-               }
-               
-               if ( empty ($flds) ) {
-                       return $sql;
-               }
-               
-               if (isset($idxoptions['FULLTEXT'])) {
-                       $unique = ' FULLTEXT';
-               } elseif (isset($idxoptions['UNIQUE'])) {
-                       $unique = ' UNIQUE';
-               } else {
-                       $unique = '';
-               }
-               
-               if ( is_array($flds) ) $flds = implode(', ',$flds);
-               
-               if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD 
$unique INDEX $idxname ";
-               else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . 
$tabname;
-               
-               $s .= ' (' . $flds . ')';
-               
-               if ( isset($idxoptions[$this->upperName]) )
-                       $s .= $idxoptions[$this->upperName];
-               
-               $sql[] = $s;
-               
-               return $sql;
-       }
-}
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_mysql extends ADODB_DataDict {
+       var $databaseType = 'mysql';
+       var $alterCol = ' MODIFY COLUMN';
+       var $alterTableAddIndex = true;
+       var $dropTable = 'DROP TABLE IF EXISTS %s'; // requires mysql 3.22 or 
later
+       
+       var $dropIndex = 'DROP INDEX %s ON %s';
+       var $renameColumn = 'ALTER TABLE %s CHANGE COLUMN %s %s %s';    // 
needs column-definition!
+       
+       function MetaType($t,$len=-1,$fieldobj=false)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               $is_serial = is_object($fieldobj) && $fieldobj->primary_key && 
$fieldobj->auto_increment;
+               
+               $len = -1; // mysql max_length is not accurate
+               switch (strtoupper($t)) {
+               case 'STRING': 
+               case '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 'YEAR':
+               case 'DATE': return 'D';
+               
+               case 'TIME':
+               case 'DATETIME':
+               case 'TIMESTAMP': return 'T';
+               
+               case 'FLOAT':
+               case 'DOUBLE':
+                       return 'F';
+                       
+               case 'INT': 
+               case 'INTEGER': return $is_serial ? 'R' : 'I';
+               case 'TINYINT': return $is_serial ? 'R' : 'I1';
+               case 'SMALLINT': return $is_serial ? 'R' : 'I2';
+               case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
+               case 'BIGINT':  return $is_serial ? 'R' : 'I8';
+               default: return 'N';
+               }
+       }
+
+       function ActualType($meta)
+       {
+               switch(strtoupper($meta)) {
+               case 'C': return 'VARCHAR';
+               case 'XL':return 'LONGTEXT';
+               case 'X': return 'TEXT';
+               
+               case 'C2': return 'VARCHAR';
+               case 'X2': return 'LONGTEXT';
+               
+               case 'B': return 'LONGBLOB';
+                       
+               case 'D': return 'DATE';
+               case 'T': return 'DATETIME';
+               case 'L': return 'TINYINT';
+               
+               case 'R':
+               case 'I4':
+               case 'I': return 'INTEGER';
+               case 'I1': return 'TINYINT';
+               case 'I2': return 'SMALLINT';
+               case 'I8': return 'BIGINT';
+               
+               case 'F': return 'DOUBLE';
+               case 'N': return 'NUMERIC';
+               default:
+                       return $meta;
+               }
+       }
+       
+       // return string must begin with space
+       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+       {       
+               $suffix = '';
+               if ($funsigned) $suffix .= ' UNSIGNED';
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+               if ($fautoinc) $suffix .= ' AUTO_INCREMENT';
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               return $suffix;
+       }
+       
+       /*
+       CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name 
[(create_definition,...)]
+               [table_options] [select_statement]
+               create_definition:
+               col_name type [NOT NULL | NULL] [DEFAULT default_value] 
[AUTO_INCREMENT]
+               [PRIMARY KEY] [reference_definition]
+               or PRIMARY KEY (index_col_name,...)
+               or KEY [index_name] (index_col_name,...)
+               or INDEX [index_name] (index_col_name,...)
+               or UNIQUE [INDEX] [index_name] (index_col_name,...)
+               or FULLTEXT [INDEX] [index_name] (index_col_name,...)
+               or [CONSTRAINT symbol] FOREIGN KEY [index_name] 
(index_col_name,...)
+               [reference_definition]
+               or CHECK (expr)
+       */
+       
+       /*
+       CREATE [UNIQUE|FULLTEXT] INDEX index_name
+               ON tbl_name (col_name[(length)],... )
+       */
+       
+       function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+       {
+               $sql = array();
+               
+               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
+                       if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE 
$tabname DROP INDEX $idxname";
+                       else $sql[] = sprintf($this->dropIndex, $idxname, 
$tabname);
+
+                       if ( isset($idxoptions['DROP']) )
+                               return $sql;
+               }
+               
+               if ( empty ($flds) ) {
+                       return $sql;
+               }
+               
+               if (isset($idxoptions['FULLTEXT'])) {
+                       $unique = ' FULLTEXT';
+               } elseif (isset($idxoptions['UNIQUE'])) {
+                       $unique = ' UNIQUE';
+               } else {
+                       $unique = '';
+               }
+               
+               if ( is_array($flds) ) $flds = implode(', ',$flds);
+               
+               if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD 
$unique INDEX $idxname ";
+               else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . 
$tabname;
+               
+               $s .= ' (' . $flds . ')';
+               
+               if ( isset($idxoptions[$this->upperName]) )
+                       $s .= $idxoptions[$this->upperName];
+               
+               $sql[] = $s;
+               
+               return $sql;
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php:1.2       Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php   Tue Feb 21 13:47:42 2006
@@ -1,280 +1,282 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_oci8 extends ADODB_DataDict {
-       
-       var $databaseType = 'oci8';
-       var $seqField = false;
-       var $seqPrefix = 'SEQ_';
-       var $dropTable = "DROP TABLE %s CASCADE CONSTRAINTS";
-       var $trigPrefix = 'TRIG_';
-       var $alterCol = ' MODIFY ';
-       
-       function MetaType($t,$len=-1)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               switch (strtoupper($t)) {
-               case 'VARCHAR':
-               case 'VARCHAR2':
-               case 'CHAR':
-               case 'VARBINARY':
-               case 'BINARY':
-                       if (isset($this) && $len <= $this->blobSize) return 'C';
-                       return 'X';
-               
-               case 'NCHAR':
-               case 'NVARCHAR2':
-               case 'NVARCHAR':
-                       if (isset($this) && $len <= $this->blobSize) return 
'C2';
-                       return 'X2';
-                       
-               case 'NCLOB':
-               case 'CLOB':
-                       return 'XL';
-               
-               case 'LONG RAW':
-               case 'LONG VARBINARY':
-               case 'BLOB':
-                       return 'B';
-               
-               case 'DATE': 
-                       return 'T';
-               
-               case 'INT': 
-               case 'SMALLINT':
-               case 'INTEGER': 
-                       return 'I';
-                       
-               default:
-                       return 'N';
-               }
-       }
-       
-       function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'VARCHAR';
-               case 'X': return 'VARCHAR(4000)';
-               case 'XL': return 'CLOB';
-               
-               case 'C2': return 'NVARCHAR';
-               case 'X2': return 'NVARCHAR(2000)';
-               
-               case 'B': return 'BLOB';
-                       
-               case 'D': 
-               case 'T': return 'DATE';
-               case 'L': return 'DECIMAL(1)';
-               case 'I1': return 'DECIMAL(3)';
-               case 'I2': return 'DECIMAL(5)';
-               case 'I':
-               case 'I4': return 'DECIMAL(10)';
-               
-               case 'I8': return 'DECIMAL(20)';
-               case 'F': return 'DECIMAL';
-               case 'N': return 'DECIMAL';
-               default:
-                       return $meta;
-               }       
-       }
-       
-       function CreateDatabase($dbname, $options=false)
-       {
-               $options = $this->_Options($options);
-               $password = isset($options['PASSWORD']) ? $options['PASSWORD'] 
: 'tiger';
-               $tablespace = isset($options["TABLESPACE"]) ? " DEFAULT 
TABLESPACE ".$options["TABLESPACE"] : '';
-               $sql[] = "CREATE USER ".$dbname." IDENTIFIED BY 
".$password.$tablespace;
-               $sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED 
TABLESPACE,CREATE SEQUENCE TO $dbname";
-               
-               return $sql;
-       }
-       
-       function AddColumnSQL($tabname, $flds)
-       {
-               $f = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               $s = "ALTER TABLE $tabname ADD (";
-               foreach($lines as $v) {
-                       $f[] = "\n $v";
-               }
-               
-               $s .= implode(', ',$f).')';
-               $sql[] = $s;
-               return $sql;
-       }
-       
-       function AlterColumnSQL($tabname, $flds)
-       {
-               $f = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               $s = "ALTER TABLE $tabname MODIFY(";
-               foreach($lines as $v) {
-                       $f[] = "\n $v";
-               }
-               $s .= implode(', ',$f).')';
-               $sql[] = $s;
-               return $sql;
-       }
-       
-       function DropColumnSQL($tabname, $flds)
-       {
-               if (!is_array($flds)) $flds = explode(',',$flds);
-               foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
-               
-               $sql = array();
-               $s = "ALTER TABLE $tabname DROP(";
-               $s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
-               $sql[] = $s;
-               return $sql;
-       }
-       
-       function _DropAutoIncrement($t)
-       {
-               if (strpos($t,'.') !== false) {
-                       $tarr = explode('.',$t);
-                       return "drop sequence ".$tarr[0].".seq_".$tarr[1];
-               }
-               return "drop sequence seq_".$t;
-       }
-       
-       // return string must begin with space
-       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-       {
-               $suffix = '';
-               
-               if ($fdefault == "''" && $fnotnull) {// this is null in oracle
-                       $fnotnull = false;
-                       if ($this->debug) ADOConnection::outp("NOT NULL and 
DEFAULT='' illegal in Oracle");
-               }
-               
-               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               
-               if ($fautoinc) $this->seqField = $fname;
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               
-               return $suffix;
-       }
-       
-/*
-CREATE or replace TRIGGER jaddress_insert
-before insert on jaddress
-for each row
-begin
-select seqaddress.nextval into :new.A_ID from dual;
-end;
-*/
-       function _Triggers($tabname,$tableoptions)
-       {
-               if (!$this->seqField) return array();
-               
-               if ($this->schema) {
-                       $t = strpos($tabname,'.');
-                       if ($t !== false) $tab = substr($tabname,$t+1);
-                       else $tab = $tabname;
-                       $seqname = $this->schema.'.'.$this->seqPrefix.$tab;
-                       $trigname = 
$this->schema.'.'.$this->trigPrefix.$this->seqPrefix.$tab;
-               } else {
-                       $seqname = $this->seqPrefix.$tabname;
-                       $trigname = $this->trigPrefix.$seqname;
-               }
-               if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE 
$seqname";
-               $seqCache = '';
-               if (isset($tableoptions['SEQUENCE_CACHE'])){$seqCache = 
$tableoptions['SEQUENCE_CACHE'];}
-               $seqIncr = '';
-               if (isset($tableoptions['SEQUENCE_INCREMENT'])){$seqIncr = ' 
INCREMENT BY '.$tableoptions['SEQUENCE_INCREMENT'];}
-               $seqStart = '';
-               if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START 
WITH '.$tableoptions['SEQUENCE_START'];}
-               $sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr 
$seqCache";
-               $sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON 
$tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField 
= 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
-               
-               $this->seqField = false;
-               return $sql;
-       }
-       
-       /*
-       CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name 
[(create_definition,...)]
-               [table_options] [select_statement]
-               create_definition:
-               col_name type [NOT NULL | NULL] [DEFAULT default_value] 
[AUTO_INCREMENT]
-               [PRIMARY KEY] [reference_definition]
-               or PRIMARY KEY (index_col_name,...)
-               or KEY [index_name] (index_col_name,...)
-               or INDEX [index_name] (index_col_name,...)
-               or UNIQUE [INDEX] [index_name] (index_col_name,...)
-               or FULLTEXT [INDEX] [index_name] (index_col_name,...)
-               or [CONSTRAINT symbol] FOREIGN KEY [index_name] 
(index_col_name,...)
-               [reference_definition]
-               or CHECK (expr)
-       */
-       
-
-       
-       function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
-       {
-               $sql = array();
-               
-               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
-                       $sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-                       if ( isset($idxoptions['DROP']) )
-                               return $sql;
-               }
-               
-               if ( empty ($flds) ) {
-                       return $sql;
-               }
-               
-               if (isset($idxoptions['BITMAP'])) {
-                       $unique = ' BITMAP'; 
-               } elseif (isset($idxoptions['UNIQUE'])) {
-                       $unique = ' UNIQUE';
-               } else {
-                       $unique = '';
-               }
-               
-               if ( is_array($flds) )
-                       $flds = implode(', ',$flds);
-               $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . 
$tabname . ' (' . $flds . ')';
-               
-               if ( isset($idxoptions[$this->upperName]) )
-                       $s .= $idxoptions[$this->upperName];
-               
-               if (isset($idxoptions['oci8']))
-                       $s .= $idxoptions['oci8'];
-               
-
-               $sql[] = $s;
-               
-               return $sql;
-       }
-       
-       function GetCommentSQL($table,$col)
-       {
-               $table = $this->connection->qstr($table);
-               $col = $this->connection->qstr($col);   
-               return "select comments from USER_COL_COMMENTS where 
TABLE_NAME=$table and COLUMN_NAME=$col";
-       }
-       
-       function SetCommentSQL($table,$col,$cmt)
-       {
-               $cmt = $this->connection->qstr($cmt);
-               return  "COMMENT ON COLUMN $table.$col IS $cmt";
-       }
-}
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_oci8 extends ADODB_DataDict {
+       
+       var $databaseType = 'oci8';
+       var $seqField = false;
+       var $seqPrefix = 'SEQ_';
+       var $dropTable = "DROP TABLE %s CASCADE CONSTRAINTS";
+       var $trigPrefix = 'TRIG_';
+       var $alterCol = ' MODIFY ';
+       var $typeX = 'VARCHAR(4000)';
+       var $typeXL = 'CLOB';
+       
+       function MetaType($t,$len=-1)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               switch (strtoupper($t)) {
+               case 'VARCHAR':
+               case 'VARCHAR2':
+               case 'CHAR':
+               case 'VARBINARY':
+               case 'BINARY':
+                       if (isset($this) && $len <= $this->blobSize) return 'C';
+                       return 'X';
+               
+               case 'NCHAR':
+               case 'NVARCHAR2':
+               case 'NVARCHAR':
+                       if (isset($this) && $len <= $this->blobSize) return 
'C2';
+                       return 'X2';
+                       
+               case 'NCLOB':
+               case 'CLOB':
+                       return 'XL';
+               
+               case 'LONG RAW':
+               case 'LONG VARBINARY':
+               case 'BLOB':
+                       return 'B';
+               
+               case 'DATE': 
+                       return 'T';
+               
+               case 'INT': 
+               case 'SMALLINT':
+               case 'INTEGER': 
+                       return 'I';
+                       
+               default:
+                       return 'N';
+               }
+       }
+       
+       function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'VARCHAR';
+               case 'X': return $this->typeX;
+               case 'XL': return $this->typeXL;
+               
+               case 'C2': return 'NVARCHAR';
+               case 'X2': return 'NVARCHAR(2000)';
+               
+               case 'B': return 'BLOB';
+                       
+               case 'D': 
+               case 'T': return 'DATE';
+               case 'L': return 'DECIMAL(1)';
+               case 'I1': return 'DECIMAL(3)';
+               case 'I2': return 'DECIMAL(5)';
+               case 'I':
+               case 'I4': return 'DECIMAL(10)';
+               
+               case 'I8': return 'DECIMAL(20)';
+               case 'F': return 'DECIMAL';
+               case 'N': return 'DECIMAL';
+               default:
+                       return $meta;
+               }       
+       }
+       
+       function CreateDatabase($dbname, $options=false)
+       {
+               $options = $this->_Options($options);
+               $password = isset($options['PASSWORD']) ? $options['PASSWORD'] 
: 'tiger';
+               $tablespace = isset($options["TABLESPACE"]) ? " DEFAULT 
TABLESPACE ".$options["TABLESPACE"] : '';
+               $sql[] = "CREATE USER ".$dbname." IDENTIFIED BY 
".$password.$tablespace;
+               $sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED 
TABLESPACE,CREATE SEQUENCE TO $dbname";
+               
+               return $sql;
+       }
+       
+       function AddColumnSQL($tabname, $flds)
+       {
+               $f = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               $s = "ALTER TABLE $tabname ADD (";
+               foreach($lines as $v) {
+                       $f[] = "\n $v";
+               }
+               
+               $s .= implode(', ',$f).')';
+               $sql[] = $s;
+               return $sql;
+       }
+       
+       function AlterColumnSQL($tabname, $flds)
+       {
+               $f = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               $s = "ALTER TABLE $tabname MODIFY(";
+               foreach($lines as $v) {
+                       $f[] = "\n $v";
+               }
+               $s .= implode(', ',$f).')';
+               $sql[] = $s;
+               return $sql;
+       }
+       
+       function DropColumnSQL($tabname, $flds)
+       {
+               if (!is_array($flds)) $flds = explode(',',$flds);
+               foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
+               
+               $sql = array();
+               $s = "ALTER TABLE $tabname DROP(";
+               $s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
+               $sql[] = $s;
+               return $sql;
+       }
+       
+       function _DropAutoIncrement($t)
+       {
+               if (strpos($t,'.') !== false) {
+                       $tarr = explode('.',$t);
+                       return "drop sequence ".$tarr[0].".seq_".$tarr[1];
+               }
+               return "drop sequence seq_".$t;
+       }
+       
+       // return string must begin with space
+       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+       {
+               $suffix = '';
+               
+               if ($fdefault == "''" && $fnotnull) {// this is null in oracle
+                       $fnotnull = false;
+                       if ($this->debug) ADOConnection::outp("NOT NULL and 
DEFAULT='' illegal in Oracle");
+               }
+               
+               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               
+               if ($fautoinc) $this->seqField = $fname;
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               
+               return $suffix;
+       }
+       
+/*
+CREATE or replace TRIGGER jaddress_insert
+before insert on jaddress
+for each row
+begin
+select seqaddress.nextval into :new.A_ID from dual;
+end;
+*/
+       function _Triggers($tabname,$tableoptions)
+       {
+               if (!$this->seqField) return array();
+               
+               if ($this->schema) {
+                       $t = strpos($tabname,'.');
+                       if ($t !== false) $tab = substr($tabname,$t+1);
+                       else $tab = $tabname;
+                       $seqname = $this->schema.'.'.$this->seqPrefix.$tab;
+                       $trigname = 
$this->schema.'.'.$this->trigPrefix.$this->seqPrefix.$tab;
+               } else {
+                       $seqname = $this->seqPrefix.$tabname;
+                       $trigname = $this->trigPrefix.$seqname;
+               }
+               if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE 
$seqname";
+               $seqCache = '';
+               if (isset($tableoptions['SEQUENCE_CACHE'])){$seqCache = 
$tableoptions['SEQUENCE_CACHE'];}
+               $seqIncr = '';
+               if (isset($tableoptions['SEQUENCE_INCREMENT'])){$seqIncr = ' 
INCREMENT BY '.$tableoptions['SEQUENCE_INCREMENT'];}
+               $seqStart = '';
+               if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START 
WITH '.$tableoptions['SEQUENCE_START'];}
+               $sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr 
$seqCache";
+               $sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON 
$tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField 
= 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
+               
+               $this->seqField = false;
+               return $sql;
+       }
+       
+       /*
+       CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name 
[(create_definition,...)]
+               [table_options] [select_statement]
+               create_definition:
+               col_name type [NOT NULL | NULL] [DEFAULT default_value] 
[AUTO_INCREMENT]
+               [PRIMARY KEY] [reference_definition]
+               or PRIMARY KEY (index_col_name,...)
+               or KEY [index_name] (index_col_name,...)
+               or INDEX [index_name] (index_col_name,...)
+               or UNIQUE [INDEX] [index_name] (index_col_name,...)
+               or FULLTEXT [INDEX] [index_name] (index_col_name,...)
+               or [CONSTRAINT symbol] FOREIGN KEY [index_name] 
(index_col_name,...)
+               [reference_definition]
+               or CHECK (expr)
+       */
+       
+
+       
+       function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
+       {
+               $sql = array();
+               
+               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
+                       $sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+                       if ( isset($idxoptions['DROP']) )
+                               return $sql;
+               }
+               
+               if ( empty ($flds) ) {
+                       return $sql;
+               }
+               
+               if (isset($idxoptions['BITMAP'])) {
+                       $unique = ' BITMAP'; 
+               } elseif (isset($idxoptions['UNIQUE'])) {
+                       $unique = ' UNIQUE';
+               } else {
+                       $unique = '';
+               }
+               
+               if ( is_array($flds) )
+                       $flds = implode(', ',$flds);
+               $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . 
$tabname . ' (' . $flds . ')';
+               
+               if ( isset($idxoptions[$this->upperName]) )
+                       $s .= $idxoptions[$this->upperName];
+               
+               if (isset($idxoptions['oci8']))
+                       $s .= $idxoptions['oci8'];
+               
+
+               $sql[] = $s;
+               
+               return $sql;
+       }
+       
+       function GetCommentSQL($table,$col)
+       {
+               $table = $this->connection->qstr($table);
+               $col = $this->connection->qstr($col);   
+               return "select comments from USER_COL_COMMENTS where 
TABLE_NAME=$table and COLUMN_NAME=$col";
+       }
+       
+       function SetCommentSQL($table,$col,$cmt)
+       {
+               $cmt = $this->connection->qstr($cmt);
+               return  "COMMENT ON COLUMN $table.$col IS $cmt";
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php:1.2   Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php       Tue Feb 21 
13:47:42 2006
@@ -1,359 +1,371 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_postgres extends ADODB_DataDict {
-       
-       var $databaseType = 'postgres';
-       var $seqField = false;
-       var $seqPrefix = 'SEQ_';
-       var $addCol = ' ADD COLUMN';
-       var $quote = '"';
-       var $renameTable = 'ALTER TABLE %s RENAME TO %s'; // at least since 7.1
-       
-       function MetaType($t,$len=-1,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               $is_serial = is_object($fieldobj) && $fieldobj->primary_key && 
$fieldobj->unique && 
-                       $fieldobj->has_default && 
substr($fieldobj->default_value,0,8) == 'nextval(';
-               
-               switch (strtoupper($t)) {
-                       case 'INTERVAL':
-                       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':
-                       case 'TIMESTAMPTZ':
-                               return 'T';
-                       
-                       case 'INTEGER': return !$is_serial ? 'I' : 'R';
-                       case 'SMALLINT': 
-                       case 'INT2': return !$is_serial ? 'I2' : 'R';
-                       case 'INT4': return !$is_serial ? 'I4' : 'R';
-                       case 'BIGINT': 
-                       case 'INT8': return !$is_serial ? 'I8' : 'R';
-                               
-                       case 'OID':
-                       case 'SERIAL':
-                               return 'R';
-                       
-                       case 'FLOAT4':
-                       case 'FLOAT8':
-                       case 'DOUBLE PRECISION':
-                       case 'REAL':
-                               return 'F';
-                               
-                        default:
-                               return 'N';
-               }
-       }
-       
-       function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'VARCHAR';
-               case 'XL':
-               case 'X': return 'TEXT';
-               
-               case 'C2': return 'VARCHAR';
-               case 'X2': return 'TEXT';
-               
-               case 'B': return 'BYTEA';
-                       
-               case 'D': return 'DATE';
-               case 'T': return 'TIMESTAMP';
-               
-               case 'L': return 'SMALLINT';
-               case 'I': return 'INTEGER';
-               case 'I1': return 'SMALLINT';
-               case 'I2': return 'INT2';
-               case 'I4': return 'INT4';
-               case 'I8': return 'INT8';
-               
-               case 'F': return 'FLOAT8';
-               case 'N': return 'NUMERIC';
-               default:
-                       return $meta;
-               }
-       }
-       
-       /**
-        * Adding a new Column 
-        *
-        * reimplementation of the default function as postgres does NOT allow 
to set the default in the same statement
-        *
-        * @param string $tabname table-name
-        * @param string $flds column-names and types for the changed columns
-        * @return array with SQL strings
-        */
-       function AddColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName ($tabname);
-               $sql = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               $alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-               foreach($lines as $v) {
-                       if (($not_null = preg_match('/NOT NULL/i',$v))) {
-                               $v = preg_replace('/NOT NULL/i','',$v);
-                       }
-                       if (preg_match('/^([^ ]+) .*(DEFAULT [^ 
]+)/',$v,$matches)) {
-                               list(,$colname,$default) = $matches;
-                               $sql[] = $alter . str_replace($default,'',$v);
-                               $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN 
'.$colname.' SET ' . $default;
-                       } else {                                
-                               $sql[] = $alter . $v;
-                       }
-                       if ($not_null) {
-                               list($colname) = explode(' ',$v);
-                               $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN 
'.$colname.' SET NOT NULL';
-                       }
-               }
-               return $sql;
-       }
-       
-       /**
-        * Change the definition of one column
-        *
-        * Postgres can't do that on it's own, you need to supply the complete 
defintion of the new table,
-        * to allow, recreating the table and copying the content over to the 
new table
-        * @param string $tabname table-name
-        * @param string $flds column-name and type for the changed column
-        * @param string $tableflds complete defintion of the new table, eg. 
for postgres, default ''
-        * @param array/ $tableoptions options for the new table see 
CreateTableSQL, default ''
-        * @return array with SQL strings
-        */
-       function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-       {
-               if (!$tableflds) {
-                       if ($this->debug) ADOConnection::outp("AlterColumnSQL 
needs a complete table-definiton for PostgreSQL");
-                       return array();
-               }
-               return 
$this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
-       }
-       
-       /**
-        * Drop one column
-        *
-        * Postgres < 7.3 can't do that on it's own, you need to supply the 
complete defintion of the new table,
-        * to allow, recreating the table and copying the content over to the 
new table
-        * @param string $tabname table-name
-        * @param string $flds column-name and type for the changed column
-        * @param string $tableflds complete defintion of the new table, eg. 
for postgres, default ''
-        * @param array/ $tableoptions options for the new table see 
CreateTableSQL, default ''
-        * @return array with SQL strings
-        */
-       function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-       {
-               $has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
-               if (!$has_drop_column && !$tableflds) {
-                       if ($this->debug) ADOConnection::outp("DropColumnSQL 
needs complete table-definiton for PostgreSQL < 7.3");
-               return array();
-       }
-               if ($has_drop_column) {
-                       return ADODB_DataDict::DropColumnSQL($tabname, $flds);
-               }
-               return 
$this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
-       }
-       
-       /**
-        * Save the content into a temp. table, drop and recreate the original 
table and copy the content back in
-        *
-        * We also take care to set the values of the sequenz and recreate the 
indexes.
-        * All this is done in a transaction, to not loose the content of the 
table, if something went wrong!
-        * @internal
-        * @param string $tabname table-name
-        * @param string $dropflds column-names to drop
-        * @param string $tableflds complete defintion of the new table, eg. 
for postgres
-        * @param array/string $tableoptions options for the new table see 
CreateTableSQL, default ''
-        * @return array with SQL strings
-        */
-       function 
_recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='')
-       {
-               if ($dropflds && !is_array($dropflds)) $dropflds = 
explode(',',$dropflds);
-               $copyflds = array();
-               foreach($this->MetaColumns($tabname) as $fld) {
-                       if (!$dropflds || !in_array($fld->name,$dropflds)) {
-                               // we need to explicit convert varchar to a 
number to be able to do an AlterColumn of a char column to a nummeric one
-                               if (preg_match('/'.$fld->name.' 
(I|I2|I4|I8|N|F)/i',$tableflds,$matches) && 
-                                       
in_array($fld->type,array('varchar','char','text','bytea'))) {
-                                       $copyflds[] = 
"to_number($fld->name,'S99D99')";
-                               } else {
-                                       $copyflds[] = $fld->name;
-                               }
-                               // identify the sequence name and the fld its on
-                               if ($fld->primary_key && $fld->has_default && 
-                                       
preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
-                                       $seq_name = $matches[1];
-                                       $seq_fld = $fld->name;
-                               }
-                       }
-               }
-               $copyflds = implode(', ',$copyflds);
-               
-               $tempname = $tabname.'_tmp';
-               $aSql[] = 'BEGIN';              // we use a transaction, to 
make sure not to loose the content of the table
-               $aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM 
$tabname";
-               $aSql = array_merge($aSql,$this->DropTableSQL($tabname));
-               $aSql = 
array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions));
-               $aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM 
$tempname";
-               if ($seq_name && $seq_fld) {    // if we have a sequence we 
need to set it again
-                       $seq_name = $tabname.'_'.$seq_fld.'_seq';       // has 
to be the name of the new implicit sequence
-                       $aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) 
FROM $tabname";
-               }
-               $aSql[] = "DROP TABLE $tempname";
-               // recreate the indexes, if they not contain one of the droped 
columns
-               foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data)
-               {
-                       if (substr($idx_name,-5) != '_pkey' && (!$dropflds || 
!count(array_intersect($dropflds,$idx_data['columns'])))) {
-                               $aSql = 
array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'],
-                                       $idx_data['unique'] ? array('UNIQUE') : 
False));
-                       }
-               }
-               $aSql[] = 'COMMIT';
-               return $aSql;
-       }
-       
-       function DropTableSQL($tabname)
-       {
-               $sql = ADODB_DataDict::DropTableSQL($tabname);
-               
-               $drop_seq = $this->_DropAutoIncrement($tabname);
-               if ($drop_seq) $sql[] = $drop_seq;
-               
-               return $sql;
-       }
-
-       // return string must begin with space
-       function _CreateSuffix($fname, &$ftype, 
$fnotnull,$fdefault,$fautoinc,$fconstraint)
-       {
-               if ($fautoinc) {
-                       $ftype = 'SERIAL';
-                       return '';
-               }
-               $suffix = '';
-               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               return $suffix;
-       }
-       
-       // search for a sequece for the given table (asumes the seqence-name 
contains the table-name!)
-       // if yes return sql to drop it
-       // this is still necessary if postgres < 7.3 or the SERIAL was created 
on an earlier version!!!
-       function _DropAutoIncrement($tabname)
-       {
-               $tabname = $this->connection->quote('%'.$tabname.'%');
-
-               $seq = $this->connection->GetOne("SELECT relname FROM pg_class 
WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'");
-
-               // check if a tables depends on the sequenz and it therefor 
cant and dont need to be droped separatly
-               if (!$seq || $this->connection->GetOne("SELECT relname FROM 
pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE 
relname='$seq' AND relkind='S' AND deptype='i'")) {
-                       return False;
-               }
-               return "DROP SEQUENCE ".$seq;
-       }
-       
-       /*
-       CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
-       { column_name data_type [ DEFAULT default_expr ] [ column_constraint [, 
... ] ]
-       | table_constraint } [, ... ]
-       )
-       [ INHERITS ( parent_table [, ... ] ) ]
-       [ WITH OIDS | WITHOUT OIDS ]
-       where column_constraint is:
-       [ CONSTRAINT constraint_name ]
-       { NOT NULL | NULL | UNIQUE | PRIMARY KEY |
-       CHECK (expression) |
-       REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL ]
-       [ ON DELETE action ] [ ON UPDATE action ] }
-       [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY 
IMMEDIATE ]
-       and table_constraint is:
-       [ CONSTRAINT constraint_name ]
-       { UNIQUE ( column_name [, ... ] ) |
-       PRIMARY KEY ( column_name [, ... ] ) |
-       CHECK ( expression ) |
-       FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn 
[, ... ] ) ]
-       [ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action 
] }
-       [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY 
IMMEDIATE ]
-       */
-       
-       
-       /*
-       CREATE [ UNIQUE ] INDEX index_name ON table
-[ USING acc_method ] ( column [ ops_name ] [, ...] )
-[ WHERE predicate ]
-CREATE [ UNIQUE ] INDEX index_name ON table
-[ USING acc_method ] ( func_name( column [, ... ]) [ ops_name ] )
-[ WHERE predicate ]
-       */
-       function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-       {
-               $sql = array();
-               
-               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
-                       $sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-                       if ( isset($idxoptions['DROP']) )
-                               return $sql;
-               }
-               
-               if ( empty ($flds) ) {
-                       return $sql;
-               }
-               
-               $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-               
-               $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . 
$tabname . ' ';
-               
-               if (isset($idxoptions['HASH']))
-                       $s .= 'USING HASH ';
-               
-               if ( isset($idxoptions[$this->upperName]) )
-                       $s .= $idxoptions[$this->upperName];
-               
-               if ( is_array($flds) )
-                       $flds = implode(', ',$flds);
-               $s .= '(' . $flds . ')';
-               $sql[] = $s;
-               
-               return $sql;
-       }
-}
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_postgres extends ADODB_DataDict {
+       
+       var $databaseType = 'postgres';
+       var $seqField = false;
+       var $seqPrefix = 'SEQ_';
+       var $addCol = ' ADD COLUMN';
+       var $quote = '"';
+       var $renameTable = 'ALTER TABLE %s RENAME TO %s'; // at least since 7.1
+       var $dropTable = 'DROP TABLE %s CASCADE';
+       
+       function MetaType($t,$len=-1,$fieldobj=false)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               $is_serial = is_object($fieldobj) && $fieldobj->primary_key && 
$fieldobj->unique && 
+                       $fieldobj->has_default && 
substr($fieldobj->default_value,0,8) == 'nextval(';
+               
+               switch (strtoupper($t)) {
+                       case 'INTERVAL':
+                       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':
+                       case 'TIMESTAMPTZ':
+                               return 'T';
+                       
+                       case 'INTEGER': return !$is_serial ? 'I' : 'R';
+                       case 'SMALLINT': 
+                       case 'INT2': return !$is_serial ? 'I2' : 'R';
+                       case 'INT4': return !$is_serial ? 'I4' : 'R';
+                       case 'BIGINT': 
+                       case 'INT8': return !$is_serial ? 'I8' : 'R';
+                               
+                       case 'OID':
+                       case 'SERIAL':
+                               return 'R';
+                       
+                       case 'FLOAT4':
+                       case 'FLOAT8':
+                       case 'DOUBLE PRECISION':
+                       case 'REAL':
+                               return 'F';
+                               
+                        default:
+                               return 'N';
+               }
+       }
+       
+       function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'VARCHAR';
+               case 'XL':
+               case 'X': return 'TEXT';
+               
+               case 'C2': return 'VARCHAR';
+               case 'X2': return 'TEXT';
+               
+               case 'B': return 'BYTEA';
+                       
+               case 'D': return 'DATE';
+               case 'T': return 'TIMESTAMP';
+               
+               case 'L': return 'BOOLEAN';
+               case 'I': return 'INTEGER';
+               case 'I1': return 'SMALLINT';
+               case 'I2': return 'INT2';
+               case 'I4': return 'INT4';
+               case 'I8': return 'INT8';
+               
+               case 'F': return 'FLOAT8';
+               case 'N': return 'NUMERIC';
+               default:
+                       return $meta;
+               }
+       }
+       
+       /**
+        * Adding a new Column 
+        *
+        * reimplementation of the default function as postgres does NOT allow 
to set the default in the same statement
+        *
+        * @param string $tabname table-name
+        * @param string $flds column-names and types for the changed columns
+        * @return array with SQL strings
+        */
+       function AddColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName ($tabname);
+               $sql = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               $alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
+               foreach($lines as $v) {
+                       if (($not_null = preg_match('/NOT NULL/i',$v))) {
+                               $v = preg_replace('/NOT NULL/i','',$v);
+                       }
+                       if (preg_match('/^([^ ]+) .*DEFAULT ([^ 
]+)/',$v,$matches)) {
+                               list(,$colname,$default) = $matches;
+                               $sql[] = $alter . str_replace('DEFAULT 
'.$default,'',$v);
+                               $sql[] = 'UPDATE '.$tabname.' SET 
'.$colname.'='.$default;
+                               $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN 
'.$colname.' SET DEFAULT ' . $default;
+                       } else {                                
+                               $sql[] = $alter . $v;
+                       }
+                       if ($not_null) {
+                               list($colname) = explode(' ',$v);
+                               $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN 
'.$colname.' SET NOT NULL';
+                       }
+               }
+               return $sql;
+       }
+       
+       /**
+        * Change the definition of one column
+        *
+        * Postgres can't do that on it's own, you need to supply the complete 
defintion of the new table,
+        * to allow, recreating the table and copying the content over to the 
new table
+        * @param string $tabname table-name
+        * @param string $flds column-name and type for the changed column
+        * @param string $tableflds complete defintion of the new table, eg. 
for postgres, default ''
+        * @param array/ $tableoptions options for the new table see 
CreateTableSQL, default ''
+        * @return array with SQL strings
+        */
+       function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+       {
+               if (!$tableflds) {
+                       if ($this->debug) ADOConnection::outp("AlterColumnSQL 
needs a complete table-definiton for PostgreSQL");
+                       return array();
+               }
+               return 
$this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+       }
+       
+       /**
+        * Drop one column
+        *
+        * Postgres < 7.3 can't do that on it's own, you need to supply the 
complete defintion of the new table,
+        * to allow, recreating the table and copying the content over to the 
new table
+        * @param string $tabname table-name
+        * @param string $flds column-name and type for the changed column
+        * @param string $tableflds complete defintion of the new table, eg. 
for postgres, default ''
+        * @param array/ $tableoptions options for the new table see 
CreateTableSQL, default ''
+        * @return array with SQL strings
+        */
+       function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+       {
+               $has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
+               if (!$has_drop_column && !$tableflds) {
+                       if ($this->debug) ADOConnection::outp("DropColumnSQL 
needs complete table-definiton for PostgreSQL < 7.3");
+               return array();
+       }
+               if ($has_drop_column) {
+                       return ADODB_DataDict::DropColumnSQL($tabname, $flds);
+               }
+               return 
$this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
+       }
+       
+       /**
+        * Save the content into a temp. table, drop and recreate the original 
table and copy the content back in
+        *
+        * We also take care to set the values of the sequenz and recreate the 
indexes.
+        * All this is done in a transaction, to not loose the content of the 
table, if something went wrong!
+        * @internal
+        * @param string $tabname table-name
+        * @param string $dropflds column-names to drop
+        * @param string $tableflds complete defintion of the new table, eg. 
for postgres
+        * @param array/string $tableoptions options for the new table see 
CreateTableSQL, default ''
+        * @return array with SQL strings
+        */
+       function 
_recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='')
+       {
+               if ($dropflds && !is_array($dropflds)) $dropflds = 
explode(',',$dropflds);
+               $copyflds = array();
+               foreach($this->MetaColumns($tabname) as $fld) {
+                       if (!$dropflds || !in_array($fld->name,$dropflds)) {
+                               // we need to explicit convert varchar to a 
number to be able to do an AlterColumn of a char column to a nummeric one
+                               if (preg_match('/'.$fld->name.' 
(I|I2|I4|I8|N|F)/i',$tableflds,$matches) && 
+                                       
in_array($fld->type,array('varchar','char','text','bytea'))) {
+                                       $copyflds[] = 
"to_number($fld->name,'S9999999999999D99')";
+                               } else {
+                                       $copyflds[] = $fld->name;
+                               }
+                               // identify the sequence name and the fld its on
+                               if ($fld->primary_key && $fld->has_default && 
+                                       
preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
+                                       $seq_name = $matches[1];
+                                       $seq_fld = $fld->name;
+                               }
+                       }
+               }
+               $copyflds = implode(', ',$copyflds);
+               
+               $tempname = $tabname.'_tmp';
+               $aSql[] = 'BEGIN';              // we use a transaction, to 
make sure not to loose the content of the table
+               $aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM 
$tabname";
+               $aSql = array_merge($aSql,$this->DropTableSQL($tabname));
+               $aSql = 
array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions));
+               $aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM 
$tempname";
+               if ($seq_name && $seq_fld) {    // if we have a sequence we 
need to set it again
+                       $seq_name = $tabname.'_'.$seq_fld.'_seq';       // has 
to be the name of the new implicit sequence
+                       $aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) 
FROM $tabname";
+               }
+               $aSql[] = "DROP TABLE $tempname";
+               // recreate the indexes, if they not contain one of the droped 
columns
+               foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data)
+               {
+                       if (substr($idx_name,-5) != '_pkey' && (!$dropflds || 
!count(array_intersect($dropflds,$idx_data['columns'])))) {
+                               $aSql = 
array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'],
+                                       $idx_data['unique'] ? array('UNIQUE') : 
False));
+                       }
+               }
+               $aSql[] = 'COMMIT';
+               return $aSql;
+       }
+       
+       function DropTableSQL($tabname)
+       {
+               $sql = ADODB_DataDict::DropTableSQL($tabname);
+               
+               $drop_seq = $this->_DropAutoIncrement($tabname);
+               if ($drop_seq) $sql[] = $drop_seq;
+               
+               return $sql;
+       }
+
+       // return string must begin with space
+       function _CreateSuffix($fname, &$ftype, 
$fnotnull,$fdefault,$fautoinc,$fconstraint)
+       {
+               if ($fautoinc) {
+                       $ftype = 'SERIAL';
+                       return '';
+               }
+               $suffix = '';
+               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               return $suffix;
+       }
+       
+       // search for a sequece for the given table (asumes the seqence-name 
contains the table-name!)
+       // if yes return sql to drop it
+       // this is still necessary if postgres < 7.3 or the SERIAL was created 
on an earlier version!!!
+       function _DropAutoIncrement($tabname)
+       {
+               $tabname = $this->connection->quote('%'.$tabname.'%');
+
+               $seq = $this->connection->GetOne("SELECT relname FROM pg_class 
WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'");
+
+               // check if a tables depends on the sequenz and it therefor 
cant and dont need to be droped separatly
+               if (!$seq || $this->connection->GetOne("SELECT relname FROM 
pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE 
relname='$seq' AND relkind='S' AND deptype='i'")) {
+                       return False;
+               }
+               return "DROP SEQUENCE ".$seq;
+       }
+       
+       /*
+       CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
+       { column_name data_type [ DEFAULT default_expr ] [ column_constraint [, 
... ] ]
+       | table_constraint } [, ... ]
+       )
+       [ INHERITS ( parent_table [, ... ] ) ]
+       [ WITH OIDS | WITHOUT OIDS ]
+       where column_constraint is:
+       [ CONSTRAINT constraint_name ]
+       { NOT NULL | NULL | UNIQUE | PRIMARY KEY |
+       CHECK (expression) |
+       REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL ]
+       [ ON DELETE action ] [ ON UPDATE action ] }
+       [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY 
IMMEDIATE ]
+       and table_constraint is:
+       [ CONSTRAINT constraint_name ]
+       { UNIQUE ( column_name [, ... ] ) |
+       PRIMARY KEY ( column_name [, ... ] ) |
+       CHECK ( expression ) |
+       FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn 
[, ... ] ) ]
+       [ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action 
] }
+       [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY 
IMMEDIATE ]
+       */
+       
+       
+       /*
+       CREATE [ UNIQUE ] INDEX index_name ON table
+[ USING acc_method ] ( column [ ops_name ] [, ...] )
+[ WHERE predicate ]
+CREATE [ UNIQUE ] INDEX index_name ON table
+[ USING acc_method ] ( func_name( column [, ... ]) [ ops_name ] )
+[ WHERE predicate ]
+       */
+       function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+       {
+               $sql = array();
+               
+               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
+                       $sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+                       if ( isset($idxoptions['DROP']) )
+                               return $sql;
+               }
+               
+               if ( empty ($flds) ) {
+                       return $sql;
+               }
+               
+               $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+               
+               $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . 
$tabname . ' ';
+               
+               if (isset($idxoptions['HASH']))
+                       $s .= 'USING HASH ';
+               
+               if ( isset($idxoptions[$this->upperName]) )
+                       $s .= $idxoptions[$this->upperName];
+               
+               if ( is_array($flds) )
+                       $flds = implode(', ',$flds);
+               $s .= '(' . $flds . ')';
+               $sql[] = $s;
+               
+               return $sql;
+       }
+       
+       function _GetSize($ftype, $ty, $fsize, $fprec)
+       {
+               if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty  != 'I' 
&& strpos($ftype,'(') === false) {
+                       $ftype .= "(".$fsize;
+                       if (strlen($fprec)) $ftype .= ",".$fprec;
+                       $ftype .= ')';
+               }
+               return $ftype;
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php:1.2      Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php  Tue Feb 21 13:47:42 2006
@@ -1,121 +1,121 @@
-<?php
-
-/**
-  V4.50 6 July 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
-  
-  Modified from datadict-generic.inc.php for sapdb by 
RalfBecker-AT-outdoor-training.de
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_sapdb extends ADODB_DataDict {
-       
-       var $databaseType = 'sapdb';
-       var $seqField = false;  
-       var $renameColumn = 'RENAME COLUMN %s.%s TO %s';
-       
-       function ActualType($meta)
-       {
-               switch($meta) {
-               case 'C': return 'VARCHAR';
-               case 'XL':
-               case 'X': return 'LONG';
-               
-               case 'C2': return 'VARCHAR UNICODE';
-               case 'X2': return 'LONG UNICODE';
-               
-               case 'B': return 'LONG';
-                       
-               case 'D': return 'DATE';
-               case 'T': return 'TIMESTAMP';
-               
-               case 'L': return 'BOOLEAN';
-               case 'I': return 'INTEGER';
-               case 'I1': return 'FIXED(3)';
-               case 'I2': return 'SMALLINT';
-               case 'I4': return 'INTEGER';
-               case 'I8': return 'FIXED(20)';
-               
-               case 'F': return 'FLOAT(38)';
-               case 'N': return 'FIXED';
-               default:
-                       return $meta;
-               }
-       }
-       
-       function MetaType($t,$len=-1,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               static $maxdb_type2adodb = array(
-                       'VARCHAR'       => 'C',
-                       'CHARACTER'     => 'C',
-                       'LONG'          => 'X',         // no way to differ 
between 'X' and 'B' :-(
-                       'DATE'          => 'D',
-                       'TIMESTAMP'     => 'T',
-                       'BOOLEAN'       => 'L',
-                       'INTEGER'       => 'I4',
-                       'SMALLINT'      => 'I2',
-                       'FLOAT'         => 'F',
-                       'FIXED'         => 'N',
-               );
-               $type = isset($maxdb_type2adodb[$t]) ? $maxdb_type2adodb[$t] : 
'C';
-
-               // convert integer-types simulated with fixed back to integer
-               if ($t == 'FIXED' && !$fieldobj->scale && ($len == 20 || $len 
== 3)) {
-                       $type = $len == 20 ? 'I8' : 'I1';
-               }
-               if ($fieldobj->auto_increment) $type = 'R';
-
-               return $type;
-       }
-       
-       // return string must begin with space
-       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-       {       
-               $suffix = '';
-               if ($funsigned) $suffix .= ' UNSIGNED';
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               if ($fautoinc) $suffix .= ' DEFAULT SERIAL';
-               elseif (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               return $suffix;
-       }
-
-       function AddColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName ($tabname);
-               $sql = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', 
',$lines) . ')' );
-       }
-       
-       function AlterColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName ($tabname);
-               $sql = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               return array( 'ALTER TABLE ' . $tabname . ' MODIFY (' . 
implode(', ',$lines) . ')' );
-       }
-
-       function DropColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName ($tabname);
-               if (!is_array($flds)) $flds = explode(',',$flds);
-               foreach($flds as $k => $v) {
-                       $flds[$k] = $this->NameQuote($v);
-               }
-               return array( 'ALTER TABLE ' . $tabname . ' DROP (' . 
implode(', ',$flds) . ')' );
-       }       
-}
-
+<?php
+
+/**
+  V4.50 6 July 2004  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+  
+  Modified from datadict-generic.inc.php for sapdb by 
RalfBecker-AT-outdoor-training.de
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_sapdb extends ADODB_DataDict {
+       
+       var $databaseType = 'sapdb';
+       var $seqField = false;  
+       var $renameColumn = 'RENAME COLUMN %s.%s TO %s';
+       
+       function ActualType($meta)
+       {
+               switch($meta) {
+               case 'C': return 'VARCHAR';
+               case 'XL':
+               case 'X': return 'LONG';
+               
+               case 'C2': return 'VARCHAR UNICODE';
+               case 'X2': return 'LONG UNICODE';
+               
+               case 'B': return 'LONG';
+                       
+               case 'D': return 'DATE';
+               case 'T': return 'TIMESTAMP';
+               
+               case 'L': return 'BOOLEAN';
+               case 'I': return 'INTEGER';
+               case 'I1': return 'FIXED(3)';
+               case 'I2': return 'SMALLINT';
+               case 'I4': return 'INTEGER';
+               case 'I8': return 'FIXED(20)';
+               
+               case 'F': return 'FLOAT(38)';
+               case 'N': return 'FIXED';
+               default:
+                       return $meta;
+               }
+       }
+       
+       function MetaType($t,$len=-1,$fieldobj=false)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               static $maxdb_type2adodb = array(
+                       'VARCHAR'       => 'C',
+                       'CHARACTER'     => 'C',
+                       'LONG'          => 'X',         // no way to differ 
between 'X' and 'B' :-(
+                       'DATE'          => 'D',
+                       'TIMESTAMP'     => 'T',
+                       'BOOLEAN'       => 'L',
+                       'INTEGER'       => 'I4',
+                       'SMALLINT'      => 'I2',
+                       'FLOAT'         => 'F',
+                       'FIXED'         => 'N',
+               );
+               $type = isset($maxdb_type2adodb[$t]) ? $maxdb_type2adodb[$t] : 
'C';
+
+               // convert integer-types simulated with fixed back to integer
+               if ($t == 'FIXED' && !$fieldobj->scale && ($len == 20 || $len 
== 3)) {
+                       $type = $len == 20 ? 'I8' : 'I1';
+               }
+               if ($fieldobj->auto_increment) $type = 'R';
+
+               return $type;
+       }
+       
+       // return string must begin with space
+       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+       {       
+               $suffix = '';
+               if ($funsigned) $suffix .= ' UNSIGNED';
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               if ($fautoinc) $suffix .= ' DEFAULT SERIAL';
+               elseif (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               return $suffix;
+       }
+
+       function AddColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName ($tabname);
+               $sql = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', 
',$lines) . ')' );
+       }
+       
+       function AlterColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName ($tabname);
+               $sql = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               return array( 'ALTER TABLE ' . $tabname . ' MODIFY (' . 
implode(', ',$lines) . ')' );
+       }
+
+       function DropColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName ($tabname);
+               if (!is_array($flds)) $flds = explode(',',$flds);
+               foreach($flds as $k => $v) {
+                       $flds[$k] = $this->NameQuote($v);
+               }
+               return array( 'ALTER TABLE ' . $tabname . ' DROP (' . 
implode(', ',$flds) . ')' );
+       }       
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php
diff -u phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php:1.2 
phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php:1.3
--- phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php:1.2     Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php Tue Feb 21 13:47:42 2006
@@ -1,228 +1,228 @@
-<?php
-
-/**
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-       
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_sybase extends ADODB_DataDict {
-       var $databaseType = 'sybase';
-       
-       var $dropIndex = 'DROP INDEX %2$s.%1$s';
-       
-       function MetaType($t,$len=-1,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               
-               $len = -1; // mysql max_length is not accurate
-               switch (strtoupper($t)) {
-
-               case 'INT': 
-               case 'INTEGER': return  'I';
-               case 'BIT':
-               case 'TINYINT': return  'I1';
-               case 'SMALLINT': return 'I2';
-               case 'BIGINT':  return  'I8';
-               
-               case 'REAL':
-               case 'FLOAT': return 'F';
-               default: return parent::MetaType($t,$len,$fieldobj);
-               }
-       }
-       
-       function ActualType($meta)
-       {
-               switch(strtoupper($meta)) {
-               case 'C': return 'VARCHAR';
-               case 'XL':
-               case 'X': return 'TEXT';
-               
-               case 'C2': return 'NVARCHAR';
-               case 'X2': return 'NTEXT';
-               
-               case 'B': return 'IMAGE';
-                       
-               case 'D': return 'DATETIME';
-               case 'T': return 'DATETIME';
-               case 'L': return 'BIT';
-               
-               case 'I': return 'INT'; 
-               case 'I1': return 'TINYINT';
-               case 'I2': return 'SMALLINT';
-               case 'I4': return 'INT';
-               case 'I8': return 'BIGINT';
-               
-               case 'F': return 'REAL';
-               case 'N': return 'NUMERIC';
-               default:
-                       return $meta;
-               }
-       }
-       
-       
-       function AddColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName ($tabname);
-               $f = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               $s = "ALTER TABLE $tabname $this->addCol";
-               foreach($lines as $v) {
-                       $f[] = "\n $v";
-               }
-               $s .= implode(', ',$f);
-               $sql[] = $s;
-               return $sql;
-       }
-       
-       function AlterColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName ($tabname);
-               $sql = array();
-               list($lines,$pkey) = $this->_GenFields($flds);
-               foreach($lines as $v) {
-                       $sql[] = "ALTER TABLE $tabname $this->alterCol $v";
-               }
-
-               return $sql;
-       }
-       
-       function DropColumnSQL($tabname, $flds)
-       {
-               $tabname = $this->TableName($tabname);
-               if (!is_array($flds)) $flds = explode(',',$flds);
-               $f = array();
-               $s = "ALTER TABLE $tabname";
-               foreach($flds as $v) {
-                       $f[] = "\n$this->dropCol ".$this->NameQuote($v);
-               }
-               $s .= implode(', ',$f);
-               $sql[] = $s;
-               return $sql;
-       }
-       
-       // return string must begin with space
-       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-       {       
-               $suffix = '';
-               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-               if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
-               if ($fnotnull) $suffix .= ' NOT NULL';
-               else if ($suffix == '') $suffix .= ' NULL';
-               if ($fconstraint) $suffix .= ' '.$fconstraint;
-               return $suffix;
-       }
-       
-       /*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
-        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
-
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
-
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
-
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
-        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
-
-
-       */
-       
-       /*
-       CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-               [ WITH < index_option > [ ,...n] ] 
-               [ ON filegroup ]
-               < index_option > :: = 
-                   { PAD_INDEX | 
-                       FILLFACTOR = fillfactor | 
-                       IGNORE_DUP_KEY | 
-                       DROP_EXISTING | 
-                   STATISTICS_NORECOMPUTE | 
-                   SORT_IN_TEMPDB  
-               }
-*/
-       function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-       {
-               $sql = array();
-               
-               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
-                       $sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-                       if ( isset($idxoptions['DROP']) )
-                               return $sql;
-               }
-               
-               if ( empty ($flds) ) {
-                       return $sql;
-               }
-               
-               $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-               $clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : 
'';
-               
-               if ( is_array($flds) )
-                       $flds = implode(', ',$flds);
-               $s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' 
ON ' . $tabname . ' (' . $flds . ')';
-               
-               if ( isset($idxoptions[$this->upperName]) )
-                       $s .= $idxoptions[$this->upperName];
-
-               $sql[] = $s;
-               
-               return $sql;
-       }
-}
+<?php
+
+/**
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+       
+  Set tabs to 4 for best viewing.
+ 
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB2_sybase extends ADODB_DataDict {
+       var $databaseType = 'sybase';
+       
+       var $dropIndex = 'DROP INDEX %2$s.%1$s';
+       
+       function MetaType($t,$len=-1,$fieldobj=false)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               
+               $len = -1; // mysql max_length is not accurate
+               switch (strtoupper($t)) {
+
+               case 'INT': 
+               case 'INTEGER': return  'I';
+               case 'BIT':
+               case 'TINYINT': return  'I1';
+               case 'SMALLINT': return 'I2';
+               case 'BIGINT':  return  'I8';
+               
+               case 'REAL':
+               case 'FLOAT': return 'F';
+               default: return parent::MetaType($t,$len,$fieldobj);
+               }
+       }
+       
+       function ActualType($meta)
+       {
+               switch(strtoupper($meta)) {
+               case 'C': return 'VARCHAR';
+               case 'XL':
+               case 'X': return 'TEXT';
+               
+               case 'C2': return 'NVARCHAR';
+               case 'X2': return 'NTEXT';
+               
+               case 'B': return 'IMAGE';
+                       
+               case 'D': return 'DATETIME';
+               case 'T': return 'DATETIME';
+               case 'L': return 'BIT';
+               
+               case 'I': return 'INT'; 
+               case 'I1': return 'TINYINT';
+               case 'I2': return 'SMALLINT';
+               case 'I4': return 'INT';
+               case 'I8': return 'BIGINT';
+               
+               case 'F': return 'REAL';
+               case 'N': return 'NUMERIC';
+               default:
+                       return $meta;
+               }
+       }
+       
+       
+       function AddColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName ($tabname);
+               $f = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               $s = "ALTER TABLE $tabname $this->addCol";
+               foreach($lines as $v) {
+                       $f[] = "\n $v";
+               }
+               $s .= implode(', ',$f);
+               $sql[] = $s;
+               return $sql;
+       }
+       
+       function AlterColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName ($tabname);
+               $sql = array();
+               list($lines,$pkey) = $this->_GenFields($flds);
+               foreach($lines as $v) {
+                       $sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+               }
+
+               return $sql;
+       }
+       
+       function DropColumnSQL($tabname, $flds)
+       {
+               $tabname = $this->TableName($tabname);
+               if (!is_array($flds)) $flds = explode(',',$flds);
+               $f = array();
+               $s = "ALTER TABLE $tabname";
+               foreach($flds as $v) {
+                       $f[] = "\n$this->dropCol ".$this->NameQuote($v);
+               }
+               $s .= implode(', ',$f);
+               $sql[] = $s;
+               return $sql;
+       }
+       
+       // return string must begin with space
+       function 
_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
+       {       
+               $suffix = '';
+               if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+               if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
+               if ($fnotnull) $suffix .= ' NOT NULL';
+               else if ($suffix == '') $suffix .= ' NULL';
+               if ($fconstraint) $suffix .= ' '.$fconstraint;
+               return $suffix;
+       }
+       
+       /*
+CREATE TABLE 
+    [ database_name.[ owner ] . | owner. ] table_name 
+    ( { < column_definition > 
+        | column_name AS computed_column_expression 
+        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
+    ) 
+
+[ ON { filegroup | DEFAULT } ] 
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+
+< column_definition > ::= { column_name data_type } 
+    [ COLLATE < collation_name > ] 
+    [ [ DEFAULT constant_expression ] 
+        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+    ] 
+    [ ROWGUIDCOL] 
+    [ < column_constraint > ] [ ...n ] 
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ NULL | NOT NULL ] 
+        | [ { PRIMARY KEY | UNIQUE } 
+            [ CLUSTERED | NONCLUSTERED ] 
+            [ WITH FILLFACTOR = fillfactor ] 
+            [ON {filegroup | DEFAULT} ] ] 
+        ] 
+        | [ [ FOREIGN KEY ] 
+            REFERENCES ref_table [ ( ref_column ) ] 
+            [ ON DELETE { CASCADE | NO ACTION } ] 
+            [ ON UPDATE { CASCADE | NO ACTION } ] 
+            [ NOT FOR REPLICATION ] 
+        ] 
+        | CHECK [ NOT FOR REPLICATION ] 
+        ( logical_expression ) 
+    } 
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ { PRIMARY KEY | UNIQUE } 
+        [ CLUSTERED | NONCLUSTERED ] 
+        { ( column [ ASC | DESC ] [ ,...n ] ) } 
+        [ WITH FILLFACTOR = fillfactor ] 
+        [ ON { filegroup | DEFAULT } ] 
+    ] 
+    | FOREIGN KEY 
+        [ ( column [ ,...n ] ) ] 
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
+        [ ON DELETE { CASCADE | NO ACTION } ] 
+        [ ON UPDATE { CASCADE | NO ACTION } ] 
+        [ NOT FOR REPLICATION ] 
+    | CHECK [ NOT FOR REPLICATION ] 
+        ( search_conditions ) 
+    } 
+
+
+       */
+       
+       /*
+       CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
+               [ WITH < index_option > [ ,...n] ] 
+               [ ON filegroup ]
+               < index_option > :: = 
+                   { PAD_INDEX | 
+                       FILLFACTOR = fillfactor | 
+                       IGNORE_DUP_KEY | 
+                       DROP_EXISTING | 
+                   STATISTICS_NORECOMPUTE | 
+                   SORT_IN_TEMPDB  
+               }
+*/
+       function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+       {
+               $sql = array();
+               
+               if ( isset($idxoptions['REPLACE']) || 
isset($idxoptions['DROP']) ) {
+                       $sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+                       if ( isset($idxoptions['DROP']) )
+                               return $sql;
+               }
+               
+               if ( empty ($flds) ) {
+                       return $sql;
+               }
+               
+               $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+               $clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : 
'';
+               
+               if ( is_array($flds) )
+                       $flds = implode(', ',$flds);
+               $s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' 
ON ' . $tabname . ' (' . $flds . ')';
+               
+               if ( isset($idxoptions[$this->upperName]) )
+                       $s .= $idxoptions[$this->upperName];
+
+               $sql[] = $s;
+               
+               return $sql;
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/docs/docs-adodb.htm
diff -u phpgwapi/inc/adodb/docs/docs-adodb.htm:1.2 
phpgwapi/inc/adodb/docs/docs-adodb.htm:1.3
--- phpgwapi/inc/adodb/docs/docs-adodb.htm:1.2  Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/docs/docs-adodb.htm      Tue Feb 21 13:47:42 2006
@@ -1,3118 +1,3357 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><title>ADODB Manual</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-       
-<style>
-pre {
-  background-color: #eee;
-  padding: 0.75em 1.5em;
-  font-size: 12px;
-  border: 1px solid #ddd;
-}
-</style></head>
-<body bgcolor="#ffffff">
-
-<h2>ADOdb Library for PHP</h2>
-<p>V4.54 5 Nov 2004 (c) 2000-2004 John Lim (jlim#natsoft.com)</p>
-<p><font size="1">This software is dual licensed using BSD-Style and LGPL. 
This 
-  means you can use it in compiled proprietary and commercial 
products.</font></p>
-  
-  
-  <table border="1"><tbody><tr><td><font color="red">Kindly note that the 
ADOdb home page has moved to <a 
href="http://adodb.sourceforge.net/";>http://adodb.sourceforge.net/</a> because 
of the persistent 
-  unreliability of http://php.weblogs.com. <b>Please change your 
links</b>!</font></td></tr></tbody></table>
-       <p>Useful ADOdb links:  <a 
href="http://adodb.sourceforge.net/#download";>Download</a> &nbsp; <a 
href="http://adodb.sourceforge.net/#docs";>Other Docs</a>
-
-</p><p><a href="#intro"><b>Introduction</b></a><b><br>
-       <a href="#features">Unique Features</a><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</a><br>
-       <a href="#mininstall">Minimum Install</a><br>
-       <a href="#coding">Initializing Code and Connectioning to 
Databases</a><br>
-       </b><font size="2"> &nbsp; <a href="#dsnsupport">Data Source Name (DSN) 
Support</a></font>  &nbsp;  <a href="#connect_ex">Connection Examples</a> <br>
-       <b><a href="#speed">High Speed ADOdb - tuning tips</a></b><br>
-       <b><a href="#hack">Hacking and Modifying ADOdb Safely</a><br>
-       <a href="#php5">PHP5 Features</a></b><br>
-       <font size="2"><a href="#php5iterators">foreach iterators</a> <a 
href="#php5exceptions">exceptions</a></font><br>
-       <b> <a href="#drivers">Supported Databases</a></b><br>
-       <b> <a href="#quickstart">Tutorials</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>
-       <a href="#ex9">Example 9: Exporting in CSV or Tab-Delimited Format</a> 
<br>
-       <a href="#ex10">Example 10: Custom filters</a><br>
-       <a href="#ex11">Example 11: Smart Transactions</a><br>
-       <br>
-       <b> <a href="#errorhandling">Using Custom Error Handlers and 
PEAR_Error</a><br>
-       <a href="#DSN">Data Source Names</a><br>
-       <a href="#caching">Caching</a><br>
-       <a href="#pivot">Pivot Tables</a></b> 
-</p><p><a href="#ref"><b>REFERENCE</b></a>
-</p><p> <font size="2">Variables: <a 
href="#adodb_countrecs">$ADODB_COUNTRECS</a> 
-<a href="#adodb_ansi_padding_off">$ADODB_ANSI_PADDING_OFF</a>
-  <a href="#adodb_cache_dir">$ADODB_CACHE_DIR</a> <br>
-  &nbsp; &nbsp; &nbsp; &nbsp;  <a href="#force_type">$ADODB_FORCE_TYPE</a> 
-  <a href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a> 
-  <a href="#adodb_lang">$ADODB_LANG</a> <br>
-  Constants: </font><font size="2"><a 
href="#adodb_assoc_case">ADODB_ASSOC_CASE</a> 
-  </font><br>
-  <a href="#ADOConnection"><b> ADOConnection</b></a><br>
-  <font size="2">Connections: <a href="#connect">Connect</a> <a 
href="#pconnect">PConnect</a> 
-  <a href="#nconnect">NConnect</a> <a href="#isconnected">IsConnected</a><br>
-  Executing SQL: <a href="#execute">Execute</a> <a 
href="#cacheexecute"><i>CacheExecute</i></a> 
-  <a href="#SelectLimit">SelectLimit</a> <a 
href="#cacheSelectLimit"><i>CacheSelectLimit</i></a> 
-  <a href="#param">Param</a> <a href="#prepare">Prepare</a> <a 
href="#preparesp">PrepareSP</a> 
-  <a href="#inparameter">InParameter</a> <a 
href="#outparameter">OutParameter</a>
-  <br>
-  &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a 
href="#getone">GetOne</a> 
-  <a href="#cachegetone"><i>CacheGetOne</i></a> <a href="#getrow">GetRow</a> 
<a href="#cachegetrow"><i>CacheGetRow</i></a> 
-  <a href="#getall">GetAll</a> <a href="#cachegetall"><i>CacheGetAll</i></a> 
<a href="#getcol">GetCol</a> 
-  <a href="#cachegetcol"><i>CacheGetCol</i></a> <a 
href="#getassoc1">GetAssoc</a> <a 
href="#cachegetassoc"><i>CacheGetAssoc</i></a> <a href="#replace">Replace</a> 
-  <br>
-  &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a 
href="#executecursor">ExecuteCursor</a> 
-  (oci8 only)<br>
-  Generates SQL strings: <a href="#getupdatesql">GetUpdateSQL</a> <a 
href="#getinsertsql">GetInsertSQL</a> 
-  <a href="#concat">Concat</a> <a href="#ifnull">IfNull</a> <a 
href="#length">length</a> <a href="#random">random</a> <a 
href="#substr">substr</a> 
-  <a href="#qstr">qstr</a> <a href="#param">Param</a> 
-  <a href="#prepare"></a><a href="#OffsetDate">OffsetDate</a> <a 
href="#SQLDate">SQLDate</a> 
-  <a href="#dbdate">DBDate</a> <a href="#dbtimestamp"></a> <a 
href="#dbtimestamp">DBTimeStamp</a>
-  <br>
-  Blobs: <a href="#updateblob">UpdateBlob</a> <a 
href="#updateclob">UpdateClob</a> 
-  <a href="#updateblobfile">UpdateBlobFile</a> <a 
href="#blobencode">BlobEncode</a> 
-  <a href="#blobdecode">BlobDecode</a><br>
-  Paging/Scrolling: <a href="#pageexecute">PageExecute</a> <a 
href="#cachepageexecute">CachePageExecute</a><br>
-  Cleanup: <a href="#cacheflush">CacheFlush</a> <a href="#Close">Close</a><br>
-  Transactions: <a href="#starttrans">StartTrans</a> <a 
href="#completetrans">CompleteTrans</a> 
-  <a href="#failtrans">FailTrans</a> <a 
href="#hasfailedtrans">HasFailedTrans</a> 
-  <a href="#begintrans">BeginTrans</a> <a href="#committrans">CommitTrans</a> 
-  <a href="#rollbacktrans">RollbackTrans</a> <br>
-  Fetching Data: </font> <font size="2"><a 
href="#setfetchmode">SetFetchMode</a><br>
-  Strings: <a href="#concat">concat</a> <a href="#length">length</a>  <a 
href="#qstr">qstr</a> <a href="#quote">quote</a> <a 
href="#substr">substr</a><br>
-  Dates: <a href="#dbdate">DBDate</a> <a href="#dbtimestamp">DBTimeStamp</a> 
<a href="#unixdate">UnixDate</a> 
-  <a href="#unixtimestamp">UnixTimeStamp</a> <a 
href="#OffsetDate">OffsetDate</a> 
-  <a href="#SQLDate">SQLDate</a> <br>
-  Row Management: <a href="#affected_rows">Affected_Rows</a> <a 
href="#inserted_id">Insert_ID</a>  <a href="#rowlock">RowLock</a>
-  <a href="#genid">GenID</a> <a href="#createseq">CreateSequence</a> <a 
href="#dropseq">DropSequence</a> 
-  <br>
-  Error Handling: <a href="#errormsg">ErrorMsg</a> <a 
href="#errorno">ErrorNo</a> 
-  <a href="#metaerror">MetaError</a> <a 
href="#metaerrormsg">MetaErrorMsg</a><br>
-  Data Dictionary (metadata): <a href="#metadatabases">MetaDatabases</a> <a 
href="#metatables">MetaTables</a> 
-  <a href="#metacolumns">MetaColumns</a> <a 
href="#metacolumnames">MetaColumnNames</a> 
-  <a href="#metaprimarykeys">MetaPrimaryKeys</a> <a 
href="#metaforeignkeys">MetaForeignKeys</a> 
-  <a href="#serverinfo">ServerInfo</a> <br>
-  Statistics and Query-Rewriting: <a href="#logsql">LogSQL</a> <a 
href="#fnexecute">fnExecute 
-  and fnCacheExecute</a><br>
-  </font><font size="2">Deprecated: <a href="#bind">Bind</a> <a 
href="#blankrecordset">BlankRecordSet</a>
-  <a href="#parameter">Parameter</a></font>
-  <a href="#adorecordSet"><b><br>
-  ADORecordSet</b></a><br>
-  <font size="2">
-  Returns one field: <a href="#fields">Fields</a><br>
- Returns one row:<a href="#fetchrow">FetchRow</a> <a 
href="#fetchinto">FetchInto</a> 
-  <a href="#fetchobject">FetchObject</a> <a 
href="#fetchnextobject">FetchNextObject</a> 
-  <a href="#fetchobj">FetchObj</a> <a href="#fetchnextobj">FetchNextObj</a>
- <a href="#getrowassoc">GetRowAssoc</a> <br>
-  Returns all rows:<a href="#getarray">GetArray</a> <a 
href="#getrows">GetRows</a> 
-  <a href="#getassoc">GetAssoc</a><br>
-  Scrolling:<a href="#move">Move</a> <a href="#movenext">MoveNext</a> <a 
href="#movefirst">MoveFirst</a> 
-  <a href="#movelast">MoveLast</a> <a href="#abspos">AbsolutePosition</a> <a 
href="#currentrow">CurrentRow</a> 
-  <a href="#atfirstpage">AtFirstPage</a> <a href="#atlastpage">AtLastPage</a> 
-  <a href="#absolutepage">AbsolutePage</a> </font> <font size="2"><br>
-  Menu generation:<a href="#getmenu">GetMenu</a> <a 
href="#getmenu2">GetMenu2</a><br>
-  Dates:<a href="#userdate">UserDate</a> <a 
href="#usertimestamp">UserTimeStamp</a> 
-  <a href="#unixdate">UnixDate</a> <a href="#unixtimestamp">UnixTimeStamp<br>
-  </a>Recordset Info:<a href="#recordcount">RecordCount</a> <a 
href="#po_recordcount">PO_RecordSet</a> 
-  <a href="#nextrecordset">NextRecordSet</a><br>
-  Field Info:<a href="#fieldcount">FieldCount</a> <a 
href="#fetchfield">FetchField</a> 
-  <a href="#metatype">MetaType</a><br>
-  Cleanup: <a href="#rsclose">Close</a></font> <font size="2"></font> 
-</p><p><font size="2"><a href="#rs2html"><b>rs2html</b></a>&nbsp; <a 
href="#exrs2html">example</a></font><br>
-  <a href="#adodiff">Differences between ADOdb and ADO</a><br>
-  <a href="#driverguide"><b>Database Driver Guide<br>
-  </b></a><b><a href="#changes">Change Log</a></b><br>
-</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 
database 
-  API's (encapsulate the differences) so we can easily switch databases. PHP 
4.0.5 or later
-  is now required (because we use array-based str_replace).</p>
-<p>We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase 
SQL Anywhere, Informix, 
-  PostgreSQL, FrontBase,  SQLite, Interbase (Firebird and Borland variants), 
Foxpro, Access, ADO, DB2, SAP DB and ODBC. 
-  We have had successful reports of connecting to Progress and CacheLite 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>
-<p>Also read <a 
href="http://phplens.com/lens/adodb/tips_portable_sql.htm";>tips_portable_sql.htm</a>
 
- for tips on writing 
-  portable SQL.</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>Portable table and index creation</b> with the <a 
href="docs-datadict.htm">datadict</a> classes.
-  </li><li><b>Database performance monitoring and SQL tuning</b> with the <a 
href="docs-perf.htm">performance monitoring</a> classes.
-  </li><li><b>Database-backed sessions</b> with the <a 
href="docs-session.htm">session management</a> classes. Supports session expiry 
notification.
-</li></ul>
-<h2>How People are using ADOdb<a name="users"></a></h2>
-Here are some examples of how people are using ADOdb (for a much longer list, 
-visit <a 
href="http://phplens.com/phpeverywhere/adodb-cool-apps";>adodb-cool-apps</a>): 
-<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.<p>
-
-</p></li><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.<p>
-
-</p></li><li><a 
href="http://www.andrew.cmu.edu/%7Erdanyliw/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.<p>
-
-</p></li><li><a href="http://www.postnuke.com/";>PostNuke</a> is a very
-popular free content management system and weblog system. It offers
-full CSS support, HTML 4.01 transitional compliance throughout, an
-advanced blocks system, and is fully multi-lingual enabled. <p>
-
-</p></li><li><a 
href="http://www.auto-net.no/easypublish.php?page=index&amp;lang_id=2";>EasyPublish
 CMS</a>
-is another free content management system for managing information and
-integrated modules on your internet, intranet- and extranet-sites. From
-Norway.<p>
-
-</p></li><li><a href="http://nola.noguska.com/";>NOLA</a> is a full featured 
accounting, inventory, and job tracking application. It is licensed under the 
GPL, and developed by Noguska.
-</li></ul><p>
-
-</p><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 the ADOdb Help forums at <a 
href="http://phplens.com/lens/lensforum/topics.php?id=4";>http://phplens.com/lens/lensforum/topics.php?id=4</a>.</p>
-<h2>Installation Guide<a name="install"></a></h2>
-<p>Make sure you are running PHP 4.0.5 or later. 
-  Unpack all the files into a directory accessible by your webserver.</p>
-<p>To test, try modifying some of the tutorial examples. Make sure you 
customize 
-  the connection settings correctly. You can debug using <i>$db-&gt;debug = 
true</i> as shown below:</p>
-<pre>&lt;?php<br>      include('adodb/adodb.inc.php');<br>     $db = <a 
href="#adonewconnection">ADONewConnection</a>($dbdriver); # eg 'mysql' or 
'postgres'<br>       $db-&gt;debug = true;<br>       $db-&gt;<a 
href="#connect">Connect</a>($server, $user, $password, $database);<br>       
$rs = $db-&gt;<a href="#execute">Execute</a>('select * from 
some_small_table');<br>     print "&lt;pre&gt;";<br>        print_r($rs-&gt;<a 
href="#getrows">GetRows</a>());<br>  print "&lt;/pre&gt;";<br>?&gt;</pre>
-
- <h3>Minimum Install<a name="mininstall"></a></h3>
-<p>For developers who want to release a minimal install of ADOdb, you will 
need:
-</p><ul>
-<li>adodb.inc.php
-</li><li>adodb-lib.inc.php
-</li><li>adodb-time.inc.php
-</li><li>drivers/adodb-$database.inc.php
-</li><li>license.txt (for legal reasons)
-</li><li>adodb-php4.inc.php
-</li><li>adodb-iterator.inc.php
-</li></ul>
-Optional:
-<ul>
-<li>adodb-error.inc.php and lang/adodb-$lang.inc.php (if you use MetaError())
-</li><li>adodb-csvlib.inc.php (if you use cached recordsets - CacheExecute(), 
etc)
-</li><li>adodb-exceptions.inc.php and adodb-errorhandler.inc.php (if you use 
adodb error handler or php5 exceptions).
-</li></ul>
-
-<h3>Code Initialization Examples<a name="coding"></a></h3>
-<p>When running ADOdb, at least two files are loaded. First is 
adodb/adodb.inc.php, 
- which contains all functions used by all database classes. The code specific 
- to a particular database is in the adodb/driver/adodb-????.inc.php file.</p>
- <a name="adonewconnection"></a>
-<p>For example, to connect to a mysql database:</p>
-<pre>include('/path/to/set/here/adodb.inc.php');<br>$conn = 
&amp;ADONewConnection('mysql');<br></pre>
-<p>Whenever you need to connect to a database, you create a Connection object 
-  using the <b>ADONewConnection</b>($driver) function. 
-  <b>NewADOConnection</b>($driver) is an alternative name for the same 
function.</p>
-
-<p>At this point, you are not connected to the database (no longer true if you 
pass in a <a href="#dsnsupport">dsn</a>). You will first need to decide
-whether to use <i>persistent</i> or <i>non-persistent</i> connections. The 
advantage of <i>persistent</i>
-connections is that they are faster, as the database connection is never 
closed (even 
-when you call Close()). <i>Non-persistent </i>connections take up much fewer 
resources though,
-reducing the risk of your database and your web-server becoming overloaded. 
-</p><p>For persistent connections,
-use $conn-&gt;<a href="#pconnect">PConnect()</a>,
- or $conn-&gt;<a href="#connect">Connect()</a> for non-persistent connections.
-Some database drivers also support <a href="#nconnect">NConnect()</a>, which 
forces 
-the creation of a new connection. 
-
-<a name="connection_gotcha"></a>
-</p><p><b>Connection Gotcha</b>:  If you create two connections, but both use 
the same userid and password,
-PHP will share the same connection. This can cause problems if the connections 
are meant to 
-different databases. The solution is to always use different userid's for 
different databases,
- or use NConnect().
-
- <a name="dsnsupport"></a>
- </p><h3>Data Source Name (DSN) Support</h3> 
- <p> Since ADOdb 4.51, you can connect to a database by passing a dsn to 
NewADOConnection() (or ADONewConnection, which is
- the same function). The dsn format is:
-</p><pre>      
$driver://$username:address@hidden/$database?options[=value]<br></pre><p>
-NewADOConnection() calls Connect() or PConnect() internally for you. If the 
connection fails, false is returned.
-</p><pre>      <font color="#008000"># non-persistent connection</font>
-       $dsn = 'mysql://root:address@hidden/mydb'; 
-       $db = NewADOConnection($dsn);
-       if (!$db) die("Connection failed");   
-       
-       <font color="#008000"># no need to call connect/pconnect!</font>
-       $arr = $db-&gt;GetArray("select * from table");
-       
-       <font color="#008000"># persistent connection</font>
-       $dsn2 = 'mysql://root:address@hidden/mydb?persist'; 
-</pre>
-<p>
-If you have special characters such as /:? in your dsn, then you need to 
rawurlencode them first:
-</p><pre>      $pwd = rawurlencode($pwd);<br>  $dsn = 
"mysql://root:address@hidden/mydb";<br></pre>
-<p>
-Legal options are:
-</p><p>
-<table align="center" border="1"><tbody><tr><td>For all drivers</td><td>
-       'persist', 'persistent', 'debug', 'fetchmode'
-       </td></tr><tr><td>Interbase/Firebird
-       </td><td>
-                                        'dialect',
-                                        'charset',
-                                       'buffers'
-       </td></tr><tr><td>M'soft ADO</td><td>
-                                        'charpage'
-                                       
-               </td></tr><tr><td>MySQL</td><td>
-                                       'clientflags'
-</td></tr><tr><td>MySQLi</td><td>
-       'port', 'socket', 'clientflags'
-</td></tr><tr><td>Oci8</td><td>
- 'nls_date_format'
-</td></tr></tbody></table>
-</p><p>
-For all drivers, when the options <i>persist</i> or <i>persistent</i> are set, 
 a persistent connection is forced.
-The <i>debug</i> option enables debugging. The <i>fetchmode</i> calls <a 
href="#setfetchmode">SetFetchMode()</a>.
-If no value is defined for an option, then the value is set to 1.
-</p><p>
-ADOdb DSN's are compatible with version 1.0 of PEAR DB's DSN format.
-<a name="connect_ex">
-</a></p><h3><a name="connect_ex">Examples of Connecting to Databases</a></h3>
-<h4><a name="connect_ex">MySQL and Most Other Database Drivers</a></h4>
-<p><a name="connect_ex">MySQL connections are very straightforward, and the 
parameters are identical 
-  to mysql_connect:</a></p>
-<pre><a name="connect_ex">     $conn = &amp;ADONewConnection('mysql'); <br>    
$conn-&gt;PConnect('localhost','userid','password','database');<br>     <br>    
<font color="#008000"># or dsn </font>
-       $dsn = 'mysql://user:address@hidden/mydb'; 
-       $conn = ADONewConnection($dsn);  # no need for Connect()
-       
-       <font color="#008000"># or persistent dsn</font>
-       $dsn = 'mysql://user:address@hidden/mydb?persist'; 
-       $conn = ADONewConnection($dsn);  # no need for PConnect()
-       
-       <font color="#008000"># a more complex example:</font>
-       $pwd = urlencode($pwd);
-       $flags =  MYSQL_CLIENT_COMPRESS;
-       $dsn = 
"mysql://user:address@hidden/mydb?persist&amp;clientflags=$flags";
-       $conn = ADONewConnection($dsn);  # no need for PConnect()
- </a></pre>
-<p><a name="connect_ex"> For most drivers, you can use the standard function: 
Connect($server, $user, $password, $database), or
-a </a><a href="dsnsupport">DSN</a> since ADOdb 4.51. Exceptions to this are 
listed below.
-</p><h4>PostgreSQL</h4>
-<p>PostgreSQL accepts connections using: </p>
-<p>a. the standard connection string:</p>
-<pre>  $conn = &amp;ADONewConnection('postgres7'); <br>        
$conn-&gt;PConnect('host=localhost port=5432 dbname=mary');</pre>
-<p> b. the classical 4 parameters:</p>
- <pre> $conn-&gt;PConnect('localhost','userid','password','database');<br> 
</pre>
-<p>c. dsn:
-</p><pre>      $dsn = 'postgres7://user:address@hidden/mydb?persist';  # 
persist is optional<br>       $conn = ADONewConnection($dsn);  # no need for 
Connect/PConnect<br></pre>
-<a name="ldap"></a>
-
- <h4>LDAP</h4>
-  <p>Here is an example of querying a LDAP server. Thanks to Josh Eldridge for 
the driver and this example:
-</p><pre> &lt;?php<br>require('/path/to/adodb.inc.php');<br><br>$host = 
'ldap.baylor.edu';<br>$ldapbase = 'ou=People,o=Baylor 
University,c=US';<br><br>$ldap = NewADOConnection( 'ldap' 
);<br>$ldap-&gt;Connect( $host, $user_name='', $password='', $ldapbase 
);<br><br>echo "&lt;pre&gt;";<br><br>print_r( $ldap-&gt;ServerInfo() 
);<br>$ldap-&gt;SetFetchMode(ADODB_FETCH_ASSOC);<br>$userName = 
'eldridge';<br>$filter="(|(CN=$userName*)(sn=$userName*)(givenname=$userName*)(uid=$userName*))";<br><br>$rs
 = $ldap-&gt;Execute( $filter );<br>if ($rs)<br>       while ($arr = 
$rs-&gt;FetchRow()) {<br>      print_r($arr);     <br>    }<br><br>$rs = 
$ldap-&gt;Execute( $filter );<br>if ($rs) <br>   while (!$rs-&gt;EOF) {<br>     
         print_r($rs-&gt;fields);        <br>            
$rs-&gt;MoveNext();<br> } <br>  <br>print_r( $ldap-&gt;GetArray( $filter ) 
);<br><br>print_r( $ldap-&gt;GetRow( $filter ) 
);<br><br>$ldap-&gt;Close();<br>echo "&lt;/pre&gt;";<br>?&gt;</pre>
-<h4>Interbase/Firebird</h4>
-You define the database in the $host parameter:
-<pre>  $conn = &amp;ADONewConnection('ibase'); <br>    
$conn-&gt;PConnect('localhost:c:\ibase\employee.gdb','sysdba','masterkey');<br></pre>
-<p>Or dsn:
-</p><pre>      $dsn = 
'firebird://user:address@hidden/mydb?persist&amp;dialect=3';  # persist is 
optional<br>  $conn = ADONewConnection($dsn);  # no need for 
Connect/PConnect<br></pre>
-<h4>SQLite</h4>
-Sqlite will create the database file if it does not exist.
-<pre>  $conn = &amp;ADONewConnection('sqlite'); <br>   
$conn-&gt;PConnect('c:\path\to\sqlite.db'); # sqlite will create if does not 
exist<br></pre>
-<p>Or dsn:
-</p><pre>      $dsn = 'sqlite://user:address@hidden/mydb?persist';  # persist 
is optional<br>  $conn = ADONewConnection($dsn);  # no need for 
Connect/PConnect<br></pre>
-<h4>Oracle (oci8)</h4>
-<p>With oci8, you can connect in multiple ways. Note that oci8 works fine with 
-newer versions of the Oracle, eg. 9i and 10g.</p>
-<p>a. PHP and Oracle reside on the same machine, use default SID.</p>
-<pre>  $conn-&gt;Connect(false, 'scott', 'tiger');</pre>
-<p>b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 
'myTNS'</p>
-<pre>  $conn-&gt;PConnect(false, 'scott', 'tiger', 'myTNS');</pre>
-<p>or</p>
-<pre>  $conn-&gt;PConnect('myTNS', 'scott', 'tiger');</pre>
-<p>c. Host Address and SID</p>
-<pre>  $conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'SID');</pre>
-<p>d. Host Address and Service Name</p>
-<pre>  $conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'servicename');</pre>
-<p>e. Oracle connection string:
-</p><pre>      $cstr = 
"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))<br>              
        (CONNECT_DATA=(SID=$sid)))";<br>        $conn-&gt;Connect($cstr, 
'scott', 'tiger');<br></pre>
-<p>f. ADOdb dsn:
-</p><pre>      $dsn = 'oci8://user:address@hidden/?persist';  # persist is 
optional<br>        $conn = ADONewConnection($dsn);  # no need for 
Connect/PConnect<br>     <br>    $dsn = 'oci8://user:address@hidden/sid';<br>   
 $conn = ADONewConnection($dsn);<br>     <br>    $dsn = 'oci8://user:pwd@/';   
# oracle on local machine<br>     $conn = ADONewConnection($dsn);<br></pre>
-<p>You can also set the charSet for Oracle 9.2 and later, supported since PHP 
4.3.2, ADOdb 4.54:
-<pre>
-       $conn->charSet = 'we8iso8859p1';
-       $conn->Connect(...);
-       
-       # or
-       $dsn = 'oci8://user:address@hidden/?charset=WE8MSWIN1252';
-       $db = ADONewConnection($dsn);
-</pre>
-<a name="dsnless"></a>
-<h4>DSN-less ODBC ( Access, MSSQL and DB2 examples)</h4>
-<p>ODBC DSN's can be created in the ODBC control panel, or you can use a 
DSN-less 
-  connection.To use DSN-less connections with ODBC you need PHP 4.3 or later. 
-</p>
-<p>For Microsoft Access:</p>
-<pre>  $db =&amp; ADONewConnection('access');<br>      $dsn = 
<strong>"Driver={Microsoft Access Driver 
(*.mdb)};Dbq=d:\\northwind.mdb;Uid=Admin;Pwd=;";</strong>
-       $db-&gt;Connect($dsn);
-</pre>
-For Microsoft SQL Server: 
-<pre>  $db =&amp; ADONewConnection('odbc_mssql');<br>  $dsn = 
<strong>"Driver={SQL 
Server};Server=localhost;Database=northwind;"</strong>;<br> 
$db-&gt;Connect($dsn,'userid','password');<br></pre>
-or if you prefer to use the mssql extension (which is limited to mssql 6.5 
functionality):
-<pre>  $db =&amp; ADONewConnection('mssql');<br>       
$db-&gt;Execute("localhost', 'userid', 'password', 'northwind');<br></pre>
-For DB2:
-<pre>  $db =&amp; ADONewConnection('db2');<br> $dsn = "driver={IBM db2 odbc 
DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP;".<br>     
                   "uid=root; pwd=secret";<br>     
$db-&gt;Connect($dsn);<br></pre>
-<b>DSN-less Connections with ADO</b><br>
-If you are using versions of PHP earlier than PHP 4.3.0, DSN-less connections 
-only work with Microsoft's ADO, which is Microsoft's COM based API. An example 
-using the ADOdb library and Microsoft's ADO: 
-<pre>&lt;?php<br>      include('adodb.inc.php'); <br>  $db = 
&amp;ADONewConnection("ado_mssql");<br>   print "&lt;h1&gt;Connecting DSN-less 
$db-&gt;databaseType...&lt;/h1&gt;";<br>           <br>    
<b>$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"<br>           . 
"SERVER=flipper;DATABASE=ai;UID=sa;PWD=;"  ;</b>
-       $db-&gt;Connect($myDSN);
-       
-       $rs = $db-&gt;Execute("select * from table");
-       $arr = $rs-&gt;GetArray();
-       print_r($arr);
-?&gt;
-</pre><a name="speed"></a>
-<h2>High Speed ADOdb - tuning tips</h2>
-<p>ADOdb is a big class library, yet it <a 
href="http://phplens.com/lens/adodb/";>consistently beats</a> all other PHP 
class 
-  libraries in performance. This is because it is designed in a layered 
fashion, 
-  like an onion, with the fastest functions in the innermost layer. Stick to 
the 
-  following functions for best performance:</p>
-<table align="center" border="1" width="40%">
-  <tbody><tr>
-    <td><div align="center"><b>Innermost Layer</b></div></td>
-  </tr>
-  <tr> 
-    <td><p align="center">Connect, PConnect, NConnect<br>
-        Execute, CacheExecute<br>
-        SelectLimit, CacheSelectLimit<br>
-        MoveNext, Close <br>
-               qstr, Affected_Rows, Insert_ID</p></td>
-  </tr>
-</tbody></table>
-<p>The fastest way to access the field data is by accessing the array 
$recordset-&gt;fields 
-  directly. Also set the global variables <a 
href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a> 
-  = ADODB_FETCH_NUM, and (for oci8, ibase/firebird and odbc) <a 
href="#adodb_countrecs">$ADODB_COUNTRECS</a> = false 
-  before you connect to your database.</p>
-<p>Consider using bind parameters if your database supports it, as it improves 
-  query plan reuse. Use ADOdb's performance tuning system to identify 
bottlenecks 
-  quickly. At the time of writing (Dec 2003), this means oci8 and odbc 
drivers.</p>
- <p>Lastly make sure you have a PHP accelerator cache installed such as APC, 
Turck 
-  MMCache, Zend Accelerator or ionCube.</p>
- <p>Some examples:</p>
- <table align="center" border="1"><tbody><tr><td><b>Fastest data retrieval 
using PHP</b></td><td><b>Fastest data retrieval using ADOdb 
extension</b></td></tr>
-<tr><td>
-<pre>$rs =&amp; $rs-&gt;Execute($sql);<br>while (!$rs-&gt;EOF) {<br>   
var_dump($rs-&gt;fields);<br>   $rs-&gt;MoveNext();<br>}</pre></td><td>
-<pre>$rs =&amp; $rs-&gt;Execute($sql);<br>$array = 
adodb_getall($rs);<br>var_dump($array);<br><br><br></pre></td></tr></tbody></table>
- <p><b>Advanced Tips</b>
- </p><p>If you have the <a 
href="http://adodb.sourceforge.net/#extension";>ADOdb C extension</a> installed, 
- you can replace your calls to $rs-&gt;MoveNext() with adodb_movenext($rs). 
- This doubles the speed of this operation. For retrieving entire recordsets at 
once,
-use GetArray(), which uses the high speed extension function adodb_getall($rs) 
internally.
- </p><p>Execute() is the default way to run queries. You can use the low-level 
functions _Execute() and _query()
-to reduce query overhead.  Both these functions share the same parameters as 
Execute().
-</p><p>If you do not have any bind parameters or your database supports
-binding (without emulation),
-then you can call _Execute() directly. Calling this function bypasses
-bind emulation. Debugging is still supported in _Execute().
-</p><p>If you do not require debugging facilities nor emulated
-binding, and do not require a recordset to be returned, then you can
-call _query. This is great for inserts, updates and deletes. Calling
-this function
-bypasses emulated binding, debugging, and recordset handling. Either
-the resultid, true or false are returned by _query(). </p><p>For Informix, you 
can disable scrollable cursors with $db-&gt;cursorType = 0.
-</p><p><a name="hack"></a> </p>
-<h2>Hacking ADOdb Safely</h2>
-<p>You might want to modify ADOdb for your own purposes. Luckily you can
-still maintain backward compatibility by sub-classing ADOdb and using the 
$ADODB_NEWCONNECTION
-variable. $ADODB_NEWCONNECTION allows you to override the behaviour of 
ADONewConnection().
-ADOConnection() checks for this variable and will call
-the function-name stored in this variable if it is defined.
-</p><p>In the following example, new functionality for the connection object 
-is placed in the <i>hack_mysql</i> and <i>hack_postgres7</i> classes. The 
recordset class naming convention
-can be controlled using $rsPrefix. Here we set it to 'hack_rs_', which will 
make ADOdb use
-<i>hack_rs_mysql</i> and <i>hack_rs_postgres7</i> as the recordset classes.
-
-
-</p><pre>class hack_mysql extends adodb_mysql {<br>var $rsPrefix = 
'hack_rs_';<br>  /* Your mods here */<br>}<br><br>class hack_rs_mysql extends 
ADORecordSet_mysql {<br>       /* Your mods here */<br>}<br><br>class 
hack_postgres7 extends adodb_postgres7 {<br>var $rsPrefix = 'hack_rs_';<br>  /* 
Your mods here */<br>}<br><br>class hack_rs_postgres7 extends 
ADORecordSet_postgres7 {<br> /* Your mods here 
*/<br>}<br><br>$ADODB_NEWCONNECTION = 'hack_factory';<br><br>function&amp; 
hack_factory($driver)<br>{<br>  if ($driver !== 'mysql' &amp;&amp; $driver !== 
'postgres7') return false;<br>   <br>    $driver = 'hack_'.$driver;<br>  $obj = 
new $driver();<br>       return 
$obj;<br>}<br><br>include_once('adodb.inc.php');<br></pre>
-<p></p><p>Don't forget to call the constructor of the parent class in
-your constructor. If you want to use the default ADOdb drivers return
-false in the above hack_factory() function.
-<a name="php5"></a>
-</p><h2>PHP5 Features</h2>
- ADOdb 4.02 or later will transparently determine which version of PHP you are 
using.
-If PHP5 is detected, the following features become available:
-<ul>
-<a name="php5iterators"></a>
-<li><b>Foreach iterators</b>: This is a very natural way of going through a 
recordset:
-<pre>  $ADODB_FETCH_MODE = ADODB_FETCH_NUM;<br>        $rs = 
$db-&gt;Execute($sql);<br>        foreach($rs as $k =&gt; $row) {<br>           
  echo "r1=".$row[0]." r2=".$row[1]."&lt;br&gt;";<br>     }<br></pre>
-<p>
-<a name="php5exceptions"></a>
-</p></li><li><b>Exceptions</b>: Just include <i>adodb-exceptions.inc.php</i> 
and you can now 
-catch exceptions on errors as they occur.
-<pre>  <b>include("../adodb-exceptions.inc.php");</b> <br>     
include("../adodb.inc.php");     <br>   try { <br>              $db = 
NewADOConnection("oci8"); <br>            
$db-&gt;Connect('','scott','bad-password'); <br>        } catch (exception $e) 
{ <br>           var_dump($e); <br>              
adodb_backtrace($e-&gt;gettrace());<br> } <br></pre>
-<p>Note that reaching EOF is <b>not</b> considered an error nor an exception.
-If you want to use the default ADOdb drivers return false.
-</p></li></ul> 
-<h3><a name="drivers"></a>Databases Supported</h3>
-The <i>name</i> below is the value you pass to NewADOConnection($name) to 
create a  connection object for that database.
-<p>
-<p> 
-</p><table border="1" width="100%">
-  <tbody><tr valign="top"> 
-    <td><b>Name</b></td>
-    <td><b>Tested</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><font size="2">access</font></b></td>
-    <td><font size="2">B</font></td>
-    <td><font size="2">Microsoft Access/Jet. You need to create an ODBC 
DSN.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ODBC </font></td>
-    <td><font size="2">Windows only</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">ado</font></b></td>
-    <td><font size="2">B</font></td>
-    <td><p><font size="2">Generic ADO, not tuned for specific databases. 
Allows 
-        DSN-less connections. For best performance, use an OLEDB provider. 
This 
-        is the base class for all ado drivers.</font></p>
-      <p><font size="2">You can set $db-&gt;codePage before 
connecting.</font></p></td>
-    <td><font size="2">? depends on database</font></td>
-    <td><font size="2">ADO or OLEDB provider</font></td>
-    <td><font size="2">Windows only</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">ado_access</font></b></td>
-    <td><font size="2">B</font></td>
-    <td><font size="2">Microsoft Access/Jet using ADO. Allows DSN-less 
connections. 
-      For best performance, use an OLEDB provider.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ADO or OLEDB provider</font></td>
-    <td><font size="2">Windows only</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">ado_mssql</font></b></td>
-    <td><font size="2">B</font></td>
-    <td><font size="2">Microsoft SQL Server using ADO. Allows DSN-less 
connections. 
-      For best performance, use an OLEDB provider.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ADO or OLEDB provider</font></td>
-    <td><font size="2">Windows only</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="54"><b><font size="2">db2</font></b></td>
-    <td height="54"><font size="2">A</font></td>
-    <td height="54"><font size="2">DB2. Should work reliably as based on ODBC 
-      driver.</font></td>
-    <td height="54"><font size="2">Y/N</font></td>
-    <td height="54"><font size="2">DB2 CLI/ODBC interface</font></td>
-    <td height="54"> <p><font size="2">Unix and Windows. <a 
href="http://www.faqts.com/knowledge_base/view.phtml/aid/6283/fid/14";>Unix 
-        install hints</a>. I have had reports that the $host and $database 
params have to be reversed in Connect() when using the CLI 
interface.</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">vfp</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">Microsoft Visual FoxPro. You need to create an ODBC 
DSN.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ODBC</font></td>
-    <td><font size="2">Windows only</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">fbsql</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">FrontBase. </font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">?</font></td>
-    <td> <p><font size="2">Unix and Windows</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">ibase</font></b></td>
-    <td><font size="2">B</font></td>
-    <td><font size="2">Interbase 6 or earlier. Some users report you might 
need 
-      to use this<br>
-      $db-&gt;PConnect('localhost:c:/ibase/employee.gdb', "sysdba", 
"masterkey") 
-      to connect. Lacks Affected_Rows currently.<br>
-      <br>
-      You can set $db-&gt;dialect, $db-&gt;buffers and $db-&gt;charSet before 
connecting.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Interbase client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><i><font size="2">firebird</font></i></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Firebird version of interbase.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Interbase client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><i><font size="2">borland_ibase</font></i></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Borland version of Interbase 6.5 or later. Very sad 
that 
-      the forks differ.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Interbase client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-
-  <tr valign="top"> 
-    <td><b><font size="2">informix</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Generic informix driver. Use this if you are using 
Informix 7.3 or later.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Informix client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">informix72</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2"> Informix databases before Informix 7.3 that do no 
support 
-      SELECT FIRST.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Informix client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">ldap</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">LDAP driver. See this example for usage 
information.</font></td>
-    <td>&nbsp;</td>
-    <td><font size="2">LDAP extension</font></td>
-    <td><font size="2">?</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="73"><b><font size="2">mssql</font></b></td>
-    <td height="73"><font size="2">A</font></td>
-    <td height="73"> <p><font size="2">Microsoft SQL Server 7 and later. Works 
-        with Microsoft SQL Server 2000 also. Note that date formating is 
problematic 
-        with this driver. For example, the PHP mssql extension does not return 
-        the seconds for datetime!</font></p></td>
-    <td height="73"><font size="2">Y/N</font></td>
-    <td height="73"><font size="2">Mssql client</font></td>
-    <td height="73"> <p><font size="2">Unix and Windows. <br>
-        <a href="http://phpbuilder.com/columns/alberto20000919.php3";>Unix 
install 
-        howto</a> and <a 
href="http://linuxjournal.com/article.php?sid=6636&amp;mode=thread&amp;order=0";>another
 
-        one</a>. </font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="73"><b><font size="2">mssqlpo</font></b></td>
-    <td height="73"><font size="2">A</font></td>
-    <td height="73"> <p><font size="2">Portable mssql driver. Identical to 
above 
-        mssql driver, except that '||', the concatenation operator, is 
converted 
-        to '+'. Useful for porting scripts from most other sql variants that 
use 
-        ||.</font></p></td>
-    <td height="73"><font size="2">Y/N</font></td>
-    <td height="73"><font size="2">Mssql client</font></td>
-    <td height="73"> <p><font size="2">Unix and Windows. <a 
href="http://phpbuilder.com/columns/alberto20000919.php3";><br>
-        Unix install howto</a>.</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">mysql</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">MySQL without transaction support. You can also set 
$db-&gt;clientFlags 
-      before connecting.</font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">MySQL client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><font size="2"><b>mysqlt</b> or <b>maxsql</b></font></td>
-    <td><font size="2">A</font></td>
-    <td> <p><font size="2">MySQL with transaction support. We recommend using 
-        || as the concat operator for best portability. This can be done by 
running 
-        MySQL using: <br>
-        <i>mysqld --ansi</i> or <i>mysqld 
--sql-mode=PIPES_AS_CONCAT</i></font></p></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">MySQL client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">oci8</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">Oracle 8/9. Has more functionality than <i>oracle</i> 
driver 
-      (eg. Affected_Rows). You might have to putenv('ORACLE_HOME=...') before 
-      Connect/PConnect. </font> <p><font size="2"> There are 2 ways of 
connecting 
-        - with server IP and service name: <br>
-        <i>PConnect('serverip:1521','scott','tiger','service'</i>)<br>
-        or using an entry in TNSNAMES.ORA or ONAMES or HOSTNAMES: <br>
-        <i>PConnect(false, 'scott', 'tiger', $oraname)</i>. </font> 
-      </p><p><font size="2">Since 2.31, we support Oracle REF cursor variables 
directly 
-        (see <a href="#executecursor">ExecuteCursor</a>).</font> </p></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Oracle client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">oci805</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Supports reduced Oracle functionality for Oracle 8.0.5. 
-      SelectLimit is not as efficient as in the oci8 or oci8po 
drivers.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Oracle client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">oci8po</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">Oracle 8/9 portable driver. This is nearly identical 
with 
-      the oci8 driver except (a) bind variables in Prepare() use the ? 
convention, 
-      instead of :bindvar, (b) field names use the more common PHP convention 
-      of lowercase names. </font> <p><font size="2">Use this driver if porting 
-        from other databases is important. Otherwise the oci8 driver offers 
better 
-        performance. </font> </p></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Oracle client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">odbc</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">Generic ODBC, not tuned for specific databases. To 
connect, 
-      use <br>
-      PConnect('DSN','user','pwd'). This is the base class for all odbc 
derived 
-      drivers.</font></td>
-    <td><font size="2">? depends on database</font></td>
-    <td><font size="2">ODBC</font></td>
-    <td><font size="2">Unix and Windows. <a 
href="http://phpbuilder.com/columns/alberto20000919.php3?page=4";>Unix 
-      hints.</a></font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">odbc_mssql</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Uses ODBC to connect to MSSQL</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ODBC</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">odbc_oracle</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Uses ODBC to connect to Oracle</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ODBC</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-    
-  <tr valign="top"> 
-    <td><b><font size="2">odbtp</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Generic odbtp driver. <a 
href="http://odbtp.sourceforge.net/";>Odbtp</a> is a software for
-       accessing Windows ODBC data sources from other operating 
systems.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">odbtp</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">odbtp_unicode</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Odtbp with unicode support</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">odbtp</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="34"><b><font size="2">oracle</font></b></td>
-    <td height="34"><font size="2">C</font></td>
-    <td height="34"><font size="2">Implements old Oracle 7 client API. Use 
oci8 
-      driver if possible for better performance.</font></td>
-    <td height="34"><font size="2">Y/N</font></td>
-    <td height="34"><font size="2">Oracle client</font></td>
-    <td height="34"><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="34"><b><font size="2">netezza</font></b></td>
-    <td height="34"><font size="2">C</font></td>
-    <td height="34"><font size="2">Netezza driver. Netezza is based on 
postgres code-base.</font></td>
-    <td height="34"><font size="2">Y</font></td>
-    <td height="34"><font size="2">?</font></td>
-    <td height="34"><font size="2">?</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">postgres</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">Generic PostgreSQL driver. Currently identical to 
postgres7 
-      driver. </font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">PostgreSQL client</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">postgres64</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">For PostgreSQL 6.4 and earlier which does not support 
LIMIT 
-      internally.</font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">PostgreSQL client</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">postgres7</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">PostgreSQL which supports LIMIT and other version 7 
functionality.</font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">PostgreSQL client</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">sapdb</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">SAP DB. Should work reliably as based on ODBC 
driver.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">SAP ODBC client</font></td>
-    <td> <p><font size="2">?</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">sqlanywhere</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Sybase SQL Anywhere. Should work reliably as based on 
ODBC 
-      driver.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">SQL Anywhere ODBC client</font></td>
-    <td> <p><font size="2">?</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="54"><b><font size="2">sqlite</font></b></td>
-    <td height="54"><font size="2">B</font></td>
-    <td height="54"><font size="2">SQLite.</font></td>
-    <td height="54"><font size="2">Y</font></td>
-    <td height="54"><font size="2">-</font></td>
-    <td height="54"> <p><font size="2">Unix and Windows.</font></p></td>
-  </tr>
-    <tr valign="top"> 
-    <td height="54"><b><font size="2">sqlitepo</font></b></td>
-    <td height="54"><font size="2">B</font></td>
-    <td height="54"><font size="2">Portable SQLite driver.  This is because 
assoc mode does not work like other drivers in sqlite.
-   Namely, when selecting (joining) multiple tables, the table
-         names are included in the assoc keys in the "sqlite" driver.</font><p>
-<font size="2">          In "sqlitepo" driver, the table names are stripped 
from the returned column names. 
-         When this results in a conflict,  the first field get preference.
-         </font></p></td>
-    <td height="54"><font size="2">Y</font></td>
-    <td height="54"><font size="2">-</font></td>
-    <td height="54"> <p><font size="2">Unix and Windows.</font></p></td>
-  </tr>
- 
-         
-  <tr valign="top"> 
-    <td><b><font size="2">sybase</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Sybase. </font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Sybase client</font></td>
-    <td> <p><font size="2">Unix and Windows.</font></p></td>
-  </tr>
-  </tbody></table>
-
-</p><p>The "Tested" column indicates how extensively the code has been tested 
-  and used. <br>
-  A = well tested and used by many people<br>
-  B = tested and usable, but some features might not be implemented<br>
-  C = user contributed or experimental driver. Might not fully support all of 
-  the latest features of ADOdb. </p>
-<p>The column "RecordCount() usable" indicates whether RecordCount() 
-  return the number of rows, or returns -1 when a SELECT statement is 
executed. 
-  If this column displays Y/N then the RecordCount() is emulated when the 
global 
-  variable $ADODB_COUNTRECS=true (this is the default). Note that for large 
recordsets, 
-  it might be better to disable RecordCount() emulation because substantial 
amounts 
-  of memory are required to cache the recordset for counting. Also there is a 
-  speed penalty of 40-50% if emulation is required. This is emulated in most 
databases 
-  except for PostgreSQL and MySQL. This variable is checked every time a query 
-  is executed, so you can selectively choose which recordsets to count.</p>
-<p> 
-</p><hr>
-<h1>Tutorials<a name="quickstart"></a></h1>
-<h3>Example 1: Select Statement<a name="ex1"></a></h3>
-<p>Task: Connect to the Access Northwind DSN, 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. 
-</p><pre>&lt;?<br><font face="Courier New, Courier, 
mono"><b>include</b>('adodb.inc.php');        # load code common to 
ADOdb<br>$<font color="#660000">conn</font> = &amp;ADONewConnection('access'); 
# create a connection<br>$<font 
color="#660000">conn</font>-&gt;PConnect('northwind');   # connect to 
MS-Access, northwind DSN<br>$<font color="#660000">recordSet</font> = 
&amp;$<font color="#660000">conn</font>-&gt;Execute('select * from 
products');<br>if (!$<font color="#660000">recordSet</font>) <br>        print 
$<font color="#660000">conn</font>-&gt;ErrorMsg();<br>else<br><b>while</b> 
(!$<font color="#660000">recordSet</font>-&gt;EOF) {<br>       <b>print</b> 
$<font color="#660000">recordSet</font>-&gt;fields[0].' '.$<font 
color="#660000">recordSet</font>-&gt;fields[1].'&lt;BR&gt;';<br>  $<font 
color="#660000">recordSet</font>-&gt;MoveNext();<br>}</font><font face="Courier 
New, Courier, mono">
-
-$<font color="#660000">recordSet</font>-&gt;Close(); # optional<br>$<font 
color="#660000">conn</font>-&gt;Close(); # optional<br></font>
-?&gt;
-</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. If an error occurs in 
Execute(), 
-  we return false instead of a recordset.</p>
-<p>The <code>$recordSet-&gt;fields[]</code> array is generated by the PHP 
database 
-  extension. Some database extensions only index by number and do not index 
the 
-  array by field name. To force indexing by name - that is associative arrays 
-  - use the SetFetchMode function. Each recordset saves and uses whatever 
fetch 
-  mode was set when the recordset was created in Execute() or SelectLimit(). 
-</p><pre>      $db-&gt;SetFetchMode(ADODB_FETCH_NUM);<br>      $rs1 = 
$db-&gt;Execute('select * from table');<br>      
$db-&gt;SetFetchMode(ADODB_FETCH_ASSOC);<br>    $rs2 = $db-&gt;Execute('select 
* from table');<br>      print_r($rs1-&gt;fields); # shows 
<i>array([0]=&gt;'v0',[1] =&gt;'v1')</i>
-       print_r($rs2-&gt;fields); # shows <i>array(['col1']=&gt;'v0',['col2'] 
=&gt;'v1')</i>
-</pre>
-<p> </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;?<br><font face="Courier New, Courier, 
mono"><b>include</b>('adodb.inc.php');    # load code common to ADOdb<br>$<font 
color="#660000">conn</font> = &amp;ADONewConnection('access'); # create a 
connection<br>$<font color="#660000">conn</font>-&gt;PConnect('northwind');   # 
connect to MS-Access, northwind dsn<br>$<font color="#660000">recordSet</font> 
= &amp;$<font color="#660000">conn</font>-&gt;Execute('select 
CustomerID,OrderDate from Orders');<br>if (!$<font 
color="#660000">recordSet</font>) <br>       print $<font 
color="#660000">conn</font>-&gt;ErrorMsg();<br>else<br><b>while</b> (!$<font 
color="#660000">recordSet</font>-&gt;EOF) {<br>       $<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);<br><br>
    <b>if</b> ( $<font color="#660000">type</font> == 'D' || $<font 
color="#660000">type</font> == 'T') <br>                <b>print</b> $<font 
color="#660000">recordSet</font>-&gt;fields[0].' '.<br>                     
<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;';<br>
    <b>else </b>
-               <b>print</b> $<font 
color="#660000">recordSet</font>-&gt;fields[0].' '.$<font 
color="#660000">recordSet</font>-&gt;fields[1].'&lt;BR&gt;';<br><br>      
$<font color="#660000">recordSet</font>-&gt;MoveNext();<br>}</font><font 
face="Courier New, Courier, mono">
-$<font color="#660000">recordSet</font>-&gt;Close(); # optional<br>$<font 
color="#660000">conn</font>-&gt;Close(); # optional<br></font>
-?&gt;
-</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="text"&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><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>I</b>:&nbsp; Integer 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;?<br><b>include</b>('adodb.inc.php');    # load code common to 
ADOdb<br>$<font color="#660000">conn</font> = &amp;ADONewConnection('access'); 
# create a connection<br><br>$<font 
color="#660000">conn</font>-&gt;PConnect('northwind');   # connect to 
MS-Access, northwind dsn<br>$<font color="#660000">shipto</font> = <font 
color="#006600"><b>$conn-&gt;qstr</b></font>("<i>John's Old 
Shoppe</i>");<br><br>$<font color="#660000">sql</font> = "insert into orders 
(customerID,EmployeeID,OrderDate,ShipName) ";<br>$<font 
color="#660000">sql</font> .= "values ('ANATR',2,".<b><font 
color="#006600">$conn-&gt;DBDate(</font>time()<font 
color="#006600">)</font></b><font color="#006600">.</font>",$<font 
color="#660000">shipto</font>)";<br><br><b>if</b> ($<font 
color="#660000">conn</font>-&gt;Execute($<font color="#660000">sql</font>) 
<font color="#336600"><b>=== false</b></font>) {<br>        <b>print</b> 'error 
inserting: '.<font 
color="#336600"><b>$conn-&gt;ErrorMsg()</b></font>.'&lt;BR&gt;';<br>}<br>?&gt;<br></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;?<br><b>include</b>('adodb.inc.php');    # load code common to 
ADOdb<br>$<font color="#663300">conn</font> = &amp;ADONewConnection('access'); 
# create a connection<br>$<font 
color="#663300">conn</font>-&gt;PConnect('northwind');   # connect to 
MS-Access, northwind dsn<br><font color="#000000">$<font 
color="#663300">shipto</font> = <b>$conn-&gt;qstr</b>("John's Old 
Shoppe");<br>$<font color="#663300">sql</font> = "insert into orders 
(customerID,EmployeeID,OrderDate,ShipName) ";<br>$<font 
color="#663300">sql</font> .= "values ('ANATR',2,".$<font 
color="#663300">conn</font>-&gt;FormatDate(time()).",$shipto)";<br><b><font 
color="#336600">$<font color="#663300">conn</font>-&gt;debug = true;</font></b>
-<b>if</b> ($<font color="#663300">conn</font>-&gt;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;?<br><b>include</b>('adodb.inc.php'); # load code common to 
ADOdb<br>$<font color="#663300">conn</font> = &amp;ADONewConnection('mysql');  
# create a connection<br>$<font 
color="#663300">conn</font>-&gt;PConnect('localhost','userid','','agora');# 
connect to MySQL, agora db<br><font color="#000000">$<font 
color="#663300">sql</font> = 'select CustomerName, CustomerID from 
customers';<br>$<font color="#663300">rs</font> = $<font 
color="#663300">conn</font>-&gt;Execute($sql);<br><b>print</b> <b><font 
color="#336600">$<font color="#663300">rs</font>-&gt;GetMenu('GetCust','Mary 
Rosli');<br>?&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="#getassoc1">GetAssoc</a>().</p>
-<h3>Example 6: Connecting to 2 Databases At Once<a name="ex6"></a></h3>
-<pre>&lt;?<br><b>include</b>('adodb.inc.php');  # load code common to 
ADOdb<br>$<font color="#663300">conn1</font> = &amp;ADONewConnection('mysql');  
# create a mysql connection<br>$<font color="#663300">conn2</font> = 
&amp;ADONewConnection('oracle');  # create a oracle 
connection<br><br>$conn1-&gt;PConnect($server, $userid, $password, 
$database);<br>$conn2-&gt;PConnect(false, $ora_userid, $ora_pwd, 
$oraname);<br><br>$conn1-&gt;Execute('insert 
...');<br>$conn2-&gt;Execute('update ...');<br>?&gt;</pre>
-<p> 
-</p><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-&gt;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><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. 
- Since ADOdb 2.42, you can pass a  table name instead of a recordset into 
-GetInsertSQL (in $rs), and it will generate an insert statement for that table.
-</p><p> 
-</p><pre>&lt;?<br>#==============================================<br># SAMPLE 
GetUpdateSQL() and GetInsertSQL() 
code<br>#==============================================<br>include('adodb.inc.php');<br>include('tohtml.inc.php');<br><br>#==========================<br>#
 This code tests an insert<br><br>$sql = "SELECT * FROM ADOXYZ WHERE id = -1"; 
<br># Select an empty record from the database<br><br>$conn = 
&amp;ADONewConnection("mysql");  # create a 
connection<br>$conn-&gt;debug=1;<br>$conn-&gt;PConnect("localhost", "admin", 
"", "test"); # connect to MySQL, testdb<br>$rs = $conn-&gt;Execute($sql); # 
Execute the query and get the empty recordset<br><br>$record = array(); # 
Initialize an array to hold the record data to insert<br><br># Set the values 
for the fields in the record<br># Note that field names are 
case-insensitive<br>$record["firstname"] = "Bob";<br>$record["lastNamE"] = 
"Smith";<br>$record["creaTed"] = time();<br><br># Pass the empty recordset and 
the array containing the data to insert<br># into the GetInsertSQL function. 
The function will process the data and return<br># a fully formatted insert sql 
statement.<br>$insertSQL = $conn-&gt;GetInsertSQL($rs, 
$record);<br><br>$conn-&gt;Execute($insertSQL); # Insert the record into the 
database<br><br>#==========================<br># This code tests an 
update<br><br>$sql = "SELECT * FROM ADOXYZ WHERE id = 1"; <br># Select a record 
to update<br><br>$rs = $conn-&gt;Execute($sql); # Execute the query and get the 
existing record to update<br><br>$record = array(); # Initialize an array to 
hold the record data to update<br><br># Set the values for the fields in the 
record<br># Note that field names are case-insensitive<br>$record["firstname"] 
= "Caroline";<br>$record["LasTnAme"] = "Smith"; # Update Caroline's lastname 
from Miranda to Smith<br><br># Pass the single record recordset and the array 
containing the data to update<br># into the GetUpdateSQL function. The function 
will process the data and return<br># a fully formatted update sql statement 
with the correct WHERE clause.<br># If the data has not changed, no recordset 
is returned<br>$updateSQL = $conn-&gt;GetUpdateSQL($rs, 
$record);<br><br>$conn-&gt;Execute($updateSQL); # Update the record in the 
database<br>$conn-&gt;Close();<br>?&gt;<br></pre>
-<a name="ADODB_FORCE_TYPE"></a>
-<b>$ADODB_FORCE_TYPE</b><p>
-The behaviour of GetUpdateSQL() and GetInsertSQL()  
-when converting empty or null PHP variables to SQL is controlled by the
- global $ADODB_FORCE_TYPE variable. Set it to one of the values below. Default
-  is ADODB_FORCE_VALUE (3):
-</p><pre>0 = ignore empty fields. All empty fields in array are ignored.<br>1 
= force null. All empty, php null and string 'null' fields are changed to sql 
NULL values.<br>2 = force empty. All empty, php null and string 'null' fields 
are changed to sql empty '' or 0 values.<br>3 = force value. Value is left as 
it is. Php null and string 'null' are set to sql NULL values and <br>    empty 
fields '' are set to empty '' sql 
values.<br><br>define('ADODB_FORCE_IGNORE',0);<br>define('ADODB_FORCE_NULL',1);<br>define('ADODB_FORCE_EMPTY',2);<br>define('ADODB_FORCE_VALUE',3);<br></pre>
-<p>
-Thanks to Niko (nuko#mbnet.fi) for the $ADODB_FORCE_TYPE code.
-</p><p>
-Note: the constant ADODB_FORCE_NULLS is obsolete since 4.52 and is ignored. 
Set $ADODB_FORCE_TYPE = ADODB_FORCE_NULL
-for equivalent behaviour.
-
-</p><p>
-</p><h3>Example 8: Implementing Scrolling with Next and Previous<a 
name="ex8"></a></h3>
-<p> The following code creates a very simple recordset pager, where you can 
scroll 
-  from page to page of a recordset.</p>
-<pre>include_once('../adodb.inc.php');<br>include_once('../adodb-pager.inc.php');<br>session_start();<br><br>$db
 = 
NewADOConnection('mysql');<br><br>$db-&gt;Connect('localhost','root','','xphplens');<br><br>$sql
 = "select * from adoxyz ";<br><br>$pager = new 
ADODB_Pager($db,$sql);<br>$pager-&gt;Render($rows_per_page=5);</pre>
-<p>This will create a basic record pager that looks like this: <a 
name="scr"></a> 
-</p><p> 
-<table bgcolor="beige" border="1">
-  <tbody><tr> 
-    <td> <a href="#scr"><code>|&lt;</code></a> &nbsp; <a 
href="#scr"><code>&lt;&lt;</code></a> 
-      &nbsp; <a href="#scr"><code>&gt;&gt;</code></a> &nbsp; <a 
href="#scr"><code>&gt;|</code></a> 
-      &nbsp; </td>
-  </tr>
-  <tr>
-    <td><table bgcolor="white" border="1" cols="4" width="100%">
-        <tbody><tr><th>ID</th>
-        <th>First Name</th>
-        <th>Last Name</th>
-        <th>Date Created</th>
-        </tr><tr> 
-          <td align="right">36&nbsp;</td>
-          <td>Alan&nbsp;</td>
-          <td>Turing&nbsp;</td>
-          <td>Sat 06, Oct 2001&nbsp;</td>
-        </tr>
-        <tr> 
-          <td align="right">37&nbsp;</td>
-          <td>Serena&nbsp;</td>
-          <td>Williams&nbsp;</td>
-          <td>Sat 06, Oct 2001&nbsp;</td>
-        </tr>
-        <tr> 
-          <td align="right">38&nbsp;</td>
-          <td>Yat Sun&nbsp;</td>
-          <td>Sun&nbsp;</td>
-          <td>Sat 06, Oct 2001&nbsp;</td>
-        </tr>
-        <tr> 
-          <td align="right">39&nbsp;</td>
-          <td>Wai Hun&nbsp;</td>
-          <td>See&nbsp;</td>
-          <td>Sat 06, Oct 2001&nbsp;</td>
-        </tr>
-        <tr> 
-          <td align="right">40&nbsp;</td>
-          <td>Steven&nbsp;</td>
-          <td>Oey&nbsp;</td>
-          <td>Sat 06, Oct 2001&nbsp;</td>
-        </tr>
-      </tbody></table></td>
-  </tr>
-  <tr>
-    <td><font size="-1">Page 8/10</font></td>
-  </tr>
-</tbody></table>
-</p><p>The number of rows to display at one time is controled by the 
Render($rows) 
-  method. If you do not pass any value to Render(), ADODB_Pager will default 
to 
-  10 records per page. 
-</p><p>You can control the column titles by modifying your SQL (supported by 
most 
-  databases): 
-</p><pre>$sql = 'select id as "ID", firstname as "First Name", <br>            
  lastname as "Last Name", created as "Date Created" <br>               from 
adoxyz';</pre>
-<p>The above code can be found in the <i>adodb/tests/testpaging.php</i> 
example 
-  included with this release, and the class ADODB_Pager in 
<i>adodb/adodb-pager.inc.php</i>. 
-  The ADODB_Pager code can be adapted by a programmer so that the text links 
can 
-  be replaced by images, and the dull white background be replaced with more 
interesting 
-  colors. 
-</p><p>You can also allow display of html by setting 
$pager-&gt;htmlSpecialChars = false. 
-</p><p>Some of the code used here was contributed by Iv&aacute;n Oliva and 
Cornel 
-  G. </p>
-<h3><a name="ex9"></a>Example 9: Exporting in CSV or Tab-Delimited Format</h3>
-<p>We provide some helper functions to export in comma-separated-value (CSV) 
and 
-  tab-delimited formats:</p>
-<pre><b>include_once('/path/to/adodb/toexport.inc.php');</b><br>include_once('/path/to/adodb/adodb.inc.php');<br>
-$db = &amp;NewADOConnection('mysql');<br>$db-&gt;Connect($server, $userid, 
$password, $database);<br><br>$rs = $db-&gt;Execute('select fname as "First 
Name", surname as "Surname" from table');<br><br>print "&lt;pre&gt;";<br>print 
<b>rs2csv</b>($rs); # return a string, CSV format<p>print 
'&lt;hr&gt;';<br><br>$rs-&gt;MoveFirst(); # note, some databases do not support 
MoveFirst<br>print <b>rs2tab</b>($rs,<i>false</i>); # return a string, 
tab-delimited<br>                                                # false == 
suppress field names in first line</p>print 
'&lt;hr&gt;';<br>$rs-&gt;MoveFirst();<br><b>rs2tabout</b>($rs); # send to 
stdout directly (there is also an rs2csvout function)<br>print 
"&lt;/pre&gt;";<br><br>$rs-&gt;MoveFirst();<br><b></b>$fp = fopen($path, 
"w");<br>if ($fp) {<br>  <b>rs2csvfile</b>($rs, $fp); # write to file (there is 
also an rs2tabfile function)<br>  fclose($fp);<br>}<br></pre>
-<p> Carriage-returns or newlines are converted to spaces. Field names are 
returned 
-  in the first line of text. Strings containing the delimiter character are 
quoted 
-  with double-quotes. Double-quotes are double-quoted again. This conforms to 
-  Excel import and export guide-lines. 
-</p><p>All the above functions take as an optional last parameter, $addtitles 
which 
-  defaults to <i>true</i>. When set to <i>false</i> field names in the first 
line 
-  are suppressed. <br>
-</p><h3>Example 10: Recordset Filters<a name="ex10"></a></h3>
-<p>Sometimes we want to pre-process all rows in a recordset before we use it. 
-  For example, we want to ucwords all text in recordset. 
-</p><pre>include_once('adodb/rsfilter.inc.php');<br>include_once('adodb/adodb.inc.php');<br><br>//
 ucwords() every element in the recordset<br>function 
do_ucwords(&amp;$arr,$rs)<br>{<br>     foreach($arr as $k =&gt; $v) {<br>       
       $arr[$k] = ucwords($v);<br>     }<br>}<br><br>$db = 
NewADOConnection('mysql');<br>$db-&gt;PConnect('server','user','pwd','db');<br><br>$rs
 = $db-&gt;Execute('select ... from table');<br>$rs = 
<b>RSFilter</b>($rs,'do_ucwords');<br></pre>
-<p>The <i>RSFilter</i> function takes 2 parameters, the recordset, and the 
name 
-  of the <i>filter</i> function. It returns the processed recordset scrolled 
to 
-  the first record. The <i>filter</i> function takes two parameters, the 
current 
-  row as an array, and the recordset object. For future compatibility, you 
should 
-  not use the original recordset object. </p>
-<h3>Example 11:<a name="ex11"></a> Smart Transactions</h3>
-The old way of doing transactions required you to use 
-<pre>$conn-&gt;<b>BeginTrans</b>();<br>$ok = $conn-&gt;Execute($sql);<br>if 
($ok) $ok = $conn-&gt;Execute($sql2);<br>if (!$ok) 
$conn-&gt;<b>RollbackTrans</b>();<br>else 
$conn-&gt;<b>CommitTrans</b>();<br></pre>
-This is very complicated for large projects because you have to track the 
error 
-status. Smart Transactions is much simpler. You start a smart transaction by 
calling 
-StartTrans(): 
-<pre>$conn-&gt;<b>StartTrans</b>();<br>$conn-&gt;Execute($sql);<br>$conn-&gt;Execute($Sql2);<br>$conn-&gt;<b>CompleteTrans</b>();<br></pre>
-CompleteTrans() detects when an SQL error occurs, and will Rollback/Commit as 
-appropriate. To specificly force a rollback even if no error occured, use 
FailTrans(). 
-Note that the rollback is done in CompleteTrans(), and not in FailTrans(). 
-<pre>$conn-&gt;<b>StartTrans</b>();<br>$conn-&gt;Execute($sql);<br>if 
(!CheckRecords()) 
$conn-&gt;<strong>FailTrans</strong>();<br>$conn-&gt;Execute($Sql2);<br>$conn-&gt;<b>CompleteTrans</b>();<br></pre>
-<p>You can also check if a transaction has failed, using HasFailedTrans(), 
which 
-  returns true if FailTrans() was called, or there was an error in the SQL 
execution. 
-  Make sure you call HasFailedTrans() before you call CompleteTrans(), as it 
is 
-  only works between StartTrans/CompleteTrans.
-</p><p>Lastly, StartTrans/CompleteTrans is nestable, and only the outermost 
block 
-  is executed. In contrast, BeginTrans/CommitTrans/RollbackTrans is NOT 
nestable. 
-</p><pre>$conn-&gt;<strong>StartTrans</strong>();<br>$conn-&gt;Execute($sql);<br>
  $conn-&gt;<strong>StartTrans</strong>();    <font color="#006600"># 
ignored</font>
-  if (!CheckRecords()) $conn-&gt;FailTrans();
-  $conn-&gt;<strong>CompleteTrans</strong>(); <font color="#006600"># 
ignored</font>
-$conn-&gt;Execute($Sql2);
-$conn-&gt;<strong>CompleteTrans</strong>();<br></pre>
-<p>Note: Savepoints are currently not supported. 
-</p><h2><a name="errorhandling"></a>Using Custom Error Handlers and 
PEAR_Error</h2>
-<p>ADOdb supports PHP5 exceptions.  Just include 
<i>adodb-exceptions.inc.php</i> and you can now 
-catch exceptions on errors as they occur.
-</p><pre>      <b>include("../adodb-exceptions.inc.php");</b> <br>     
include("../adodb.inc.php");     <br>   try { <br>              $db = 
NewADOConnection("oci8://scott:address@hidden/"); <br>    } catch (exception 
$e) { <br>           var_dump($e); <br>              
adodb_backtrace($e-&gt;gettrace());<br> } <br></pre>
-<p> ADOdb also 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><p> Including the above file will cause 
<i>trigger_error($errorstring,E_USER_ERROR)</i> 
-  to be called when<br>
-  (a) Connect() or PConnect() fails, or <br>
-  (b) a function that executes SQL statements such as Execute() or 
SelectLimit() 
-  has an error.<br>
-  (c) GenID() appears to go into an infinite loop. 
-</p><p> The $errorstring is generated by ADOdb and will contain useful 
debugging information 
-  similar to the error.log data generated below. This file 
adodb-errorhandler.inc.php 
-  should be included before you create any ADOConnection objects. 
-</p><p> If you define error_reporting(0), no errors will be passed to the 
error handler. 
-  If you set error_reporting(E_ALL), all errors will be passed to the error 
handler. 
-  You still need to use <b>ini_set("display_errors", "0" or "1")</b> to 
control 
-  the display of errors. 
-</p><pre>&lt;?php<br><b>error_reporting(E_ALL); # pass any error messages 
triggered to error handler<br>include('adodb-errorhandler.inc.php');</b>
-include('adodb.inc.php');
-include('tohtml.inc.php');
-$c = NewADOConnection('mysql');
-$c-&gt;PConnect('localhost','root','','northwind');
-$rs=$c-&gt;Execute('select * from productsz'); #invalid table productsz');
-if ($rs) rs2html($rs);
-?&gt;
-</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. 
-</p><pre>&lt;?php<br><b>error_reporting(E_ALL); # report all 
errors<br>ini_set("display_errors", "0"); # but do not echo the 
errors<br>define('ADODB_ERROR_LOG_TYPE',3);<br>define('ADODB_ERROR_LOG_DEST','C:/errors.log');<br>include('adodb-errorhandler.inc.php');</b>
-include('adodb.inc.php');
-include('tohtml.inc.php');
-
-$c = NewADOConnection('mysql');
-$c-&gt;PConnect('localhost','root','','northwind');
-$rs=$c-&gt;Execute('select * from productsz'); ## invalid table productsz
-if ($rs) rs2html($rs);
-?&gt;
-</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<br> EXECUTE("select * from productsz")<br></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<br><b>include('adodb-errorpear.inc.php');</b>
-include('adodb.inc.php');
-include('tohtml.inc.php');
-$c = NewADOConnection('mysql');
-$c-&gt;PConnect('localhost','root','','northwind');
-$rs=$c-&gt;Execute('select * from productsz'); #invalid table productsz');
-if ($rs) rs2html($rs);
-else {
-       <b>$e = ADODB_Pear_Error();<br> echo 
'&lt;p&gt;',$e-&gt;message,'&lt;/p&gt;';</b>
-}
-?&gt;
-</pre>
-<p> You can use a PEAR_Error derived class by defining the constant 
ADODB_PEAR_ERROR_CLASS 
-  before the adodb-errorpear.inc.php file is included. For easy debugging, 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: 
-</p><pre>include('PEAR.php');<br>PEAR::setErrorHandling('PEAR_ERROR_DIE');<br></pre>
-<p> Note that we do not explicitly return a PEAR_Error object to you when an 
error 
-  occurs. We return false instead. You have to call ADODB_Pear_Error() to get 
-  the last error or use the PEAR_ERROR_DIE technique. 
-</p><h4>Error Messages</h4>
-<p>Error messages are outputted using the static method 
ADOConnnection::outp($msg,$newline=true). 
-  By default, it sends the messages to the client. You can override this to 
perform 
-  error-logging. 
-</p><h2><a name="dsn"></a> Data Source Names</h2>
-<p>We now support connecting using PEAR style DSN's. A DSN is a connection 
string 
-  of the form:</p>
-<p>$dsn = <i>"$driver://$username:address@hidden/$databasename"</i>;</p>
-<p>An example:</p>
-<pre>   $username = 'root';<br>   $password = '';<br>   $hostname = 
'localhost';<br>   $databasename = 'xphplens';<br>   $driver = 'mysql';<br>   
$dsn = "$driver://$username:address@hidden/$databasename"<br>   $db = 
NewADOConnection(); <br>   # DB::Connect($dsn) also works if you include 
'adodb/adodb-pear.inc.php' at the top<br>   $rs = $db-&gt;query('select 
firstname,lastname from adoxyz');<br>   $cnt = 0;<br>   while ($arr = 
$rs-&gt;fetchRow()) {<br>               print_r($arr); print "&lt;br&gt;";<br>  
 }</pre>
-   <p></p>
-<p>   <a href="#dsnsupport">More info and connection examples</a> on the DSN 
format.
-
- </p><h2><a name="pear"></a>PEAR Compatibility</h2>
-  We support DSN's (see above), and the following functions:
- <pre><b> DB_Common</b>
-       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
-       disconnect
-       
-       getOne
-       getAssoc
-       getRow
-       getCol
-       
-<b> DB_Result</b>
-       numRows - returns -1 if not supported
-       numCols
-       fetchInto - does not support passing of fetchmode
-       fetchRows - does not support passing of fetchmode
-       free
-</pre>
-<h2><a name="caching"></a>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><p> An example: 
-</p><pre><b>include</b>('adodb.inc.php'); # load code common to 
ADOdb<br>$ADODB_CACHE_DIR = '/usr/ADODB_cache';<br>$<font 
color="#663300">conn</font> = &amp;ADONewConnection('mysql');  # create a 
connection<br>$<font 
color="#663300">conn</font>-&gt;PConnect('localhost','userid','','agora');# 
connect to MySQL, agora db<br><font color="#000000">$<font 
color="#663300">sql</font> = 'select CustomerName, CustomerID from 
customers';<br>$<font color="#663300">rs</font> = $<font 
color="#663300">conn</font>-&gt;CacheExecute(15,$sql);</font></pre>
-<p><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 to execute and flush the cache, call 
CacheExecute() 
-  with the first parameter set to zero. Alternatively, use the 
CacheFlush($sql) 
-  call. </font></p>
-<p><font color="#000000">For the sake of security, we recommend you set 
<i>register_globals=off</i> 
-  in php.ini if you are using $ADODB_CACHE_DIR.</font></p>
-<p>In ADOdb 1.80 onwards, the secs2cache parameter is optional in 
CacheSelectLimit() 
-  and CacheExecute(). If you leave it out, it will use the 
$connection-&gt;cacheSecs 
-  parameter, which defaults to 60 minutes. 
-</p><pre>      $conn-&gt;Connect(...);<br>     $conn-&gt;cacheSecs = 3600*24; 
# cache 24 hours<br>     $rs = $conn-&gt;CacheExecute('select * from 
table');<br></pre>
-<p>Please note that magic_quotes_runtime should be turned off. <a 
href="http://phplens.com/lens/lensforum/msgs.php?LeNs#LensBM_forummsg";>More 
-  info</a>, and do not change $ADODB_FETCH_MODE (or SetFetchMode) 
-  as the cached recordset will use the $ADODB_FETCH_MODE set when the query 
was executed. <font color="#000000"> 
-<h2><a name="pivot"></a>Pivot Tables</h2>
-</font> </p><p><font color="#000000">Since ADOdb 2.30, we support the 
generation of 
-SQL to create pivot tables, also known as cross-tabulations. For further 
explanation 
-read this DevShed <a 
href="http://www.devshed.com/Server_Side/MySQL/MySQLWiz/";>Cross-Tabulation 
-tutorial</a>. We assume that your database supports the SQL case-when 
expression. </font></p> 
-<font color="#000000"> 
-<p>In this example, we will use the Northwind database from Microsoft. In the 
-  database, we have a products table, and we want to analyze this table by 
<i>suppliers 
-  versus product categories</i>. We will place the suppliers on each row, and 
-  pivot on categories. So from the table on the left, we generate the 
pivot-table 
-  on the right:</p>
-</font> 
-<table align="center" border="0" cellpadding="2" cellspacing="2">
-  <tbody><tr>
-       <td>
-         <table align="center" border="1" cellpadding="2" cellspacing="2" 
width="142">
-               <tbody><tr> 
-                 <td><i>Supplier</i></td>
-                 <td><i>Category</i></td>
-               </tr>
-               <tr> 
-                 <td>supplier1</td>
-                 <td>category1</td>
-               </tr>
-               <tr> 
-                 <td>supplier2</td>
-                                       <td>category1</td>
-               </tr>
-               <tr> 
-                                       <td>supplier2</td>
-                 <td>category2</td>
-               </tr>
-         </tbody></table>
-       </td>
-       <td> <font face="Courier New, Courier, mono">--&gt;</font></td>
-       <td>
-         <table align="center" border="1" cellpadding="2" cellspacing="2">
-               <tbody><tr> 
-                 <td>&nbsp;</td>
-                 <td><i>category1</i></td>
-                 <td><i>category2</i></td>
-                 <td><i>total</i></td>
-               </tr>
-               <tr> 
-                 <td><i>supplier1</i></td>
-                 <td align="right">1</td>
-                 <td align="right">0</td>
-                 <td align="right">1</td>
-               </tr>
-               <tr> 
-                 <td><i>supplier2</i></td>
-                 <td align="right">1</td>
-                 <td align="right">1</td>
-                 <td align="right">2</td>
-               </tr>
-         </tbody></table>
-       </td>
-  </tr>
-</tbody></table>
-<font color="#000000"> 
-</font><p><font color="#000000">The following code will generate the SQL for a 
cross-tabulation: 
-</font></p><pre><font color="#000000"># Query the main "product" table<br># 
Set the rows to CompanyName<br># and the columns to the values of 
Categories<br># and define the joins to link to lookup tables <br># 
"categories" and "suppliers"<br>#<br> include "adodb/pivottable.php";<br> $sql 
= PivotTableSQL(<br>  $gDB,                                      # adodb 
connection<br>       'products p ,categories c ,suppliers s',   # tables<br> 
'CompanyName',                             # rows (multiple fields allowed)<br> 
'CategoryName',                            # column to pivot on <br>    
'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # 
joins/where<br>);<br></font></pre>
- 
-<p><font color="#000000"> This will generate the following SQL:</font></p>
-<p><code><font size="2">SELECT CompanyName, <br>
-  SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
-  <br>
-  SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
-  <br>
-  SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS 
"Confections", 
-  <br>
-  SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy 
-  Products", <br>
-  SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS 
"Grains/Cereals", 
-  <br>
-  SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS 
"Meat/Poultry", 
-  <br>
-  SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
-  <br>
-  SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
-  <br>
-  SUM(1) as Total <br>
-  FROM products p ,categories c ,suppliers s WHERE p.CategoryID = c.CategoryID 
-  and s.SupplierID= p.SupplierID <br>
-  GROUP BY CompanyName</font></code></p>
-<p> You can also pivot on <i>numerical columns</i> and <i>generate totals</i> 
-       by using ranges. <font color="#000000">This code was revised in ADODB 
2.41 
-       and is not backward compatible.</font> The second example shows 
this:</p>
-<pre> $sql = PivotTableSQL(<br>        $gDB,                                   
    # adodb connection<br>      'products p ,categories c ,suppliers s',    # 
tables<br>        'CompanyName',                              #<font 
color="#000000"> rows (multiple fields allowed)</font>
-   array(                                       # column ranges
-       ' 0 '      =&gt; 'UnitsInStock &lt;= 0',
-       "1 to 5"   =&gt; '0 &lt; UnitsInStock and UnitsInStock &lt;= 5',
-       "6 to 10"  =&gt; '5 &lt; UnitsInStock and UnitsInStock &lt;= 10',
-       "11 to 15" =&gt; '10 &lt; UnitsInStock and UnitsInStock &lt;= 15',
-       "16+"      =&gt; '15 &lt; UnitsInStock'
-       ),
-       ' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # 
joins/where
-       'UnitsInStock',                             # sum this field
-       'Sum '                                      # sum label prefix
-);
-</pre> 
-<p>Which generates: </p>
-<p> <code> <font size="2">SELECT CompanyName, <br>
-       SUM(CASE WHEN UnitsInStock &lt;= 0 THEN UnitsInStock ELSE 0 END) AS 
"Sum 
-       0 ", <br>
-       SUM(CASE WHEN 0 &lt; UnitsInStock and UnitsInStock &lt;= 5 THEN 
UnitsInStock 
-       ELSE 0 END) AS "Sum 1 to 5",<br>
-       SUM(CASE WHEN 5 &lt; UnitsInStock and UnitsInStock &lt;= 10 THEN 
UnitsInStock 
-       ELSE 0 END) AS "Sum 6 to 10",<br>
-       SUM(CASE WHEN 10 &lt; UnitsInStock and UnitsInStock &lt;= 15 THEN 
UnitsInStock 
-       ELSE 0 END) AS "Sum 11 to 15", <br>
-       SUM(CASE WHEN 15 &lt; UnitsInStock THEN UnitsInStock ELSE 0 END) AS 
"Sum 
-       16+", <br>
-       SUM(UnitsInStock) AS "Sum UnitsInStock", <br>
-       SUM(1) as Total,<br>
-       FROM products p ,categories c ,suppliers s WHERE p.CategoryID = 
c.CategoryID 
-       and s.SupplierID= p.SupplierID <br>
-       GROUP BY CompanyName</font></code><font size="2"><br>
-       </font> </p>
-<font color="#000000"><hr>
-<h1>Class Reference<a name="ref"></a></h1>
-<p>Function parameters with [ ] around them are optional.</p>
-</font> 
-<h2>Global Variables</h2>
-<h3><font color="#000000"><a 
name="adodb_countrecs"></a></font>$ADODB_COUNTRECS</h3>
-<p>If the database driver API does not support counting the number of records 
-       returned in a SELECT statement, the function RecordCount() is emulated 
when 
-       the global variable $ADODB_COUNTRECS is set to true, which is the 
default. 
-       We emulate this by buffering the records, which can take up large 
amounts 
-       of memory for big recordsets. Set this variable to false for the best 
performance. 
-       This variable is checked every time a query is executed, so you can 
selectively 
-       choose which recordsets to count.</p>
-<h3><font color="#000000"><a 
name="adodb_cache_dir"></a>$ADODB_CACHE_DIR</font></h3>
-<font color="#000000"> 
-<p>If you are using recordset caching, this is the directory to save your 
recordsets 
-  in. Define this before you call any caching functions such as CacheExecute( 
-  ). We recommend setting <i>register_globals=off</i> in php.ini if you use 
this 
-  feature for security reasons.</p>
-<p>If you are using Unix and apache, you might need to set your cache 
directory 
-  permissions to something similar to the following:</p>
-</font> 
-<p>chown -R apache /path/to/adodb/cache<br>
-  chgrp -R apache /path/to/adodb/cache </p>
-<font color="#000000">
-</font><h3><font color="#000000"><a 
name="adodb_ansi_padding_off"></a>$ADODB_ANSI_PADDING_OFF</font></h3>
-<p><font color="#000000">Determines whether to right trim CHAR fields (and 
also VARCHAR for ibase/firebird).
-Set to true to trim. Default is false. Currently works for oci8po, ibase and 
firebird 
-drivers. Added in ADOdb 4.01.
-</font></p><h3><font color="#000000"><font color="#000000"><a 
name="adodb_lang"></a></font>$ADODB_LANG</font></h3>
-<p><font color="#000000">Determines the language used in MetaErrorMsg(). The 
default is 'en', for English. 
-To find out what languages are supported, see the files 
-in adodb/lang/adodb-$lang.inc.php, where $lang is the supported langauge.
-</font></p><h3><font color="#000000"><a 
name="adodb_fetch_mode"></a>$ADODB_FETCH_MODE</font></h3>
-<p><font color="#000000">This is a global variable that determines how arrays 
are retrieved by recordsets. 
-  The recordset saves this value on creation (eg. in Execute( ) or 
SelectLimit( 
-  )), and any subsequent changes to $ADODB_FETCH_MODE have no affect on 
existing 
-  recordsets, only on recordsets created in the future.</font></p>
-<p><font color="#000000">The following constants are defined:</font></p>
- 
-<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></p>
-<font color="#000000"> 
-</font><p><font color="#000000"> An example: 
-</font></p><pre><font color="#000000"> $ADODB_<b>FETCH_MODE</b> = 
ADODB_FETCH_NUM;<br> $rs1 = $db-&gt;Execute('select * from table');<br>      
$ADODB_<b>FETCH_MODE</b> = ADODB_FETCH_ASSOC;<br>       $rs2 = 
$db-&gt;Execute('select * from table');<br>      print_r($rs1-&gt;fields); # 
shows <i>array([0]=&gt;'v0',[1] =&gt;'v1')</i>
-       print_r($rs2-&gt;fields); # shows <i>array(['col1']=&gt;'v0',['col2'] 
=&gt;'v1')</i>
-</font></pre>
-<p><font color="#000000"> As you can see in the above example, both recordsets 
store and use different 
-       fetch modes based on the $ADODB_FETCH_MODE setting when the recordset 
was 
-       created by Execute().</font></p>
-<p><font color="#000000">If no fetch mode is predefined, the fetch mode 
defaults to ADODB_FETCH_DEFAULT. 
-       The behaviour of this default mode varies from driver to driver, so do 
not 
-       rely on ADODB_FETCH_DEFAULT. For portability, we recommend sticking to 
ADODB_FETCH_NUM 
-       or ADODB_FETCH_ASSOC. Many drivers do not support 
ADODB_FETCH_BOTH.</font></p>
-<p><font color="#000000"><strong>SetFetchMode Function</strong></font></p>
-<p><font color="#000000">Some programmers prefer to use a more object-oriented 
solution, where the fetch 
-       mode is set by a object function, <a 
href="#setfetchmode">SetFetchMode</a>. 
-       Once this function is called for a connection object, that connection 
object 
-       will ignore the global variable $ADODB_FETCH_MODE and will use the 
internal 
-       fetchMode property exclusively.</font></p>
-<pre><font color="#000000">    $db-&gt;SetFetchMode(ADODB_FETCH_NUM);<br>      
$rs1 = $db-&gt;Execute('select * from table');<br>      
$db-&gt;SetFetchMode(ADODB_FETCH_ASSOC);<br>    $rs2 = $db-&gt;Execute('select 
* from table');<br>      print_r($rs1-&gt;fields); # shows 
<i>array([0]=&gt;'v0',[1] =&gt;'v1')</i>
-       print_r($rs2-&gt;fields); # shows <i>array(['col1']=&gt;'v0',['col2'] 
=&gt;'v1')</i></font></pre>
-<p><font color="#000000">To retrieve the previous fetch mode, you can use 
check the $db-&gt;fetchMode 
-       property, or use the return value of SetFetchMode( ). 
-</font></p><p><font color="#000000"><strong><a 
name="adodb_assoc_case"></a>ADODB_ASSOC_CASE</strong></font></p>
-<p><font color="#000000">You can control the associative fetch case for 
certain drivers which behave 
-       differently. For the sybase, oci8po, mssql, odbc and ibase drivers and 
all 
-       drivers derived from them, ADODB_ASSOC_CASE will by default generate 
recordsets 
-       where the field name keys are lower-cased. Use the constant 
ADODB_ASSOC_CASE 
-       to change the case of the keys. There are 3 possible values:</font></p>
-<p><font color="#000000">0 = assoc lowercase field names. 
$rs-&gt;fields['orderid']<br>
-       1 = assoc uppercase field names. $rs-&gt;fields['ORDERID']<br>
-       2 = use native-case field names. $rs-&gt;fields['OrderID'] -- this is 
the 
-       default since ADOdb 2.90</font></p>
-<p><font color="#000000">To use it, declare it before you incldue 
adodb.inc.php.</font></p>
-<p><font color="#000000">define('ADODB_ASSOC_CASE', 2); # use native-case for 
ADODB_FETCH_ASSOC<br>
-       include('adodb.inc.php'); </font></p>
-<h3><font color="#000000"><font color="#000000"><a 
name="force_type"></a></font>$ADODB_FORCE_TYPE</font></h3>
-<p><font color="#000000">See the <a href="#ADODB_FORCE_TYPE">GetUpdateSQL 
tutorial</a>.
-</font></p><hr>
-<h2><font color="#000000">ADOConnection<a name="adoconnection"></a></font></h2>
-<p><font color="#000000">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.</font></p>
-<h3><font color="#000000">ADOConnection Fields</font></h3>
-<p><font color="#000000"><b>databaseType</b>: Name of the database system we 
are connecting to. Eg. 
-       <b>odbc</b> or <b>mssql</b> or <b>mysql</b>.</font></p>
-<p><font color="#000000"><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>.</font></p>
-<p><font color="#000000"><b>host: </b>Name of server or data source name (DSN) 
to connect to.</font></p>
-<p><font color="#000000"><b>database</b>: Name of the database or to connect 
to. If ado is used, it 
-       will hold the ado data provider.</font></p>
-<p><font color="#000000"><b>user</b>: Login id to connect to database. 
Password is not saved for security 
-       reasons.</font></p>
-<p><font color="#000000"><b>raiseErrorFn</b>: Allows you to define an error 
handling function. See adodb-errorhandler.inc.php 
-       for an example.</font></p>
-<p><font color="#000000"><b>debug</b>: Set to <i>true</i> to make debug 
statements to appear.</font></p>
-<p><font color="#000000"><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.</font></p>
-<p><font color="#000000"><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.</font></p>
-<p><font color="#000000"><b>fmtTimeStamp: </b>The format used by the <b><a 
href="#dbtimestamp">DBTimeStamp</a></b> 
-       function to send timestamps to the database. </font></p>
-<p><font color="#000000"><b>true</b>: The value used to represent true.Eg. 
'.T.'. for Foxpro, '1' for 
-       Microsoft SQL.</font></p>
-<p><font color="#000000"><b>false: </b> The value used to represent false. Eg. 
'.F.'. for Foxpro, '0' 
-       for Microsoft SQL.</font></p>
-<p><font color="#000000"><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>.</font></p>
-<p><font color="#000000"><b>autoCommit</b>: indicates whether automatic commit 
is enabled. Default is 
-       true.</font></p>
-<p><font color="#000000"><b>charSet</b>: set the default charset to use. 
Currently only interbase supports 
-       this.</font></p>
-<p><font color="#000000"><b>dialect</b>: set the default sql dialect to use. 
Currently only interbase 
-       supports this.</font></p>
-<p><font color="#000000"><b>metaTablesSQL</b>: SQL statement to return a list 
of available tables. Eg. 
-       <i>SHOW TABLES</i> in MySQL.</font></p>
-<p><font color="#000000"><b>genID</b>: The latest id generated by GenID() if 
supported by the database.</font></p>
-<p><font color="#000000"><b>cacheSecs</b>: The number of seconds to cache 
recordsets if CacheExecute() 
-       or CacheSelectLimit() omit the $secs2cache parameter. Defaults to 60 
minutes.</font></p>
-<p><font color="#000000"><b>sysDate</b>: String that holds the name of the 
database function to call 
-       to get the current date. Useful for inserts and updates.</font></p>
-<p><font color="#000000"><b>sysTimeStamp</b>: String that holds the name of 
the database function to 
-       call to get the current timestamp/datetime value.</font></p>
-<p><font color="#000000"><b>leftOuter</b>: String that holds operator for left 
outer join, if known. 
-       Otherwise set to false.</font></p>
-<p><font color="#000000"><b>rightOuter</b>: String that holds operator for 
left outer join, if known. 
-       Otherwise set to false.</font></p>
-<p><font color="#000000"><b>ansiOuter</b>: Boolean that if true indicates that 
ANSI style outer joins 
-       are permitted. Eg. <i>select * from table1 left join table2 on 
p1=p2.</i></font></p>
-<p><font color="#000000"><b>connectSID</b>: Boolean that indicates whether to 
treat the $database parameter 
-       in connects as the SID for the oci8 driver. Defaults to false. Useful 
for 
-       Oracle 8.0.5 and earlier.</font></p>
-<p><font color="#000000"><b>autoRollback</b>: Persistent connections are 
auto-rollbacked in PConnect( 
-       ) if this is set to true. Default is false.</font></p>
-<hr>
-<h3><font color="#000000">ADOConnection Main Functions</font></h3>
-<p><font color="#000000"><b>ADOConnection( )</b></font></p>
-<p><font color="#000000">Constructor function. Do not call this directly. Use 
ADONewConnection( ) instead.</font></p>
-<p><font color="#000000"><b>Connect<a 
name="connect"></a>($host,[$user],[$password],[$database])</b></font></p>
-<p><font color="#000000">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>. </font></p>
-<p><font color="#000000">Returns true/false depending on connection success. 
Since 4.23, null is returned if the extension is not loaded.</font></p>
-<p><font color="#000000">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.</font></p>
-<p><font color="#000000">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.</font></p>
-<p><font color="#000000">For Oracle and Oci8, there are two ways to connect. 
First is to use the TNS 
-       name defined in your local tnsnames.ora (or ONAMES or HOSTNAMES). Place 
the 
-       name in the $database field, and set the $host field to false. 
Alternatively, 
-       set $host to the server, and $database to the database SID, this 
bypassed 
-       tnsnames.ora. 
-</font></p><p><font color="#000000">Examples: 
-</font></p><pre><font color="#000000"> # $oraname in 
tnsnames.ora/ONAMES/HOSTNAMES<br> $conn-&gt;Connect(false, 'scott', 'tiger', 
$oraname); <br> $conn-&gt;Connect('server:1521', 'scott', 'tiger', 
'ServiceName'); # bypass tnsnames.ora</font></pre>
-<p><font color="#000000">There are many examples of connecting to a database.
-See  <a href="#connect_ex">Connection Examples</a> for many examples.
-
-</font></p><p><font color="#000000"><b>PConnect<a 
name="pconnect"></a>($host,[$user],[$password],[$database])</b></font></p>
-<p><font color="#000000">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>.</font></p>
-<p><font color="#000000">We now perform a rollback on persistent connection 
for selected databases since 
-       2.21, as advised in the PHP manual. See change log or source code for 
which 
-       databases are affected. 
-</font></p><p><font color="#000000">Returns true/false depending on 
connection. Since 4.23, null is returned if the extension is not loaded.
-See Connect( ) above for more info.</font></p>
-<p><font color="#000000">Since ADOdb 2.21, we also support autoRollback. If 
you set:</font></p>
- 
-<pre> $conn = &amp;NewADOConnection('mysql');<br> $conn-&gt;autoRollback = 
true; # default is false<br> $conn-&gt;PConnect(...); # rollback here</pre>
-<p> Then when doing a persistent connection with PConnect( ), ADOdb will 
-  perform a rollback first. This is because it is documented that PHP is 
-  not guaranteed to rollback existing failed transactions when 
-  persistent connections are used. This is implemented in Oracle, 
-  MySQL, PgSQL, MSSQL, ODBC currently. 
-</p><p>Since ADOdb 3.11, you can force non-persistent 
-connections even if PConnect is called by defining the constant 
-ADODB_NEVER_PERSIST  before you call PConnect.
-</p><p>
-Since 4.23, null is returned if the extension is not loaded.
-</p><p><b>NConnect<a 
name="nconnect"></a>($host,[$user],[$password],[$database])</b></p>
-<p>Always force a new connection. In contrast, PHP sometimes reuses 
connections 
-       when you use Connect() or PConnect(). Currently works only on mysql 
(PHP 4.3.0 
-       or later), postgresql and oci8-derived drivers. For other drivers, 
NConnect() works like 
-       Connect(). 
-<font color="#000000"> 
-</font></p><p><font color="#000000"><b>IsConnected( )<a 
name="isconnected"></a></b></font></p>
-<p>
-<font color="#000000">Returns true if connected to database. Added in 4.53.
-
-</font></p><p><font color="#000000"><b>Execute<a 
name="execute"></a>($sql,$inputarr=false)</b></font></p>
-<p><font color="#000000">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. You can also pass in 
$sql a statement prepared 
-       in <a href="#prepare">Prepare()</a>.</font></p>
-<p><font color="#000000">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.</font></p>
-<p><font color="#000000">The $inputarr parameter can be used for binding 
variables to parameters. Below 
-       is an Oracle example:</font></p>
-<pre><font color="#000000"> $conn-&gt;Execute("SELECT * FROM TABLE WHERE 
COND=:val", array('val'=&gt; $val));<br> </font></pre>
-<p><font color="#000000">Another example, using ODBC,which uses the ? 
convention:</font></p>
-<pre><font color="#000000">  $conn-&gt;Execute("SELECT * FROM TABLE WHERE 
COND=?", array($val));<br></font></pre>
-<font color="#000000"><a name="binding"></a>
-<i>Binding variables</i></font><p>
-<font color="#000000">Variable binding speeds the compilation and caching of 
SQL statements, leading 
-to higher performance. Currently Oracle, Interbase and ODBC supports variable 
binding. 
-Interbase/ODBC style ? binding is emulated in databases that do not support 
binding. 
-Note that you do not have to quote strings if you use binding.
-</font></p><p><font color="#000000"> Variable binding in the odbc, interbase 
and oci8po drivers. 
-</font></p><pre><font color="#000000">$rs = $db-&gt;Execute('select * from 
table where val=?', array('10'));<br></font></pre>
-<font color="#000000">Variable binding in the oci8 driver: 
-</font><pre><font color="#000000">$rs = $db-&gt;Execute('select name from 
table where val=:key', <br>  array('key' =&gt; 10));<br></font></pre>
-<font color="#000000"><a name="bulkbind"></a>
-<i>Bulk binding</i>
-</font><p><font color="#000000">Since ADOdb 3.80, we support bulk binding in 
Execute(), in which you pass in a 2-dimensional array to
-be bound to an INSERT/UPDATE or DELETE statement.
-</font></p><pre><font color="#000000">$arr = array(<br>        
array('Ahmad',32),<br>  array('Zulkifli', 24),<br>      array('Rosnah', 21)<br> 
);<br>$ok = $db-&gt;Execute('insert into table (name,age) values 
(?,?)',$arr);<br></font></pre>
-<p><font color="#000000">This provides very high performance as the SQL 
statement is prepared first. 
-The prepared statement is executed repeatedly for each array row until all 
rows are completed, 
-or until the first error. Very useful for importing data.
-
-</font></p><p><font color="#000000"><b>CacheExecute<a 
name="cacheexecute"></a>([$secs2cache,]$sql,$inputarr=false)</b></font></p>
-<p><font color="#000000">Similar to Execute, except that the recordset is 
cached for $secs2cache seconds 
-       in the $ADODB_CACHE_DIR directory, and $inputarr only accepts 
1-dimensional arrays. 
-       If CacheExecute() is called again with the same $sql, $inputarr, 
-       and also the same database, same userid, and the cached recordset 
-       has not expired, the cached recordset is returned. 
-</font></p><pre><font color="#000000">  include('adodb.inc.php'); <br>  
include('tohtml.inc.php');<br>  $ADODB_<b>CACHE_DIR</b> = 
'/usr/local/ADOdbcache';<br>  $conn = &amp;ADONewConnection('mysql'); <br>  
$conn-&gt;PConnect('localhost','userid','password','database');<br>  $rs = 
$conn-&gt;<b>CacheExecute</b>(15, 'select * from table'); # cache 15 secs<br>  
rs2html($rs); /* recordset to html table */  <br></font></pre>
-<p><font color="#000000"> Alternatively, since ADOdb 1.80, the $secs2cache 
parameter is optional:</font></p>
-<pre><font color="#000000">    $conn-&gt;Connect(...);<br>     
$conn-&gt;cacheSecs = 3600*24; // cache 24 hours<br>    $rs = 
$conn-&gt;CacheExecute('select * from table');<br></font></pre>
-<font color="#000000">If $secs2cache is omitted, we use the value 
-in $connection-&gt;cacheSecs (default is 3600 seconds, or 1 hour). Use 
CacheExecute() 
-only with SELECT statements. 
-</font><p><font color="#000000">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. 
</font></p>
-<p><font color="#000000"><b>ExecuteCursor<a 
name="executecursor"></a>($sql,$cursorName='rs',$parameters=false)</b></font></p>
-<p><font color="#000000">Execute an Oracle stored procedure, and returns an 
Oracle REF cursor variable as 
-       a regular ADOdb recordset. Does not work with any other database except 
oci8. 
-       Thanks to Robert Tuttle for the design.
-</font></p><pre><font color="#000000">    $db = ADONewConnection("oci8"); <br> 
   $db-&gt;Connect("foo.com:1521", "uid", "pwd", "FOO"); <br>    $rs = 
$db-&gt;ExecuteCursor("begin :cursorvar := getdata(:param1); end;", <br>        
                         'cursorvar',<br>                                       
 array('param1'=&gt;10)); <br>    # $rs is now just like any other ADOdb 
recordset object<br>    rs2html($rs);</font></pre>
-<p><font color="#000000">ExecuteCursor() is a helper function that does the 
following internally: 
-</font></p><pre><font color="#000000"> $stmt = $db-&gt;Prepare("begin 
:cursorvar := getdata(:param1); end;", true); <br>       
$db-&gt;Parameter($stmt, $cur, 'cursorvar', false, -1, OCI_B_CURSOR);<br>       
$rs = $db-&gt;Execute($stmt,$bindarr);<br></font></pre>
-<p><font color="#000000">ExecuteCursor only accepts 1 out parameter. So if you 
have 2 out parameters, use:
-</font></p><pre><font color="#000000"> $vv = 'A%';<br> $stmt = 
$db-&gt;PrepareSP("BEGIN list_tabs(:crsr,:tt); END;");<br>      
$db-&gt;OutParameter($stmt, $cur, 'crsr', -1, OCI_B_CURSOR);<br>        
$db-&gt;OutParameter($stmt, $vv, 'tt', 32); # return varchar(32)<br>    $arr = 
$db-&gt;GetArray($stmt);<br>     print_r($arr);<br>      echo " val = $vv"; ## 
outputs 'TEST'<br></font></pre>
-<font color="#000000">for the following PL/SQL:
-</font><pre><font color="#000000">     TYPE TabType IS REF CURSOR RETURN 
TAB%ROWTYPE;<br><br>  PROCEDURE list_tabs(tabcursor IN OUT TabType,tablenames 
IN OUT VARCHAR) IS<br>  BEGIN<br>               OPEN tabcursor FOR SELECT * 
FROM TAB WHERE tname LIKE tablenames;<br>           tablenames := 'TEST';<br>   
    END list_tabs;<br></font></pre>
-<p><font color="#000000"><b>SelectLimit<a 
name="selectlimit"></a>($sql,$numrows=-1,$offset=-1,$inputarr=false)</b></font></p>
-<p><font color="#000000">Returns a recordset if successful. Returns false 
otherwise. Performs a select 
-       statement, simulating PostgreSQL's SELECT statement, LIMIT $numrows 
OFFSET 
-       $offset clause.</font></p>
-<p><font color="#000000">In PostgreSQL, SELECT * FROM TABLE LIMIT 3 will 
return the first 3 records 
-       only. The equivalent is <code>$connection-&gt;SelectLimit('SELECT * 
FROM TABLE',3)</code>. 
-       This functionality is simulated for databases that do not possess this 
feature.</font></p>
-<p><font color="#000000">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-&gt;SelectLimit('SELECT 
-       * FROM TABLE',3,2)</code>.</font></p>
-<p><font color="#000000">Note that this is the <i>opposite</i> of MySQL's 
LIMIT clause. You can also 
-       set <code>$connection-&gt;SelectLimit('SELECT * FROM 
TABLE',-1,10)</code> to 
-       get rows 11 to the last row.</font></p>
-<p><font color="#000000">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:</font></p>
-<pre><font color="#000000"> $conn-&gt;SelectLimit("SELECT * FROM TABLE WHERE 
COND=:val", 100,-1,array('val'=&gt; $val));<br> </font></pre>
-<p><font color="#000000">The oci8po driver (oracle portable driver) uses the 
more standard bind variable 
-       of ?: 
-</font></p><pre><font color="#000000"> $conn-&gt;SelectLimit("SELECT * FROM 
TABLE WHERE COND=?", 100,-1,array('val'=&gt; $val));<br></font></pre>
-<p><font color="#000000"> 
-</font></p><p><font color="#000000">Ron Wilson reports that SelectLimit does 
not work with UNIONs. 
-</font></p><p><font color="#000000"><b>CacheSelectLimit<a 
name="cacheselectlimit"></a>([$secs2cache,] $sql, 
$numrows=-1,$offset=-1,$inputarr=false)</b></font></p>
-<p><font color="#000000">Similar to SelectLimit, except that the recordset 
returned is cached for $secs2cache 
-       seconds in the $ADODB_CACHE_DIR directory. </font></p>
-<p><font color="#000000">Since 1.80, $secs2cache has been optional, and you 
can define the caching time 
-       in $connection-&gt;cacheSecs.</font></p>
- 
-<pre><font color="#000000">    $conn-&gt;Connect(...);<br>   
$conn-&gt;cacheSecs = 3600*24; // cache 24 hours<br>      $rs = 
$conn-&gt;CacheSelectLimit('select * from table',10);</font></pre>
-<font color="#000000"> 
-</font><p><font color="#000000"><b>CacheFlush<a 
name="cacheflush"></a>($sql=false,$inputarr=false)</b></font></p>
-<p><font color="#000000">Flush (delete) any cached recordsets for the SQL 
statement $sql in $ADODB_CACHE_DIR. 
-</font></p><p><font color="#000000">If no parameter is passed in, then all 
adodb_*.cache files are deleted. 
-</font></p><p><font color="#000000"> If you want to flush all cached 
recordsets manually, execute the following 
-       PHP code (works only under Unix): <br>
-       <code> &nbsp; system("rm -f `find ".$ADODB_CACHE_DIR." -name 
-       adodb_*.cache`");</code></font></p>
-<p><font color="#000000">For general cleanup of all expired files, you should 
use <a href="http://www.superscripts.com/tutorial/crontab.html";>crontab</a> 
-       on Unix, or at.exe on Windows, and a shell script similar to the 
following:<font face="Courier New, Courier, mono"><br>
-       #------------------------------------------------------ <br>
-       # This particular example deletes files in the TMPPATH <br>
-       # directory with the string ".cache" in their name that <br>
-       # are more than 7 days old. <br>
-       #------------------------------------------------------ <br>
-       AGED=7 <br>
-       find ${TMPPATH} -mtime +$AGED | grep "\.cache" | xargs rm -f <br>
-       </font> </font></p>
-<p><font color="#000000"><b>MetaError<a 
name="metaerror"></a>($errno=false)</b></font></p>
-<p><font color="#000000">Returns a virtualized error number, based on PEAR 
DB's error number system. You might
-need to include adodb-error.inc.php before you call this function. The 
parameter $errno
-is the native error number you want to convert. If you do not pass any 
parameter, MetaError
-will call ErrorNo() for you and convert it. If the error number cannot be 
virtualized, MetaError 
-will return -1 (DB_ERROR).</font></p>
-
-<p><font color="#000000"><b>MetaErrorMsg<a 
name="metaerrormsg"></a>($errno)</b></font></p>
-<p><font color="#000000">Pass the error number returned by MetaError() for the 
equivalent textual error message.</font></p>
-<p><font color="#000000"><b>ErrorMsg<a name="errormsg"></a>()</b></font></p>
-<p><font color="#000000">Returns the last status or error message. The error 
message is reset after every 
-call to Execute(). 
-</font></p><p>
-<font color="#000000">This can return a string even if 
-       no error occurs. In general you do not need to call this function 
unless an 
-       ADOdb function returns false on an error. </font></p>
-<p><font color="#000000">Note: If <b>debug</b> is enabled, the SQL error 
message is always displayed 
-       when the <b>Execute</b> function is called.</font></p>
-<p><font color="#000000"><b>ErrorNo<a name="errorno"></a>()</b></font></p>
-<p><font color="#000000">Returns the last error number. The error number is 
reset after every call to Execute(). 
-If 0 is returned, no error occurred.
-</font></p><p>
-<font color="#000000">Note that old versions of PHP (pre 4.0.6) do 
-       not support error number for ODBC. In general you do not need to call 
this 
-       function unless an ADOdb function returns false on an error.</font></p>
-
-<p><font color="#000000"><b>SetFetchMode<a 
name="setfetchmode"></a>($mode)</b></font></p>
-<p><font color="#000000">Sets the current fetch mode for the connection and 
stores 
-       it in $db-&gt;fetchMode. Legal modes are ADODB_FETCH_ASSOC and 
ADODB_FETCH_NUM. 
-       For more info, see <a 
href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a>.</font></p>
-<p><font color="#000000">Returns the previous fetch mode, which could be false 
-       if SetFetchMode( ) has not been called before.</font></p>
-<font color="#000000"> 
-</font><p><font color="#000000"><b>CreateSequence<a 
name="createseq"></a>($seqName = 'adodbseq',$startID=1)</b></font></p>
-<p><font color="#000000">Create a sequence. The next time GenID( ) is called, 
the value returned will 
-       be $startID. Added in 2.60. 
-</font></p><p><font color="#000000"><b>DropSequenceD<a 
name="dropseq"></a>($seqName = 'adodbseq')</b></font></p>
-<p><font color="#000000">Delete a sequence. Added in 2.60. 
-</font></p><p><font color="#000000"><b>GenID<a name="genid"></a>($seqName = 
'adodbseq',$startID=1)</b></font></p>
-<p><font color="#000000">Generate a sequence number . Works for interbase, 
-       mysql, postgresql, oci8, oci8po, mssql, ODBC based (access,vfp,db2,etc) 
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). Otherwise you will have to create the sequence 
yourself. 
-</font></p><p><font color="#000000"> If your database driver emulates 
sequences, the name of the table is the sequence 
-       name. The table has one column, "id" which should be of type integer, 
or if 
-       you need something larger - numeric(16). 
-</font></p><p><font color="#000000"> For ODBC and databases that do not 
support sequences natively (eg mssql, mysql), 
-       we create a table for each sequence. If the sequence has not been 
defined 
-       earlier, it is created with the starting value set in 
$startID.</font></p>
-<p><font color="#000000">Note that the mssql driver's GenID() before 1.90 used 
to generate 16 byte GUID's.</font></p>
-<p><font color="#000000"><b>UpdateBlob<a 
name="updateblob"></a>($table,$column,$val,$where)</b></font></p>
-<font color="#000000">Allows you to store a blob (in $val) into $table into 
$column in a row at $where. 
-</font><p><font color="#000000"> Usage: 
-</font></p><p><font color="#000000"> 
-</font></p><pre><font color="#000000"> # for oracle<br>        
$conn-&gt;Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, 
empty_blob())');<br>  
$conn-&gt;UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');<br>      <br>    
# non oracle databases<br>      $conn-&gt;Execute('INSERT INTO blobtable (id, 
blobcol) VALUES (1, null)');<br>  
$conn-&gt;UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');<br></font></pre>
-<p><font color="#000000"> Returns true if succesful, false otherwise. 
Supported by MySQL, PostgreSQL, 
-       Oci8, Oci8po and Interbase drivers. Other drivers might work, depending 
on 
-       the state of development.</font></p>
-<p><font color="#000000">Note that when an Interbase blob is retrieved using 
SELECT, it still needs 
-       to be decoded using $connection-&gt;DecodeBlob($blob); to derive the 
original 
-       value in versions of PHP before 4.1.0. 
-</font></p><p><font color="#000000">For PostgreSQL, you can store your blob 
using blob oid's or as a bytea field. 
-       You can use bytea fields but not blob oid's currently with UpdateBlob( 
). 
-       Conversely UpdateBlobFile( ) supports oid's, but not bytea data.<br>
-       <br>
-       If you do not pass in an oid, then UpdateBlob() assumes that you are 
storing 
-       in bytea fields.
-</font></p><p><font color="#000000"><b>UpdateClob<a 
name="updateclob"></a>($table,$column,$val,$where)</b></font></p>
-<font color="#000000">Allows you to store a clob (in $val) into $table into 
$column in a row at $where. 
-Similar to UpdateBlob (see above), but for Character Large OBjects. 
-</font><p><font color="#000000"> Usage:
-</font></p><pre><font color="#000000"> # for oracle<br>        
$conn-&gt;Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, 
empty_clob())');<br>  
$conn-&gt;UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');<br>      <br>    
# non oracle databases<br>      $conn-&gt;Execute('INSERT INTO clobtable (id, 
clobcol) VALUES (1, null)');<br>  
$conn-&gt;UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');<br></font></pre>
-<p><font color="#000000"><b>UpdateBlobFile<a 
name="updateblobfile"></a>($table,$column,$path,$where,$blobtype='BLOB')</b></font></p>
-<p><font color="#000000">Similar to UpdateBlob, except that we pass in a file 
path to where the blob 
-       resides.
-</font></p><p><font color="#000000">For PostgreSQL, if you are using blob 
oid's, use this interface. This interface 
-       does not support bytea fields.
-</font></p><p><font color="#000000">Returns true if successful, false 
otherwise. 
-</font></p><p><font color="#000000"><b>BlobEncode<a name="blobencode" 
id="blobencode"></a>($blob)</b> 
-</font></p><p><font color="#000000">Some databases require blob's to be 
encoded manually before upload. Note if 
-       you use UpdateBlob( ) or UpdateBlobFile( ) the conversion is done 
automatically 
-       for you and you do not have to call this function. For PostgreSQL, 
currently, 
-       BlobEncode() can only be used for bytea fields.
-</font></p><p><font color="#000000">Returns the encoded blob value.
-</font></p><p><font color="#000000">Note that there is a connection property 
called <em>blobEncodeType</em> which 
-       has 3 legal values: 
-</font></p><p><font color="#000000">false - no need to perform encoding or 
decoding.<br>
-       'I' - blob encoding required, and returned encoded blob is a numeric 
value 
-       (no need to quote).<br>
-       'C' - blob encoding required, and returned encoded blob is a character 
value 
-       (requires quoting).
-</font></p><p><font color="#000000">This is purely for documentation purposes, 
so that programs that accept multiple 
-       database drivers know what is the right thing to do when processing 
blobs.
-</font></p><p><font color="#000000"><strong>BlobDecode<a 
name="blobdecode"></a>($blob, $maxblobsize = false)</strong> 
-</font></p><p><font color="#000000">Some databases require blob's to be 
decoded manually after doing a select statement. 
-       If the database does not require decoding, then this function will 
return 
-       the blob unchanged. Currently BlobDecode is only required for one 
database, 
-       PostgreSQL, and only if you are using blob oid's (if you are using 
bytea fields, 
-       we auto-decode for you).</font> The default maxblobsize is set in 
$connection->maxblobsize, which 
-       is set to 256K in adodb 4.54. <p>
-       In ADOdb 4.54 and later, the blob is the return value. In earlier 
versions, the blob data is sent to stdout.</p><font color="#000000">
-</font></p><pre><font color="#000000">$rs = $db-&gt;Execute("select bloboid 
from postgres_table where id=$key");<br>$blob = $db-&gt;BlobDecode( 
reset($rs-&gt;fields) );</font></pre>
-<p><font color="#000000"><b>Replace<a name="replace"></a>($table, $arrFields, 
$keyCols,$autoQuote=false)</b></font></p>
-<p><font color="#000000">Try to update a record, and if the record is not 
found, an insert statement 
-       is generated and executed. Returns 0 on failure, 1 if update statement 
worked, 
-       2 if no record was found and the insert was executed successfully. This 
differs 
-       from MySQL's replace which deletes the record and inserts a new record. 
This 
-       also means you cannot update the primary key. The only exception to 
this is 
-       Interbase and its derivitives, which uses delete and insert because of 
some 
-       Interbase API limitations. 
-</font></p><p><font color="#000000">The parameters are $table which is the 
table name, the $keyCols which is an 
-       associative array where the keys are the field names, and keyCols is 
the name 
-       of the primary key, or an array of field names if it is a compound key. 
If 
-       $autoQuote is set to true, then Replace() will quote all values that 
are non-numeric; 
-       auto-quoting will not quote nulls. Note that auto-quoting will not work 
if 
-       you use SQL functions or operators. 
-</font></p><p><font color="#000000">Examples: 
-</font></p><pre><font color="#000000"># single field primary key<br>$ret = 
$db-&gt;Replace('atable', <br>      
array('id'=&gt;1000,'firstname'=&gt;'Harun','lastname'=&gt;'Al-Rashid'),<br>    
'id',$autoquote = true);        <br># generates UPDATE atable SET 
firstname='Harun',lastname='Al-Rashid' WHERE id=1000<br># or INSERT INTO atable 
(id,firstname,lastname) VALUES (1000,'Harun','Al-Rashid')<br><br># compound 
key<br>$ret = $db-&gt;Replace('atable2', <br>     
array('firstname'=&gt;'Harun','lastname'=&gt;'Al-Rashid', 'age' =&gt; 33, 
'birthday' =&gt; 'null'),<br> array('lastname','firstname'),<br>      
$autoquote = true);<br><br># no auto-quoting<br>$ret = 
$db-&gt;Replace('atable2', <br>  
array('firstname'=&gt;"'Harun'",'lastname'=&gt;"'Al-Rashid'", 'age' =&gt; 
'null'),<br>  array('lastname','firstname')); <br></font></pre>
-<p><font color="#000000"><b>GetUpdateSQL<a name="getupdatesql"></a>(&amp;$rs, 
$arrFields, $forceUpdate=false,$magicq=false, $force=null)</b></font></p>
-<p><font color="#000000">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. $magicq is 
used 
-       to indicate whether magic quotes are enabled (see qstr()). The field 
names in the array 
-       are case-insensitive.</font></p>
-<font color="#000000"> </font><p><font color="#000000">Since 4.52, we allow 
you to pass the $force type parameter, and this overrides the <a 
href="#ADODB_FORCE_TYPE">$ADODB_FORCE_TYPE</a>
-       global variable.
-</font></p><p><font color="#000000"><b>GetInsertSQL<a 
name="getinsertsql"></a>(&amp;$rs, 
$arrFields,$magicq=false,$force=false)</b></font></p>
-<p><font color="#000000">Generate SQL to insert into a table given a recordset 
$rs. Requires the query 
-       to be associative. $magicq is used to indicate whether magic quotes are 
enabled 
-       (for qstr()). The field names in the array are 
case-insensitive.</font></p>
-<p>
-<font color="#000000">  Since 2.42, you can pass a  table name instead of a 
recordset into 
-GetInsertSQL (in $rs), and it will generate an insert statement for that table.
-</font></p><p><font color="#000000">Since 4.52, we allow you to pass the 
$force type parameter, and this overrides the <a 
href="#ADODB_FORCE_TYPE">$ADODB_FORCE_TYPE</a>
-       global variable.
-</font></p><p><font color="#000000"><b>PageExecute<a 
name="pageexecute"></a>($sql, $nrows, $page, $inputarr=false)</b> 
-</font></p><p><font color="#000000">Used for pagination of recordset. $page is 
1-based. See <a href="#ex8">Example 
-  8</a>.</font></p>
- 
-<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-based. 
See 
-  <a href="#ex8">Example 8</a>. Caching version of PageExecute.</font></p>
-<font color="#000000"> 
-</font><p></p>
-<p><font color="#000000"><b>Close<a name="close"></a>( )</b></font></p>
-<p><font color="#000000">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.</font></p>
-<font color="#000000">  </font><p><font color="#000000"><b>StartTrans<a 
name="starttrans"></a>( )</b></font></p>
-<font color="#000000">  </font><p><font color="#000000">Start a monitored 
transaction. As SQL statements are executed, ADOdb will monitor
-  for SQL errors, and if any are detected, when CompleteTrans() is called, we 
auto-rollback.
-  </font></p><p>
-<font color="#000000">  </font></p><p><font color="#000000"> To understand why 
StartTrans() is superior to BeginTrans(), 
-  let us examine a few ways of using BeginTrans().
-  The following is the wrong way to use transactions: 
-</font></p><pre><font 
color="#000000">$DB-&gt;BeginTrans();<br>$DB-&gt;Execute("update table1 set 
val=$val1 where id=$id");<br>$DB-&gt;Execute("update table2 set val=$val2 where 
id=$id");<br>$DB-&gt;CommitTrans();<br></font></pre>
-<p><font color="#000000">because you perform no error checking. It is possible 
to update table1 and 
-  for the update on table2 to fail. Here is a better way: 
-</font></p><pre><font color="#000000">$DB-&gt;BeginTrans();<br>$ok = 
$DB-&gt;Execute("update table1 set val=$val1 where id=$id");<br>if ($ok) $ok = 
$DB-&gt;Execute("update table2 set val=$val2 where id=$id");<br>if ($ok) 
$DB-&gt;CommitTrans();<br>else $DB-&gt;RollbackTrans();<br></font></pre>
-<p><font color="#000000">Another way is (since ADOdb 2.0): 
-</font></p><pre><font color="#000000">$DB-&gt;BeginTrans();<br>$ok = 
$DB-&gt;Execute("update table1 set val=$val1 where id=$id");<br>if ($ok) $ok = 
$DB-&gt;Execute("update table2 set val=$val2 where 
id=$id");<br>$DB-&gt;CommitTrans($ok);<br></font></pre>
-<p><font color="#000000"> Now it is a headache monitoring $ok all over the 
place. StartTrans() is an
-improvement because it monitors all SQL errors for you. This is particularly
-useful if you are calling black-box functions in which SQL queries might be 
executed.
- Also all BeginTrans, CommitTrans and RollbackTrans calls inside a StartTrans 
block 
-  will be disabled, so even if the black box function does a commit, it will 
be ignored.
-</font></p><pre><font 
color="#000000">$DB-&gt;StartTrans();<br>CallBlackBox();<br>$DB-&gt;Execute("update
 table1 set val=$val1 where id=$id");<br>$DB-&gt;Execute("update table2 set 
val=$val2 where id=$id");<br>$DB-&gt;CompleteTrans($ok);<br></font></pre>
-<p><font color="#000000">Note that a StartTrans blocks are nestable, the inner 
blocks are ignored.
- </font></p><p><font color="#000000"><b>CompleteTrans<a 
name="completetrans"></a>($autoComplete=true)</b></font></p>
-<font color="#000000">  </font><p><font color="#000000">Complete a transaction 
called with StartTrans(). This function monitors
-  for SQL errors, and will commit if no errors have occured, otherwise it will 
rollback. 
-  Returns true on commit, false on rollback. If the parameter $autoComplete is 
true
-  monitor sql errors and commit and rollback as appropriate. Set $autoComplete 
to false 
-  to force rollback even if no SQL error detected.
-  </font></p><p><font color="#000000"><b>FailTrans<a name="failtrans"></a>( 
)</b></font></p>
-<font color="#000000">  </font><p><font color="#000000">Fail a transaction 
started with StartTrans(). The rollback will only occur when
-  CompleteTrans() is called.
-    </font></p><p><font color="#000000"><b>HasFailedTrans<a 
name="hasfailedtrans"></a>( )</b></font></p>
-<font color="#000000"> </font><p><font color="#000000">Check whether smart 
transaction has failed, 
-       eg. returns true if there was an error in SQL execution or FailTrans() 
was called.
-       If not within smart transaction, returns false.
-</font></p><p><font color="#000000"><b>BeginTrans<a name="begintrans"></a>( 
)</b></font></p>
-<p><font color="#000000">Begin a transaction. Turns off autoCommit. Returns 
true if successful. Some 
-  databases will always return false if transaction support is not available. 
-   Any open transactions will be rolled back when the connection is closed. 
Among the
-   databases that support transactions are Oracle, PostgreSQL, Interbase, 
MSSQL, certain
-    versions of MySQL, DB2, Informix, Sybase, etc.</font></p>
-<font color="#000000"> </font><p><font color="#000000">Note that <a 
href="#starttrans">StartTrans()</a> and CompleteTrans() is a superior method of 
- handling transactions, available since ADOdb 3.40. For a explanation, see the 
<a href="#starttrans">StartTrans()</a> documentation.
-
-</font></p><p><font color="#000000">You can also use the ADOdb <a 
href="#errorhandling">error handler</a> to die 
-  and rollback your transactions for you transparently. Some buggy database 
extensions 
-  are known to commit all outstanding tranasactions, so you might want to 
explicitly 
-  do a $DB-&gt;RollbackTrans() in your error handler for safety. 
- </font></p><h4><font color="#000000">Detecting Transactions</font></h4>
-<font color="#000000"> </font><p><font color="#000000">Since ADOdb 2.50, you 
are able to detect when you are inside a transaction. Check
- that $connection-&gt;transCnt &gt; 0. This variable is incremented whenever 
BeginTrans() is called,
- and decremented whenever RollbackTrans() or CommitTrans() is called.
-</font></p><p><font color="#000000"><b>CommitTrans<a 
name="committrans"></a>($ok=true)</b></font></p>
-<p><font color="#000000">End a transaction successfully. Returns true if 
successful. If the database 
-  does not support transactions, will return true also as data is always 
committed. 
-</font></p>
-<p><font color="#000000">If you pass the parameter $ok=false, the data is 
rolled back. See example in 
-  BeginTrans().</font></p>
-<p><font color="#000000"><b>RollbackTrans<a name="rollbacktrans"></a>( 
)</b></font></p>
-<p><font color="#000000">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. 
-</font></p>
-<font color="#000000"> 
-</font><p><font color="#000000"><b>GetAssoc<a 
name="getassoc1"></a>($sql,$inputarr=false,$force_array=false,$first2cols=false)</b></font></p>
-<p><font color="#000000">Returns an associative array for the given query $sql 
with optional bind parameters 
-  in $inputarr. If the number of columns returned is greater to two, a 
2-dimensional 
-  array is returned, with the first column of the recordset becomes the keys 
-  to the rest of the rows. If the columns is equal to two, a 1-dimensional 
array 
-  is created, where the the keys directly map to the values (unless 
$force_array 
-  is set to true, when an array is created for each value).
-</font></p><p><font color="#000000"> <font color="#000000">Examples:<a 
name="getassocex"></a></font></font></p>
-
-<p><font color="#000000">We have the following data in a recordset:</font></p>
-<p><font color="#000000">row1: Apple, Fruit, Edible<br>
-  row2: Cactus, Plant, Inedible<br>
-  row3: Rose, Flower, Edible</font></p>
-<p><font color="#000000">GetAssoc will generate the following 2-dimensional 
associative 
-  array:</font></p>
-<p><font color="#000000">Apple =&gt; array[Fruit, Edible]<br>
-  Cactus =&gt; array[Plant, Inedible]<br>
-  Rose =&gt; array[Flower,Edible]</font></p>
-<p><font color="#000000">If the dataset is:</font></p>
-<p><font color="#000000"><font color="#000000"><font color="#000000">row1: 
Apple, 
-  Fruit<br>
-  row2: Cactus, Plant<br>
-  row3: Rose, Flower</font> </font></font></p>
-<p><font color="#000000"><font color="#000000">GetAssoc will generate the 
following 
-  1-dimensional associative array (with $force_array==false):</font></font></p>
-<p><font color="#000000">Apple =&gt; Fruit</font><br>
-  Cactus=&gt;Plant<br>
-  Rose=&gt;Flower <font color="#000000"><font color="#000000"> 
</font></font><font color="#000000"><font color="#000000"></font></font></p>
-<p><font color="#000000">The function returns:</font></p>
-<p><font color="#000000">The associative array, or false if an error 
occurs.</font></p>
-<font color="#000000">
-<p><b>CacheGetAssoc<a name="cachegetassoc"></a>([$secs2cache,] 
$sql,$inputarr=false,$force_array=false,$first2cols=false)</b></p>
-</font><font color="#000000"> 
-</font><p><font color="#000000">Caching version of <a 
href="#getassoc1">GetAssoc</a> function above.
-</font></p><p><font color="#000000"><b>GetOne<a 
name="getone"></a>($sql,$inputarr=false)</b></font></p>
-<p><font color="#000000">Executes the SQL and returns the first field of the 
first row. The recordset 
-  and remaining rows are discarded for you automatically. If an error occur, 
false 
-  is returned.</font></p>
-<p><font color="#000000"><b>GetRow<a 
name="getrow"></a>($sql,$inputarr=false)</b></font></p>
-<p><font color="#000000">Executes the SQL and returns the first row as an 
array. The recordset and remaining 
-  rows are discarded for you automatically. If an error occurs, false is 
returned.</font></p>
-<p><font color="#000000"><b>GetAll<a name="getall"></a>($sql)</b></font></p>
-
-<p><font color="#000000">Executes the SQL and returns the all the rows as a 
2-dimensional 
-  array. The recordset is discarded for you automatically. If an error occurs, 
-  false is returned.</font></p>
- <p><b>GetCol<a name="getcol"></a>($sql,$inputarr=false,$trim=false)</b></p>
-
-<p><font color="#000000">Executes the SQL and returns all elements of the 
first column as a 
-1-dimensional array. The recordset is discarded for you automatically. If an 
error occurs, 
-  false is returned.</font></p>
-<p><font color="#000000"><b>CacheGetOne<a 
name="cachegetone"></a>([$secs2cache,] 
-  $sql,$inputarr=false), CacheGetRow<a name="cachegetrow"></a>([$secs2cache,] 
$sql,$inputarr=false), CacheGetAll<a name="cachegetall"></a>([$secs2cache,] 
-  $sql,$inputarr=false), CacheGetCol<a name="cachegetcol"></a>([$secs2cache,] 
-  $sql,$inputarr=false,$trim=false)</b></font></p>
-<font color="#000000"> 
-<p>Similar to above Get* functions, except that the recordset is serialized 
and 
-  cached in the $ADODB_CACHE_DIR directory for $secs2cache seconds. Good for 
speeding 
-  up queries on rarely changing data. Note that the $secs2cache parameter is 
optional. 
-  If omitted, we use the value in $connection-&gt;cacheSecs (default is 3600 
seconds, 
-  or 1 hour).</p>
-<p><b>Prepare<a name="prepare"></a>($sql )</b></p>
-</font> 
-<p><font color="#000000">Prepares (compiles) an SQL query for repeated 
execution. Bind parameters
-are denoted by ?, except for the oci8 driver, which uses the traditional 
Oracle :varname
-convention. 
-  </font></p>
-<p><font color="#000000">Returns an array containing the original sql 
statement 
-  in the first array element; the remaining elements of the array are driver 
dependent. 
-  If there is an error, or we are emulating Prepare( ), we return the original 
-  $sql string. This is because all error-handling has been centralized in 
Execute( 
-  ).</font></p>
-<p><font color="#000000">Prepare( ) cannot be used with functions that use SQL 
-  query rewriting techniques, e.g. PageExecute( ) and SelectLimit( 
).</font></p>
-<p>Example:</p>
-<pre><font color="#000000">$stmt = $DB-&gt;Prepare('insert into table 
(col1,col2) values (?,?)');<br>for ($i=0; $i &lt; $max; $i++)<br></font> 
$DB-&gt;<font color="#000000">Execute($stmt,array((string) rand(), 
$i));<br></font></pre>
-<font color="#000000"> 
-</font><p><font color="#000000">Also see InParameter(), OutParameter() and 
PrepareSP() below. Only supported internally by interbase, 
-  oci8 and selected ODBC-based drivers, otherwise it is emulated. There is no 
-  performance advantage to using Prepare() with emulation. 
-</font></p><p><font color="#000000"> Important: Due to limitations or bugs in 
PHP, if you are getting errors when 
-  you using prepared queries, try setting $ADODB_COUNTRECS = false before 
preparing. 
-  This behaviour has been observed with ODBC. 
-</font></p><p><font color="#000000"><b>IfNull<a name="ifnull"></a>($field, 
$nullReplacementValue)</b></font></p>
-<p><font color="#000000">Portable IFNULL function (NVL in Oracle). Returns a 
string that represents 
-  the function that checks whether a $field is null for the given database, 
and 
-  if null, change the value returned to $nullReplacementValue. Eg.</font></p>
-<pre><font color="#000000">$sql = <font color="#993300">'SELECT 
'</font>.$db-&gt;IfNull('name', <font color="#993300">"'- unknown 
-'"</font>).<font color="#993300"> ' FROM table'</font>;</font></pre>
-
-<p><font color="#000000"><b>length<a name="length"></a></b></font></p>
-<p><font color="#000000">This is not a function, but a property. Some 
databases have "length" and others "len"
-as the function to measure the length of a string. To use this property:
-</font></p><pre><font color="#000000">  $sql = <font color="#993300">"SELECT 
"</font>.$db-&gt;length.<font color="#993300">"(field) from table"</font>;<br>  
$rs = $db-&gt;Execute($sql);<br></font></pre>
-
-<p><font color="#000000"><b>random<a name="random"></a></b></font></p>
-<p><font color="#000000">This is not a function, but a property. This is a 
string that holds the sql to
-generate a random number between 0.0 and 1.0 inclusive.
-
-</font></p><p><font color="#000000"><b>substr<a 
name="substr"></a></b></font></p>
-<p><font color="#000000">This is not a function, but a property. Some 
databases have "substr" and others "substring"
-as the function to retrieve a sub-string. To use this property:
-</font></p><pre><font color="#000000">  $sql = <font color="#993300">"SELECT 
"</font>.$db-&gt;substr.<font color="#993300">"(field, $offset, $length) from 
table"</font>;<br>  $rs = $db-&gt;Execute($sql);<br></font></pre>
-<p><font color="#000000">For all databases, the 1st parameter of <i>substr</i> 
is the field, the 2nd is the
-offset (1-based) to the beginning of the sub-string, and the 3rd is the length 
of the sub-string.
-
-
-</font></p><p><font color="#000000"><b>Param<a 
name="param"></a>($name)</b></font></p>
-<p><font color="#000000">Generates a bind placeholder portably. For most 
databases, the bind placeholder 
-  is "?". However some databases use named bind parameters such as Oracle, eg 
-  ":somevar". This allows us to portably define an SQL statement with bind 
parameters: 
-</font></p><pre><font color="#000000"><font color="#000000">$sql = <font 
color="#993300">'insert into table (col1,col2) values 
('</font>.$DB-&gt;Param('a').<font 
color="#993300">','</font>.$DB-&gt;Param('b').<font 
color="#993300">')'</font>;<br><font color="#006600"># generates 'insert into 
table (col1,col2) values (?,?)'<br># or        'insert into table (col1,col2) 
values (:a,:b)</font>'<br>$stmt = $DB-&gt;Prepare($sql);<br>$stmt = 
$DB-&gt;Execute($stmt,array('one','two'));<br></font></font></pre>
-<font color="#000000"><font color="#000000"> 
-</font></font><p></p>
-<p><font color="#000000"><font color="#000000"><b>PrepareSP</b><b><a 
name="preparesp"></a></b><b>($sql, $cursor=false )</b></font></font></p>
-<p><font color="#000000"><font color="#000000">When calling stored procedures 
in mssql and oci8 (oracle), and you might want 
-  to directly bind to parameters that return values, or for special LOB 
handling. 
-  PrepareSP() allows you to do so. 
-</font></font></p><p><font color="#000000"><font color="#000000">Returns the 
same array or $sql string as Prepare( ) above. If you do not need 
-  to bind to return values, you should use Prepare( ) 
instead.</font></font></p>
-<p><font color="#000000"><font color="#000000">The 2nd parameter, $cursor is 
not used except with oci8. Setting it to true will
-force OCINewCursor to be called; this is to support output REF CURSORs.
-</font></font></p><p><font color="#000000"><font color="#000000">For examples 
of usage of PrepareSP( ), see InParameter( ) below. 
-</font></font></p><p><font color="#000000"><font color="#000000">Note: in the 
mssql driver, preparing stored procedures requires a special function 
-  call, mssql_init( ), which is called by this function. PrepareSP( ) is 
available 
-  in all other drivers, and is emulated by calling Prepare( ). 
</font></font></p>
-<p><font color="#000000"><font color="#000000"><b> InParameter<a 
name="inparameter"></a>($stmt, $var, $name,
-  $maxLen = 4000, $type = false )</b></font></font></p>
-<font color="#000000"><font color="#000000">Binds a PHP variable as input to a 
stored procedure variable. The parameter <i>$stmt</i>
- is the value returned by PrepareSP(), <i>$var</i> is the PHP variable you 
want to bind, $name
- is the name of the stored procedure variable. Optional is <i>$maxLen</i>, the 
maximum length of the
- data to bind, and $type which is database dependant. 
- Consult <a href="http://php.net/mssql_bind";>mssql_bind</a> and <a 
href="http://php.net/ocibindbyname";>ocibindbyname</a> docs
-  at php.net for more info on legal values for $type. 
- </font></font><p>
-<font color="#000000"><font color="#000000">InParameter() is a wrapper 
function that calls Parameter() with $isOutput=false. 
-The advantage of this function is that it is self-documenting, because
-the $isOutput parameter is no longer needed.  Only for mssql 
-  and oci8 currently.
-  </font></font></p><p><font color="#000000"><font color="#000000">Here is an 
example using oci8:
-  </font></font></p><pre><font color="#000000"><font color="#000000"><font 
color="green"># For oracle, Prepare and PrepareSP are identical</font>
-$stmt = $db-&gt;PrepareSP(
-       <font color="#993300">"declare RETVAL integer; <br>     begin<br>       
:RETVAL := </font><font color="#993300">SP_RUNSOMETHING</font><font 
color="#993300">(:myid,:group);<br> 
end;"</font>);<br>$db-&gt;InParameter($stmt,$id,'myid');<br>$db-&gt;InParameter($stmt,$group,'group',64);<br>$db-&gt;OutParameter($stmt,$ret,'RETVAL');<br>$db-&gt;Execute($stmt);<br></font></font></pre>
-<p><font color="#000000"><font color="#000000"> The same example using 
mssql:</font></font></p>
-<font color="#000000"> 
-</font><pre><font color="#000000"><font color="#000000"><font color="green"># 
@RETVAL = SP_RUNSOMETHING @myid,@group</font>
-$stmt = $db-&gt;PrepareSP(<font color="#993333">'<font 
color="#993300">SP_RUNSOMETHING</font>'</font>); <br><font color="green"># note 
that the parameter name does not have @ in front!</font>
-$db-&gt;InParameter($stmt,$id,'myid');
-$db-&gt;InParameter($stmt,$group,'group',64);
-<font color="green"># return value in mssql - RETVAL is hard-coded name</font> 
<br>$db-&gt;OutParameter($stmt,$ret,'RETVAL');<br>$db-&gt;Execute($stmt); 
</font></font></pre>
-
-<p><font color="#000000">Note that the only difference between the oci8 and 
mssql implementations is $sql.</font></p>
-<font color="#000000">  </font><p>
-<font color="#000000"> If $type parameter is set to false, in mssql, $type 
will be dynamicly determined 
-based on the type of the PHP variable passed <font face="Courier New, Courier, 
mono">(string 
-=&gt; SQLCHAR, boolean =&gt;SQLINT1, integer =&gt;SQLINT4 or 
float/double=&gt;SQLFLT8)</font>.
-</font></p><p><font color="#000000"> 
-In oci8, $type can be set to OCI_B_FILE (Binary-File), OCI_B_CFILE 
(Character-File), 
-OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and OCI_B_ROWID (ROWID). 
To 
-pass in a null, use<font face="Courier New, Courier, mono"> 
$db-&gt;Parameter($stmt, 
-$null=null, 'param')</font>. 
-  </font></p><p><font color="#000000"><b> OutParameter<a 
name="outparameter"></a>($stmt, $var, $name, 
-  $maxLen = 4000, $type = false )</b></font></p>
-<font color="#000000">  Binds a PHP variable as output from a stored procedure 
variable. The parameter <i>$stmt</i>
- is the value returned by PrepareSP(), <i>$var</i> is the PHP variable you 
want to bind, <i>$name</i>
- is the name of the stored procedure variable. Optional is <i>$maxLen</i>, the 
maximum length of the
- data to bind, and <i>$type</i> which is database dependant. 
-  </font><p>
-<font color="#000000">  OutParameter() is a wrapper function that calls 
Parameter() with $isOutput=true. 
-  The advantage of this function is that it is self-documenting, because
-the $isOutput parameter is no longer needed.  Only for mssql 
-  and oci8 currently.
-</font></p><p>
-<font color="#000000">For an example, see <a 
href="#inparameter">InParameter</a>.
-
-</font></p><p><font color="#000000"><b> Parameter<a 
name="parameter"></a>($stmt, $var, $name, $isOutput=false, 
-  $maxLen = 4000, $type = false )</b></font></p>
-<p><font color="#000000">Note: This function is deprecated, because of the new 
InParameter() and OutParameter() functions.
-These are superior because they are self-documenting, unlike Parameter().
-</font></p><p><font color="#000000">Adds a bind parameter suitable for return 
values or special data handling (eg. 
-  LOBs) after a statement has been prepared using PrepareSP(). Only for mssql 
-  and oci8 currently. The parameters are:<br>
-  <br>
-  $<i><b>stmt</b></i> Statement returned by Prepare() or PrepareSP().<br>
-  $<i><b>var</b></i> PHP variable to bind to. Make sure you pre-initialize 
it!<br>
-  $<i><b>name</b></i> Name of stored procedure variable name to bind to.<br>
-  [$<i><b>isOutput</b></i>] Indicates direction of parameter 0/false=IN 1=OUT 
-  2= IN/OUT. This is ignored in oci8 as this driver auto-detects the 
direction.<br>
-  [$<b>maxLen</b>] Maximum length of the parameter variable.<br>
-  [$<b>type</b>] Consult <a href="http://php.net/mssql_bind";>mssql_bind</a> 
and 
-  <a href="http://php.net/ocibindbyname";>ocibindbyname</a> docs at php.net for 
-  more info on legal values for type.</font></p>
-<p><font color="#000000">Lastly, in oci8, bind parameters can be reused 
without calling PrepareSP( ) 
-  or Parameters again. This is not possible with mssql. An oci8 
example:</font></p>
-<pre><font color="#000000">$id = 0; $i = 0;<br>$stmt = $db-&gt;PrepareSP( 
<font color="#993300">"update table set val=:i where 
id=:id"</font>);<br>$db-&gt;Parameter($stmt,$id,'id');<br>$db-&gt;Parameter($stmt,$i,
 'i');<br>for ($cnt=0; $cnt &lt; 1000; $cnt++) {<br>       $id = $cnt; <br>     
   $i = $cnt * $cnt; <font color="green"># works with oci8!</font>
-       $db-&gt;Execute($stmt); <br>}</font></pre>
-<p><font color="#000000"><b>Bind<a name="bind"></a>($stmt, $var, $size=4001, 
$type=false, $name=false)</b></font></p>
- 
-<p><font color="#000000">This is a low-level function supported only by the 
oci8 
-  driver. <b>Avoid using</b> unless you only want to support Oracle. The 
Parameter( 
-  ) function is the recommended way to go with bind variables.</font></p>
-<p><font color="#000000">Bind( ) allows you to use bind variables in your sql 
-  statement. This binds a PHP variable to a name defined in an Oracle sql 
statement 
-  that was previously prepared using Prepare(). Oracle named variables begin 
with 
-  a colon, and ADOdb requires the named variables be called :0, :1, :2, :3, 
etc. 
-  The first invocation of Bind() will match :0, the second invocation will 
match 
-  :1, etc. Binding can provide 100% speedups for insert, select and update 
statements. 
-  </font></p>
-<p>The other variables, $size sets the buffer size for data storage, $type is 
-  the optional descriptor type OCI_B_FILE (Binary-File), OCI_B_CFILE 
(Character-File), 
-  OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and OCI_B_ROWID (ROWID). 
-  Lastly, instead of using the default :0, :1, etc names, you can define your 
-  own bind-name using $name. 
-</p><p><font color="#000000">The following example shows 3 bind variables 
being used: 
-  p1, p2 and p3. These variables are bound to :0, :1 and :2.</font></p>
-<pre>$stmt = $DB-&gt;Prepare("insert into table (col0, col1, col2) values (:0, 
:1, :2)");<br>$DB-&gt;Bind($stmt, $p1);<br>$DB-&gt;Bind($stmt, 
$p2);<br>$DB-&gt;Bind($stmt, $p3);<br>for ($i = 0; $i &lt; $max; $i++) { <br>   
$p1 = ?; $p2 = ?; $p3 = ?;<br>   $DB-&gt;Execute($stmt);<br>}</pre>
-<p>You can also use named variables:</p>
-<pre>$stmt = $DB-&gt;Prepare("insert into table (col0, col1, col2) values 
(:name0, :name1, :name2)");<br>$DB-&gt;Bind($stmt, $p1, 
"name0");<br>$DB-&gt;Bind($stmt, $p2, "name1");<br>$DB-&gt;Bind($stmt, $p3, 
"name2");<br>for ($i = 0; $i &lt; $max; $i++) { <br>   $p1 = ?; $p2 = ?; $p3 = 
?;<br>   $DB-&gt;Execute($stmt);<br>}</pre>
-<p><b>LogSQL($enable=true)<a name="logsql"></a></b></p>
-Call this method to install a SQL logging and timing function (using 
fnExecute). 
-Then all SQL statements are logged into an adodb_logsql table in a database. 
If 
-the adodb_logsql table does not exist, ADOdb will create the table if you have 
-the appropriate permissions. Returns the previous logging value (true for 
enabled, 
-false for disabled). Here are samples of the DDL for selected databases: 
-<p> 
-</p><pre>              <b>mysql:</b>
-               CREATE TABLE adodb_logsql (
-                 created datetime NOT NULL,
-                 sql0 varchar(250) NOT NULL,
-                 sql1 text NOT NULL,
-                 params text NOT NULL,
-                 tracer text NOT NULL,
-                 timer decimal(16,6) NOT NULL
-               )
-               
-               <b>postgres:</b>
-               CREATE TABLE adodb_logsql (
-                 created timestamp NOT NULL,
-                 sql0 varchar(250) NOT NULL,
-                 sql1 text NOT NULL,
-                 params text NOT NULL,
-                 tracer text NOT NULL,
-                 timer decimal(16,6) NOT NULL
-               )
-               
-               <b>mssql:</b>
-               CREATE TABLE adodb_logsql (
-                 created datetime NOT NULL,
-                 sql0 varchar(250) NOT NULL,
-                 sql1 varchar(4000) NOT NULL,
-                 params varchar(3000) NOT NULL,
-                 tracer varchar(500) NOT NULL,
-                 timer decimal(16,6) NOT NULL
-               )
-               
-               <b>oci8:</b>
-               CREATE TABLE adodb_logsql (
-                 created date NOT NULL,
-                 sql0 varchar(250) NOT NULL,
-                 sql1 varchar(4000) NOT NULL,
-                 params varchar(4000),
-                 tracer varchar(4000),
-                 timer decimal(16,6) NOT NULL
-               )
-</pre>
-Usage: 
-<pre>  $conn-&gt;LogSQL(); // turn on logging<br>        :<br> 
$conn-&gt;Execute(...);<br>       :<br> $conn-&gt;LogSQL(false); // turn off 
logging<br>        <br>    # output summary of SQL logging results<br>     
$perf = NewPerfMonitor($conn);<br>      echo $perf-&gt;SuspiciousSQL();<br>     
echo $perf-&gt;ExpensiveSQL();<br></pre>
-<p>One limitation of logging is that rollback also prevents SQL from being 
logged.
-</p><p>
-If you prefer to use another name for the table used to store the SQL, you can 
override it by calling 
-adodb_perf::table($tablename), where $tablename is the new table name (you 
will still need to manually
-create the table yourself). An example:
-</p><pre>      include('adodb.inc.php');<br>   
include('adodb-perf.inc.php');<br>      
adodb_perf::table('my_logsql_table');<br></pre>
-Also see <a href="docs-perf.htm">Performance Monitor</a>. 
-<p><font color="#000000"><b>fnExecute and fnCacheExecute properties<a 
name="fnexecute" id="fnexecute"></a></b></font></p>
-<p>These two properties allow you to define bottleneck functions for all sql 
statements 
-  processed by ADOdb. This allows you to perform statistical analysis and 
query-rewriting 
-  of your sql. 
-</p><p><b>Examples of fnExecute</b></p>
-<p>Here is an example of using fnExecute, to count all cached queries and 
non-cached 
-  queries, you can do this:</p>
-<pre><font color="#006600"># $db is the connection object</font>
-function CountExecs($db, $sql, $inputarray)
-{
-global $EXECS;
-
-if (!is_array(inputarray)) $EXECS++;
-<font color="#006600"># handle 2-dimensional input arrays</font>
-else if (is_array(reset($inputarray))) $EXECS += sizeof($inputarray);
-else $EXECS++;
-}
-
-<font color="#006600"># $db is the connection object</font>
-function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
-{<br>global $CACHED; $CACHED++;<br>}<br><br>$db = 
NewADOConnection('mysql');<br>$db-&gt;Connect(...);<br>$db-&gt;<strong>fnExecute</strong>
 = 'CountExecs';<br>$db-&gt;<strong>fnCacheExecute</strong> = 
'CountCachedExecs';<br> :<br> :<br><font color="#006600"># After many sql 
statements:</font>`<br>printf("&lt;p&gt;Total queries=%d; total 
cached=%d&lt;/p&gt;",$EXECS+$CACHED, $CACHED);<br></pre>
-<p>The fnExecute function is called before the sql is parsed and executed, so 
-  you can perform a query rewrite. If you are passing in a prepared statement, 
-  then $sql is an array (see <a href="#prepare">Prepare</a>). The 
fnCacheExecute 
-  function is only called if the recordset returned was cached.<font 
color="#000000"> 
-  The function parameters match the Execute and CacheExecute functions 
respectively, 
-  except that $this (the connection object) is passed as the first 
parameter.</font></p>
-<p>Since ADOdb 3.91, the behaviour of fnExecute varies depending on whether 
the 
-  defined function returns a value. If it does not return a value, then the 
$sql 
-  is executed as before. This is useful for query rewriting or counting sql 
queries. 
-</p><p> On the other hand, you might want to replace the Execute function with 
one 
-  of your own design. If this is the case, then have your function return a 
value. 
-  If a value is returned, that value is returned immediately, without any 
further 
-  processing. This is used internally by ADOdb to implement LogSQL() 
functionality. 
-</p><p> <font color="#000000"> 
-</font></p><hr>
-<h3><font color="#000000">ADOConnection Utility Functions</font></h3>
-<p><font color="#000000"><b>BlankRecordSet<a 
name="blankrecordset"></a>([$queryid])</b></font></p>
-<p><font color="#000000">No longer available - removed since 1.99.</font></p>
-<p><font color="#000000"><b>Concat<a 
name="concat"></a>($s1,$s2,....)</b></font></p>
-<p><font color="#000000">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.</font></p>
-<p><font color="#000000">Returns the concatenated string.</font></p>
-<p><font color="#000000"><b>DBDate<a name="dbdate"></a>($date)</b></font></p>
-<p><font color="#000000">Format the $<b>date</b> in the format the database 
accepts. This is used in 
-  INSERT/UPDATE statements; for SELECT statements, use <a 
href="#sqldate">SQLDate</a>. 
-  The $<b>date</b> parameter can be a Unix integer timestamp or an ISO format 
-  Y-m-d. Uses the fmtDate field, which holds the format to use. If null or 
false 
-  or '' is passed in, it will be converted to an SQL null.</font></p>
-<p><font color="#000000">Returns the date as a quoted string.</font></p>
-<p><font color="#000000"><b>DBTimeStamp<a 
name="dbtimestamp"></a>($ts)</b></font></p>
-<p><font color="#000000">Format the timestamp $<b>ts</b> in the format the 
database accepts; this can 
-  be a Unix integer timestamp or an ISO format Y-m-d H:i:s. Uses the 
fmtTimeStamp 
-  field, which holds the format to use. If null or false or '' is passed in, 
it 
-  will be converted to an SQL null.</font></p>
-<p><font color="#000000">Returns the timestamp as a quoted string.</font></p>
-<p><font color="#000000"><b>qstr<a 
name="qstr"></a>($s,[$magic_quotes_enabled</b>=false]<b>)</b></font></p>
-<p><font color="#000000">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>.</font></p>
-<p><font color="#000000">Eg.<font face="Courier New, Courier, mono"> $s = 
$db-&gt;qstr(HTTP_GET_VARS['name'],get_magic_quotes_gpc());</font></font></p>
-<p><font color="#000000">Returns the quoted string.</font></p>
-<p><font color="#000000"><b>Quote<a name="quote"></a>($s)</b></font></p>
-<p><font color="#000000">Quotes the string $s, escaping the database specific 
quote character as appropriate. 
-  Formerly checked magic quotes setting, but this was disabled since 3.31 for 
-  compatibility with PEAR DB. 
-</font></p><p><font color="#000000"><b>Affected_Rows<a 
name="affected_rows"></a>( )</b></font></p>
-<p><font color="#000000">Returns the number of rows affected by a update or 
delete statement. Returns 
-  false if function not supported.</font></p>
-<p><font color="#000000">Not supported by interbase/firebird currently. 
</font></p>
-<p><font color="#000000"><b>Insert_ID<a name="inserted_id"></a>( 
)</b></font></p>
-<p><font color="#000000">Returns the last autonumbering ID inserted. Returns 
false if function not supported. 
-</font></p>
-<p><font color="#000000">Only supported by databases that support 
auto-increment or object id's, such 
-  as PostgreSQL, MySQL and MS SQL Server currently. PostgreSQL returns the 
OID, which 
-  can change on a database reload.</font></p>
-<p><font color="#000000"><b>RowLock<a 
name="rowlock"></a>($table,$where)</b></font></p>
-<p><font color="#000000">Lock a table row for the duration of a transaction. 
For example to lock record $id in table1:
-</font></p><pre><font color="#000000"> $DB-&gt;StartTrans();<br>       
$DB-&gt;RowLock("table1","rowid=$id");<br>      $DB-&gt;Execute($sql1);<br>     
$DB-&gt;Execute($sql2);<br>     $DB-&gt;CompleteTrans();<br></font></pre>
-<p><font color="#000000">Supported in db2, interbase, informix, mssql, oci8, 
postgres, sybase.
-</font></p><p><font color="#000000"><b>MetaDatabases<a 
name="metadatabases"></a>()</b></font></p>
-<p><font color="#000000">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.</font></p>
-<p><font color="#000000"><b>MetaTables<a name="metatables"></a>($ttype = 
false, $showSchema = false, 
-  $mask=false)</b></font></p>
-<p><font color="#000000">Returns an array of tables and views for the current 
database as an array. 
-  The array should exclude system catalog tables if possible. To only show 
tables, 
-  use $db-&gt;MetaTables('TABLES'). To show only views, use 
$db-&gt;MetaTables('VIEWS'). 
-  The $showSchema parameter currently works only for DB2, and when set to 
true, 
-  will add the schema name to the table, eg. "SCHEMA.TABLE". </font></p>
-<p><font color="#000000">You can define a mask for matching. For example, 
setting $mask = 'TMP%' will 
-  match all tables that begin with 'TMP'. Currently only mssql, oci8, 
odbc_mssql 
-  and postgres* support $mask. 
-</font></p><p><font color="#000000"><b>MetaColumns<a 
name="metacolumns"></a>($table,$toupper=true)</b></font></p>
-<p><font color="#000000">Returns an array of ADOFieldObject's, one field 
object for every column of 
-  $table. A field object is a class instance with (name, type, max_length) 
defined.
-  Currently Sybase does not recognise date types, and ADO cannot identify 
-  the correct data type (so we default to varchar).   
- </font></p><p><font color="#000000"> The $toupper parameter determines 
whether we uppercase the table name 
- (required for some databases).
- </font></p><p><font color="#000000">For schema support, pass in the $table 
parameter, "$schema.$tablename". This is only
- supported for selected databases.
-</font></p><p><font color="#000000"><b>MetaColumnNames<a 
name="metacolumnames"></a>($table,$numericIndex=false)</b></font></p>
-<p><font color="#000000">Returns an array of column names for $table. Since 
ADOdb 4.22, this is an associative array, with the
-keys in uppercase. Set $numericIndex=true if you want the old behaviour of 
numeric indexes (since 4.23).
-</font></p><p>
-<font color="#000000">e.g. array('FIELD1' =&gt; 'Field1', 
'FIELD2'=&gt;'Field2')
-</font></p><p>
-</p><p><font color="#000000"><font color="#000000"><b>MetaPrimaryKeys<a 
name="metaprimarykeys"></a>($table, 
-  $owner=false)</b></font></font> 
-</p><p><font color="#000000">Returns an array containing column names that are 
the 
-  primary keys of $table. Supported by mysql, odbc (including db2, odbc_mssql, 
-  etc), mssql, postgres, interbase/firebird, oci8 currently. </font><font 
color="#000000"> 
-</font></p><p><font color="#000000">Views (and some tables) have primary keys, 
but sometimes this information is not available from the
-database. You can define a function  ADODB_View_PrimaryKeys($databaseType, 
$database, $view, $owner) that
-should return an array containing the fields that make up the primary key. If 
that function exists,
-it will be called when MetaPrimaryKeys() cannot find a primary key for a table 
or view.
-</font></p><pre><font color="#000000">// In this example: dbtype = 'oci8', $db 
= 'mydb', $view = 'dataView', $owner = false <br>function 
ADODB_View_PrimaryKeys($dbtype,$db,$view,$owner)<br>{<br>     
switch(strtoupper($view)) {<br> case 'DATAVIEW': return array('DATAID');<br>    
default: return false;<br>      }<br>}<br><br>$db = 
NewADOConnection('oci8');<br>$db-&gt;Connect('localhost','root','','mydb'); 
<br>$db-&gt;MetaPrimaryKeys('dataView');<br></font></pre>
-<p><font color="#000000"><font color="#000000"><b>ServerInfo<a 
name="serverinfo" id="serverinfo"></a>($table)</b></font></font> 
-</p><p><font color="#000000">Returns an array of containing two elements 
'description' 
-  and 'version'. The 'description' element contains the string description of 
-  the database. The 'version' naturally holds the version number (which is 
also 
-  a string).</font><font color="#000000"> 
-</font></p><p><font color="#000000"><b>MetaForeignKeys<a 
name="metaforeignkeys"></a>($table, $owner=false, $upper=false)</b> 
-</font></p><p><font color="#000000">Returns an associate array of foreign 
keys, or false if not supported. For 
-  example, if table employee has a foreign key where employee.deptkey points 
to 
-  dept_table.deptid, and employee.posn=posn_table.postionid and 
employee.poscategory=posn_table.category, 
-  then $conn-&gt;MetaForeignKeys('employee') will return 
-</font></p><pre><font color="#000000"> array(<br>              'dept_table' 
=&gt; array('deptkey=deptid'),<br>         'posn_table' =&gt; 
array('posn=positionid','poscategory=category')<br>  )<br></font></pre>
-<p><font color="#000000">The optional schema or owner can be defined in 
$owner. If $upper is true, then 
-  the table names (array keys) are upper-cased. 
-</font></p><hr>
-<h2><font color="#000000">ADORecordSet<a name="adorecordset"></a></font></h2>
-<p><font color="#000000">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.</font></p>
-<h3><font color="#000000">ADORecordSet Fields</font></h3>
-<p><font color="#000000"><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.</font></p>
-<p><font color="#000000"><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>.</font></p>
-<p><font color="#000000"><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.</font></p>
-<p><font color="#000000"><b>sql</b>: Holds the sql statement used to generate 
this record set.</font></p>
-<p><font color="#000000"><b>canSeek</b>: Set to true if Move( ) function 
works.</font></p>
-<p><font color="#000000"><b>EOF</b>: True if we have scrolled the cursor past 
the last record.</font></p>
-<h3><font color="#000000">ADORecordSet Functions</font></h3>
-<p><font color="#000000"><b>ADORecordSet( )</b></font></p>
-<p><font color="#000000">Constructer. Normally you never call this function 
yourself.</font></p>
-<p><font color="#000000"><b>GetAssoc<a 
name="getassoc"></a>([$force_array])</b></font></p>
-<p><font color="#000000">Generates an associative array from the recordset. 
Note that is this function 
-  is also <a href="#getassoc1">available</a> in the connection object. More 
details 
-  can be found there.</font></p>
-<font color="#000000"><font color="#000000"> </font></font><font 
color="#000000"><font color="#000000">
-</font></font><p><font color="#000000"><font color="#000000"><b>GetArray<a 
name="getarray"></a>([$number_of_rows])</b></font></font></p>
-<p><font color="#000000"><font color="#000000">Generate a 2-dimensional array 
of records from the current cursor position, 
-  indexed from 0 to $number_of_rows - 1. If $number_of_rows is undefined, till 
-  EOF.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>GetRows<a 
name="getrows"></a>([$number_of_rows])</b></font></font></p>
-<font color="#000000"><font color="#000000">Generate a 2-dimensional array of 
records from the current cursor position. Synonym 
-for GetArray() for compatibility with Microsoft ADO. 
-</font></font><p><font color="#000000"><font color="#000000"> <b>GetMenu<a 
name="getmenu"></a>($name, [$default_str=''], [$blank1stItem=true], 
-  [$multiple_select=false], [$size=0], [$moreAttr=''])</b></font></font></p>
-<p><font color="#000000"><font color="#000000">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>. 
-</font></font></p><p><font color="#000000"><font color="#000000"> 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. You can also set the first option strings by setting $blank1stItem = 
-  "$value:$text".</font></font></p>
-<p><font color="#000000"><font color="#000000">$<i>Default_str</i> can be 
array for a multiple select listbox.</font></font></p>
-<p><font color="#000000"><font color="#000000">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. </font></font></p>
-<p><font color="#000000"><font color="#000000">Menu Example 1: 
<code>GetMenu('menu1','A',true)</code> will generate a menu: 
-  <select name="menu1"><option> 
-    </option><option value="1" selected="selected">A 
-    </option><option value="2">B 
-    </option><option value="3">C 
-  </option></select>
-  for the data (A,1), (B,2), (C,3). Also see <a href="#ex5">example 
5</a>.</font></font></p>
-<p><font color="#000000"><font color="#000000">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="multiple" size="3"><option value="1" 
selected="selected">A 
-    </option><option value="2" selected="selected">B 
-    </option><option value="3">C 
-  </option></select>
-</font></font></p><p><font color="#000000"><font color="#000000"> 
<b>GetMenu2<a name="getmenu2"></a>($name, [$default_str=''], 
[$blank1stItem=true], 
-  [$multiple_select=false], [$size=0], [$moreAttr=''])</b></font></font></p>
-<p><font color="#000000"><font color="#000000">This is nearly identical to 
GetMenu, except that the $<i>default_str</i> is 
-  matched to fields[1] (the option values).</font></font></p>
-<p><font color="#000000"><font color="#000000">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. 
-</font></font></p><p><font color="#000000"><font color="#000000"><b>UserDate<a 
name="userdate"></a>($str, [$fmt])</b></font></font></p>
-<p><font color="#000000"><font color="#000000">Converts the date string 
$<i>str</i> to another format. The date format is Y-m-d,
-or Unix timestamp format. The default $<i>fmt</i> is Y-m-d.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>UserTimeStamp<a 
name="usertimestamp"></a>($str, [$fmt])</b></font></font></p>
-<p><font color="#000000"><font color="#000000">Converts the timestamp string 
$<b>str</b> to another format. The timestamp 
-  format is Y-m-d H:i:s, as in '2002-02-28 23:00:12', or Unix timestamp format.
-   UserTimeStamp calls UnixTimeStamp to parse $<i>str</i>, and $<i>fmt</i> 
defaults to Y-m-d H:i:s if not defined. 
-</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>UnixDate<a 
name="unixdate"></a>($str)</b></font></font></p>
-<p><font color="#000000"><font color="#000000">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).</font></font></p>
-<p><font color="#000000"><font color="#000000">This function is available in 
both ADORecordSet and ADOConnection since 1.91.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>UnixTimeStamp<a 
name="unixtimestamp"></a>($str)</b></font></font></p>
-<p><font color="#000000"><font color="#000000">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" (1970-12-24, 00:00:00) or "Y-m-d H:i:s" (1970-12-24 00:00:00) or
-"YmdHis" (19701225000000) format, except for Sybase and Microsoft SQL
-Server, where "M d Y h:i:sA" (Dec 25 1970 00:00:00AM) is also accepted
-(the 3 letter month strings are controlled by a global array, which
-might need localisation).</font></font></p>
-<font color="#000000"> 
-</font><p><font color="#000000"><font color="#000000">This function is 
available in both ADORecordSet and ADOConnection 
-  since 1.91. </font></font></p>
-<p><font color="#000000"><font color="#000000"><b>OffsetDate<a 
name="offsetdate"></a>($dayFraction, 
-  $basedate=false)</b></font></font></p>
-<p><font color="#000000"><font color="#000000"><font color="#000000">Returns a 
string </font>with the 
-  native SQL functions to calculate future and past dates based on $basedate 
in 
-  a portable fashion. If $basedate is not defined, then the current date (at 
12 
-  midnight) is used. Returns the SQL string that performs the calculation when 
-  passed to Execute(). </font></font></p>
-<p><font color="#000000"><font color="#000000">For example, in Oracle, to find 
the date and time that 
-  is 2.5 days from today, you can use:</font></font></p>
-<pre><font color="#000000"><font color="#000000"># get date one week from 
now<br>$fld = $conn-&gt;OffsetDate(7); // returns 
"(trunc(sysdate)+7")</font></font></pre>
-<pre><font color="#000000"><font color="#000000"># get date and time that is 
60 hours from current date and time<br>$fld = $conn-&gt;OffsetDate(2.5, 
$conn-&gt;sysTimeStamp);  // returns "(sysdate+2.5)"</font>
-
-$conn-&gt;Execute("UPDATE TABLE SET dodate=$fld WHERE ID=$id");</font></pre>
-<p><font color="#000000"> This function is available for mysql, mssql, oracle, 
oci8 and postgresql drivers 
-  since 2.13. It might work with other drivers<font color="#000000"> provided 
-  they allow performing numeric day arithmetic on dates.</font></font></p>
-<font color="#000000"><font color="#000000"> 
-</font></font><p><font color="#000000"><font color="#000000"><font 
color="#000000"><b>SQLDate<a name="sqldate"></a>($dateFormat, 
$basedate=false)</b></font></font></font></p>
-<font color="#000000"><font color="#000000">Returns a string which contains 
the native SQL functions to format a date or date 
-column $basedate. This is used in SELECT statements. For INSERT/UPDATE 
statements, 
-use <a href="#dbdate">DBDate</a>. It uses a case-sensitive $dateFormat, which 
-supports: 
-</font></font><pre><font color="#000000"><font color="#000000"> Y: 4-digit 
Year<br> Q: Quarter (1-4)<br> M: Month (Jan-Dec)<br> m: Month (01-12)<br> d: 
Day (01-31)<br> H: Hour (00-23)<br> h: Hour (1-12)<br> i: Minute (00-59)<br> s: 
Second (00-60)<br> A: AM/PM indicator</font></font></pre>
-<p><font color="#000000"><font color="#000000">All other characters are 
treated as strings. You can also use \ to escape characters. 
-  Available on selected databases, including mysql, postgresql, mssql, oci8 
and 
-  DB2. 
-</font></font></p><p><font color="#000000"><font color="#000000">This is 
useful in writing portable sql statements that GROUP BY on dates. For 
-  example to display total cost of goods sold broken by quarter (dates are 
stored 
-  in a field called postdate): 
-</font></font></p><pre><font color="#000000"><font color="#000000"> $sqlfn = 
$db-&gt;SQLDate('Y-\QQ','postdate'); # get sql that formats postdate to output 
2002-Q1<br> $sql = "SELECT $sqlfn,SUM(cogs) FROM table GROUP BY $sqlfn ORDER BY 
1 desc";<br> </font></font></pre>
-<p><font color="#000000"><font color="#000000"><b>MoveNext<a 
name="movenext"></a>( )</b></font></font></p>
-<p><font color="#000000"><font color="#000000">Move the internal cursor to the 
next row. The <i>$this-&gt;fields</i> array is 
-  automatically updated. Returns false if unable to do so (normally because 
EOF 
-  has been reached), otherwise true. 
-</font></font></p><p><font color="#000000"><font color="#000000"> If EOF is 
reached, then the $this-&gt;fields array is set to false (this was 
-  only implemented consistently in ADOdb 3.30). For the pre-3.30 behaviour of 
-  $this-&gt;fields (at EOF), set the global variable $ADODB_COMPAT_FETCH = 
true.</font></font></p>
-<p><font color="#000000"><font color="#000000">Example:</font></font></p>
-<pre><font color="#000000"><font color="#000000">$rs = 
$db-&gt;Execute($sql);<br>if ($rs) <br> while (!$rs-&gt;EOF) {<br>              
ProcessArray($rs-&gt;fields);   <br>            $rs-&gt;MoveNext();<br> } 
</font></font></pre>
-<p><font color="#000000"><font color="#000000"><b>Move<a 
name="move"></a>($to)</b></font></font></p>
-<p><font color="#000000"><font color="#000000">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.</font></font></p>
-<p><font color="#000000"><font color="#000000">Note: This function uses 
<i>absolute positioning</i>, unlike Microsoft's ADO.</font></font></p>
-<p><font color="#000000"><font color="#000000">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( 
-  ). </font></font></p>
-<p><font color="#000000"><font color="#000000"><b>MoveFirst<a 
name="movefirst"></a>()</b></font></font></p>
-<p><font color="#000000"><font color="#000000">Internally calls Move(0). Note 
that some databases do not support this function.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>MoveLast<a 
name="movelast"></a>()</b></font></font></p>
-<p><font color="#000000"><font color="#000000">Internally calls 
Move(RecordCount()-1). Note that some databases do not support 
-  this function.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>GetRowAssoc</b><a 
name="getrowassoc"></a>($toUpper=true)</font></font></p>
-<p><font color="#000000"><font color="#000000">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(). </font></font></p>
-<p><font color="#000000"><font color="#000000">For example:<br>
-  Array ( [ID] =&gt; 1 [FIRSTNAME] =&gt; Caroline [LASTNAME] =&gt; Miranda 
[CREATED] =&gt; 
-  2001-07-05 ) </font></font></p>
-<p><font color="#000000"><font color="#000000">Note: do not use GetRowAssoc() 
with $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC. 
-  Because they have the same functionality, they will interfere with each 
other.</font></font></p>
-<font color="#000000"> 
-</font><p><font color="#000000"><font color="#000000"><b>AbsolutePage<a 
name="absolutepage"></a>($page=-1) 
-  </b></font></font></p>
-<p><font color="#000000">Returns the current page. Requires 
PageExecute()/CachePageExecute() to be called. 
-  See <a href="#ex8">Example 8</a>.</font></p>
-<font color="#000000"><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>Returns the value of the 
-  associated column $<b>colname</b> for the current row. The column name is 
case-insensitive.</p>
-<p>This is a convenience function. For higher performance, use <a 
href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a>. </p>
-<p><b>FetchRow</b><a name="fetchrow"></a>()</p>
-</font> 
-</font><p><font color="#000000"><font color="#000000">Returns array containing 
current row, or false if EOF. 
-  FetchRow( ) internally moves to the next record after returning the current 
-  row. </font></font></p>
-<p><font color="#000000"><font color="#000000">Warning: Do not mix using 
FetchRow() with MoveNext().</font></font></p>
-<p><font color="#000000"><font color="#000000">Usage:</font></font></p>
-<pre><font color="#000000"><font color="#000000">$rs = 
$db-&gt;Execute($sql);<br>if ($rs)<br>  while ($arr = $rs-&gt;FetchRow()) {<br> 
   &nbsp;&nbsp;# process $arr   <br></font><font color="#000000">       
}</font></font></pre>
-<p><font color="#000000"><font color="#000000"><b>FetchInto</b><a 
name="fetchinto"></a>(<b>&amp;$array</b>)</font></font></p>
-<p><font color="#000000"><font color="#000000"> Sets $array to the current 
row. Returns PEAR_Error object 
-  if EOF, 1 if ok (DB_OK constant). If PEAR is undefined, false is returned 
when 
-  EOF. </font><font color="#000000">FetchInto( ) internally moves to the next 
-  record after returning the current row. </font></font></p>
-<p><font color="#000000"><font color="#000000"> FetchRow() is easier to use. 
See above.</font></font></p>
-<font color="#000000"><font color="#000000"> 
-</font></font><p><font color="#000000"><font color="#000000"><b>FetchField<a 
name="fetchfield"></a>($column_number)</b></font></font></p>
-<p><font color="#000000"><font color="#000000">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></font></font></p>
-<p><font color="#000000"><font color="#000000"><b>FieldCount<a 
name="fieldcount"></a>( )</b></font></font></p>
-<p><font color="#000000"><font color="#000000">Returns the number of fields 
(columns) in the record set.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>RecordCount<a 
name="recordcount"></a>( )</b></font></font></p>
-<p><font color="#000000"><font color="#000000">Returns the number of rows in 
the record set. If the number of records returned 
-  cannot be determined from the database driver API, we will buffer all rows 
and 
-  return a count of the rows after all the records have been retrieved. This 
buffering 
-  can be disabled (for performance reasons) by setting the global variable 
$ADODB_COUNTRECS 
-  = false. When disabled, RecordCount( ) will return -1 for certain databases. 
-  See the supported databases list above for more details. </font></font></p>
-<p><font color="#000000"><font color="#000000"> RowCount is a synonym for 
RecordCount.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>PO_RecordCount<a 
name="po_recordcount"></a>($table, $where)</b></font></font></p>
-<p><font color="#000000"><font color="#000000">Returns the number of rows in 
the record set. If the database does not support 
-  this, it will perform a SELECT COUNT(*) on the table $table, with the given 
-  $where condition to return an estimate of the recordset 
size.</font></font></p>
-<p><font color="#000000"><font color="#000000">$numrows = 
$rs-&gt;PO_RecordCount("articles_table", "group=$group");</font></font></p>
-<font color="#000000"><font color="#000000"><b> NextRecordSet<a 
name="nextrecordset" id="nextrecordset"></a>()</b> 
-</font></font><p><font color="#000000"><font color="#000000">For databases 
that allow multiple recordsets to be returned in one query, this 
-  function allows you to switch to the next recordset. Currently only 
supported 
-  by mssql driver.</font></font></p>
-<pre><font color="#000000"><font color="#000000">$rs = 
$db-&gt;Execute('execute return_multiple_rs');<br>$arr1 = 
$rs-&gt;GetArray();<br>$rs-&gt;NextRecordSet();<br>$arr2 = 
$rs-&gt;GetArray();</font></font></pre>
-<p><font color="#000000"><font color="#000000"><b>FetchObject<a 
name="fetchobject"></a>($toupper=true)</b></font></font></p>
-<p><font color="#000000"><font color="#000000">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.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>FetchNextObject<a 
name="fetchnextobject"></a>($toupper=true)</b></font></font></p>
-<p><font color="#000000"><font color="#000000">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.</font></font></p>
-<pre><font color="#000000"><font color="#000000">$rs = $db-&gt;Execute('select 
firstname,lastname from table');<br>if ($rs) {<br>      while ($o = 
$rs-&gt;FetchNextObject()) {<br>            print "$o-&gt;FIRSTNAME, 
$o-&gt;LASTNAME&lt;BR&gt;";<br>        }<br>}<br></font></font></pre>
-<p><font color="#000000"><font color="#000000">There is some trade-off in 
speed in using FetchNextObject(). If performance 
-  is important, you should access rows with the <code>fields[]</code> array. 
<b>FetchObj<a name="fetchobj" id="fetchobj"></a>()</b> 
-</font></font></p><p><font color="#000000"><font color="#000000">Returns the 
current record as an object. Fields are not upper-cased, unlike 
-  FetchObject. </font> 
-</font></p><p><font color="#000000"><font color="#000000"><b>FetchNextObj<a 
name="fetchnextobj" id="fetchnextobj"></a>()</b> 
-  </font></font></p>
-<p><font color="#000000"><font color="#000000">Returns the current record as 
an object and moves to 
-  the next record. If EOF, false is returned. Fields are not upper-cased, 
unlike 
-  FetctNextObject. </font></font></p>
-<font color="#000000"><font color="#000000"> 
-<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> as a string 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 FetchField() can be passed in $<b>fieldobj</b> or as the 1st parameter 
<b>$nativeDBType</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>
-For example, $db-&gt;MetaType('char') will return 'C'. 
-<p>Returns:</p>
-<ul>
-  <li><b>C</b>: Character fields that should be shown in a &lt;input 
type="text"&gt; 
-    tag. </li>
-  <li><b>X</b>: Clob (character large objects), 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>:&nbsp; Integer field. </li>
-  <li><b>R</b>: Counter or Autoincrement field. Must be numeric.</li>
-  <li><b>B</b>: Blob, or binary large objects.<font color="#000000"> 
</font></li>
-</ul>
-</font> 
-</font><p><font color="#000000"><font color="#000000"> Since ADOdb 3.0, 
MetaType accepts $fieldobj as the first 
-  parameter, instead of $nativeDBType. </font></font></p>
-<font color="#000000"><font color="#000000"> 
-
-</font></font><p><font color="#000000"><font color="#000000"><b>Close( )<a 
name="rsclose"></a></b></font></font></p>
-<p><font color="#000000"><font color="#000000">Closes the recordset, cleaning 
all memory and resources associated with the recordset. 
-</font></font></p><p>
-<font color="#000000"><font color="#000000">If memory management is not an 
issue, you do not need to call this function as recordsets
-are closed for you by PHP at the end of the script. 
-SQL statements such as INSERT/UPDATE/DELETE do not really return a recordset, 
so you do not have to call Close()
-for such SQL statements.</font></font></p>
-<hr>
-<h3><font color="#000000"><font color="#000000">function rs2html<a 
name="rs2html"></a>($adorecordset,[$tableheader_attributes], 
-  [$col_titles])</font></font></h3>
-<p><font color="#000000"><font color="#000000">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.</font></font></p>
-<p><font color="#000000"><font color="#000000">You will need to include the 
file <i>tohtml.inc.php</i>.</font></font></p>
-<p><font color="#000000"><font color="#000000">Example of rs2html:<b><font 
color="#336600"><a name="exrs2html"></a></font></b></font></font></p>
-<pre><font color="#000000"><font color="#000000"><b><font 
color="#336600">&lt;?<br>include('tohtml.inc.php')</font></b>; # load code 
common to ADOdb <br><b>include</b>('adodb.inc.php'); # load code common to 
ADOdb <br>$<font color="#663300">conn</font> = &amp;ADONewConnection('mysql');  
 # create a connection <br>$<font 
color="#663300">conn</font>-&gt;PConnect('localhost','userid','','agora');# 
connect to MySQL, agora db<br>$<font color="#663300">sql</font> = 'select 
CustomerName, CustomerID from customers'; <br>$<font color="#663300">rs</font>  
 = $<font color="#663300">conn</font>-&gt;Execute($sql); <br><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>'));<br>?&gt;</b></font></font></pre>
-<hr>
-<h3><font color="#000000"><font color="#000000">Differences between this ADOdb 
library and Microsoft ADO<a name="adodiff"></a></font></font></h3>
-<ol>
-<font color="#000000"><font color="#000000">  <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. Instead we have the 
ADOConnection::<a href="#parameter">Parameter</a>( 
-    ) function, which provides a simpler interface for calling preparing 
parameters 
-    and calling stored procedures.</li>
-  <li>Recordset properties for paging records are available, but implemented 
as 
-    in <a href="#ex8">Example 8</a>.</li>
-</font></font></ol>
-<hr>
-<h1><font color="#000000"><font color="#000000">Database Driver Guide<a 
name="driverguide"></a></font></font></h1>
-<p><font color="#000000"><font color="#000000">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.</font></font></p>
-<p><font color="#000000"><font color="#000000">First decide on a name in lower 
case to call the database type. Let's say we 
-  call it xbase. </font></font></p>
-<p><font color="#000000"><font color="#000000">Then we need to create two 
classes ADODB_xbase and ADORecordSet_xbase in the 
-  file adodb-xbase.inc.php.</font></font></p>
-<p><font color="#000000"><font color="#000000">The simplest form of database 
driver is an adaptation of an existing ODBC driver. 
-  Then we just need to create the class <i>ADODB_xbase extends ADODB_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.</font></font></p>
-<p><font color="#000000"><font color="#000000">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.</font></font></p>
-<p><font color="#000000"><font color="#000000">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.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>ADOConnection Functions to 
Override</b></font></font></p>
-<p><font color="#000000"><font color="#000000">Defining a constructor for your 
ADOConnection derived function is optional. 
-  There is no need to call the base class constructor.</font></font></p>
-<p><font color="#000000"><font color="#000000">_<b>connect</b>: Low level 
implementation of Connect. Returns true or false. 
-  Should set the _<b>connectionID</b>.</font></font></p>
-<p><font color="#000000"><font color="#000000">_<b>pconnect:</b> Low level 
implemention of PConnect. Returns true or false. 
-  Should set the _<b>connectionID</b>.</font></font></p>
-<p><font color="#000000"><font color="#000000">_<b>query</b>: Execute a query. 
Returns the queryID, or false.</font></font></p>
-<p><font color="#000000"><font color="#000000">_<b>close: </b>Close the 
connection -- PHP should clean up all recordsets. 
-</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>ErrorMsg</b>: Stores the 
error message in the private variable _errorMsg. 
-</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>ADOConnection Fields to 
Set</b></font></font></p>
-<p><font color="#000000"><font color="#000000">_<b>bindInputArray</b>: Set to 
true if binding of parameters for SQL inserts 
-  and updates is allowed using ?, eg. as with ODBC.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>fmtDate</b></font></font></p>
-<p><font color="#000000"><font 
color="#000000"><b>fmtTimeStamp</b></font></font></p>
-<p><font color="#000000"><font color="#000000"><b>true</b></font></font></p>
-<p><font color="#000000"><font color="#000000"><b>false</b></font></font></p>
-<p><font color="#000000"><font 
color="#000000"><b>concat_operator</b></font></font></p>
-<p><font color="#000000"><font 
color="#000000"><b>replaceQuote</b></font></font></p>
-<p><font color="#000000"><font color="#000000"><b>hasLimit</b> support SELECT 
* FROM TABLE LIMIT 10 of MySQL.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>hasTop</b> support Microsoft 
style SELECT TOP 10 * FROM TABLE.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>ADORecordSet Functions to 
Override</b></font></font></p>
-<p><font color="#000000"><font color="#000000">You will need to define a 
constructor for your ADORecordSet derived class that 
-  calls the parent class constructor.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>FetchField: </b> as 
documented above in ADORecordSet</font></font></p>
-<p><font color="#000000"><font color="#000000">_<b>initrs</b>: low level 
initialization of the recordset: setup the _<b>numOfRows</b> 
-  and _<b>numOfFields</b> fields -- called by the 
constructor.</font></font></p>
-<p><font color="#000000"><font color="#000000">_<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.</font></font></p>
-<p><font color="#000000"><font color="#000000">_<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.</font></font></p>
-<p><font color="#000000"><font color="#000000">_<b>close</b>: close the 
recordset</font></font></p>
-<p><font color="#000000"><font color="#000000"><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.</font></font></p>
-<p><font color="#000000"><font color="#000000"><b>ADOConnection Fields to 
Set</b></font></font></p>
-<p><font color="#000000"><font color="#000000">canSeek: Set to true if the 
_seek function works.</font></font></p>
-<h2><font color="#000000"><font color="#000000">ToDo:</font></font></h2>
-<p><font color="#000000"><font color="#000000">See the <a 
href="http://php.weblogs.com/adodb-todo-roadmap";>RoadMap</a> 
article.</font></font></p>
-<p><font color="#000000"><font color="#000000">Also see the ADOdb <a 
href="http://php.weblogs.com/adodb_csv";>proxy</a> article 
-  for bridging Windows and Unix databases using http remote procedure calls. 
For 
-  your education, visit <a href="http://palslib.com/";>palslib.com</a> for 
database info, 
-  and read this article on <a 
href="http://phplens.com/lens/php-book/optimizing-debugging-php.php";>Optimizing 
-  PHP</a>. </font></font></p>
-
-<h2><font color="#000000">Change Log<a name="Changes"></a><a 
name="changes"></a><a name="changelog"></a></font></h2>
-<p><a name="4.54"></a><b>4.54 5 Nov 2004</b>
-<p>
-Now you can set $db->charSet = ?? before doing a Connect() in oci8.
-<p>
-Added adodbFetchMode to sqlite.
-<p>
-Perf code, added a string typecast to substr in adodb_log_sql().
-<p>
-Postgres: Changed BlobDecode() to use po_loread, added new $maxblobsize 
parameter, and now it returns the blob instead
-of sending it to stdout - make sure to mention that as a compat warning.
-Also added $db->IsOID($oid) function; uses a heuristic, not guaranteed to work 
100%.
-<p>
-Contributed arabic language file by "El-Shamaa, Khaled" k.el-shamaa#cgiar.org
-<p>
-PHP5 exceptions did not handle @ protocol properly. Fixed.
-<p>
-Added ifnull handling for postgresql (using coalesce).
-<p>
-Added  metatables() support for Postgresql 8.0 (no longer uses pg_% dictionary 
tables).
-<p>
-Improved Sybase ErrorMsg() function. By Gaetano Giunta.
-<p>
-Improved oci8 SelectLimit() to use Prepare(). By Cristiano Duarte.
-<P>
-Type-cast $row parameter in ifx_fetch_row() to int. Thx stefan bodgan.
-<p>Ralf becker contributed improvements in postgresql, sapdb, mysql data 
dictionary handling:<br>
-- MySql and Postgres MetaType was reporting every int column which was 
-part of a primary key and unique as serial<br>
-- Postgres was not reporting the scale of decimal types<br>
-- MaxDB was padding the defaults of none-string types with spaces<br>
-- MySql now correctly converts enum columns to varchar
-<p>
-Ralf also changed Postgresql datadict:<br>
-- you cant add NOT NULL columns in postgres in one go, they need to be 
-added as NULL and then altered to NOT NULL<br>
-- AlterColumnSQL could not change a varchar column with numbers into an 
-integer column, postgres need an explicit conversation<br>
-- a re-created sequence was not set to the correct value, if the name 
-was the old name (no implicit sequence), now always the new name of the 
-implicit sequence is used<br>
-<p>Sergio Strampelli added extra $intoken check to Lens_ParseArgs() in 
datadict code.
-<p><a name="4.53"></a><b>4.53 28 Sept 2004</b>
-</p><p><font color="#000000">FetchMode cached in recordset is sometimes mapped 
to native db fetchMode. Normally this does not matter,
-but when using cached recordsets, we need to switch back to using adodb 
fetchmode.  So we cache this
-in $rs-&gt;adodbFetchMode if it differs from the db's fetchMode.
-</font></p><p><font color="#000000">For informix we now set canSeek = false 
driver because stefan bodgan tells me that seeking doesn't work. 
-</font></p><p><font color="#000000">SetDateLocale() never worked till now ;-) 
Thx david#tomato.it
-</font></p><p><font color="#000000">Set $_bindInputArray = true in sapdb 
driver. Required for clob support.
-</font></p><p><font color="#000000">Fixed some PEAR::DB emulation issues with 
isError() and isWarning. Thx to Gert-Rainer Bitterlich.
-</font></p><p><font color="#000000">Empty() used in getupdatesql without 
strlen() check. Fixed.</font></p>
-<p><font color="#000000">Added unsigned detection to mysql and mysqli drivers. 
Thx to dan cech.
-</font></p><p><font color="#000000">Added hungarian language file. Thx to 
Hal&aacute;szv&aacute;ri G&aacute;bor.
-</font></p><p><font color="#000000">Improved fieldname-type formatting of 
datadict SQL generated (adding $widespacing parameter to _GenField).
-</font></p><p><font color="#000000">Datadict oci8 DROP CONSTRAINTS misspelt. 
Fixed. Thx Mark Newnham.
-</font></p><p><font color="#000000">Changed odbtp to dynamically change 
databaseType based on connection, eg. from 'odbtp' to 'odbtp_mssql' when 
connecting
-to mssql database.
-</font></p><p><font color="#000000">In datadict, MySQL I4 was wrongly mapped 
to MEDIUMINT, which is actually I3. Fixed.
-</font></p><p><font color="#000000">Fixed mysqli MetaType() recognition. 
Mysqli returns numeric types unlike mysql extension. Thx Francesco Riosa.
-</font></p><p><font color="#000000">VFP odbc driver curmode set wrongly, 
causing problems with memo fields. Fixed.
-</font></p><p><font color="#000000">Odbc driver did not recognize odbc version 
2 driver date types properly. Fixed. Thx Bostjan.
-</font></p><p><font color="#000000">ChangeTableSQL() fixes to 
datadict-db2.inc.php by Mark Newnham.
-</font></p><p><font color="#000000">Perf monitoring with odbc improved. Now we 
try in perf code to manually set the sysTimeStamp using date() if sysTimeStamp
-is empty.
-</font></p><p><font color="#000000">All ADO errors are thrown as exceptions in 
PHP5. 
-So we added exception handling to ado in PHP5 by creating new 
adodb-ado5.inc.php driver.
-</font></p><p><font color="#000000">Added IsConnected(). Returns true if 
connection object connected. By Luca.Gioppo.
-</font></p><p><font color="#000000">"Ralf Becker"
-RalfBecker#digitalROCK.de contributed new sapdb data-dictionary driver
-and a large patch that implements field and table renaming for oracle,
-mssql, postgresql, mysql and sapdb. See the new RenameTableSQL() and
-RenameColumnSQL() functions.
-</font></p><p><font color="#000000">We now check ExecuteCursor to see if 
PrepareSP was initially called.
-</font></p><p><font color="#000000">Changed oci8 datadict to use MODIFY for 
$dd-&gt;alterCol. Thx Mark Newnham.
-</font></p><p><font color="#000000"><a name="4.52"></a><b>4.52  10 Aug 2004</b>
-</font></p><p><font color="#000000">Bug found in Replace() when performance 
logging enabled, introduced in ADOdb 4.50. Fixed.
-</font></p><p><font color="#000000">Replace() checks update stmt. If update 
stmt fails, we now return immediately. Thx to alex.
-</font></p><p><font color="#000000">Added support for $ADODB_FORCE_TYPE in 
GetUpdateSQL/GetInsertSQL. Thx to niko.
-</font></p><p><font color="#000000">Added ADODB_ASSOC_CASE support to 
postgres/postgres7 driver.
-</font></p><p><font color="#000000">Support for DECLARE stmt in oci8. Thx 
Lochbrunner.
-</font></p><p><font color="#000000"><a name="4.51"></a><b>4.51  29 July  
2004</b>
-</font></p><p><font color="#000000">Added adodb-xmlschema 1.0.2. Thx dan and 
richard.
-</font></p><p><font color="#000000">Added new adorecordset_ext_* classes. If 
ADOdb extension installed for mysql, mysqlt and oci8 
-(but not oci8po),  we use the superfast ADOdb extension code for movenext.
-</font></p><p><font color="#000000">Added schema support to mssql and 
odbc_mssql MetaPrimaryKeys().
-</font></p><p><font color="#000000">Patched MSSQL driver to support PHP NULL 
and Boolean values 
-while binding the input array parameters in the _query() function. By Stephen 
Farmer.
-</font></p><p><font color="#000000">Added support for clob's for mssql,  
UpdateBlob(). Thx to gfran#directa.com.br
-</font></p><p><font color="#000000">Added normalize support for postgresql 
(true=lowercase table name, or false=case-sensitive table names) 
-to MetaColumns($table, $normalize=true).
-</font></p><p><font color="#000000">PHP5 variant dates in ADO not working. 
Fixed in adodb-ado.inc.php.
-</font></p><p><font color="#000000">Constant ADODB_FORCE_NULLS was not working 
properly for many releases (for GetUpdateSQL). Fixed. 
-Also GetUpdateSQL strips off ORDER BY now - thx Elieser Le&atilde;o.
-</font></p><p><font color="#000000">Perf Monitor for oci8 now dynamically 
highlights optimizer_* params if too high/low.
-</font></p><p><font color="#000000">Added dsn support to 
NewADOConnection/ADONewConnection.
-</font></p><p><font color="#000000">Fixed out of page bounds bug in 
_adodb_pageexecute_all_rows() Thx to "Sergio Strampelli" sergio#rir.it
-</font></p><p><font color="#000000">Speedup of movenext for mysql and oci8 
drivers.
-</font></p><p><font color="#000000">Moved debugging code 
_adodb_debug_execute() to adodb-lib.inc.php.
-</font></p><p><font color="#000000">Fixed postgresql bytea detection bug. See 
http://phplens.com/lens/lensforum/msgs.php?id=9849.
-</font></p><p><font color="#000000">Fixed ibase datetimestamp typo in PHP5. 
Thx stefan.
-</font></p><p><font color="#000000">Removed whitespace at end of odbtp drivers.
-</font></p><p><font color="#000000">Added db2 metaprimarykeys fix.
-</font></p><p><font color="#000000">Optimizations to MoveNext() for mysql and 
oci8. Misc speedups to Get* functions.
-</font></p><p><font color="#000000"><a name="4.50"></a><b>4.50  6 July  
2004</b>
-</font></p><p><font color="#000000">Bumped it to 4.50 to avoid confusion with 
PHP 4.3.x series.
-</font></p><p><font color="#000000">Added db2 metatables and metacolumns 
extensions.
-</font></p><p><font color="#000000">Added alpha PDO driver. Very buggy, only 
works with odbc.
-</font></p><p><font color="#000000">Tested mysqli. Set poorAffectedRows = 
true. Cleaned up movenext() and _fetch().
-</font></p><p><font color="#000000">PageExecute does not work properly with 
php5 (return val not a variable). Reported Dmytro Sychevsky sych#php.com.ua.  
Fixed.
-</font></p><p><font color="#000000">MetaTables() for mysql, $showschema 
parameter was not backward compatible with older versions of adodb. Fixed.
-</font></p><p><font color="#000000">Changed mysql GetOne() to work with mysql 
3.23 when using with non-select stmts (e.g. SHOW TABLES).
-</font></p><p><font color="#000000">Changed TRIG_ prefix to a variable in 
datadict-oci8.inc.php. Thx to Luca.Gioppo#csi.it.
-</font></p><p><font color="#000000">New to adodb-time code. We allow you to 
define your own daylights savings function, 
-adodb_daylight_sv for pre-1970 dates. If the function is defined 
-(somewhere in an include), then you can correct 
-for daylights savings. See 
http://phplens.com/phpeverywhere/node/view/16#daylightsavings
-for more info.
-</font></p><p><font color="#000000">New sqlitepo driver. This is because assoc 
mode does not work like other drivers in sqlite.
-   Namely, when selecting (joining) multiple tables, in assoc mode the table
-         names are included in the assoc keys in the "sqlite" driver.
-         In "sqlitepo" driver, the table names are stripped from the returned 
column names. 
-         When this results in a conflict,  the first field get preference.
-       Contributed by Herman Kuiper  herman#ozuzo.net  
-</font></p><p><font color="#000000">Added $forcenull parameter to 
GetInsertSQL/GetUpdateSQL. Idea by Marco Aurelio Silva.
-</font></p><p><font color="#000000">More XHTML changes for GetMenu. By Jeremy 
Evans.
-</font></p><p><font color="#000000">Fixes some ibase date issues. Thx to 
stefan bogdan.
-</font></p><p><font color="#000000">Improvements to mysqli driver to support 
$ADODB_COUNTRECS.
-</font></p><p><font color="#000000">Fixed adodb-csvlib.inc.php problem when 
reading stream from socket. We need to poll stream continiously.
-</font></p><p><font color="#000000"><a name="4.23"></a><b>4.23  16 June   
2004</b>
-</font></p><p>
-<font color="#000000">New interbase/firebird fixes thx to Lester Caine.
-Driver fixes a problem with getting field names in the result array, and 
-corrects a couple of data conversions. Also we default to dialect3 for 
firebird.
-Also ibase sysDate property was wrong. Changed to cast as timestamp.
-</font></p><p>
-<font color="#000000">The datadict driver is set up to give quoted tables and 
fields as this 
-was the only way round reserved words being used as field names in 
-TikiWiki. TikiPro is tidying that up, and I hope to be able to produce a 
-build of THAT which uses what I consider proper UPPERCASE field and 
-table names. The conversion of TikiWiki to ADOdb helped in that, but 
-until the database is completely tidied up in TikiPro ...
-</font></p><p><font color="#000000">Modified _gencachename() to include 
fetchmode in name hash.
-This means you should clear your cache directory after installing this release 
as the 
-cache name algorithm has changed.
-</font></p><p><font color="#000000">Now Cache* functions work in safe
-mode, because we do not create sub-directories in the $ADODB_CACHE_DIR
-in safe mode. In non-safe mode we still create sub-directories. Done by
-modifying _gencachename().
-</font></p><p><font color="#000000">Added $gmt parameter (true/false)
-to UserDate and UserTimeStamp in connection class, to force conversion
-of input (in local time) to be converted to UTC/GMT.
-</font></p><p><font color="#000000">Mssql datadict did not support INT types 
properly (no size param allowed). 
-Added _GetSize() to datadict-mssql.inc.php.
-</font></p><p><font color="#000000">For borland_ibase, BeginTrans(), 
changed:<br>
-</font></p><pre><font color="#000000">   $this-&gt;_transactionID = 
$this-&gt;_connectionID;</font></pre>
-<font color="#000000">to<br>
-</font><pre><font color="#000000">   $this-&gt;_transactionID = 
ibase_trans($this-&gt;ibasetrans, $this-&gt;_connectionID);</font></pre>
-<font color="#000000">         
-</font><p><font color="#000000">Fixed typo in mysqi_field_seek(). Thx to 
Sh4dow (sh4dow#php.pl).
-</font></p><p><font color="#000000">LogSQL did not work with 
Firebird/Interbase. Fixed.
-</font></p><p><font color="#000000">Postgres: made errorno() handling more 
consistent. Thx to Michael Jahn, Michael.Jahn#mailbox.tu-dresden.de.
-</font></p><p><font color="#000000">Added informix patch to better support 
metatables, metacolumns by "Cecilio Albero" c-albero#eos-i.com
-</font></p><p><font color="#000000">Cyril Malevanov contributed patch to oci8 
to support passing of LOB parameters:
-</font></p><pre><font color="#000000"> $text = 'test test test';<br>   $sql = 
"declare rs clob; begin :rs := lobinout(:sa0); end;";<br>        $stmt = $conn 
-&gt; PrepareSP($sql);<br>        $conn -&gt; InParameter($stmt,$text,'sa0', 
-1, OCI_B_CLOB);<br> $rs = '';<br>   $conn -&gt; OutParameter($stmt,$rs,'rs', 
-1, OCI_B_CLOB);<br>   $conn -&gt; Execute($stmt);<br> echo "return = 
".$rs."&lt;br&gt;";<br></font></pre>
-<font color="#000000">As he says, the LOBs limitations are:
-</font><pre><font color="#000000"> - use OCINewDescriptor before binding<br> - 
if Param is IN, uses save() before each execute. This is done automatically for 
you.<br> - if Param is OUT, uses load() after each execute. This is done 
automatically for you.<br> - when we bind $var as LOB, we create new descriptor 
and return it as a<br>   Bind Result, so if we want to use OUT parameters, we 
have to store<br>   somewhere &amp;$var to load() data from LOB to it.<br> - IN 
OUT params are not working now (should not be a big problem to fix it)<br> - 
now mass binding not working too (I've wrote about it before)<br></font></pre>
-<p><font color="#000000">Simplified Connect() and PConnect() error handling.
-</font></p><p><font color="#000000">When extension not loaded, Connect() and 
PConnect() will return null. On connect error, the fns will return false.
-</font></p><p><font color="#000000">CacheGetArray() added to code.
-</font></p><p><font color="#000000">Added Init() to adorecordset_empty().
-</font></p><p><font color="#000000">Changed postgres64 driver, MetaColumns() 
to not strip off quotes in default value if :: detected (type-casting of 
default).
-</font></p><p><font color="#000000">Added test: if (!defined('ADODB_DIR')) 
die(). Useful to prevent hackers from detecting file paths.
-</font></p><p><font color="#000000">Changed metaTablesSQL to ignore Postgres 
7.4 information schemas (sql_*).
-</font></p><p><font color="#000000">New polish language file by  Grzegorz Pacan
-</font></p><p><font color="#000000">Added support for UNION in 
_adodb_getcount().
-</font></p><p><font color="#000000">Added security check for ADODB_DIR to 
limit path disclosure issues. Requested by postnuke team.
-</font></p><p><font color="#000000">Added better error message support to 
oracle driver. Thx to Gaetano Giunta.
-</font></p><p><font color="#000000">Added showSchema support to mysql.
-</font></p><p><font color="#000000">Bind in oci8 did not handle $name=false 
properly. Fixed.
-</font></p><p><font color="#000000">If extension not loaded, Connect(), 
PConnect(), NConnect() will return null.
-</font></p><p><font color="#000000"><b>4.22  15 Apr   2004</b>
-</font></p><p><font color="#000000">Moved docs to own adodb/docs folder.
-</font></p><p><font color="#000000">Fixed session bug when quoting 
compressed/encrypted data in Replace().
-</font></p><p><font color="#000000">Netezza Driver and LDAP drivers 
contributed by Josh Eldridge.
-</font></p><p><font color="#000000">GetMenu now uses rtrim() on values instead 
of trim().
-</font></p><p><font color="#000000">Changed MetaColumnNames to return an 
associative array, keys being the field names in uppercase.
-</font></p><p><font color="#000000">Suggested fix to adodb-ado.inc.php 
affected_rows to support PHP5 variants. Thx to Alexios Fakos.
-</font></p><p><font color="#000000">Contributed bulgarian language file by 
Valentin Sheiretsky valio#valio.eu.org.
-</font></p><p><font color="#000000">Contributed romanian language file by 
stefan bogdan.
-</font></p><p><font color="#000000">GetInsertSQL now checks for table name 
(string) in $rs, and will create a recordset for that
-table automatically. Contributed by Walt Boring. Also added OCI_B_BLOB in bind 
on Walt's request - hope
-it doesn't break anything :-)
-</font></p><p><font color="#000000">Some minor postgres speedups in _initrs().
-</font></p><p><font color="#000000"> ChangeTableSQL checks now if MetaColumns 
returns empty. Thx Jason Judge.
-</font></p><p><font color="#000000">Added ADOConnection::Time(), returns 
current database time in unix timestamp format, or false.
-</font></p><p><font color="#000000"><b>4.21 20 Mar 2004</b>
-</font></p><p><font color="#000000">We no longer in SelectLimit for VFP driver 
add SELECT TOP X unless an ORDER BY exists.
-</font></p><p><font color="#000000">Pim Koeman contributed dutch language file 
adodb-nl.inc.php.
-</font></p><p><font color="#000000">Rick Hickerson added CLOB support to db2 
datadict.
-</font></p><p><font color="#000000">Added odbtp driver. Thx to "stefan bogdan" 
sbogdan#rsb.ro.
-</font></p><p><font color="#000000">Changed PrepareSP() 2nd parameter, 
$cursor, to default to true (formerly false). Fixes oci8 backward
-compat problems with OUT params.
-</font></p><p><font color="#000000">Fixed month calculation error in 
adodb-time.inc.php. 2102-June-01 appeared as 2102-May-32.
-</font></p><p><font color="#000000">Updated PHP5 RC1 iterator support. API 
changed, hasMore() renamed to valid().
-</font></p><p><font color="#000000">Changed internal format of serialized 
cache recordsets. As we store a version number, this should be
-backward compatible.
-</font></p><p><font color="#000000">Error handling when driver file not found 
was flawed in ADOLoadCode(). Fixed.
-</font></p><p><font color="#000000"><b>4.20 27 Feb 2004</b>
-</font></p><p><font color="#000000">Updated to AXMLS 1.01.
-</font></p><p><font color="#000000">MetaForeignKeys for postgres7 modified by 
Edward Jaramilla, works on pg 7.4.
-</font></p><p><font color="#000000">Now numbers accepts function calls or 
sequences for GetInsertSQL/GetUpdateSQL numeric fields.
-</font></p><p><font color="#000000">Changed quotes of 'delete from 
$perf_table' to "". Thx Kehui (webmaster#kehui.net)
-</font></p><p><font color="#000000">Added ServerInfo() for ifx, and putenv 
trim fix. Thx Fernando Ortiz.
-</font></p><p><font color="#000000">Added addq(), which is analogous to 
addslashes().
-</font></p><p><font color="#000000">Tested with php5b4. Fix some php5 compat 
problems with exceptions and sybase.
-</font></p><p><font color="#000000">Carl-Christian Salvesen added patch to 
mssql _query to support binds greater than 4000 chars.
-</font></p><p><font color="#000000">Mike suggested patch to PHP5 exception 
handler. $errno must be numeric.
-</font></p><p><font color="#000000">Added double quotes (") to 
ADODB_TABLE_REGEX.
-</font></p><p><font color="#000000">For oci8, Prepare(...,$cursor),
-$cursor's meaning was accidentally inverted in 4.11. This causes
-problems with ExecuteCursor() too, which calls Prepare() internally.
-Thx to William Lovaton.
-</font></p><p><font color="#000000">Now dateHasTime property in connection 
object renamed to datetime for consistency. This could break bc.
-</font></p><p><font color="#000000">Csongor Halmai reports that db2 
SelectLimit with input array is not working. Fixed..
-</font></p><p><font color="#000000"><b>4.11 27 Jan 2004</b>
-</font></p><p><font color="#000000">Csongor Halmai reports db2 binding not 
working. Reverted back to emulated binding.
-</font></p><p><font color="#000000">Dan Cech modifies datadict code. Adds 
support for DropIndex. Minor cleanups.
-</font></p><p><font color="#000000">Table misspelt in perf-oci8.inc.php. 
Changed v$conn_cache_advice to v$db_cache_advice. Reported by Steve W.
-</font></p><p><font color="#000000">UserTimeStamp and DBTimeStamp did not 
handle YYYYMMDDHHMMSS format properly. Reported by Mike Muir. Fixed.
-</font></p><p><font color="#000000">Changed oci8 Prepare(). Does not 
auto-allocate OCINewCursor automatically, unless 2nd param is set to true.
-This will break backward compat, if Prepare/Execute is used instead of 
ExecuteCursor. Reported by Chris Jones.
-</font></p><p><font color="#000000">Added InParameter() and OutParameter(). 
Wrapper functions to Parameter(), but nicer because they
-are self-documenting.
-</font></p><p><font color="#000000">Added 'R' handling in ActualType() to 
datadict-mysql.inc.php
-</font></p><p><font color="#000000">Added ADOConnection::SerializableRS($rs). 
Returns a recordset that can be serialized in a session.
-</font></p><p><font color="#000000">Added "Run SQL" to performance UI().
-</font></p><p><font color="#000000">Misc spelling corrections in 
adodb-mysqli.inc.php, adodb-oci8.inc.php and datadict-oci8.inc.php, from Heinz 
Hombergs.
-</font></p><p><font color="#000000">MetaIndexes() for ibase contributed by 
Heinz Hombergs.
-</font></p><p><font color="#000000"><b>4.10 12 Jan 2004</b>
-</font></p><p><font color="#000000">Dan Cech contributed extensive changes to 
data dictionary to support name quoting (with `), and drop table/index.
-</font></p><p><font color="#000000">Informix added cursorType property. 
Default remains IFX_SCROLL, but you can change to 0 (non-scrollable cursor) for 
performance.
-</font></p><p><font color="#000000">Added ADODB_View_PrimaryKeys() for 
returning view primary keys to MetaPrimaryKeys().
-</font></p><p><font color="#000000">Simplified chinese file, adodb-cn.inc.php 
from cysoft.
-</font></p><p><font color="#000000">Added check for ctype_alnum in 
adodb-datadict.inc.php. Thx to Jason Judge.
-</font></p><p><font color="#000000">Added connection parameter to ibase 
Prepare(). Fix by Daniel Hassan.
-</font></p><p><font color="#000000">Added nameQuote for quoting identifiers 
and names to connection obj. Requested by Jason Judge. Also the
-data dictionary parser now detects `field name` and generates column names 
with spaces correctly.
-</font></p><p><font color="#000000">BOOL type not recognised correctly as L. 
Fixed.
-</font></p><p><font color="#000000">Fixed paths in ADODB_DIR for session 
files, and back-ported it to 4.05 (15 Dec 2003)
-</font></p><p><font color="#000000">Added Schema to postgresql MetaTables. Thx 
to col#gear.hu
-</font></p><p><font color="#000000">Empty postgresql recordsets that had blob 
fields did not set EOF properly. Fixed.
-</font></p><p><font color="#000000">CacheSelectLimit internal parameters to 
SelectLimit were wrong. Thx to Nio.
-</font></p><p><font color="#000000">Modified adodb_pr() and adodb_backtrace() 
to support command-line usage (eg. no html).
-</font></p><p><font color="#000000">Fixed some fr and it lang errors. Thx to 
Gaetano G.
-</font></p><p><font color="#000000">Added contrib directory, with adodb rs to 
xmlrpc convertor by Gaetano G.
-</font></p><p><font color="#000000">Fixed array recordset bugs when _skiprow1 
is true. Thx to Gaetano G.
-</font></p><p><font color="#000000">Fixed pivot table code when count is false.
-</font></p><p>
-
-</p><p><font color="#000000"><b>4.05 13 Dec 2003 </b>
-</font></p><p><font color="#000000">Added MetaIndexes - thx to Dan Cech.
-</font></p><p><font color="#000000">Rewritten session code by Ross Smith. 
Moved code to adodb/session directory.
-</font></p><p><font color="#000000">Added function exists check on connecting 
to most drivers, so we don't crash with the unknown function error.
-</font></p><p><font color="#000000">Smart Transactions failed with GenID() 
when it no seq table has been created because the sql
-       statement fails. Fix by Mark Newnham.
-</font></p><p><font color="#000000">Added $db-&gt;length, which holds name of 
function that returns strlen.
-</font></p><p><font color="#000000">Fixed error handling for bad driver in 
ADONewConnection - passed too few params to error-handler.
-</font></p><p><font color="#000000">Datadict did not handle types like 16.0 
properly in _GetSize. Fixed.
-</font></p><p><font color="#000000">Oci8 driver SelectLimit() bug &amp;= 
instead of =&amp; used. Thx to Swen Th&uuml;mmler.
-</font></p><p><font color="#000000">Jesse Mullan suggested not flushing outp 
when output buffering enabled. Due to Apache 2.0 bug. Added.
-</font></p><p><font color="#000000">MetaTables/MetaColumns return ref bug with 
PHP5 fixed in adodb-datadict.inc.php.
-</font></p><p><font color="#000000">New mysqli driver contributed by Arjen de 
Rijke. Based on adodb 3.40 driver.
-Then jlim added BeginTrans, CommitTrans, RollbackTrans, IfNull, SQLDate. Also 
fixed return ref bug.
-</font></p><p><font color="#000000">$ADODB_FLUSH added, if true then force 
flush in debugging outp. Default is false.  In earlier
-versions, outp defaulted to flush, which is not compat with apache 2.0.
-</font></p><p><font color="#000000">Mysql driver's GenID() function did not 
work when when sql logging is on. Fixed.
-</font></p><p><font color="#000000">$ADODB_SESSION_TBL not declared as global 
var. Not available if adodb-session.inc.php included in function. Fixed.
-</font></p><p><font color="#000000">The input array not passed to Execute() in 
_adodb_getcount(). Fixed.
-</font></p><p><font color="#000000"><b>4.04 13 Nov 2003 </b>
-</font></p><p><font color="#000000">Switched back to foreach - faster than 
list-each.
-</font></p><p><font color="#000000">Fixed bug in ado driver - wiping out 
$this-&gt;fields with date fields.
-</font></p><p><font color="#000000">Performance Monitor, View SQL, Explain 
Plan did not work if strlen($SQL)&gt;max($_GET length). Fixed.
-</font></p><p><font color="#000000">Performance monitor, oci8 driver added 
memory sort ratio.
-</font></p><p><font color="#000000">Added random property, returns SQL to 
generate a floating point number between 0 and 1;
-</font></p><p><font color="#000000"><b>4.03 6 Nov 2003 </b>
-</font></p><p><font color="#000000">The path to adodb-php4.inc.php and 
adodb-iterators.inc.php was not setup properly.
-</font></p><p><font color="#000000">Patched SQLDate in interbase to support 
hours/mins/secs. Thx to ari kuorikoski.
-</font></p><p><font color="#000000">Force autorollback for pgsql persistent 
connections - 
-apparently pgsql did not autorollback properly before 4.3.4. See 
http://bugs.php.net/bug.php?id=25404
-</font></p><p><font color="#000000"><b>4.02 5 Nov 2003 </b>
-</font></p><p><font color="#000000">Some errors in adodb_error_pg() fixed. Thx 
to Styve.
-</font></p><p><font color="#000000">Spurious Insert_ID() error was generated 
by LogSQL(). Fixed.
-</font></p><p><font color="#000000">Insert_ID was interfering with 
Affected_Rows() and Replace()  when LogSQL() enabled. Fixed.
-</font></p><p><font color="#000000">More foreach loops optimized with 
list/each.
-</font></p><p><font color="#000000">Null dates not handled properly in ADO 
driver (it becomes 31 Dec 1969!).
-</font></p><p><font color="#000000">Heinz Hombergs contributed patches for 
mysql MetaColumns - adding scale, made
-interbase MetaColumns work with firebird/interbase, and added 
lang/adodb-de.inc.php.
-</font></p><p><font color="#000000">Added INFORMIXSERVER environment variable.
-</font></p><p><font color="#000000">Added $ADODB_ANSI_PADDING_OFF for 
interbase/firebird.
-</font></p><p><font color="#000000">PHP 5 beta 2 compat check. Foreach 
(Iterator) support. Exceptions support.
-</font></p><p><font color="#000000"><b>4.01 23 Oct 2003 </b>
-</font></p><p><font color="#000000">Fixed bug in rs2html(), tohtml.inc.php, 
that generated blank table cells.
-</font></p><p><font color="#000000">Fixed insert_id() incorrectly generated 
when logsql() enabled.
-</font></p><p><font color="#000000">Modified PostgreSQL _fixblobs to use 
list/each instead of foreach.
-</font></p><p><font color="#000000">Informix ErrorNo() implemented correctly.
-</font></p><p><font color="#000000">Modified several places to use list/each, 
including GetRowAssoc().
-</font></p><p><font color="#000000">Added UserTimeStamp() to connection class.
-</font></p><p><font color="#000000">Added $ADODB_ANSI_PADDING_OFF for oci8po.
-</font></p><p><font color="#000000"><b>4.00 20 Oct 2003 </b>
-</font></p><p><font color="#000000">Upgraded adodb-xmlschema to 1 Oct 2003 
snapshot.
-</font></p><p><font color="#000000">Fix to rs2html warning message. Thx to 
Filo.
-</font></p><p><font color="#000000">Fix for odbc_mssql/mssql SQLDate(), hours 
was wrong.
-</font></p><p><font color="#000000">Added MetaColumns and MetaPrimaryKeys for 
sybase. Thx to Chris Phillipson.
-</font></p><p><font color="#000000">Added autoquoting to datadict for MySQL 
and PostgreSQL. Suggestion by Karsten Dambekalns  
-</font></p><p><font color="#000000"><b>3.94 11 Oct 2003 </b>
-</font></p><p><font color="#000000">Create trigger in datadict-oci8.inc.php 
did not work, because all cr/lf's must be removed. 
-</font></p><p><font color="#000000">ErrorMsg()/ErrorNo() did not work for many 
databases when logging enabled. Fixed.
-</font></p><p><font color="#000000">Removed global variable $ADODB_LOGSQL as 
it does not work properly with multiple connections.
-</font></p><p><font color="#000000">Added SQLDate support for sybase. Thx to 
Chris Phillipson
-</font></p><p><font color="#000000">Postgresql checking of pgsql resultset 
resource was incorrect. Fix by Bharat Mediratta bharat#menalto.com.
-Same patch applied to  _insertid and _affectedrows for 
adodb-postgres64.inc.php.
-</font></p><p><font color="#000000">Added support for NConnect for postgresql.
-</font></p><p><font color="#000000">Added Sybase data dict support. Thx to 
Chris Phillipson  
-</font></p><p><font color="#000000">Extensive improvements in $perf-&gt;UI(), 
eg. Explain now opens in new window, we show scripts
-which call sql, etc.
-</font></p><p><font color="#000000">Perf Monitor UI works with magic quotes 
enabled.
-</font></p><p><font color="#000000">rsPrefix was declared twice. Removed.
-</font></p><p><font color="#000000">Oci8 stored procedure support, eg. "begin 
func(); end;" was incorrect in _query. Fixed.
-</font></p><p><font color="#000000">Tiraboschi Massimiliano contributed 
italian language file.
-</font></p><p><font color="#000000">Fernando Ortiz, fortiz#lacorona.com.mx, 
contributed informix performance monitor.
-</font></p><p><font color="#000000">Added _varchar (varchar arrays) support 
for postgresql. Reported by PREVOT St&eacute;phane.
-</font></p><p><font color="#000000"><b>3.92 22 Sept 2003</b> 
-</font></p><p><font color="#000000">Added GetAssoc and CacheGetAssoc to 
connection object.
-</font></p><p><font color="#000000">Removed TextMax and CharMax functions from 
adodb.inc.php. 
-</font></p><p><font color="#000000">HasFailedTrans() returned false when trans 
failed. Fixed. 
-</font></p><p><font color="#000000">Moved perf driver classes into 
adodb/perf/*.php. 
-</font></p><p><font color="#000000">Misc improvements to performance 
monitoring, including UI(). 
-</font></p><p><font color="#000000">RETVAL in mssql Parameter(), we do not 
append @ now. 
-</font></p><p><font color="#000000">Added Param($name) to connection class, 
returns '?' or ":$name", for defining 
-  bind parameters portably. 
-</font></p><p><font color="#000000">LogSQL traps affected_rows() and saves its 
value properly now. Also fixed oci8 
-  _stmt and _affectedrows() bugs. 
-</font></p><p><font color="#000000">Session code timestamp check for oci8 
works now. Formerly default NLS_DATE_FORMAT 
-  stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). 
Also 
-  added new $conn-&gt;datetime field to oci8, controls whether MetaType() 
returns 
-  'D' ($this-&gt;datetime==false) or 'T' ($this-&gt;datetime == true) for DATE 
type. 
-</font></p><p><font color="#000000">Fixed bugs in adodb-cryptsession.inc.php 
and adodb-session-clob.inc.php. 
-</font></p><p><font color="#000000">Fixed misc bugs in adodb_key_exists, 
GetInsertSQL() and GetUpdateSQL(). 
-</font></p><p><font color="#000000">Tuned include_once handling to reduce 
file-system checking overhead. 
-</font></p><p><font color="#000000"><b>3.91 9 Sept 2003</b> 
-</font></p><p><font color="#000000">Only released to InterAkt 
-</font></p><p><font color="#000000">Added LogSQL() for sql logging and 
$ADODB_NEWCONNECTION to override factory 
-  for driver instantiation. 
-</font></p><p><font color="#000000">Added IfNull($field,$ifNull) function, thx 
to johnwilk#juno.com 
-</font></p><p><font color="#000000">Added portable substr support. 
-</font></p><p><font color="#000000">Now rs2html() has new parameter, $echo. 
Set to false to return $html instead 
-  of echoing it. 
-</font></p><p><font color="#000000"><b>3.90 5 Sept 2003</b> 
-</font></p><p><font color="#000000">First beta of performance monitoring 
released. 
-</font></p><p><font color="#000000">MySQL supports MetaTable() masking. 
-</font></p><p><font color="#000000">Fixed key_exists() bug in 
adodb-lib.inc.php 
-</font></p><p><font color="#000000">Added sp_executesql Prepare() support to 
mssql. 
-</font></p><p><font color="#000000">Added bind support to db2. 
-</font></p><p><font color="#000000">Added swedish language file - Christian 
Tiberg" christian#commsoft.nu 
-</font></p><p><font color="#000000">Bug in drop index for mssql data dict 
fixed. Thx to Gert-Rainer Bitterlich. 
-</font></p><p><font color="#000000">Left join setting for oci8 was wrong. Thx 
to johnwilk#juno.com 
-</font></p><p><font color="#000000"><b>3.80 27 Aug 2003</b> 
-</font></p><p><font color="#000000">Patch for PHP 4.3.3 cached recordset 
csv2rs() fread loop incompatibility. 
-</font></p><p><font color="#000000">Added matching mask for MetaTables. Only 
for oci8, mssql and postgres currently. 
-</font></p><p><font color="#000000">Rewrite of "oracle" driver connection 
code, merging with "oci8", by Gaetano. 
-</font></p><p><font color="#000000">Added better debugging for Smart 
Transactions. 
-</font></p><p><font color="#000000">Postgres DBTimeStamp() was wrongly using 
TO_DATE. Changed to TO_TIMESTAMP. 
-</font></p><p><font color="#000000">ADODB_FETCH_CASE check pushed to 
ADONewConnection to allow people to define 
-  it after including adodb.inc.php. 
-</font></p><p><font color="#000000">Added portugese (brazilian) to languages. 
Thx to "Levi Fukumori". 
-</font></p><p><font color="#000000">Removed arg3 parameter from 
Execute/SelectLimit/Cache* functions. 
-</font></p><p><font color="#000000">Execute() now accepts 2-d array as 
$inputarray. Also changed docs of fnExecute() 
-  to note change in sql query counting with 2-d arrays. 
-</font></p><p><font color="#000000">Added MONEY to MetaType in PostgreSQL. 
-</font></p><p><font color="#000000">Added more debugging output to 
CacheFlush(). 
-</font></p><p><font color="#000000"><b>3.72 9 Aug 2003</b> 
-</font></p><p><font color="#000000">Added qmagic($str), which is a qstr($str) 
that auto-checks for magic quotes 
-  and does the right thing... 
-</font></p><p><font color="#000000">Fixed CacheFlush() bug - Thx to 
martin#gmx.de 
-</font></p><p><font color="#000000">Walt Boring contributed MetaForeignKeys 
for postgres7. 
-</font></p><p><font color="#000000">_fetch() called _BlobDecode() wrongly in 
interbase. Fixed. 
-</font></p><p><font color="#000000">adodb_time bug fixed with dates after 2038 
fixed by Jason Pell. http://phplens.com/lens/lensforum/msgs.php?id=6980 
-</font></p><p><font color="#000000"><b>3.71 4 Aug 2003</b> 
-</font></p><p><font color="#000000">The oci8 driver, MetaPrimaryKeys() did not 
check the owner correctly when $owner 
-  == false. 
-</font></p><p><font color="#000000">Russian language file contributed by 
"Cyrill Malevanov" cyrill#malevanov.spb.ru. 
-</font></p><p><font color="#000000">Spanish language file contributed by 
"Horacio Degiorgi" horaciod#codigophp.com. 
-</font></p><p><font color="#000000">Error handling in oci8 bugfix - if there 
was an error in Execute(), then when 
-  calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, 
but 
-  the 2nd call would return no error. 
-</font></p><p><font color="#000000">Error handling in odbc bugfix. ODBC would 
always return the last error, even 
-  if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 
-  0 everytime before CacheExecute() and Execute(). 
-</font></p><p><font color="#000000"><b>3.70 29 July 2003</b> 
-</font></p><p><font color="#000000">Added new SQLite driver. Tested on PHP 4.3 
and PHP 5. 
-</font></p><p><font color="#000000">Added limited "sapdb" driver support - 
mainly date support. 
-</font></p><p><font color="#000000">The oci8 driver did not identify NUMBER 
with no defined precision correctly. 
-</font></p><p><font color="#000000">Added ADODB_FORCE_NULLS, if set, then PHP 
nulls are converted to SQL nulls 
-  in GetInsertSQL/GetUpdateSQL. 
-</font></p><p><font color="#000000">DBDate() and DBTimeStamp() format for 
postgresql had problems. Fixed. 
-</font></p><p><font color="#000000">Added tableoptions to ChangeTableSQL(). 
Thx to Mike Benoit. 
-</font></p><p><font color="#000000">Added charset support to postgresql. Thx 
to Julian Tarkhanov. 
-</font></p><p><font color="#000000">Changed OS check for MS-Windows to prevent 
confusion with darWIN (MacOS) 
-</font></p><p><font color="#000000">Timestamp format for db2 was wrong. 
Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn. 
-</font></p><p><font color="#000000">adodb-cryptsession.php includes wrong. 
Fixed. 
-</font></p><p><font color="#000000">Added MetaForeignKeys(). Supported by 
mssql, odbc_mssql and oci8. 
-</font></p><p><font color="#000000">Fixed some oci8 
MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring. 
-</font></p><p><font color="#000000">adodb_getcount() did not init qryRecs to 
0. Missing "WHERE" clause checking 
-  in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn. 
-</font></p><p><font color="#000000">Added support for only 'VIEWS' and 
"TABLES" in MetaTables. From Walt Boring. 
-</font></p><p><font color="#000000">Upgraded to adodb-xmlschema.inc.php 0.0.2. 
-</font></p><p><font color="#000000">NConnect for mysql now returns value. Thx 
to Dennis Verspuij. 
-</font></p><p><font color="#000000">ADODB_FETCH_BOTH support added to 
interbase/firebird. 
-</font></p><p><font color="#000000">Czech language file contributed by Kamil 
Jakubovic jake#host.sk. 
-</font></p><p><font color="#000000">PostgreSQL BlobDecode did not use 
_connectionID properly. Thx to Juraj Chlebec. 
-</font></p><p><font color="#000000">Added some new initialization stuff for 
Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it 
-</font></p><p><font color="#000000">ADODB_ASSOC_CASE constant wrong in sybase 
_fetch(). Fixed. 
-</font></p><p><font color="#000000"><b>3.60 16 June 2003</b> 
-</font></p><p><font color="#000000">We now SET CONCAT_NULL_YIELDS_NULL OFF for 
odbc_mssql driver to be compat with 
-  mssql driver. 
-</font></p><p><font color="#000000">The property $emptyDate missing from 
connection class. Also changed 1903 to 
-  constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn. 
-</font></p><p><font color="#000000">ADOdb speedup optimization - we now return 
all arrays by reference. 
-</font></p><p><font color="#000000">Now DBDate() and DBTimeStamp() now accepts 
the string 'null' as a parameter. 
-  Suggested by vincent. 
-</font></p><p><font color="#000000">Added GetArray() to connection class. 
-</font></p><p><font color="#000000">Added not_null check in informix 
metacolumns(). 
-</font></p><p><font color="#000000">Connection parameters for postgresql did 
not work correctly when port was defined. 
-</font></p><p><font color="#000000">DB2 is now a tested driver, making adodb 
100% compatible. Extensive changes 
-  to odbc driver for DB2, including implementing serverinfo() and SQLDate(), 
switching 
-  to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and 
SelectLimit() 
-  fixes. 
-</font></p><p><font color="#000000">The odbc driver's FetchField() field names 
did not obey ADODB_ASSOC_CASE. Fixed. 
-</font></p><p><font color="#000000">Some bugs in adodb_backtrace() fixed. 
-</font></p><p><font color="#000000">Added "INT IDENTITY" type to 
adorecordset::MetaType() to support odbc_mssql 
-  properly. 
-</font></p><p><font color="#000000">MetaColumns() for oci8, mssql, odbc 
revised to support scale. Also minor revisions 
-  to odbc MetaColumns() for vfp and db2 compat. 
-</font></p><p><font color="#000000">Added unsigned support to mysql datadict 
class. Thx to iamsure. 
-</font></p><p><font color="#000000">Infinite loop in mssql MoveNext() fixed 
when ADODB_FETCH_ASSOC used. Thx to 
-  Josh R, Night_Wulfe#hotmail.com. 
-</font></p><p><font color="#000000">ChangeTableSQL contributed by Florian 
Buzin. 
-</font></p><p><font color="#000000">The odbc_mssql driver now sets 
CONCAT_NULL_YIELDS_NULL OFF for compat with 
-  mssql driver. 
-</font></p><hr>
-<p><font color="#000000"><strong>0.10 Sept 9 2000</strong> First release 
-</font></p><h3><font color="#000000"><strong>Old changelog history moved to <a 
href="old-changelog.htm">old-changelog.htm</a>. 
-  </strong></font></h3>
-<p><font color="#000000">&nbsp;</font></p>
-<p><font color="#000000"> </font> 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><title>ADODB Manual</title>
+
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+       
+<style>
+pre {
+  background-color: #eee;
+  padding: 0.75em 1.5em;
+  font-size: 12px;
+  border: 1px solid #ddd;
+}
+</style></head>
+<body bgcolor="#ffffff" text="black">
+
+<h2>ADOdb Library for PHP</h2>
+<p>V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com)</p>
+<p><font size="1">This software is dual licensed using BSD-Style and LGPL. 
This 
+  means you can use it in compiled proprietary and commercial 
products.</font></p>
+  
+
+       <p>Useful ADOdb links:  <a 
href="http://adodb.sourceforge.net/#download";>Download</a> &nbsp; <a 
href="http://adodb.sourceforge.net/#docs";>Other Docs</a>
+
+</p><p><a href="#intro"><b>Introduction</b></a><b><br>
+       <a href="#features">Unique Features</a><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</a><br>
+       <a href="#mininstall">Minimum Install</a><br>
+       <a href="#coding">Initializing Code and Connectioning to 
Databases</a><br>
+       </b><font size="2"> &nbsp; <a href="#dsnsupport">Data Source Name (DSN) 
Support</a></font>  &nbsp;  <a href="#connect_ex">Connection Examples</a> <br>
+       <b><a href="#speed">High Speed ADOdb - tuning tips</a></b><br>
+       <b><a href="#hack">Hacking and Modifying ADOdb Safely</a><br>
+       <a href="#php5">PHP5 Features</a></b><br>
+       <font size="2"><a href="#php5iterators">foreach iterators</a> <a 
href="#php5exceptions">exceptions</a></font><br>
+       <b> <a href="#drivers">Supported Databases</a></b><br>
+       <b> <a href="#quickstart">Tutorials</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>
+       <a href="#ex9">Example 9: Exporting in CSV or Tab-Delimited Format</a> 
<br>
+       <a href="#ex10">Example 10: Custom filters</a><br>
+       <a href="#ex11">Example 11: Smart Transactions</a><br>
+       <br>
+       <b> <a href="#errorhandling">Using Custom Error Handlers and 
PEAR_Error</a><br>
+       <a href="#DSN">Data Source Names</a><br>
+       <a href="#caching">Caching</a><br>
+       <a href="#pivot">Pivot Tables</a></b> 
+</p><p><a href="#ref"><b>REFERENCE</b></a>
+</p><p> <font size="2">Variables: <a 
href="#adodb_countrecs">$ADODB_COUNTRECS</a> 
+<a href="#adodb_ansi_padding_off">$ADODB_ANSI_PADDING_OFF</a>
+  <a href="#adodb_cache_dir">$ADODB_CACHE_DIR</a> <br>
+  &nbsp; &nbsp; &nbsp; &nbsp;  <a href="#force_type">$ADODB_FORCE_TYPE</a> 
+  <a href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a> 
+  <a href="#adodb_lang">$ADODB_LANG</a> <br>
+  Constants: </font><font size="2"><a 
href="#adodb_assoc_case">ADODB_ASSOC_CASE</a> 
+  </font><br>
+  <a href="#ADOConnection"><b> ADOConnection</b></a><br>
+  <font size="2">Connections: <a href="#connect">Connect</a> <a 
href="#pconnect">PConnect</a> 
+  <a href="#nconnect">NConnect</a> <a href="#isconnected">IsConnected</a><br>
+  Executing SQL: <a href="#execute">Execute</a> <a 
href="#cacheexecute"><i>CacheExecute</i></a> 
+  <a href="#selectlimit">SelectLimit</a> <a 
href="#cacheSelectLimit"><i>CacheSelectLimit</i></a> 
+  <a href="#param">Param</a> <a href="#prepare">Prepare</a> <a 
href="#preparesp">PrepareSP</a> 
+  <a href="#inparameter">InParameter</a> <a 
href="#outparameter">OutParameter</a> <a href="#autoexecute">AutoExecute</a>
+  <br>
+  &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a 
href="#getone">GetOne</a> 
+  <a href="#cachegetone"><i>CacheGetOne</i></a> <a href="#getrow">GetRow</a> 
<a href="#cachegetrow"><i>CacheGetRow</i></a> 
+  <a href="#getall">GetAll</a> <a href="#cachegetall"><i>CacheGetAll</i></a> 
<a href="#getcol">GetCol</a> 
+  <a href="#cachegetcol"><i>CacheGetCol</i></a> <a 
href="#getassoc1">GetAssoc</a> <a 
href="#cachegetassoc"><i>CacheGetAssoc</i></a> <a href="#replace">Replace</a> 
+  <br>
+  &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a 
href="#executecursor">ExecuteCursor</a> 
+  (oci8 only)<br>
+  Generates SQL strings: <a href="#getupdatesql">GetUpdateSQL</a> <a 
href="#getinsertsql">GetInsertSQL</a> 
+  <a href="#concat">Concat</a> <a href="#ifnull">IfNull</a> <a 
href="#length">length</a> <a href="#random">random</a> <a 
href="#substr">substr</a> 
+  <a href="#qstr">qstr</a> <a href="#param">Param</a>  <a 
href="#OffsetDate">OffsetDate</a> <a href="#SQLDate">SQLDate</a> 
+  <a href="#dbdate">DBDate</a>  <a href="#dbtimestamp">DBTimeStamp</a>
+  <br>
+  Blobs: <a href="#updateblob">UpdateBlob</a> <a 
href="#updateclob">UpdateClob</a> 
+  <a href="#updateblobfile">UpdateBlobFile</a> <a 
href="#blobencode">BlobEncode</a> 
+  <a href="#blobdecode">BlobDecode</a><br>
+  Paging/Scrolling: <a href="#pageexecute">PageExecute</a> <a 
href="#cachepageexecute">CachePageExecute</a><br>
+  Cleanup: <a href="#cacheflush">CacheFlush</a> <a href="#Close">Close</a><br>
+  Transactions: <a href="#starttrans">StartTrans</a> <a 
href="#completetrans">CompleteTrans</a> 
+  <a href="#failtrans">FailTrans</a> <a 
href="#hasfailedtrans">HasFailedTrans</a> 
+  <a href="#begintrans">BeginTrans</a> <a href="#committrans">CommitTrans</a> 
+  <a href="#rollbacktrans">RollbackTrans</a> <br>
+  Fetching Data: </font> <font size="2"><a 
href="#setfetchmode">SetFetchMode</a><br>
+  Strings: <a href="#concat">concat</a> <a href="#length">length</a>  <a 
href="#qstr">qstr</a> <a href="#quote">quote</a> <a 
href="#substr">substr</a><br>
+  Dates: <a href="#dbdate">DBDate</a> <a href="#dbtimestamp">DBTimeStamp</a> 
<a href="#unixdate">UnixDate</a> 
+  <a href="#unixtimestamp">UnixTimeStamp</a> <a 
href="#OffsetDate">OffsetDate</a> 
+  <a href="#SQLDate">SQLDate</a> <br>
+  Row Management: <a href="#affected_rows">Affected_Rows</a> <a 
href="#inserted_id">Insert_ID</a>  <a href="#rowlock">RowLock</a>
+  <a href="#genid">GenID</a> <a href="#createseq">CreateSequence</a> <a 
href="#dropseq">DropSequence</a> 
+  <br>
+  Error Handling: <a href="#errormsg">ErrorMsg</a> <a 
href="#errorno">ErrorNo</a> 
+  <a href="#metaerror">MetaError</a> <a 
href="#metaerrormsg">MetaErrorMsg</a><br>
+  Data Dictionary (metadata): <a href="#metadatabases">MetaDatabases</a> <a 
href="#metatables">MetaTables</a> 
+  <a href="#metacolumns">MetaColumns</a> <a 
href="#metacolumnames">MetaColumnNames</a> 
+  <a href="#metaprimarykeys">MetaPrimaryKeys</a> <a 
href="#metaforeignkeys">MetaForeignKeys</a> 
+  <a href="#serverinfo">ServerInfo</a> <br>
+  Statistics and Query-Rewriting: <a href="#logsql">LogSQL</a> <a 
href="#fnexecute">fnExecute 
+  and fnCacheExecute</a><br>
+  </font><font size="2">Deprecated: <a href="#bind">Bind</a> <a 
href="#blankrecordset">BlankRecordSet</a>
+  <a href="#parameter">Parameter</a></font>
+  <a href="#adorecordSet"><b><br>
+  ADORecordSet</b></a><br>
+  <font size="2">
+  Returns one field: <a href="#fields">Fields</a><br>
+ Returns one row:<a href="#fetchrow">FetchRow</a> <a 
href="#fetchinto">FetchInto</a> 
+  <a href="#fetchobject">FetchObject</a> <a 
href="#fetchnextobject">FetchNextObject</a> 
+  <a href="#fetchobj">FetchObj</a> <a href="#fetchnextobj">FetchNextObj</a>
+ <a href="#getrowassoc">GetRowAssoc</a> <br>
+  Returns all rows:<a href="#getarray">GetArray</a> <a 
href="#getrows">GetRows</a> 
+  <a href="#getassoc">GetAssoc</a><br>
+  Scrolling:<a href="#move">Move</a> <a href="#movenext">MoveNext</a> <a 
href="#movefirst">MoveFirst</a> 
+  <a href="#movelast">MoveLast</a> <a href="#abspos">AbsolutePosition</a> <a 
href="#currentrow">CurrentRow</a> 
+  <a href="#atfirstpage">AtFirstPage</a> <a href="#atlastpage">AtLastPage</a> 
+  <a href="#absolutepage">AbsolutePage</a> </font> <font size="2"><br>
+  Menu generation:<a href="#getmenu">GetMenu</a> <a 
href="#getmenu2">GetMenu2</a><br>
+  Dates:<a href="#userdate">UserDate</a> <a 
href="#usertimestamp">UserTimeStamp</a> 
+  <a href="#unixdate">UnixDate</a> <a href="#unixtimestamp">UnixTimeStamp<br>
+  </a>Recordset Info:<a href="#recordcount">RecordCount</a> <a 
href="#po_recordcount">PO_RecordSet</a> 
+  <a href="#nextrecordset">NextRecordSet</a><br>
+  Field Info:<a href="#fieldcount">FieldCount</a> <a 
href="#fetchfield">FetchField</a> 
+  <a href="#metatype">MetaType</a><br>
+  Cleanup: <a href="#rsclose">Close</a></font>  
+</p>
+<p><font size="2"><a href="#rs2html"><b>rs2html</b></a>&nbsp; <a 
href="#exrs2html">example</a></font><br>
+  <a href="#adodiff">Differences between ADOdb and ADO</a><br>
+  <a href="#driverguide"><b>Database Driver Guide<br>
+  </b></a><b><a href="#changes">Change Log</a></b><br>
+</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 
database 
+  API's (encapsulate the differences) so we can easily switch databases. PHP 
4.0.5 or later
+  is now required (because we use array-based str_replace).</p>
+<p>We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase 
SQL Anywhere, Informix, 
+  PostgreSQL, FrontBase,  SQLite, Interbase (Firebird and Borland variants), 
Foxpro, Access, ADO, DB2, SAP DB and ODBC. 
+  We have had successful reports of connecting to Progress and CacheLite 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>
+<p>Also read <a 
href="http://phplens.com/lens/adodb/tips_portable_sql.htm";>tips_portable_sql.htm</a>
 
+ for tips on writing 
+  portable SQL.</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>Portable table and index creation</b> with the <a 
href="docs-datadict.htm">datadict</a> classes.
+  </li><li><b>Database performance monitoring and SQL tuning</b> with the <a 
href="docs-perf.htm">performance monitoring</a> classes.
+  </li><li><b>Database-backed sessions</b> with the <a 
href="docs-session.htm">session management</a> classes. Supports session expiry 
notification.
+</li></ul>
+<h2>How People are using ADOdb<a name="users"></a></h2>
+Here are some examples of how people are using ADOdb (for a much longer list, 
+visit <a 
href="http://phplens.com/phpeverywhere/adodb-cool-apps";>adodb-cool-apps</a>): 
+<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.<p>
+
+</p></li><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.<p>
+
+</p></li><li><a 
href="http://www.andrew.cmu.edu/%7Erdanyliw/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.<p>
+
+</p></li><li><a href="http://www.postnuke.com/";>PostNuke</a> is a very
+popular free content management system and weblog system. It offers
+full CSS support, HTML 4.01 transitional compliance throughout, an
+advanced blocks system, and is fully multi-lingual enabled. <p>
+
+</p></li><li><a 
href="http://www.auto-net.no/easypublish.php?page=index&amp;lang_id=2";>EasyPublish
 CMS</a>
+is another free content management system for managing information and
+integrated modules on your internet, intranet- and extranet-sites. From
+Norway.<p>
+
+</p></li><li><a href="http://nola.noguska.com/";>NOLA</a> is a full featured 
accounting, inventory, and job tracking application. It is licensed under the 
GPL, and developed by Noguska.
+</li></ul><p>
+
+</p><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 the ADOdb Help forums at <a 
href="http://phplens.com/lens/lensforum/topics.php?id=4";>http://phplens.com/lens/lensforum/topics.php?id=4</a>.</p>
+<h2>Installation Guide<a name="install"></a></h2>
+<p>Make sure you are running PHP 4.0.5 or later. 
+  Unpack all the files into a directory accessible by your webserver.</p>
+<p>To test, try modifying some of the tutorial examples. Make sure you 
customize 
+  the connection settings correctly. You can debug using <i>$db-&gt;debug = 
true</i> as shown below:</p>
+<pre>&lt;?php<br>      include('adodb/adodb.inc.php');<br>     $db = <a 
href="#adonewconnection">ADONewConnection</a>($dbdriver); # eg 'mysql' or 
'postgres'<br>       $db-&gt;debug = true;<br>       $db-&gt;<a 
href="#connect">Connect</a>($server, $user, $password, $database);<br>       
$rs = $db-&gt;<a href="#execute">Execute</a>('select * from 
some_small_table');<br>     print "&lt;pre&gt;";<br>        print_r($rs-&gt;<a 
href="#getrows">GetRows</a>());<br>  print "&lt;/pre&gt;";<br>?&gt;</pre>
+
+ <h3>Minimum Install<a name="mininstall"></a></h3>
+<p>For developers who want to release a minimal install of ADOdb, you will 
need:
+</p><ul>
+<li>adodb.inc.php
+</li><li>adodb-lib.inc.php
+</li><li>adodb-time.inc.php
+</li><li>drivers/adodb-$database.inc.php
+</li><li>license.txt (for legal reasons)
+</li><li>adodb-php4.inc.php
+</li><li>adodb-iterator.inc.php
+</li></ul>
+Optional:
+<ul>
+<li>adodb-error.inc.php and lang/adodb-$lang.inc.php (if you use MetaError())
+</li><li>adodb-csvlib.inc.php (if you use cached recordsets - CacheExecute(), 
etc)
+</li><li>adodb-exceptions.inc.php and adodb-errorhandler.inc.php (if you use 
adodb error handler or php5 exceptions).
+</li></ul>
+
+<h3>Code Initialization Examples<a name="coding"></a></h3>
+<p>When running ADOdb, at least two files are loaded. First is 
adodb/adodb.inc.php, 
+ which contains all functions used by all database classes. The code specific 
+ to a particular database is in the adodb/driver/adodb-????.inc.php file.</p>
+ <a name="adonewconnection"></a>
+<p>For example, to connect to a mysql database:</p>
+<pre>include('/path/to/set/here/adodb.inc.php');<br>$conn = 
&amp;ADONewConnection('mysql');<br></pre>
+<p>Whenever you need to connect to a database, you create a Connection object 
+  using the <b>ADONewConnection</b>($driver) function. 
+  <b>NewADOConnection</b>($driver) is an alternative name for the same 
function.</p>
+
+<p>At this point, you are not connected to the database (no longer true if you 
pass in a <a href="#dsnsupport">dsn</a>). You will first need to decide
+whether to use <i>persistent</i> or <i>non-persistent</i> connections. The 
advantage of <i>persistent</i>
+connections is that they are faster, as the database connection is never 
closed (even 
+when you call Close()). <i>Non-persistent </i>connections take up much fewer 
resources though,
+reducing the risk of your database and your web-server becoming overloaded. 
+</p><p>For persistent connections,
+use $conn-&gt;<a href="#pconnect">PConnect()</a>,
+ or $conn-&gt;<a href="#connect">Connect()</a> for non-persistent connections.
+Some database drivers also support <a href="#nconnect">NConnect()</a>, which 
forces 
+the creation of a new connection. 
+
+<a name="connection_gotcha"></a>
+</p><p><b>Connection Gotcha</b>:  If you create two connections, but both use 
the same userid and password,
+PHP will share the same connection. This can cause problems if the connections 
are meant to 
+different databases. The solution is to always use different userid's for 
different databases,
+ or use NConnect().
+
+ <a name="dsnsupport"></a>
+ </p><h3>Data Source Name (DSN) Support</h3> 
+ <p> Since ADOdb 4.51, you can connect to a database by passing a dsn to 
NewADOConnection() (or ADONewConnection, which is
+ the same function). The dsn format is:
+</p><pre>      
$driver://$username:address@hidden/$database?options[=value]<br></pre><p>
+NewADOConnection() calls Connect() or PConnect() internally for you. If the 
connection fails, false is returned.
+</p><pre>      <font color="#008000"># non-persistent connection</font>
+       $dsn = 'mysql://root:address@hidden/mydb'; 
+       $db = NewADOConnection($dsn);
+       if (!$db) die("Connection failed");   
+       
+       <font color="#008000"># no need to call connect/pconnect!</font>
+       $arr = $db-&gt;GetArray("select * from table");
+       
+       <font color="#008000"># persistent connection</font>
+       $dsn2 = 'mysql://root:address@hidden/mydb?persist'; 
+</pre>
+<p>
+If you have special characters such as /:? in your dsn, then you need to 
rawurlencode them first:
+</p><pre>      $pwd = rawurlencode($pwd);<br>  $dsn = 
"mysql://root:address@hidden/mydb";<br></pre>
+<p>
+Legal options are:
+</p><p>
+<table align="center" border="1"><tbody><tr><td>For all drivers</td><td>
+       'persist', 'persistent', 'debug', 'fetchmode', 'new'
+       </td></tr><tr><td>Interbase/Firebird
+       </td><td>
+                                        'dialect','charset','buffers','role'
+       </td></tr><tr><td>M'soft ADO</td><td>
+                                        'charpage'
+                                       
+               </td></tr><tr><td>MySQL</td><td>
+                                       'clientflags'
+</td></tr><tr><td>MySQLi</td><td>
+       'port', 'socket', 'clientflags'
+</td></tr><tr><td>Oci8</td><td>
+ 'nls_date_format','charset'
+</td></tr></tbody></table>
+</p><p>
+For all drivers, when the options <i>persist</i> or <i>persistent</i> are set, 
 a persistent connection is forced; similarly, when <i>new</i> is set, then
+a new connection will be created using NConnect if the underlying driver 
supports it. 
+The <i>debug</i> option enables debugging. The <i>fetchmode</i> calls <a 
href="#setfetchmode">SetFetchMode()</a>.
+If no value is defined for an option, then the value is set to 1.
+</p><p>
+ADOdb DSN's are compatible with version 1.0 of PEAR DB's DSN format.
+<a name="connect_ex">
+</a></p><h3><a name="connect_ex">Examples of Connecting to Databases</a></h3>
+<h4><a name="connect_ex">MySQL and Most Other Database Drivers</a></h4>
+<p><a name="connect_ex">MySQL connections are very straightforward, and the 
parameters are identical 
+  to mysql_connect:</a></p>
+<pre><a name="connect_ex">     $conn = &amp;ADONewConnection('mysql'); <br>    
$conn-&gt;PConnect('localhost','userid','password','database');<br>     <br>    
<font color="#008000"># or dsn </font>
+       $dsn = 'mysql://user:address@hidden/mydb'; 
+       $conn = ADONewConnection($dsn);  # no need for Connect()
+       
+       <font color="#008000"># or persistent dsn</font>
+       $dsn = 'mysql://user:address@hidden/mydb?persist'; 
+       $conn = ADONewConnection($dsn);  # no need for PConnect()
+       
+       <font color="#008000"># a more complex example:</font>
+       $pwd = urlencode($pwd);
+       $flags =  MYSQL_CLIENT_COMPRESS;
+       $dsn = 
"mysql://user:address@hidden/mydb?persist&amp;clientflags=$flags";
+       $conn = ADONewConnection($dsn);  # no need for PConnect()
+ </a></pre>
+<p><a name="connect_ex"> For most drivers, you can use the standard function: 
Connect($server, $user, $password, $database), or
+a </a><a href="dsnsupport">DSN</a> since ADOdb 4.51. Exceptions to this are 
listed below.
+</p>
+<a name=pdo>
+<h4>PDO</h4>
+<p>PDO, which only works with PHP5, accepts a driver specific connection 
string:
+<pre>
+       $conn =& NewADConnection('pdo');
+       $conn->Connect('mysql:host=localhost',$user,$pwd,$mydb);
+       $conn->Connect('mysql:host=localhost;dbname=mydb',$user,$pwd);
+       
$conn->Connect("mysql:host=localhost;dbname=mydb;username=$user;password=$pwd");
+</pre>
+<p>The DSN mechanism is also supported:
+<pre>
+       $conn =& 
NewADConnection("pdo_mysql://user:address@hidden/mydb?persist"); # persist is 
optional
+</pre>
+<h4>PostgreSQL</h4>
+<p>PostgreSQL 7 and 8 accepts connections using: </p>
+<p>a. the standard connection string:</p>
+<pre>  $conn = &amp;ADONewConnection('postgres');  <br>        
$conn-&gt;PConnect('host=localhost port=5432 dbname=mary');</pre>
+<p> b. the classical 4 parameters:</p>
+ <pre> $conn-&gt;PConnect('localhost','userid','password','database');<br> 
</pre>
+<p>c. dsn:
+</p><pre>      $dsn = 'postgres://user:address@hidden/mydb?persist';  # 
persist is optional
+       $conn = ADONewConnection($dsn);  # no need for 
Connect/PConnect<br></pre>
+<a name="ldap"></a>
+
+ <h4>LDAP</h4>
+  <p>Here is an example of querying a LDAP server. Thanks to Josh Eldridge for 
the driver and this example:
+</p><pre>
+require('/path/to/adodb.inc.php');
+
+/* Make sure to set this BEFORE calling Connect() */
+$LDAP_CONNECT_OPTIONS = Array(
+       Array ("OPTION_NAME"=>LDAP_OPT_DEREF, "OPTION_VALUE"=>2),
+       Array ("OPTION_NAME"=>LDAP_OPT_SIZELIMIT,"OPTION_VALUE"=>100),
+       Array ("OPTION_NAME"=>LDAP_OPT_TIMELIMIT,"OPTION_VALUE"=>30),
+       Array ("OPTION_NAME"=>LDAP_OPT_PROTOCOL_VERSION,"OPTION_VALUE"=>3),
+       Array ("OPTION_NAME"=>LDAP_OPT_ERROR_NUMBER,"OPTION_VALUE"=>13),
+       Array ("OPTION_NAME"=>LDAP_OPT_REFERRALS,"OPTION_VALUE"=>FALSE),
+       Array ("OPTION_NAME"=>LDAP_OPT_RESTART,"OPTION_VALUE"=>FALSE)
+);
+$host = 'ldap.baylor.edu';
+$ldapbase = 'ou=People,o=Baylor University,c=US';
+
+$ldap = NewADOConnection( 'ldap' );
+$ldap->Connect( $host, $user_name='', $password='', $ldapbase );
+
+echo "&lt;pre>";
+
+print_r( $ldap->ServerInfo() );
+$ldap->SetFetchMode(ADODB_FETCH_ASSOC);
+$userName = 'eldridge';
+$filter="(|(CN=$userName*)(sn=$userName*)(givenname=$userName*)(uid=$userName*))";
+
+$rs = $ldap->Execute( $filter );
+if ($rs)
+       while ($arr = $rs->FetchRow()) {
+            print_r($arr);     
+       }
+
+$rs = $ldap->Execute( $filter );
+if ($rs) 
+       while (!$rs->EOF) {
+               print_r($rs->fields);   
+               $rs->MoveNext();
+       } 
+       
+print_r( $ldap->GetArray( $filter ) );
+print_r( $ldap->GetRow( $filter ) );
+
+$ldap->Close();
+echo "&lt;/pre>";
+</pre>
+<p>Using DSN:
+<pre>
+$dsn = "ldap://ldap.baylor.edu/ou=People,o=Baylor University,c=US";
+$db = NewADOConnection($dsn);
+</pre>
+<h4>Interbase/Firebird</h4>
+You define the database in the $host parameter:
+<pre>  $conn = &amp;ADONewConnection('ibase'); <br>    
$conn-&gt;PConnect('localhost:c:\ibase\employee.gdb','sysdba','masterkey');<br></pre>
+<p>Or dsn:
+</p><pre>      $dsn = 
'firebird://user:address@hidden/mydb?persist&amp;dialect=3';  # persist is 
optional<br>  $conn = ADONewConnection($dsn);  # no need for 
Connect/PConnect<br></pre>
+<h4>SQLite</h4>
+Sqlite will create the database file if it does not exist.
+<pre>  $conn = &amp;ADONewConnection('sqlite');
+       $conn-&gt;PConnect('c:\path\to\sqlite.db'); # sqlite will create if 
does not exist<br></pre>
+<p>Or dsn:
+</p><pre>      $path = urlencode('c:\path\to\sqlite.db');
+       $dsn = "sqlite://$path/?persist";  # persist is optional
+       $conn = ADONewConnection($dsn);  # no need for 
Connect/PConnect<br></pre>
+<h4>Oracle (oci8)</h4>
+<p>With oci8, you can connect in multiple ways. Note that oci8 works fine with 
+newer versions of the Oracle, eg. 9i and 10g.</p>
+<p>a. PHP and Oracle reside on the same machine, use default SID.</p>
+<pre>  $conn-&gt;Connect(false, 'scott', 'tiger');</pre>
+<p>b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 
'myTNS'</p>
+<pre>  $conn-&gt;PConnect(false, 'scott', 'tiger', 'myTNS');</pre>
+<p>or</p>
+<pre>  $conn-&gt;PConnect('myTNS', 'scott', 'tiger');</pre>
+<p>c. Host Address and SID</p>
+<pre>
+       $conn->connectSID = true;
+       $conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'SID');</pre>
+<p>d. Host Address and Service Name</p>
+<pre>  $conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'servicename');</pre>
+<p>e. Oracle connection string:
+</p><pre>      $cstr = 
"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))<br>              
        (CONNECT_DATA=(SID=$sid)))";<br>        $conn-&gt;Connect($cstr, 
'scott', 'tiger');<br></pre>
+<p>f. ADOdb dsn:
+</p><pre>      $dsn = 'oci8://user:address@hidden/?persist';  # persist is 
optional<br>        $conn = ADONewConnection($dsn);  # no need for 
Connect/PConnect<br>     <br>    $dsn = 'oci8://user:address@hidden/sid';<br>   
 $conn = ADONewConnection($dsn);<br>     <br>    $dsn = 'oci8://user:pwd@/';   
# oracle on local machine<br>     $conn = ADONewConnection($dsn);<br></pre>
+<p>You can also set the charSet for Oracle 9.2 and later, supported since PHP 
4.3.2, ADOdb 4.54:
+</p><pre>      $conn-&gt;charSet = 'we8iso8859p1';<br> 
$conn-&gt;Connect(...);<br>     <br>    # or<br>        $dsn = 
'oci8://user:address@hidden/?charset=WE8MSWIN1252';<br>  $db = 
ADONewConnection($dsn);<br></pre>
+<a name="dsnless"></a>
+<h4>DSN-less ODBC ( Access, MSSQL and DB2 examples)</h4>
+<p>ODBC DSN's can be created in the ODBC control panel, or you can use a 
DSN-less 
+  connection.To use DSN-less connections with ODBC you need PHP 4.3 or later. 
+</p>
+<p>For Microsoft Access:</p>
+<pre>  $db =&amp; ADONewConnection('access');<br>      $dsn = 
<strong>"Driver={Microsoft Access Driver 
(*.mdb)};Dbq=d:\\northwind.mdb;Uid=Admin;Pwd=;";</strong>
+       $db-&gt;Connect($dsn);
+</pre>
+For Microsoft SQL Server: 
+<pre>  $db =&amp; ADONewConnection('odbc_mssql');<br>  $dsn = 
<strong>"Driver={SQL 
Server};Server=localhost;Database=northwind;"</strong>;<br> 
$db-&gt;Connect($dsn,'userid','password');<br></pre>
+or if you prefer to use the mssql extension (which is limited to mssql 6.5 
functionality):
+<pre>  $db =&amp; ADONewConnection('mssql');<br>       
$db-&gt;Execute('localhost', 'userid', 'password', 'northwind');<br></pre>
+For DB2:
+<pre>
+       $dbms = 'db2'; # or 'odbc_db2' if db2 extension not available
+       $db =&amp; ADONewConnection($dbms);
+       $dsn = "driver={IBM db2 odbc 
DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP;".
+                               "uid=root; pwd=secret";<br>     
$db-&gt;Connect($dsn);
+</pre>
+<b>DSN-less Connections with ADO</b><br>
+If you are using versions of PHP earlier than PHP 4.3.0, DSN-less connections 
+only work with Microsoft's ADO, which is Microsoft's COM based API. An example 
+using the ADOdb library and Microsoft's ADO: 
+<pre>&lt;?php<br>      include('adodb.inc.php'); <br>  $db = 
&amp;ADONewConnection("ado_mssql");<br>   print "&lt;h1&gt;Connecting DSN-less 
$db-&gt;databaseType...&lt;/h1&gt;";<br>           <br>    
<b>$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"<br>           . 
"SERVER=flipper;DATABASE=ai;UID=sa;PWD=;"  ;</b>
+       $db-&gt;Connect($myDSN);
+       
+       $rs = $db-&gt;Execute("select * from table");
+       $arr = $rs-&gt;GetArray();
+       print_r($arr);
+?&gt;
+</pre><a name="speed"></a>
+<h2>High Speed ADOdb - tuning tips</h2>
+<p>ADOdb is a big class library, yet it <a 
href="http://phplens.com/lens/adodb/";>consistently beats</a> all other PHP 
class 
+  libraries in performance. This is because it is designed in a layered 
fashion, 
+  like an onion, with the fastest functions in the innermost layer. Stick to 
the 
+  following functions for best performance:</p>
+<table align="center" border="1" width="40%">
+  <tbody><tr>
+    <td><div align="center"><b>Innermost Layer</b></div></td>
+  </tr>
+  <tr> 
+    <td><p align="center">Connect, PConnect, NConnect<br>
+        Execute, CacheExecute<br>
+        SelectLimit, CacheSelectLimit<br>
+        MoveNext, Close <br>
+               qstr, Affected_Rows, Insert_ID</p></td>
+  </tr>
+</tbody></table>
+<p>The fastest way to access the field data is by accessing the array 
$recordset-&gt;fields 
+  directly. Also set the global variables <a 
href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a> 
+  = ADODB_FETCH_NUM, and (for oci8, ibase/firebird and odbc) <a 
href="#adodb_countrecs">$ADODB_COUNTRECS</a> = false 
+  before you connect to your database.</p>
+<p>Consider using bind parameters if your database supports it, as it improves 
+  query plan reuse. Use ADOdb's performance tuning system to identify 
bottlenecks 
+  quickly. At the time of writing (Dec 2003), this means oci8 and odbc 
drivers.</p>
+ <p>Lastly make sure you have a PHP accelerator cache installed such as APC, 
Turck 
+  MMCache, Zend Accelerator or ionCube.</p>
+ <p>Some examples:</p>
+ <table align="center" border="1"><tbody><tr><td><b>Fastest data retrieval 
using PHP</b></td><td><b>Fastest data retrieval using ADOdb 
extension</b></td></tr>
+<tr><td>
+<pre>$rs =&amp; $rs-&gt;Execute($sql);<br>while (!$rs-&gt;EOF) {<br>   
var_dump($rs-&gt;fields);<br>   $rs-&gt;MoveNext();<br>}</pre></td><td>
+<pre>$rs =&amp; $rs-&gt;Execute($sql);<br>$array = 
adodb_getall($rs);<br>var_dump($array);<br><br><br></pre></td></tr></tbody></table>
+ <p><b>Advanced Tips</b>
+ </p><p>If you have the <a 
href="http://adodb.sourceforge.net/#extension";>ADOdb C extension</a> installed, 
+ you can replace your calls to $rs-&gt;MoveNext() with adodb_movenext($rs). 
+ This doubles the speed of this operation. For retrieving entire recordsets at 
once,
+use GetArray(), which uses the high speed extension function adodb_getall($rs) 
internally.
+ </p><p>Execute() is the default way to run queries. You can use the low-level 
functions _Execute() and _query()
+to reduce query overhead.  Both these functions share the same parameters as 
Execute().
+</p><p>If you do not have any bind parameters or your database supports
+binding (without emulation),
+then you can call _Execute() directly. Calling this function bypasses
+bind emulation. Debugging is still supported in _Execute().
+</p><p>If you do not require debugging facilities nor emulated
+binding, and do not require a recordset to be returned, then you can
+call _query. This is great for inserts, updates and deletes. Calling
+this function
+bypasses emulated binding, debugging, and recordset handling. Either
+the resultid, true or false are returned by _query(). </p><p>For Informix, you 
can disable scrollable cursors with $db-&gt;cursorType = 0.
+</p><p><a name="hack"></a> </p>
+<h2>Hacking ADOdb Safely</h2>
+<p>You might want to modify ADOdb for your own purposes. Luckily you can
+still maintain backward compatibility by sub-classing ADOdb and using the 
$ADODB_NEWCONNECTION
+variable. $ADODB_NEWCONNECTION allows you to override the behaviour of 
ADONewConnection().
+ADOConnection() checks for this variable and will call
+the function-name stored in this variable if it is defined.
+</p><p>In the following example, new functionality for the connection object 
+is placed in the <i>hack_mysql</i> and <i>hack_postgres7</i> classes. The 
recordset class naming convention
+can be controlled using $rsPrefix. Here we set it to 'hack_rs_', which will 
make ADOdb use
+<i>hack_rs_mysql</i> and <i>hack_rs_postgres7</i> as the recordset classes.
+
+
+</p><pre>class hack_mysql extends adodb_mysql {<br>var $rsPrefix = 
'hack_rs_';<br>  /* Your mods here */<br>}<br><br>class hack_rs_mysql extends 
ADORecordSet_mysql {<br>       /* Your mods here */<br>}<br><br>class 
hack_postgres7 extends adodb_postgres7 {<br>var $rsPrefix = 'hack_rs_';<br>  /* 
Your mods here */<br>}<br><br>class hack_rs_postgres7 extends 
ADORecordSet_postgres7 {<br> /* Your mods here 
*/<br>}<br><br>$ADODB_NEWCONNECTION = 'hack_factory';<br><br>function&amp; 
hack_factory($driver)<br>{<br>  if ($driver !== 'mysql' &amp;&amp; $driver !== 
'postgres7') return false;<br>   <br>    $driver = 'hack_'.$driver;<br>  $obj = 
new $driver();<br>       return 
$obj;<br>}<br><br>include_once('adodb.inc.php');<br></pre>
+<p></p><p>Don't forget to call the constructor of the parent class in
+your constructor. If you want to use the default ADOdb drivers return
+false in the above hack_factory() function.
+<a name="php5"></a>
+</p><h2>PHP5 Features</h2>
+ ADOdb 4.02 or later will transparently determine which version of PHP you are 
using.
+If PHP5 is detected, the following features become available:
+<ul>
+
+<li><b>PDO</b>: PDO drivers are available. See the <a href=#pdo>connection 
examples</a>. Currently PDO drivers are
+ not as powerful as native drivers, and should be treated as 
experimental.<br><br>
+<a name="php5iterators"></a>
+<li><b>Foreach iterators</b>: This is a very natural way of going through a 
recordset:
+<pre>  $ADODB_FETCH_MODE = ADODB_FETCH_NUM;<br>        $rs = 
$db-&gt;Execute($sql);<br>        foreach($rs as $k =&gt; $row) {<br>           
  echo "r1=".$row[0]." r2=".$row[1]."&lt;br&gt;";<br>     }<br></pre>
+<p>
+<a name="php5exceptions"></a>
+</p></li><li><b>Exceptions</b>: Just include <i>adodb-exceptions.inc.php</i> 
and you can now 
+catch exceptions on errors as they occur.
+<pre>  <b>include("../adodb-exceptions.inc.php");</b> <br>     
include("../adodb.inc.php");     <br>   try { <br>              $db = 
NewADOConnection("oci8"); <br>            
$db-&gt;Connect('','scott','bad-password'); <br>        } catch (exception $e) 
{ <br>           var_dump($e); <br>              
adodb_backtrace($e-&gt;gettrace());<br> } <br></pre>
+<p>Note that reaching EOF is <b>not</b> considered an error nor an exception.
+</p></li></ul> 
+<h3><a name="drivers"></a>Databases Supported</h3>
+The <i>name</i> below is the value you pass to NewADOConnection($name) to 
create a  connection object for that database.
+<p>
+</p><p> 
+</p><table border="1" width="100%">
+  <tbody><tr valign="top"> 
+    <td><b>Name</b></td>
+    <td><b>Tested</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><font size="2">access</font></b></td>
+    <td><font size="2">B</font></td>
+    <td><font size="2">Microsoft Access/Jet. You need to create an ODBC 
DSN.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">ODBC </font></td>
+    <td><font size="2">Windows only</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">ado</font></b></td>
+    <td><font size="2">B</font></td>
+    <td><p><font size="2">Generic ADO, not tuned for specific databases. 
Allows 
+        DSN-less connections. For best performance, use an OLEDB provider. 
This 
+        is the base class for all ado drivers.</font></p>
+      <p><font size="2">You can set $db-&gt;codePage before 
connecting.</font></p></td>
+    <td><font size="2">? depends on database</font></td>
+    <td><font size="2">ADO or OLEDB provider</font></td>
+    <td><font size="2">Windows only</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">ado_access</font></b></td>
+    <td><font size="2">B</font></td>
+    <td><font size="2">Microsoft Access/Jet using ADO. Allows DSN-less 
connections. 
+      For best performance, use an OLEDB provider.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">ADO or OLEDB provider</font></td>
+    <td><font size="2">Windows only</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">ado_mssql</font></b></td>
+    <td><font size="2">B</font></td>
+    <td><font size="2">Microsoft SQL Server using ADO. Allows DSN-less 
connections. 
+      For best performance, use an OLEDB provider.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">ADO or OLEDB provider</font></td>
+    <td><font size="2">Windows only</font></td>
+  </tr>
+    <tr valign="top"> 
+    <td height="54"><b><font size="2">db2</font></b></td>
+    <td height="54"><font size="2">C</font></td>
+    <td height="54"><font size="2">Uses PHP's db2-specific extension for 
better performance.</font></td>
+    <td height="54"><font size="2">Y/N</font></td>
+    <td height="54"><font size="2">DB2 CLI/ODBC interface</font></td>
+    <td height="54"> <p><font size="2">Unix and Windows. Requires IBM DB2 
Universal Database client.</font></p></td>
+  </tr>
+  <tr valign="top"> 
+    <td height="54"><b><font size="2">odbc_db2</font></b></td>
+    <td height="54"><font size="2">C</font></td>
+    <td height="54"><font size="2">Connects to DB2 using generic ODBC 
extension.</font></td>
+    <td height="54"><font size="2">Y/N</font></td>
+    <td height="54"><font size="2">DB2 CLI/ODBC interface</font></td>
+    <td height="54"> <p><font size="2">Unix and Windows. <a 
href="http://www.faqts.com/knowledge_base/view.phtml/aid/6283/fid/14";>Unix 
+        install hints</a>. I have had reports that the $host and $database 
params have to be reversed in Connect() when using the CLI 
interface.</font></p></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">vfp</font></b></td>
+    <td><font size="2">A</font></td>
+    <td><font size="2">Microsoft Visual FoxPro. You need to create an ODBC 
DSN.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">ODBC</font></td>
+    <td><font size="2">Windows only</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">fbsql</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">FrontBase. </font></td>
+    <td><font size="2">Y</font></td>
+    <td><font size="2">?</font></td>
+    <td> <p><font size="2">Unix and Windows</font></p></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">ibase</font></b></td>
+    <td><font size="2">B</font></td>
+    <td><font size="2">Interbase 6 or earlier. Some users report you might 
need 
+      to use this<br>
+      $db-&gt;PConnect('localhost:c:/ibase/employee.gdb', "sysdba", 
"masterkey") 
+      to connect. Lacks Affected_Rows currently.<br>
+      <br>
+      You can set $db-&gt;role, $db-&gt;dialect, $db-&gt;buffers and 
$db-&gt;charSet before connecting.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">Interbase client</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><i><font size="2">firebird</font></i></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Firebird version of interbase.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">Interbase client</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><i><font size="2">borland_ibase</font></i></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Borland version of Interbase 6.5 or later. Very sad 
that 
+      the forks differ.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">Interbase client</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+
+  <tr valign="top"> 
+    <td><b><font size="2">informix</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Generic informix driver. Use this if you are using 
Informix 7.3 or later.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">Informix client</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">informix72</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2"> Informix databases before Informix 7.3 that do no 
support 
+      SELECT FIRST.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">Informix client</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">ldap</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">LDAP driver. See this example for usage 
information.</font></td>
+    <td>&nbsp;</td>
+    <td><font size="2">LDAP extension</font></td>
+    <td><font size="2">?</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td height="73"><b><font size="2">mssql</font></b></td>
+    <td height="73"><font size="2">A</font></td>
+    <td height="73"> <p><font size="2">Microsoft SQL Server 7 and later. Works 
+        with Microsoft SQL Server 2000 also. Note that date formating is 
problematic 
+        with this driver. For example, the PHP mssql extension does not return 
+        the seconds for datetime!</font></p></td>
+    <td height="73"><font size="2">Y/N</font></td>
+    <td height="73"><font size="2">Mssql client</font></td>
+    <td height="73"> <p><font size="2">Unix and Windows. <br>
+        <a href="http://phpbuilder.com/columns/alberto20000919.php3";>Unix 
install 
+        howto</a> and <a 
href="http://linuxjournal.com/article.php?sid=6636&amp;mode=thread&amp;order=0";>another
 
+        one</a>. </font></p></td>
+  </tr>
+  <tr valign="top"> 
+    <td height="73"><b><font size="2">mssqlpo</font></b></td>
+    <td height="73"><font size="2">A</font></td>
+    <td height="73"> <p><font size="2">Portable mssql driver. Identical to 
above 
+        mssql driver, except that '||', the concatenation operator, is 
converted 
+        to '+'. Useful for porting scripts from most other sql variants that 
use 
+        ||.</font></p></td>
+    <td height="73"><font size="2">Y/N</font></td>
+    <td height="73"><font size="2">Mssql client</font></td>
+    <td height="73"> <p><font size="2">Unix and Windows. <a 
href="http://phpbuilder.com/columns/alberto20000919.php3";><br>
+        Unix install howto</a>.</font></p></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">mysql</font></b></td>
+    <td><font size="2">A</font></td>
+    <td><font size="2">MySQL without transaction support. You can also set 
$db-&gt;clientFlags 
+      before connecting.</font></td>
+    <td><font size="2">Y</font></td>
+    <td><font size="2">MySQL client</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><font size="2"><b>mysqlt</b> or <b>maxsql</b></font></td>
+    <td><font size="2">A</font></td>
+    <td> <p><font size="2">MySQL with transaction support. We recommend using 
+        || as the concat operator for best portability. This can be done by 
running 
+        MySQL using: <br>
+        <i>mysqld --ansi</i> or <i>mysqld 
--sql-mode=PIPES_AS_CONCAT</i></font></p></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">MySQL client</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">oci8</font></b></td>
+    <td><font size="2">A</font></td>
+    <td><font size="2">Oracle 8/9. Has more functionality than <i>oracle</i> 
driver 
+      (eg. Affected_Rows). You might have to putenv('ORACLE_HOME=...') before 
+      Connect/PConnect. </font> <p><font size="2"> There are 2 ways of 
connecting 
+        - with server IP and service name: <br>
+        <i>PConnect('serverip:1521','scott','tiger','service'</i>)<br>
+        or using an entry in TNSNAMES.ORA or ONAMES or HOSTNAMES: <br>
+        <i>PConnect(false, 'scott', 'tiger', $oraname)</i>. </font> 
+      </p><p><font size="2">Since 2.31, we support Oracle REF cursor variables 
directly 
+        (see <a href="#executecursor">ExecuteCursor</a>).</font> </p></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">Oracle client</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">oci805</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Supports reduced Oracle functionality for Oracle 8.0.5. 
+      SelectLimit is not as efficient as in the oci8 or oci8po 
drivers.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">Oracle client</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">oci8po</font></b></td>
+    <td><font size="2">A</font></td>
+    <td><font size="2">Oracle 8/9 portable driver. This is nearly identical 
with 
+      the oci8 driver except (a) bind variables in Prepare() use the ? 
convention, 
+      instead of :bindvar, (b) field names use the more common PHP convention 
+      of lowercase names. </font> <p><font size="2">Use this driver if porting 
+        from other databases is important. Otherwise the oci8 driver offers 
better 
+        performance. </font> </p></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">Oracle client</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">odbc</font></b></td>
+    <td><font size="2">A</font></td>
+    <td><font size="2">Generic ODBC, not tuned for specific databases. To 
connect, 
+      use <br>
+      PConnect('DSN','user','pwd'). This is the base class for all odbc 
derived 
+      drivers.</font></td>
+    <td><font size="2">? depends on database</font></td>
+    <td><font size="2">ODBC</font></td>
+    <td><font size="2">Unix and Windows. <a 
href="http://phpbuilder.com/columns/alberto20000919.php3?page=4";>Unix 
+      hints.</a></font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">odbc_mssql</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Uses ODBC to connect to MSSQL</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">ODBC</font></td>
+    <td><font size="2">Unix and Windows. </font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">odbc_oracle</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Uses ODBC to connect to Oracle</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">ODBC</font></td>
+    <td><font size="2">Unix and Windows. </font></td>
+  </tr>
+    
+  <tr valign="top"> 
+    <td><b><font size="2">odbtp</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Generic odbtp driver. <a 
href="http://odbtp.sourceforge.net/";>Odbtp</a> is a software for
+       accessing Windows ODBC data sources from other operating 
systems.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">odbtp</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">odbtp_unicode</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Odtbp with unicode support</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">odbtp</font></td>
+    <td><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td height="34"><b><font size="2">oracle</font></b></td>
+    <td height="34"><font size="2">C</font></td>
+    <td height="34"><font size="2">Implements old Oracle 7 client API. Use 
oci8 
+      driver if possible for better performance.</font></td>
+    <td height="34"><font size="2">Y/N</font></td>
+    <td height="34"><font size="2">Oracle client</font></td>
+    <td height="34"><font size="2">Unix and Windows</font></td>
+  </tr>
+  <tr valign="top"> 
+    <td height="34"><b><font size="2">netezza</font></b></td>
+    <td height="34"><font size="2">C</font></td>
+    <td height="34"><font size="2">Netezza driver. Netezza is based on 
postgres code-base.</font></td>
+    <td height="34"><font size="2">Y</font></td>
+    <td height="34"><font size="2">?</font></td>
+    <td height="34"><font size="2">?</font></td>
+  </tr>
+     <tr valign="top"> 
+    <td><b><font size="2">pdo</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Generic PDO driver for PHP5. </font></td>
+    <td><font size="2">Y</font></td>
+    <td><font size="2">PDO extension and database specific drivers</font></td>
+    <td><font size="2">Unix and Windows. </font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">postgres</font></b></td>
+    <td><font size="2">A</font></td>
+    <td><font size="2">Generic PostgreSQL driver. Currently identical to 
postgres7 
+      driver.</font></td>
+    <td><font size="2">Y</font></td>
+    <td><font size="2">PostgreSQL client</font></td>
+    <td><font size="2">Unix and Windows. </font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">postgres64</font></b></td>
+    <td><font size="2">A</font></td>
+    <td><font size="2">For PostgreSQL 6.4 and earlier which does not support 
LIMIT 
+      internally.</font></td>
+    <td><font size="2">Y</font></td>
+    <td><font size="2">PostgreSQL client</font></td>
+    <td><font size="2">Unix and Windows. </font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">postgres7</font></b></td>
+    <td><font size="2">A</font></td>
+    <td><font size="2">PostgreSQL which supports LIMIT and other version 7 
functionality.</font></td>
+    <td><font size="2">Y</font></td>
+    <td><font size="2">PostgreSQL client</font></td>
+    <td><font size="2">Unix and Windows. </font></td>
+  </tr>
+    <tr valign="top"> 
+    <td><b><font size="2">postgres8</font></b></td>
+    <td><font size="2">A</font></td>
+    <td><font size="2">PostgreSQL which supports version 8 
functionality.</font></td>
+    <td><font size="2">Y</font></td>
+    <td><font size="2">PostgreSQL client</font></td>
+    <td><font size="2">Unix and Windows. </font></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">sapdb</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">SAP DB. Should work reliably as based on ODBC 
driver.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">SAP ODBC client</font></td>
+    <td> <p><font size="2">?</font></p></td>
+  </tr>
+  <tr valign="top"> 
+    <td><b><font size="2">sqlanywhere</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Sybase SQL Anywhere. Should work reliably as based on 
ODBC 
+      driver.</font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">SQL Anywhere ODBC client</font></td>
+    <td> <p><font size="2">?</font></p></td>
+  </tr>
+  <tr valign="top"> 
+    <td height="54"><b><font size="2">sqlite</font></b></td>
+    <td height="54"><font size="2">B</font></td>
+    <td height="54"><font size="2">SQLite.</font></td>
+    <td height="54"><font size="2">Y</font></td>
+    <td height="54"><font size="2">-</font></td>
+    <td height="54"> <p><font size="2">Unix and Windows.</font></p></td>
+  </tr>
+    <tr valign="top"> 
+    <td height="54"><b><font size="2">sqlitepo</font></b></td>
+    <td height="54"><font size="2">B</font></td>
+    <td height="54"><font size="2">Portable SQLite driver.  This is because 
assoc mode does not work like other drivers in sqlite.
+   Namely, when selecting (joining) multiple tables, the table
+         names are included in the assoc keys in the "sqlite" driver.</font><p>
+<font size="2">          In "sqlitepo" driver, the table names are stripped 
from the returned column names. 
+         When this results in a conflict,  the first field get preference.
+         </font></p></td>
+    <td height="54"><font size="2">Y</font></td>
+    <td height="54"><font size="2">-</font></td>
+    <td height="54"> <p><font size="2">Unix and Windows.</font></p></td>
+  </tr>
+ 
+         
+  <tr valign="top"> 
+    <td><b><font size="2">sybase</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Sybase. </font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">Sybase client</font></td>
+    <td> <p><font size="2">Unix and Windows.</font></p></td>
+  </tr>
+  
+    <tr valign="top"> 
+    <td><b><font size="2">sybase_ase</font></b></td>
+    <td><font size="2">C</font></td>
+    <td><font size="2">Sybase ASE. </font></td>
+    <td><font size="2">Y/N</font></td>
+    <td><font size="2">Sybase client</font></td>
+    <td> <p><font size="2">Unix and Windows.</font></p></td>
+  </tr>
+  </tbody></table>
+
+<p></p><p>The "Tested" column indicates how extensively the code has been 
tested 
+  and used. <br>
+  A = well tested and used by many people<br>
+  B = tested and usable, but some features might not be implemented<br>
+  C = user contributed or experimental driver. Might not fully support all of 
+  the latest features of ADOdb. </p>
+<p>The column "RecordCount() usable" indicates whether RecordCount() 
+  return the number of rows, or returns -1 when a SELECT statement is 
executed. 
+  If this column displays Y/N then the RecordCount() is emulated when the 
global 
+  variable $ADODB_COUNTRECS=true (this is the default). Note that for large 
recordsets, 
+  it might be better to disable RecordCount() emulation because substantial 
amounts 
+  of memory are required to cache the recordset for counting. Also there is a 
+  speed penalty of 40-50% if emulation is required. This is emulated in most 
databases 
+  except for PostgreSQL and MySQL. This variable is checked every time a query 
+  is executed, so you can selectively choose which recordsets to count.</p>
+<p> 
+</p><hr />
+<h1>Tutorials<a name="quickstart"></a></h1>
+<h3>Example 1: Select Statement<a name="ex1"></a></h3>
+<p>Task: Connect to the Access Northwind DSN, 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. 
+</p><pre>&lt;?<br><font face="Courier New, Courier, 
mono"><b>include</b>('adodb.inc.php');        # load code common to 
ADOdb<br>$<font color="#660000">conn</font> = &amp;ADONewConnection('access'); 
# create a connection<br>$<font 
color="#660000">conn</font>-&gt;PConnect('northwind');   # connect to 
MS-Access, northwind DSN<br>$<font color="#660000">recordSet</font> = 
&amp;$<font color="#660000">conn</font>-&gt;Execute('select * from 
products');<br>if (!$<font color="#660000">recordSet</font>) <br>        print 
$<font color="#660000">conn</font>-&gt;ErrorMsg();<br>else<br><b>while</b> 
(!$<font color="#660000">recordSet</font>-&gt;EOF) {<br>       <b>print</b> 
$<font color="#660000">recordSet</font>-&gt;fields[0].' '.$<font 
color="#660000">recordSet</font>-&gt;fields[1].'&lt;BR&gt;';<br>  $<font 
color="#660000">recordSet</font>-&gt;MoveNext();<br>}</font><font face="Courier 
New, Courier, mono">
+
+$<font color="#660000">recordSet</font>-&gt;Close(); # optional<br>$<font 
color="#660000">conn</font>-&gt;Close(); # optional<br></font>
+?&gt;
+</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. If an error occurs in 
Execute(), 
+  we return false instead of a recordset.</p>
+<p>The <code>$recordSet-&gt;fields[]</code> array is generated by the PHP 
database 
+  extension. Some database extensions only index by number and do not index 
the 
+  array by field name. To force indexing by name - that is associative arrays 
+  - use the SetFetchMode function. Each recordset saves and uses whatever 
fetch 
+  mode was set when the recordset was created in Execute() or SelectLimit(). 
+</p><pre>      $db-&gt;SetFetchMode(ADODB_FETCH_NUM);<br>      $rs1 = 
$db-&gt;Execute('select * from table');<br>      
$db-&gt;SetFetchMode(ADODB_FETCH_ASSOC);<br>    $rs2 = $db-&gt;Execute('select 
* from table');<br>      print_r($rs1-&gt;fields); # shows 
<i>array([0]=&gt;'v0',[1] =&gt;'v1')</i>
+       print_r($rs2-&gt;fields); # shows <i>array(['col1']=&gt;'v0',['col2'] 
=&gt;'v1')</i>
+</pre>
+<p> </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;?<br><font face="Courier New, Courier, 
mono"><b>include</b>('adodb.inc.php');    # load code common to ADOdb<br>$<font 
color="#660000">conn</font> = &amp;ADONewConnection('access'); # create a 
connection<br>$<font color="#660000">conn</font>-&gt;PConnect('northwind');   # 
connect to MS-Access, northwind dsn<br>$<font color="#660000">recordSet</font> 
= &amp;$<font color="#660000">conn</font>-&gt;Execute('select 
CustomerID,OrderDate from Orders');<br>if (!$<font 
color="#660000">recordSet</font>) <br>       print $<font 
color="#660000">conn</font>-&gt;ErrorMsg();<br>else<br><b>while</b> (!$<font 
color="#660000">recordSet</font>-&gt;EOF) {<br>       $<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);<br><br>
    <b>if</b> ( $<font color="#660000">type</font> == 'D' || $<font 
color="#660000">type</font> == 'T') <br>                <b>print</b> $<font 
color="#660000">recordSet</font>-&gt;fields[0].' '.<br>                     
<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;';<br>
    <b>else </b>
+               <b>print</b> $<font 
color="#660000">recordSet</font>-&gt;fields[0].' '.$<font 
color="#660000">recordSet</font>-&gt;fields[1].'&lt;BR&gt;';<br><br>      
$<font color="#660000">recordSet</font>-&gt;MoveNext();<br>}</font><font 
face="Courier New, Courier, mono">
+$<font color="#660000">recordSet</font>-&gt;Close(); # optional<br>$<font 
color="#660000">conn</font>-&gt;Close(); # optional<br></font>
+?&gt;
+</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="text"&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><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>I</b>:&nbsp; Integer 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;?<br><b>include</b>('adodb.inc.php');    # load code common to 
ADOdb<br>$<font color="#660000">conn</font> = &amp;ADONewConnection('access'); 
# create a connection<br><br>$<font 
color="#660000">conn</font>-&gt;PConnect('northwind');   # connect to 
MS-Access, northwind dsn<br>$<font color="#660000">shipto</font> = <font 
color="#006600"><b>$conn-&gt;qstr</b></font>("<i>John's Old 
Shoppe</i>");<br><br>$<font color="#660000">sql</font> = "insert into orders 
(customerID,EmployeeID,OrderDate,ShipName) ";<br>$<font 
color="#660000">sql</font> .= "values ('ANATR',2,".<b><font 
color="#006600">$conn-&gt;DBDate(</font>time()<font 
color="#006600">)</font></b><font color="#006600">.</font>",$<font 
color="#660000">shipto</font>)";<br><br><b>if</b> ($<font 
color="#660000">conn</font>-&gt;Execute($<font color="#660000">sql</font>) 
<font color="#336600"><b>=== false</b></font>) {<br>        <b>print</b> 'error 
inserting: '.<font 
color="#336600"><b>$conn-&gt;ErrorMsg()</b></font>.'&lt;BR&gt;';<br>}<br>?&gt;<br></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;?<br><b>include</b>('adodb.inc.php');    # load code common to 
ADOdb<br>$<font color="#663300">conn</font> = &amp;ADONewConnection('access'); 
# create a connection<br>$<font 
color="#663300">conn</font>-&gt;PConnect('northwind');   # connect to 
MS-Access, northwind dsn<br><font>$<font color="#663300">shipto</font> = 
<b>$conn-&gt;qstr</b>("John's Old Shoppe");<br>$<font 
color="#663300">sql</font> = "insert into orders 
(customerID,EmployeeID,OrderDate,ShipName) ";<br>$<font 
color="#663300">sql</font> .= "values ('ANATR',2,".$<font 
color="#663300">conn</font>-&gt;FormatDate(time()).",$shipto)";<br><b><font 
color="#336600">$<font color="#663300">conn</font>-&gt;debug = true;</font></b>
+<b>if</b> ($<font color="#663300">conn</font>-&gt;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;?<br><b>include</b>('adodb.inc.php'); # load code common to 
ADOdb<br>$<font color="#663300">conn</font> = &amp;ADONewConnection('mysql');  
# create a connection<br>$<font 
color="#663300">conn</font>-&gt;PConnect('localhost','userid','','agora');# 
connect to MySQL, agora db<br><font>$<font color="#663300">sql</font> = 'select 
CustomerName, CustomerID from customers';<br>$<font color="#663300">rs</font> = 
$<font color="#663300">conn</font>-&gt;Execute($sql);<br><b>print</b> <b><font 
color="#336600">$<font color="#663300">rs</font>-&gt;GetMenu('GetCust','Mary 
Rosli');<br>?&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="#getassoc1">GetAssoc</a>().</p>
+<h3>Example 6: Connecting to 2 Databases At Once<a name="ex6"></a></h3>
+<pre>&lt;?<br><b>include</b>('adodb.inc.php');  # load code common to 
ADOdb<br>$<font color="#663300">conn1</font> = &amp;ADONewConnection('mysql');  
# create a mysql connection<br>$<font color="#663300">conn2</font> = 
&amp;ADONewConnection('oracle');  # create a oracle 
connection<br><br>$conn1-&gt;PConnect($server, $userid, $password, 
$database);<br>$conn2-&gt;PConnect(false, $ora_userid, $ora_pwd, 
$oraname);<br><br>$conn1-&gt;Execute('insert 
...');<br>$conn2-&gt;Execute('update ...');<br>?&gt;</pre>
+<p> 
+</p><h3>Example 7: Generating Update and Insert SQL<a name="ex7"></a></h3>
+<p>Since ADOdb 4.56, we support <a 
href="reference.functions.getupdatesql.html#autoexecute">AutoExecute()</a>, 
+which simplifies things by providing an advanced wrapper for GetInsertSQL() 
and GetUpdateSQL(). For example,
+an INSERT can be carried out with:
+
+<pre>
+    $record["firstname"] = "Bob"; 
+    $record["lastname"] = "Smith"; 
+    $record["created"] = time(); 
+    $insertSQL = $conn->AutoExecute($rs, $record, 'INSERT'); 
+</pre>
+
+and an UPDATE with:
+<pre>
+    $record["firstname"] = "Caroline"; 
+    $record["lastname"] = "Smith"; # Update Caroline's lastname from Miranda 
to Smith 
+    $insertSQL = $conn->AutoExecute($rs, $record, 'UPDATE', 'id = 1'); 
+</pre>
+<p>
+The rest of this section is out-of-date:
+<p>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-&gt;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><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. 
+ Since ADOdb 2.42, you can pass a  table name instead of a recordset into 
+GetInsertSQL (in $rs), and it will generate an insert statement for that table.
+</p><p> 
+</p><pre>&lt;?<br>#==============================================<br># SAMPLE 
GetUpdateSQL() and GetInsertSQL() 
code<br>#==============================================<br>include('adodb.inc.php');<br>include('tohtml.inc.php');<br><br>#==========================<br>#
 This code tests an insert<br><br>$sql = "SELECT * FROM ADOXYZ WHERE id = -1"; 
<br># Select an empty record from the database<br><br>$conn = 
&amp;ADONewConnection("mysql");  # create a 
connection<br>$conn-&gt;debug=1;<br>$conn-&gt;PConnect("localhost", "admin", 
"", "test"); # connect to MySQL, testdb<br>$rs = $conn-&gt;Execute($sql); # 
Execute the query and get the empty recordset<br><br>$record = array(); # 
Initialize an array to hold the record data to insert<br><br># Set the values 
for the fields in the record<br># Note that field names are 
case-insensitive<br>$record["firstname"] = "Bob";<br>$record["lastNamE"] = 
"Smith";<br>$record["creaTed"] = time();<br><br># Pass the empty recordset and 
the array containing the data to insert<br># into the GetInsertSQL function. 
The function will process the data and return<br># a fully formatted insert sql 
statement.<br>$insertSQL = $conn-&gt;GetInsertSQL($rs, 
$record);<br><br>$conn-&gt;Execute($insertSQL); # Insert the record into the 
database<br><br>#==========================<br># This code tests an 
update<br><br>$sql = "SELECT * FROM ADOXYZ WHERE id = 1"; <br># Select a record 
to update<br><br>$rs = $conn-&gt;Execute($sql); # Execute the query and get the 
existing record to update<br><br>$record = array(); # Initialize an array to 
hold the record data to update<br><br># Set the values for the fields in the 
record<br># Note that field names are case-insensitive<br>$record["firstname"] 
= "Caroline";<br>$record["LasTnAme"] = "Smith"; # Update Caroline's lastname 
from Miranda to Smith<br><br># Pass the single record recordset and the array 
containing the data to update<br># into the GetUpdateSQL function. The function 
will process the data and return<br># a fully formatted update sql statement 
with the correct WHERE clause.<br># If the data has not changed, no recordset 
is returned<br>$updateSQL = $conn-&gt;GetUpdateSQL($rs, 
$record);<br><br>$conn-&gt;Execute($updateSQL); # Update the record in the 
database<br>$conn-&gt;Close();<br>?&gt;<br></pre>
+<a name="ADODB_FORCE_TYPE"></a>
+<b>$ADODB_FORCE_TYPE</b><p>
+The behaviour of AutoExecute(), GetUpdateSQL() and GetInsertSQL()  
+when converting empty or null PHP variables to SQL is controlled by the
+ global $ADODB_FORCE_TYPE variable. Set it to one of the values below. Default
+  is ADODB_FORCE_VALUE (3):
+</p><pre>0 = ignore empty fields. All empty fields in array are ignored.<br>1 
= force null. All empty, php null and string 'null' fields are changed to sql 
NULL values.<br>2 = force empty. All empty, php null and string 'null' fields 
are changed to sql empty '' or 0 values.<br>3 = force value. Value is left as 
it is. Php null and string 'null' are set to sql NULL values and <br>    empty 
fields '' are set to empty '' sql 
values.<br><br>define('ADODB_FORCE_IGNORE',0);<br>define('ADODB_FORCE_NULL',1);<br>define('ADODB_FORCE_EMPTY',2);<br>define('ADODB_FORCE_VALUE',3);<br></pre>
+<p>
+Thanks to Niko (nuko#mbnet.fi) for the $ADODB_FORCE_TYPE code.
+</p><p>
+Note: the constant ADODB_FORCE_NULLS is obsolete since 4.52 and is ignored. 
Set $ADODB_FORCE_TYPE = ADODB_FORCE_NULL
+for equivalent behaviour.
+<p>Since 4.62, the table name to be used can be overridden by setting 
$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
+</p><h3>Example 8: Implementing Scrolling with Next and Previous<a 
name="ex8"></a></h3>
+<p> The following code creates a very simple recordset pager, where you can 
scroll 
+  from page to page of a recordset.</p>
+<pre>include_once('../adodb.inc.php');<br>include_once('../adodb-pager.inc.php');<br>session_start();<br><br>$db
 = 
NewADOConnection('mysql');<br><br>$db-&gt;Connect('localhost','root','','xphplens');<br><br>$sql
 = "select * from adoxyz ";<br><br>$pager = new 
ADODB_Pager($db,$sql);<br>$pager-&gt;Render($rows_per_page=5);</pre>
+<p>This will create a basic record pager that looks like this: <a 
name="scr"></a> 
+</p><p> 
+<table bgcolor="beige" border="1">
+  <tbody><tr> 
+    <td> <a href="#scr"><code>|&lt;</code></a> &nbsp; <a 
href="#scr"><code>&lt;&lt;</code></a> 
+      &nbsp; <a href="#scr"><code>&gt;&gt;</code></a> &nbsp; <a 
href="#scr"><code>&gt;|</code></a> 
+      &nbsp; </td>
+  </tr>
+  <tr>
+    <td><table bgcolor="white" border="1" cols="4" width="100%">
+        <tbody><tr><th>ID</th>
+        <th>First Name</th>
+        <th>Last Name</th>
+        <th>Date Created</th>
+        </tr><tr> 
+          <td align="right">36&nbsp;</td>
+          <td>Alan&nbsp;</td>
+          <td>Turing&nbsp;</td>
+          <td>Sat 06, Oct 2001&nbsp;</td>
+        </tr>
+        <tr> 
+          <td align="right">37&nbsp;</td>
+          <td>Serena&nbsp;</td>
+          <td>Williams&nbsp;</td>
+          <td>Sat 06, Oct 2001&nbsp;</td>
+        </tr>
+        <tr> 
+          <td align="right">38&nbsp;</td>
+          <td>Yat Sun&nbsp;</td>
+          <td>Sun&nbsp;</td>
+          <td>Sat 06, Oct 2001&nbsp;</td>
+        </tr>
+        <tr> 
+          <td align="right">39&nbsp;</td>
+          <td>Wai Hun&nbsp;</td>
+          <td>See&nbsp;</td>
+          <td>Sat 06, Oct 2001&nbsp;</td>
+        </tr>
+        <tr> 
+          <td align="right">40&nbsp;</td>
+          <td>Steven&nbsp;</td>
+          <td>Oey&nbsp;</td>
+          <td>Sat 06, Oct 2001&nbsp;</td>
+        </tr>
+      </tbody></table></td>
+  </tr>
+  <tr>
+    <td><font size="-1">Page 8/10</font></td>
+  </tr>
+</tbody></table>
+</p><p>The number of rows to display at one time is controled by the 
Render($rows) 
+  method. If you do not pass any value to Render(), ADODB_Pager will default 
to 
+  10 records per page. 
+</p><p>You can control the column titles by modifying your SQL (supported by 
most 
+  databases): 
+</p><pre>$sql = 'select id as "ID", firstname as "First Name", <br>            
  lastname as "Last Name", created as "Date Created" <br>               from 
adoxyz';</pre>
+<p>The above code can be found in the <i>adodb/tests/testpaging.php</i> 
example 
+  included with this release, and the class ADODB_Pager in 
<i>adodb/adodb-pager.inc.php</i>. 
+  The ADODB_Pager code can be adapted by a programmer so that the text links 
can 
+  be replaced by images, and the dull white background be replaced with more 
interesting 
+  colors. 
+</p><p>You can also allow display of html by setting 
$pager-&gt;htmlSpecialChars = false. 
+</p><p>Some of the code used here was contributed by Iv&aacute;n Oliva and 
Cornel 
+  G. </p>
+<h3><a name="ex9"></a>Example 9: Exporting in CSV or Tab-Delimited Format</h3>
+<p>We provide some helper functions to export in comma-separated-value (CSV) 
and 
+  tab-delimited formats:</p>
+<pre><b>include_once('/path/to/adodb/toexport.inc.php');</b><br>include_once('/path/to/adodb/adodb.inc.php');<br>
+$db = &amp;NewADOConnection('mysql');<br>$db-&gt;Connect($server, $userid, 
$password, $database);<br><br>$rs = $db-&gt;Execute('select fname as "First 
Name", surname as "Surname" from table');<br><br>print "&lt;pre&gt;";<br>print 
<b>rs2csv</b>($rs); # return a string, CSV format<p>print 
'&lt;hr&gt;';<br><br>$rs-&gt;MoveFirst(); # note, some databases do not support 
MoveFirst<br>print <b>rs2tab</b>($rs,<i>false</i>); # return a string, 
tab-delimited<br>                                                # false == 
suppress field names in first line</p>print 
'&lt;hr&gt;';<br>$rs-&gt;MoveFirst();<br><b>rs2tabout</b>($rs); # send to 
stdout directly (there is also an rs2csvout function)<br>print 
"&lt;/pre&gt;";<br><br>$rs-&gt;MoveFirst();<br>$fp = fopen($path, "w");<br>if 
($fp) {<br>  <b>rs2csvfile</b>($rs, $fp); # write to file (there is also an 
rs2tabfile function)<br>  fclose($fp);<br>}<br></pre>
+<p> Carriage-returns or newlines are converted to spaces. Field names are 
returned 
+  in the first line of text. Strings containing the delimiter character are 
quoted 
+  with double-quotes. Double-quotes are double-quoted again. This conforms to 
+  Excel import and export guide-lines. 
+</p><p>All the above functions take as an optional last parameter, $addtitles 
which 
+  defaults to <i>true</i>. When set to <i>false</i> field names in the first 
line 
+  are suppressed. <br>
+</p><h3>Example 10: Recordset Filters<a name="ex10"></a></h3>
+<p>Sometimes we want to pre-process all rows in a recordset before we use it. 
+  For example, we want to ucwords all text in recordset. 
+</p><pre>include_once('adodb/rsfilter.inc.php');<br>include_once('adodb/adodb.inc.php');<br><br>//
 ucwords() every element in the recordset<br>function 
do_ucwords(&amp;$arr,$rs)<br>{<br>     foreach($arr as $k =&gt; $v) {<br>       
       $arr[$k] = ucwords($v);<br>     }<br>}<br><br>$db = 
NewADOConnection('mysql');<br>$db-&gt;PConnect('server','user','pwd','db');<br><br>$rs
 = $db-&gt;Execute('select ... from table');<br>$rs = 
<b>RSFilter</b>($rs,'do_ucwords');<br></pre>
+<p>The <i>RSFilter</i> function takes 2 parameters, the recordset, and the 
name 
+  of the <i>filter</i> function. It returns the processed recordset scrolled 
to 
+  the first record. The <i>filter</i> function takes two parameters, the 
current 
+  row as an array, and the recordset object. For future compatibility, you 
should 
+  not use the original recordset object. </p>
+<h3>Example 11:<a name="ex11"></a> Smart Transactions</h3>
+The old way of doing transactions required you to use 
+<pre>$conn-&gt;<b>BeginTrans</b>();<br>$ok = $conn-&gt;Execute($sql);<br>if 
($ok) $ok = $conn-&gt;Execute($sql2);<br>if (!$ok) 
$conn-&gt;<b>RollbackTrans</b>();<br>else 
$conn-&gt;<b>CommitTrans</b>();<br></pre>
+This is very complicated for large projects because you have to track the 
error 
+status. Smart Transactions is much simpler. You start a smart transaction by 
calling 
+StartTrans(): 
+<pre>$conn-&gt;<b>StartTrans</b>();<br>$conn-&gt;Execute($sql);<br>$conn-&gt;Execute($Sql2);<br>$conn-&gt;<b>CompleteTrans</b>();<br></pre>
+CompleteTrans() detects when an SQL error occurs, and will Rollback/Commit as 
+appropriate. To specificly force a rollback even if no error occured, use 
FailTrans(). 
+Note that the rollback is done in CompleteTrans(), and not in FailTrans(). 
+<pre>$conn-&gt;<b>StartTrans</b>();<br>$conn-&gt;Execute($sql);<br>if 
(!CheckRecords()) 
$conn-&gt;<strong>FailTrans</strong>();<br>$conn-&gt;Execute($Sql2);<br>$conn-&gt;<b>CompleteTrans</b>();<br></pre>
+<p>You can also check if a transaction has failed, using HasFailedTrans(), 
which 
+  returns true if FailTrans() was called, or there was an error in the SQL 
execution. 
+  Make sure you call HasFailedTrans() before you call CompleteTrans(), as it 
is 
+  only works between StartTrans/CompleteTrans.
+</p><p>Lastly, StartTrans/CompleteTrans is nestable, and only the outermost 
block 
+  is executed. In contrast, BeginTrans/CommitTrans/RollbackTrans is NOT 
nestable. 
+</p><pre>$conn-&gt;<strong>StartTrans</strong>();<br>$conn-&gt;Execute($sql);<br>
  $conn-&gt;<strong>StartTrans</strong>();    <font color="#006600"># 
ignored</font>
+  if (!CheckRecords()) $conn-&gt;FailTrans();
+  $conn-&gt;<strong>CompleteTrans</strong>(); <font color="#006600"># 
ignored</font>
+$conn-&gt;Execute($Sql2);
+$conn-&gt;<strong>CompleteTrans</strong>();<br></pre>
+<p>Note: Savepoints are currently not supported. 
+</p><h2><a name="errorhandling"></a>Using Custom Error Handlers and 
PEAR_Error</h2>
+<p>ADOdb supports PHP5 exceptions.  Just include 
<i>adodb-exceptions.inc.php</i> and you can now 
+catch exceptions on errors as they occur.
+</p><pre>      <b>include("../adodb-exceptions.inc.php");</b> <br>     
include("../adodb.inc.php");     <br>   try { <br>              $db = 
NewADOConnection("oci8://scott:address@hidden/"); <br>    } catch (exception 
$e) { <br>           var_dump($e); <br>              
adodb_backtrace($e-&gt;gettrace());<br> } <br></pre>
+<p> ADOdb also 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><p> Including the above file will cause 
<i>trigger_error($errorstring,E_USER_ERROR)</i> 
+  to be called when<br>
+  (a) Connect() or PConnect() fails, or <br>
+  (b) a function that executes SQL statements such as Execute() or 
SelectLimit() 
+  has an error.<br>
+  (c) GenID() appears to go into an infinite loop. 
+</p><p> The $errorstring is generated by ADOdb and will contain useful 
debugging information 
+  similar to the error.log data generated below. This file 
adodb-errorhandler.inc.php 
+  should be included before you create any ADOConnection objects. 
+</p><p> If you define error_reporting(0), no errors will be passed to the 
error handler. 
+  If you set error_reporting(E_ALL), all errors will be passed to the error 
handler. 
+  You still need to use <b>ini_set("display_errors", "0" or "1")</b> to 
control 
+  the display of errors. 
+</p><pre>&lt;?php<br><b>error_reporting(E_ALL); # pass any error messages 
triggered to error handler<br>include('adodb-errorhandler.inc.php');</b>
+include('adodb.inc.php');
+include('tohtml.inc.php');
+$c = NewADOConnection('mysql');
+$c-&gt;PConnect('localhost','root','','northwind');
+$rs=$c-&gt;Execute('select * from productsz'); #invalid table productsz');
+if ($rs) rs2html($rs);
+?&gt;
+</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. 
+</p><pre>&lt;?php<br><b>error_reporting(E_ALL); # report all 
errors<br>ini_set("display_errors", "0"); # but do not echo the 
errors<br>define('ADODB_ERROR_LOG_TYPE',3);<br>define('ADODB_ERROR_LOG_DEST','C:/errors.log');<br>include('adodb-errorhandler.inc.php');</b>
+include('adodb.inc.php');
+include('tohtml.inc.php');
+
+$c = NewADOConnection('mysql');
+$c-&gt;PConnect('localhost','root','','northwind');
+$rs=$c-&gt;Execute('select * from productsz'); ## invalid table productsz
+if ($rs) rs2html($rs);
+?&gt;
+</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<br> EXECUTE("select * from productsz")<br></pre>
+<h3>PEAR_ERROR</h3>
+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<br><b>include('adodb-errorpear.inc.php');</b>
+include('adodb.inc.php');
+include('tohtml.inc.php');
+$c = NewADOConnection('mysql');
+$c-&gt;PConnect('localhost','root','','northwind');
+$rs=$c-&gt;Execute('select * from productsz'); #invalid table productsz');
+if ($rs) rs2html($rs);
+else {
+       <b>$e = ADODB_Pear_Error();<br> echo 
'&lt;p&gt;',$e-&gt;message,'&lt;/p&gt;';</b>
+}
+?&gt;
+</pre>
+<p> You can use a PEAR_Error derived class by defining the constant 
ADODB_PEAR_ERROR_CLASS 
+  before the adodb-errorpear.inc.php file is included. For easy debugging, 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: 
+</p><pre>include('PEAR.php');<br>PEAR::setErrorHandling('PEAR_ERROR_DIE');<br></pre>
+<p> Note that we do not explicitly return a PEAR_Error object to you when an 
error 
+  occurs. We return false instead. You have to call ADODB_Pear_Error() to get 
+  the last error or use the PEAR_ERROR_DIE technique. 
+</p>
+<h3>MetaError and MetaErrMsg</h3>
+ <p>If you need error messages that work across multiple databases, then use 
<a href="#metaerror">MetaError()</a>, which returns a virtualized error number, 
based on PEAR DB's error number system, and <a href=<a 
href="#metaerrmsg">MetaErrMsg()</a>.
+
+<h4>Error Messages</h4>
+<p>Error messages are outputted using the static method 
ADOConnnection::outp($msg,$newline=true). 
+  By default, it sends the messages to the client. You can override this to 
perform 
+  error-logging. 
+</p><h2><a name="dsn"></a> Data Source Names</h2>
+<p>We now support connecting using PEAR style DSN's. A DSN is a connection 
string 
+  of the form:</p>
+<p>$dsn = <i>"$driver://$username:address@hidden/$databasename"</i>;</p>
+<p>An example:</p>
+<pre>   $username = 'root';<br>   $password = '';<br>   $hostname = 
'localhost';<br>   $databasename = 'xphplens';<br>   $driver = 'mysql';<br>   
$dsn = "$driver://$username:address@hidden/$databasename"<br>   $db = 
NewADOConnection(); <br>   # DB::Connect($dsn) also works if you include 
'adodb/adodb-pear.inc.php' at the top<br>   $rs = $db-&gt;query('select 
firstname,lastname from adoxyz');<br>   $cnt = 0;<br>   while ($arr = 
$rs-&gt;fetchRow()) {<br>               print_r($arr); print "&lt;br&gt;";<br>  
 }</pre>
+   <p></p>
+<p>   <a href="#dsnsupport">More info and connection examples</a> on the DSN 
format.
+
+</p><h2><a name="pear"></a>PEAR Compatibility</h2>
+  We support DSN's (see above), and the following functions:
+ <pre><b> DB_Common</b>
+       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
+       disconnect
+       
+       getOne
+       getAssoc
+       getRow
+       getCol
+       
+<b> DB_Result</b>
+       numRows - returns -1 if not supported
+       numCols
+       fetchInto - does not support passing of fetchmode
+       fetchRows - does not support passing of fetchmode
+       free
+</pre>
+<h2><a name="caching"></a>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><p> An example: 
+</p><pre><b>include</b>('adodb.inc.php'); # load code common to 
ADOdb<br>$ADODB_CACHE_DIR = '/usr/ADODB_cache';<br>$<font 
color="#663300">conn</font> = &amp;ADONewConnection('mysql');  # create a 
connection<br>$<font 
color="#663300">conn</font>-&gt;PConnect('localhost','userid','','agora');# 
connect to MySQL, agora db<br><font>$<font color="#663300">sql</font> = 'select 
CustomerName, CustomerID from customers';<br>$<font color="#663300">rs</font> = 
$<font color="#663300">conn</font>-&gt;CacheExecute(15,$sql);</font></pre>
+<p><font> 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 to execute and flush the cache, call 
CacheExecute() 
+  with the first parameter set to zero. Alternatively, use the 
CacheFlush($sql) 
+  call. </font></p>
+<p><font>For the sake of security, we recommend you set 
<i>register_globals=off</i> 
+  in php.ini if you are using $ADODB_CACHE_DIR.</font></p>
+<p>In ADOdb 1.80 onwards, the secs2cache parameter is optional in 
CacheSelectLimit() 
+  and CacheExecute(). If you leave it out, it will use the 
$connection-&gt;cacheSecs 
+  parameter, which defaults to 60 minutes. 
+</p><pre>      $conn-&gt;Connect(...);<br>     $conn-&gt;cacheSecs = 3600*24; 
# cache 24 hours<br>     $rs = $conn-&gt;CacheExecute('select * from 
table');<br></pre>
+<p>Please note that magic_quotes_runtime should be turned off. <a 
href="http://phplens.com/lens/lensforum/msgs.php?LeNs#LensBM_forummsg";>More 
+  info</a>, and do not change $ADODB_FETCH_MODE (or SetFetchMode) 
+  as the cached recordset will use the $ADODB_FETCH_MODE set when the query 
was executed. <font> 
+<h2><a name="pivot"></a>Pivot Tables</h2>
+</font> </p><p><font>Since ADOdb 2.30, we support the generation of 
+SQL to create pivot tables, also known as cross-tabulations. For further 
explanation 
+read this DevShed <a 
href="http://www.devshed.com/Server_Side/MySQL/MySQLWiz/";>Cross-Tabulation 
+tutorial</a>. We assume that your database supports the SQL case-when 
expression. </font></p> 
+<font> 
+<p>In this example, we will use the Northwind database from Microsoft. In the 
+  database, we have a products table, and we want to analyze this table by 
<i>suppliers 
+  versus product categories</i>. We will place the suppliers on each row, and 
+  pivot on categories. So from the table on the left, we generate the 
pivot-table 
+  on the right:</p>
+</font> 
+<table align="center" border="0" cellpadding="2" cellspacing="2">
+  <tbody><tr>
+       <td>
+         <table align="center" border="1" cellpadding="2" cellspacing="2" 
width="142">
+               <tbody><tr> 
+                 <td><i>Supplier</i></td>
+                 <td><i>Category</i></td>
+               </tr>
+               <tr> 
+                 <td>supplier1</td>
+                 <td>category1</td>
+               </tr>
+               <tr> 
+                 <td>supplier2</td>
+                                       <td>category1</td>
+               </tr>
+               <tr> 
+                                       <td>supplier2</td>
+                 <td>category2</td>
+               </tr>
+         </tbody></table>
+       </td>
+       <td> <font face="Courier New, Courier, mono">--&gt;</font></td>
+       <td>
+         <table align="center" border="1" cellpadding="2" cellspacing="2">
+               <tbody><tr> 
+                 <td>&nbsp;</td>
+                 <td><i>category1</i></td>
+                 <td><i>category2</i></td>
+                 <td><i>total</i></td>
+               </tr>
+               <tr> 
+                 <td><i>supplier1</i></td>
+                 <td align="right">1</td>
+                 <td align="right">0</td>
+                 <td align="right">1</td>
+               </tr>
+               <tr> 
+                 <td><i>supplier2</i></td>
+                 <td align="right">1</td>
+                 <td align="right">1</td>
+                 <td align="right">2</td>
+               </tr>
+         </tbody></table>
+       </td>
+  </tr>
+</tbody></table>
+<font> 
+</font><p><font>The following code will generate the SQL for a 
cross-tabulation: 
+</font></p><pre><font># Query the main "product" table<br># Set the rows to 
CompanyName<br># and the columns to the values of Categories<br># and define 
the joins to link to lookup tables <br># "categories" and "suppliers"<br>#<br> 
include "adodb/pivottable.inc.php";<br> $sql = PivotTableSQL(<br>      $gDB,    
                                  # adodb connection<br>       'products p 
,categories c ,suppliers s',   # tables<br> 'CompanyName',                      
       # rows (multiple fields allowed)<br> 'CategoryName',                     
       # column to pivot on <br>    'p.CategoryID = c.CategoryID and 
s.SupplierID= p.SupplierID' # joins/where<br>);<br></font></pre>
+ 
+<p><font> This will generate the following SQL:</font></p>
+<p><code><font size="2">SELECT CompanyName, <br>
+  SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
+  <br>
+  SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
+  <br>
+  SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS 
"Confections", 
+  <br>
+  SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy 
+  Products", <br>
+  SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS 
"Grains/Cereals", 
+  <br>
+  SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS 
"Meat/Poultry", 
+  <br>
+  SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
+  <br>
+  SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
+  <br>
+  SUM(1) as Total <br>
+  FROM products p ,categories c ,suppliers s WHERE p.CategoryID = c.CategoryID 
+  and s.SupplierID= p.SupplierID <br>
+  GROUP BY CompanyName</font></code></p>
+<p> You can also pivot on <i>numerical columns</i> and <i>generate totals</i> 
+       by using ranges. <font>This code was revised in ADODB 2.41 
+       and is not backward compatible.</font> The second example shows 
this:</p>
+<pre> $sql = PivotTableSQL(<br>        $gDB,                                   
    # adodb connection<br>      'products p ,categories c ,suppliers s',    # 
tables<br>        'CompanyName',                              #<font> rows 
(multiple fields allowed)</font>
+   array(                                       # column ranges
+       ' 0 '      =&gt; 'UnitsInStock &lt;= 0',
+       "1 to 5"   =&gt; '0 &lt; UnitsInStock and UnitsInStock &lt;= 5',
+       "6 to 10"  =&gt; '5 &lt; UnitsInStock and UnitsInStock &lt;= 10',
+       "11 to 15" =&gt; '10 &lt; UnitsInStock and UnitsInStock &lt;= 15',
+       "16+"      =&gt; '15 &lt; UnitsInStock'
+       ),
+       ' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # 
joins/where
+       'UnitsInStock',                             # sum this field
+       'Sum '                                      # sum label prefix
+);
+</pre> 
+<p>Which generates: </p>
+<p> <code> <font size="2">SELECT CompanyName, <br>
+       SUM(CASE WHEN UnitsInStock &lt;= 0 THEN UnitsInStock ELSE 0 END) AS 
"Sum 
+       0 ", <br>
+       SUM(CASE WHEN 0 &lt; UnitsInStock and UnitsInStock &lt;= 5 THEN 
UnitsInStock 
+       ELSE 0 END) AS "Sum 1 to 5",<br>
+       SUM(CASE WHEN 5 &lt; UnitsInStock and UnitsInStock &lt;= 10 THEN 
UnitsInStock 
+       ELSE 0 END) AS "Sum 6 to 10",<br>
+       SUM(CASE WHEN 10 &lt; UnitsInStock and UnitsInStock &lt;= 15 THEN 
UnitsInStock 
+       ELSE 0 END) AS "Sum 11 to 15", <br>
+       SUM(CASE WHEN 15 &lt; UnitsInStock THEN UnitsInStock ELSE 0 END) AS 
"Sum 
+       16+", <br>
+       SUM(UnitsInStock) AS "Sum UnitsInStock", <br>
+       SUM(1) as Total,<br>
+       FROM products p ,categories c ,suppliers s WHERE p.CategoryID = 
c.CategoryID 
+       and s.SupplierID= p.SupplierID <br>
+       GROUP BY CompanyName</font></code><font size="2"><br>
+       </font> </p>
+<font><hr />
+<h1>Class Reference<a name="ref"></a></h1>
+<p>Function parameters with [ ] around them are optional.</p>
+</font> 
+<h2>Global Variables</h2>
+<h3><font><a name="adodb_countrecs"></a></font>$ADODB_COUNTRECS</h3>
+<p>If the database driver API does not support counting the number of records 
+       returned in a SELECT statement, the function RecordCount() is emulated 
when 
+       the global variable $ADODB_COUNTRECS is set to true, which is the 
default. 
+       We emulate this by buffering the records, which can take up large 
amounts 
+       of memory for big recordsets. Set this variable to false for the best 
performance. 
+       This variable is checked every time a query is executed, so you can 
selectively 
+       choose which recordsets to count.</p>
+<h3><font><a name="adodb_cache_dir"></a>$ADODB_CACHE_DIR</font></h3>
+<font> 
+<p>If you are using recordset caching, this is the directory to save your 
recordsets 
+  in. Define this before you call any caching functions such as CacheExecute( 
+  ). We recommend setting <i>register_globals=off</i> in php.ini if you use 
this 
+  feature for security reasons.</p>
+<p>If you are using Unix and apache, you might need to set your cache 
directory 
+  permissions to something similar to the following:</p>
+</font> 
+<p>chown -R apache /path/to/adodb/cache<br>
+  chgrp -R apache /path/to/adodb/cache </p>
+<h3><font><a 
name="adodb_ansi_padding_off"></a>$ADODB_ANSI_PADDING_OFF</font></h3>
+<p><font>Determines whether to right trim CHAR fields (and also VARCHAR for 
ibase/firebird).
+Set to true to trim. Default is false. Currently works for oci8po, ibase and 
firebird 
+drivers. Added in ADOdb 4.01.
+</font></p><h3><font><a name="adodb_lang"></a>$ADODB_LANG</font></h3>
+<p><font>Determines the language used in MetaErrorMsg(). The default is 'en', 
for English. 
+To find out what languages are supported, see the files 
+in adodb/lang/adodb-$lang.inc.php, where $lang is the supported langauge.
+</font></p><h3><font><a 
name="adodb_fetch_mode"></a>$ADODB_FETCH_MODE</font></h3>
+<p><font>This is a global variable that determines how arrays are retrieved by 
recordsets. 
+  The recordset saves this value on creation (eg. in Execute( ) or 
SelectLimit( 
+  )), and any subsequent changes to $ADODB_FETCH_MODE have no affect on 
existing 
+  recordsets, only on recordsets created in the future.</font></p>
+<p><font>The following constants are defined:</font></p>
+ 
+<p><font>define('ADODB_FETCH_DEFAULT',0);<br>
+  define('ADODB_FETCH_NUM',1);<br>
+  define('ADODB_FETCH_ASSOC',2);<br>
+  define('ADODB_FETCH_BOTH',3); </font></p>
+<font> 
+</font><p><font> An example: 
+</font></p><pre><font> $ADODB_<b>FETCH_MODE</b> = ADODB_FETCH_NUM;<br> $rs1 = 
$db-&gt;Execute('select * from table');<br>      $ADODB_<b>FETCH_MODE</b> = 
ADODB_FETCH_ASSOC;<br>       $rs2 = $db-&gt;Execute('select * from table');<br> 
     print_r($rs1-&gt;fields); # shows <i>array([0]=&gt;'v0',[1] =&gt;'v1')</i>
+       print_r($rs2-&gt;fields); # shows <i>array(['col1']=&gt;'v0',['col2'] 
=&gt;'v1')</i>
+</font></pre>
+<p><font> As you can see in the above example, both recordsets store and use 
different 
+       fetch modes based on the $ADODB_FETCH_MODE setting when the recordset 
was 
+       created by Execute().</font></p>
+<p><font>If no fetch mode is predefined, the fetch mode defaults to 
ADODB_FETCH_DEFAULT. 
+       The behaviour of this default mode varies from driver to driver, so do 
not 
+       rely on ADODB_FETCH_DEFAULT. For portability, we recommend sticking to 
ADODB_FETCH_NUM 
+       or ADODB_FETCH_ASSOC. Many drivers do not support 
ADODB_FETCH_BOTH.</font></p>
+<p><font><strong>SetFetchMode Function</strong></font></p>
+<p><font>If you have multiple connection objects, and want to have different 
fetch modes for each 
+connection, then use <a href="#setfetchmode">SetFetchMode</a>. 
+       Once this function is called for a connection object, that connection 
object 
+       will ignore the global variable $ADODB_FETCH_MODE and will use the 
internal 
+       fetchMode property exclusively.</font></p>
+<pre><font>    $db-&gt;SetFetchMode(ADODB_FETCH_NUM);<br>      $rs1 = 
$db-&gt;Execute('select * from table');<br>      
$db-&gt;SetFetchMode(ADODB_FETCH_ASSOC);<br>    $rs2 = $db-&gt;Execute('select 
* from table');<br>      print_r($rs1-&gt;fields); # shows 
<i>array([0]=&gt;'v0',[1] =&gt;'v1')</i>
+       print_r($rs2-&gt;fields); # shows <i>array(['col1']=&gt;'v0',['col2'] 
=&gt;'v1')</i></font></pre>
+<p><font>To retrieve the previous fetch mode, you can use check the 
$db-&gt;fetchMode 
+       property, or use the return value of SetFetchMode( ). 
+</font></p><p><font><strong><a 
name="adodb_assoc_case"></a>ADODB_ASSOC_CASE</strong></font></p>
+<p><font>You can control the associative fetch case for certain drivers which 
behave 
+       differently. For the sybase, oci8po, mssql, odbc and ibase drivers and 
all 
+       drivers derived from them, ADODB_ASSOC_CASE will by default generate 
recordsets 
+       where the field name keys are lower-cased. Use the constant 
ADODB_ASSOC_CASE 
+       to change the case of the keys. There are 3 possible values:</font></p>
+<p><font>0 = assoc lowercase field names. $rs-&gt;fields['orderid']<br>
+       1 = assoc uppercase field names. $rs-&gt;fields['ORDERID']<br>
+       2 = use native-case field names. $rs-&gt;fields['OrderID'] -- this is 
the 
+       default since ADOdb 2.90</font></p>
+<p><font>To use it, declare it before you incldue adodb.inc.php.</font></p>
+<p><font>define('ADODB_ASSOC_CASE', 2); # use native-case for 
ADODB_FETCH_ASSOC<br>
+       include('adodb.inc.php'); </font></p>
+<h3><font><a name="force_type"></a>$ADODB_FORCE_TYPE</font></h3>
+<p><font>See the <a href="#ADODB_FORCE_TYPE">GetUpdateSQL tutorial</a>.
+</font></p><hr />
+<h2><font>ADOConnection<a name="adoconnection"></a></font></h2>
+<p><font>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.</font></p>
+<h3><font>ADOConnection Fields</font></h3>
+<p><font><b>databaseType</b>: Name of the database system we are connecting 
to. Eg. 
+       <b>odbc</b> or <b>mssql</b> or <b>mysql</b>.</font></p>
+<p><font><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>.</font></p>
+<p><font><b>host: </b>Name of server or data source name (DSN) to connect 
to.</font></p>
+<p><font><b>database</b>: Name of the database or to connect to. If ado is 
used, it 
+       will hold the ado data provider.</font></p>
+<p><font><b>user</b>: Login id to connect to database. Password is not saved 
for security 
+       reasons.</font></p>
+<p><font><b>raiseErrorFn</b>: Allows you to define an error handling function. 
See adodb-errorhandler.inc.php 
+       for an example.</font></p>
+<p><font><b>debug</b>: Set to <i>true</i> to make debug statements to 
appear.</font></p>
+<p><font><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.</font></p>
+<p><font><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.</font></p>
+<p><font><b>fmtTimeStamp: </b>The format used by the <b><a 
href="#dbtimestamp">DBTimeStamp</a></b> 
+       function to send timestamps to the database. </font></p>
+<p><font><b>true</b>: The value used to represent true.Eg. '.T.'. for Foxpro, 
'1' for 
+       Microsoft SQL.</font></p>
+<p><font><b>false: </b> The value used to represent false. Eg. '.F.'. for 
Foxpro, '0' 
+       for Microsoft SQL.</font></p>
+<p><font><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>.</font></p>
+<p><font><b>autoCommit</b>: indicates whether automatic commit is enabled. 
Default is 
+       true.</font></p>
+<p><font><b>charSet</b>: set the default charset to use. Currently only 
interbase/firebird supports 
+       this.</font></p>
+<p><font><b>dialect</b>: set the default sql dialect to use. Currently only 
interbase/firebird 
+       supports this.</font></p>
+       <p><font><b>role</b>: set the role. Currently only interbase/firebird 
+       supports this.</font></p>
+<p><font><b>metaTablesSQL</b>: SQL statement to return a list of available 
tables. Eg. 
+       <i>SHOW TABLES</i> in MySQL.</font></p>
+<p><font><b>genID</b>: The latest id generated by GenID() if supported by the 
database.</font></p>
+<p><font><b>cacheSecs</b>: The number of seconds to cache recordsets if 
CacheExecute() 
+       or CacheSelectLimit() omit the $secs2cache parameter. Defaults to 60 
minutes.</font></p>
+<p><font><b>sysDate</b>: String that holds the name of the database function 
to call 
+       to get the current date. Useful for inserts and updates.</font></p>
+<p><font><b>sysTimeStamp</b>: String that holds the name of the database 
function to 
+       call to get the current timestamp/datetime value.</font></p>
+<p><font><b>leftOuter</b>: String that holds operator for left outer join, if 
known. 
+       Otherwise set to false.</font></p>
+<p><font><b>rightOuter</b>: String that holds operator for left outer join, if 
known. 
+       Otherwise set to false.</font></p>
+<p><font><b>ansiOuter</b>: Boolean that if true indicates that ANSI style 
outer joins 
+       are permitted. Eg. <i>select * from table1 left join table2 on 
p1=p2.</i></font></p>
+<p><font><b>connectSID</b>: Boolean that indicates whether to treat the 
$database parameter 
+       in connects as the SID for the oci8 driver. Defaults to false. Useful 
for 
+       Oracle 8.0.5 and earlier.</font></p>
+<p><font><b>autoRollback</b>: Persistent connections are auto-rollbacked in 
PConnect( 
+       ) if this is set to true. Default is false.</font></p>
+<hr />
+<h3><font>ADOConnection Main Functions</font></h3>
+<p><font><b>ADOConnection( )</b></font></p>
+<p><font>Constructor function. Do not call this directly. Use 
ADONewConnection( ) instead.</font></p>
+<p><font><b>Connect<a 
name="connect"></a>($host,[$user],[$password],[$database])</b></font></p>
+<p><font>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>. </font></p>
+<p><font>Returns true/false depending on connection success. Since 4.23, null 
is returned if the extension is not loaded.</font></p>
+<p><font>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.</font></p>
+<p><font>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.</font></p>
+<p><font>For Oracle and Oci8, there are two ways to connect. First is to use 
the TNS 
+       name defined in your local tnsnames.ora (or ONAMES or HOSTNAMES). Place 
the 
+       name in the $database field, and set the $host field to false. 
Alternatively, 
+       set $host to the server, and $database to the database SID, this 
bypassed 
+       tnsnames.ora. 
+</font></p><p><font>Examples: 
+</font></p><pre><font> # $oraname in tnsnames.ora/ONAMES/HOSTNAMES<br> 
$conn-&gt;Connect(false, 'scott', 'tiger', $oraname); <br> 
$conn-&gt;Connect('server:1521', 'scott', 'tiger', 'ServiceName'); # bypass 
tnsnames.ora</font></pre>
+<p><font>There are many examples of connecting to a database.
+See  <a href="#connect_ex">Connection Examples</a> for many examples.
+
+</font></p><p><font><b>PConnect<a 
name="pconnect"></a>($host,[$user],[$password],[$database])</b></font></p>
+<p><font>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>.</font></p>
+<p><font>We now perform a rollback on persistent connection for selected 
databases since 
+       2.21, as advised in the PHP manual. See change log or source code for 
which 
+       databases are affected. 
+</font></p><p><font>Returns true/false depending on connection. Since 4.23, 
null is returned if the extension is not loaded.
+See Connect( ) above for more info.</font></p>
+<p><font>Since ADOdb 2.21, we also support autoRollback. If you set:</font></p>
+ 
+<pre> $conn = &amp;NewADOConnection('mysql');<br> $conn-&gt;autoRollback = 
true; # default is false<br> $conn-&gt;PConnect(...); # rollback here</pre>
+<p> Then when doing a persistent connection with PConnect( ), ADOdb will 
+  perform a rollback first. This is because it is documented that PHP is 
+  not guaranteed to rollback existing failed transactions when 
+  persistent connections are used. This is implemented in Oracle, 
+  MySQL, PgSQL, MSSQL, ODBC currently. 
+</p><p>Since ADOdb 3.11, you can force non-persistent 
+connections even if PConnect is called by defining the constant 
+ADODB_NEVER_PERSIST  before you call PConnect.
+</p><p>
+Since 4.23, null is returned if the extension is not loaded.
+</p><p><b>NConnect<a 
name="nconnect"></a>($host,[$user],[$password],[$database])</b></p>
+<p>Always force a new connection. In contrast, PHP sometimes reuses 
connections 
+       when you use Connect() or PConnect(). Currently works only on mysql 
(PHP 4.3.0 
+       or later), postgresql and oci8-derived drivers. For other drivers, 
NConnect() works like 
+       Connect().</p>
+<p><font><b>IsConnected( )<a name="isconnected"></a></b></font></p>
+<p>
+<font>Returns true if connected to database. Added in 4.53.
+
+</font></p><p><font><b>Execute<a 
name="execute"></a>($sql,$inputarr=false)</b></font></p>
+<p><font>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. You can also pass in 
$sql a statement prepared 
+       in <a href="#prepare">Prepare()</a>.</font></p>
+<p><font>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.</font></p>
+<p><font>The $inputarr parameter can be used for binding variables to 
parameters. Below 
+       is an Oracle example:</font></p>
+<pre><font> $conn-&gt;Execute("SELECT * FROM TABLE WHERE COND=:val", 
array('val'=&gt; $val));<br> </font></pre>
+<p><font>Another example, using ODBC,which uses the ? convention:</font></p>
+<pre><font>  $conn-&gt;Execute("SELECT * FROM TABLE WHERE COND=?", 
array($val));<br></font></pre>
+<font><a name="binding"></a>
+<i>Binding variables</i></font><p>
+<font>Variable binding speeds the compilation and caching of SQL statements, 
leading 
+to higher performance. Currently Oracle, Interbase and ODBC supports variable 
binding. 
+Interbase/ODBC style ? binding is emulated in databases that do not support 
binding. 
+Note that you do not have to quote strings if you use binding.
+</font></p><p><font> Variable binding in the odbc, interbase and oci8po 
drivers. 
+</font></p><pre><font>$rs = $db-&gt;Execute('select * from table where val=?', 
array('10'));<br></font></pre>
+<font>Variable binding in the oci8 driver: 
+</font><pre><font>$rs = $db-&gt;Execute('select name from table where 
val=:key', <br>  array('key' =&gt; 10));<br></font></pre>
+<font><a name="bulkbind"></a>
+<i>Bulk binding</i>
+</font><p><font>Since ADOdb 3.80, we support bulk binding in Execute(), in 
which you pass in a 2-dimensional array to
+be bound to an INSERT/UPDATE or DELETE statement.
+</font></p><pre><font>$arr = array(<br>        array('Ahmad',32),<br>  
array('Zulkifli', 24),<br>      array('Rosnah', 21)<br> );<br>$ok = 
$db-&gt;Execute('insert into table (name,age) values 
(?,?)',$arr);<br></font></pre>
+<p><font>This provides very high performance as the SQL statement is prepared 
first. 
+The prepared statement is executed repeatedly for each array row until all 
rows are completed, 
+or until the first error. Very useful for importing data.
+
+</font></p><p><font><b>CacheExecute<a 
name="cacheexecute"></a>([$secs2cache,]$sql,$inputarr=false)</b></font></p>
+<p><font>Similar to Execute, except that the recordset is cached for 
$secs2cache seconds 
+       in the $ADODB_CACHE_DIR directory, and $inputarr only accepts 
1-dimensional arrays. 
+       If CacheExecute() is called again with the same $sql, $inputarr, 
+       and also the same database, same userid, and the cached recordset 
+       has not expired, the cached recordset is returned. 
+</font></p><pre><font>  include('adodb.inc.php'); <br>  
include('tohtml.inc.php');<br>  $ADODB_<b>CACHE_DIR</b> = 
'/usr/local/ADOdbcache';<br>  $conn = &amp;ADONewConnection('mysql'); <br>  
$conn-&gt;PConnect('localhost','userid','password','database');<br>  $rs = 
$conn-&gt;<b>CacheExecute</b>(15, 'select * from table'); # cache 15 secs<br>  
rs2html($rs); /* recordset to html table */  <br></font></pre>
+<p><font> Alternatively, since ADOdb 1.80, the $secs2cache parameter is 
optional:</font></p>
+<pre><font>    $conn-&gt;Connect(...);<br>     $conn-&gt;cacheSecs = 3600*24; 
// cache 24 hours<br>    $rs = $conn-&gt;CacheExecute('select * from 
table');<br></font></pre>
+<font>If $secs2cache is omitted, we use the value 
+in $connection-&gt;cacheSecs (default is 3600 seconds, or 1 hour). Use 
CacheExecute() 
+only with SELECT statements. 
+</font><p><font>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. 
</font></p>
+<p><font><b>ExecuteCursor<a 
name="executecursor"></a>($sql,$cursorName='rs',$parameters=false)</b></font></p>
+<p><font>Execute an Oracle stored procedure, and returns an Oracle REF cursor 
variable as 
+       a regular ADOdb recordset. Does not work with any other database except 
oci8. 
+       Thanks to Robert Tuttle for the design.
+</font></p><pre><font>    $db = ADONewConnection("oci8"); <br>    
$db-&gt;Connect("foo.com:1521", "uid", "pwd", "FOO"); <br>    $rs = 
$db-&gt;ExecuteCursor("begin :cursorvar := getdata(:param1); end;", <br>        
                         'cursorvar',<br>                                       
 array('param1'=&gt;10)); <br>    # $rs is now just like any other ADOdb 
recordset object<br>    rs2html($rs);</font></pre>
+<p><font>ExecuteCursor() is a helper function that does the following 
internally: 
+</font></p><pre><font> $stmt = $db-&gt;Prepare("begin :cursorvar := 
getdata(:param1); end;", true); <br>       $db-&gt;Parameter($stmt, $cur, 
'cursorvar', false, -1, OCI_B_CURSOR);<br>       $rs = 
$db-&gt;Execute($stmt,$bindarr);<br></font></pre>
+<p><font>ExecuteCursor only accepts 1 out parameter. So if you have 2 out 
parameters, use:
+</font></p><pre><font> $vv = 'A%';<br> $stmt = $db-&gt;PrepareSP("BEGIN 
list_tabs(:crsr,:tt); END;");<br>      $db-&gt;OutParameter($stmt, $cur, 
'crsr', -1, OCI_B_CURSOR);<br>        $db-&gt;OutParameter($stmt, $vv, 'tt', 
32); # return varchar(32)<br>    $arr = $db-&gt;GetArray($stmt);<br>     
print_r($arr);<br>      echo " val = $vv"; ## outputs 'TEST'<br></font></pre>
+<font>for the following PL/SQL:
+</font><pre><font>     TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;<br><br>  
PROCEDURE list_tabs(tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) IS<br>  
BEGIN<br>               OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE 
tablenames;<br>           tablenames := 'TEST';<br>       END 
list_tabs;<br></font></pre>
+<p><font><b>SelectLimit<a 
name="selectlimit"></a>($sql,$numrows=-1,$offset=-1,$inputarr=false)</b></font></p>
+<p><font>Returns a recordset if successful. Returns false otherwise. Performs 
a select 
+       statement, simulating PostgreSQL's SELECT statement, LIMIT $numrows 
OFFSET 
+       $offset clause.</font></p>
+<p><font>In PostgreSQL, SELECT * FROM TABLE LIMIT 3 will return the first 3 
records 
+       only. The equivalent is <code>$connection-&gt;SelectLimit('SELECT * 
FROM TABLE',3)</code>. 
+       This functionality is simulated for databases that do not possess this 
feature.</font></p>
+<p><font>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-&gt;SelectLimit('SELECT 
+       * FROM TABLE',3,2)</code>.</font></p>
+<p><font>Note that this is the <i>opposite</i> of MySQL's LIMIT clause. You 
can also 
+       set <code>$connection-&gt;SelectLimit('SELECT * FROM 
TABLE',-1,10)</code> to 
+       get rows 11 to the last row.</font></p>
+<p><font>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:</font></p>
+<pre><font> $conn-&gt;SelectLimit("SELECT * FROM TABLE WHERE COND=:val", 
100,-1,array('val'=&gt; $val));<br> </font></pre>
+<p><font>The oci8po driver (oracle portable driver) uses the more standard 
bind variable 
+       of ?: 
+</font></p><pre><font> $conn-&gt;SelectLimit("SELECT * FROM TABLE WHERE 
COND=?", 100,-1,array('val'=&gt; $val));<br></font></pre>
+<p><font> 
+</font></p><p><font>Ron Wilson reports that SelectLimit does not work with 
UNIONs. 
+</font></p><p><font><b>CacheSelectLimit<a 
name="cacheselectlimit"></a>([$secs2cache,] $sql, 
$numrows=-1,$offset=-1,$inputarr=false)</b></font></p>
+<p><font>Similar to SelectLimit, except that the recordset returned is cached 
for $secs2cache 
+       seconds in the $ADODB_CACHE_DIR directory. </font></p>
+<p><font>Since 1.80, $secs2cache has been optional, and you can define the 
caching time 
+       in $connection-&gt;cacheSecs.</font></p>
+ 
+<pre><font>    $conn-&gt;Connect(...);<br>   $conn-&gt;cacheSecs = 3600*24; // 
cache 24 hours<br>      $rs = $conn-&gt;CacheSelectLimit('select * from 
table',10);</font></pre>
+<font> 
+</font><p><font><b>CacheFlush<a 
name="cacheflush"></a>($sql=false,$inputarr=false)</b></font></p>
+<p><font>Flush (delete) any cached recordsets for the SQL statement $sql in 
$ADODB_CACHE_DIR. 
+</font></p><p><font>If no parameter is passed in, then all adodb_*.cache files 
are deleted. 
+</font></p><p><font> If you want to flush all cached recordsets manually, 
execute the following 
+       PHP code (works only under Unix): <br>
+       <code> &nbsp; system("rm -f `find ".$ADODB_CACHE_DIR." -name 
+       adodb_*.cache`");</code></font></p>
+<p><font>For general cleanup of all expired files, you should use <a 
href="http://www.superscripts.com/tutorial/crontab.html";>crontab</a> 
+       on Unix, or at.exe on Windows, and a shell script similar to the 
following:<font face="Courier New, Courier, mono"><br>
+       #------------------------------------------------------ <br>
+       # This particular example deletes files in the TMPPATH <br>
+       # directory with the string ".cache" in their name that <br>
+       # are more than 7 days old. <br>
+       #------------------------------------------------------ <br>
+       AGED=7 <br>
+       find ${TMPPATH} -mtime +$AGED | grep "\.cache" | xargs rm -f <br>
+       </font> </font></p>
+<p><font><b>MetaError<a name="metaerror"></a>($errno=false)</b></font></p>
+<p><font>Returns a virtualized error number, based on PEAR DB's error number 
system. You might
+need to include adodb-error.inc.php before you call this function. The 
parameter $errno
+is the native error number you want to convert. If you do not pass any 
parameter, MetaError
+will call ErrorNo() for you and convert it. If the error number cannot be 
virtualized, MetaError 
+will return -1 (DB_ERROR).</font></p>
+
+<p><font><b>MetaErrorMsg<a name="metaerrormsg"></a>($errno)</b></font></p>
+<p><font>Pass the error number returned by MetaError() for the equivalent 
textual error message.</font></p>
+<p><font><b>ErrorMsg<a name="errormsg"></a>()</b></font></p>
+<p><font>Returns the last status or error message. The error message is reset 
after every 
+call to Execute(). 
+</font></p><p>
+<font>This can return a string even if 
+       no error occurs. In general you do not need to call this function 
unless an 
+       ADOdb function returns false on an error. </font></p>
+<p><font>Note: If <b>debug</b> is enabled, the SQL error message is always 
displayed 
+       when the <b>Execute</b> function is called.</font></p>
+<p><font><b>ErrorNo<a name="errorno"></a>()</b></font></p>
+<p><font>Returns the last error number. The error number is reset after every 
call to Execute(). 
+If 0 is returned, no error occurred.
+</font></p><p>
+<font>Note that old versions of PHP (pre 4.0.6) do 
+       not support error number for ODBC. In general you do not need to call 
this 
+       function unless an ADOdb function returns false on an error.</font></p>
+
+<p><font><b>SetFetchMode<a name="setfetchmode"></a>($mode)</b></font></p>
+<p><font>Sets the current fetch mode for the connection and stores 
+       it in $db-&gt;fetchMode. Legal modes are ADODB_FETCH_ASSOC and 
ADODB_FETCH_NUM. 
+       For more info, see <a 
href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a>.</font></p>
+<p><font>Returns the previous fetch mode, which could be false 
+       if SetFetchMode( ) has not been called before.</font></p>
+<font> 
+</font><p><font><b>CreateSequence<a name="createseq"></a>($seqName = 
'adodbseq',$startID=1)</b></font></p>
+<p><font>Create a sequence. The next time GenID( ) is called, the value 
returned will 
+       be $startID. Added in 2.60. 
+</font></p><p><font><b>DropSequence<a name="dropseq"></a>($seqName = 
'adodbseq')</b></font></p>
+<p><font>Delete a sequence. Added in 2.60. 
+</font></p><p><font><b>GenID<a name="genid"></a>($seqName = 
'adodbseq',$startID=1)</b></font></p>
+<p><font>Generate a sequence number . Works for interbase, 
+       mysql, postgresql, oci8, oci8po, mssql, ODBC based (access,vfp,db2,etc) 
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). Otherwise you will have to create the sequence 
yourself. 
+</font></p><p><font> If your database driver emulates sequences, the name of 
the table is the sequence 
+       name. The table has one column, "id" which should be of type integer, 
or if 
+       you need something larger - numeric(16). 
+</font></p><p><font> For ODBC and databases that do not support sequences 
natively (eg mssql, mysql), 
+       we create a table for each sequence. If the sequence has not been 
defined 
+       earlier, it is created with the starting value set in 
$startID.</font></p>
+<p><font>Note that the mssql driver's GenID() before 1.90 used to generate 16 
byte GUID's.</font></p>
+<p><font><b>UpdateBlob<a 
name="updateblob"></a>($table,$column,$val,$where)</b></font></p>
+<font>Allows you to store a blob (in $val) into $table into $column in a row 
at $where. 
+</font><p><font> Usage: 
+</font></p><p><font> 
+</font></p><pre><font> # for oracle<br>        $conn-&gt;Execute('INSERT INTO 
blobtable (id, blobcol) VALUES (1, empty_blob())');<br>  
$conn-&gt;UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');<br>      <br>    
# non oracle databases<br>      $conn-&gt;Execute('INSERT INTO blobtable (id, 
blobcol) VALUES (1, null)');<br>  
$conn-&gt;UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');<br></font></pre>
+<p><font> Returns true if succesful, false otherwise. Supported by MySQL, 
PostgreSQL, 
+       Oci8, Oci8po and Interbase drivers. Other drivers might work, depending 
on 
+       the state of development.</font></p>
+<p><font>Note that when an Interbase blob is retrieved using SELECT, it still 
needs 
+       to be decoded using $connection-&gt;DecodeBlob($blob); to derive the 
original 
+       value in versions of PHP before 4.1.0. 
+</font></p><p><font>For PostgreSQL, you can store your blob using blob oid's 
or as a bytea field. 
+       You can use bytea fields but not blob oid's currently with UpdateBlob( 
). 
+       Conversely UpdateBlobFile( ) supports oid's, but not bytea data.<br>
+       <br>
+       If you do not pass in an oid, then UpdateBlob() assumes that you are 
storing 
+       in bytea fields.
+       <p>If you do not have any blob fields, you can improve you can improve 
general SQL query performance by disabling blob handling with 
$connection->disableBlobs = true.
+</font></p><p><font><b>UpdateClob<a 
name="updateclob"></a>($table,$column,$val,$where)</b></font></p>
+<font>Allows you to store a clob (in $val) into $table into $column in a row 
at $where. 
+Similar to UpdateBlob (see above), but for Character Large OBjects. 
+</font><p><font> Usage:
+</font></p><pre><font> # for oracle<br>        $conn-&gt;Execute('INSERT INTO 
clobtable (id, clobcol) VALUES (1, empty_clob())');<br>  
$conn-&gt;UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');<br>      <br>    
# non oracle databases<br>      $conn-&gt;Execute('INSERT INTO clobtable (id, 
clobcol) VALUES (1, null)');<br>  
$conn-&gt;UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');<br></font></pre>
+<p><font><b>UpdateBlobFile<a 
name="updateblobfile"></a>($table,$column,$path,$where,$blobtype='BLOB')</b></font></p>
+<p><font>Similar to UpdateBlob, except that we pass in a file path to where 
the blob 
+       resides.
+</font></p><p><font>For PostgreSQL, if you are using blob oid's, use this 
interface. This interface 
+       does not support bytea fields.
+</font></p><p><font>Returns true if successful, false otherwise. 
+</font></p><p><font><b>BlobEncode<a name="blobencode" 
id="blobencode"></a>($blob)</b> 
+</font></p><p><font>Some databases require blob's to be encoded manually 
before upload. Note if 
+       you use UpdateBlob( ) or UpdateBlobFile( ) the conversion is done 
automatically 
+       for you and you do not have to call this function. For PostgreSQL, 
currently, 
+       BlobEncode() can only be used for bytea fields.
+</font></p><p><font>Returns the encoded blob value.
+</font></p><p><font>Note that there is a connection property called 
<em>blobEncodeType</em> which 
+       has 3 legal values: 
+</font></p><p><font>false - no need to perform encoding or decoding.<br>
+       'I' - blob encoding required, and returned encoded blob is a numeric 
value 
+       (no need to quote).<br>
+       'C' - blob encoding required, and returned encoded blob is a character 
value 
+       (requires quoting).
+</font></p><p><font>This is purely for documentation purposes, so that 
programs that accept multiple 
+       database drivers know what is the right thing to do when processing 
blobs.
+</font></p><p><font><strong>BlobDecode<a name="blobdecode"></a>($blob, 
$maxblobsize = false)</strong> 
+</font></p><p><font>Some databases require blob's to be decoded manually after 
doing a select statement. 
+       If the database does not require decoding, then this function will 
return 
+       the blob unchanged. Currently BlobDecode is only required for one 
database, 
+       PostgreSQL, and only if you are using blob oid's (if you are using 
bytea fields, 
+       we auto-decode for you).</font> The default maxblobsize is set in 
$connection-&gt;maxblobsize, which 
+       is set to 256K in adodb 4.54. </p><p>
+       In ADOdb 4.54 and later, the blob is the return value. In earlier 
versions, the blob data is sent to stdout.</p><font>
+</font><p></p><pre><font>$rs = $db-&gt;Execute("select bloboid from 
postgres_table where id=$key");<br>$blob = $db-&gt;BlobDecode( 
reset($rs-&gt;fields) );</font></pre>
+<p><font><b>Replace<a name="replace"></a>($table, $arrFields, 
$keyCols,$autoQuote=false)</b></font></p>
+<p><font>Try to update a record, and if the record is not found, an insert 
statement 
+       is generated and executed. Returns 0 on failure, 1 if update statement 
worked, 
+       2 if no record was found and the insert was executed successfully. This 
differs 
+       from MySQL's replace which deletes the record and inserts a new record. 
This 
+       also means you cannot update the primary key. The only exception to 
this is 
+       Interbase and its derivitives, which uses delete and insert because of 
some 
+       Interbase API limitations. 
+</font></p><p><font>The parameters are $table which is the table name, the 
$arrFields which is an 
+       associative array where the keys are the field names, and $keyCols is 
the name 
+       of the primary key, or an array of field names if it is a compound key. 
If 
+       $autoQuote is set to true, then Replace() will quote all values that 
are non-numeric; 
+       auto-quoting will not quote nulls. Note that auto-quoting will not work 
if 
+       you use SQL functions or operators. 
+</font></p><p><font>Examples: 
+</font></p><pre><font># single field primary key<br>$ret = 
$db-&gt;Replace('atable', <br>      
array('id'=&gt;1000,'firstname'=&gt;'Harun','lastname'=&gt;'Al-Rashid'),<br>    
'id',$autoquote = true);        <br># generates UPDATE atable SET 
firstname='Harun',lastname='Al-Rashid' WHERE id=1000<br># or INSERT INTO atable 
(id,firstname,lastname) VALUES (1000,'Harun','Al-Rashid')<br><br># compound 
key<br>$ret = $db-&gt;Replace('atable2', <br>     
array('firstname'=&gt;'Harun','lastname'=&gt;'Al-Rashid', 'age' =&gt; 33, 
'birthday' =&gt; 'null'),<br> array('lastname','firstname'),<br>      
$autoquote = true);<br><br># no auto-quoting<br>$ret = 
$db-&gt;Replace('atable2', <br>  
array('firstname'=&gt;"'Harun'",'lastname'=&gt;"'Al-Rashid'", 'age' =&gt; 
'null'),<br>  array('lastname','firstname')); <br></font></pre>
+<p><font><b>AutoExecute<a name="autoexecute"></a>($table, $arrFields, $mode, 
$where=false, $forceUpdate=true,$magicq=false)</b></font></p>
+<p>Since ADOdb 4.56, you can automatically generate and execute INSERTs and 
UPDATEs on a given table with this
+function, which is a wrapper for GetInsertSQL() and GetUpdateSQL().
+<p>AutoExecute() inserts or updates $table given an array of $arrFields, where 
the keys are the field names and the array values are the 
+field values to store. Note that there is some overhead because the table is 
first queried to extract key information 
+before the SQL is generated. We generate an INSERT or UPDATE based on $mode 
(see below).
+<p>
+Legal values for $mode are 
+<ul>
+<li>'INSERT' or 1 or DB_AUTOQUERY_INSERT
+<li>'UPDATE' or 2 or DB_AUTOQUERY_UPDATE
+</ul>
+<p>You have to define the constants DB_AUTOQUERY_UPDATE and 
DB_AUTOQUERY_INSERT yourself or include adodb-pear.inc.php.
+<p>The $where clause is required if $mode == 'UPDATE'. If $forceUpdate=false 
then we will query the 
+database first and check if the field value returned by the query matches the 
current field value; only if they differ do we update that field.
+<p>Returns true on success, false on error.
+<p>An example of its use is:
+<pre>
+$record["firstName"] = "Carol";
+$record["lasTname"] = "Smith"; 
+$conn->AutoExecute($table,$record,'INSERT');
+# executes <i>"INSERT INTO $table (firstName,lasTname) values 
('Carol',Smith')"</i>;
+
+$record["firstName"] = "Carol";
+$record["lasTname"] = "Jones"; 
+$conn->AutoExecute($table,$record,'UPDATE', "lastname like 'Sm%'");
+# executes <i>"UPDATE $table SET firstName='Carol',lasTname='Jones' WHERE 
lastname like 'Sm%'"</i>;
+</pre>
+<p>Note: One of the strengths of ADOdb's AutoExecute() is that only valid 
field names for $table are updated. If $arrFields
+contains keys that are invalid field names for $table, they are ignored. There 
is some overhead in doing this as we have to 
+query the database to get the field names, but given that you are not directly 
coding the SQL yourself, you probably aren't interested in
+speed at all, but convenience.
+<p>Since 4.62, the table name to be used can be overridden by setting 
$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
+<p><font><b>GetUpdateSQL<a name="getupdatesql"></a>(&amp;$rs, $arrFields, 
$forceUpdate=false,$magicq=false, $force=null)</b></font></p>
+<p><font>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. $magicq is 
used 
+       to indicate whether magic quotes are enabled (see qstr()). The field 
names in the array 
+       are case-insensitive.</font></p>
+<font> </font><p><font>Since 4.52, we allow you to pass the $force type 
parameter, and this overrides the <a 
href="#ADODB_FORCE_TYPE">$ADODB_FORCE_TYPE</a>
+       global variable.
+<p>Since 4.62, the table name to be used can be overridden by setting 
$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
+</font></p><p><font><b>GetInsertSQL<a name="getinsertsql"></a>(&amp;$rs, 
$arrFields,$magicq=false,$force_type=false)</b></font></p>
+<p><font>Generate SQL to insert into a table given a recordset $rs. Requires 
the query 
+       to be associative. $magicq is used to indicate whether magic quotes are 
enabled 
+       (for qstr()). The field names in the array are 
case-insensitive.</font></p>
+<p>
+<font>  Since 2.42, you can pass a  table name instead of a recordset into 
+GetInsertSQL (in $rs), and it will generate an insert statement for that table.
+</font></p><p><font>Since 4.52, we allow you to pass the $force_type 
parameter, and this overrides the <a 
href="#ADODB_FORCE_TYPE">$ADODB_FORCE_TYPE</a>
+       global variable.
+<p>Since 4.62, the table name to be used can be overridden by setting 
$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
+</font></p><p><font><b>PageExecute<a name="pageexecute"></a>($sql, $nrows, 
$page, $inputarr=false)</b> 
+</font></p><p><font>Used for pagination of recordset. $page is 1-based. See <a 
href="#ex8">Example 
+  8</a>.</font></p>
+ 
+<p><font><b>CachePageExecute<a name="cachepageexecute"></a>($secs2cache, 
+  $sql, $nrows, $page, $inputarr=false)</b> </font></p>
+<p><font>Used for pagination of recordset. $page is 1-based. See 
+  <a href="#ex8">Example 8</a>. Caching version of PageExecute.</font></p>
+<font> 
+</font><p></p>
+<p><font><b>Close<a name="close"></a>( )</b></font></p>
+<p><font>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.</font></p>
+<font>  </font><p><font><b>StartTrans<a name="starttrans"></a>( 
)</b></font></p>
+<font>  </font><p><font>Start a monitored transaction. As SQL statements are 
executed, ADOdb will monitor
+  for SQL errors, and if any are detected, when CompleteTrans() is called, we 
auto-rollback.
+  </font></p><p>
+<font>  </font></p><p><font> To understand why StartTrans() is superior to 
BeginTrans(), 
+  let us examine a few ways of using BeginTrans().
+  The following is the wrong way to use transactions: 
+</font></p><pre><font>$DB-&gt;BeginTrans();<br>$DB-&gt;Execute("update table1 
set val=$val1 where id=$id");<br>$DB-&gt;Execute("update table2 set val=$val2 
where id=$id");<br>$DB-&gt;CommitTrans();<br></font></pre>
+<p><font>because you perform no error checking. It is possible to update 
table1 and 
+  for the update on table2 to fail. Here is a better way: 
+</font></p><pre><font>$DB-&gt;BeginTrans();<br>$ok = $DB-&gt;Execute("update 
table1 set val=$val1 where id=$id");<br>if ($ok) $ok = $DB-&gt;Execute("update 
table2 set val=$val2 where id=$id");<br>if ($ok) $DB-&gt;CommitTrans();<br>else 
$DB-&gt;RollbackTrans();<br></font></pre>
+<p><font>Another way is (since ADOdb 2.0): 
+</font></p><pre><font>$DB-&gt;BeginTrans();<br>$ok = $DB-&gt;Execute("update 
table1 set val=$val1 where id=$id");<br>if ($ok) $ok = $DB-&gt;Execute("update 
table2 set val=$val2 where 
id=$id");<br>$DB-&gt;CommitTrans($ok);<br></font></pre>
+<p><font> Now it is a headache monitoring $ok all over the place. StartTrans() 
is an
+improvement because it monitors all SQL errors for you. This is particularly
+useful if you are calling black-box functions in which SQL queries might be 
executed.
+ Also all BeginTrans, CommitTrans and RollbackTrans calls inside a StartTrans 
block 
+  will be disabled, so even if the black box function does a commit, it will 
be ignored.
+</font></p><pre><font>$DB-&gt;StartTrans();<br>CallBlackBox();<br>$DB-&gt;Execute("update
 table1 set val=$val1 where id=$id");<br>$DB-&gt;Execute("update table2 set 
val=$val2 where id=$id");<br>$DB-&gt;CompleteTrans();<br></font></pre>
+<p><font>Note that a StartTrans blocks are nestable, the inner blocks are 
ignored.
+ </font></p><p><font><b>CompleteTrans<a 
name="completetrans"></a>($autoComplete=true)</b></font></p>
+<font>  </font><p><font>Complete a transaction called with StartTrans(). This 
function monitors
+  for SQL errors, and will commit if no errors have occured, otherwise it will 
rollback. 
+  Returns true on commit, false on rollback. If the parameter $autoComplete is 
true
+  monitor sql errors and commit and rollback as appropriate. Set $autoComplete 
to false 
+  to force rollback even if no SQL error detected.
+  </font></p><p><font><b>FailTrans<a name="failtrans"></a>( )</b></font></p>
+<font>  </font><p><font>Fail a transaction started with StartTrans(). The 
rollback will only occur when
+  CompleteTrans() is called.
+    </font></p><p><font><b>HasFailedTrans<a name="hasfailedtrans"></a>( 
)</b></font></p>
+<font> </font><p><font>Check whether smart transaction has failed, 
+       eg. returns true if there was an error in SQL execution or FailTrans() 
was called.
+       If not within smart transaction, returns false.
+</font></p><p><font><b>BeginTrans<a name="begintrans"></a>( )</b></font></p>
+<p><font>Begin a transaction. Turns off autoCommit. Returns true if 
successful. Some 
+  databases will always return false if transaction support is not available. 
+   Any open transactions will be rolled back when the connection is closed. 
Among the
+   databases that support transactions are Oracle, PostgreSQL, Interbase, 
MSSQL, certain
+    versions of MySQL, DB2, Informix, Sybase, etc.</font></p>
+<font> </font><p><font>Note that <a href="#starttrans">StartTrans()</a> and 
CompleteTrans() is a superior method of 
+ handling transactions, available since ADOdb 3.40. For a explanation, see the 
<a href="#starttrans">StartTrans()</a> documentation.
+
+</font></p><p><font>You can also use the ADOdb <a href="#errorhandling">error 
handler</a> to die 
+  and rollback your transactions for you transparently. Some buggy database 
extensions 
+  are known to commit all outstanding tranasactions, so you might want to 
explicitly 
+  do a $DB-&gt;RollbackTrans() in your error handler for safety. 
+ </font></p><h4><font>Detecting Transactions</font></h4>
+<font> </font><p><font>Since ADOdb 2.50, you are able to detect when you are 
inside a transaction. Check
+ that $connection-&gt;transCnt &gt; 0. This variable is incremented whenever 
BeginTrans() is called,
+ and decremented whenever RollbackTrans() or CommitTrans() is called.
+</font></p><p><font><b>CommitTrans<a 
name="committrans"></a>($ok=true)</b></font></p>
+<p><font>End a transaction successfully. Returns true if successful. If the 
database 
+  does not support transactions, will return true also as data is always 
committed. 
+</font></p>
+<p><font>If you pass the parameter $ok=false, the data is rolled back. See 
example in 
+  BeginTrans().</font></p>
+<p><font><b>RollbackTrans<a name="rollbacktrans"></a>( )</b></font></p>
+<p><font>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. 
+</font></p>
+<font> 
+</font><p><font><b>GetAssoc<a 
name="getassoc1"></a>($sql,$inputarr=false,$force_array=false,$first2cols=false)</b></font></p>
+<p><font>Returns an associative array for the given query $sql with optional 
bind parameters 
+  in $inputarr. If the number of columns returned is greater to two, a 
2-dimensional 
+  array is returned, with the first column of the recordset becomes the keys 
+  to the rest of the rows. If the columns is equal to two, a 1-dimensional 
array 
+  is created, where the the keys directly map to the values (unless 
$force_array 
+  is set to true, when an array is created for each value).
+</font></p><p><font> Examples:<a name="getassocex"></a></font></p>
+
+<p><font>We have the following data in a recordset:</font></p>
+<p><font>row1: Apple, Fruit, Edible<br>
+  row2: Cactus, Plant, Inedible<br>
+  row3: Rose, Flower, Edible</font></p>
+<p><font>GetAssoc will generate the following 2-dimensional associative 
+  array:</font></p>
+<p><font>Apple =&gt; array[Fruit, Edible]<br>
+  Cactus =&gt; array[Plant, Inedible]<br>
+  Rose =&gt; array[Flower,Edible]</font></p>
+<p><font>If the dataset is:</font></p>
+<p><font>row1: Apple, Fruit<br>
+row2: Cactus, Plant<br>
+row3: Rose, Flower </font></p>
+<p><font>GetAssoc will generate the following 1-dimensional associative
+  array (with $force_array==false):</font></p>
+<p><font>Apple =&gt; Fruit</font><br>
+  Cactus=&gt;Plant<br>
+  Rose=&gt;Flower </p>
+<p><font>The function returns:</font></p>
+<p><font>The associative array, or false if an error occurs.</font></p>
+<font>
+<p><b>CacheGetAssoc<a name="cachegetassoc"></a>([$secs2cache,] 
$sql,$inputarr=false,$force_array=false,$first2cols=false)</b></p>
+</font>
+<p><font>Caching version of <a href="#getassoc1">GetAssoc</a> function above.
+</font></p><p><font><b>GetOne<a 
name="getone"></a>($sql,$inputarr=false)</b></font></p>
+<p><font>Executes the SQL and returns the first field of the first row. The 
recordset 
+  and remaining rows are discarded for you automatically. If an error occur, 
false 
+  is returned.</font></p>
+<p><font><b>GetRow<a name="getrow"></a>($sql,$inputarr=false)</b></font></p>
+<p><font>Executes the SQL and returns the first row as an array. The recordset 
and remaining 
+  rows are discarded for you automatically. If an error occurs, false is 
returned.</font></p>
+<p><font><b>GetAll<a name="getall"></a>($sql,$inputarr=false)</b></font></p>
+
+<p>Executes the SQL and returns the all the rows as a 2-dimensional 
+  array. The recordset is discarded for you automatically. If an error occurs, 
+  false is returned. <i>GetArray</i> is a synonym for <i>GetAll</i>.</p>
+ <p><b>GetCol<a name="getcol"></a>($sql,$inputarr=false,$trim=false)</b></p>
+
+<p><font>Executes the SQL and returns all elements of the first column as a 
+1-dimensional array. The recordset is discarded for you automatically. If an 
error occurs, 
+  false is returned.</font></p>
+<p><font><b>CacheGetOne<a name="cachegetone"></a>([$secs2cache,] 
+  $sql,$inputarr=false), CacheGetRow<a name="cachegetrow"></a>([$secs2cache,] 
$sql,$inputarr=false), CacheGetAll<a name="cachegetall"></a>([$secs2cache,] 
+  $sql,$inputarr=false), CacheGetCol<a name="cachegetcol"></a>([$secs2cache,] 
+  $sql,$inputarr=false,$trim=false)</b></font></p>
+<font> 
+</font><p><font>Similar to above Get* functions, except that the recordset is 
serialized and 
+  cached in the $ADODB_CACHE_DIR directory for $secs2cache seconds. Good for 
speeding 
+  up queries on rarely changing data. Note that the $secs2cache parameter is 
optional. 
+  If omitted, we use the value in $connection-&gt;cacheSecs (default is 3600 
seconds, 
+  or 1 hour).</font></p>
+<p><font><b>Prepare<a name="prepare"></a>($sql )</b></font></p>
+ 
+<p><font>Prepares (compiles) an SQL query for repeated execution. Bind 
parameters
+are denoted by ?, except for the oci8 driver, which uses the traditional 
Oracle :varname
+convention. 
+  </font></p>
+<p><font>Returns an array containing the original sql statement 
+  in the first array element; the remaining elements of the array are driver 
dependent. 
+  If there is an error, or we are emulating Prepare( ), we return the original 
+  $sql string. This is because all error-handling has been centralized in 
Execute( 
+  ).</font></p>
+<p><font>Prepare( ) cannot be used with functions that use SQL 
+  query rewriting techniques, e.g. PageExecute( ) and SelectLimit( 
).</font></p>
+<p>Example:</p>
+<pre><font>$stmt = $DB-&gt;Prepare('insert into table (col1,col2) values 
(?,?)');<br>for ($i=0; $i &lt; $max; $i++)<br></font> 
$DB-&gt;<font>Execute($stmt,array((string) rand(), $i));<br></font></pre>
+<font> 
+</font><p><font>Also see InParameter(), OutParameter() and PrepareSP() below. 
Only supported internally by interbase, 
+  oci8 and selected ODBC-based drivers, otherwise it is emulated. There is no 
+  performance advantage to using Prepare() with emulation. 
+</font></p><p><font> Important: Due to limitations or bugs in PHP, if you are 
getting errors when 
+  you using prepared queries, try setting $ADODB_COUNTRECS = false before 
preparing. 
+  This behaviour has been observed with ODBC. 
+</font></p><p><font><b>IfNull<a name="ifnull"></a>($field, 
$nullReplacementValue)</b></font></p>
+<p><font>Portable IFNULL function (NVL in Oracle). Returns a string that 
represents 
+  the function that checks whether a $field is null for the given database, 
and 
+  if null, change the value returned to $nullReplacementValue. Eg.</font></p>
+<pre><font>$sql = <font color="#993300">'SELECT 
'</font>.$db-&gt;IfNull('name', <font color="#993300">"'- unknown 
-'"</font>).<font color="#993300"> ' FROM table'</font>;</font></pre>
+
+<p><font><b>length<a name="length"></a></b></font></p>
+<p><font>This is not a function, but a property. Some databases have "length" 
and others "len"
+as the function to measure the length of a string. To use this property:
+</font></p><pre><font>  $sql = <font color="#993300">"SELECT 
"</font>.$db-&gt;length.<font color="#993300">"(field) from table"</font>;<br>  
$rs = $db-&gt;Execute($sql);<br></font></pre>
+
+<p><font><b>random<a name="random"></a></b></font></p>
+<p><font>This is not a function, but a property. This is a string that holds 
the sql to
+generate a random number between 0.0 and 1.0 inclusive.
+
+</font></p><p><font><b>substr<a name="substr"></a></b></font></p>
+<p><font>This is not a function, but a property. Some databases have "substr" 
and others "substring"
+as the function to retrieve a sub-string. To use this property:
+</font></p><pre><font>  $sql = <font color="#993300">"SELECT 
"</font>.$db-&gt;substr.<font color="#993300">"(field, $offset, $length) from 
table"</font>;<br>  $rs = $db-&gt;Execute($sql);<br></font></pre>
+<p><font>For all databases, the 1st parameter of <i>substr</i> is the field, 
the 2nd is the
+offset (1-based) to the beginning of the sub-string, and the 3rd is the length 
of the sub-string.
+
+
+</font></p><p><font><b>Param<a name="param"></a>($name)</b></font></p>
+<p><font>Generates a bind placeholder portably. For most databases, the bind 
placeholder 
+  is "?". However some databases use named bind parameters such as Oracle, eg 
+  ":somevar". This allows us to portably define an SQL statement with bind 
parameters: 
+</font></p><pre><font>$sql = <font color="#993300">'insert into table 
(col1,col2) values ('</font>.$DB-&gt;Param('a').<font 
color="#993300">','</font>.$DB-&gt;Param('b').<font 
color="#993300">')'</font>;<br><font color="#006600"># generates 'insert into 
table (col1,col2) values (?,?)'<br># or        'insert into table (col1,col2) 
values (:a,:b)</font>'<br>$stmt = $DB-&gt;Prepare($sql);<br>$stmt = 
$DB-&gt;Execute($stmt,array('one','two'));<br></font></pre>
+<font> </font>
+<p></p>
+<p><font><b>PrepareSP</b><b><a name="preparesp"></a></b><b>($sql,
+$cursor=false )</b></font></p>
+<p><font>When calling stored procedures in mssql and oci8 (oracle),
+    and you might want to directly bind to parameters that return values, or
+for special LOB handling. PrepareSP() allows you to do so. </font></p>
+<p><font>Returns the same array or $sql string as Prepare( )
+    above. If you do not need to bind to return values, you should use Prepare(
+  ) instead.</font></p>
+<p><font>The 2nd parameter, $cursor is not used except with oci8.
+    Setting it to true will force OCINewCursor to be called; this is to support
+output REF CURSORs. </font></p>
+<p><font>For examples of usage of PrepareSP( ), see InParameter(
+) below. </font></p>
+<p><font>Note: in the mssql driver, preparing stored procedures
+    requires a special function call, mssql_init( ), which is called by this
+    function. PrepareSP( ) is available in all other drivers, and is emulated
+  by calling Prepare( ). </font></p>
+<p><font><b> InParameter<a name="inparameter"></a>($stmt, $var,
+  $name, $maxLen = 4000, $type = false )</b></font></p>
+<font>Binds a PHP variable as input to a stored procedure variable.
+The parameter <i>$stmt</i> is the value returned by PrepareSP(), <i>$var</i> is
+the PHP variable you want to bind, $name is the name of the stored procedure
+variable. Optional is <i>$maxLen</i>, the maximum length of the data to bind,
+and $type which is database dependant. Consult <a 
href="http://php.net/mssql_bind";>mssql_bind</a> and <a 
href="http://php.net/ocibindbyname";>ocibindbyname</a> docs
+at php.net for more info on legal values for $type. </font>
+<p>
+<font>InParameter() is a wrapper function that calls Parameter()
+with $isOutput=false. The advantage of this function is that it is 
self-documenting,
+because the $isOutput parameter is no longer needed. Only for mssql and oci8
+currently. </font></p>
+<p><font>Here is an example using oci8: </font></p>
+<pre><font><font color="green"># For oracle, Prepare and PrepareSP are 
identical</font>
+$stmt = $db-&gt;PrepareSP(
+       <font color="#993300">"declare RETVAL integer; <br>     begin<br>       
:RETVAL := </font><font color="#993300">SP_RUNSOMETHING</font><font 
color="#993300">(:myid,:group);<br> 
end;"</font>);<br>$db-&gt;InParameter($stmt,$id,'myid');<br>$db-&gt;InParameter($stmt,$group,'group',64);<br>$db-&gt;OutParameter($stmt,$ret,'RETVAL');<br>$db-&gt;Execute($stmt);<br></font></pre>
+<p><font> The same example using mssql:</font></p>
+<font> 
+</font><pre><font><font color="green"># @RETVAL = SP_RUNSOMETHING 
@myid,@group</font>
+$stmt = $db-&gt;PrepareSP(<font color="#993333">'<font 
color="#993300">SP_RUNSOMETHING</font>'</font>); <br><font color="green"># note 
that the parameter name does not have @ in front!</font>
+$db-&gt;InParameter($stmt,$id,'myid');
+$db-&gt;InParameter($stmt,$group,'group',64);
+<font color="green"># return value in mssql - RETVAL is hard-coded name</font> 
<br>$db-&gt;OutParameter($stmt,$ret,'RETVAL');<br>$db-&gt;Execute($stmt); 
</font></pre>
+
+<p><font>Note that the only difference between the oci8 and mssql 
implementations is $sql.</font></p>
+<p>
+<font> If $type parameter is set to false, in mssql, $type will be dynamicly 
determined 
+based on the type of the PHP variable passed <font face="Courier New, Courier, 
mono">(string 
+=&gt; SQLCHAR, boolean =&gt;SQLINT1, integer =&gt;SQLINT4 or 
float/double=&gt;SQLFLT8)</font>.
+</font></p><p><font> 
+In oci8, $type can be set to OCI_B_FILE (Binary-File), OCI_B_CFILE 
(Character-File), 
+OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and OCI_B_ROWID (ROWID). 
To 
+pass in a null, use<font face="Courier New, Courier, mono"> 
$db-&gt;Parameter($stmt, 
+$null=null, 'param')</font>. 
+  </font></p><p><font><b> OutParameter<a name="outparameter"></a>($stmt, $var, 
$name, 
+  $maxLen = 4000, $type = false )</b></font></p>
+<font>  Binds a PHP variable as output from a stored procedure variable. The 
parameter <i>$stmt</i>
+ is the value returned by PrepareSP(), <i>$var</i> is the PHP variable you 
want to bind, <i>$name</i>
+ is the name of the stored procedure variable. Optional is <i>$maxLen</i>, the 
maximum length of the
+ data to bind, and <i>$type</i> which is database dependant. 
+</font><p>
+<font>  OutParameter() is a wrapper function that calls Parameter() with 
$isOutput=true. 
+  The advantage of this function is that it is self-documenting, because
+the $isOutput parameter is no longer needed.  Only for mssql 
+  and oci8 currently.
+</font></p><p>
+<font>For an example, see <a href="#inparameter">InParameter</a>.
+
+</font></p><p><font><b> Parameter<a name="parameter"></a>($stmt, $var, $name, 
$isOutput=false, 
+  $maxLen = 4000, $type = false )</b></font></p>
+<p><font>Note: This function is deprecated, because of the new InParameter() 
and OutParameter() functions.
+These are superior because they are self-documenting, unlike Parameter().
+</font></p><p><font>Adds a bind parameter suitable for return values or 
special data handling (eg. 
+  LOBs) after a statement has been prepared using PrepareSP(). Only for mssql 
+  and oci8 currently. The parameters are:<br>
+  <br>
+  $<i><b>stmt</b></i> Statement returned by Prepare() or PrepareSP().<br>
+  $<i><b>var</b></i> PHP variable to bind to. Make sure you pre-initialize 
it!<br>
+  $<i><b>name</b></i> Name of stored procedure variable name to bind to.<br>
+  [$<i><b>isOutput</b></i>] Indicates direction of parameter 0/false=IN 1=OUT 
+  2= IN/OUT. This is ignored in oci8 as this driver auto-detects the 
direction.<br>
+  [$<b>maxLen</b>] Maximum length of the parameter variable.<br>
+  [$<b>type</b>] Consult <a href="http://php.net/mssql_bind";>mssql_bind</a> 
and 
+  <a href="http://php.net/ocibindbyname";>ocibindbyname</a> docs at php.net for 
+  more info on legal values for type.</font></p>
+<p><font>Lastly, in oci8, bind parameters can be reused without calling 
PrepareSP( ) 
+  or Parameters again. This is not possible with mssql. An oci8 
example:</font></p>
+<pre><font>$id = 0; $i = 0;<br>$stmt = $db-&gt;PrepareSP( <font 
color="#993300">"update table set val=:i where 
id=:id"</font>);<br>$db-&gt;Parameter($stmt,$id,'id');<br>$db-&gt;Parameter($stmt,$i,
 'i');<br>for ($cnt=0; $cnt &lt; 1000; $cnt++) {<br>       $id = $cnt; <br>     
   $i = $cnt * $cnt; <font color="green"># works with oci8!</font>
+       $db-&gt;Execute($stmt); <br>}</font></pre>
+<p><font><b>Bind<a name="bind"></a>($stmt, $var, $size=4001, $type=false, 
$name=false)</b></font></p>
+ 
+<p><font>This is a low-level function supported only by the oci8 
+  driver. <b>Avoid using</b> unless you only want to support Oracle. The 
Parameter( 
+  ) function is the recommended way to go with bind variables.</font></p>
+<p><font>Bind( ) allows you to use bind variables in your sql 
+  statement. This binds a PHP variable to a name defined in an Oracle sql 
statement 
+  that was previously prepared using Prepare(). Oracle named variables begin 
with 
+  a colon, and ADOdb requires the named variables be called :0, :1, :2, :3, 
etc. 
+  The first invocation of Bind() will match :0, the second invocation will 
match 
+  :1, etc. Binding can provide 100% speedups for insert, select and update 
statements. 
+  </font></p>
+<p>The other variables, $size sets the buffer size for data storage, $type is 
+  the optional descriptor type OCI_B_FILE (Binary-File), OCI_B_CFILE 
(Character-File), 
+  OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and OCI_B_ROWID (ROWID). 
+  Lastly, instead of using the default :0, :1, etc names, you can define your 
+  own bind-name using $name. 
+</p><p><font>The following example shows 3 bind variables being used: 
+  p1, p2 and p3. These variables are bound to :0, :1 and :2.</font></p>
+<pre>$stmt = $DB-&gt;Prepare("insert into table (col0, col1, col2) values (:0, 
:1, :2)");<br>$DB-&gt;Bind($stmt, $p1);<br>$DB-&gt;Bind($stmt, 
$p2);<br>$DB-&gt;Bind($stmt, $p3);<br>for ($i = 0; $i &lt; $max; $i++) { <br>   
$p1 = ?; $p2 = ?; $p3 = ?;<br>   $DB-&gt;Execute($stmt);<br>}</pre>
+<p>You can also use named variables:</p>
+<pre>$stmt = $DB-&gt;Prepare("insert into table (col0, col1, col2) values 
(:name0, :name1, :name2)");<br>$DB-&gt;Bind($stmt, $p1, 
"name0");<br>$DB-&gt;Bind($stmt, $p2, "name1");<br>$DB-&gt;Bind($stmt, $p3, 
"name2");<br>for ($i = 0; $i &lt; $max; $i++) { <br>   $p1 = ?; $p2 = ?; $p3 = 
?;<br>   $DB-&gt;Execute($stmt);<br>}</pre>
+<p><b>LogSQL($enable=true)<a name="logsql"></a></b></p>
+Call this method to install a SQL logging and timing function (using 
fnExecute). 
+Then all SQL statements are logged into an adodb_logsql table in a database. 
If 
+the adodb_logsql table does not exist, ADOdb will create the table if you have 
+the appropriate permissions. Returns the previous logging value (true for 
enabled, 
+false for disabled). Here are samples of the DDL for selected databases: 
+<p> 
+</p><pre>              <b>mysql:</b>
+               CREATE TABLE adodb_logsql (
+                 created datetime NOT NULL,
+                 sql0 varchar(250) NOT NULL,
+                 sql1 text NOT NULL,
+                 params text NOT NULL,
+                 tracer text NOT NULL,
+                 timer decimal(16,6) NOT NULL
+               )
+               
+               <b>postgres:</b>
+               CREATE TABLE adodb_logsql (
+                 created timestamp NOT NULL,
+                 sql0 varchar(250) NOT NULL,
+                 sql1 text NOT NULL,
+                 params text NOT NULL,
+                 tracer text NOT NULL,
+                 timer decimal(16,6) NOT NULL
+               )
+               
+               <b>mssql:</b>
+               CREATE TABLE adodb_logsql (
+                 created datetime NOT NULL,
+                 sql0 varchar(250) NOT NULL,
+                 sql1 varchar(4000) NOT NULL,
+                 params varchar(3000) NOT NULL,
+                 tracer varchar(500) NOT NULL,
+                 timer decimal(16,6) NOT NULL
+               )
+               
+               <b>oci8:</b>
+               CREATE TABLE adodb_logsql (
+                 created date NOT NULL,
+                 sql0 varchar(250) NOT NULL,
+                 sql1 varchar(4000) NOT NULL,
+                 params varchar(4000),
+                 tracer varchar(4000),
+                 timer decimal(16,6) NOT NULL
+               )
+</pre>
+Usage: 
+<pre>  $conn-&gt;LogSQL(); // turn on logging<br>        :<br> 
$conn-&gt;Execute(...);<br>       :<br> $conn-&gt;LogSQL(false); // turn off 
logging<br>        <br>    # output summary of SQL logging results<br>     
$perf = NewPerfMonitor($conn);<br>      echo $perf-&gt;SuspiciousSQL();<br>     
echo $perf-&gt;ExpensiveSQL();<br></pre>
+<p>One limitation of logging is that rollback also prevents SQL from being 
logged.
+</p><p>
+If you prefer to use another name for the table used to store the SQL, you can 
override it by calling 
+adodb_perf::table($tablename), where $tablename is the new table name (you 
will still need to manually
+create the table yourself). An example:
+</p><pre>      include('adodb.inc.php');<br>   
include('adodb-perf.inc.php');<br>      
adodb_perf::table('my_logsql_table');<br></pre>
+Also see <a href="docs-perf.htm">Performance Monitor</a>. 
+<p><font><b>fnExecute and fnCacheExecute properties<a name="fnexecute" 
id="fnexecute"></a></b></font></p>
+<p>These two properties allow you to define bottleneck functions for all sql 
statements 
+  processed by ADOdb. This allows you to perform statistical analysis and 
query-rewriting 
+  of your sql. 
+</p><p><b>Examples of fnExecute</b></p>
+<p>Here is an example of using fnExecute, to count all cached queries and 
non-cached 
+  queries, you can do this:</p>
+<pre><font color="#006600"># $db is the connection object</font>
+function CountExecs($db, $sql, $inputarray)
+{
+global $EXECS;
+
+if (!is_array(inputarray)) $EXECS++;
+<font color="#006600"># handle 2-dimensional input arrays</font>
+else if (is_array(reset($inputarray))) $EXECS += sizeof($inputarray);
+else $EXECS++;
+}
+
+<font color="#006600"># $db is the connection object</font>
+function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
+{<br>global $CACHED; $CACHED++;<br>}<br><br>$db = 
NewADOConnection('mysql');<br>$db-&gt;Connect(...);<br>$db-&gt;<strong>fnExecute</strong>
 = 'CountExecs';<br>$db-&gt;<strong>fnCacheExecute</strong> = 
'CountCachedExecs';<br> :<br> :<br><font color="#006600"># After many sql 
statements:</font>`<br>printf("&lt;p&gt;Total queries=%d; total 
cached=%d&lt;/p&gt;",$EXECS+$CACHED, $CACHED);<br></pre>
+<p>The fnExecute function is called before the sql is parsed and executed, so 
+  you can perform a query rewrite. If you are passing in a prepared statement, 
+  then $sql is an array (see <a href="#prepare">Prepare</a>). The 
fnCacheExecute 
+  function is only called if the recordset returned was cached.<font> 
+  The function parameters match the Execute and CacheExecute functions 
respectively, 
+  except that $this (the connection object) is passed as the first 
parameter.</font></p>
+<p>Since ADOdb 3.91, the behaviour of fnExecute varies depending on whether 
the 
+  defined function returns a value. If it does not return a value, then the 
$sql 
+  is executed as before. This is useful for query rewriting or counting sql 
queries. 
+</p><p> On the other hand, you might want to replace the Execute function with 
one 
+  of your own design. If this is the case, then have your function return a 
value. 
+  If a value is returned, that value is returned immediately, without any 
further 
+  processing. This is used internally by ADOdb to implement LogSQL() 
functionality. 
+</p>
+<p>
+</p><hr />
+<h3><font>ADOConnection Utility Functions</font></h3>
+<p><font><b>BlankRecordSet<a 
name="blankrecordset"></a>([$queryid])</b></font></p>
+<p><font>No longer available - removed since 1.99.</font></p>
+<p><font><b>Concat<a name="concat"></a>($s1,$s2,....)</b></font></p>
+<p><font>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.</font></p>
+<p><font>Returns the concatenated string.</font></p>
+<p><font><b>DBDate<a name="dbdate"></a>($date)</b></font></p>
+<p><font>Format the $<b>date</b> in the format the database accepts. This is 
used in 
+  INSERT/UPDATE statements; for SELECT statements, use <a 
href="#sqldate">SQLDate</a>. 
+  The $<b>date</b> parameter can be a Unix integer timestamp or an ISO format 
+  Y-m-d. Uses the fmtDate field, which holds the format to use. If null or 
false 
+  or '' is passed in, it will be converted to an SQL null.</font></p>
+<p><font>Returns the date as a quoted string.</font></p>
+<p><font><b>DBTimeStamp<a name="dbtimestamp"></a>($ts)</b></font></p>
+<p><font>Format the timestamp $<b>ts</b> in the format the database accepts; 
this can 
+  be a Unix integer timestamp or an ISO format Y-m-d H:i:s. Uses the 
fmtTimeStamp 
+  field, which holds the format to use. If null or false or '' is passed in, 
it 
+  will be converted to an SQL null.</font></p>
+<p><font>Returns the timestamp as a quoted string.</font></p>
+<p><font><b>qstr<a 
name="qstr"></a>($s,[$magic_quotes_enabled</b>=false]<b>)</b></font></p>
+<p><font>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>.</font></p>
+<p><font>Eg.<font face="Courier New, Courier, mono"> $s = 
$db-&gt;qstr(HTTP_GET_VARS['name'],get_magic_quotes_gpc());</font></font></p>
+<p><font>Returns the quoted string.</font></p>
+<p><font><b>Quote<a name="quote"></a>($s)</b></font></p>
+<p><font>Quotes the string $s, escaping the database specific quote character 
as appropriate. 
+  Formerly checked magic quotes setting, but this was disabled since 3.31 for 
+  compatibility with PEAR DB. 
+</font></p><p><font><b>Affected_Rows<a name="affected_rows"></a>( 
)</b></font></p>
+<p><font>Returns the number of rows affected by a update or delete statement. 
Returns 
+  false if function not supported.</font></p>
+<p><font>Not supported by interbase/firebird currently. </font></p>
+<p><font><b>Insert_ID<a name="inserted_id"></a>( )</b></font></p>
+<p><font>Returns the last autonumbering ID inserted. Returns false if function 
not supported. 
+</font></p>
+<p><font>Only supported by databases that support auto-increment or object 
id's, such 
+  as PostgreSQL, MySQL and MS SQL Server currently. PostgreSQL returns the 
OID, which 
+  can change on a database reload.</font></p>
+<p><font><b>RowLock<a name="rowlock"></a>($table,$where)</b></font></p>
+<p><font>Lock a table row for the duration of a transaction. For example to 
lock record $id in table1:
+</font></p><pre><font> $DB-&gt;StartTrans();<br>       
$DB-&gt;RowLock("table1","rowid=$id");<br>      $DB-&gt;Execute($sql1);<br>     
$DB-&gt;Execute($sql2);<br>     $DB-&gt;CompleteTrans();<br></font></pre>
+<p><font>Supported in db2, interbase, informix, mssql, oci8, postgres, sybase.
+</font></p><p><font><b>MetaDatabases<a 
name="metadatabases"></a>()</b></font></p>
+<p><font>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.</font></p>
+<p><font><b>MetaTables<a name="metatables"></a>($ttype = false, $showSchema = 
false, 
+  $mask=false)</b></font></p>
+<p><font>Returns an array of tables and views for the current database as an 
array. 
+  The array should exclude system catalog tables if possible. To only show 
tables, 
+  use $db-&gt;MetaTables('TABLES'). To show only views, use 
$db-&gt;MetaTables('VIEWS'). 
+  The $showSchema parameter currently works only for DB2, and when set to 
true, 
+  will add the schema name to the table, eg. "SCHEMA.TABLE". </font></p>
+<p><font>You can define a mask for matching. For example, setting $mask = 
'TMP%' will 
+  match all tables that begin with 'TMP'. Currently only mssql, oci8, 
odbc_mssql 
+  and postgres* support $mask. 
+</font></p><p><font><b>MetaColumns<a 
name="metacolumns"></a>($table,$notcasesensitive=true)</b></font></p>
+<p><font>Returns an array of ADOFieldObject's, one field object for every 
column of 
+  $table. A field object is a class instance with (name, type, max_length) 
defined.
+  Currently Sybase does not recognise date types, and ADO cannot identify 
+  the correct data type (so we default to varchar).   
+ </font></p><p><font> The $notcasesensitive parameter determines whether we 
uppercase or lowercase the table name to normalize it
+ (required for some databases). Does not work with MySQL ISAM tables.
+ </font></p><p><font>For schema support, pass in the $table parameter, 
"$schema.$tablename". This is only
+ supported for selected databases.
+</font></p><p><font><b>MetaColumnNames<a 
name="metacolumnames"></a>($table,$numericIndex=false)</b></font></p>
+<p><font>Returns an array of column names for $table. Since ADOdb 4.22, this 
is an associative array, with the
+keys in uppercase. Set $numericIndex=true if you want the old behaviour of 
numeric indexes (since 4.23).
+</font></p><p>
+<font>e.g. array('FIELD1' =&gt; 'Field1', 'FIELD2'=&gt;'Field2')
+</font></p><p>
+</p><p><font><b>MetaPrimaryKeys<a name="metaprimarykeys"></a>($table,
+      $owner=false)</b></font> 
+</p>
+<p><font>Returns an array containing column names that are the 
+  primary keys of $table. Supported by mysql, odbc (including db2, odbc_mssql, 
+etc), mssql, postgres, interbase/firebird, oci8 currently. </font></p>
+<p><font>Views (and some tables) have primary keys, but sometimes this 
information is not available from the
+database. You can define a function  ADODB_View_PrimaryKeys($databaseType, 
$database, $view, $owner) that
+should return an array containing the fields that make up the primary key. If 
that function exists,
+it will be called when MetaPrimaryKeys() cannot find a primary key for a table 
or view.
+</font></p><pre><font>// In this example: dbtype = 'oci8', $db = 'mydb', $view 
= 'dataView', $owner = false <br>function 
ADODB_View_PrimaryKeys($dbtype,$db,$view,$owner)<br>{<br>     
switch(strtoupper($view)) {<br> case 'DATAVIEW': return array('DATAID');<br>    
default: return false;<br>      }<br>}<br><br>$db = 
NewADOConnection('oci8');<br>$db-&gt;Connect('localhost','root','','mydb'); 
<br>$db-&gt;MetaPrimaryKeys('dataView');<br></font></pre>
+<p><font><b>ServerInfo<a name="serverinfo" id="serverinfo"></a>()</b></font> 
+</p>
+<p><font>Returns an array of containing two elements 'description' 
+  and 'version'. The 'description' element contains the string description of 
+  the database. The 'version' naturally holds the version number (which is 
also 
+a string).</font></p>
+<p><font><b>MetaForeignKeys<a name="metaforeignkeys"></a>($table, 
$owner=false, $upper=false)</b> 
+</font></p><p><font>Returns an associate array of foreign keys, or false if 
not supported. For 
+  example, if table employee has a foreign key where employee.deptkey points 
to 
+  dept_table.deptid, and employee.posn=posn_table.postionid and 
employee.poscategory=posn_table.category, 
+  then $conn-&gt;MetaForeignKeys('employee') will return 
+</font></p><pre><font> array(<br>              'dept_table' =&gt; 
array('deptkey=deptid'),<br>         'posn_table' =&gt; 
array('posn=positionid','poscategory=category')<br>  )<br></font></pre>
+<p><font>The optional schema or owner can be defined in $owner. If $upper is 
true, then 
+  the table names (array keys) are upper-cased. 
+</font></p><hr />
+<h2><font>ADORecordSet<a name="adorecordset"></a></font></h2>
+<p><font>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.</font></p>
+<h3><font>ADORecordSet Fields</font></h3>
+<p><font><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.</font></p>
+<p><font><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>.</font></p>
+<p><font><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.</font></p>
+<p><font><b>sql</b>: Holds the sql statement used to generate this record 
set.</font></p>
+<p><font><b>canSeek</b>: Set to true if Move( ) function works.</font></p>
+<p><font><b>EOF</b>: True if we have scrolled the cursor past the last 
record.</font></p>
+<h3><font>ADORecordSet Functions</font></h3>
+<p><font><b>ADORecordSet( )</b></font></p>
+<p><font>Constructer. Normally you never call this function 
yourself.</font></p>
+<p><font><b>GetAssoc<a name="getassoc"></a>([$force_array])</b></font></p>
+<p><font>Generates an associative array from the recordset. Note that is this 
function 
+  is also <a href="#getassoc1">available</a> in the connection object. More 
details 
+  can be found there.</font></p>
+<font> </font>
+<p><font><b>GetArray<a name="getarray"></a>([$number_of_rows])</b></font></p>
+<p><font>Generate a 2-dimensional array of records from the current
+    cursor position, indexed from 0 to $number_of_rows - 1. If $number_of_rows
+  is undefined, till EOF.</font></p>
+<p><font><b>GetRows<a name="getrows"></a>([$number_of_rows])</b></font></p>
+<font>Generate a 2-dimensional array of records from the current
+cursor position. Synonym for GetArray() for compatibility with Microsoft ADO. 
</font>
+<p><font> <b>GetMenu<a name="getmenu"></a>($name, [$default_str=''],
+  [$blank1stItem=true], [$multiple_select=false], [$size=0], 
[$moreAttr=''])</b></font></p>
+<p><font>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>. </font></p>
+<p><font> 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. You can also set the first option strings by setting 
$blank1stItem
+  = "$value:$text".</font></p>
+<p><font>$<i>Default_str</i> can be array for a multiple select
+listbox.</font></p>
+<p><font>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. 
</font></p>
+<p><font>Menu Example 1: <code>GetMenu('menu1','A',true)</code> will
+    generate a menu:
+    <select name="menu1"><option> </option><option value="1" 
selected="selected">A </option><option value="2">B </option><option value="3">C 
</option></select>
+for the data (A,1), (B,2), (C,3). Also see <a href="#ex5">example 
5</a>.</font></p>
+<p><font>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="multiple" size="3"><option value="1" 
selected="selected">A </option><option value="2" selected="selected">B 
</option><option value="3">C </option></select>
+</font></p>
+<p><font> <b>GetMenu2<a name="getmenu2"></a>($name, [$default_str=''],
+  [$blank1stItem=true], [$multiple_select=false], [$size=0], 
[$moreAttr=''])</b></font></p>
+<p><font>This is nearly identical to GetMenu, except that the
+  $<i>default_str</i> is matched to fields[1] (the option values).</font></p>
+<p><font>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. </font></p>
+<p><font><b>UserDate<a name="userdate"></a>($str, [$fmt])</b></font></p>
+<p><font>Converts the date string $<i>str</i> to another format.
+    The date format is Y-m-d, or Unix timestamp format. The default 
$<i>fmt</i> is
+Y-m-d.</font></p>
+<p><font><b>UserTimeStamp<a name="usertimestamp"></a>($str, 
[$fmt])</b></font></p>
+<p><font>Converts the timestamp string $<b>str</b> to another
+    format. The timestamp format is Y-m-d H:i:s, as in '2002-02-28 23:00:12',
+    or Unix timestamp format. UserTimeStamp calls UnixTimeStamp to parse 
$<i>str</i>,
+and $<i>fmt</i> defaults to Y-m-d H:i:s if not defined. </font></p>
+<p><font><b>UnixDate<a name="unixdate"></a>($str)</b></font></p>
+<p><font>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).</font></p>
+<p><font>This function is available in both ADORecordSet and
+ADOConnection since 1.91.</font></p>
+<p><font><b>UnixTimeStamp<a name="unixtimestamp"></a>($str)</b></font></p>
+<p><font>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" (1970-12-24, 00:00:00)
+    or "Y-m-d H:i:s" (1970-12-24 00:00:00) or "YmdHis" (19701225000000) format,
+    except for Sybase and Microsoft SQL Server, where "M d Y h:i:sA" (Dec 25
+    1970 00:00:00AM) is also accepted (the 3 letter month strings are 
controlled
+by a global array, which might need localisation).</font></p>
+<font> 
+</font><p><font>This function is available in both ADORecordSet
+    and ADOConnection since 1.91. </font></p>
+<p><font><b>OffsetDate<a name="offsetdate"></a>($dayFraction,
+  $basedate=false)</b></font></p>
+<p><font>Returns a string with the native SQL functions to calculate
+    future and past dates based on $basedate in a portable fashion. If 
$basedate
+    is not defined, then the current date (at 12 midnight) is used. Returns the
+  SQL string that performs the calculation when passed to Execute(). 
</font></p>
+<p><font>For example, in Oracle, to find the date and time that
+  is 2.5 days from today, you can use:</font></p>
+<pre><font># get date one week from now<br>$fld = $conn-&gt;OffsetDate(7); // 
returns "(trunc(sysdate)+7")</font></pre>
+<pre><font># get date and time that is 60 hours from current date and 
time<br>$fld = $conn-&gt;OffsetDate(2.5, $conn-&gt;sysTimeStamp);        // 
returns "(sysdate+2.5)"<br><br>$conn-&gt;Execute("UPDATE TABLE SET dodate=$fld 
WHERE ID=$id");</font></pre>
+<p><font> This function is available for mysql, mssql, oracle, oci8 and 
postgresql drivers 
+  since 2.13. It might work with other drivers provided they allow performing
+  numeric day arithmetic on dates.</font></p>
+<font> </font>
+<p><font><b>SQLDate<a name="sqldate"></a>($dateFormat, 
$basedate=false)</b></font></p>
+<font>Returns a string which contains the native SQL functions
+to format a date or date column $basedate. This is used in SELECT statements.
+For INSERT/UPDATE statements, use <a href="#dbdate">DBDate</a>. It uses a 
case-sensitive
+$dateFormat, which supports: </font>
+<pre><font> 
+  Y: 4-digit Year
+  Q: Quarter (1-4)
+  M: Month (Jan-Dec)
+  m: Month (01-12)
+  d: Day (01-31)
+  H: Hour (00-23)
+  h: Hour (1-12)
+  i: Minute (00-59)
+  s: Second (00-60)
+  A: AM/PM indicator
+  w: day of week (0-6 or 1-7 depending on DB)
+  l: day of week (as string - lowercase L)
+  W: week in year (0..53 for MySQL, 1..53 for PostgreSQL and Oracle)
+  </font></pre>
+<p><font>All other characters are treated as strings. You can
+    also use \ to escape characters. Available on selected databases, including
+mysql, postgresql, mssql, oci8 and DB2. </font></p>
+<p><font>This is useful in writing portable sql statements that
+    GROUP BY on dates. For example to display total cost of goods sold broken
+by quarter (dates are stored in a field called postdate): </font></p>
+<pre><font> $sqlfn = $db-&gt;SQLDate('Y-\QQ','postdate'); # get sql that 
formats postdate to output 2002-Q1<br> $sql = "SELECT $sqlfn,SUM(cogs) FROM 
table GROUP BY $sqlfn ORDER BY 1 desc";<br> </font></pre>
+<p><font><b>MoveNext<a name="movenext"></a>( )</b></font></p>
+<p><font>Move the internal cursor to the next row. The <i>$this-&gt;fields</i> 
array
+    is automatically updated. Returns false if unable to do so (normally 
because
+EOF has been reached), otherwise true. </font></p>
+<p><font> If EOF is reached, then the $this-&gt;fields array
+    is set to false (this was only implemented consistently in ADOdb 3.30). For
+    the pre-3.30 behaviour of $this-&gt;fields (at EOF), set the global 
variable
+  $ADODB_COMPAT_FETCH = true.</font></p>
+<p><font>Example:</font></p>
+<pre><font>$rs = $db-&gt;Execute($sql);<br>if ($rs) <br>       while 
(!$rs-&gt;EOF) {<br>              ProcessArray($rs-&gt;fields);   <br>          
  $rs-&gt;MoveNext();<br> } </font></pre>
+<p><font><b>Move<a name="move"></a>($to)</b></font></p>
+<p><font>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.</font></p>
+<p><font>Note: This function uses <i>absolute positioning</i>,
+unlike Microsoft's ADO.</font></p>
+<p><font>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( ). </font></p>
+<p><font><b>MoveFirst<a name="movefirst"></a>()</b></font></p>
+<p><font>Internally calls Move(0). Note that some databases do
+not support this function.</font></p>
+<p><font><b>MoveLast<a name="movelast"></a>()</b></font></p>
+<p><font>Internally calls Move(RecordCount()-1). Note that some
+  databases do not support this function.</font></p>
+<p><font><b>GetRowAssoc</b><a name="getrowassoc"></a>($toUpper=true)</font></p>
+<p><font>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(). </font></p>
+<p><font>For example:<br>
+Array ( [ID] =&gt; 1 [FIRSTNAME] =&gt; Caroline [LASTNAME] =&gt; Miranda 
[CREATED]
+=&gt; 2001-07-05 ) </font></p>
+<p><font>Note: do not use GetRowAssoc() with $ADODB_FETCH_MODE
+    = ADODB_FETCH_ASSOC. Because they have the same functionality, they will
+  interfere with each other.</font></p>
+<font> 
+</font><p><font><b>AbsolutePage<a name="absolutepage"></a>($page=-1) 
</b></font></p>
+<p><font>Returns the current page. Requires PageExecute()/CachePageExecute() 
to be called. 
+  See <a href="#ex8">Example 8</a>.</font></p>
+<font>
+<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>Returns the value of the associated column $<b>colname</b> for the current
+  row. The column name is case-insensitive.</p>
+<p>This is a convenience function. For higher performance, use <a 
href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a>. </p>
+<p><b>FetchRow</b><a name="fetchrow"></a>()</p> 
+</font><p><font>Returns array containing current row, or false
+    if EOF. FetchRow( ) internally moves to the next record after returning the
+    current row. </font></p>
+<p><font>Warning: Do not mix using FetchRow() with MoveNext().</font></p>
+<p><font>Usage:</font></p>
+<pre><font>$rs = $db-&gt;Execute($sql);<br>if ($rs)<br>        while ($arr = 
$rs-&gt;FetchRow()) {<br>    &nbsp;&nbsp;# process $arr   <br>    }</font></pre>
+<p><font><b>FetchInto</b><a 
name="fetchinto"></a>(<b>&amp;$array</b>)</font></p>
+<p><font> Sets $array to the current row. Returns PEAR_Error
+    object if EOF, 1 if ok (DB_OK constant). If PEAR is undefined, false is 
returned
+    when EOF. FetchInto( ) internally moves to the next record after returning
+  the current row. </font></p>
+<p><font> FetchRow() is easier to use. See above.</font></p>
+<font> </font>
+<p><font><b>FetchField<a name="fetchfield"></a>($column_number)</b></font></p>
+<p><font>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></font></p>
+<p><font><b>FieldCount<a name="fieldcount"></a>( )</b></font></p>
+<p><font>Returns the number of fields (columns) in the record
+set.</font></p>
+<p><font><b>RecordCount<a name="recordcount"></a>( )</b></font></p>
+<p><font>Returns the number of rows in the record set. If the
+    number of records returned cannot be determined from the database driver
+    API, we will buffer all rows and return a count of the rows after all the
+    records have been retrieved. This buffering can be disabled (for 
performance
+    reasons) by setting the global variable $ADODB_COUNTRECS = false. When 
disabled,
+    RecordCount( ) will return -1 for certain databases. See the supported 
databases
+  list above for more details. </font></p>
+<p><font> RowCount is a synonym for RecordCount.</font></p>
+<p><font><b>PO_RecordCount<a name="po_recordcount"></a>($table,
+$where)</b></font></p>
+<p><font>Returns the number of rows in the record set. If the
+    database does not support this, it will perform a SELECT COUNT(*) on the
+    table $table, with the given $where condition to return an estimate of the
+  recordset size.</font></p>
+<p><font>$numrows = $rs-&gt;PO_RecordCount("articles_table", 
"group=$group");</font></p>
+<font><b> NextRecordSet<a name="nextrecordset" id="nextrecordset"></a>()</b> 
</font>
+<p><font>For databases that allow multiple recordsets to be returned
+    in one query, this function allows you to switch to the next recordset. 
Currently
+  only supported by mssql driver.</font></p>
+<pre><font>$rs = $db-&gt;Execute('execute return_multiple_rs');<br>$arr1 = 
$rs-&gt;GetArray();<br>$rs-&gt;NextRecordSet();<br>$arr2 = 
$rs-&gt;GetArray();</font></pre>
+<p><font><b>FetchObject<a name="fetchobject"></a>($toupper=true)</b></font></p>
+<p><font>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.</font></p>
+<p><font><b>FetchNextObject<a 
name="fetchnextobject"></a>($toupper=true)</b></font></p>
+<p><font>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.</font></p>
+<pre><font>$rs = $db-&gt;Execute('select firstname,lastname from 
table');<br>if ($rs) {<br>    while ($o = $rs-&gt;FetchNextObject()) {<br>      
      print "$o-&gt;FIRSTNAME, $o-&gt;LASTNAME&lt;BR&gt;";<br>        
}<br>}<br></font></pre>
+<p><font>There is some trade-off in speed in using FetchNextObject().
+If performance is important, you should access rows with the 
<code>fields[]</code> array. <b>FetchObj<a name="fetchobj" 
id="fetchobj"></a>()</b> </font></p>
+<p><font>Returns the current record as an object. Fields are
+    not upper-cased, unlike FetchObject.  
+</font></p>
+<p><font><b>FetchNextObj<a name="fetchnextobj" id="fetchnextobj"></a>()</b> 
</font></p>
+<p><font>Returns the current record as an object and moves to
+    the next record. If EOF, false is returned. Fields are not upper-cased, 
unlike
+  FetctNextObject. </font></p>
+<font>
+<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> as a string 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 FetchField() can be passed in $<b>fieldobj</b> or as the 1st parameter 
<b>$nativeDBType</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>
+For example, $db-&gt;MetaType('char') will return 'C'.
+<p>Returns:</p>
+<ul>
+  <li><b>C</b>: Character fields that should be shown in a &lt;input 
type="text"&gt; tag. </li>
+  <li><b>X</b>: Clob (character large objects), 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>:&nbsp; Integer field. </li>
+  <li><b>R</b>: Counter or Autoincrement field. Must be numeric.</li>
+  <li><b>B</b>: Blob, or binary large objects. </li>
+</ul> 
+</font><p><font> Since ADOdb 3.0, MetaType accepts $fieldobj
+    as the first parameter, instead of $nativeDBType. </font></p>
+<font> </font>
+<p><font><b>Close( )<a name="rsclose"></a></b></font></p>
+<p><font>Closes the recordset, cleaning all memory and resources
+associated with the recordset. </font></p>
+<p>
+<font>If memory management is not an issue, you do not need to
+call this function as recordsets are closed for you by PHP at the end of the
+script. SQL statements such as INSERT/UPDATE/DELETE do not really return a 
recordset,
+so you do not have to call Close() for such SQL statements.</font></p>
+<hr />
+<h3><font>function rs2html<a 
name="rs2html"></a>($adorecordset,[$tableheader_attributes],
+  [$col_titles])</font></h3>
+<p><font>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.</font></p>
+<p><font>You will need to include the file <i>tohtml.inc.php</i>.</font></p>
+<p><font>Example of rs2html:<b><font color="#336600"><a 
name="exrs2html"></a></font></b></font></p>
+<pre><font><b><font 
color="#336600">&lt;?<br>include('tohtml.inc.php')</font></b>; # load code 
common to ADOdb <br><b>include</b>('adodb.inc.php'); # load code common to 
ADOdb <br>$<font color="#663300">conn</font> = &amp;ADONewConnection('mysql');  
 # create a connection <br>$<font 
color="#663300">conn</font>-&gt;PConnect('localhost','userid','','agora');# 
connect to MySQL, agora db<br>$<font color="#663300">sql</font> = 'select 
CustomerName, CustomerID from customers'; <br>$<font color="#663300">rs</font>  
 = $<font color="#663300">conn</font>-&gt;Execute($sql); <br><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>'));<br>?&gt;</b></font></pre>
+<hr />
+<h3><font>Differences between this ADOdb library and Microsoft
+ADO<a name="adodiff"></a></font></h3>
+<ol>
+<font>
+<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. Instead we have the 
ADOConnection::<a href="#parameter">Parameter</a>(
+  ) function, which provides a simpler interface for calling preparing 
parameters
+  and calling stored procedures.</li>
+<li>Recordset properties for paging records are available, but implemented as
+  in <a href="#ex8">Example 8</a>.</li>
+</font></ol>
+<hr />
+<h1><font>Database Driver Guide<a name="driverguide"></a></font></h1>
+<p><font>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.</font></p>
+<p><font>First decide on a name in lower case to call the database
+  type. Let's say we call it xbase. </font></p>
+<p><font>Then we need to create two classes ADODB_xbase and ADORecordSet_xbase
+  in the file adodb-xbase.inc.php.</font></p>
+<p><font>The simplest form of database driver is an adaptation
+    of an existing ODBC driver. Then we just need to create the class 
<i>ADODB_xbase
+    extends ADODB_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.</font></p>
+<p><font>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.</font></p>
+<p><font>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.</font></p>
+<p><font><b>ADOConnection Functions to Override</b></font></p>
+<p><font>Defining a constructor for your ADOConnection derived
+  function is optional. There is no need to call the base class 
constructor.</font></p>
+<p><font>_<b>connect</b>: Low level implementation of Connect.
+  Returns true or false. Should set the _<b>connectionID</b>.</font></p>
+<p><font>_<b>pconnect:</b> Low level implemention of PConnect.
+  Returns true or false. Should set the _<b>connectionID</b>.</font></p>
+<p><font>_<b>query</b>: Execute a query. Returns the queryID,
+or false.</font></p>
+<p><font>_<b>close: </b>Close the connection -- PHP should clean
+up all recordsets. </font></p>
+<p><font><b>ErrorMsg</b>: Stores the error message in the private
+variable _errorMsg. </font></p>
+<p><font><b>ADOConnection Fields to Set</b></font></p>
+<p><font>_<b>bindInputArray</b>: Set to true if binding of parameters
+  for SQL inserts and updates is allowed using ?, eg. as with ODBC.</font></p>
+<p><font><b>fmtDate</b></font></p>
+<p><font><b>fmtTimeStamp</b></font></p>
+<p><font><b>true</b></font></p>
+<p><font><b>false</b></font></p>
+<p><font><b>concat_operator</b></font></p>
+<p><font><b>replaceQuote</b></font></p>
+<p><font><b>hasLimit</b> support SELECT * FROM TABLE LIMIT 10
+of MySQL.</font></p>
+<p><font><b>hasTop</b> support Microsoft style SELECT TOP 10
+* FROM TABLE.</font></p>
+<p><font><b>ADORecordSet Functions to Override</b></font></p>
+<p><font>You will need to define a constructor for your ADORecordSet
+  derived class that calls the parent class constructor.</font></p>
+<p><font><b>FetchField: </b> as documented above in ADORecordSet</font></p>
+<p><font>_<b>initrs</b>: low level initialization of the recordset:
+    setup the _<b>numOfRows</b> and _<b>numOfFields</b> fields -- called by the
+  constructor.</font></p>
+<p><font>_<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.</font></p>
+<p><font>_<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.</font></p>
+<p><font>_<b>close</b>: close the recordset</font></p>
+<p><font><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.</font></p>
+<p><font><b>ADOConnection Fields to Set</b></font></p>
+<p><font>canSeek: Set to true if the _seek function works.</font></p>
+<h2><font>Optimizing PHP</font></h2>
+    For info on tuning PHP, read this article on <a 
href="http://phplens.com/lens/php-book/optimizing-debugging-php.php";>Optimizing
+  PHP</a>. </font></p>
+
+<h2><font>Change Log<a name="Changes"></a><a name="changes"></a><a 
name="changelog"></a></font></h2>
+<P>
+
+<p><a name="4.72"></a><b>4.72 21 Feb 2006</b>
+<p>Added 'new' DSN parameter for NConnect().
+<p>Pager now sanitizes $PHP_SELF to protect against XSS. Thx to James Bercegay 
and others.
+<p>ADOConnection::MetaType changed to setup $rs->connection correctly. 
+<p>New native DB2 driver contributed by Larry Menard, Dan Scott, Andy 
Staudacher, Bharat Mediratta.
+<p>The mssql CreateSequence() did not BEGIN TRANSACTION correctly. Fixed. Thx 
Sean Lee.
+<p>The _adodb_countrecs() function in adodb-lib.inc.php has been revised to 
handle more ORDER BY variations.
+<p><a name="4.71"></a><b>4.71 24 Jan 2006</b>
+<p>Fixes postgresql security issue related to binary strings. Thx to Andy 
Staudacher.
+<p>Several DSN bugs found:
+<p>1. Fix bugs in DSN connections introduced in 4.70 when underscores are 
found in the DSN. 
+<p>2. DSN with _ did not work properly in PHP5 (fine in PHP4). Fixed.
+<p>3. Added support for PDO DSN connections in NewADOConnection(), and 
database parameter in PDO::Connect().
+<p>The oci8 datetime flag not correctly implemented in ADORecordSet_array. 
Fixed.
+<p>Added BlobDelete() to postgres, as a counterpoint to UpdateBlobFile().
+<p>Fixed GetInsertSQL() to support oci8po.
+<p>Fixed qstr() issue with postgresql with \0 in strings.
+<p>Fixed some datadict driver loading issues in _adodb_getdriver(). 
+<p>Added register shutdown function session_write_close in 
adodb-session.inc.php for PHP 5 compat. See 
http://phplens.com/lens/lensforum/msgs.php?id=14200.
+<p><a name="4.70"></a><b>4.70 6 Jan 2006</b>
+<p>Many fixes from Danila Ulyanov  to ibase, oci8, postgres, mssql, 
odbc_oracle, odbtp, etc drivers.
+<p>Changed usage of binary hint in adodb-session.inc.php for mysql. See 
+http://phplens.com/lens/lensforum/msgs.php?id=14160
+<p>Fixed invalid variable reference problem in undomq(), adodb-perf.inc.php.
+<p>Fixed http://phplens.com/lens/lensforum/msgs.php?id=14254 in 
adodb-perf.inc.php, _DBParameter() settings of fetchmode was wrong.
+<p>Fixed security issues in server.php and tmssql.php discussed by Andreas 
Sandblad in a Secunia security advisory. Added $ACCEPTIP = 127.0.0.1
+and changed suggested root password to something more secure.
+<p>Changed pager to close recordset after RenderLayout().
+<p><a name="4.68"></a><b>4.68 25 Nov  2005</b>
+<p>PHP 5 compat for mysqli. MetaForeignKeys repeated twice and 
MYSQLI_BINARY_FLAG missing.
+<p>PHP 5.1 support for postgresql bind parameters using ? did not work if >= 
10 parameters. Fixed. Thx to Stanislav Shramko.
+<p>Lots of PDO improvements.
+<p>Spelling error fixed in mysql MetaForeignKeys, $associative parameter.
+<p><a name="4.67"></a><b>4.67 16 Nov  2005</b>
+<p>Postgresql not_null flag not set to false correctly. Thx Cristian MARIN.
+<p>We now check in Replace() if key is in fieldArray. Thx Sébastien Vanvelthem.
+<p>_file_get_contents() function was missing in xmlschema. fixed.
+<p>Added week in year support to SQLDate(), using 'W' flag. Thx Spider.
+<p>In sqlite metacolumns was repeated twice, causing PHP 5 problems. Fixed.
+<p>Made debug output XHTML compliant. 
+<p><a name="4.66"></a><b>4.66 28 Sept  2005</b>
+<p>ExecuteCursor() in oci8 did not clean up properly on failure. Fixed.
+<p>Updated xmlschema.dtd, by "Alec Smecher" asmecher#smecher.bc.ca
+<p>Hardened SelectLimit, typecasting nrows and offset to integer.
+<p>Fixed misc bugs in AutoExecute() and GetInsertSQL().
+<p>Added $conn->database as the property holding the database name. The older 
$conn->databaseName is retained for backward
+compat.
+<p>Changed _adodb_backtrace() compat check to use function_exists().
+<p>Bug in postgresql MetaIndexes fixed. Thx Kevin Jamieson. 
+<p>Improved OffsetDate for MySQL, reducing rounding error.
+<p>Metacolumns added to sqlite. Thx Mark Newnham.
+<p>PHP 4.4 compat fixes for GetAssoc().
+<p>Added postgresql bind support for php 5.1. Thx Cristiano da Cunha Duarte
+<p>OffsetDate() fixes for postgresql, typecasting strings to date or timestamp.
+<p>DBTimeStamp formats for mssql, odbc_mssql and postgresql made to conform 
with other db's.
+<p>Changed PDO constants from PDO_ to PDO:: to support latest spec.
+<p><a name="4.65"></a><b>4.65 22 July  2005</b>
+<p>Reverted 'X' in mssql datadict to 'TEXT' to be compat with mssql driver. 
However now you can 
+set $datadict->typeX = 'varchar(4000)' or 'TEXT' or 'CLOB' for mssql and oci8 
drivers. 
+<p>Added charset support when using DSN for Oracle.
+<p>_adodb_getmenu did not use fieldcount() to get number of fields. Fixed.
+<p>MetaForeignKeys() for mysql/mysqli contributed by Juan Carlos Gonzalez.
+<p>MetaDatabases() now correctly returns an array for mysqli driver. Thx 
Cristian MARIN.
+<p>CompleteTrans(false) did not return false. Fixed. Thx to JMF.
+<p>AutoExecute() did not work with Oracle. Fixed. Thx José Moreira.
+<p>MetaType() added to connection object.
+<p>More PHP 4.4 reference return fixes. Thx Ryan C Bonham and others.
+
+<p><a name="4.64"></a><b>4.64 20 June 2005</b>
+<p>In datadict, if the default field value is set to '', then it is not 
applied when the field is created. Fixed by Eugenio.
+<p>MetaPrimaryKeys for postgres did not work because of true/false change in 
4.63. Fixed.
+<p>Tested ocifetchstatement in oci8. Rejected at the end.
+<p>Added port to dsn handling. Supported in postgres, mysql, mysqli,ldap.
+<p>Added  'w' and 'l' to mysqli SQLDate().
+<p>Fixed error handling in ldap _connect() to be more consistent. Also added 
ErrorMsg() handling to ldap.
+<p>Added support for union in _adodb_getcount, adodb-lib.inc.php for postgres 
and oci8.
+<p>rs2html() did not work with null dates properly.
+<p>PHP 4.4 reference return fixes.
+
+<p><a name="4.63"></a><b>4.63  18 May 2005</b>
+<p>Added $nrows<0 check to mysqli's SelectLimit().
+<p>Added OptimizeTable() and OptimizeTables() in adodb-perf.inc.php. By Markus 
Staab.
+<p>PostgreSQL inconsistencies fixed. true and false set to TRUE and FALSE, and 
boolean type in datadict-postgres.inc.php set
+to 'L' => 'BOOLEAN'. Thx Kevin Jamieson.
+<p>New adodb_session_create_table() function in adodb-session.inc.php. By 
Markus Staab.
+<p>Added null check to UserTimeStamp().
+<p>Fixed typo in mysqlt driver in adorecordset. Thx to Andy Staudacher.
+<p>GenID() had a bug in the raiseErrorFn handling. Fixed. Thx Marcos Pont.
+<p>Datadict name quoting now handles ( ) in index fields correctly - they 
aren't part of the index field.
+<p>Performance monitoring: (1) oci8 Ixora checks moved down; (2) expensive sql 
changed so that only those sql with 
+count(*)>1 are shown; (3) changed sql1 field to a length+crc32 checksum - this 
breaks backward compat.
+<p>We remap firebird15 to firebird in data dictionary.
+
+<p><a name="4.62"></a><b>4.62  2 Apr 2005</b>
+<p>Added 'w' (dow as 0-6 or 1-7) and 'l' (dow as string) for SQLDate for oci8, 
postgres and mysql.
+<p>Rolled back MetaType() changes for mysqli done in prev version.
+<p>Datadict change by chris, cblin#tennaxia.com data mappings from:
+<pre>
+oci8:  X->varchar(4000) XL->CLOB
+mssql: X->XL->TEXT
+mysql: X->XL->LONGTEXT
+fbird: X->XL->varchar(4000)
+</pre>
+<p>to:
+<pre>
+oci8:  X->varchar(4000) XL->CLOB
+mssql: X->VARCHAR(4000) XL->TEXT
+mysql: X->TEXT          XL->LONGTEXT
+fbird: X->VARCHAR(4000) XL->VARCHAR(32000)
+</pre>
+<p>Added $connection->disableBlobs to postgresql to improve performance when 
no bytea is used (2-5% improvement).
+<p>Removed all HTTP_* vars.
+<p>Added $rs->tableName to be set before calling AutoExecute().
+<p>Alex Rootoff rootoff#pisem.net contributed ukrainian language file.
+<p>Added new mysql_option() support using $conn->optionFlags array.
+<p>Added support for ldap_set_option() using the $LDAP_CONNECT_OPTIONS global 
variable. Contributed by Josh Eldridge.
+<p>Added LDAP_* constant definitions to ldap.
+<p>Added support for boolean bind variables. We use $conn->false and 
$conn->true to hold values to set false/true to.
+<p>We now do not close the session connection in adodb-session.inc.php as 
other objects could be using this connection.
+<p>We now strip off \0 at end of Ixora SQL strings in $perf->tohtml() for oci8.
+<p><a name="4.61"></a><b>4.61 23 Feb 2005</b>
+<p>MySQLi added support for mysqli_connect_errno() and mysqli_connect_error().
+<p>Massive improvements to alpha PDO driver.
+<p>Quote string bind parameters logged by performance monitor for easy type 
checking. Thx Jason Judge.
+<p>Added support for $role when connecting with Interbase/firebird.
+<p>Added support for enum recognition in MetaColumns() mysql and mysqli. Thx 
Amedeo Petrella.
+<p>The sybase_ase driver contributed by Interakt Online. Thx Cristian Marin 
cristic#interaktonline.com.
+<p>Removed not_null, has_default, and default_value from ADOFieldObject.
+<p>Sessions code, fixed quoting of keys when handling LOBs in session write() 
function.
+<p>Sessions code, added adodb_session_regenerate_id(), to reduce risk of 
session hijacking by changing session cookie dynamically. Thx Joe Li.
+<p>Perf monitor, polling for CPU did not work for PHP 4.3.10 and 5.0.0-5.0.3 
due to PHP bugs, so we special case these versions.
+<p>Postgresql, UpdateBlob() added code to handle type==CLOB.
+<p><a name="4.60"></a><b>4.60 24 Jan 2005</b>
+<p>Implemented PEAR DB's autoExecute(). Simplified design because I don't like 
using constants when
+strings work fine.
+<p>_rs2serialize will now update $rs->sql and $rs->oldProvider.
+<p>Added autoExecute().
+<p>Added support for postgres8 driver. Currently just remapped to postgres7 
driver.
+<p>Changed oci8 _query(), so that OCIBindByName() sets the length to -1 if 
element size is > 4000. This provides better support
+for LONGs.
+<p>Added SetDateLocale() support for netherlands (Nl).
+<p>Spelling error in pivot code ($iff should be $iif).
+</p><p>mysql insert_id() did not work with mysql 3.x. Fixed.
+</p><p>"\r\n" not converted to spaces correctly in exporting data. Fixed.
+</p><p>_nconnect() in mysqli did not return value correctly. Fixed.
+</p><p>Arne Eckmann contributed danish language file.
+</p><p>Added clone() support to FetchObject() for PHP5.<br>
+</p>
+<p>Removed SQL_CUR_USE_ODBC from odbc_mssql.<br>
+</p>
+<p><a name="4.55"></a><b>4.55 5 Jan 2005</b>
+</p><p>Found bug in Execute() with bind params for db's that do not support 
binding natively.
+</p><p>DropSequence() now correctly uses default parameter.
+</p><p>Now Execute() ignores locale for floats, so 1.23 is NEVER converted to 
1,23.
+</p><p>SetFetchMode() not properly saved in adodb-perf, suspicious sql and 
expensive sql. Fixed.
+</p><p>Added INET to postgresql metatypes. Thx motzel.
+</p><p>Allow oracle hints to work when counting with _adodb_getcount in 
adodb-lib.inc.php. Thx Chris Wrye.
+</p><p>Changed mysql insert_id() to use SELECT LAST_INSERT_ID().
+</p><p>If alter col in datadict does not modify col type/size of actual
+col, then it is removed from alter col code. By Mark Newham. Not
+perfect as MetaType() !== ActualType().
+</p><p>Added handling of view fields in metacolumns() for postgresql. Thx 
Renato De Giovanni.
+</p><p>Added to informix MetaPrimaryKeys and MetaColumns fixes for null bit. 
Thx to Cecilio Albero.
+</p><p>Removed obsolete connection_timeout() from perf code.
+</p><p>Added support for arrayClass in adodb-csv.inc.php.
+</p><p>RSFilter now accepts methods of the form $array($obj, 'methodname'). 
Thx to blake#near-time.com.
+</p><p>Changed CacheFlush to $cmd = 'rm -rf 
'.$ADODB_CACHE_DIR.'/[0-9a-f][0-9a-f]/'; 
+</p><p>For better cursor concurrency, added code to free ref cursors in
+oci8 when $rs-&gt;Close() is called. Note that CLose() is called
+internally by the Get* functions too.
+</p><p>Added IIF support for access when pivoting.  Thx Volodia Krupach.
+</p><p>Added mssql datadict support for timestamp. Thx Alexios.
+</p><p>Informix pager fix. By Mario Ramirez.
+</p><p>ADODB_TABLE_REGEX now includes ':'. By Mario Ramirez.
+</p><p>Mark Newnham contributed MetaIndexes for oci8 and db2.
+</p><p><a name="4.54"></a><b>4.54 5 Nov 2004</b>
+</p><p>
+Now you can set $db-&gt;charSet = ?? before doing a Connect() in oci8.
+</p><p>
+Added adodbFetchMode to sqlite.
+</p><p>
+Perf code, added a string typecast to substr in adodb_log_sql().
+</p><p>
+Postgres: Changed BlobDecode() to use po_loread, added new $maxblobsize 
parameter, and now it returns the blob instead
+of sending it to stdout - make sure to mention that as a compat warning.
+Also added $db-&gt;IsOID($oid) function; uses a heuristic, not guaranteed to 
work 100%.
+</p><p>
+Contributed arabic language file by "El-Shamaa, Khaled" k.el-shamaa#cgiar.org
+</p><p>
+PHP5 exceptions did not handle @ protocol properly. Fixed.
+</p><p>
+Added ifnull handling for postgresql (using coalesce).
+</p><p>
+Added  metatables() support for Postgresql 8.0 (no longer uses pg_% dictionary 
tables).
+</p><p>
+Improved Sybase ErrorMsg() function. By Gaetano Giunta.
+</p><p>
+Improved oci8 SelectLimit() to use Prepare(). By Cristiano Duarte.
+</p><p>
+Type-cast $row parameter in ifx_fetch_row() to int. Thx stefan bodgan.
+</p><p>Ralf becker contributed improvements in postgresql, sapdb, mysql data 
dictionary handling:<br>
+- MySql and Postgres MetaType was reporting every int column which was 
+part of a primary key and unique as serial<br>
+- Postgres was not reporting the scale of decimal types<br>
+- MaxDB was padding the defaults of none-string types with spaces<br>
+- MySql now correctly converts enum columns to varchar
+</p><p>
+Ralf also changed Postgresql datadict:<br>
+- you cant add NOT NULL columns in postgres in one go, they need to be 
+added as NULL and then altered to NOT NULL<br>
+- AlterColumnSQL could not change a varchar column with numbers into an 
+integer column, postgres need an explicit conversation<br>
+- a re-created sequence was not set to the correct value, if the name 
+was the old name (no implicit sequence), now always the new name of the 
+implicit sequence is used<br>
+</p><p>Sergio Strampelli added extra $intoken check to Lens_ParseArgs() in 
datadict code.
+</p><p><a name="4.53"></a><b>4.53 28 Sept 2004</b>
+</p><p>FetchMode cached in recordset is sometimes mapped to native db 
fetchMode. Normally this does not matter,
+but when using cached recordsets, we need to switch back to using adodb 
fetchmode.  So we cache this
+in $rs-&gt;adodbFetchMode if it differs from the db's fetchMode.
+</p><p>For informix we now set canSeek = false driver because stefan bodgan 
tells me that seeking doesn't work. 
+</p><p>SetDateLocale() never worked till now ;-) Thx david#tomato.it
+</p><p>Set $_bindInputArray = true in sapdb driver. Required for clob support.
+</p><p>Fixed some PEAR::DB emulation issues with isError() and isWarning. Thx 
to Gert-Rainer Bitterlich.
+</p><p>Empty() used in getupdatesql without strlen() check. Fixed.</p>
+<p>Added unsigned detection to mysql and mysqli drivers. Thx to dan cech.
+</p><p>Added hungarian language file. Thx to Hal&aacute;szv&aacute;ri 
G&aacute;bor.
+</p><p>Improved fieldname-type formatting of datadict SQL generated (adding 
$widespacing parameter to _GenField).
+</p><p>Datadict oci8 DROP CONSTRAINTS misspelt. Fixed. Thx Mark Newnham.
+</p><p>Changed odbtp to dynamically change databaseType based on connection, 
eg. from 'odbtp' to 'odbtp_mssql' when connecting
+to mssql database.
+</p><p>In datadict, MySQL I4 was wrongly mapped to MEDIUMINT, which is 
actually I3. Fixed.
+</p><p>Fixed mysqli MetaType() recognition. Mysqli returns numeric types 
unlike mysql extension. Thx Francesco Riosa.
+</p><p>VFP odbc driver curmode set wrongly, causing problems with memo fields. 
Fixed.
+</p><p>Odbc driver did not recognize odbc version 2 driver date types 
properly. Fixed. Thx Bostjan.
+</p><p>ChangeTableSQL() fixes to datadict-db2.inc.php by Mark Newnham.
+</p><p>Perf monitoring with odbc improved. Now we try in perf code to manually 
set the sysTimeStamp using date() if sysTimeStamp
+is empty.
+</p><p>All ADO errors are thrown as exceptions in PHP5. 
+So we added exception handling to ado in PHP5 by creating new 
adodb-ado5.inc.php driver.
+</p><p>Added IsConnected(). Returns true if connection object connected. By 
Luca.Gioppo.
+</p><p>"Ralf Becker"
+RalfBecker#digitalROCK.de contributed new sapdb data-dictionary driver
+and a large patch that implements field and table renaming for oracle,
+mssql, postgresql, mysql and sapdb. See the new RenameTableSQL() and
+RenameColumnSQL() functions.
+</p><p>We now check ExecuteCursor to see if PrepareSP was initially called.
+</p><p>Changed oci8 datadict to use MODIFY for $dd-&gt;alterCol. Thx Mark 
Newnham.
+</p><p><a name="4.52"></a><b>4.52  10 Aug 2004</b>
+</p><p>Bug found in Replace() when performance logging enabled, introduced in 
ADOdb 4.50. Fixed.
+</p><p>Replace() checks update stmt. If update stmt fails, we now return 
immediately. Thx to alex.
+</p><p>Added support for $ADODB_FORCE_TYPE in GetUpdateSQL/GetInsertSQL. Thx 
to niko.
+</p><p>Added ADODB_ASSOC_CASE support to postgres/postgres7 driver.
+</p><p>Support for DECLARE stmt in oci8. Thx Lochbrunner.
+</p><p><a name="4.51"></a><b>4.51  29 July  2004</b>
+</p><p>Added adodb-xmlschema 1.0.2. Thx dan and richard.
+</p><p>Added new adorecordset_ext_* classes. If ADOdb extension installed for 
mysql, mysqlt and oci8 
+(but not oci8po),  we use the superfast ADOdb extension code for movenext.
+</p><p>Added schema support to mssql and odbc_mssql MetaPrimaryKeys().
+</p><p>Patched MSSQL driver to support PHP NULL and Boolean values 
+while binding the input array parameters in the _query() function. By Stephen 
Farmer.
+</p><p>Added support for clob's for mssql,  UpdateBlob(). Thx to 
gfran#directa.com.br
+</p><p>Added normalize support for postgresql (true=lowercase table name, or 
false=case-sensitive table names) 
+to MetaColumns($table, $normalize=true).
+</p><p>PHP5 variant dates in ADO not working. Fixed in adodb-ado.inc.php.
+</p><p>Constant ADODB_FORCE_NULLS was not working properly for many releases 
(for GetUpdateSQL). Fixed. 
+Also GetUpdateSQL strips off ORDER BY now - thx Elieser Le&atilde;o.
+</p><p>Perf Monitor for oci8 now dynamically highlights optimizer_* params if 
too high/low.
+</p><p>Added dsn support to NewADOConnection/ADONewConnection.
+</p><p>Fixed out of page bounds bug in _adodb_pageexecute_all_rows() Thx to 
"Sergio Strampelli" sergio#rir.it
+</p><p>Speedup of movenext for mysql and oci8 drivers.
+</p><p>Moved debugging code _adodb_debug_execute() to adodb-lib.inc.php.
+</p><p>Fixed postgresql bytea detection bug. See 
http://phplens.com/lens/lensforum/msgs.php?id=9849.
+</p><p>Fixed ibase datetimestamp typo in PHP5. Thx stefan.
+</p><p>Removed whitespace at end of odbtp drivers.
+</p><p>Added db2 metaprimarykeys fix.
+</p><p>Optimizations to MoveNext() for mysql and oci8. Misc speedups to Get* 
functions.
+</p><p><a name="4.50"></a><b>4.50  6 July  2004</b>
+</p><p>Bumped it to 4.50 to avoid confusion with PHP 4.3.x series.
+</p><p>Added db2 metatables and metacolumns extensions.
+</p><p>Added alpha PDO driver. Very buggy, only works with odbc.
+</p><p>Tested mysqli. Set poorAffectedRows = true. Cleaned up movenext() and 
_fetch().
+</p><p>PageExecute does not work properly with php5 (return val not a 
variable). Reported Dmytro Sychevsky sych#php.com.ua.  Fixed.
+</p><p>MetaTables() for mysql, $showschema parameter was not backward 
compatible with older versions of adodb. Fixed.
+</p><p>Changed mysql GetOne() to work with mysql 3.23 when using with 
non-select stmts (e.g. SHOW TABLES).
+</p><p>Changed TRIG_ prefix to a variable in datadict-oci8.inc.php. Thx to 
Luca.Gioppo#csi.it.
+</p><p>New to adodb-time code. We allow you to define your own daylights 
savings function, 
+adodb_daylight_sv for pre-1970 dates. If the function is defined 
+(somewhere in an include), then you can correct 
+for daylights savings. See 
http://phplens.com/phpeverywhere/node/view/16#daylightsavings
+for more info.
+</p><p>New sqlitepo driver. This is because assoc mode does not work like 
other drivers in sqlite.
+   Namely, when selecting (joining) multiple tables, in assoc mode the table
+         names are included in the assoc keys in the "sqlite" driver.
+         In "sqlitepo" driver, the table names are stripped from the returned 
column names. 
+         When this results in a conflict,  the first field get preference.
+       Contributed by Herman Kuiper  herman#ozuzo.net  
+</p><p>Added $forcenull parameter to GetInsertSQL/GetUpdateSQL. Idea by Marco 
Aurelio Silva.
+</p><p>More XHTML changes for GetMenu. By Jeremy Evans.
+</p><p>Fixes some ibase date issues. Thx to stefan bogdan.
+</p><p>Improvements to mysqli driver to support $ADODB_COUNTRECS.
+</p><p>Fixed adodb-csvlib.inc.php problem when reading stream from socket. We 
need to poll stream continiously.
+</p><p><a name="4.23"></a><b>4.23  16 June   2004</b>
+</p><p>
+New interbase/firebird fixes thx to Lester Caine.
+Driver fixes a problem with getting field names in the result array, and 
+corrects a couple of data conversions. Also we default to dialect3 for 
firebird.
+Also ibase sysDate property was wrong. Changed to cast as timestamp.
+</p><p>
+The datadict driver is set up to give quoted tables and fields as this 
+was the only way round reserved words being used as field names in 
+TikiWiki. TikiPro is tidying that up, and I hope to be able to produce a 
+build of THAT which uses what I consider proper UPPERCASE field and 
+table names. The conversion of TikiWiki to ADOdb helped in that, but 
+until the database is completely tidied up in TikiPro ...
+</p><p>Modified _gencachename() to include fetchmode in name hash.
+This means you should clear your cache directory after installing this release 
as the 
+cache name algorithm has changed.
+</p><p>Now Cache* functions work in safe
+mode, because we do not create sub-directories in the $ADODB_CACHE_DIR
+in safe mode. In non-safe mode we still create sub-directories. Done by
+modifying _gencachename().
+</p><p>Added $gmt parameter (true/false)
+to UserDate and UserTimeStamp in connection class, to force conversion
+of input (in local time) to be converted to UTC/GMT.
+</p><p>Mssql datadict did not support INT types properly (no size param 
allowed). 
+Added _GetSize() to datadict-mssql.inc.php.
+</p><p>For borland_ibase, BeginTrans(), changed:<br>
+</p><pre>   $this-&gt;_transactionID = $this-&gt;_connectionID;</pre>
+to<br>
+<pre>   $this-&gt;_transactionID = ibase_trans($this-&gt;ibasetrans, 
$this-&gt;_connectionID);</pre>
+               
+<p>Fixed typo in mysqi_field_seek(). Thx to Sh4dow (sh4dow#php.pl).
+</p><p>LogSQL did not work with Firebird/Interbase. Fixed.
+</p><p>Postgres: made errorno() handling more consistent. Thx to Michael Jahn, 
Michael.Jahn#mailbox.tu-dresden.de.
+</p><p>Added informix patch to better support metatables, metacolumns by 
"Cecilio Albero" c-albero#eos-i.com
+</p><p>Cyril Malevanov contributed patch to oci8 to support passing of LOB 
parameters:
+</p><pre>      $text = 'test test test';<br>   $sql = "declare rs clob; begin 
:rs := lobinout(:sa0); end;";<br>        $stmt = $conn -&gt; 
PrepareSP($sql);<br>        $conn -&gt; InParameter($stmt,$text,'sa0', -1, 
OCI_B_CLOB);<br> $rs = '';<br>   $conn -&gt; OutParameter($stmt,$rs,'rs', -1, 
OCI_B_CLOB);<br>   $conn -&gt; Execute($stmt);<br> echo "return = 
".$rs."&lt;br&gt;";<br></pre>
+As he says, the LOBs limitations are:
+<pre> - use OCINewDescriptor before binding<br> - if Param is IN, uses save() 
before each execute. This is done automatically for you.<br> - if Param is OUT, 
uses load() after each execute. This is done automatically for you.<br> - when 
we bind $var as LOB, we create new descriptor and return it as a<br>   Bind 
Result, so if we want to use OUT parameters, we have to store<br>   somewhere 
&amp;$var to load() data from LOB to it.<br> - IN OUT params are not working 
now (should not be a big problem to fix it)<br> - now mass binding not working 
too (I've wrote about it before)<br></pre>
+<p>Simplified Connect() and PConnect() error handling.
+</p><p>When extension not loaded, Connect() and PConnect() will return null. 
On connect error, the fns will return false.
+</p><p>CacheGetArray() added to code.
+</p><p>Added Init() to adorecordset_empty().
+</p><p>Changed postgres64 driver, MetaColumns() to not strip off quotes in 
default value if :: detected (type-casting of default).
+</p><p>Added test: if (!defined('ADODB_DIR')) die(). Useful to prevent hackers 
from detecting file paths.
+</p><p>Changed metaTablesSQL to ignore Postgres 7.4 information schemas 
(sql_*).
+</p><p>New polish language file by  Grzegorz Pacan
+</p><p>Added support for UNION in _adodb_getcount().
+</p><p>Added security check for ADODB_DIR to limit path disclosure issues. 
Requested by postnuke team.
+</p><p>Added better error message support to oracle driver. Thx to Gaetano 
Giunta.
+</p><p>Added showSchema support to mysql.
+</p><p>Bind in oci8 did not handle $name=false properly. Fixed.
+</p><p>If extension not loaded, Connect(), PConnect(), NConnect() will return 
null.
+</p><p><b>4.22  15 Apr   2004</b>
+</p><p>Moved docs to own adodb/docs folder.
+</p><p>Fixed session bug when quoting compressed/encrypted data in Replace().
+</p><p>Netezza Driver and LDAP drivers contributed by Josh Eldridge.
+</p><p>GetMenu now uses rtrim() on values instead of trim().
+</p><p>Changed MetaColumnNames to return an associative array, keys being the 
field names in uppercase.
+</p><p>Suggested fix to adodb-ado.inc.php affected_rows to support PHP5 
variants. Thx to Alexios Fakos.
+</p><p>Contributed bulgarian language file by Valentin Sheiretsky 
valio#valio.eu.org.
+</p><p>Contributed romanian language file by stefan bogdan.
+</p><p>GetInsertSQL now checks for table name (string) in $rs, and will create 
a recordset for that
+table automatically. Contributed by Walt Boring. Also added OCI_B_BLOB in bind 
on Walt's request - hope
+it doesn't break anything :-)
+</p><p>Some minor postgres speedups in _initrs().
+</p><p> ChangeTableSQL checks now if MetaColumns returns empty. Thx Jason 
Judge.
+</p><p>Added ADOConnection::Time(), returns current database time in unix 
timestamp format, or false.
+</p><p><b>4.21 20 Mar 2004</b>
+</p><p>We no longer in SelectLimit for VFP driver add SELECT TOP X unless an 
ORDER BY exists.
+</p><p>Pim Koeman contributed dutch language file adodb-nl.inc.php.
+</p><p>Rick Hickerson added CLOB support to db2 datadict.
+</p><p>Added odbtp driver. Thx to "stefan bogdan" sbogdan#rsb.ro.
+</p><p>Changed PrepareSP() 2nd parameter, $cursor, to default to true 
(formerly false). Fixes oci8 backward
+compat problems with OUT params.
+</p><p>Fixed month calculation error in adodb-time.inc.php. 2102-June-01 
appeared as 2102-May-32.
+</p><p>Updated PHP5 RC1 iterator support. API changed, hasMore() renamed to 
valid().
+</p><p>Changed internal format of serialized cache recordsets. As we store a 
version number, this should be
+backward compatible.
+</p><p>Error handling when driver file not found was flawed in ADOLoadCode(). 
Fixed.
+</p><p><b>4.20 27 Feb 2004</b>
+</p><p>Updated to AXMLS 1.01.
+</p><p>MetaForeignKeys for postgres7 modified by Edward Jaramilla, works on pg 
7.4.
+</p><p>Now numbers accepts function calls or sequences for 
GetInsertSQL/GetUpdateSQL numeric fields.
+</p><p>Changed quotes of 'delete from $perf_table' to "". Thx Kehui 
(webmaster#kehui.net)
+</p><p>Added ServerInfo() for ifx, and putenv trim fix. Thx Fernando Ortiz.
+</p><p>Added addq(), which is analogous to addslashes().
+</p><p>Tested with php5b4. Fix some php5 compat problems with exceptions and 
sybase.
+</p><p>Carl-Christian Salvesen added patch to mssql _query to support binds 
greater than 4000 chars.
+</p><p>Mike suggested patch to PHP5 exception handler. $errno must be numeric.
+</p><p>Added double quotes (") to ADODB_TABLE_REGEX.
+</p><p>For oci8, Prepare(...,$cursor),
+$cursor's meaning was accidentally inverted in 4.11. This causes
+problems with ExecuteCursor() too, which calls Prepare() internally.
+Thx to William Lovaton.
+</p><p>Now dateHasTime property in connection object renamed to datetime for 
consistency. This could break bc.
+</p><p>Csongor Halmai reports that db2 SelectLimit with input array is not 
working. Fixed..
+</p><p><b>4.11 27 Jan 2004</b>
+</p><p>Csongor Halmai reports db2 binding not working. Reverted back to 
emulated binding.
+</p><p>Dan Cech modifies datadict code. Adds support for DropIndex. Minor 
cleanups.
+</p><p>Table misspelt in perf-oci8.inc.php. Changed v$conn_cache_advice to 
v$db_cache_advice. Reported by Steve W.
+</p><p>UserTimeStamp and DBTimeStamp did not handle YYYYMMDDHHMMSS format 
properly. Reported by Mike Muir. Fixed.
+</p><p>Changed oci8 Prepare(). Does not auto-allocate OCINewCursor 
automatically, unless 2nd param is set to true.
+This will break backward compat, if Prepare/Execute is used instead of 
ExecuteCursor. Reported by Chris Jones.
+</p><p>Added InParameter() and OutParameter(). Wrapper functions to 
Parameter(), but nicer because they
+are self-documenting.
+</p><p>Added 'R' handling in ActualType() to datadict-mysql.inc.php
+</p><p>Added ADOConnection::SerializableRS($rs). Returns a recordset that can 
be serialized in a session.
+</p><p>Added "Run SQL" to performance UI().
+</p><p>Misc spelling corrections in adodb-mysqli.inc.php, adodb-oci8.inc.php 
and datadict-oci8.inc.php, from Heinz Hombergs.
+</p><p>MetaIndexes() for ibase contributed by Heinz Hombergs.
+</p><p><b>4.10 12 Jan 2004</b>
+</p><p>Dan Cech contributed extensive changes to data dictionary to support 
name quoting (with `), and drop table/index.
+</p><p>Informix added cursorType property. Default remains IFX_SCROLL, but you 
can change to 0 (non-scrollable cursor) for performance.
+</p><p>Added ADODB_View_PrimaryKeys() for returning view primary keys to 
MetaPrimaryKeys().
+</p><p>Simplified chinese file, adodb-cn.inc.php from cysoft.
+</p><p>Added check for ctype_alnum in adodb-datadict.inc.php. Thx to Jason 
Judge.
+</p><p>Added connection parameter to ibase Prepare(). Fix by Daniel Hassan.
+</p><p>Added nameQuote for quoting identifiers and names to connection obj. 
Requested by Jason Judge. Also the
+data dictionary parser now detects `field name` and generates column names 
with spaces correctly.
+</p><p>BOOL type not recognised correctly as L. Fixed.
+</p><p>Fixed paths in ADODB_DIR for session files, and back-ported it to 4.05 
(15 Dec 2003)
+</p><p>Added Schema to postgresql MetaTables. Thx to col#gear.hu
+</p><p>Empty postgresql recordsets that had blob fields did not set EOF 
properly. Fixed.
+</p><p>CacheSelectLimit internal parameters to SelectLimit were wrong. Thx to 
Nio.
+</p><p>Modified adodb_pr() and adodb_backtrace() to support command-line usage 
(eg. no html).
+</p><p>Fixed some fr and it lang errors. Thx to Gaetano G.
+</p><p>Added contrib directory, with adodb rs to xmlrpc convertor by Gaetano G.
+</p><p>Fixed array recordset bugs when _skiprow1 is true. Thx to Gaetano G.
+</p><p>Fixed pivot table code when count is false.
+</p><p>
+
+</p><p><b>4.05 13 Dec 2003 </b>
+</p><p>Added MetaIndexes to data-dict code - thx to Dan Cech.
+</p><p>Rewritten session code by Ross Smith. Moved code to adodb/session 
directory.
+</p><p>Added function exists check on connecting to most drivers, so we don't 
crash with the unknown function error.
+</p><p>Smart Transactions failed with GenID() when it no seq table has been 
created because the sql
+       statement fails. Fix by Mark Newnham.
+</p><p>Added $db-&gt;length, which holds name of function that returns strlen.
+</p><p>Fixed error handling for bad driver in ADONewConnection - passed too 
few params to error-handler.
+</p><p>Datadict did not handle types like 16.0 properly in _GetSize. Fixed.
+</p><p>Oci8 driver SelectLimit() bug &amp;= instead of =&amp; used. Thx to 
Swen Th&uuml;mmler.
+</p><p>Jesse Mullan suggested not flushing outp when output buffering enabled. 
Due to Apache 2.0 bug. Added.
+</p><p>MetaTables/MetaColumns return ref bug with PHP5 fixed in 
adodb-datadict.inc.php.
+</p><p>New mysqli driver contributed by Arjen de Rijke. Based on adodb 3.40 
driver.
+Then jlim added BeginTrans, CommitTrans, RollbackTrans, IfNull, SQLDate. Also 
fixed return ref bug.
+</p><p>$ADODB_FLUSH added, if true then force flush in debugging outp. Default 
is false.  In earlier
+versions, outp defaulted to flush, which is not compat with apache 2.0.
+</p><p>Mysql driver's GenID() function did not work when when sql logging is 
on. Fixed.
+</p><p>$ADODB_SESSION_TBL not declared as global var. Not available if 
adodb-session.inc.php included in function. Fixed.
+</p><p>The input array not passed to Execute() in _adodb_getcount(). Fixed.
+</p><p><b>4.04 13 Nov 2003 </b>
+</p><p>Switched back to foreach - faster than list-each.
+</p><p>Fixed bug in ado driver - wiping out $this-&gt;fields with date fields.
+</p><p>Performance Monitor, View SQL, Explain Plan did not work if 
strlen($SQL)&gt;max($_GET length). Fixed.
+</p><p>Performance monitor, oci8 driver added memory sort ratio.
+</p><p>Added random property, returns SQL to generate a floating point number 
between 0 and 1;
+</p><p><b>4.03 6 Nov 2003 </b>
+</p><p>The path to adodb-php4.inc.php and adodb-iterators.inc.php was not 
setup properly.
+</p><p>Patched SQLDate in interbase to support hours/mins/secs. Thx to ari 
kuorikoski.
+</p><p>Force autorollback for pgsql persistent connections - 
+apparently pgsql did not autorollback properly before 4.3.4. See 
http://bugs.php.net/bug.php?id=25404
+</p><p><b>4.02 5 Nov 2003 </b>
+</p><p>Some errors in adodb_error_pg() fixed. Thx to Styve.
+</p><p>Spurious Insert_ID() error was generated by LogSQL(). Fixed.
+</p><p>Insert_ID was interfering with Affected_Rows() and Replace()  when 
LogSQL() enabled. Fixed.
+</p><p>More foreach loops optimized with list/each.
+</p><p>Null dates not handled properly in ADO driver (it becomes 31 Dec 1969!).
+</p><p>Heinz Hombergs contributed patches for mysql MetaColumns - adding 
scale, made
+interbase MetaColumns work with firebird/interbase, and added 
lang/adodb-de.inc.php.
+</p><p>Added INFORMIXSERVER environment variable.
+</p><p>Added $ADODB_ANSI_PADDING_OFF for interbase/firebird.
+</p><p>PHP 5 beta 2 compat check. Foreach (Iterator) support. Exceptions 
support.
+</p><p><b>4.01 23 Oct 2003 </b>
+</p><p>Fixed bug in rs2html(), tohtml.inc.php, that generated blank table 
cells.
+</p><p>Fixed insert_id() incorrectly generated when logsql() enabled.
+</p><p>Modified PostgreSQL _fixblobs to use list/each instead of foreach.
+</p><p>Informix ErrorNo() implemented correctly.
+</p><p>Modified several places to use list/each, including GetRowAssoc().
+</p><p>Added UserTimeStamp() to connection class.
+</p><p>Added $ADODB_ANSI_PADDING_OFF for oci8po.
+</p><p><b>4.00 20 Oct 2003 </b>
+</p><p>Upgraded adodb-xmlschema to 1 Oct 2003 snapshot.
+</p><p>Fix to rs2html warning message. Thx to Filo.
+</p><p>Fix for odbc_mssql/mssql SQLDate(), hours was wrong.
+</p><p>Added MetaColumns and MetaPrimaryKeys for sybase. Thx to Chris 
Phillipson.
+</p><p>Added autoquoting to datadict for MySQL and PostgreSQL. Suggestion by 
Karsten Dambekalns  
+</p><p><b>3.94 11 Oct 2003 </b>
+</p><p>Create trigger in datadict-oci8.inc.php did not work, because all 
cr/lf's must be removed. 
+</p><p>ErrorMsg()/ErrorNo() did not work for many databases when logging 
enabled. Fixed.
+</p><p>Removed global variable $ADODB_LOGSQL as it does not work properly with 
multiple connections.
+</p><p>Added SQLDate support for sybase. Thx to Chris Phillipson
+</p><p>Postgresql checking of pgsql resultset resource was incorrect. Fix by 
Bharat Mediratta bharat#menalto.com.
+Same patch applied to  _insertid and _affectedrows for 
adodb-postgres64.inc.php.
+</p><p>Added support for NConnect for postgresql.
+</p><p>Added Sybase data dict support. Thx to Chris Phillipson  
+</p><p>Extensive improvements in $perf-&gt;UI(), eg. Explain now opens in new 
window, we show scripts
+which call sql, etc.
+</p><p>Perf Monitor UI works with magic quotes enabled.
+</p><p>rsPrefix was declared twice. Removed.
+</p><p>Oci8 stored procedure support, eg. "begin func(); end;" was incorrect 
in _query. Fixed.
+</p><p>Tiraboschi Massimiliano contributed italian language file.
+</p><p>Fernando Ortiz, fortiz#lacorona.com.mx, contributed informix 
performance monitor.
+</p><p>Added _varchar (varchar arrays) support for postgresql. Reported by 
PREVOT St&eacute;phane.<hr />
+<p><strong>0.10 Sept 9 2000</strong> First release 
+</p><h3><strong>Old change log history moved to <a 
href="old-changelog.htm">old-changelog.htm</a>. 
+  </strong></h3>
+<p>&nbsp;</p>
+<p>  
 </p></body></html>
\ No newline at end of file
Index: phpgwapi/inc/adodb/docs/docs-datadict.htm
diff -u phpgwapi/inc/adodb/docs/docs-datadict.htm:1.2 
phpgwapi/inc/adodb/docs/docs-datadict.htm:1.3
--- phpgwapi/inc/adodb/docs/docs-datadict.htm:1.2       Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/docs/docs-datadict.htm   Tue Feb 21 13:47:42 2006
@@ -1,287 +1,278 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>ADODB Data Dictionary Manual</title>
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-  <style type="text/css">
-      body, td {
-        /*font-family: Arial, Helvetica, sans-serif;*/
-        font-size: 11pt;
-      }
-      pre {
-        font-size: 9pt;
-         background-color: #EEEEEE; padding: .5em; margin: 0px; 
-      }
-      .toplink {
-        font-size: 8pt;
-      }
-    </style>
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<h2>ADOdb Data Dictionary Library for PHP</h2>
-<p>V4.54 5 Nov 2004 (c) 2000-2004 John Lim (<a
- href="mailto:jlim#natsoft.com.my";>jlim#natsoft.com.my</a>).<br>
-AXMLS (c) 2004 ars Cognita, Inc</p>
-<p><font size="1">This software is dual licensed using BSD-Style and
-LGPL. This means you can use it in compiled proprietary and commercial
-products.</font></p>
-<table border="1">
-  <tbody>
-    <tr>
-      <td height="38"><font color="red">Kindly note that the ADOdb home page 
has
-moved to <a 
href="http://adodb.sourceforge.net/";>http://adodb.sourceforge.net/</a>
-because of the persistent unreliability of http://php.weblogs.com. <b>Please
-change your links</b>!</font></td>
-    </tr>
-  </tbody>
-</table>
-<p>Useful ADOdb links: <a 
href="http://adodb.sourceforge.net/#download";>Download</a>
-&nbsp; <a href="http://adodb.sourceforge.net/#docs";>Other Docs</a>
-</p>
-<p>This documentation describes a PHP class library to automate the
-creation of tables, indexes and foreign key constraints portably for
-multiple databases. Richard Tango-Lowy and Dan Cech have been kind
-enough to contribute <a href="#xmlschema">AXMLS</a>, an XML schema
-system for defining databases. You can contact them at
-dcech#phpwerx.net and richtl#arscognita.com.</p>
-<p>Currently the following databases are supported:</p>
-<p> <b>Well-tested:</b> PostgreSQL, MySQL, Oracle, MSSQL.<br>
-<b>Beta-quality:</b> DB2, Informix, Sybase, Interbase, Firebird.<br>
-<b>Alpha-quality:</b> MS Access (does not support DEFAULT values) and
-generic ODBC.
-</p>
-<h3>Example Usage</h3>
-<pre>  include_once('adodb.inc.php');<br>  <font color="#006600"># First 
create a normal connection</font><br>  $db-&gt;NewADOConnection('mysql');<br>  
$db-&gt;Connect(...);<br><br>  <font
- color="#006600"># Then create a data dictionary object, using this 
connection</font><br>  $dict = <strong>NewDataDictionary</strong>($db);<br><br> 
 <font
- color="#006600"># We have a portable declarative data dictionary format in 
ADOdb, similar to SQL.<br>  # Field types use 1 character codes, and fields are 
separated by commas.<br>  # The following example creates three fields: "col1", 
"col2" and "col3":</font><br>  $flds = " <br>  <font
- color="#663300"><strong> col1 C(32) NOTNULL DEFAULT 'abc',<br>   col2 I  
DEFAULT 0,<br>   col3 N(12.2)</strong></font><br>  ";<br><br>  <font
- color="#006600"># We demonstrate creating tables and indexes</font><br>  
$sqlarray = $dict-&gt;<strong>CreateTableSQL</strong>($tabname, $flds, 
$taboptarray);<br>  
$dict-&gt;<strong>ExecuteSQLArray</strong>($sqlarray);<br><br>  $idxflds = 
'co11, col2';<br>  $sqlarray = 
$dict-&gt;<strong>CreateIndexSQL</strong>($idxname, $tabname, $idxflds);<br>  
$dict-&gt;<strong>ExecuteSQLArray</strong>($sqlarray);<br></pre>
-<h3>Class Factory</h3>
-<h4>NewDataDictionary($connection, $drivername=false)</h4>
-<p>Creates a new data dictionary object. You pass a database connection object 
in $connection. The $connection does not have to be actually connected to the 
database. Some database connection objects are generic (eg. odbtp and odbc). 
Since 4.53, you can tell ADOdb  the actual database with $drivername. E.g.</p>
-<pre>
-$db =& NewADOConnection('odbtp');
-$datadict = NewDataDictionary($db, 'mssql'); # force mssql
-</pre>
-<h3>Class Functions</h3>
-<h4>function CreateDatabase($dbname, $optionsarray=false)</h4>
-<p>Create a database with the name $dbname;</p>
-<h4>function CreateTableSQL($tabname, $fldarray, $taboptarray=false)</h4>
-<pre>  RETURNS:      an array of strings, the sql to be executed, or false<br> 
 $tabname:     name of table<br>  $fldarray:    string (or array) containing 
field info<br>  $taboptarray: array containing table options<br></pre>
-<p>The new format of $fldarray uses a free text format, where each
-field is comma-delimited.
-The first token for each field is the field name, followed by the type
-and optional
-field size. Then optional keywords in $otheroptions:</p>
-<pre>  "$fieldname $type $colsize $otheroptions"</pre>
-<p>The older (and still supported) format of $fldarray is a
-2-dimensional array, where each row in the 1st dimension represents one
-field. Each row has this format:</p>
-<pre>  array($fieldname, $type, [,$colsize] [,$otheroptions]*)</pre>
-<p>The first 2 fields must be the field name and the field type. The
-field type can be a portable type codes or the actual type for that
-database.</p>
-<p>Legal portable type codes include:</p>
-<pre>  C:  varchar<br>  X:  Largest varchar size <br>  XL: For Oracle, returns 
CLOB, otherwise same as 'X' above<br><br>  C2: Multibyte varchar<br>  X2: 
Multibyte varchar (largest size)<br><br>  B:  BLOB (binary large 
object)<br><br>  D:  Date (some databases do not support this, and we return a 
datetime type)<br>  T:  Datetime or Timestamp<br>  L:  Integer field suitable 
for storing booleans (0 or 1)<br>  I:  Integer (mapped to I4)<br>  I1: 1-byte 
integer<br>  I2: 2-byte integer<br>  I4: 4-byte integer<br>  I8: 8-byte 
integer<br>  F:  Floating point number<br>  N:  Numeric or decimal 
number<br></pre>
-<p>The $colsize field represents the size of the field. If a decimal
-number is used, then it is assumed that the number following the dot is
-the precision, so 6.2 means a number of size 6 digits and 2 decimal
-places. It is recommended that the default for number types be
-represented as a string to avoid any rounding errors.</p>
-<p>The $otheroptions include the following keywords (case-insensitive):</p>
-<pre>  AUTO            For autoincrement number. Emulated with triggers if not 
available.<br>                  Sets NOTNULL also.<br>  AUTOINCREMENT   Same as 
auto.<br>  KEY             Primary key field. Sets NOTNULL also. Compound keys 
are supported.<br>  PRIMARY         Same as KEY.<br>  DEF             Synonym 
for DEFAULT for lazy typists.<br>  DEFAULT         The default value. Character 
strings are auto-quoted unless<br>                  the string begins and ends 
with spaces, eg ' SYSDATE '.<br>  NOTNULL         If field is not null.<br>  
DEFDATE         Set default value to call function to get today's date.<br>  
DEFTIMESTAMP    Set default to call function to get today's datetime.<br>  
NOQUOTE         Prevents autoquoting of default string values.<br>  CONSTRAINTS 
    Additional constraints defined at the end of the field<br>                  
definition.<br></pre>
-<p>The Data Dictonary accepts two formats, the older array
-specification:</p>
-<pre>  $flds = array(<br>    array('COLNAME',   'DECIMAL', '8.4', 'DEFAULT' 
=&gt; 0, 'NOTNULL'),<br>    array('id',        'I'      , 'AUTO'),<br>    
array('`MY DATE`', 'D'      , 'DEFDATE'),<br>    array('NAME',      'C'      , 
'32', 'CONSTRAINTS' =&gt; 'FOREIGN KEY REFERENCES reftable')<br>  );<br></pre>
-<p>Or the simpler declarative format:</p>
-<pre>  $flds = "<font color="#660000"><strong><br>    COLNAME DECIMAL(8.4) 
DEFAULT 0 NOTNULL,<br>    id I AUTO,<br>    `MY DATE` D DEFDATE,<br>    NAME 
C(32) CONSTRAINTS 'FOREIGN KEY REFERENCES reftable'</strong></font><br>  
";<br></pre>
-<p>Note that if you have special characters in the field name (e.g. My
-Date), you should enclose it in back-quotes. Normally field names are
-not case-sensitive, but if you enclose it in back-quotes, some
-databases will treat the names as case-sensitive (eg. Oracle) , and
-others won't. So be careful.</p>
-<p>The $taboptarray is the 3rd parameter of the CreateTableSQL
-function. This contains table specific settings. Legal keywords include:</p>
-<ul>
-  <li><b>REPLACE</b><br>
-Indicates that the previous table definition should be removed
-(dropped)together with ALL data. See first example below. </li>
-  <li><b>DROP</b><br>
-Drop table. Useful for removing unused tables. </li>
-  <li><b>CONSTRAINTS</b><br>
-Define this as the key, with the constraint as the value. See the
-postgresql <a href="#foreignkey">example</a> below. Additional constraints 
defined for the whole
-table. You will probably need to prefix this with a comma. </li>
-</ul>
-<p>Database specific table options can be defined also using the name
-of the database type as the array key. In the following example, <em>create
-the table as ISAM with MySQL, and store the table in the "users"
-tablespace if using Oracle</em>. And because we specified REPLACE, drop
-the table first.</p>
-<pre>  $taboptarray = array('mysql' =&gt; 'TYPE=ISAM', 'oci8' =&gt; 
'tablespace users', 'REPLACE');</pre>
-<p><a name=foreignkey></a>You can also define foreign key constraints. The 
following is syntax
-for postgresql:
-</p>
-<pre>  $taboptarray = array('constraints' =&gt; ', FOREIGN KEY (col1) 
REFERENCES reftable (refcol)');</pre>
-<h4>function DropTableSQL($tabname)</h4>
-<p>Returns the SQL to drop the specified table.</p>
-<h4>function ChangeTableSQL($tabname, $flds)</h4>
-<p>Checks to see if table exists, if table does not exist, behaves like
-CreateTableSQL. If table exists, generates appropriate ALTER TABLE
-MODIFY COLUMN commands if field already exists, or ALTER TABLE ADD
-$column if field does not exist.</p>
-<p>The class must be connected to the database for ChangeTableSQL to
-detect the existence of the table. Idea and code contributed by Florian
-Buzin.</p>
-<h4>function RenameTableSQL($tabname,$newname)</h4>
-<p>Rename a table.  Returns the an array of strings, which is the SQL required 
to rename a table. Since ADOdb 4.53. Contributed by Ralf Becker.</p>
-<h4> function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')</h4>
-<p>Rename a table field. Returns the an array of strings, which is the SQL 
required to rename a column. The optional $flds is a complete 
column-defintion-string like for AddColumnSQL, only used by mysql at the 
moment. Since ADOdb 4.53. Contributed by Ralf Becker.</p>
-<h4>function CreateIndexSQL($idxname, $tabname, $flds,
-$idxoptarray=false)</h4>
-<pre>  RETURNS:      an array of strings, the sql to be executed, or false<br> 
 $idxname:     name of index<br>  $tabname:     name of table<br>  $flds:       
 list of fields as a comma delimited string or an array of strings<br>  
$idxoptarray: array of index creation options<br></pre>
-<p>$idxoptarray is similar to $taboptarray in that index specific
-information can be embedded in the array. Other options include:</p>
-<pre>  CLUSTERED     Create clustered index (only mssql)<br>  BITMAP        
Create bitmap index (only oci8)<br>  UNIQUE        Make unique index<br>  
FULLTEXT      Make fulltext index (only mysql)<br>  HASH          Create hash 
index (only postgres)<br>  DROP          Drop legacy index<br></pre>
-<h4>function DropIndexSQL ($idxname, $tabname = NULL)</h4>
-<p>Returns the SQL to drop the specified index.</p>
-<h4>function AddColumnSQL($tabname, $flds)</h4>
-<p>Add one or more columns. Not guaranteed to work under all situations.</p>
-<h4>function AlterColumnSQL($tabname, $flds)</h4>
-<p>Warning, not all databases support this feature.</p>
-<h4>function DropColumnSQL($tabname, $flds)</h4>
-<p>Drop 1 or more columns.</p>
-<h4>function SetSchema($schema)</h4>
-<p>Set the schema.</p>
-<h4>function &amp;MetaTables()</h4>
-<h4>function &amp;MetaColumns($tab, $upper=true, $schema=false)</h4>
-<h4>function &amp;MetaPrimaryKeys($tab,$owner=false,$intkey=false)</h4>
-<h4>function &amp;MetaIndexes($table, $primary = false, $owner = false)</h4>
-<p>These functions are wrappers for the corresponding functions in the
-connection object. However, the table names will be autoquoted by the
-TableName function (see below) before being passed to the connection
-object.</p>
-<h4>function NameQuote($name = NULL)</h4>
-<p>If the provided name is quoted with backquotes (`) or contains
-special characters, returns the name quoted with the appropriate quote
-character, otherwise the name is returned unchanged.</p>
-<h4>function TableName($name)</h4>
-<p>The same as NameQuote, but will prepend the current schema if
-specified</p>
-<h4>function MetaType($t,$len=-1,$fieldobj=false)</h4>
-<h4>function ActualType($meta)</h4>
-<p>Convert between database-independent 'Meta' and database-specific
-'Actual' type codes.</p>
-<h4>function ExecuteSQLArray($sqlarray, $contOnError = true)</h4>
-<pre>  RETURNS:      0 if failed, 1 if executed all but with errors, 2 if 
executed successfully<br>  $sqlarray:    an array of strings with sql code (no 
semicolon at the end of string)<br>  $contOnError: if true, then continue 
executing even if error occurs<br></pre>
-<p>Executes an array of SQL strings returned by CreateTableSQL or
-CreateIndexSQL.</p>
-<hr>
-<a name="xmlschema"></a>
-<h2>ADOdb XML Schema (AXMLS)</h2>
-<p>This is a class contributed by Richard Tango-Lowy and Dan Cech that
-allows the user to quickly
-and easily build a database using the excellent ADODB database library
-and a simple XML formatted file.
-You can <a href="http://sourceforge.net/projects/adodb-xmlschema/";>download
-the latest version of AXMLS here</a>.</p>
-<h3>Quick Start</h3>
-<p>Adodb-xmlschema, or AXMLS, is a set of classes that allow the user
-to quickly and easily build or upgrade a database on almost any RDBMS
-using the excellent ADOdb database library and a simple XML formatted
-schema file. Our goal is to give developers a tool that's simple to
-use, but that will allow them to create a single file that can build,
-upgrade, and manipulate databases on most RDBMS platforms.</p>
-<span style="font-weight: bold;"> Installing axmls</span>
-<p>The easiest way to install AXMLS to download and install any recent
-version of the ADOdb database abstraction library. To install AXMLS
-manually, simply copy the adodb-xmlschema.inc.php file and the xsl
-directory into your adodb directory.</p>
-<span style="font-weight: bold;"> Using AXMLS in Your Application</span>
-<p>There are two steps involved in using AXMLS in your application:
-first, you must create a schema, or XML representation of your
-database, and second, you must create the PHP code that will parse and
-execute the schema.</p>
-<p>Let's begin with a schema that describes a typical, if simplistic
-user management table for an application.</p>
-<pre class="listing"><pre>&lt;?xml version="1.0"?&gt;<br>&lt;schema 
version="0.2"&gt;<br><br>  &lt;table name="users"&gt;<br>    &lt;desc&gt;A 
typical users table for our application.&lt;/desc&gt;<br>    &lt;field 
name="userId" type="I"&gt;<br>      &lt;descr&gt;A unique ID assigned to each 
user.&lt;/descr&gt;<br><br>      &lt;KEY/&gt;<br>      
&lt;AUTOINCREMENT/&gt;<br>    &lt;/field&gt;<br>    <br>    &lt;field 
name="userName" type="C" size="16"&gt;&lt;NOTNULL/&gt;&lt;/field&gt;<br><br>    
<br>    &lt;index name="userName"&gt;<br>      &lt;descr&gt;Put a unique index 
on the user name&lt;/descr&gt;<br>      &lt;col&gt;userName&lt;/col&gt;<br>     
 &lt;UNIQUE/&gt;<br><br>    &lt;/index&gt;<br>  &lt;/table&gt;<br>  <br>  
&lt;sql&gt;<br>    &lt;descr&gt;Insert some data into the users 
table.&lt;/descr&gt;<br>    &lt;query&gt;insert into users (userName) values ( 
'admin' )&lt;/query&gt;<br><br>    &lt;query&gt;insert into users (userName) 
values ( 'Joe' )&lt;/query&gt;<br>  &lt;/sql&gt;<br>&lt;/schema&gt;             
         <br></pre></pre>
-<p>Let's take a detailed look at this schema.</p>
-<p>The opening &lt;?xml version="1.0"?&gt; tag is required by XML. The
-&lt;schema&gt; tag tells the parser that the enclosed markup defines an
-XML schema. The version="0.2" attribute sets <em>the version of the
-AXMLS DTD used by the XML schema.</em> </p>
-<p>All versions of AXMLS prior to version 1.0 have a schema version of
-"0.1". The current schema version is "0.2".</p>
-<pre class="listing"><pre>&lt;?xml version="1.0"?&gt;<br>&lt;schema 
version="0.2"&gt;<br>  ...<br>&lt;/schema&gt;<br></pre></pre>
-<p>Next we define one or more tables. A table consists of a fields (and
-other objects) enclosed by &lt;table&gt; tags. The name="" attribute
-specifies the name of the table that will be created in the database.</p>
-<pre class="listing"><pre>&lt;table name="users"&gt;<br><br>    &lt;desc&gt;A 
typical users table for our application.&lt;/desc&gt;<br>    &lt;field 
name="userId" type="I"&gt;<br><br>      &lt;descr&gt;A unique ID assigned to 
each user.&lt;/descr&gt;<br>      &lt;KEY/&gt;<br>      
&lt;AUTOINCREMENT/&gt;<br>    &lt;/field&gt;<br>    <br>    &lt;field 
name="userName" type="C" size="16"&gt;&lt;NOTNULL/&gt;&lt;/field&gt;<br><br>    
<br>&lt;/table&gt;<br></pre></pre>
-<p>This table is called "users" and has a description and two fields.
-The description is optional, and is currently only for your own
-information; it is not applied to the database.</p>
-<p>The first &lt;field&gt; tag will create a field named "userId" of
-type "I", or integer. (See the ADOdb Data Dictionary documentation for
-a list of valid types.) This &lt;field&gt; tag encloses two special
-field options: &lt;KEY/&gt;, which specifies this field as a primary
-key, and &lt;AUTOINCREMENT/&gt;, which specifies that the database
-engine should automatically fill this field with the next available
-value when a new row is inserted.</p>
-<p>The second &lt;field&gt; tag will create a field named "userName" of
-type "C", or character, and of length 16 characters. The
-&lt;NOTNULL/&gt; option specifies that this field does not allow NULLs.</p>
-<p>There are two ways to add indexes to a table. The simplest is to
-mark a field with the &lt;KEY/&gt; option as described above; a primary
-key is a unique index. The second and more powerful method uses the
-&lt;index&gt; tags.</p>
-<pre class="listing"><pre>&lt;table name="users"&gt;<br>  ...<br>    <br>  
&lt;index name="userName"&gt;<br>    &lt;descr&gt;Put a unique index on the 
user name&lt;/descr&gt;<br>    &lt;col&gt;userName&lt;/col&gt;<br><br>    
&lt;UNIQUE/&gt;<br>  &lt;/index&gt;<br>    <br>&lt;/table&gt;<br></pre></pre>
-<p>The &lt;index&gt; tag specifies that an index should be created on
-the enclosing table. The name="" attribute provides the name of the
-index that will be created in the database. The description, as above,
-is for your information only. The &lt;col&gt; tags list each column
-that will be included in the index. Finally, the &lt;UNIQUE/&gt; tag
-specifies that this will be created as a unique index.</p>
-<p>Finally, AXMLS allows you to include arbitrary SQL that will be
-applied to the database when the schema is executed.</p>
-<pre class="listing"><pre>&lt;sql&gt;<br>  &lt;descr&gt;Insert some data into 
the users table.&lt;/descr&gt;<br>  &lt;query&gt;insert into users (userName) 
values ( 'admin' )&lt;/query&gt;<br><br>  &lt;query&gt;insert into users 
(userName) values ( 'Joe' )&lt;/query&gt;<br>&lt;/sql&gt;<br></pre></pre>
-<p>The &lt;sql&gt; tag encloses any number of SQL queries that you
-define for your own use.</p>
-<p>Now that we've defined an XML schema, you need to know how to apply
-it to your database. Here's a simple PHP script that shows how to load
-the schema.</p>
-<pre class="listing"><pre>&lt;?PHP<br>/* You must tell the script where to 
find the ADOdb and<br> * the AXMLS libraries.<br> */<br>require( 
"path_to_adodb/adodb.inc.php");<br>require( 
"path_to_adodb/adodb-xmlschema.inc.php" );<br><br>/* Configuration information. 
Define the schema filename,<br> * RDBMS platform (see the ADODB documentation 
for valid<br> * platform names), and database connection information here.<br> 
*/<br>$schemaFile = 'example.xml';<br>$platform = 'mysql';<br>$dbHost = 
'localhost';<br>$dbName = 'database';<br>$dbUser = 'username';<br>$dbPassword = 
'password';<br><br>/* Start by creating a normal ADODB connection.<br> 
*/<br>$db = ADONewConnection( $platform );<br>$db-&gt;Connect( $dbHost, 
$dbUser, $dbPassword, $dbName );<br><br>/* Use the database connection to 
create a new adoSchema object.<br> */<br>$schema = new adoSchema( $db 
);<br><br>/* Call ParseSchema() to build SQL from the XML schema file.<br> * 
Then call ExecuteSchema() to apply the resulting SQL to <br> * the 
database.<br> */<br>$sql = $schema-&gt;ParseSchema( $schemaFile );<br>$result = 
$schema-&gt;ExecuteSchema();<br>?&gt;<br></pre></pre>
-<p>Let's look at each part of the example in turn. After you manually
-create the database, there are three steps required to load (or
-upgrade) your schema.</p>
-<p>First, create a normal ADOdb connection. The variables and values
-here should be those required to connect to your database.</p>
-<pre class="listing"><pre>$db = ADONewConnection( 'mysql' 
);<br>$db-&gt;Connect( 'host', 'user', 'password', 'database' );<br></pre></pre>
-<p>Second, create the adoSchema object that load and manipulate your
-schema. You must pass an ADOdb database connection object in order to
-create the adoSchema object.</p>
-<pre class="listing"><pre>$schema = new adoSchema( $db );<br></pre></pre>
-<p>Third, call ParseSchema() to parse the schema and then
-ExecuteSchema() to apply it to the database. You must pass
-ParseSchema() the path and filename of your schema file.</p>
-<pre class="listing"><pre><br>$schema-&gt;ParseSchema( $schemaFile ); 
<br>$schema-&gt;ExecuteSchema(); <br></pre></pre>
-<p>Execute the above code and then log into your database. If you've
-done all this right, you should see your tables, indexes, and SQL.</p>
-<p>You can find the source files for this tutorial in the examples
-directory as tutorial_shema.xml and tutorial.php. See the class
-documentation for a more detailed description of the adoSchema methods,
-including methods and schema elements that are not described in this
-tutorial.</p>
-<h3>Upgrading</h3>
-If your schema version is older, than XSLT is used to transform the
-schema to the newest version. This means that if you are using an older
-XML schema format, you need to have the XSLT extension installed.
-If you do not want to require your users to have the XSLT extension
-installed, make sure you modify your XML schema to conform to the
-latest version.
-<hr>
-<address>If you have any questions or comments, please email them to
-Richard at richtl#arscognita.com.
-</address>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>ADODB Data Dictionary Manual</title>
+  <meta http-equiv="Content-Type"
+ content="text/html; charset=iso-8859-1">
+  <style type="text/css">
+      body, td {
+        /*font-family: Arial, Helvetica, sans-serif;*/
+        font-size: 11pt;
+      }
+      pre {
+        font-size: 9pt;
+         background-color: #EEEEEE; padding: .5em; margin: 0px; 
+      }
+      .toplink {
+        font-size: 8pt;
+      }
+    </style>
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<h2>ADOdb Data Dictionary Library for PHP</h2>
+<p>V4.72 21 Feb 2006 (c) 2000-2006 John Lim (<a
+ href="mailto:jlim#natsoft.com.my";>jlim#natsoft.com.my</a>).<br>
+AXMLS (c) 2004 ars Cognita, Inc</p>
+<p><font size="1">This software is dual licensed using BSD-Style and
+LGPL. This means you can use it in compiled proprietary and commercial
+products.</font></p>
+
+<p>Useful ADOdb links: <a 
href="http://adodb.sourceforge.net/#download";>Download</a>
+&nbsp; <a href="http://adodb.sourceforge.net/#docs";>Other Docs</a>
+</p>
+<p>This documentation describes a PHP class library to automate the
+creation of tables, indexes and foreign key constraints portably for
+multiple databases. Richard Tango-Lowy and Dan Cech have been kind
+enough to contribute <a href="#xmlschema">AXMLS</a>, an XML schema
+system for defining databases. You can contact them at
+dcech#phpwerx.net and richtl#arscognita.com.</p>
+<p>Currently the following databases are supported:</p>
+<p> <b>Well-tested:</b> PostgreSQL, MySQL, Oracle, MSSQL.<br>
+<b>Beta-quality:</b> DB2, Informix, Sybase, Interbase, Firebird.<br>
+<b>Alpha-quality:</b> MS Access (does not support DEFAULT values) and
+generic ODBC.
+</p>
+<h3>Example Usage</h3>
+<pre>  include_once('adodb.inc.php');<br>  <font color="#006600"># First 
create a normal connection</font><br>  $db = NewADOConnection('mysql');<br>  
$db-&gt;Connect(...);<br><br>  <font
+ color="#006600"># Then create a data dictionary object, using this 
connection</font><br>  $dict = <strong>NewDataDictionary</strong>($db);<br><br> 
 <font
+ color="#006600"># We have a portable declarative data dictionary format in 
ADOdb, similar to SQL.<br>  # Field types use 1 character codes, and fields are 
separated by commas.<br>  # The following example creates three fields: "col1", 
"col2" and "col3":</font><br>  $flds = " <br>  <font
+ color="#663300"><strong> col1 C(32) NOTNULL DEFAULT 'abc',<br>   col2 I  
DEFAULT 0,<br>   col3 N(12.2)</strong></font><br>  ";<br><br>  <font
+ color="#006600"># We demonstrate creating tables and indexes</font><br>  
$sqlarray = $dict-&gt;<strong>CreateTableSQL</strong>($tabname, $flds, 
$taboptarray);<br>  
$dict-&gt;<strong>ExecuteSQLArray</strong>($sqlarray);<br><br>  $idxflds = 
'co11, col2';<br>  $sqlarray = 
$dict-&gt;<strong>CreateIndexSQL</strong>($idxname, $tabname, $idxflds);<br>  
$dict-&gt;<strong>ExecuteSQLArray</strong>($sqlarray);<br></pre>
+<h3>Class Factory</h3>
+<h4>NewDataDictionary($connection, $drivername=false)</h4>
+<p>Creates a new data dictionary object. You pass a database connection object 
in $connection. The $connection does not have to be actually connected to the 
database. Some database connection objects are generic (eg. odbtp and odbc). 
Since 4.53, you can tell ADOdb  the actual database with $drivername. E.g.</p>
+<pre>
+$db =& NewADOConnection('odbtp');
+$datadict = NewDataDictionary($db, 'mssql'); # force mssql
+</pre>
+<h3>Class Functions</h3>
+<h4>function CreateDatabase($dbname, $optionsarray=false)</h4>
+<p>Create a database with the name $dbname;</p>
+<h4>function CreateTableSQL($tabname, $fldarray, $taboptarray=false)</h4>
+<pre>  RETURNS:      an array of strings, the sql to be executed, or false<br> 
 $tabname:     name of table<br>  $fldarray:    string (or array) containing 
field info<br>  $taboptarray: array containing table options<br></pre>
+<p>The new format of $fldarray uses a free text format, where each
+field is comma-delimited.
+The first token for each field is the field name, followed by the type
+and optional
+field size. Then optional keywords in $otheroptions:</p>
+<pre>  "$fieldname $type $colsize $otheroptions"</pre>
+<p>The older (and still supported) format of $fldarray is a
+2-dimensional array, where each row in the 1st dimension represents one
+field. Each row has this format:</p>
+<pre>  array($fieldname, $type, [,$colsize] [,$otheroptions]*)</pre>
+<p>The first 2 fields must be the field name and the field type. The
+field type can be a portable type codes or the actual type for that
+database.</p>
+<p>Legal portable type codes include:</p>
+<pre>  C:  Varchar, capped to 255 characters.<br>  X:  Larger varchar, capped 
to 4000 characters (to be compatible with Oracle). <br>  XL: For Oracle, 
returns CLOB, otherwise the largest varchar size.<br><br>  C2: Multibyte 
varchar<br>  X2: Multibyte varchar (largest size)<br><br>  B:  BLOB (binary 
large object)<br><br>  D:  Date (some databases do not support this, and we 
return a datetime type)<br>  T:  Datetime or Timestamp<br>  L:  Integer field 
suitable for storing booleans (0 or 1)<br>  I:  Integer (mapped to I4)<br>  I1: 
1-byte integer<br>  I2: 2-byte integer<br>  I4: 4-byte integer<br>  I8: 8-byte 
integer<br>  F:  Floating point number<br>  N:  Numeric or decimal 
number<br></pre>
+<p>The $colsize field represents the size of the field. If a decimal
+number is used, then it is assumed that the number following the dot is
+the precision, so 6.2 means a number of size 6 digits and 2 decimal
+places. It is recommended that the default for number types be
+represented as a string to avoid any rounding errors.</p>
+<p>The $otheroptions include the following keywords (case-insensitive):</p>
+<pre>  AUTO            For autoincrement number. Emulated with triggers if not 
available.<br>                  Sets NOTNULL also.<br>  AUTOINCREMENT   Same as 
auto.<br>  KEY             Primary key field. Sets NOTNULL also. Compound keys 
are supported.<br>  PRIMARY         Same as KEY.<br>  DEF             Synonym 
for DEFAULT for lazy typists.<br>  DEFAULT         The default value. Character 
strings are auto-quoted unless<br>                  the string begins and ends 
with spaces, eg ' SYSDATE '.<br>  NOTNULL         If field is not null.<br>  
DEFDATE         Set default value to call function to get today's date.<br>  
DEFTIMESTAMP    Set default to call function to get today's datetime.<br>  
NOQUOTE         Prevents autoquoting of default string values.<br>  CONSTRAINTS 
    Additional constraints defined at the end of the field<br>                  
definition.<br></pre>
+<p>The Data Dictonary accepts two formats, the older array
+specification:</p>
+<pre>  $flds = array(<br>    array('COLNAME',   'DECIMAL', '8.4', 'DEFAULT' 
=&gt; 0, 'NOTNULL'),<br>    array('id',        'I'      , 'AUTO'),<br>    
array('`MY DATE`', 'D'      , 'DEFDATE'),<br>    array('NAME',      'C'      , 
'32', 'CONSTRAINTS' =&gt; 'FOREIGN KEY REFERENCES reftable')<br>  );<br></pre>
+<p>Or the simpler declarative format:</p>
+<pre>  $flds = "<font color="#660000"><strong><br>    COLNAME DECIMAL(8.4) 
DEFAULT 0 NOTNULL,<br>    id I AUTO,<br>    `MY DATE` D DEFDATE,<br>    NAME 
C(32) CONSTRAINTS 'FOREIGN KEY REFERENCES reftable'</strong></font><br>  
";<br></pre>
+<p>Note that if you have special characters in the field name (e.g. My
+Date), you should enclose it in back-quotes. Normally field names are
+not case-sensitive, but if you enclose it in back-quotes, some
+databases will treat the names as case-sensitive (eg. Oracle) , and
+others won't. So be careful.</p>
+<p>The $taboptarray is the 3rd parameter of the CreateTableSQL
+function. This contains table specific settings. Legal keywords include:</p>
+<ul>
+  <li><b>REPLACE</b><br>
+Indicates that the previous table definition should be removed
+(dropped)together with ALL data. See first example below. </li>
+  <li><b>DROP</b><br>
+Drop table. Useful for removing unused tables. </li>
+  <li><b>CONSTRAINTS</b><br>
+Define this as the key, with the constraint as the value. See the
+postgresql <a href="#foreignkey">example</a> below. Additional constraints 
defined for the whole
+table. You will probably need to prefix this with a comma. </li>
+</ul>
+<p>Database specific table options can be defined also using the name
+of the database type as the array key. In the following example, <em>create
+the table as ISAM with MySQL, and store the table in the "users"
+tablespace if using Oracle</em>. And because we specified REPLACE, drop
+the table first.</p>
+<pre>  $taboptarray = array('mysql' =&gt; 'TYPE=ISAM', 'oci8' =&gt; 
'tablespace users', 'REPLACE');</pre>
+<p><a name=foreignkey></a>You can also define foreign key constraints. The 
following is syntax
+for postgresql:
+</p>
+<pre>  $taboptarray = array('constraints' =&gt; ', FOREIGN KEY (col1) 
REFERENCES reftable (refcol)');</pre>
+<h4>function DropTableSQL($tabname)</h4>
+<p>Returns the SQL to drop the specified table.</p>
+<h4>function ChangeTableSQL($tabname, $flds)</h4>
+<p>Checks to see if table exists, if table does not exist, behaves like
+CreateTableSQL. If table exists, generates appropriate ALTER TABLE
+MODIFY COLUMN commands if field already exists, or ALTER TABLE ADD
+$column if field does not exist.</p>
+<p>The class must be connected to the database for ChangeTableSQL to
+detect the existence of the table. Idea and code contributed by Florian
+Buzin.</p>
+<h4>function RenameTableSQL($tabname,$newname)</h4>
+<p>Rename a table.  Returns the an array of strings, which is the SQL required 
to rename a table. Since ADOdb 4.53. Contributed by Ralf Becker.</p>
+<h4> function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')</h4>
+<p>Rename a table field. Returns the an array of strings, which is the SQL 
required to rename a column. The optional $flds is a complete 
column-defintion-string like for AddColumnSQL, only used by mysql at the 
moment. Since ADOdb 4.53. Contributed by Ralf Becker.</p>
+<h4>function CreateIndexSQL($idxname, $tabname, $flds,
+$idxoptarray=false)</h4>
+<pre>  RETURNS:      an array of strings, the sql to be executed, or false<br> 
 $idxname:     name of index<br>  $tabname:     name of table<br>  $flds:       
 list of fields as a comma delimited string or an array of strings<br>  
$idxoptarray: array of index creation options<br></pre>
+<p>$idxoptarray is similar to $taboptarray in that index specific
+information can be embedded in the array. Other options include:</p>
+<pre>  CLUSTERED     Create clustered index (only mssql)<br>  BITMAP        
Create bitmap index (only oci8)<br>  UNIQUE        Make unique index<br>  
FULLTEXT      Make fulltext index (only mysql)<br>  HASH          Create hash 
index (only postgres)<br>  DROP          Drop legacy index<br></pre>
+<h4>function DropIndexSQL ($idxname, $tabname = NULL)</h4>
+<p>Returns the SQL to drop the specified index.</p>
+<h4>function AddColumnSQL($tabname, $flds)</h4>
+<p>Add one or more columns. Not guaranteed to work under all situations.</p>
+<h4>function AlterColumnSQL($tabname, $flds)</h4>
+<p>Warning, not all databases support this feature.</p>
+<h4>function DropColumnSQL($tabname, $flds)</h4>
+<p>Drop 1 or more columns.</p>
+<h4>function SetSchema($schema)</h4>
+<p>Set the schema.</p>
+<h4>function &amp;MetaTables()</h4>
+<h4>function &amp;MetaColumns($tab, $upper=true, $schema=false)</h4>
+<h4>function &amp;MetaPrimaryKeys($tab,$owner=false,$intkey=false)</h4>
+<h4>function &amp;MetaIndexes($table, $primary = false, $owner = false)</h4>
+<p>These functions are wrappers for the corresponding functions in the
+connection object. However, the table names will be autoquoted by the
+TableName function (see below) before being passed to the connection
+object.</p>
+<h4>function NameQuote($name = NULL)</h4>
+<p>If the provided name is quoted with backquotes (`) or contains
+special characters, returns the name quoted with the appropriate quote
+character, otherwise the name is returned unchanged.</p>
+<h4>function TableName($name)</h4>
+<p>The same as NameQuote, but will prepend the current schema if
+specified</p>
+<h4>function MetaType($t,$len=-1,$fieldobj=false)</h4>
+<h4>function ActualType($meta)</h4>
+<p>Convert between database-independent 'Meta' and database-specific
+'Actual' type codes.</p>
+<h4>function ExecuteSQLArray($sqlarray, $contOnError = true)</h4>
+<pre>  RETURNS:      0 if failed, 1 if executed all but with errors, 2 if 
executed successfully<br>  $sqlarray:    an array of strings with sql code (no 
semicolon at the end of string)<br>  $contOnError: if true, then continue 
executing even if error occurs<br></pre>
+<p>Executes an array of SQL strings returned by CreateTableSQL or
+CreateIndexSQL.</p>
+<hr />
+<a name="xmlschema"></a>
+<h2>ADOdb XML Schema (AXMLS)</h2>
+<p>This is a class contributed by Richard Tango-Lowy and Dan Cech that
+allows the user to quickly
+and easily build a database using the excellent ADODB database library
+and a simple XML formatted file.
+You can <a href="http://sourceforge.net/projects/adodb-xmlschema/";>download
+the latest version of AXMLS here</a>.</p>
+<h3>Quick Start</h3>
+<p>Adodb-xmlschema, or AXMLS, is a set of classes that allow the user
+to quickly and easily build or upgrade a database on almost any RDBMS
+using the excellent ADOdb database library and a simple XML formatted
+schema file. Our goal is to give developers a tool that's simple to
+use, but that will allow them to create a single file that can build,
+upgrade, and manipulate databases on most RDBMS platforms.</p>
+<span style="font-weight: bold;"> Installing axmls</span>
+<p>The easiest way to install AXMLS to download and install any recent
+version of the ADOdb database abstraction library. To install AXMLS
+manually, simply copy the adodb-xmlschema.inc.php file and the xsl
+directory into your adodb directory.</p>
+<span style="font-weight: bold;"> Using AXMLS in Your Application</span>
+<p>There are two steps involved in using AXMLS in your application:
+first, you must create a schema, or XML representation of your
+database, and second, you must create the PHP code that will parse and
+execute the schema.</p>
+<p>Let's begin with a schema that describes a typical, if simplistic
+user management table for an application.</p>
+<pre class="listing"><pre>&lt;?xml version="1.0"?&gt;<br>&lt;schema 
version="0.2"&gt;<br><br>  &lt;table name="users"&gt;<br>    &lt;desc&gt;A 
typical users table for our application.&lt;/desc&gt;<br>    &lt;field 
name="userId" type="I"&gt;<br>      &lt;descr&gt;A unique ID assigned to each 
user.&lt;/descr&gt;<br><br>      &lt;KEY/&gt;<br>      
&lt;AUTOINCREMENT/&gt;<br>    &lt;/field&gt;<br>    <br>    &lt;field 
name="userName" type="C" size="16"&gt;&lt;NOTNULL/&gt;&lt;/field&gt;<br><br>    
<br>    &lt;index name="userName"&gt;<br>      &lt;descr&gt;Put a unique index 
on the user name&lt;/descr&gt;<br>      &lt;col&gt;userName&lt;/col&gt;<br>     
 &lt;UNIQUE/&gt;<br><br>    &lt;/index&gt;<br>  &lt;/table&gt;<br>  <br>  
&lt;sql&gt;<br>    &lt;descr&gt;Insert some data into the users 
table.&lt;/descr&gt;<br>    &lt;query&gt;insert into users (userName) values ( 
'admin' )&lt;/query&gt;<br><br>    &lt;query&gt;insert into users (userName) 
values ( 'Joe' )&lt;/query&gt;<br>  &lt;/sql&gt;<br>&lt;/schema&gt;             
         <br></pre></pre>
+<p>Let's take a detailed look at this schema.</p>
+<p>The opening &lt;?xml version="1.0"?&gt; tag is required by XML. The
+&lt;schema&gt; tag tells the parser that the enclosed markup defines an
+XML schema. The version="0.2" attribute sets <em>the version of the
+AXMLS DTD used by the XML schema.</em> </p>
+<p>All versions of AXMLS prior to version 1.0 have a schema version of
+"0.1". The current schema version is "0.2".</p>
+<pre class="listing"><pre>&lt;?xml version="1.0"?&gt;<br>&lt;schema 
version="0.2"&gt;<br>  ...<br>&lt;/schema&gt;<br></pre></pre>
+<p>Next we define one or more tables. A table consists of a fields (and
+other objects) enclosed by &lt;table&gt; tags. The name="" attribute
+specifies the name of the table that will be created in the database.</p>
+<pre class="listing"><pre>&lt;table name="users"&gt;<br><br>    &lt;desc&gt;A 
typical users table for our application.&lt;/desc&gt;<br>    &lt;field 
name="userId" type="I"&gt;<br><br>      &lt;descr&gt;A unique ID assigned to 
each user.&lt;/descr&gt;<br>      &lt;KEY/&gt;<br>      
&lt;AUTOINCREMENT/&gt;<br>    &lt;/field&gt;<br>    <br>    &lt;field 
name="userName" type="C" size="16"&gt;&lt;NOTNULL/&gt;&lt;/field&gt;<br><br>    
<br>&lt;/table&gt;<br></pre></pre>
+<p>This table is called "users" and has a description and two fields.
+The description is optional, and is currently only for your own
+information; it is not applied to the database.</p>
+<p>The first &lt;field&gt; tag will create a field named "userId" of
+type "I", or integer. (See the ADOdb Data Dictionary documentation for
+a list of valid types.) This &lt;field&gt; tag encloses two special
+field options: &lt;KEY/&gt;, which specifies this field as a primary
+key, and &lt;AUTOINCREMENT/&gt;, which specifies that the database
+engine should automatically fill this field with the next available
+value when a new row is inserted.</p>
+<p>The second &lt;field&gt; tag will create a field named "userName" of
+type "C", or character, and of length 16 characters. The
+&lt;NOTNULL/&gt; option specifies that this field does not allow NULLs.</p>
+<p>There are two ways to add indexes to a table. The simplest is to
+mark a field with the &lt;KEY/&gt; option as described above; a primary
+key is a unique index. The second and more powerful method uses the
+&lt;index&gt; tags.</p>
+<pre class="listing"><pre>&lt;table name="users"&gt;<br>  ...<br>    <br>  
&lt;index name="userName"&gt;<br>    &lt;descr&gt;Put a unique index on the 
user name&lt;/descr&gt;<br>    &lt;col&gt;userName&lt;/col&gt;<br><br>    
&lt;UNIQUE/&gt;<br>  &lt;/index&gt;<br>    <br>&lt;/table&gt;<br></pre></pre>
+<p>The &lt;index&gt; tag specifies that an index should be created on
+the enclosing table. The name="" attribute provides the name of the
+index that will be created in the database. The description, as above,
+is for your information only. The &lt;col&gt; tags list each column
+that will be included in the index. Finally, the &lt;UNIQUE/&gt; tag
+specifies that this will be created as a unique index.</p>
+<p>Finally, AXMLS allows you to include arbitrary SQL that will be
+applied to the database when the schema is executed.</p>
+<pre class="listing"><pre>&lt;sql&gt;<br>  &lt;descr&gt;Insert some data into 
the users table.&lt;/descr&gt;<br>  &lt;query&gt;insert into users (userName) 
values ( 'admin' )&lt;/query&gt;<br><br>  &lt;query&gt;insert into users 
(userName) values ( 'Joe' )&lt;/query&gt;<br>&lt;/sql&gt;<br></pre></pre>
+<p>The &lt;sql&gt; tag encloses any number of SQL queries that you
+define for your own use.</p>
+<p>Now that we've defined an XML schema, you need to know how to apply
+it to your database. Here's a simple PHP script that shows how to load
+the schema.</p>
+<pre class="listing"><pre>&lt;?PHP<br>/* You must tell the script where to 
find the ADOdb and<br> * the AXMLS libraries.<br> */<br>require( 
"path_to_adodb/adodb.inc.php");<br>require( 
"path_to_adodb/adodb-xmlschema.inc.php" );<br><br>/* Configuration information. 
Define the schema filename,<br> * RDBMS platform (see the ADODB documentation 
for valid<br> * platform names), and database connection information here.<br> 
*/<br>$schemaFile = 'example.xml';<br>$platform = 'mysql';<br>$dbHost = 
'localhost';<br>$dbName = 'database';<br>$dbUser = 'username';<br>$dbPassword = 
'password';<br><br>/* Start by creating a normal ADODB connection.<br> 
*/<br>$db = ADONewConnection( $platform );<br>$db-&gt;Connect( $dbHost, 
$dbUser, $dbPassword, $dbName );<br><br>/* Use the database connection to 
create a new adoSchema object.<br> */<br>$schema = new adoSchema( $db 
);<br><br>/* Call ParseSchema() to build SQL from the XML schema file.<br> * 
Then call ExecuteSchema() to apply the resulting SQL to <br> * the 
database.<br> */<br>$sql = $schema-&gt;ParseSchema( $schemaFile );<br>$result = 
$schema-&gt;ExecuteSchema();<br>?&gt;<br></pre></pre>
+<p>Let's look at each part of the example in turn. After you manually
+create the database, there are three steps required to load (or
+upgrade) your schema.</p>
+<p>First, create a normal ADOdb connection. The variables and values
+here should be those required to connect to your database.</p>
+<pre class="listing"><pre>$db = ADONewConnection( 'mysql' 
);<br>$db-&gt;Connect( 'host', 'user', 'password', 'database' );<br></pre></pre>
+<p>Second, create the adoSchema object that load and manipulate your
+schema. You must pass an ADOdb database connection object in order to
+create the adoSchema object.</p>
+<pre class="listing"><pre>$schema = new adoSchema( $db );<br></pre></pre>
+<p>Third, call ParseSchema() to parse the schema and then
+ExecuteSchema() to apply it to the database. You must pass
+ParseSchema() the path and filename of your schema file.</p>
+<pre class="listing"><pre><br>$schema-&gt;ParseSchema( $schemaFile ); 
<br>$schema-&gt;ExecuteSchema(); <br></pre></pre>
+<p>Execute the above code and then log into your database. If you've
+done all this right, you should see your tables, indexes, and SQL.</p>
+<p>You can find the source files for this tutorial in the examples
+directory as tutorial_shema.xml and tutorial.php. See the class
+documentation for a more detailed description of the adoSchema methods,
+including methods and schema elements that are not described in this
+tutorial.</p>
+<h3>Upgrading</h3>
+If your schema version is older, than XSLT is used to transform the
+schema to the newest version. This means that if you are using an older
+XML schema format, you need to have the XSLT extension installed.
+If you do not want to require your users to have the XSLT extension
+installed, make sure you modify your XML schema to conform to the
+latest version.
+<hr />
+<address>If you have any questions or comments, please email them to
+Richard at richtl#arscognita.com.
+</address>
+</body>
+</html>
Index: phpgwapi/inc/adodb/docs/docs-oracle.htm
diff -u phpgwapi/inc/adodb/docs/docs-oracle.htm:1.2 
phpgwapi/inc/adodb/docs/docs-oracle.htm:1.3
--- phpgwapi/inc/adodb/docs/docs-oracle.htm:1.2 Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/docs/docs-oracle.htm     Tue Feb 21 13:47:42 2006
@@ -1,518 +1,542 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<style>
-pre {
-  background-color: #eee;
-  padding: 0.75em 1.5em;
-  font-size: 12px;
-  border: 1px solid #ddd;
-}
-.greybg {
-  background-color: #eee;
-  padding: 0.75em 1.5em;
-  font-size: 12px;
-  border: 1px solid #ddd;
-}
-</style>
-<title>ADOdb with PHP and Oracle</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</style>
-</head>
-
-<body>
-<table width=100%><tr><td>
-<h2>Using ADOdb with PHP and Oracle: an advanced tutorial</h2>
-</td><td><div align="right"><img src=cute_icons_for_site/adodb.gif width="88" 
height="31"></div></tr></table>
-<p><font size="1">(c)2004 John Lim. All rights reserved.</font></p>
-<h3>1. Introduction</h3>
-<p>Oracle is the most popular commercial database used with PHP. There are 
many ways of accessing Oracle databases in PHP. These include:</p>
-<ul>
-  <li>The oracle extension</li>
-  <li>The oci8 extension</li>
-  <li>PEAR DB library</li>
-  <li>ADOdb library</li>
-</ul>
-<p>The wide range of choices is confusing to someone just starting with Oracle 
and PHP. I will briefly summarize the differences, and  show you the advantages 
of using <a href="http://adodb.sourceforge.net/";>ADOdb</a>. </p>
-<p>First we have the C extensions which provide low-level access to Oracle 
functionality. These C extensions are precompiled into PHP, or linked in 
dynamically when the web server starts up. Just in case you need it, here's a 
<a 
href=http://www.oracle.com/technology/tech/opensource/php/apache/inst_php_apache_linux.html>guide
 to installing Oracle and PHP on Linux</a>.</p>
-<table width="75%" border="1" align="center">
-  <tr valign="top">
-    <td nowrap><b>Oracle extension</b></td>
-    <td>Designed for Oracle 7 or earlier. This is obsolete.</td>
-  </tr>
-  <tr valign="top">
-    <td nowrap><b>Oci8 extension</b></td>
-    <td> Despite it's name, which implies it is only for Oracle 8i, this is 
the standard method for accessing databases running Oracle 8i, 9i or 10g (and 
later).</td>
-  </tr>
-</table>
-<p>Here is an example of using the oci8 extension to query the <i>emp</i> 
table of the <i>scott</i> schema with bind parameters:
-<pre>
-$conn = OCILogon("scott","tiger", $tnsName); 
-
-$stmt = OCIParse($conn,"select * from emp where empno > :emp order by empno"); 
-$emp = 7900;
-OCIBindByName($stmt, ':emp', $emp);
-$ok = OCIExecute($stmt);
-while (OCIFetchInto($stmt,$arr)) {
-       print_r($arr);
-       echo "&lt;hr>"; 
-} 
-</pre>
-<p>This generates the following output:
-<div class=greybg>
-Array ( [0] => 7902 [1] => FORD [2] => ANALYST [3] => 7566 [4] => 03/DEC/81 
[5] => 3000 [7] => 20 ) 
-<hr>
-  Array ( [0] => 7934 [1] => MILLER [2] => CLERK [3] => 7782 [4] => 23/JAN/82 
[5] => 1300 [7] => 10 )
-</div>
-<p>We also have  many higher level PHP libraries that allow you to simplify 
the above code. The most popular are <a href="http://pear.php.net/";>PEAR DB</a> 
and <a href="http://adodb.sourceforge.net/";>ADOdb</a>.  Here are some of the 
differences between these libraries:</p>
-<table width="75%" border="1" align="center">
-  <tr>
-    <td><b>Feature</b></td>
-    <td><b>PEAR DB 1.6</b></td>
-    <td><b>ADOdb 4.52</b></td>
-  </tr>
-  <tr valign="top">
-    <td>General Style</td>
-    <td>Simple, easy to use. Lacks Oracle specific functionality.</td>
-    <td>Has multi-tier design. Simple high-level design for beginners, and 
also lower-level advanced Oracle functionality.</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for Prepare</td>
-    <td>Yes, but only on one statement, as the last prepare overwrites 
previous prepares.</td>
-    <td>Yes (multiple simultaneous prepare's allowed)</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for LOBs</td>
-    <td>No</td>
-    <td>Yes, using update semantics</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for REF Cursors</td>
-    <td>No</td>
-    <td>Yes</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for IN Parameters</td>
-    <td>Yes</td>
-    <td>Yes</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for OUT Parameters</td>
-    <td>No</td>
-    <td>Yes</td>
-  </tr>
-  <tr valign="top">
-    <td>Schema creation using XML</td>
-    <td>No</td>
-    <td>Yes, including ability to define tablespaces and constraints</td>
-  </tr>
-  <tr valign="top">
-    <td>Provides database portability features</td>
-    <td>No</td>
-    <td>Yes, has some ability to abstract features that differ between 
databases such as dates, bind parameters, and data types.</td>
-  </tr>
-  <tr valign="top">
-    <td>Performance monitoring and tracing</td>
-    <td>No</td>
-    <td>Yes. SQL can be traced and linked to web page it was executed on. 
Explain plan support included.</td>
-  </tr>
-  <tr valign="top">
-    <td>Recordset caching for frequently used queries</td>
-    <td>No</td>
-    <td>Yes. Provides great speedups for SQL involving complex <i>where, 
group-by </i>and <i>order-by</i> clauses.</td>
-  </tr>
-  <tr valign="top">
-    <td>Popularity</td>
-    <td>Yes, part of PEAR release</td>
-    <td>Yes, many open source projects are using this software, including 
PostNuke, Xaraya, Mambo, Tiki Wiki.</td>
-  </tr>
-  <tr valign="top">
-    <td>Speed</td>
-    <td>Medium speed.</td>
-    <td>Very high speed. Fastest database abstraction library available for 
PHP. <a href="http://phplens.com/lens/adodb/";>Benchmarks are available</a>.</td>
-  </tr>
-  <tr valign="top">
-    <td>High Speed Extension available</td>
-    <td>No</td>
-    <td>Yes. You can install the ADOdb extension, which implements the most 
frequently used parts of ADOdb as fast C code.</td>
-  </tr>
-</table>
-<p> PEAR DB is good enough for simple web apps. But if you need more power, 
you can see ADOdb offers more sophisticated functionality. The rest of this 
article will concentrate on using ADOdb with Oracle. You can find out more 
about <a href="#connecting">connecting to Oracle</a> later in this guide.</p>
-<h4>ADOdb Example</h4>
-<p>In ADOdb, the above oci8 example querying the <i>emp</i> table could be 
written as:</p>
-<pre>
-include "/path/to/adodb.inc.php";
-$db = NewADOConnection("oci8");
-$db->Connect($tnsName, "scott", "tiger");
-
-$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
-                    array('emp' => 7900));
-while ($arr = $rs->FetchRow()) {
-    print_r($arr);
-       echo "&lt;hr>";
-}
-</pre>
-<p>The Execute( ) function returns a recordset object, and you can retrieve 
the rows returned using $recordset-&gt;FetchRow( ). </p>
-<p>If we ignore the initial connection preamble, we can see the ADOdb version 
is much easier and simpler:</p>
-<table width="100%" border="1">
-  <tr valign="top" bgcolor="#FFFFFF">
-    <td width="50%" bgcolor="#e0e0e0"><b>Oci8</b></td>
-    <td bgcolor="#e0e0e0"><b>ADOdb</b></td>
-  </tr>
-  <tr valign="top" bgcolor="#CCCCCC">
-    <td><pre><font size="1">$stmt = <b>OCIParse</b>($conn,
-       "select * from emp where empno > :emp"); 
-$emp = 7900;
-<b>OCIBindByName</b>($stmt, ':emp', $emp);
-$ok = <b>OCIExecute</b>($stmt);
-
-while (<b>OCIFetchInto</b>($stmt,$arr)) {
-       print_r($arr);
-       echo "&lt;hr>"; 
-} </font></pre></td>
-    <td><pre><font size="1">$recordset = $db-><b>Execute</b>("select * from 
emp where empno>:emp", 
-                           array('emp' => 7900));
-
-
-
-
-while ($arr = $recordset-><b>FetchRow</b>()) {
-       print_r($arr);
-       echo "&lt;hr>";
-}</font></pre></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<h3>2. ADOdb Query Semantics</h3>
-<p>You can also query the database using the standard Microsoft ADO MoveNext( 
) metaphor. The data array for the current row is stored in the <i>fields</i> 
property of the recordset object, $rs.
-MoveNext( ) offers the highest performance among all the techniques for 
iterating through a recordset:
-<pre>
-$rs = $db->Execute("select * from emp where empno>:emp", array('emp' => 7900));
-while (!$rs->EOF) {
-       print_r($rs->fields);
-       $rs->MoveNext();
-}
-</pre>
-<p>And if you are interested in having the data returned in a 2-dimensional 
array, you can use:
-<pre>
-$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 
7900));
-</pre>
-<p>Now to obtain only the first row as an array:
-<pre>
-$arr = $db->GetRow("select * from emp where empno=:emp", array('emp' => 7900));
-</pre>
-<p>Or to retrieve only the first field of the first row:
-<pre>
-$arr = $db->GetOne("select ename from emp where empno=:emp", array('emp' => 
7900));
-</pre>
-<p>For easy pagination support, we provide the SelectLimit function. The 
following will perform a select query, limiting it to 100 rows, starting from 
row 200:
-<pre>
-$offset = 200; $limitrows = 100;
-$rs = $db->SelectLimit('select * from table', $offset, $limitrows);
-</pre>
-<p>The $limitrows parameter is optional.
-<h4>Array Fetch Mode</h4>
-<p>When data is being returned in an array, you can choose the type of array 
the data is returned in. 
-<ol>
-  <li> Numeric indexes - use <font size="2" face="Courier New, Courier, 
mono">$connection-&gt;SetFetchMode(ADODB_FETCH_NUM).</font></li>
-  <li>Associative indexes - the keys of the array are the names of the fields 
(in upper-case). Use <font size="2" face="Courier New, Courier, 
mono">$connection-&gt;SetFetchMode(ADODB_FETCH_ASSOC)</font><font face="Courier 
New, Courier, mono">.</font></li>
-  <li>Both numeric and associative indexes - use <font size="2" face="Courier 
New, Courier, mono">$connection-&gt;SetFetchMode(ADODB_FETCH_BOTH).</font></li>
-</ol>
-<p>The default is ADODB_FETCH_BOTH for Oracle.</p>
-<h4><b>Caching</b></h4>
-<p>You can define a database cache directory using $ADODB_CACHE_DIR, and cache 
the results of frequently used queries that rarely change. This is particularly 
useful for SQL with complex where clauses and group-by's and order-by's. It is 
also good for relieving heavily-loaded database servers.</p>
-<p>This example will cache the following select statement for 3600 seconds (1 
hour):</p>
-<pre>
-$ADODB_CACHE_DIR = '/var/adodb/tmp';
-$rs = $db->CacheExecute(3600, "select names from allcountries order by 1");
-</pre>
-There are analogous CacheGetArray(
-), CacheGetRow( ),  CacheGetOne( ) and CacheSelectLimit( )  functions. The 
first parameter is the number of seconds to cache. You can also pass a bind 
array as a 3rd parameter (not shown above).
-<p>There is an alternative syntax for the caching functions. The first 
parameter is omitted, and you set the cacheSecs
- property of the connection object:
-<pre>
-$ADODB_CACHE_DIR = '/var/adodb/tmp';
-$connection->cacheSecs = 3600;
-$rs = $connection->CacheExecute($sql, array('id' => 1));
-</pre>
-<h3>&nbsp;</h3>
-<h3>3. Using Prepare( ) For Frequently Used Statements</h3>
-<p>Prepare( ) is  for compiling frequently used  SQL statement for reuse. For 
example, suppose we have a large array which needs to be inserted into an 
Oracle database. The following will result in a massive speedup in query 
execution (at least 20-40%), as the SQL statement only needs to be compiled 
once:</p>
-<pre>
-$stmt = $db->Prepare('insert into table (field1, field2) values (:f1, :f2)');
-foreach ($arrayToInsert as $key => $value) {
-       $db->Execute($stmt, array('f1' => $key, 'f2' => $val);
-}
-</pre>
-<p>&nbsp;</p>
-<h3>4. Working With LOBs</h3>
-<p>Oracle treats data which is more than 4000 bytes in length specially. These 
are called Large Objects, or LOBs for short. Binary LOBs are BLOBs, and 
character LOBs are CLOBs. In most Oracle libraries, you need to do a lot of 
work to process LOBs, probably because Oracle designed it to work in systems 
with little memory. ADOdb tries to make things easy by assuming the LOB can fit 
into main memory. </p>
-<p>ADOdb will transparently handle LOBs  in <i>select</i> statements. The LOBs 
are automatically converted to PHP variables without any special coding.</p>
-<p>For updating records with LOBs, the functions UpdateBlob( ) and UpdateClob( 
) are provided. Here's a BLOB example. The parameters should be 
self-explanatory:
-<pre>
-$ok = $db->Execute("insert into aTable (id, name, ablob) 
-                                values (aSequence.nextVal, 'Name', null)");
-if (!$ok) return LogError($db-&gt;ErrorMsg());
-<font color="#006600"># params: $tableName, $blobFieldName, $blobValue, 
$whereClause</font>
-$db->UpdateBlob('aTable', 'ablob', $blobValue, 'id=aSequence.currVal');
-</pre>
-<p>and the analogous CLOB example:
-<pre>
-$ok = $db->Execute("insert into aTable (id, name, aclob) 
-                                values (aSequence.nextVal, 'Name', null)");
-if (!$ok) return LogError($db-&gt;ErrorMsg());
-$db->UpdateClob('aTable', 'aclob', $clobValue, 'id=aSequence.currVal');
-</pre>
-<p>Note that LogError( ) is a user-defined function, and not part of ADOdb.
-<p>&nbsp;
-<h3>5. REF CURSORs</h3>
-<p>Oracle recordsets can be passed around as variables called REF Cursors. For 
example, in PL/SQL, we could define a function <i>open_tab</i> that returns a 
REF CURSOR in the first parameter:</p>
-<pre>
-TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
-
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
-       BEGIN
-               OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE 
tablenames;
-       END open_tab;
-</pre>
-<p>In ADOdb, we could access this REF Cursor using the ExecuteCursor() 
function. The following will find
- all table names that begin with 'A' in the current schema:
-<pre>
-$rs = $db->ExecuteCursor("BEGIN open_tab(:refc,'A%'); END;",'refc');
-while ($arr = $rs->FetchRow()) print_r($arr);
-</pre>
-<p>The first parameter is the PL/SQL statement, and the second parameter is 
the name of the REF Cursor.
-</p>
-<p>&nbsp;</p>
-<h3>6. In and Out Parameters</h3>
-<p>The following PL/SQL
-stored procedure  requires an input  variable, and returns a result into an 
output variable:
-<pre>
-PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
-       BEGIN
-               output := 'I love '||input;
-       END;
-</pre>
-<p>The following ADOdb code allows you to call the stored procedure:</p>
-<pre>
-$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
-$input = 'Sophia Loren';
-$db->InParameter($stmt,$input,'a1');
-$db->OutParameter($stmt,$output,'a2');
-$ok = $db->Execute($stmt);
-if ($ok) echo ($output == 'I love Sophia Loren') ? 'OK' : 'Failed';
-</pre>
-<p>PrepareSP( ) is a special function that knows about bind parameters.
-The main limitation currently is that IN OUT parameters do not work.
-<h4>Bind Parameters and REF CURSORs</h4>
-<p>We could also rewrite the REF CURSOR example to use InParameter (requires 
ADOdb 4.53 or later):
-<pre>
-$stmt = $db->PrepareSP("BEGIN adodb.open_tab(:refc,:tabname); END;");
-$input = 'A%';
-$db->InParameter($stmt,$input,'tabname');
-$rs = $db->ExecuteCursor($stmt,'refc');
-while ($arr = $rs->FetchRow()) print_r($arr);
-</pre>
-<h4>Bind Parameters and LOBs</h4>
-<p>You can also operate on LOBs. In this example, we have IN and OUT 
parameters using CLOBs. 
-<pre>
-       $text = 'test test test';
-       $sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";
-       $stmt = $conn -> PrepareSP($sql);
-       $conn -> InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB); # -1 means 
variable length
-       $rs = '';
-       $conn -> OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);
-       $conn -> Execute($stmt);
-       echo "return = ".$rs."&lt;br>";
-</pre>
-<p>Similarly, you can use the constant OCI_B_BLOB to indicate that you are 
using BLOBs.
-<h4>Reusing Bind Parameters with CURSOR_SHARING=FORCE</h4>
-<p>Many web programmers do not care to use bind parameters, and prefer to 
enter the SQL directly. So instead of:</p>
-<pre>
-$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 
7900));
-</pre>
-<p>They prefer  entering the values inside the SQL:
-<pre>
-$arr = $db->GetArray("select * from emp where empno>7900");
-</pre>
-<p>This reduces Oracle performance because Oracle will reuse compiled SQL 
which is identical to previously compiled SQL. The above example with the 
values inside the SQL
-is unlikely to be reused. As an optimization, from Oracle 8.1 onwards, you can 
set the following session parameter after you login:
-<pre>
-ALTER SESSION SET CURSOR_SHARING=FORCE
-</pre>
-<p>This will force Oracle to convert all such variables (eg. the 7900 value) 
into constant bind parameters, improving SQL reuse.</p>
-<p>More <a 
href="http://phplens.com/adodb/code.initialization.html#speed";>speedup 
tips</a>.</p>
-<p>&nbsp;</p>
-<h3>7. Dates and Datetime in ADOdb</h3>
-<p>There are two things you need to know about dates in ADOdb. </p>
-<p>First, to ensure cross-database compability, ADOdb assumes that dates are 
returned in ISO format (YYYY-MM-DD H24:MI:SS).</p>
-<p>Secondly, since Oracle treats dates and datetime as the same data type, we 
decided not to display the time in the default date format. So on login, ADOdb 
will set the NLS_DATE_FORMAT to 'YYYY-MM-DD'. If you prefer to show the date 
and time by default, do this:</p>
-<pre>
-$db = NewADOConnection('oci8');
-$db->NLS_DATE_FORMAT =  'RRRR-MM-DD HH24:MI:SS';
-$db->Connect($tns, $user, $pwd);
-</pre>
-<p>Or execute:</p>
-<pre>$sql = &quot;ALTER SESSION SET NLS_DATE_FORMAT = 'RRRR-MM-DD 
HH24:MI:SS'&quot;;
-$db-&gt;Execute($sql);
-</pre>
-<p>If you are not concerned about date portability and do not use ADOdb's 
portability layer, you can use your preferred date format instead.
-<p>&nbsp;
-<h3>8. Database Portability Layer</h3>
-<p>ADOdb provides the following functions for portably generating SQL 
functions 
-  as strings to be merged into your SQL statements:</p>
-<table width="75%" border="1" align=center>
-  <tr> 
-    <td width=30%><b>Function</b></td>
-    <td><b>Description</b></td>
-  </tr>
-  <tr> 
-    <td>DBDate($date)</td>
-    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a date 
-      string formatted for INSERT/UPDATE</td>
-  </tr>
-  <tr> 
-    <td>DBTimeStamp($date)</td>
-    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a 
timestamp 
-      string formatted for INSERT/UPDATE</td>
-  </tr>
-  <tr> 
-    <td>SQLDate($date, $fmt)</td>
-    <td>Portably generate a date formatted using $fmt mask, for use in SELECT 
-      statements.</td>
-  </tr>
-  <tr> 
-    <td>OffsetDate($date, $ndays)</td>
-    <td>Portably generate a $date offset by $ndays.</td>
-  </tr>
-  <tr> 
-    <td>Concat($s1, $s2, ...)</td>
-    <td>Portably concatenate strings. Alternatively, for mssql use mssqlpo 
driver, 
-      which allows || operator.</td>
-  </tr>
-  <tr> 
-    <td>IfNull($fld, $replaceNull)</td>
-    <td>Returns a string that is the equivalent of MySQL IFNULL or Oracle 
NVL.</td>
-  </tr>
-  <tr>
-    <td>Param($name)</td>
-    <td>Generates bind placeholders, using ? or named conventions as 
appropriate.</td>
-  </tr>
-  <tr><td>$db->sysDate</td><td>Property that holds the SQL function that 
returns today's date</td>
-</tr>
-<tr><td>$db->sysTimeStamp</td><td>Property that holds the SQL function that 
returns the current
-timestamp (date+time).
-</td>
-</tr>
-<tr>
-<td>$db->concat_operator</td><td>Property that holds the concatenation operator
-</td>
-</tr>
-<tr><td>$db->length</td><td>Property that holds the name of the SQL strlen 
function.
-</td></tr>
-
-<tr><td>$db->upperCase</td><td>Property that holds the name of the SQL 
strtoupper function.
-</td></tr>
-<tr><td>$db->random</td><td>Property that holds the SQL to generate a random 
number between 0.00 and 1.00.
-</td>
-</tr>
-<tr><td>$db->substr</td><td>Property that holds the name of the SQL substring 
function.
-</td></tr>
-</table>
-<p>ADOdb also provides multiple oracle oci8 drivers for different 
scenarios:</p>
-<table width="75%" border="1" align="center">
-  <tr>
-    <td nowrap><b>Driver Name</b></td>
-    <td><b>Description</b></td>
-  </tr>
-  <tr>
-    <td>oci805 </td>
-    <td>Specifically for Oracle 8.0.5. This driver has a slower SelectLimit( 
).</td>
-  </tr>
-  <tr>
-    <td>oci8</td>
-    <td>The default high performance driver. The keys of associative arrays 
returned in a recordset are upper-case.</td>
-  </tr>
-  <tr>
-    <td>oci8po</td>
-    <td> The portable Oracle driver. Slightly slower than oci8. This driver 
uses ? instead of :<i>bindvar</i> for binding variables, which is the standard 
for  other databases. Also the keys of associative arrays are in lower-case 
like other databases.</td>
-  </tr>
-</table>
-<p>Here's an example of calling the <i>oci8po</i> driver. Note that the bind 
variables use question-mark:</p>
-<pre>$db = NewADOConnection('oci8po');
-$db-&gt;Connect($tns, $user, $pwd);
-$db-&gt;Execute(&quot;insert into atable (f1, f2) values (?,?)&quot;, 
array(12, 'abc'));</pre>
-<p>&nbsp;<a name=connecting></a>
-<h3>9. Connecting to Oracle</h3>
-<p>Before you can use ADOdb, you need to have the Oracle client installed and 
setup the oci8 extension. This extension comes pre-compiled for Windows (but 
you still need to enable it in the php.ini file). For information on compiling 
the oci8 extension for PHP and Apache on Unix, there is an excellent guide at 
<a 
href="http://www.oracle.com/technology/tech/opensource/php/apache/inst_php_apache_linux.html";>oracle.com</a>.
 </p>
-<h4>Should You Use Persistent Connections</h4>
-<p>One question that is frequently asked is should you use persistent 
connections to Oracle. Persistent connections allow PHP to recycle existing 
connections, reusing them after the previous web pages have completed. 
Non-persistent connections close automatically after the web page has 
completed. Persistent connections are faster because the cost of reconnecting 
is expensive, but there is additional resource overhead. As an alternative, 
Oracle allows you to pool and reuse server processes; this is called  <a 
href="http://www.cise.ufl.edu/help/database/oracle-docs/server.920/a96521/manproc.htm#13132";>Shared
 Server</a> (also known as MTS).</p>
-<p>The author's benchmarks suggest that using non-persistent connections and 
the  Shared Server configuration offer the best performance. If Shared Server 
is not an option, only then consider using persistent connections.</p>
-<h4>Connection Examples</h4>
-<p>Just in case you are having problems connecting to Oracle, here are some 
examples:</p>
-<p>a. PHP and Oracle reside on the same machine, use default SID, with 
non-persistent connections:</p>
-<pre>  $conn = NewADOConnection('oci8');
-       $conn-&gt;Connect(false, 'scott', 'tiger');</pre>
-<p>b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 'myTNS', 
using persistent connections:</p>
-<pre>  $conn = NewADOConnection('oci8');
-       $conn-&gt;PConnect(false, 'scott', 'tiger', 'myTNS');</pre>
-<p>or</p>
-<pre>  $conn-&gt;PConnect('myTNS', 'scott', 'tiger');</pre>
-<p>c. Host Address and SID</p>
-<pre>  $conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'SID');</pre>
-<p>d. Host Address and Service Name</p>
-<pre>  $conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'servicename');</pre>
-<p>e. Oracle connection string:
-<pre>  $cstr = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))
-                       (CONNECT_DATA=(SID=$sid)))";
-       $conn-&gt;Connect($cstr, 'scott', 'tiger');
-</pre>
-<p>f. ADOdb data source names (dsn):
-<pre>
-       $dsn = 'oci8://user:address@hidden/?persist';  # persist is optional
-       $conn = ADONewConnection($dsn);  # no need for Connect/PConnect
-       
-       $dsn = 'oci8://user:address@hidden/sid';
-       $conn = ADONewConnection($dsn);
-       
-       $dsn = 'oci8://user:pwd@/';   # oracle on local machine
-       $conn = ADONewConnection($dsn);</pre>
-<p>With ADOdb data source names,
-you don't have to call Connect( ) or PConnect( ).
-</p>
-<p>&nbsp;</p>
-<h3>10. Error Checking</h3>
-<p>The examples in this article are easy to read but a bit simplistic because 
we ignore error-handling. Execute( ) and Connect( ) will return false on error. 
So a more realistic way to call Connect( ) and Execute( ) is:
-<pre>function InvokeErrorHandler()
-{<br>global $db; ## assume global
-    MyLogFunction($db-&gt;ErrorNo(), $db-&gt;ErrorMsg());
-}
-if (!$db-&gt;Connect($tns, $usr, $pwd)) InvokeErrorHandler();
-
-$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
-                    array('emp' => 7900));
-if (!$rs) return InvokeErrorHandler();
-while ($arr = $rs->FetchRow()) {
-    print_r($arr);
-       echo "&lt;hr>";
-}
-</pre>
-<p>You can retrieve the  error message and error number of the last SQL 
statement executed from ErrorMsg( ) and ErrorNo( ). You can also <a 
href=http://phplens.com/adodb/using.custom.error.handlers.and.pear_error.html>define
 a custom error handler function</a>.
-ADOdb also supports throwing exceptions in PHP5.
-<p>&nbsp;</p>
-<h3>11. Other ADOdb Features</h3>
-<p><a href="http://phplens.com/lens/adodb/docs-datadict.htm";>Schema 
generation</a>. This allows you to define a schema using XML and import it into 
different RDBMS systems portably.</p>
-<p><a href="http://phplens.com/lens/adodb/docs-perf.htm";>Performance 
monitoring and tracing</a>. Highlights of performance monitoring include 
identification of poor and suspicious SQL, with explain plan support, and 
identifying which web pages the SQL ran on.</p>
-<p>&nbsp;</p>
-<h3>12. Download</h3>
-<p>You can <a href="http://adodb.sourceforge.net/#download";>download ADOdb 
from sourceforge</a>. ADOdb uses a BSD style license. That means that it is 
free for commercial use, and redistribution without source code is allowed.</p>
-<p>&nbsp;</p>
-<h3>13. Resources</h3>
-<ul>
-  <li>Oracle's <a 
href="http://www.oracle.com/technology/pub/articles/php_experts/index.html";>Hitchhiker
 Guide to PHP</a></li>
-  <li>Oracle has an excellent <a 
href="http://www.oracle.com/technology/tech/opensource/php/php_troubleshooting_faq.html";>FAQ
 on PHP</a></li>
-  <li>PHP <a href="http://php.net/oci8";>oci8</a> manual pages</li>
-  <li><a href=http://phplens.com/lens/lensforum/topics.php?id=4>ADOdb 
forums</a>.
-</ul>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<style>
+pre {
+  background-color: #eee;
+  padding: 0.75em 1.5em;
+  font-size: 12px;
+  border: 1px solid #ddd;
+}
+.greybg {
+  background-color: #eee;
+  padding: 0.75em 1.5em;
+  font-size: 12px;
+  border: 1px solid #ddd;
+}
+.style1 {color: #660000}
+</style>
+<title>ADOdb with PHP and Oracle</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</style>
+</head>
+
+<body>
+<table width=100%><tr><td>
+<h2>Using ADOdb with PHP and Oracle: an advanced tutorial</h2>
+</td><td><div align="right"><img src=cute_icons_for_site/adodb.gif width="88" 
height="31"></div></tr></table>
+<p><font size="1">(c)2004-2005 John Lim. All rights reserved.</font></p>
+<h3>1. Introduction</h3>
+<p>Oracle is the most popular commercial database used with PHP. There are 
many ways of accessing Oracle databases in PHP. These include:</p>
+<ul>
+  <li>The oracle extension</li>
+  <li>The oci8 extension</li>
+  <li>PEAR DB library</li>
+  <li>ADOdb library</li>
+</ul>
+<p>The wide range of choices is confusing to someone just starting with Oracle 
and PHP. I will briefly summarize the differences, and  show you the advantages 
of using <a href="http://adodb.sourceforge.net/";>ADOdb</a>. </p>
+<p>First we have the C extensions which provide low-level access to Oracle 
functionality. These C extensions are precompiled into PHP, or linked in 
dynamically when the web server starts up. Just in case you need it, here's a 
<a 
href=http://www.oracle.com/technology/tech/opensource/php/apache/inst_php_apache_linux.html>guide
 to installing Oracle and PHP on Linux</a>.</p>
+<table width="75%" border="1" align="center">
+  <tr valign="top">
+    <td nowrap><b>Oracle extension</b></td>
+    <td>Designed for Oracle 7 or earlier. This is obsolete.</td>
+  </tr>
+  <tr valign="top">
+    <td nowrap><b>Oci8 extension</b></td>
+    <td> Despite it's name, which implies it is only for Oracle 8i, this is 
the standard method for accessing databases running Oracle 8i, 9i or 10g (and 
later).</td>
+  </tr>
+</table>
+<p>Here is an example of using the oci8 extension to query the <i>emp</i> 
table of the <i>scott</i> schema with bind parameters:
+<pre>
+$conn = OCILogon("scott","tiger", $tnsName); 
+
+$stmt = OCIParse($conn,"select * from emp where empno > :emp order by empno"); 
+$emp = 7900;
+OCIBindByName($stmt, ':emp', $emp);
+$ok = OCIExecute($stmt);
+while (OCIFetchInto($stmt,$arr)) {
+       print_r($arr);
+       echo "&lt;hr>"; 
+} 
+</pre>
+<p>This generates the following output:
+<div class=greybg>
+Array ( [0] => 7902 [1] => FORD [2] => ANALYST [3] => 7566 [4] => 03/DEC/81 
[5] => 3000 [7] => 20 ) 
+<hr />
+  Array ( [0] => 7934 [1] => MILLER [2] => CLERK [3] => 7782 [4] => 23/JAN/82 
[5] => 1300 [7] => 10 )
+</div>
+<p>We also have  many higher level PHP libraries that allow you to simplify 
the above code. The most popular are <a href="http://pear.php.net/";>PEAR DB</a> 
and <a href="http://adodb.sourceforge.net/";>ADOdb</a>.  Here are some of the 
differences between these libraries:</p>
+<table width="75%" border="1" align="center">
+  <tr>
+    <td><b>Feature</b></td>
+    <td><b>PEAR DB 1.6</b></td>
+    <td><b>ADOdb 4.52</b></td>
+  </tr>
+  <tr valign="top">
+    <td>General Style</td>
+    <td>Simple, easy to use. Lacks Oracle specific functionality.</td>
+    <td>Has multi-tier design. Simple high-level design for beginners, and 
also lower-level advanced Oracle functionality.</td>
+  </tr>
+  <tr valign="top">
+    <td>Support for Prepare</td>
+    <td>Yes, but only on one statement, as the last prepare overwrites 
previous prepares.</td>
+    <td>Yes (multiple simultaneous prepare's allowed)</td>
+  </tr>
+  <tr valign="top">
+    <td>Support for LOBs</td>
+    <td>No</td>
+    <td>Yes, using update semantics</td>
+  </tr>
+  <tr valign="top">
+    <td>Support for REF Cursors</td>
+    <td>No</td>
+    <td>Yes</td>
+  </tr>
+  <tr valign="top">
+    <td>Support for IN Parameters</td>
+    <td>Yes</td>
+    <td>Yes</td>
+  </tr>
+  <tr valign="top">
+    <td>Support for OUT Parameters</td>
+    <td>No</td>
+    <td>Yes</td>
+  </tr>
+  <tr valign="top">
+    <td>Schema creation using XML</td>
+    <td>No</td>
+    <td>Yes, including ability to define tablespaces and constraints</td>
+  </tr>
+  <tr valign="top">
+    <td>Provides database portability features</td>
+    <td>No</td>
+    <td>Yes, has some ability to abstract features that differ between 
databases such as dates, bind parameters, and data types.</td>
+  </tr>
+  <tr valign="top">
+    <td>Performance monitoring and tracing</td>
+    <td>No</td>
+    <td>Yes. SQL can be traced and linked to web page it was executed on. 
Explain plan support included.</td>
+  </tr>
+  <tr valign="top">
+    <td>Recordset caching for frequently used queries</td>
+    <td>No</td>
+    <td>Yes. Provides great speedups for SQL involving complex <i>where, 
group-by </i>and <i>order-by</i> clauses.</td>
+  </tr>
+  <tr valign="top">
+    <td>Popularity</td>
+    <td>Yes, part of PEAR release</td>
+    <td>Yes, many open source projects are using this software, including 
PostNuke, Xaraya, Mambo, Tiki Wiki.</td>
+  </tr>
+  <tr valign="top">
+    <td>Speed</td>
+    <td>Medium speed.</td>
+    <td>Very high speed. Fastest database abstraction library available for 
PHP. <a href="http://phplens.com/lens/adodb/";>Benchmarks are available</a>.</td>
+  </tr>
+  <tr valign="top">
+    <td>High Speed Extension available</td>
+    <td>No</td>
+    <td>Yes. You can install the optional ADOdb extension, which reimplements 
the most frequently used parts of ADOdb as fast C code. Note that the source 
code version of ADOdb runs just fine without this extension, and only makes use 
of the extension if detected.</td>
+  </tr>
+</table>
+<p> PEAR DB is good enough for simple web apps. But if you need more power, 
you can see ADOdb offers more sophisticated functionality. The rest of this 
article will concentrate on using ADOdb with Oracle. You can find out more 
about <a href="#connecting">connecting to Oracle</a> later in this guide.</p>
+<h4>ADOdb Example</h4>
+<p>In ADOdb, the above oci8 example querying the <i>emp</i> table could be 
written as:</p>
+<pre>
+include "/path/to/adodb.inc.php";
+$db = NewADOConnection("oci8");
+$db->Connect($tnsName, "scott", "tiger");
+
+$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
+                    array('emp' => 7900));
+while ($arr = $rs->FetchRow()) {
+    print_r($arr);
+       echo "&lt;hr>";
+}
+</pre>
+<p>The Execute( ) function returns a recordset object, and you can retrieve 
the rows returned using $recordset-&gt;FetchRow( ). </p>
+<p>If we ignore the initial connection preamble, we can see the ADOdb version 
is much easier and simpler:</p>
+<table width="100%" border="1">
+  <tr valign="top" bgcolor="#FFFFFF">
+    <td width="50%" bgcolor="#e0e0e0"><b>Oci8</b></td>
+    <td bgcolor="#e0e0e0"><b>ADOdb</b></td>
+  </tr>
+  <tr valign="top" bgcolor="#CCCCCC">
+    <td><pre><font size="1">$stmt = <b>OCIParse</b>($conn,
+       "select * from emp where empno > :emp"); 
+$emp = 7900;
+<b>OCIBindByName</b>($stmt, ':emp', $emp);
+$ok = <b>OCIExecute</b>($stmt);
+
+while (<b>OCIFetchInto</b>($stmt,$arr)) {
+       print_r($arr);
+       echo "&lt;hr>"; 
+} </font></pre></td>
+    <td><pre><font size="1">$recordset = $db-><b>Execute</b>("select * from 
emp where empno>:emp", 
+                           array('emp' => 7900));
+
+while ($arr = $recordset-><b>FetchRow</b>()) {
+       print_r($arr);
+       echo "&lt;hr>";
+}</font></pre></td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<h3>2. ADOdb Query Semantics</h3>
+<p>You can also query the database using the standard Microsoft ADO MoveNext( 
) metaphor. The data array for the current row is stored in the <i>fields</i> 
property of the recordset object, $rs.
+MoveNext( ) offers the highest performance among all the techniques for 
iterating through a recordset:
+<pre>
+$rs = $db->Execute("select * from emp where empno>:emp", array('emp' => 7900));
+while (!$rs->EOF) {
+       print_r($rs->fields);
+       $rs->MoveNext();
+}
+</pre>
+<p>And if you are interested in having the data returned in a 2-dimensional 
array, you can use:
+<pre>
+$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 
7900));
+</pre>
+<p>Now to obtain only the first row as an array:
+<pre>
+$arr = $db->GetRow("select * from emp where empno=:emp", array('emp' => 7900));
+</pre>
+<p>Or to retrieve only the first field of the first row:
+<pre>
+$arr = $db->GetOne("select ename from emp where empno=:emp", array('emp' => 
7900));
+</pre>
+<p>For easy pagination support, we provide the SelectLimit function. The 
following will perform a select query, limiting it to 100 rows, starting from 
row 200:
+<pre>
+$offset = 200; $limitrows = 100;
+$rs = $db->SelectLimit('select * from table', $offset, $limitrows);
+</pre>
+<p>The $limitrows parameter is optional.
+<h4>Array Fetch Mode</h4>
+<p>When data is being returned in an array, you can choose the type of array 
the data is returned in. 
+<ol>
+  <li> Numeric indexes - use <font size="2" face="Courier New, Courier, 
mono">$connection-&gt;SetFetchMode(ADODB_FETCH_NUM).</font></li>
+  <li>Associative indexes - the keys of the array are the names of the fields 
(in upper-case). Use <font size="2" face="Courier New, Courier, 
mono">$connection-&gt;SetFetchMode(ADODB_FETCH_ASSOC)</font><font face="Courier 
New, Courier, mono">.</font></li>
+  <li>Both numeric and associative indexes - use <font size="2" face="Courier 
New, Courier, mono">$connection-&gt;SetFetchMode(ADODB_FETCH_BOTH).</font></li>
+</ol>
+<p>The default is ADODB_FETCH_BOTH for Oracle.</p>
+<h4><b>Caching</b></h4>
+<p>You can define a database cache directory using $ADODB_CACHE_DIR, and cache 
the results of frequently used queries that rarely change. This is particularly 
useful for SQL with complex where clauses and group-by's and order-by's. It is 
also good for relieving heavily-loaded database servers.</p>
+<p>This example will cache the following select statement for 3600 seconds (1 
hour):</p>
+<pre>
+$ADODB_CACHE_DIR = '/var/adodb/tmp';
+$rs = $db->CacheExecute(3600, "select names from allcountries order by 1");
+</pre>
+There are analogous CacheGetArray(
+), CacheGetRow( ),  CacheGetOne( ) and CacheSelectLimit( )  functions. The 
first parameter is the number of seconds to cache. You can also pass a bind 
array as a 3rd parameter (not shown above).
+<p>There is an alternative syntax for the caching functions. The first 
parameter is omitted, and you set the cacheSecs
+ property of the connection object:
+<pre>
+$ADODB_CACHE_DIR = '/var/adodb/tmp';
+$connection->cacheSecs = 3600;
+$rs = $connection->CacheExecute($sql, array('id' => 1));
+</pre>
+<h3>&nbsp;</h3>
+<h3>3. Using Prepare( ) For Frequently Used Statements</h3>
+<p>Prepare( ) is  for compiling frequently used  SQL statement for reuse. For 
example, suppose we have a large array which needs to be inserted into an 
Oracle database. The following will result in a massive speedup in query 
execution (at least 20-40%), as the SQL statement only needs to be compiled 
once:</p>
+<pre>
+$stmt = $db->Prepare('insert into table (field1, field2) values (:f1, :f2)');
+foreach ($arrayToInsert as $key => $value) {
+       $db->Execute($stmt, array('f1' => $key, 'f2' => $val);
+}
+</pre>
+<p>&nbsp;</p>
+<h3>4. Working With LOBs</h3>
+<p>Oracle treats data which is more than 4000 bytes in length specially. These 
are called Large Objects, or LOBs for short. Binary LOBs are BLOBs, and 
character LOBs are CLOBs. In most Oracle libraries, you need to do a lot of 
work to process LOBs, probably because Oracle designed it to work in systems 
with little memory. ADOdb tries to make things easy by assuming the LOB can fit 
into main memory. </p>
+<p>ADOdb will transparently handle LOBs  in <i>select</i> statements. The LOBs 
are automatically converted to PHP variables without any special coding.</p>
+<p>For updating records with LOBs, the functions UpdateBlob( ) and UpdateClob( 
) are provided. Here's a BLOB example. The parameters should be 
self-explanatory:
+<pre>
+$ok = $db->Execute("insert into aTable (id, name, ablob) 
+                                values (aSequence.nextVal, 'Name', null)");
+if (!$ok) return LogError($db-&gt;ErrorMsg());
+<font color="#006600"># params: $tableName, $blobFieldName, $blobValue, 
$whereClause</font>
+$db->UpdateBlob('aTable', 'ablob', $blobValue, 'id=aSequence.currVal');
+</pre>
+<p>and the analogous CLOB example:
+<pre>
+$ok = $db->Execute("insert into aTable (id, name, aclob) 
+                                values (aSequence.nextVal, 'Name', null)");
+if (!$ok) return LogError($db-&gt;ErrorMsg());
+$db->UpdateClob('aTable', 'aclob', $clobValue, 'id=aSequence.currVal');
+</pre>
+<p>Note that LogError( ) is a user-defined function, and not part of ADOdb.
+<p>Inserting LOBs is more complicated. Since ADOdb 4.55, we allow you to do 
this
+  (assuming that the <em>photo</em> field is a BLOB, and we want to store 
$blob_data into
+  this field, and the primary key is the <em>id</em> field):
+<pre>
+       $sql = <span class="style1">"INSERT INTO photos ( ID, photo) ".
+                       "VALUES ( :id, empty_blob() )".
+                       " RETURNING photo INTO :xx"</span>;
+
+               $stmt = $db->PrepareSP($sql);
+               $db->InParameter($stmt, $<strong>id</strong>, <span 
class="style1">'id'</span>);
+               $blob = $db->InParameter($stmt, $<strong>blob_data</strong>, 
<span class="style1">'xx'</span>,-1, OCI_B_BLOB);
+               $db->StartTrans();
+               $ok = $db->Execute($stmt);
+               $db->CompleteTrans();
+</pre> 
+<p>
+<h3>5. REF CURSORs</h3>
+<p>Oracle recordsets can be passed around as variables called REF Cursors. For 
example, in PL/SQL, we could define a function <i>open_tab</i> that returns a 
REF CURSOR in the first parameter:</p>
+<pre>
+TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
+
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
+       BEGIN
+               OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE 
tablenames;
+       END open_tab;
+</pre>
+<p>In ADOdb, we could access this REF Cursor using the ExecuteCursor() 
function. The following will find
+ all table names that begin with 'A' in the current schema:
+<pre>
+$rs = $db->ExecuteCursor("BEGIN open_tab(:refc,'A%'); END;",'refc');
+while ($arr = $rs->FetchRow()) print_r($arr);
+</pre>
+<p>The first parameter is the PL/SQL statement, and the second parameter is 
the name of the REF Cursor.
+</p>
+<p>&nbsp;</p>
+<h3>6. In and Out Parameters</h3>
+<p>The following PL/SQL
+stored procedure  requires an input  variable, and returns a result into an 
output variable:
+<pre>
+PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
+       BEGIN
+               output := 'I love '||input;
+       END;
+</pre>
+<p>The following ADOdb code allows you to call the stored procedure:</p>
+<pre>
+$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
+$input = 'Sophia Loren';
+$db->InParameter($stmt,$input,'a1');
+$db->OutParameter($stmt,$output,'a2');
+$ok = $db->Execute($stmt);
+if ($ok) echo ($output == 'I love Sophia Loren') ? 'OK' : 'Failed';
+</pre>
+<p>PrepareSP( ) is a special function that knows about bind parameters.
+The main limitation currently is that IN OUT parameters do not work.
+<h4>Bind Parameters and REF CURSORs</h4>
+<p>We could also rewrite the REF CURSOR example to use InParameter (requires 
ADOdb 4.53 or later):
+<pre>
+$stmt = $db->PrepareSP("BEGIN adodb.open_tab(:refc,:tabname); END;");
+$input = 'A%';
+$db->InParameter($stmt,$input,'tabname');
+$rs = $db->ExecuteCursor($stmt,'refc');
+while ($arr = $rs->FetchRow()) print_r($arr);
+</pre>
+<h4>Bind Parameters and LOBs</h4>
+<p>You can also operate on LOBs. In this example, we have IN and OUT 
parameters using CLOBs. 
+<pre>
+       $text = 'test test test';
+       $sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";
+       $stmt = $conn -> PrepareSP($sql);
+       $conn -> InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB); # -1 means 
variable length
+       $rs = '';
+       $conn -> OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);
+       $conn -> Execute($stmt);
+       echo "return = ".$rs."&lt;br>";
+</pre>
+<p>Similarly, you can use the constant OCI_B_BLOB to indicate that you are 
using BLOBs.
+<h4>Reusing Bind Parameters with CURSOR_SHARING=FORCE</h4>
+<p>Many web programmers do not care to use bind parameters, and prefer to 
enter the SQL directly. So instead of:</p>
+<pre>
+$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 
7900));
+</pre>
+<p>They prefer  entering the values inside the SQL:
+<pre>
+$arr = $db->GetArray("select * from emp where empno>7900");
+</pre>
+<p>This reduces Oracle performance because Oracle will reuse compiled SQL 
which is identical to previously compiled SQL. The above example with the 
values inside the SQL
+is unlikely to be reused. As an optimization, from Oracle 8.1 onwards, you can 
set the following session parameter after you login:
+<pre>
+ALTER SESSION SET CURSOR_SHARING=FORCE
+</pre>
+<p>This will force Oracle to convert all such variables (eg. the 7900 value) 
into constant bind parameters, improving SQL reuse.</p>
+<p>More <a 
href="http://phplens.com/adodb/code.initialization.html#speed";>speedup 
tips</a>.</p>
+<p>&nbsp;</p>
+<h3>7. Dates and Datetime in ADOdb</h3>
+<p>There are two things you need to know about dates in ADOdb. </p>
+<p>First, to ensure cross-database compability, ADOdb assumes that dates are 
returned in ISO format (YYYY-MM-DD H24:MI:SS).</p>
+<p>Secondly, since Oracle treats dates and datetime as the same data type, we 
decided not to display the time in the default date format. So on login, ADOdb 
will set the NLS_DATE_FORMAT to 'YYYY-MM-DD'. If you prefer to show the date 
and time by default, do this:</p>
+<pre>
+$db = NewADOConnection('oci8');
+$db->NLS_DATE_FORMAT =  'RRRR-MM-DD HH24:MI:SS';
+$db->Connect($tns, $user, $pwd);
+</pre>
+<p>Or execute:</p>
+<pre>$sql = &quot;ALTER SESSION SET NLS_DATE_FORMAT = 'RRRR-MM-DD 
HH24:MI:SS'&quot;;
+$db-&gt;Execute($sql);
+</pre>
+<p>If you are not concerned about date portability and do not use ADOdb's 
portability layer, you can use your preferred date format instead.
+<p>
+<h3>8. Database Portability Layer</h3>
+<p>ADOdb provides the following functions for portably generating SQL 
functions 
+  as strings to be merged into your SQL statements:</p>
+<table width="75%" border="1" align=center>
+  <tr> 
+    <td width=30%><b>Function</b></td>
+    <td><b>Description</b></td>
+  </tr>
+  <tr> 
+    <td>DBDate($date)</td>
+    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a date 
+      string formatted for INSERT/UPDATE</td>
+  </tr>
+  <tr> 
+    <td>DBTimeStamp($date)</td>
+    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a 
timestamp 
+      string formatted for INSERT/UPDATE</td>
+  </tr>
+  <tr> 
+    <td>SQLDate($date, $fmt)</td>
+    <td>Portably generate a date formatted using $fmt mask, for use in SELECT 
+      statements.</td>
+  </tr>
+  <tr> 
+    <td>OffsetDate($date, $ndays)</td>
+    <td>Portably generate a $date offset by $ndays.</td>
+  </tr>
+  <tr> 
+    <td>Concat($s1, $s2, ...)</td>
+    <td>Portably concatenate strings. Alternatively, for mssql use mssqlpo 
driver, 
+      which allows || operator.</td>
+  </tr>
+  <tr> 
+    <td>IfNull($fld, $replaceNull)</td>
+    <td>Returns a string that is the equivalent of MySQL IFNULL or Oracle 
NVL.</td>
+  </tr>
+  <tr>
+    <td>Param($name)</td>
+    <td>Generates bind placeholders, using ? or named conventions as 
appropriate.</td>
+  </tr>
+  <tr><td>$db->sysDate</td><td>Property that holds the SQL function that 
returns today's date</td>
+</tr>
+<tr><td>$db->sysTimeStamp</td><td>Property that holds the SQL function that 
returns the current
+timestamp (date+time).
+</td>
+</tr>
+<tr>
+<td>$db->concat_operator</td><td>Property that holds the concatenation operator
+</td>
+</tr>
+<tr><td>$db->length</td><td>Property that holds the name of the SQL strlen 
function.
+</td></tr>
+
+<tr><td>$db->upperCase</td><td>Property that holds the name of the SQL 
strtoupper function.
+</td></tr>
+<tr><td>$db->random</td><td>Property that holds the SQL to generate a random 
number between 0.00 and 1.00.
+</td>
+</tr>
+<tr><td>$db->substr</td><td>Property that holds the name of the SQL substring 
function.
+</td></tr>
+</table>
+<p>ADOdb also provides multiple oracle oci8 drivers for different 
scenarios:</p>
+<table width="75%" border="1" align="center">
+  <tr>
+    <td nowrap><b>Driver Name</b></td>
+    <td><b>Description</b></td>
+  </tr>
+  <tr>
+    <td>oci805 </td>
+    <td>Specifically for Oracle 8.0.5. This driver has a slower SelectLimit( 
).</td>
+  </tr>
+  <tr>
+    <td>oci8</td>
+    <td>The default high performance driver. The keys of associative arrays 
returned in a recordset are upper-case.</td>
+  </tr>
+  <tr>
+    <td>oci8po</td>
+    <td> The portable Oracle driver. Slightly slower than oci8. This driver 
uses ? instead of :<i>bindvar</i> for binding variables, which is the standard 
for  other databases. Also the keys of associative arrays are in lower-case 
like other databases.</td>
+  </tr>
+</table>
+<p>Here's an example of calling the <i>oci8po</i> driver. Note that the bind 
variables use question-mark:</p>
+<pre>$db = NewADOConnection('oci8po');
+$db-&gt;Connect($tns, $user, $pwd);
+$db-&gt;Execute(&quot;insert into atable (f1, f2) values (?,?)&quot;, 
array(12, 'abc'));</pre>
+<p>&nbsp;<a name=connecting></a>
+<h3>9. Connecting to Oracle</h3>
+<p>Before you can use ADOdb, you need to have the Oracle client installed and 
setup the oci8 extension. This extension comes pre-compiled for Windows (but 
you still need to enable it in the php.ini file). For information on compiling 
the oci8 extension for PHP and Apache on Unix, there is an excellent guide at 
<a 
href="http://www.oracle.com/technology/tech/opensource/php/apache/inst_php_apache_linux.html";>oracle.com</a>.
 </p>
+<h4>Should You Use Persistent Connections</h4>
+<p>One question that is frequently asked is should you use persistent 
connections to Oracle. Persistent connections allow PHP to recycle existing 
connections, reusing them after the previous web pages have completed. 
Non-persistent connections close automatically after the web page has 
completed. Persistent connections are faster because the cost of reconnecting 
is expensive, but there is additional resource overhead. As an alternative, 
Oracle allows you to pool and reuse server processes; this is called  <a 
href="http://www.cise.ufl.edu/help/database/oracle-docs/server.920/a96521/manproc.htm#13132";>Shared
 Server</a> (also known as MTS).</p>
+<p>The author's benchmarks suggest that using non-persistent connections and 
the  Shared Server configuration offer the best performance. If Shared Server 
is not an option, only then consider using persistent connections.</p>
+<h4>Connection Examples</h4>
+<p>Just in case you are having problems connecting to Oracle, here are some 
examples:</p>
+<p>a. PHP and Oracle reside on the same machine, use default SID, with 
non-persistent connections:</p>
+<pre>  $conn = NewADOConnection('oci8');
+       $conn-&gt;Connect(false, 'scott', 'tiger');</pre>
+<p>b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 'myTNS', 
using persistent connections:</p>
+<pre>  $conn = NewADOConnection('oci8');
+       $conn-&gt;PConnect(false, 'scott', 'tiger', 'myTNS');</pre>
+<p>or</p>
+<pre>  $conn-&gt;PConnect('myTNS', 'scott', 'tiger');</pre>
+<p>c. Host Address and SID</p>
+<pre>
+       $conn->connectSID = true;       
+       $conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'SID');</pre>
+<p>d. Host Address and Service Name</p>
+<pre>  $conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'servicename');</pre>
+<p>e. Oracle connection string:
+<pre>  $cstr = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))
+                       (CONNECT_DATA=(SID=$sid)))";
+       $conn-&gt;Connect($cstr, 'scott', 'tiger');
+</pre>
+<p>f. ADOdb data source names (dsn):
+<pre>
+       $dsn = 'oci8://user:address@hidden/?persist';  # persist is optional
+       $conn = ADONewConnection($dsn);  # no need for Connect/PConnect
+       
+       $dsn = 'oci8://user:address@hidden/sid';
+       $conn = ADONewConnection($dsn);
+       
+       $dsn = 'oci8://user:pwd@/';   # oracle on local machine
+       $conn = ADONewConnection($dsn);</pre>
+<p>With ADOdb data source names,
+you don't have to call Connect( ) or PConnect( ).
+</p>
+<p>&nbsp;</p>
+<h3>10. Error Checking</h3>
+<p>The examples in this article are easy to read but a bit simplistic because 
we ignore error-handling. Execute( ) and Connect( ) will return false on error. 
So a more realistic way to call Connect( ) and Execute( ) is:
+<pre>function InvokeErrorHandler()
+{<br>global $db; ## assume global
+    MyLogFunction($db-&gt;ErrorNo(), $db-&gt;ErrorMsg());
+}
+if (!$db-&gt;Connect($tns, $usr, $pwd)) InvokeErrorHandler();
+
+$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
+                    array('emp' => 7900));
+if (!$rs) return InvokeErrorHandler();
+while ($arr = $rs->FetchRow()) {
+    print_r($arr);
+       echo "&lt;hr>";
+}
+</pre>
+<p>You can retrieve the  error message and error number of the last SQL 
statement executed from ErrorMsg( ) and ErrorNo( ). You can also <a 
href=http://phplens.com/adodb/using.custom.error.handlers.and.pear_error.html>define
 a custom error handler function</a>.
+ADOdb also supports throwing exceptions in PHP5.
+<p>&nbsp;</p>
+<h3>Handling Large Recordsets (added 27 May 2005)</h3>
+The oci8 driver does not support counting the number of records returned in a 
SELECT statement, so the function RecordCount() 
+is emulated when the global variable $ADODB_COUNTRECS is set to true, which is 
the default. 
+We emulate this by buffering all the records. This can take up large amounts 
of memory for big recordsets.
+ Set $ADODB_COUNTRECS to false for the best performance. 
+ <p>
+This variable is checked every time a query is executed, so you can 
selectively choose which recordsets to count.
+<p>&nbsp;</p>
+<h3>11. Other ADOdb Features</h3>
+<p><a href="http://phplens.com/lens/adodb/docs-datadict.htm";>Schema 
generation</a>. This allows you to define a schema using XML and import it into 
different RDBMS systems portably.</p>
+<p><a href="http://phplens.com/lens/adodb/docs-perf.htm";>Performance 
monitoring and tracing</a>. Highlights of performance monitoring include 
identification of poor and suspicious SQL, with explain plan support, and 
identifying which web pages the SQL ran on.</p>
+<p>&nbsp;</p>
+<h3>12. Download</h3>
+<p>You can <a href="http://adodb.sourceforge.net/#download";>download ADOdb 
from sourceforge</a>. ADOdb uses a BSD style license. That means that it is 
free for commercial use, and redistribution without source code is allowed.</p>
+<p>&nbsp;</p>
+<h3>13. Resources</h3>
+<ul>
+  <li>Oracle's <a 
href="http://www.oracle.com/technology/pub/articles/php_experts/index.html";>Hitchhiker
 Guide to PHP</a></li>
+  <li>OTN article on <a 
href=http://www.oracle.com/technology/pub/articles/deployphp/lim_deployphp.html>Optimizing
 PHP and Oracle</a> by this author.
+  <li>Oracle has an excellent <a 
href="http://www.oracle.com/technology/tech/opensource/php/php_troubleshooting_faq.html";>FAQ
 on PHP</a></li>
+  <li>PHP <a href="http://php.net/oci8";>oci8</a> manual pages</li>
+  <li><a href=http://phplens.com/lens/lensforum/topics.php?id=4>ADOdb 
forums</a>.
+</ul>
+</body>
+</html>
Index: phpgwapi/inc/adodb/docs/docs-perf.htm
diff -u phpgwapi/inc/adodb/docs/docs-perf.htm:1.2 
phpgwapi/inc/adodb/docs/docs-perf.htm:1.3
--- phpgwapi/inc/adodb/docs/docs-perf.htm:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/docs/docs-perf.htm       Tue Feb 21 13:47:42 2006
@@ -1,972 +1,962 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>ADOdb Performance Monitoring Library</title>
-  <style type="text/css">
-body, td {
-/*font-family: Arial, Helvetica, sans-serif;*/
-font-size: 11pt;
-}
-pre {
-font-size: 9pt;
-background-color: #EEEEEE; padding: .5em; margin: 0px;
-}
-.toplink {
-font-size: 8pt;
-}
-  </style>
-</head>
-<body>
-<h3>The ADOdb Performance Monitoring Library</h3>
-<p>V4.54 5 Nov 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my)</p>
-<p><font size="1">This software is dual licensed using BSD-Style and
-LGPL. This means you can use it in compiled proprietary and commercial
-products.</font></p>
-<table border="1">
-  <tbody>
-    <tr>
-      <td><font color="red">Kindly note that the ADOdb home page has
-moved to <a 
href="http://adodb.sourceforge.net/";>http://adodb.sourceforge.net/</a>
-because of the persistent unreliability of http://php.weblogs.com. <b>Please
-change your links</b>!</font></td>
-    </tr>
-  </tbody>
-</table>
-<p>Useful ADOdb links: <a 
href="http://adodb.sourceforge.net/#download";>Download</a>
-&nbsp; <a href="http://adodb.sourceforge.net/#docs";>Other Docs</a>
-</p>
-<h3>Introduction</h3>
-<p>This module, part of the ADOdb package, provides both CLI and HTML
-interfaces for viewing key performance indicators of your database.
-This is very useful because web apps such as the popular phpMyAdmin
-currently do not provide effective database health monitoring tools.
-The module provides the following: </p>
-<ul>
-  <li>A quick health check of your database server using 
<code>$perf-&gt;HealthCheck()</code>
-or <code>$perf-&gt;HealthCheckCLI()</code>. </li>
-  <li>User interface for performance monitoring, <code>$perf-&gt;UI()</code>.
-This UI displays:
-    <ul>
-      <li>the health check, </li>
-      <li>all SQL logged and their query plans, </li>
-      <li>a list of all tables in the current database</li>
-      <li>an interface to continiously poll the server for key
-performance indicators such as CPU, Hit Ratio, Disk I/O</li>
-      <li>a form where you can enter and run SQL interactively.</li>
-    </ul>
-  </li>
-  <li>Gives you an API to build database monitoring tools for a server
-farm, for example calling <code>$perf-&gt;DBParameter('data cache hit
-ratio')</code> returns this very important statistic in a database
-independant manner. </li>
-</ul>
-<p>ADOdb also has the ability to log all SQL executed, using <a
- href="docs-adodb.htm#logsql">LogSQL</a>. All SQL logged can be
-analyzed through the performance monitor <a href="#ui">UI</a>. In the <i>View
-SQL</i> mode, we categorize the SQL into 3 types:
-</p>
-<ul>
-  <li><b>Suspicious SQL</b>: queries with high average execution times,
-and are potential candidates for rewriting</li>
-  <li><b>Expensive SQL</b>: queries with high total execution times
-(#executions * avg execution time). Optimizing these queries will
-reduce your database server load.</li>
-  <li><b>Invalid SQL</b>: queries that generate errors.</li>
-</ul>
-<p>Each query is hyperlinked to a description of the query plan, and
-every PHP script that executed that query is also shown.</p>
-<p>Please note that the information presented is a very basic database
-health check, and does not provide a complete overview of database
-performance. Although some attempt has been made to make it work across
-multiple databases in the same way, it is impossible to do so. For the
-health check, we do try to display the following key database
-parameters for all drivers:</p>
-<ul>
-  <li><b>data cache size</b> - The amount of memory allocated to the
-cache.</li>
-  <li><b>data cache hit ratio</b> - A measure of how effective the
-cache is, as a percentage. The higher, the better.</li>
-  <li><b>current connections</b> - The number of sessions currently
-connected to the database. </li>
-</ul>
-<p>You will need to connect to the database as an administrator to view
-most of the parameters. </p>
-<p>Code improvements as very welcome, particularly adding new database
-parameters and automated tuning hints.</p>
-<a name="usage"></a>
-<h3>Usage</h3>
-<p>Currently, the following drivers: <em>mysql</em>, <em>postgres</em>,
-<em>oci8</em>, <em>mssql</em>, <i>informix</i> and <em>db2</em> are
-supported. To create a new performance monitor, call NewPerfMonitor( )
-as demonstrated below: </p>
-<pre>&lt;?php<br>include_once('adodb.inc.php');<br>session_start(); <font
- color="#006600"># session variables required for monitoring</font><br>$conn = 
ADONewConnection($driver);<br>$conn-&gt;Connect($server,$user,$pwd,$db);<br>$perf
 =&amp; NewPerfMonitor($conn);<br>$perf-&gt;UI($pollsecs=5);<br>?&gt;<br></pre>
-<p>It is also possible to retrieve a single database parameter:</p>
-<pre>$size = $perf-&gt;DBParameter('data cache size');<br></pre>
-<p>
-Thx to Fernando Ortiz for the informix module. </p>
-<h3>Methods</h3>
-<a name="ui"></a>
-<p><font face="Courier New, Courier, mono">function 
<b>UI($pollsecs=5)</b></font></p>
-<p>Creates a web-based user interface for performance monitoring. When
-you click on Poll, server statistics will be displayed every $pollsecs
-seconds. See <a href="#usage">Usage</a> above. </p>
-<p>Since 4.11, we allow users to enter and run SQL interactively via
-the "Run SQL" link. To disable this for security reasons, set this
-constant before calling $perf-&gt;UI(). </p>
-<p> </p>
-<pre>define('ADODB_PERF_NO_RUN_SQL',1);</pre>
-<p>Sample output follows below:</p>
-<table bgcolor="lightyellow" border="1" width="100%">
-  <tbody>
-    <tr>
-      <td> <b><a href="http://php.weblogs.com/adodb?perf=1";>ADOdb</a>
-Performance Monitor</b> for localhost, db=test<br>
-      <font size="-1">PostgreSQL 7.3.2 on i686-pc-cygwin, compiled by
-GCC gcc (GCC) 3.2 20020927 (prerelease)</font></td>
-    </tr>
-    <tr>
-      <td> <a href="#">Performance Stats</a> &nbsp; <a href="#">View
-SQL</a> &nbsp; <a href="#">View Tables</a> &nbsp; <a href="#">Poll
-Stats</a></td>
-    </tr>
-  </tbody>
-</table>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>postgres7</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>statistics collector</td>
-      <td>TRUE</td>
-      <td>Value must be TRUE to enable hit ratio statistics 
(<i>stats_start_collector</i>,<i>stats_row_level</i>
-and <i>stats_block_level</i> must be set to true in postgresql.conf)</td>
-    </tr>
-    <tr>
-      <td>data cache hit ratio</td>
-      <td>99.7967555299239</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data reads</td>
-      <td>125</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>21.78125000000000000</td>
-      <td>Count of inserts/updates/deletes * coef</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache buffers</td>
-      <td>640</td>
-      <td>Number of cache buffers. <a
- 
href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#basic";>Tuning</a></td>
-    </tr>
-    <tr>
-      <td>cache blocksize</td>
-      <td>8192</td>
-      <td>(estimate)</td>
-    </tr>
-    <tr>
-      <td>data cache size</td>
-      <td>5M</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>operating system cache size</td>
-      <td>80M</td>
-      <td>(effective cache size)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Memory Usage</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>sort buffer size</td>
-      <td>1M</td>
-      <td>Size of sort buffer (per query)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>0</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>max connections</td>
-      <td>32</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Parameters</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>rollback buffers</td>
-      <td>8</td>
-      <td>WAL buffers</td>
-    </tr>
-    <tr>
-      <td>random page cost</td>
-      <td>4</td>
-      <td>Cost of doing a seek (default=4). See <a
- 
href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#less";>random_page_cost</a></td>
-    </tr>
-  </tbody>
-</table>
-<p><font face="Courier New, Courier, mono">function 
<b>HealthCheck</b>()</font></p>
-<p>Returns database health check parameters as a HTML table. You will
-need to echo or print the output of this function,</p>
-<p><font face="Courier New, Courier, mono">function 
<b>HealthCheckCLI</b>()</font></p>
-<p>Returns database health check parameters formatted for a command
-line interface. You will need to echo or print the output of this
-function. Sample output for mysql:</p>
-<pre>-- Ratios -- <br>          MyISAM cache hit ratio =&gt; 56.5635738832 
<br>          InnoDB cache hit ratio =&gt; 0 <br>             sql cache hit 
ratio =&gt; 0 <br> -- IO -- <br>                      data reads =&gt; 2622 
<br>                     data writes =&gt; 2415.5 <br> -- Data Cache -- <br>    
      MyISAM data cache size =&gt; 512K <br>             BDB data cache size 
=&gt; 8388600<br>          InnoDB data cache size =&gt; 8M<br> -- Memory Pools 
-- <br>                read buffer size =&gt; 131072 <br>                sort 
buffer size =&gt; 65528 <br>                     table cache =&gt; 4 <br> -- 
Connections -- <br>             current connections =&gt; 3<br>                 
max connections =&gt; 100</pre>
-<p><font face="Courier New, Courier, mono">function <b>Poll</b>($pollSecs=5)
-</font> </p>
-<p> Run in infinite loop, displaying the following information every
-$pollSecs. This will not work properly if output buffering is enabled.
-In the example below, $pollSecs=3:
-</p>
-<pre>Accumulating statistics...<br> Time   WS-CPU%   Hit%   Sess        
Reads/s          Writes/s<br>11:08:30    0.7  56.56      1         0.0000       
     0.0000<br>11:08:33    1.8  56.56      2         0.0000            
0.0000<br>11:08:36   11.1  56.55      3         2.5000            
0.0000<br>11:08:39    9.8  56.55      2         3.1121            
0.0000<br>11:08:42    2.8  56.55      1         0.0000            
0.0000<br>11:08:45    7.4  56.55      2         0.0000            
1.5000<br></pre>
-<p><b>WS-CPU%</b> is the Web Server CPU load of the server that PHP is
-running from (eg. the database client), and not the database. The <b>Hit%</b>
-is the data cache hit ratio. <b>Sess</b> is the current number of
-sessions connected to the database. If you are using persistent
-connections, this should not change much. The <b>Reads/s</b> and 
<b>Writes/s</b>
-are synthetic values to give the viewer a rough guide to I/O, and are
-not to be taken literally. </p>
-<p><font face="Courier New, Courier, mono">function 
<b>SuspiciousSQL</b>($numsql=10)</font></p>
-<p>Returns SQL which have high average execution times as a HTML table.
-Each sql statement
-is hyperlinked to a new window which details the execution plan and the
-scripts that execute this SQL.
-</p>
-<p> The number of statements returned is determined by $numsql. Data is
-taken from the adodb_logsql table, where the sql statements are logged
-when
-$connection-&gt;LogSQL(true) is enabled. The adodb_logsql table is
-populated using <a href="docs-adodb.htm#logsql">$conn-&gt;LogSQL</a>.
-</p>
-<p>For Oracle, Ixora Suspicious SQL returns a list of SQL statements
-that are most cache intensive as a HTML table. These are data intensive
-SQL statements that could benefit most from tuning. </p>
-<p><font face="Courier New, Courier, mono">function 
<b>ExpensiveSQL</b>($numsql=10)</font></p>
-<p>Returns SQL whose total execution time (avg time * #executions) is
-high as a HTML table. Each sql statement
-is hyperlinked to a new window which details the execution plan and the
-scripts that execute this SQL.
-</p>
-<p> The number of statements returned is determined by $numsql. Data is
-taken from the adodb_logsql table, where the sql statements are logged
-when
-$connection-&gt;LogSQL(true) is enabled. The adodb_logsql table is
-populated using <a href="docs-adodb.htm#logsql">$conn-&gt;LogSQL</a>.
-</p>
-<p>For Oracle, Ixora Expensive SQL returns a list of SQL statements
-that are taking the most CPU load when run.
-</p>
-<p><font face="Courier New, Courier, mono">function 
<b>InvalidSQL</b>($numsql=10)</font></p>
-<p>Returns a list of invalid SQL as an HTML table.
-</p>
-<p>Data is taken from the adodb_logsql table, where the sql statements
-are logged when
-$connection-&gt;LogSQL(true) is enabled.
-</p>
-<p><font face="Courier New, Courier, mono">function 
<b>Tables</b>($orderby=1)</font></p>
-<p>Returns information on all tables in a database, with the first two
-fields containing the table name and table size, the remaining fields
-depend on the database driver. If $orderby is set to 1, it will sort by
-name. If $orderby is set to 2, then it will sort by table size. Some
-database drivers (mssql and mysql) will ignore the $orderby clause. For
-postgresql, the information is up-to-date since the last <i>vacuum</i>.
-Not supported currently for db2.</p>
-<h3>Raw Functions</h3>
-<p>Raw functions return values without any formatting.</p>
-<p><font face="Courier New, Courier, mono">function 
<b>DBParameter</b>($paramname)</font></p>
-<p>Returns the value of a database parameter, such as
-$this-&gt;DBParameter("data cache size").</p>
-<p><font face="Courier New, Courier, mono">function <b>CPULoad</b>()</font></p>
-<p>Returns the CPU load of the database client (NOT THE SERVER) as a
-percentage. Only works for Linux and Windows. For Windows, WMI must be
-available.</p>
-<h3>Format of $settings Property</h3>
-<p> To create new database parameters, you need to understand
-$settings. The $settings data structure is an associative array. Each
-element of the array defines a database parameter. The key is the name
-of the database parameter. If no key is defined, then it is assumed to
-be a section break, and the value is the name of the section break. If
-this is too confusing, looking at the source code will help a lot!</p>
-<p> Each database parameter is itself an array consisting of the
-following elements:</p>
-<ol start="0">
-  <li> Category code, used to group related db parameters. If the
-category code is 'HIDE', then
-the database parameter is not shown when HTML() is called. <br>
-  </li>
-  <li> either
-    <ol type="a">
-      <li>sql string to retrieve value, eg. "select value from
-v\$parameter where name='db_block_size'", </li>
-      <li>array holding sql string and field to look for, e.g.
-array('show variables','table_cache'); optional 3rd parameter is the
-$rs-&gt;fields[$index] to use (otherwise $index=1), and optional 4th
-parameter is a constant to multiply the result with (typically 100 for
-percentage calculations),</li>
-      <li>a string prefixed by =, then a PHP method of the class is
-invoked, e.g. to invoke $this-&gt;GetIndexValue(), set this array
-element to '=GetIndexValue', <br>
-      </li>
-    </ol>
-  </li>
-  <li> Description of database parameter. If description begins with an
-=, then it is interpreted as a method call, just as in (1c) above,
-taking one parameter, the current value. E.g. '=GetIndexDescription'
-will invoke $this-&gt;GetIndexDescription($val). This is useful for
-generating tuning suggestions. For an example, see WarnCacheRatio().</li>
-</ol>
-<p>Example from MySQL, table_cache database parameter:</p>
-<pre>'table cache' =&gt; array('CACHE',            # category code<br>   
array("show variables", 'table_cache'), # array (type 1b)<br>   'Number of 
tables to keep open'),       # description</pre>
-<h3>Example Health Check Output</h3>
-<p><a href="#db2">db2</a> <a href="#informix">informix</a> <a
- href="#mysql">mysql</a> <a href="#mssql">mssql</a> <a href="#oci8">oci8</a>
-<a href="#postgres">postgres</a></p>
-<p><a name="db2"></a></p>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>db2</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td>data cache hit ratio</td>
-      <td>0 &nbsp; </td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i></td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td>data cache buffers</td>
-      <td>250 &nbsp; </td>
-      <td>See <a
- 
href="http://www7b.boulder.ibm.com/dmdd/library/techarticle/anshum/0107anshum.html#bufferpoolsize";>tuning
-reference</a>.</td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td>cache blocksize</td>
-      <td>4096 &nbsp; </td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td>data cache size</td>
-      <td>1000K &nbsp; </td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i></td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td>current connections</td>
-      <td>2 &nbsp; </td>
-      <td>&nbsp;</td>
-    </tr>
-  </tbody>
-</table>
-<p>&nbsp;</p>
-<p><a name="informix"></a>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>informix</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Val
-ue</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache hit
-ratio</td>
-      <td>95.89</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data
-reads</td>
-      <td>1883884</td>
-      <td>Page reads</td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>1716724</td>
-      <td>Page writes</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i>
-&nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>263.0</td>
-      <td>Number of
-sessions</td>
-    </tr>
-  </tbody>
-</table>
-</p>
-<p>&nbsp;</p>
-<p><a name="mysql" id="mysql"></a></p>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>mysql</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>MyISAM cache hit ratio</td>
-      <td>56.5658301822</td>
-      <td><font color="red"><b>Cache ratio should be at least 
90%</b></font></td>
-    </tr>
-    <tr>
-      <td>InnoDB cache hit ratio</td>
-      <td>0</td>
-      <td><font color="red"><b>Cache ratio should be at least 
90%</b></font></td>
-    </tr>
-    <tr>
-      <td>sql cache hit ratio</td>
-      <td>0</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data reads</td>
-      <td>2622</td>
-      <td>Number of selects (Key_reads is not accurate)</td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>2415.5</td>
-      <td>Number of inserts/updates/deletes * coef (Key_writes is not
-accurate)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>MyISAM data cache size</td>
-      <td>512K</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>BDB data cache size</td>
-      <td>8388600</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>InnoDB data cache size</td>
-      <td>8M</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Memory Pools</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>read buffer size</td>
-      <td>131072</td>
-      <td>(per session)</td>
-    </tr>
-    <tr>
-      <td>sort buffer size</td>
-      <td>65528</td>
-      <td>Size of sort buffer (per session)</td>
-    </tr>
-    <tr>
-      <td>table cache</td>
-      <td>4</td>
-      <td>Number of tables to keep open</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>3</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>max connections</td>
-      <td>100</td>
-      <td>&nbsp;</td>
-    </tr>
-  </tbody>
-</table>
-<p>&nbsp;</p>
-<p><a name="mssql" id="mssql"></a></p>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>mssql</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache hit ratio</td>
-      <td>99.9999694824</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>prepared sql hit ratio</td>
-      <td>99.7738579828</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>adhoc sql hit ratio</td>
-      <td>98.4540169133</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data reads</td>
-      <td>2858</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>1438</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache size</td>
-      <td>4362</td>
-      <td>in K</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>14</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>max connections</td>
-      <td>32767</td>
-      <td>&nbsp;</td>
-    </tr>
-  </tbody>
-</table>
-<p>&nbsp;</p>
-<p><a name="oci8" id="oci8"></a></p>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>oci8</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache hit ratio</td>
-      <td>96.98</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>sql cache hit ratio</td>
-      <td>99.96</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data reads</td>
-      <td>842938</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>16852</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache buffers</td>
-      <td>3072</td>
-      <td>Number of cache buffers</td>
-    </tr>
-    <tr>
-      <td>data cache blocksize</td>
-      <td>8192</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache size</td>
-      <td>48M</td>
-      <td>shared_pool_size</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Memory Pools</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>java pool size</td>
-      <td>0</td>
-      <td>java_pool_size</td>
-    </tr>
-    <tr>
-      <td>sort buffer size</td>
-      <td>512K</td>
-      <td>sort_area_size (per query)</td>
-    </tr>
-    <tr>
-      <td>user session buffer size</td>
-      <td>8M</td>
-      <td>large_pool_size</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>1</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>max connections</td>
-      <td>170</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache utilization ratio</td>
-      <td>88.46</td>
-      <td>Percentage of data cache actually in use</td>
-    </tr>
-    <tr>
-      <td>user cache utilization ratio</td>
-      <td>91.76</td>
-      <td>Percentage of user cache (large_pool) actually in use</td>
-    </tr>
-    <tr>
-      <td>rollback segments</td>
-      <td>11</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Transactions</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>peak transactions</td>
-      <td>24</td>
-      <td>Taken from high-water-mark</td>
-    </tr>
-    <tr>
-      <td>max transactions</td>
-      <td>187</td>
-      <td>max transactions / rollback segments &lt; 3.5 (or
-transactions_per_rollback_segment)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Parameters</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>cursor sharing</td>
-      <td>EXACT</td>
-      <td>Cursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR
-(9i+). See <a
- 
href="http://www.praetoriate.com/oracle_tips_cursor_sharing.htm";>cursor_sharing</a>.</td>
-    </tr>
-    <tr>
-      <td>index cache cost</td>
-      <td>0</td>
-      <td>% of indexed data blocks expected in the cache. Recommended
-is 20-80. Default is 0. See <a
- 
href="http://www.dba-oracle.com/oracle_tips_cbo_part1.htm";>optimizer_index_caching</a>.</td>
-    </tr>
-    <tr>
-      <td>random page cost</td>
-      <td>100</td>
-      <td>Recommended is 10-50 for TP, and 50 for data warehouses.
-Default is 100. See <a
- 
href="http://www.dba-oracle.com/oracle_tips_cost_adj.htm";>optimizer_index_cost_adj</a>.
-      </td>
-    </tr>
-  </tbody>
-</table>
-<h3>Suspicious SQL</h3>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td><b>LOAD</b></td>
-      <td><b>EXECUTES</b></td>
-      <td><b>SQL_TEXT</b></td>
-    </tr>
-    <tr>
-      <td align="right"> .73%</td>
-      <td align="right">89</td>
-      <td>select u.name, o.name, t.spare1, t.pctfree$ from sys.obj$ o,
-sys.user$ u, sys.tab$ t where (bitand(t.trigflag, 1048576) = 1048576)
-and o.obj#=t.obj# and o.owner# = u.user# select i.obj#, i.flags,
-u.name, o.name from sys.obj$ o, sys.user$ u, sys.ind$ i where
-(bitand(i.flags, 256) = 256 or bitand(i.flags, 512) = 512) and
-(not((i.type# = 9) and bitand(i.flags,8) = 8)) and o.obj#=i.obj# and
-o.owner# = u.user# </td>
-    </tr>
-    <tr>
-      <td align="right"> .84%</td>
-      <td align="right">3</td>
-      <td>select /*+ RULE */ distinct tabs.table_name, tabs.owner ,
-partitioned, iot_type , TEMPORARY, table_type, table_type_owner from
-DBA_ALL_TABLES tabs where tabs.owner = :own </td>
-    </tr>
-    <tr>
-      <td align="right"> 3.95%</td>
-      <td align="right">6</td>
-      <td>SELECT round(count(1)*avg(buf.block_size)/1048576) FROM
-DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE
-obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
-seg.owner and obj.object_name = seg.segment_name and obj.object_type =
-seg.segment_type and seg.buffer_pool = buf.name and buf.name =
-'DEFAULT' </td>
-    </tr>
-    <tr>
-      <td align="right"> 4.50%</td>
-      <td align="right">6</td>
-      <td>SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM
-DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE
-obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
-seg.owner and obj.object_name = seg.segment_name and obj.object_type =
-seg.segment_type and seg.tablespace_name = tsp.tablespace_name </td>
-    </tr>
-    <tr>
-      <td align="right">57.34%</td>
-      <td align="right">9267</td>
-      <td>select t.schema, t.name, t.flags, q.name from
-system.aq$_queue_tables t, sys.aq$_queue_table_affinities aft,
-system.aq$_queues q where aft.table_objno = t.objno and
-aft.owner_instance = :1 and q.table_objno = t.objno and q.usage = 0 and
-bitand(t.flags, 4+16+32+64+128+256) = 0 for update of t.name,
-aft.table_objno skip locked </td>
-    </tr>
-  </tbody>
-</table>
-<h3>Expensive SQL</h3>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td><b>LOAD</b></td>
-      <td><b>EXECUTES</b></td>
-      <td><b>SQL_TEXT</b></td>
-    </tr>
-    <tr>
-      <td align="right"> 5.24%</td>
-      <td align="right">1</td>
-      <td>select round(sum(bytes)/1048576) from dba_segments </td>
-    </tr>
-    <tr>
-      <td align="right"> 6.89%</td>
-      <td align="right">6</td>
-      <td>SELECT round(count(1)*avg(buf.block_size)/1048576) FROM
-DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE
-obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
-seg.owner and obj.object_name = seg.segment_name and obj.object_type =
-seg.segment_type and seg.buffer_pool = buf.name and buf.name =
-'DEFAULT' </td>
-    </tr>
-    <tr>
-      <td align="right"> 7.85%</td>
-      <td align="right">6</td>
-      <td>SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM
-DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE
-obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
-seg.owner and obj.object_name = seg.segment_name and obj.object_type =
-seg.segment_type and seg.tablespace_name = tsp.tablespace_name </td>
-    </tr>
-    <tr>
-      <td align="right">33.69%</td>
-      <td align="right">89</td>
-      <td>select u.name, o.name, t.spare1, t.pctfree$ from sys.obj$ o,
-sys.user$ u, sys.tab$ t where (bitand(t.trigflag, 1048576) = 1048576)
-and o.obj#=t.obj# and o.owner# = u.user# </td>
-    </tr>
-    <tr>
-      <td align="right">36.44%</td>
-      <td align="right">89</td>
-      <td>select i.obj#, i.flags, u.name, o.name from sys.obj$ o,
-sys.user$ u, sys.ind$ i where (bitand(i.flags, 256) = 256 or
-bitand(i.flags, 512) = 512) and (not((i.type# = 9) and
-bitand(i.flags,8) = 8)) and o.obj#=i.obj# and o.owner# = u.user# </td>
-    </tr>
-  </tbody>
-</table>
-<p><a name="postgres" id="postgres"></a></p>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>postgres7</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>statistics collector</td>
-      <td>FALSE</td>
-      <td>Must be set to TRUE to enable hit ratio statistics 
(<i>stats_start_collector</i>,<i>stats_row_level</i>
-and <i>stats_block_level</i> must be set to true in postgresql.conf)</td>
-    </tr>
-    <tr>
-      <td>data cache hit ratio</td>
-      <td>99.9666031916603</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data reads</td>
-      <td>15</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>0.000000000000000000</td>
-      <td>Count of inserts/updates/deletes * coef</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache buffers</td>
-      <td>1280</td>
-      <td>Number of cache buffers. <a
- 
href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#basic";>Tuning</a></td>
-    </tr>
-    <tr>
-      <td>cache blocksize</td>
-      <td>8192</td>
-      <td>(estimate)</td>
-    </tr>
-    <tr>
-      <td>data cache size</td>
-      <td>10M</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>operating system cache size</td>
-      <td>80000K</td>
-      <td>(effective cache size)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Memory Pools</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>sort buffer size</td>
-      <td>1M</td>
-      <td>Size of sort buffer (per query)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>13</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>max connections</td>
-      <td>32</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Parameters</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>rollback buffers</td>
-      <td>8</td>
-      <td>WAL buffers</td>
-    </tr>
-    <tr>
-      <td>random page cost</td>
-      <td>4</td>
-      <td>Cost of doing a seek (default=4). See <a
- 
href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#less";>random_page_cost</a></td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>ADOdb Performance Monitoring Library</title>
+  <style type="text/css">
+body, td {
+/*font-family: Arial, Helvetica, sans-serif;*/
+font-size: 11pt;
+}
+pre {
+font-size: 9pt;
+background-color: #EEEEEE; padding: .5em; margin: 0px;
+}
+.toplink {
+font-size: 8pt;
+}
+  </style>
+</head>
+<body>
+<h3>The ADOdb Performance Monitoring Library</h3>
+<p>V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my)</p>
+<p><font size="1">This software is dual licensed using BSD-Style and
+LGPL. This means you can use it in compiled proprietary and commercial
+products.</font></p>
+<p>Useful ADOdb links: <a 
href="http://adodb.sourceforge.net/#download";>Download</a>
+&nbsp; <a href="http://adodb.sourceforge.net/#docs";>Other Docs</a>
+</p>
+<h3>Introduction</h3>
+<p>This module, part of the ADOdb package, provides both CLI and HTML
+interfaces for viewing key performance indicators of your database.
+This is very useful because web apps such as the popular phpMyAdmin
+currently do not provide effective database health monitoring tools.
+The module provides the following: </p>
+<ul>
+  <li>A quick health check of your database server using 
<code>$perf-&gt;HealthCheck()</code>
+or <code>$perf-&gt;HealthCheckCLI()</code>. </li>
+  <li>User interface for performance monitoring, <code>$perf-&gt;UI()</code>.
+This UI displays:
+    <ul>
+      <li>the health check, </li>
+      <li>all SQL logged and their query plans, </li>
+      <li>a list of all tables in the current database</li>
+      <li>an interface to continiously poll the server for key
+performance indicators such as CPU, Hit Ratio, Disk I/O</li>
+      <li>a form where you can enter and run SQL interactively.</li>
+    </ul>
+  </li>
+  <li>Gives you an API to build database monitoring tools for a server
+farm, for example calling <code>$perf-&gt;DBParameter('data cache hit
+ratio')</code> returns this very important statistic in a database
+independant manner. </li>
+</ul>
+<p>ADOdb also has the ability to log all SQL executed, using <a
+ href="docs-adodb.htm#logsql">LogSQL</a>. All SQL logged can be
+analyzed through the performance monitor <a href="#ui">UI</a>. In the <i>View
+SQL</i> mode, we categorize the SQL into 3 types:
+</p>
+<ul>
+  <li><b>Suspicious SQL</b>: queries with high average execution times,
+and are potential candidates for rewriting</li>
+  <li><b>Expensive SQL</b>: queries with high total execution times
+(#executions * avg execution time). Optimizing these queries will
+reduce your database server load.</li>
+  <li><b>Invalid SQL</b>: queries that generate errors.</li>
+</ul>
+<p>Each query is hyperlinked to a description of the query plan, and
+every PHP script that executed that query is also shown.</p>
+<p>Please note that the information presented is a very basic database
+health check, and does not provide a complete overview of database
+performance. Although some attempt has been made to make it work across
+multiple databases in the same way, it is impossible to do so. For the
+health check, we do try to display the following key database
+parameters for all drivers:</p>
+<ul>
+  <li><b>data cache size</b> - The amount of memory allocated to the
+cache.</li>
+  <li><b>data cache hit ratio</b> - A measure of how effective the
+cache is, as a percentage. The higher, the better.</li>
+  <li><b>current connections</b> - The number of sessions currently
+connected to the database. </li>
+</ul>
+<p>You will need to connect to the database as an administrator to view
+most of the parameters. </p>
+<p>Code improvements as very welcome, particularly adding new database
+parameters and automated tuning hints.</p>
+<a name="usage"></a>
+<h3>Usage</h3>
+<p>Currently, the following drivers: <em>mysql</em>, <em>postgres</em>,
+<em>oci8</em>, <em>mssql</em>, <i>informix</i> and <em>db2</em> are
+supported. To create a new performance monitor, call NewPerfMonitor( )
+as demonstrated below: </p>
+<pre>&lt;?php<br>include_once('adodb.inc.php');<br>session_start(); <font
+ color="#006600"># session variables required for monitoring</font><br>$conn = 
ADONewConnection($driver);<br>$conn-&gt;Connect($server,$user,$pwd,$db);<br>$perf
 =&amp; NewPerfMonitor($conn);<br>$perf-&gt;UI($pollsecs=5);<br>?&gt;<br></pre>
+<p>It is also possible to retrieve a single database parameter:</p>
+<pre>$size = $perf-&gt;DBParameter('data cache size');<br></pre>
+<p>
+Thx to Fernando Ortiz for the informix module. </p>
+<h3>Methods</h3>
+<a name="ui"></a>
+<p><font face="Courier New, Courier, mono">function 
<b>UI($pollsecs=5)</b></font></p>
+<p>Creates a web-based user interface for performance monitoring. When
+you click on Poll, server statistics will be displayed every $pollsecs
+seconds. See <a href="#usage">Usage</a> above. </p>
+<p>Since 4.11, we allow users to enter and run SQL interactively via
+the "Run SQL" link. To disable this for security reasons, set this
+constant before calling $perf-&gt;UI(). </p>
+<p> </p>
+<pre>define('ADODB_PERF_NO_RUN_SQL',1);</pre>
+<p>Sample output follows below:</p>
+<table bgcolor="lightyellow" border="1" width="100%">
+  <tbody>
+    <tr>
+      <td> <b><a href="http://php.weblogs.com/adodb?perf=1";>ADOdb</a>
+Performance Monitor</b> for localhost, db=test<br>
+      <font size="-1">PostgreSQL 7.3.2 on i686-pc-cygwin, compiled by
+GCC gcc (GCC) 3.2 20020927 (prerelease)</font></td>
+    </tr>
+    <tr>
+      <td> <a href="#">Performance Stats</a> &nbsp; <a href="#">View
+SQL</a> &nbsp; <a href="#">View Tables</a> &nbsp; <a href="#">Poll
+Stats</a></td>
+    </tr>
+  </tbody>
+</table>
+<table bgcolor="white" border="1">
+  <tbody>
+    <tr>
+      <td colspan="3">
+      <h3>postgres7</h3>
+      </td>
+    </tr>
+    <tr>
+      <td><b>Parameter</b></td>
+      <td><b>Value</b></td>
+      <td><b>Description</b></td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Ratios</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>statistics collector</td>
+      <td>TRUE</td>
+      <td>Value must be TRUE to enable hit ratio statistics 
(<i>stats_start_collector</i>,<i>stats_row_level</i>
+and <i>stats_block_level</i> must be set to true in postgresql.conf)</td>
+    </tr>
+    <tr>
+      <td>data cache hit ratio</td>
+      <td>99.7967555299239</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>IO</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data reads</td>
+      <td>125</td>
+      <td>&nbsp; </td>
+    </tr>
+    <tr>
+      <td>data writes</td>
+      <td>21.78125000000000000</td>
+      <td>Count of inserts/updates/deletes * coef</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data cache buffers</td>
+      <td>640</td>
+      <td>Number of cache buffers. <a
+ 
href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#basic";>Tuning</a></td>
+    </tr>
+    <tr>
+      <td>cache blocksize</td>
+      <td>8192</td>
+      <td>(estimate)</td>
+    </tr>
+    <tr>
+      <td>data cache size</td>
+      <td>5M</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>operating system cache size</td>
+      <td>80M</td>
+      <td>(effective cache size)</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Memory Usage</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>sort buffer size</td>
+      <td>1M</td>
+      <td>Size of sort buffer (per query)</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Connections</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>current connections</td>
+      <td>0</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>max connections</td>
+      <td>32</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Parameters</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>rollback buffers</td>
+      <td>8</td>
+      <td>WAL buffers</td>
+    </tr>
+    <tr>
+      <td>random page cost</td>
+      <td>4</td>
+      <td>Cost of doing a seek (default=4). See <a
+ 
href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#less";>random_page_cost</a></td>
+    </tr>
+  </tbody>
+</table>
+<p><font face="Courier New, Courier, mono">function 
<b>HealthCheck</b>()</font></p>
+<p>Returns database health check parameters as a HTML table. You will
+need to echo or print the output of this function,</p>
+<p><font face="Courier New, Courier, mono">function 
<b>HealthCheckCLI</b>()</font></p>
+<p>Returns database health check parameters formatted for a command
+line interface. You will need to echo or print the output of this
+function. Sample output for mysql:</p>
+<pre>-- Ratios -- <br>          MyISAM cache hit ratio =&gt; 56.5635738832 
<br>          InnoDB cache hit ratio =&gt; 0 <br>             sql cache hit 
ratio =&gt; 0 <br> -- IO -- <br>                      data reads =&gt; 2622 
<br>                     data writes =&gt; 2415.5 <br> -- Data Cache -- <br>    
      MyISAM data cache size =&gt; 512K <br>             BDB data cache size 
=&gt; 8388600<br>          InnoDB data cache size =&gt; 8M<br> -- Memory Pools 
-- <br>                read buffer size =&gt; 131072 <br>                sort 
buffer size =&gt; 65528 <br>                     table cache =&gt; 4 <br> -- 
Connections -- <br>             current connections =&gt; 3<br>                 
max connections =&gt; 100</pre>
+<p><font face="Courier New, Courier, mono">function <b>Poll</b>($pollSecs=5)
+</font> </p>
+<p> Run in infinite loop, displaying the following information every
+$pollSecs. This will not work properly if output buffering is enabled.
+In the example below, $pollSecs=3:
+</p>
+<pre>Accumulating statistics...<br> Time   WS-CPU%   Hit%   Sess        
Reads/s          Writes/s<br>11:08:30    0.7  56.56      1         0.0000       
     0.0000<br>11:08:33    1.8  56.56      2         0.0000            
0.0000<br>11:08:36   11.1  56.55      3         2.5000            
0.0000<br>11:08:39    9.8  56.55      2         3.1121            
0.0000<br>11:08:42    2.8  56.55      1         0.0000            
0.0000<br>11:08:45    7.4  56.55      2         0.0000            
1.5000<br></pre>
+<p><b>WS-CPU%</b> is the Web Server CPU load of the server that PHP is
+running from (eg. the database client), and not the database. The <b>Hit%</b>
+is the data cache hit ratio. <b>Sess</b> is the current number of
+sessions connected to the database. If you are using persistent
+connections, this should not change much. The <b>Reads/s</b> and 
<b>Writes/s</b>
+are synthetic values to give the viewer a rough guide to I/O, and are
+not to be taken literally. </p>
+<p><font face="Courier New, Courier, mono">function 
<b>SuspiciousSQL</b>($numsql=10)</font></p>
+<p>Returns SQL which have high average execution times as a HTML table.
+Each sql statement
+is hyperlinked to a new window which details the execution plan and the
+scripts that execute this SQL.
+</p>
+<p> The number of statements returned is determined by $numsql. Data is
+taken from the adodb_logsql table, where the sql statements are logged
+when
+$connection-&gt;LogSQL(true) is enabled. The adodb_logsql table is
+populated using <a href="docs-adodb.htm#logsql">$conn-&gt;LogSQL</a>.
+</p>
+<p>For Oracle, Ixora Suspicious SQL returns a list of SQL statements
+that are most cache intensive as a HTML table. These are data intensive
+SQL statements that could benefit most from tuning. </p>
+<p><font face="Courier New, Courier, mono">function 
<b>ExpensiveSQL</b>($numsql=10)</font></p>
+<p>Returns SQL whose total execution time (avg time * #executions) is
+high as a HTML table. Each sql statement
+is hyperlinked to a new window which details the execution plan and the
+scripts that execute this SQL.
+</p>
+<p> The number of statements returned is determined by $numsql. Data is
+taken from the adodb_logsql table, where the sql statements are logged
+when
+$connection-&gt;LogSQL(true) is enabled. The adodb_logsql table is
+populated using <a href="docs-adodb.htm#logsql">$conn-&gt;LogSQL</a>.
+</p>
+<p>For Oracle, Ixora Expensive SQL returns a list of SQL statements
+that are taking the most CPU load when run.
+</p>
+<p><font face="Courier New, Courier, mono">function 
<b>InvalidSQL</b>($numsql=10)</font></p>
+<p>Returns a list of invalid SQL as an HTML table.
+</p>
+<p>Data is taken from the adodb_logsql table, where the sql statements
+are logged when
+$connection-&gt;LogSQL(true) is enabled.
+</p>
+<p><font face="Courier New, Courier, mono">function 
<b>Tables</b>($orderby=1)</font></p>
+<p>Returns information on all tables in a database, with the first two
+fields containing the table name and table size, the remaining fields
+depend on the database driver. If $orderby is set to 1, it will sort by
+name. If $orderby is set to 2, then it will sort by table size. Some
+database drivers (mssql and mysql) will ignore the $orderby clause. For
+postgresql, the information is up-to-date since the last <i>vacuum</i>.
+Not supported currently for db2.</p>
+<h3>Raw Functions</h3>
+<p>Raw functions return values without any formatting.</p>
+<p><font face="Courier New, Courier, mono">function 
<b>DBParameter</b>($paramname)</font></p>
+<p>Returns the value of a database parameter, such as
+$this-&gt;DBParameter("data cache size").</p>
+<p><font face="Courier New, Courier, mono">function <b>CPULoad</b>()</font></p>
+<p>Returns the CPU load of the database client (NOT THE SERVER) as a
+percentage. Only works for Linux and Windows. For Windows, WMI must be
+available.</p>
+<h3>Format of $settings Property</h3>
+<p> To create new database parameters, you need to understand
+$settings. The $settings data structure is an associative array. Each
+element of the array defines a database parameter. The key is the name
+of the database parameter. If no key is defined, then it is assumed to
+be a section break, and the value is the name of the section break. If
+this is too confusing, looking at the source code will help a lot!</p>
+<p> Each database parameter is itself an array consisting of the
+following elements:</p>
+<ol start="0">
+  <li> Category code, used to group related db parameters. If the
+category code is 'HIDE', then
+the database parameter is not shown when HTML() is called. <br>
+  </li>
+  <li> either
+    <ol type="a">
+      <li>sql string to retrieve value, eg. "select value from
+v\$parameter where name='db_block_size'", </li>
+      <li>array holding sql string and field to look for, e.g.
+array('show variables','table_cache'); optional 3rd parameter is the
+$rs-&gt;fields[$index] to use (otherwise $index=1), and optional 4th
+parameter is a constant to multiply the result with (typically 100 for
+percentage calculations),</li>
+      <li>a string prefixed by =, then a PHP method of the class is
+invoked, e.g. to invoke $this-&gt;GetIndexValue(), set this array
+element to '=GetIndexValue', <br>
+      </li>
+    </ol>
+  </li>
+  <li> Description of database parameter. If description begins with an
+=, then it is interpreted as a method call, just as in (1c) above,
+taking one parameter, the current value. E.g. '=GetIndexDescription'
+will invoke $this-&gt;GetIndexDescription($val). This is useful for
+generating tuning suggestions. For an example, see WarnCacheRatio().</li>
+</ol>
+<p>Example from MySQL, table_cache database parameter:</p>
+<pre>'table cache' =&gt; array('CACHE',            # category code<br>   
array("show variables", 'table_cache'), # array (type 1b)<br>   'Number of 
tables to keep open'),       # description</pre>
+<h3>Example Health Check Output</h3>
+<p><a href="#db2">db2</a> <a href="#informix">informix</a> <a
+ href="#mysql">mysql</a> <a href="#mssql">mssql</a> <a href="#oci8">oci8</a>
+<a href="#postgres">postgres</a></p>
+<p><a name="db2"></a></p>
+<table bgcolor="white" border="1">
+  <tbody>
+    <tr>
+      <td colspan="3">
+      <h3>db2</h3>
+      </td>
+    </tr>
+    <tr>
+      <td><b>Parameter</b></td>
+      <td><b>Value</b></td>
+      <td><b>Description</b></td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Ratios</i> &nbsp;</td>
+    </tr>
+    <tr bgcolor="#ffffff">
+      <td>data cache hit ratio</td>
+      <td>0 &nbsp; </td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Data Cache</i></td>
+    </tr>
+    <tr bgcolor="#ffffff">
+      <td>data cache buffers</td>
+      <td>250 &nbsp; </td>
+      <td>See <a
+ 
href="http://www7b.boulder.ibm.com/dmdd/library/techarticle/anshum/0107anshum.html#bufferpoolsize";>tuning
+reference</a>.</td>
+    </tr>
+    <tr bgcolor="#ffffff">
+      <td>cache blocksize</td>
+      <td>4096 &nbsp; </td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#ffffff">
+      <td>data cache size</td>
+      <td>1000K &nbsp; </td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Connections</i></td>
+    </tr>
+    <tr bgcolor="#ffffff">
+      <td>current connections</td>
+      <td>2 &nbsp; </td>
+      <td>&nbsp;</td>
+    </tr>
+  </tbody>
+</table>
+<p>&nbsp;</p>
+<p><a name="informix"></a>
+<table bgcolor="white" border="1">
+  <tbody>
+    <tr>
+      <td colspan="3">
+      <h3>informix</h3>
+      </td>
+    </tr>
+    <tr>
+      <td><b>Parameter</b></td>
+      <td><b>Val
+ue</b></td>
+      <td><b>Description</b></td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Ratios</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data cache hit
+ratio</td>
+      <td>95.89</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>IO</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data
+reads</td>
+      <td>1883884</td>
+      <td>Page reads</td>
+    </tr>
+    <tr>
+      <td>data writes</td>
+      <td>1716724</td>
+      <td>Page writes</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Connections</i>
+&nbsp;</td>
+    </tr>
+    <tr>
+      <td>current connections</td>
+      <td>263.0</td>
+      <td>Number of
+sessions</td>
+    </tr>
+  </tbody>
+</table>
+</p>
+<p>&nbsp;</p>
+<p><a name="mysql" id="mysql"></a></p>
+<table bgcolor="white" border="1">
+  <tbody>
+    <tr>
+      <td colspan="3">
+      <h3>mysql</h3>
+      </td>
+    </tr>
+    <tr>
+      <td><b>Parameter</b></td>
+      <td><b>Value</b></td>
+      <td><b>Description</b></td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Ratios</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>MyISAM cache hit ratio</td>
+      <td>56.5658301822</td>
+      <td><font color="red"><b>Cache ratio should be at least 
90%</b></font></td>
+    </tr>
+    <tr>
+      <td>InnoDB cache hit ratio</td>
+      <td>0</td>
+      <td><font color="red"><b>Cache ratio should be at least 
90%</b></font></td>
+    </tr>
+    <tr>
+      <td>sql cache hit ratio</td>
+      <td>0</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>IO</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data reads</td>
+      <td>2622</td>
+      <td>Number of selects (Key_reads is not accurate)</td>
+    </tr>
+    <tr>
+      <td>data writes</td>
+      <td>2415.5</td>
+      <td>Number of inserts/updates/deletes * coef (Key_writes is not
+accurate)</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>MyISAM data cache size</td>
+      <td>512K</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>BDB data cache size</td>
+      <td>8388600</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>InnoDB data cache size</td>
+      <td>8M</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Memory Pools</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>read buffer size</td>
+      <td>131072</td>
+      <td>(per session)</td>
+    </tr>
+    <tr>
+      <td>sort buffer size</td>
+      <td>65528</td>
+      <td>Size of sort buffer (per session)</td>
+    </tr>
+    <tr>
+      <td>table cache</td>
+      <td>4</td>
+      <td>Number of tables to keep open</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Connections</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>current connections</td>
+      <td>3</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>max connections</td>
+      <td>100</td>
+      <td>&nbsp;</td>
+    </tr>
+  </tbody>
+</table>
+<p>&nbsp;</p>
+<p><a name="mssql" id="mssql"></a></p>
+<table bgcolor="white" border="1">
+  <tbody>
+    <tr>
+      <td colspan="3">
+      <h3>mssql</h3>
+      </td>
+    </tr>
+    <tr>
+      <td><b>Parameter</b></td>
+      <td><b>Value</b></td>
+      <td><b>Description</b></td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Ratios</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data cache hit ratio</td>
+      <td>99.9999694824</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>prepared sql hit ratio</td>
+      <td>99.7738579828</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>adhoc sql hit ratio</td>
+      <td>98.4540169133</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>IO</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data reads</td>
+      <td>2858</td>
+      <td>&nbsp; </td>
+    </tr>
+    <tr>
+      <td>data writes</td>
+      <td>1438</td>
+      <td>&nbsp; </td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data cache size</td>
+      <td>4362</td>
+      <td>in K</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Connections</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>current connections</td>
+      <td>14</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>max connections</td>
+      <td>32767</td>
+      <td>&nbsp;</td>
+    </tr>
+  </tbody>
+</table>
+<p>&nbsp;</p>
+<p><a name="oci8" id="oci8"></a></p>
+<table bgcolor="white" border="1">
+  <tbody>
+    <tr>
+      <td colspan="3">
+      <h3>oci8</h3>
+      </td>
+    </tr>
+    <tr>
+      <td><b>Parameter</b></td>
+      <td><b>Value</b></td>
+      <td><b>Description</b></td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Ratios</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data cache hit ratio</td>
+      <td>96.98</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>sql cache hit ratio</td>
+      <td>99.96</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>IO</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data reads</td>
+      <td>842938</td>
+      <td>&nbsp; </td>
+    </tr>
+    <tr>
+      <td>data writes</td>
+      <td>16852</td>
+      <td>&nbsp; </td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data cache buffers</td>
+      <td>3072</td>
+      <td>Number of cache buffers</td>
+    </tr>
+    <tr>
+      <td>data cache blocksize</td>
+      <td>8192</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>data cache size</td>
+      <td>48M</td>
+      <td>shared_pool_size</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Memory Pools</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>java pool size</td>
+      <td>0</td>
+      <td>java_pool_size</td>
+    </tr>
+    <tr>
+      <td>sort buffer size</td>
+      <td>512K</td>
+      <td>sort_area_size (per query)</td>
+    </tr>
+    <tr>
+      <td>user session buffer size</td>
+      <td>8M</td>
+      <td>large_pool_size</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Connections</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>current connections</td>
+      <td>1</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>max connections</td>
+      <td>170</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>data cache utilization ratio</td>
+      <td>88.46</td>
+      <td>Percentage of data cache actually in use</td>
+    </tr>
+    <tr>
+      <td>user cache utilization ratio</td>
+      <td>91.76</td>
+      <td>Percentage of user cache (large_pool) actually in use</td>
+    </tr>
+    <tr>
+      <td>rollback segments</td>
+      <td>11</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Transactions</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>peak transactions</td>
+      <td>24</td>
+      <td>Taken from high-water-mark</td>
+    </tr>
+    <tr>
+      <td>max transactions</td>
+      <td>187</td>
+      <td>max transactions / rollback segments &lt; 3.5 (or
+transactions_per_rollback_segment)</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Parameters</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>cursor sharing</td>
+      <td>EXACT</td>
+      <td>Cursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR
+(9i+). See <a
+ 
href="http://www.praetoriate.com/oracle_tips_cursor_sharing.htm";>cursor_sharing</a>.</td>
+    </tr>
+    <tr>
+      <td>index cache cost</td>
+      <td>0</td>
+      <td>% of indexed data blocks expected in the cache. Recommended
+is 20-80. Default is 0. See <a
+ 
href="http://www.dba-oracle.com/oracle_tips_cbo_part1.htm";>optimizer_index_caching</a>.</td>
+    </tr>
+    <tr>
+      <td>random page cost</td>
+      <td>100</td>
+      <td>Recommended is 10-50 for TP, and 50 for data warehouses.
+Default is 100. See <a
+ 
href="http://www.dba-oracle.com/oracle_tips_cost_adj.htm";>optimizer_index_cost_adj</a>.
+      </td>
+    </tr>
+  </tbody>
+</table>
+<h3>Suspicious SQL</h3>
+<table bgcolor="white" border="1">
+  <tbody>
+    <tr>
+      <td><b>LOAD</b></td>
+      <td><b>EXECUTES</b></td>
+      <td><b>SQL_TEXT</b></td>
+    </tr>
+    <tr>
+      <td align="right"> .73%</td>
+      <td align="right">89</td>
+      <td>select u.name, o.name, t.spare1, t.pctfree$ from sys.obj$ o,
+sys.user$ u, sys.tab$ t where (bitand(t.trigflag, 1048576) = 1048576)
+and o.obj#=t.obj# and o.owner# = u.user# select i.obj#, i.flags,
+u.name, o.name from sys.obj$ o, sys.user$ u, sys.ind$ i where
+(bitand(i.flags, 256) = 256 or bitand(i.flags, 512) = 512) and
+(not((i.type# = 9) and bitand(i.flags,8) = 8)) and o.obj#=i.obj# and
+o.owner# = u.user# </td>
+    </tr>
+    <tr>
+      <td align="right"> .84%</td>
+      <td align="right">3</td>
+      <td>select /*+ RULE */ distinct tabs.table_name, tabs.owner ,
+partitioned, iot_type , TEMPORARY, table_type, table_type_owner from
+DBA_ALL_TABLES tabs where tabs.owner = :own </td>
+    </tr>
+    <tr>
+      <td align="right"> 3.95%</td>
+      <td align="right">6</td>
+      <td>SELECT round(count(1)*avg(buf.block_size)/1048576) FROM
+DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE
+obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
+seg.owner and obj.object_name = seg.segment_name and obj.object_type =
+seg.segment_type and seg.buffer_pool = buf.name and buf.name =
+'DEFAULT' </td>
+    </tr>
+    <tr>
+      <td align="right"> 4.50%</td>
+      <td align="right">6</td>
+      <td>SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM
+DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE
+obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
+seg.owner and obj.object_name = seg.segment_name and obj.object_type =
+seg.segment_type and seg.tablespace_name = tsp.tablespace_name </td>
+    </tr>
+    <tr>
+      <td align="right">57.34%</td>
+      <td align="right">9267</td>
+      <td>select t.schema, t.name, t.flags, q.name from
+system.aq$_queue_tables t, sys.aq$_queue_table_affinities aft,
+system.aq$_queues q where aft.table_objno = t.objno and
+aft.owner_instance = :1 and q.table_objno = t.objno and q.usage = 0 and
+bitand(t.flags, 4+16+32+64+128+256) = 0 for update of t.name,
+aft.table_objno skip locked </td>
+    </tr>
+  </tbody>
+</table>
+<h3>Expensive SQL</h3>
+<table bgcolor="white" border="1">
+  <tbody>
+    <tr>
+      <td><b>LOAD</b></td>
+      <td><b>EXECUTES</b></td>
+      <td><b>SQL_TEXT</b></td>
+    </tr>
+    <tr>
+      <td align="right"> 5.24%</td>
+      <td align="right">1</td>
+      <td>select round(sum(bytes)/1048576) from dba_segments </td>
+    </tr>
+    <tr>
+      <td align="right"> 6.89%</td>
+      <td align="right">6</td>
+      <td>SELECT round(count(1)*avg(buf.block_size)/1048576) FROM
+DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE
+obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
+seg.owner and obj.object_name = seg.segment_name and obj.object_type =
+seg.segment_type and seg.buffer_pool = buf.name and buf.name =
+'DEFAULT' </td>
+    </tr>
+    <tr>
+      <td align="right"> 7.85%</td>
+      <td align="right">6</td>
+      <td>SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM
+DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE
+obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
+seg.owner and obj.object_name = seg.segment_name and obj.object_type =
+seg.segment_type and seg.tablespace_name = tsp.tablespace_name </td>
+    </tr>
+    <tr>
+      <td align="right">33.69%</td>
+      <td align="right">89</td>
+      <td>select u.name, o.name, t.spare1, t.pctfree$ from sys.obj$ o,
+sys.user$ u, sys.tab$ t where (bitand(t.trigflag, 1048576) = 1048576)
+and o.obj#=t.obj# and o.owner# = u.user# </td>
+    </tr>
+    <tr>
+      <td align="right">36.44%</td>
+      <td align="right">89</td>
+      <td>select i.obj#, i.flags, u.name, o.name from sys.obj$ o,
+sys.user$ u, sys.ind$ i where (bitand(i.flags, 256) = 256 or
+bitand(i.flags, 512) = 512) and (not((i.type# = 9) and
+bitand(i.flags,8) = 8)) and o.obj#=i.obj# and o.owner# = u.user# </td>
+    </tr>
+  </tbody>
+</table>
+<p><a name="postgres" id="postgres"></a></p>
+<table bgcolor="white" border="1">
+  <tbody>
+    <tr>
+      <td colspan="3">
+      <h3>postgres7</h3>
+      </td>
+    </tr>
+    <tr>
+      <td><b>Parameter</b></td>
+      <td><b>Value</b></td>
+      <td><b>Description</b></td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Ratios</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>statistics collector</td>
+      <td>FALSE</td>
+      <td>Must be set to TRUE to enable hit ratio statistics 
(<i>stats_start_collector</i>,<i>stats_row_level</i>
+and <i>stats_block_level</i> must be set to true in postgresql.conf)</td>
+    </tr>
+    <tr>
+      <td>data cache hit ratio</td>
+      <td>99.9666031916603</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>IO</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data reads</td>
+      <td>15</td>
+      <td>&nbsp; </td>
+    </tr>
+    <tr>
+      <td>data writes</td>
+      <td>0.000000000000000000</td>
+      <td>Count of inserts/updates/deletes * coef</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>data cache buffers</td>
+      <td>1280</td>
+      <td>Number of cache buffers. <a
+ 
href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#basic";>Tuning</a></td>
+    </tr>
+    <tr>
+      <td>cache blocksize</td>
+      <td>8192</td>
+      <td>(estimate)</td>
+    </tr>
+    <tr>
+      <td>data cache size</td>
+      <td>10M</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>operating system cache size</td>
+      <td>80000K</td>
+      <td>(effective cache size)</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Memory Pools</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>sort buffer size</td>
+      <td>1M</td>
+      <td>Size of sort buffer (per query)</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Connections</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>current connections</td>
+      <td>13</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr>
+      <td>max connections</td>
+      <td>32</td>
+      <td>&nbsp;</td>
+    </tr>
+    <tr bgcolor="#f0f0f0">
+      <td colspan="3"><i>Parameters</i> &nbsp;</td>
+    </tr>
+    <tr>
+      <td>rollback buffers</td>
+      <td>8</td>
+      <td>WAL buffers</td>
+    </tr>
+    <tr>
+      <td>random page cost</td>
+      <td>4</td>
+      <td>Cost of doing a seek (default=4). See <a
+ 
href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#less";>random_page_cost</a></td>
+    </tr>
+  </tbody>
+</table>
+</body>
+</html>
Index: phpgwapi/inc/adodb/docs/docs-session.htm
diff -u phpgwapi/inc/adodb/docs/docs-session.htm:1.2 
phpgwapi/inc/adodb/docs/docs-session.htm:1.3
--- phpgwapi/inc/adodb/docs/docs-session.htm:1.2        Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/docs/docs-session.htm    Tue Feb 21 13:47:42 2006
@@ -1,208 +1,247 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>ADODB Session Management Manual</title>
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-  <style type="text/css">
-body, td {
-/*font-family: Arial, Helvetica, sans-serif;*/
-font-size: 11pt;
-}
-pre {
-font-size: 9pt;
-background-color: #EEEEEE; padding: .5em; margin: 0px;
-}
-.toplink {
-font-size: 8pt;
-}
-  </style>
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<h3>ADODB Session Management Manual</h3>
-<p>
-V4.54 5 Nov 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my)
-</p>
-<p> <font size="1">This software is dual licensed using BSD-Style and
-LGPL. This means you can use it in compiled proprietary and commercial
-products. </font>
-<table border="1">
-  <tbody>
-    <tr>
-      <td><font color="red">Kindly note that the ADOdb home page has
-moved to <a 
href="http://adodb.sourceforge.net/";>http://adodb.sourceforge.net/</a>
-because of the persistent unreliability of http://php.weblogs.com. <b>Please
-change your links</b>!</font></td>
-    </tr>
-    <tr>
-    </tr>
-  </tbody>
-</table>
-<p></p>
-<p>Useful ADOdb links: <a 
href="http://adodb.sourceforge.net/#download";>Download</a>
-&nbsp; <a href="http://adodb.sourceforge.net/#docs";>Other Docs</a>
-</p>
-<h3>Introduction</h3>
-<p> We store state information specific to a user or web client in
-session variables. These session variables persist throughout a
-session, as the user moves from page to page. </p>
-<p>To use session variables, call session_start() at the beginning of
-your web page, before your HTTP headers are sent. Then for every
-variable you want to keep alive for the duration of the session, call
-session_register($variable_name). By default, the session handler will
-keep track of the session by using a cookie. You can save objects or
-arrays in session variables also.
-</p>
-<p>The default method of storing sessions is to store it in a file.
-However if you have special needs such as you:
-</p>
-<ul>
-  <li>Have multiple web servers that need to share session info</li>
-  <li>Need to do special processing of each session</li>
-  <li>Require notification when a session expires</li>
-</ul>
-<p>Then the ADOdb session handler provides you with the above
-additional capabilities by storing the session information as records
-in a database table that can be shared across multiple servers. </p>
-<p><b>Important Upgrade Notice:</b> Since ADOdb 4.05, the session files
-have been moved to its own folder, adodb/session. This is a rewrite
-of the session code by Ross Smith. The old session code is in
-adodb/session/old. </p>
-<h4>ADOdb Session Handler Features</h4>
-<ul>
-  <li>Ability to define a notification function that is called when a
-session expires. Typically
-used to detect session logout and release global resources. </li>
-  <li>Optimization of database writes. We crc32 the session data and
-only perform an update
-to the session data if there is a data change. </li>
-  <li>Support for large amounts of session data with CLOBs (see
-adodb-session-clob.php). Useful
-for Oracle. </li>
-  <li>Support for encrypted session data, see
-adodb-cryptsession.inc.php. Enabling encryption is simply a matter of
-including adodb-cryptsession.inc.php instead of adodb-session.inc.php. </li>
-</ul>
-<h3>Setup</h3>
-<p>There are 3 session management files that you can use:
-</p>
-<pre>adodb-session.php        : The default<br>adodb-session-clob.php   : Use 
this if you are storing DATA in clobs<br>adodb-cryptsession.php   : Use this if 
you want to store encrypted session data in the database<br><br>
-</pre>
-<p><strong>Examples</strong>
-<p><pre>
- <font
- color="#004040">    include('adodb/adodb.inc.php');<br>    <br><b>    
$ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>   
 $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    
$ADODB_SESSION_DB ='sessiondb';</b><br>    <br>    
<b>include('adodb/session/adodb-session.php');</b><br>    session_start();<br>  
  <br>    #<br>    # Test session vars, the following should increment on 
refresh<br>    #<br>    $_SESSION['AVAR'] += 1;<br>    print 
"&lt;p&gt;\$_SESSION['AVAR']={$_SESSION['AVAR']}&lt;/p&gt;";<br></font></pre>
- 
-<p>To force non-persistent connections, call adodb_session_open() first before 
session_start():
-<p>
- <pre>
- <font color="#004040"><br>    include('adodb/adodb.inc.php');<br>    <br><b>  
  $ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br> 
   $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    
$ADODB_SESSION_DB ='sessiondb';</b><br>    <br>    
<b>include('adodb/session/adodb-session.php');<br>    
adodb_sess_open(false,false,false);</b><br>    session_start();<br> </font>
- </pre>
-<p> The 3rd parameter to adodb_sess_open($path, $sessname, $connectMode)  sets 
the connection method. You can pass in the following:</p>
-<table width="50%" border="1">
-  <tr>
-    <td><b>$connectMode</b></td>
-    <td><b>Connection Method</b></td>
-  </tr>
-  <tr>
-    <td>true</td>
-    <td><p>PConnect( )</p></td>
-  </tr>
-  <tr>
-    <td>false</td>
-    <td>Connect( )</td>
-  </tr>
-  <tr>
-    <td>'N'</td>
-    <td>NConnect( )</td>
-  </tr>
-  <tr>
-    <td>'P'</td>
-    <td>PConnect( )</td>
-  </tr>
-  <tr>
-    <td>'C'</td>
-    <td>Connect( )</td>
-  </tr>
-</table>
-<p>To use a encrypted sessions, simply replace the file adodb-session.php:</p>
- <pre> <font
- color="#004040"><br>    include('adodb/adodb.inc.php');<br>    <br><b>    
$ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>   
 $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    
$ADODB_SESSION_DB ='sessiondb';<br>    <br>    
include('adodb/session/adodb-cryptsession.php');</b><br>    
session_start();</font><br>
- </pre>
- <p>And the same technique for adodb-session-clob.php:</p>
- <pre>  <font
- color="#004040"><br>    include('adodb/adodb.inc.php');<br>    <br><b>    
$ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>   
 $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    
$ADODB_SESSION_DB ='sessiondb';<br>    <br>    
include('adodb/session/adodb-session-clob.php');</b><br>    
session_start();</font>
- </pre>
- <h4>Installation</h4>
-<p>1. Create this table in your database (syntax might vary depending on your 
db):
-<p><pre> <a
- name="sessiontab"></a> <font color="#004040"><br>  create table sessions 
(<br>       SESSKEY char(32) not null,<br>       EXPIRY int(11) unsigned not 
null,<br>       EXPIREREF varchar(64),<br>       DATA text not null,<br>      
primary key (sesskey)<br>  );</font><br> 
- </pre>
- <p> For the adodb-session-clob.php version, create this:
-<p>  <pre>
-    <font
- color="#004040"><br>    create table sessions (<br>       SESSKEY char(32) 
not null,<br>       EXPIRY int(11) unsigned not null,<br>       EXPIREREF 
varchar(64),<br>       DATA CLOB,<br>      primary key (sesskey)<br>  );</font>
- </pre>
- <p>2. Then define the following parameters. You can either modify this file, 
or define them before this file is included:
- <pre>      <font
- color="#004040"><br>    $ADODB_SESSION_DRIVER='database driver, eg. mysql or 
ibase';<br>    $ADODB_SESSION_CONNECT='server to connect to';<br>    
$ADODB_SESSION_USER ='user';<br>    $ADODB_SESSION_PWD ='password';<br>    
$ADODB_SESSION_DB ='database';<br>    $ADODB_SESSION_TBL = 'sessions'; # 
setting this is optional<br>    </font>
- </pre><p>
-     When the session is created, $<b>ADODB_SESS_CONN</b> holds the connection 
object.<br>    <br>  3. Recommended is PHP 4.0.6 or later. There are documented 
session bugs in earlier versions of PHP.
-<h3>Notifications</h3>
-<p>If you want to receive notification when a session expires, then tag
-the session record with a <a href="#sessiontab">EXPIREREF</a> tag (see
-the definition of the sessions table above). Before any session record
-is deleted, ADOdb will call a notification function, passing in the
-EXPIREREF.
-</p>
-<p>When a session is first created, we check a global variable
-$ADODB_SESSION_EXPIRE_NOTIFY. This is an array with 2 elements, the
-first being the name of the session variable you would like to store in
-the EXPIREREF field, and the 2nd is the notification function's name. </p>
-<p> Suppose we want to be notified when a user's session has expired,
-based on the userid. The user id in the global session variable
-$USERID. The function name is 'NotifyFn'. So we define: </p>
-<pre> <font color="#004040"><br>        $ADODB_SESSION_EXPIRE_NOTIFY = 
array('USERID','NotifyFn');<br>    </font></pre>
-And when the NotifyFn is called (when the session expires), we pass the
-$USERID as the first parameter, eg. NotifyFn($userid, $sesskey). The
-session key (which is the primary key of the record in the sessions
-table) is the 2nd parameter.
-<p> Here is an example of a Notification function that deletes some
-records in the database and temporary files: </p>
-<pre><font color="#004040"><br>        function NotifyFn($expireref, 
$sesskey)<br>        {<br>        global $ADODB_SESS_CONN; # the session 
connection object<br><br>          $user = 
$ADODB_SESS_CONN-&gt;qstr($expireref);<br>          
$ADODB_SESS_CONN-&gt;Execute("delete from shopping_cart where user=$user");<br> 
         system("rm /work/tmpfiles/$expireref/*");<br>        }</font><br>    
</pre>
-<p> NOTE 1: If you have register_globals disabled in php.ini, then you
-will have to manually set the EXPIREREF. E.g. </p>
-<pre> <font color="#004040">
-    $GLOBALS['USERID'] =&amp; $_SESSION['USERID'];
-    $ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');</font>
-</pre>
-<p> NOTE 2: If you want to change the EXPIREREF after the session
-record has been created, you will need to modify any session variable
-to force a database record update.
-</p>
-<h4>Neat Notification Tricks</h4>
-<p><i>ExpireRef</i> normally holds the user id of the current session.
-</p>
-<p>1. You can then write a session monitor, scanning expireref to see
-who is currently logged on.
-</p>
-<p>2. If you delete the sessions record for a specific user, eg.
-</p>
-<pre>delete from sessions where expireref = '$USER'<br></pre>
-then the user is logged out. Useful for ejecting someone from a
-site.
-<p>3. You can scan the sessions table to ensure no user
-can be logged in twice. Useful for security reasons.
-</p>
-<h3>Compression/Encryption Schemes</h3>
-Since ADOdb 4.05, thanks to Ross Smith, multiple encryption and
-compression schemes are supported. Currently, supported are:
-<p>
-<pre>  MD5Crypt (crypt.inc.php)<br>  MCrypt<br>  Secure (Horde's emulation of 
MCrypt, if MCrypt module is not available.)<br>  GZip<br>  BZip2<br></pre>
-<p>These are stackable. E.g.
-<p><pre>ADODB_Session::filter(new 
ADODB_Compress_Bzip2());<br>ADODB_Session::filter(new 
ADODB_Encrypt_MD5());<br></pre>
-will compress and then encrypt the record in the database.
-<p>Also see the <a href="docs-adodb.htm">core ADOdb documentation</a>.
-</p>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>ADODB Session Management Manual</title>
+  <meta http-equiv="Content-Type"
+ content="text/html; charset=iso-8859-1">
+  <style type="text/css">
+body, td {
+/*font-family: Arial, Helvetica, sans-serif;*/
+font-size: 11pt;
+}
+pre {
+font-size: 9pt;
+background-color: #EEEEEE; padding: .5em; margin: 0px;
+}
+.toplink {
+font-size: 8pt;
+}
+  </style>
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<h3>ADODB Session Management Manual</h3>
+<p>
+V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my)
+</p>
+<p> <font size="1">This software is dual licensed using BSD-Style and
+LGPL. This means you can use it in compiled proprietary and commercial
+products. </font>
+<p>Useful ADOdb links: <a 
href="http://adodb.sourceforge.net/#download";>Download</a>
+&nbsp; <a href="http://adodb.sourceforge.net/#docs";>Other Docs</a>
+</p>
+<h3>Introduction</h3>
+<p> We store state information specific to a user or web client in
+session variables. These session variables persist throughout a
+session, as the user moves from page to page. </p>
+<p>To use session variables, call session_start() at the beginning of
+your web page, before your HTTP headers are sent. Then for every
+variable you want to keep alive for the duration of the session, call
+session_register($variable_name). By default, the session handler will
+keep track of the session by using a cookie. You can save objects or
+arrays in session variables also.
+</p>
+<p>The default method of storing sessions is to store it in a file.
+However if you have special needs such as you:
+</p>
+<ul>
+  <li>Have multiple web servers that need to share session info</li>
+  <li>Need to do special processing of each session</li>
+  <li>Require notification when a session expires</li>
+</ul>
+<p>The ADOdb session handler provides you with the above
+additional capabilities by storing the session information as records
+in a database table that can be shared across multiple servers. </p>
+<p>These records will be garbage collected based on the php.ini [session] 
timeout settings. 
+You can register a notification function to notify you when the record has 
expired and 
+is about to be freed by the garbage collector.</p>
+<p><b>Important Upgrade Notice:</b> Since ADOdb 4.05, the session files
+have been moved to its own folder, adodb/session. This is a rewrite
+of the session code by Ross Smith. The old session code is in
+adodb/session/old. </p>
+<h4>ADOdb Session Handler Features</h4>
+<ul>
+  <li>Ability to define a notification function that is called when a
+session expires. Typically
+used to detect session logout and release global resources. </li>
+  <li>Optimization of database writes. We crc32 the session data and
+only perform an update
+to the session data if there is a data change. </li>
+  <li>Support for large amounts of session data with CLOBs (see
+adodb-session-clob.php). Useful
+for Oracle. </li>
+  <li>Support for encrypted session data, see
+adodb-cryptsession.inc.php. Enabling encryption is simply a matter of
+including adodb-cryptsession.inc.php instead of adodb-session.inc.php. </li>
+</ul>
+<h3>Setup</h3>
+<p>There are 3 session management files that you can use:
+</p>
+<pre>adodb-session.php        : The default<br>adodb-session-clob.php   : Use 
this if you are storing DATA in clobs<br>adodb-cryptsession.php   : Use this if 
you want to store encrypted session data in the database<br><br>
+</pre>
+<p><strong>Examples</strong>
+<p><pre>
+ <font
+ color="#004040">    include('adodb/adodb.inc.php');<br>    <br><b>    
$ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>   
 $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    
$ADODB_SESSION_DB ='sessiondb';</b><br>    <br>    
<b>include('adodb/session/adodb-session.php');</b><br>    session_start();<br>  
  <br>    #<br>    # Test session vars, the following should increment on 
refresh<br>    #<br>    $_SESSION['AVAR'] += 1;<br>    print 
"&lt;p&gt;\$_SESSION['AVAR']={$_SESSION['AVAR']}&lt;/p&gt;";<br></font></pre>
+ 
+<p>To force non-persistent connections, call adodb_session_open() first before 
session_start():
+<p>
+ <pre>
+ <font color="#004040"><br>    include('adodb/adodb.inc.php');<br>    <br><b>  
  $ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br> 
   $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    
$ADODB_SESSION_DB ='sessiondb';</b><br>    <br>    
<b>include('adodb/session/adodb-session.php');<br>    
adodb_sess_open(false,false,false);</b><br>    session_start();<br> </font>
+ </pre>
+<p> The 3rd parameter to adodb_sess_open($path, $sessname, $connectMode)  sets 
the connection method. You can pass in the following:</p>
+<table width="50%" border="1">
+  <tr>
+    <td><b>$connectMode</b></td>
+    <td><b>Connection Method</b></td>
+  </tr>
+  <tr>
+    <td>true</td>
+    <td><p>PConnect( )</p></td>
+  </tr>
+  <tr>
+    <td>false</td>
+    <td>Connect( )</td>
+  </tr>
+  <tr>
+    <td>'N'</td>
+    <td>NConnect( )</td>
+  </tr>
+  <tr>
+    <td>'P'</td>
+    <td>PConnect( )</td>
+  </tr>
+  <tr>
+    <td>'C'</td>
+    <td>Connect( )</td>
+  </tr>
+</table>
+<p>To use a encrypted sessions, simply replace the file adodb-session.php:</p>
+ <pre> <font
+ color="#004040"><br>    include('adodb/adodb.inc.php');<br>    <br><b>    
$ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>   
 $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    
$ADODB_SESSION_DB ='sessiondb';<br>    <br>    
include('adodb/session/adodb-cryptsession.php');</b><br>    
session_start();</font><br>
+ </pre>
+ <p>And the same technique for adodb-session-clob.php:</p>
+ <pre>  <font
+ color="#004040"><br>    include('adodb/adodb.inc.php');<br>    <br><b>    
$ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>   
 $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    
$ADODB_SESSION_DB ='sessiondb';<br>    <br>    
include('adodb/session/adodb-session-clob.php');</b><br>    
session_start();</font>
+ </pre>
+ <h4>Installation</h4>
+<p>1. Create this table in your database (syntax might vary depending on your 
db):
+<p><pre> <a
+ name="sessiontab"></a> <font color="#004040"><br>  create table sessions 
(<br>       SESSKEY char(32) not null,<br>       EXPIRY int(11) unsigned not 
null,<br>       EXPIREREF varchar(64),<br>       DATA text not null,<br>      
primary key (sesskey)<br>  );</font><br> 
+ </pre>
+ <p>You may want to rename the 'data' field to 'session_data' as
+       'data' appears to be a reserved word for one or more of the following:
+       <ul>
+       <li>    ANSI SQL
+       <li>    IBM DB2
+       <li>    MS SQL Server
+       <li>    Postgres
+       <li>    SAP
+               </ul>
+<p>
+       If you do, then execute:
+<pre>
+               ADODB_Session::dataFieldName('session_data');
+</pre>
+ <p> For the adodb-session-clob.php version, create this:
+<p>  <pre>
+    <font
+ color="#004040"><br>    create table sessions (<br>       SESSKEY char(32) 
not null,<br>       EXPIRY int(11) unsigned not null,<br>       EXPIREREF 
varchar(64),<br>       DATA CLOB,<br>      primary key (sesskey)<br>  );</font>
+ </pre>
+ <p>2. Then define the following parameters. You can either modify this file, 
or define them before this file is included:
+ <pre>      <font
+ color="#004040"><br>    $ADODB_SESSION_DRIVER='database driver, eg. mysql or 
ibase';<br>    $ADODB_SESSION_CONNECT='server to connect to';<br>    
$ADODB_SESSION_USER ='user';<br>    $ADODB_SESSION_PWD ='password';<br>    
$ADODB_SESSION_DB ='database';<br>    $ADODB_SESSION_TBL = 'sessions'; # 
setting this is optional<br>    </font>
+ </pre><p>
+     When the session is created, $<b>ADODB_SESS_CONN</b> holds the connection 
object.<br>    <br>  3. Recommended is PHP 4.0.6 or later. There are documented 
session bugs in earlier versions of PHP.
+<h3>Notifications</h3>
+<p>You can receive notification when your session is cleaned up by the session 
garbage collector or
+when you call session_destroy().
+<p>PHP's session extension will automatically run a special garbage collection 
function based on
+your php.ini session.cookie_lifetime and session.gc_probability settings. This 
will in turn call
+adodb's garbage collection function, which can be setup to do notification.
+<p>
+<pre>
+       PHP Session --> ADOdb Session  --> Find all recs  --> Send          --> 
Delete queued
+       GC Function     GC Function        to be deleted      notification      
records
+       executed at     called by                             for all recs
+       random time     Session Extension                     queued for 
deletion
+</pre>
+<p>When a session is created, we need to store a value in the session record 
(in the EXPIREREF field), typically 
+the userid of the session. Later when the session has expired,  just before 
the record is deleted,
+we reload the EXPIREREF field and call the notification function with the 
value of EXPIREREF, which 
+is the userid of the person being logged off.
+<p>ADOdb use a global variable $ADODB_SESSION_EXPIRE_NOTIFY that you must 
predefine before session
+start to store the notification configuratioin. 
+$ADODB_SESSION_EXPIRE_NOTIFY is an array with 2 elements, the
+first being the name of the session variable you would like to store in
+the EXPIREREF field, and the 2nd is the notification function's name. </p>
+<p>For example, suppose we want to be notified when a user's session has 
expired,
+based on the userid. When the user logs in, we store the id in the global 
session variable
+$USERID. The function name is 'NotifyFn'. 
+<p>
+So we define (before session_start() is called): </p>
+<pre> <font color="#004040"><br>        $ADODB_SESSION_EXPIRE_NOTIFY = 
array('USERID','NotifyFn');<br>    </font></pre>
+And when the NotifyFn is called (when the session expires), the
+$USERID is passed in as the first parameter, eg. NotifyFn($userid, $sesskey). 
The
+session key (which is the primary key of the record in the sessions
+table) is the 2nd parameter.
+<p> Here is an example of a Notification function that deletes some
+records in the database and temporary files: </p>
+<pre><font color="#004040"><br>        function NotifyFn($expireref, 
$sesskey)<br>        {<br>        global $ADODB_SESS_CONN; # the session 
connection object<br><br>          $user = 
$ADODB_SESS_CONN-&gt;qstr($expireref);<br>          
$ADODB_SESS_CONN-&gt;Execute("delete from shopping_cart where user=$user");<br> 
         system("rm /work/tmpfiles/$expireref/*");<br>        }</font><br>    
</pre>
+<p> NOTE 1: If you have register_globals disabled in php.ini, then you
+will have to manually set the EXPIREREF. E.g. </p>
+<pre> <font color="#004040">
+    $GLOBALS['USERID'] = GetUserID();
+    $ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');</font>
+</pre>
+<p> NOTE 2: If you want to change the EXPIREREF after the session
+record has been created, you will need to modify any session variable
+to force a database record update.
+</p>
+<h4>Neat Notification Tricks</h4>
+<p><i>ExpireRef</i> normally holds the user id of the current session.
+</p>
+<p>1. You can then write a session monitor, scanning expireref to see
+who is currently logged on.
+</p>
+<p>2. If you delete the sessions record for a specific user, eg.
+</p>
+<pre>delete from sessions where expireref = '$USER'<br></pre>
+then the user is logged out. Useful for ejecting someone from a
+site.
+<p>3. You can scan the sessions table to ensure no user
+can be logged in twice. Useful for security reasons.
+</p>
+<h3>Compression/Encryption Schemes</h3>
+Since ADOdb 4.05, thanks to Ross Smith, multiple encryption and
+compression schemes are supported. Currently, supported are:
+<p>
+<pre>  MD5Crypt (crypt.inc.php)<br>  MCrypt<br>  Secure (Horde's emulation of 
MCrypt, if MCrypt module is not available.)<br>  GZip<br>  BZip2<br></pre>
+<p>These are stackable. E.g.
+<p><pre>ADODB_Session::filter(new 
ADODB_Compress_Bzip2());<br>ADODB_Session::filter(new 
ADODB_Encrypt_MD5());<br></pre>
+will compress and then encrypt the record in the database.
+<h3>adodb_session_regenerate_id()</h3>
+<p>Dynamically change the current session id with a newly generated one and 
update database. Currently only
+works with cookies. Useful to improve security by reducing the risk of 
session-hijacking.
+See this article on <a 
href=http://shiflett.org/articles/security-corner-feb2004>Session Fixation</a> 
for more info 
+on the theory behind this feature. Usage:
+<pre>
+       $ADODB_SESSION_DRIVER='mysql';
+       $ADODB_SESSION_CONNECT='localhost';
+       $ADODB_SESSION_USER ='root';
+       $ADODB_SESSION_PWD ='abc';
+       $ADODB_SESSION_DB ='phplens';
+       
+       include('path/to/adodb/session/adodb-session.php');
+       
+       session_start();
+       # Every 10 page loads, reset cookie for safety.
+       # This is extremely simplistic example, better 
+       # to regenerate only when the user logs in or changes
+       # user privilege levels.
+       if ((rand()%10) == 0) adodb_session_regenerate_id(); </pre>
+<p>This function calls session_regenerate_id() internally or simulates it if 
the function does not exist.
+<h2>More Info</h2>
+<p>Also see the <a href="docs-adodb.htm">core ADOdb documentation</a>.
+</p>
+</body>
+</html>
Index: phpgwapi/inc/adodb/docs/old-changelog.htm
diff -u phpgwapi/inc/adodb/docs/old-changelog.htm:1.2 
phpgwapi/inc/adodb/docs/old-changelog.htm:1.3
--- phpgwapi/inc/adodb/docs/old-changelog.htm:1.2       Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/docs/old-changelog.htm   Tue Feb 21 13:47:42 2006
@@ -1,4 +1,126 @@
+<html><title>Old Changelog: ADOdb</title><body>
 <h3>Old Changelog</h3>
+
+</p><p><b>3.92 22 Sept 2003</b> 
+</p><p>Added GetAssoc and CacheGetAssoc to connection object.
+</p><p>Removed TextMax and CharMax functions from adodb.inc.php. 
+</p><p>HasFailedTrans() returned false when trans failed. Fixed. 
+</p><p>Moved perf driver classes into adodb/perf/*.php. 
+</p><p>Misc improvements to performance monitoring, including UI(). 
+</p><p>RETVAL in mssql Parameter(), we do not append @ now. 
+</p><p>Added Param($name) to connection class, returns '?' or ":$name", for 
defining 
+  bind parameters portably. 
+</p><p>LogSQL traps affected_rows() and saves its value properly now. Also 
fixed oci8 
+  _stmt and _affectedrows() bugs. 
+</p><p>Session code timestamp check for oci8 works now. Formerly default 
NLS_DATE_FORMAT 
+  stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). 
Also 
+  added new $conn-&gt;datetime field to oci8, controls whether MetaType() 
returns 
+  'D' ($this-&gt;datetime==false) or 'T' ($this-&gt;datetime == true) for DATE 
type. 
+</p><p>Fixed bugs in adodb-cryptsession.inc.php and 
adodb-session-clob.inc.php. 
+</p><p>Fixed misc bugs in adodb_key_exists, GetInsertSQL() and GetUpdateSQL(). 
+</p><p>Tuned include_once handling to reduce file-system checking overhead. 
+</p><p><b>3.91 9 Sept 2003</b> 
+</p><p>Only released to InterAkt 
+</p><p>Added LogSQL() for sql logging and $ADODB_NEWCONNECTION to override 
factory 
+  for driver instantiation. 
+</p><p>Added IfNull($field,$ifNull) function, thx to johnwilk#juno.com 
+</p><p>Added portable substr support. 
+</p><p>Now rs2html() has new parameter, $echo. Set to false to return $html 
instead 
+  of echoing it. 
+</p><p><b>3.90 5 Sept 2003</b> 
+</p><p>First beta of performance monitoring released. 
+</p><p>MySQL supports MetaTable() masking. 
+</p><p>Fixed key_exists() bug in adodb-lib.inc.php 
+</p><p>Added sp_executesql Prepare() support to mssql. 
+</p><p>Added bind support to db2. 
+</p><p>Added swedish language file - Christian Tiberg" christian#commsoft.nu 
+</p><p>Bug in drop index for mssql data dict fixed. Thx to Gert-Rainer 
Bitterlich. 
+</p><p>Left join setting for oci8 was wrong. Thx to johnwilk#juno.com 
+</p><p><b>3.80 27 Aug 2003</b> 
+</p><p>Patch for PHP 4.3.3 cached recordset csv2rs() fread loop 
incompatibility. 
+</p><p>Added matching mask for MetaTables. Only for oci8, mssql and postgres 
currently. 
+</p><p>Rewrite of "oracle" driver connection code, merging with "oci8", by 
Gaetano. 
+</p><p>Added better debugging for Smart Transactions. 
+</p><p>Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to 
TO_TIMESTAMP. 
+</p><p>ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to 
define 
+  it after including adodb.inc.php. 
+</p><p>Added portugese (brazilian) to languages. Thx to "Levi Fukumori". 
+</p><p>Removed arg3 parameter from Execute/SelectLimit/Cache* functions. 
+</p><p>Execute() now accepts 2-d array as $inputarray. Also changed docs of 
fnExecute() 
+  to note change in sql query counting with 2-d arrays. 
+</p><p>Added MONEY to MetaType in PostgreSQL. 
+</p><p>Added more debugging output to CacheFlush(). 
+</p><p><b>3.72 9 Aug 2003</b> 
+</p><p>Added qmagic($str), which is a qstr($str) that auto-checks for magic 
quotes 
+  and does the right thing... 
+</p><p>Fixed CacheFlush() bug - Thx to martin#gmx.de 
+</p><p>Walt Boring contributed MetaForeignKeys for postgres7. 
+</p><p>_fetch() called _BlobDecode() wrongly in interbase. Fixed. 
+</p><p>adodb_time bug fixed with dates after 2038 fixed by Jason Pell. 
http://phplens.com/lens/lensforum/msgs.php?id=6980 
+</p><p><b>3.71 4 Aug 2003</b> 
+</p><p>The oci8 driver, MetaPrimaryKeys() did not check the owner correctly 
when $owner 
+  == false. 
+</p><p>Russian language file contributed by "Cyrill Malevanov" 
cyrill#malevanov.spb.ru. 
+</p><p>Spanish language file contributed by "Horacio Degiorgi" 
horaciod#codigophp.com. 
+</p><p>Error handling in oci8 bugfix - if there was an error in Execute(), 
then when 
+  calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, 
but 
+  the 2nd call would return no error. 
+</p><p>Error handling in odbc bugfix. ODBC would always return the last error, 
even 
+  if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 
+  0 everytime before CacheExecute() and Execute(). 
+</p><p><b>3.70 29 July 2003</b> 
+</p><p>Added new SQLite driver. Tested on PHP 4.3 and PHP 5. 
+</p><p>Added limited "sapdb" driver support - mainly date support. 
+</p><p>The oci8 driver did not identify NUMBER with no defined precision 
correctly. 
+</p><p>Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL 
nulls 
+  in GetInsertSQL/GetUpdateSQL. 
+</p><p>DBDate() and DBTimeStamp() format for postgresql had problems. Fixed. 
+</p><p>Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit. 
+</p><p>Added charset support to postgresql. Thx to Julian Tarkhanov. 
+</p><p>Changed OS check for MS-Windows to prevent confusion with darWIN 
(MacOS) 
+</p><p>Timestamp format for db2 was wrong. Changed to 
yyyy-mm-dd-hh.mm.ss.nnnnnn. 
+</p><p>adodb-cryptsession.php includes wrong. Fixed. 
+</p><p>Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8. 
+</p><p>Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring. 
+</p><p>adodb_getcount() did not init qryRecs to 0. Missing "WHERE" clause 
checking 
+  in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn. 
+</p><p>Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt 
Boring. 
+</p><p>Upgraded to adodb-xmlschema.inc.php 0.0.2. 
+</p><p>NConnect for mysql now returns value. Thx to Dennis Verspuij. 
+</p><p>ADODB_FETCH_BOTH support added to interbase/firebird. 
+</p><p>Czech language file contributed by Kamil Jakubovic jake#host.sk. 
+</p><p>PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj 
Chlebec. 
+</p><p>Added some new initialization stuff for Informix. Thx to "Andrea 
Pinnisi" pinnisi#sysnet.it 
+</p><p>ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed. 
+</p><p><b>3.60 16 June 2003</b> 
+</p><p>We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be 
compat with 
+  mssql driver. 
+</p><p>The property $emptyDate missing from connection class. Also changed 
1903 to 
+  constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn. 
+</p><p>ADOdb speedup optimization - we now return all arrays by reference. 
+</p><p>Now DBDate() and DBTimeStamp() now accepts the string 'null' as a 
parameter. 
+  Suggested by vincent. 
+</p><p>Added GetArray() to connection class. 
+</p><p>Added not_null check in informix metacolumns(). 
+</p><p>Connection parameters for postgresql did not work correctly when port 
was defined. 
+</p><p>DB2 is now a tested driver, making adodb 100% compatible. Extensive 
changes 
+  to odbc driver for DB2, including implementing serverinfo() and SQLDate(), 
switching 
+  to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and 
SelectLimit() 
+  fixes. 
+</p><p>The odbc driver's FetchField() field names did not obey 
ADODB_ASSOC_CASE. Fixed. 
+</p><p>Some bugs in adodb_backtrace() fixed. 
+</p><p>Added "INT IDENTITY" type to adorecordset::MetaType() to support 
odbc_mssql 
+  properly. 
+</p><p>MetaColumns() for oci8, mssql, odbc revised to support scale. Also 
minor revisions 
+  to odbc MetaColumns() for vfp and db2 compat. 
+</p><p>Added unsigned support to mysql datadict class. Thx to iamsure. 
+</p><p>Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. 
Thx to 
+  Josh R, Night_Wulfe#hotmail.com. 
+</p><p>ChangeTableSQL contributed by Florian Buzin. 
+</p><p>The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat 
with 
+  mssql driver. 
+</p>
+
 <p><b>3.50 19 May 2003</b></p>
 <p>Fixed mssql compat with FreeTDS. FreeTDS does not implement 
mssql_fetch_assoc(). 
 <p>Merged back connection and recordset code into adodb.inc.php. 
@@ -697,4 +819,4 @@
 </p>
 <p><b>0.10 Sept 9 2000</b></p>
 <p>First release</p>
-<p>
\ No newline at end of file
+</body></html>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-access.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-access.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-access.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-access.inc.php:1.2 Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-access.inc.php     Tue Feb 21 13:47:42 2006
@@ -1,86 +1,86 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Microsoft Access data driver. Requires ODBC. Works only on MS Windows.
-*/
-if (!defined('_ADODB_ODBC_LAYER')) {
-       if (!defined('ADODB_DIR')) die();
-       
-       include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
- if (!defined('_ADODB_ACCESS')) {
-       define('_ADODB_ACCESS',1);
-
-class  ADODB_access extends ADODB_odbc {       
-       var $databaseType = 'access';
-       var $hasTop = 'top';            // 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; // strangely enough, setting to true does 
not work reliably
-       var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
-       var $sysTimeStamp = 'NOW';
-       var $hasTransactions = false;
-       
-       function ADODB_access()
-       {
-       global $ADODB_EXTENSION;
-       
-               $ADODB_EXTENSION = false;
-               $this->ADODB_odbc();
-       }
-       
-       function Time()
-       {
-               return time();
-       }
-       
-       function BeginTrans() { return false;}
-       
-       function IfNull( $field, $ifNull ) 
-       {
-               return " IIF(IsNull($field), $ifNull, $field) "; // if Access
-       }
-/*
-       function &MetaTables()
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $qid = odbc_tables($this->_connectionID);
-               $rs = new ADORecordSet_odbc($qid);
-               $ADODB_FETCH_MODE = $savem;
-               if (!$rs) return false;
-               
-               $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
-               
-               $arr = &$rs->GetArray();
-               //print_pre($arr);
-               $arr2 = array();
-               for ($i=0; $i < sizeof($arr); $i++) {
-                       if ($arr[$i][2] && $arr[$i][3] != 'SYSTEM TABLE')
-                               $arr2[] = $arr[$i][2];
-               }
-               return $arr2;
-       }*/
-}
-
- 
-class  ADORecordSet_access extends ADORecordSet_odbc { 
-       
-       var $databaseType = "access";           
-       
-       function ADORecordSet_access($id,$mode=false)
-       {
-               return $this->ADORecordSet_odbc($id,$mode);
-       }
-}// class
-} 
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Microsoft Access data driver. Requires ODBC. Works only on MS Windows.
+*/
+if (!defined('_ADODB_ODBC_LAYER')) {
+       if (!defined('ADODB_DIR')) die();
+       
+       include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
+}
+ if (!defined('_ADODB_ACCESS')) {
+       define('_ADODB_ACCESS',1);
+
+class  ADODB_access extends ADODB_odbc {       
+       var $databaseType = 'access';
+       var $hasTop = 'top';            // 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; // strangely enough, setting to true does 
not work reliably
+       var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
+       var $sysTimeStamp = 'NOW';
+       var $hasTransactions = false;
+       
+       function ADODB_access()
+       {
+       global $ADODB_EXTENSION;
+       
+               $ADODB_EXTENSION = false;
+               $this->ADODB_odbc();
+       }
+       
+       function Time()
+       {
+               return time();
+       }
+       
+       function BeginTrans() { return false;}
+       
+       function IfNull( $field, $ifNull ) 
+       {
+               return " IIF(IsNull($field), $ifNull, $field) "; // if Access
+       }
+/*
+       function &MetaTables()
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $qid = odbc_tables($this->_connectionID);
+               $rs = new ADORecordSet_odbc($qid);
+               $ADODB_FETCH_MODE = $savem;
+               if (!$rs) return false;
+               
+               $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
+               
+               $arr = &$rs->GetArray();
+               //print_pre($arr);
+               $arr2 = array();
+               for ($i=0; $i < sizeof($arr); $i++) {
+                       if ($arr[$i][2] && $arr[$i][3] != 'SYSTEM TABLE')
+                               $arr2[] = $arr[$i][2];
+               }
+               return $arr2;
+       }*/
+}
+
+ 
+class  ADORecordSet_access extends ADORecordSet_odbc { 
+       
+       var $databaseType = "access";           
+       
+       function ADORecordSet_access($id,$mode=false)
+       {
+               return $this->ADORecordSet_odbc($id,$mode);
+       }
+}// class
+} 
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-ado.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-ado.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-ado.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-ado.inc.php:1.2    Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-ado.inc.php        Tue Feb 21 13:47:42 2006
@@ -1,629 +1,631 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-       Microsoft ADO data driver. Requires ADO. Works only on MS Windows.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-       
-define("_ADODB_ADO_LAYER", 1 );
-/*--------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------*/
-
-       
-class ADODB_ado extends ADOConnection {
-       var $databaseType = "ado";      
-       var $_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;
-       var $_thisTransactions;
-       var $_cursor_type = 3; // 
3=adOpenStatic,0=adOpenForwardOnly,1=adOpenKeyset,2=adOpenDynamic
-       var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
-       var $_lock_type = -1;
-       var $_execute_option = -1;
-       var $poorAffectedRows = true; 
-       var $charPage;
-               
-       function ADODB_ado() 
-       {       
-               $this->_affectedRows = new VARIANT;
-       }
-
-       function ServerInfo()
-       {
-               if (!empty($this->_connectionID)) $desc = 
$this->_connectionID->provider;
-               return array('description' => $desc, 'version' => '');
-       }
-       
-       function _affectedrows()
-       {
-               if (PHP_VERSION >= 5) return $this->_affectedRows;
-               
-               return $this->_affectedRows->value;
-       }
-       
-       // you can also pass a connection string like this:
-       //
-       // $DB->Connect('USER 
ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-       function _connect($argHostname, $argUsername, $argPassword, 
$argProvider= 'MSDASQL')
-       {
-               $u = 'UID';
-               $p = 'PWD';
-       
-               if (!empty($this->charPage))
-                       $dbc = new COM('ADODB.Connection',null,$this->charPage);
-               else
-                       $dbc = new COM('ADODB.Connection');
-                       
-               if (! $dbc) return false;
-
-               /* special support if provider is mssql or access */
-               if ($argProvider=='mssql') {
-                       $u = 'User Id';  //User parameter name for OLEDB
-                       $p = 'Password'; 
-                       $argProvider = "SQLOLEDB"; // SQL Server Provider
-                       
-                       // not yet
-                       //if ($argDatabasename) $argHostname .= ";Initial 
Catalog=$argDatabasename";
-                       
-                       //use trusted conection for SQL if username not 
specified
-                       if (!$argUsername) $argHostname .= 
";Trusted_Connection=Yes";
-               } else if ($argProvider=='access')
-                       $argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft 
Jet Provider
-               
-               if ($argProvider) $dbc->Provider = $argProvider;        
-               
-               if ($argUsername) $argHostname .= ";$u=$argUsername";
-               if ($argPassword)$argHostname .= ";$p=$argPassword";
-               
-               if ($this->debug) ADOConnection::outp( 
"Host=".$argHostname."<BR>\n version=$dbc->version");
-               // @ added below for php 4.0.1 and earlier
-               @$dbc->Open((string) $argHostname);
-               
-               $this->_connectionID = $dbc;
-               
-               $dbc->CursorLocation = $this->_cursor_location;
-               return  $dbc->State > 0;
-       }
-       
-       // returns true or false
-       function _pconnect($argHostname, $argUsername, $argPassword, 
$argProvider='MSDASQL')
-       {
-               return 
$this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-       }       
-       
-/*
-       adSchemaCatalogs        = 1,
-       adSchemaCharacterSets   = 2,
-       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;
-               
-               address@hidden>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;
-               
-               address@hidden>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();
-               }
-               $false = false;
-               return empty($arr) ? $false : $arr;
-       }
-       
-
-
-       
-       /* returns queryID or false */
-       function &_query($sql,$inputarr=false) 
-       {
-               
-               $dbc = $this->_connectionID;
-               $false = false;
-               
-       //      return rs       
-               if ($inputarr) {
-                       
-                       if (!empty($this->charPage))
-                               $oCmd = new 
COM('ADODB.Command',null,$this->charPage);
-                       else
-                               $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, 
$this->_execute_option);
-
-               if ($dbc->Errors->Count > 0) return $false;
-               if (! $rs) return $false;
-               
-               if ($rs->State == 0) {
-                       $true = true;
-                       return $true; // 0 = adStateClosed means no records 
returned
-               }
-               return $rs;
-       }
-
-       
-       function BeginTrans() 
-       { 
-               if ($this->transOff) return true;
-               
-               if (isset($this->_thisTransactions))
-                       if (!$this->_thisTransactions) return false;
-               else {
-                       $o = $this->_connectionID->Properties("Transaction 
DDL");
-                       $this->_thisTransactions = $o ? true : false;
-                       if (!$o) return false;
-               }
-               @$this->_connectionID->BeginTrans();
-               $this->transCnt += 1;
-               return true;
-       }
-       function CommitTrans($ok=true) 
-       { 
-               if (!$ok) return $this->RollbackTrans();
-               if ($this->transOff) return true;
-               
-               @$this->_connectionID->CommitTrans();
-               if ($this->transCnt) @$this->transCnt -= 1;
-               return true;
-       }
-       function RollbackTrans() {
-               if ($this->transOff) return true;
-               @$this->_connectionID->RollbackTrans();
-               if ($this->transCnt) @$this->transCnt -= 1;
-               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,$mode=false)
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               $this->fetchMode = $mode;
-               return $this->ADORecordSet($id,$mode);
-       }
-
-
-       // 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;
-               $t = $f->Type;
-               $o->type = $this->MetaType($t);
-               $o->max_length = $f->DefinedSize;
-               $o->ado_type = $t;
-               
-
-               //print "off=$off name=$o->name type=$o->type 
len=$o->max_length<br>";
-               return $o;
-       }
-       
-       /* Use associative array to get fields array */
-       function Fields($colname)
-       {
-               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->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,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               
-               if (!is_numeric($t)) return $t;
-               
-               switch ($t) {
-               case 0:
-               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 or $rs->EOF) {
-                       $this->fields = false;
-                       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++) {
-                       //echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
-                       switch($t) {
-                       case 135: // timestamp
-                               if (!strlen((string)$f->value)) $this->fields[] 
= false;
-                               else {
-                                       if (!is_numeric($f->value)) $val = 
variant_date_to_timestamp($f->value);
-                                       else $val = $f->value;
-                                       $this->fields[] = adodb_date('Y-m-d 
H:i:s',$val);
-                               }
-                               break;                  
-                       case 133:// A date value (yyyymmdd) 
-                               if ($val = $f->value) {
-                                       $this->fields[] = 
substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
-                               } else
-                                       $this->fields[] = false;
-                               break;
-                       case 7: // adDate
-                               if (!strlen((string)$f->value)) $this->fields[] 
= false;
-                               else {
-                                       if (!is_numeric($f->value)) $val = 
variant_date_to_timestamp($f->value);
-                                       else $val = $f->value;
-                                       
-                                       if (($val % 86400) == 0) 
$this->fields[] = adodb_date('Y-m-d',$val);
-                                       else $this->fields[] = 
adodb_date('Y-m-d H:i:s',$val);
-                               }
-                               break;
-                       case 1: // null
-                               $this->fields[] = false;
-                               break;
-                       case 6: // currency is not supported properly;
-                               ADOConnection::outp( '<b>'.$f->Name.': currency 
type not supported by PHP</b>');
-                               $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(ADODB_ASSOC_CASE);
-               }
-               return true;
-       }
-       
-               function NextRecordSet()
-               {
-                       $rs = $this->_queryID;
-                       $this->_queryID = $rs->NextRecordSet();
-                       //$this->_queryID = $this->_QueryId->NextRecordSet();
-                       if ($this->_queryID == null) return false;
-                       
-                       $this->_currentRow = -1;
-                       $this->_currentPage = -1;
-                       $this->bind = false;
-                       $this->fields = false;
-                       $this->_flds = false;
-                       $this->_tarr = false;
-                       
-                       $this->_inited = false;
-                       $this->Init();
-                       return true;
-               }
-
-       function _close() {
-               $this->_flds = false;
-               @$this->_queryID->Close();// by Pete Dishman (address@hidden)
-               $this->_queryID = false;        
-       }
-
-}
-
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+       Microsoft ADO data driver. Requires ADO. Works only on MS Windows.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+       
+define("_ADODB_ADO_LAYER", 1 );
+/*--------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------*/
+
+       
+class ADODB_ado extends ADOConnection {
+       var $databaseType = "ado";      
+       var $_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;
+       var $_thisTransactions;
+       var $_cursor_type = 3; // 
3=adOpenStatic,0=adOpenForwardOnly,1=adOpenKeyset,2=adOpenDynamic
+       var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
+       var $_lock_type = -1;
+       var $_execute_option = -1;
+       var $poorAffectedRows = true; 
+       var $charPage;
+               
+       function ADODB_ado() 
+       {       
+               $this->_affectedRows = new VARIANT;
+       }
+
+       function ServerInfo()
+       {
+               if (!empty($this->_connectionID)) $desc = 
$this->_connectionID->provider;
+               return array('description' => $desc, 'version' => '');
+       }
+       
+       function _affectedrows()
+       {
+               if (PHP_VERSION >= 5) return $this->_affectedRows;
+               
+               return $this->_affectedRows->value;
+       }
+       
+       // you can also pass a connection string like this:
+       //
+       // $DB->Connect('USER 
ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
+       function _connect($argHostname, $argUsername, $argPassword, 
$argProvider= 'MSDASQL')
+       {
+               $u = 'UID';
+               $p = 'PWD';
+       
+               if (!empty($this->charPage))
+                       $dbc = new COM('ADODB.Connection',null,$this->charPage);
+               else
+                       $dbc = new COM('ADODB.Connection');
+                       
+               if (! $dbc) return false;
+
+               /* special support if provider is mssql or access */
+               if ($argProvider=='mssql') {
+                       $u = 'User Id';  //User parameter name for OLEDB
+                       $p = 'Password'; 
+                       $argProvider = "SQLOLEDB"; // SQL Server Provider
+                       
+                       // not yet
+                       //if ($argDatabasename) $argHostname .= ";Initial 
Catalog=$argDatabasename";
+                       
+                       //use trusted conection for SQL if username not 
specified
+                       if (!$argUsername) $argHostname .= 
";Trusted_Connection=Yes";
+               } else if ($argProvider=='access')
+                       $argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft 
Jet Provider
+               
+               if ($argProvider) $dbc->Provider = $argProvider;        
+               
+               if ($argUsername) $argHostname .= ";$u=$argUsername";
+               if ($argPassword)$argHostname .= ";$p=$argPassword";
+               
+               if ($this->debug) ADOConnection::outp( 
"Host=".$argHostname."<BR>\n version=$dbc->version");
+               // @ added below for php 4.0.1 and earlier
+               @$dbc->Open((string) $argHostname);
+               
+               $this->_connectionID = $dbc;
+               
+               $dbc->CursorLocation = $this->_cursor_location;
+               return  $dbc->State > 0;
+       }
+       
+       // returns true or false
+       function _pconnect($argHostname, $argUsername, $argPassword, 
$argProvider='MSDASQL')
+       {
+               return 
$this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
+       }       
+       
+/*
+       adSchemaCatalogs        = 1,
+       adSchemaCharacterSets   = 2,
+       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;
+               
+               address@hidden>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;
+               
+               address@hidden>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();
+               }
+               $false = false;
+               return empty($arr) ? $false : $arr;
+       }
+       
+
+
+       
+       /* returns queryID or false */
+       function &_query($sql,$inputarr=false) 
+       {
+               
+               $dbc = $this->_connectionID;
+               $false = false;
+               
+       //      return rs       
+               if ($inputarr) {
+                       
+                       if (!empty($this->charPage))
+                               $oCmd = new 
COM('ADODB.Command',null,$this->charPage);
+                       else
+                               $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, 
$this->_execute_option);
+
+               if ($dbc->Errors->Count > 0) return $false;
+               if (! $rs) return $false;
+               
+               if ($rs->State == 0) {
+                       $true = true;
+                       return $true; // 0 = adStateClosed means no records 
returned
+               }
+               return $rs;
+       }
+
+       
+       function BeginTrans() 
+       { 
+               if ($this->transOff) return true;
+               
+               if (isset($this->_thisTransactions))
+                       if (!$this->_thisTransactions) return false;
+               else {
+                       $o = $this->_connectionID->Properties("Transaction 
DDL");
+                       $this->_thisTransactions = $o ? true : false;
+                       if (!$o) return false;
+               }
+               @$this->_connectionID->BeginTrans();
+               $this->transCnt += 1;
+               return true;
+       }
+       function CommitTrans($ok=true) 
+       { 
+               if (!$ok) return $this->RollbackTrans();
+               if ($this->transOff) return true;
+               
+               @$this->_connectionID->CommitTrans();
+               if ($this->transCnt) @$this->transCnt -= 1;
+               return true;
+       }
+       function RollbackTrans() {
+               if ($this->transOff) return true;
+               @$this->_connectionID->RollbackTrans();
+               if ($this->transCnt) @$this->transCnt -= 1;
+               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,$mode=false)
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               $this->fetchMode = $mode;
+               return $this->ADORecordSet($id,$mode);
+       }
+
+
+       // 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;
+               $t = $f->Type;
+               $o->type = $this->MetaType($t);
+               $o->max_length = $f->DefinedSize;
+               $o->ado_type = $t;      
+
+               //print "off=$off name=$o->name type=$o->type 
len=$o->max_length<br>";
+               return $o;
+       }
+       
+       /* Use associative array to get fields array */
+       function Fields($colname)
+       {
+               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->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,$fieldobj=false)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               
+               if (!is_numeric($t)) return $t;
+               
+               switch ($t) {
+               case 0:
+               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 or $rs->EOF) {
+                       $this->fields = false;
+                       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++) {
+                       //echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
+                       switch($t) {
+                       case 135: // timestamp
+                               if (!strlen((string)$f->value)) $this->fields[] 
= false;
+                               else {
+                                       if (!is_numeric($f->value)) # $val = 
variant_date_to_timestamp($f->value);
+                                               // VT_DATE stores dates as 
(float) fractional days since 1899/12/30 00:00:00
+                                               $val=(float) 
variant_cast($f->value,VT_R8)*3600*24-2209161600;
+                                       else 
+                                               $val = $f->value;
+                                       $this->fields[] = adodb_date('Y-m-d 
H:i:s',$val);
+                               }
+                               break;                  
+                       case 133:// A date value (yyyymmdd) 
+                               if ($val = $f->value) {
+                                       $this->fields[] = 
substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
+                               } else
+                                       $this->fields[] = false;
+                               break;
+                       case 7: // adDate
+                               if (!strlen((string)$f->value)) $this->fields[] 
= false;
+                               else {
+                                       if (!is_numeric($f->value)) $val = 
variant_date_to_timestamp($f->value);
+                                       else $val = $f->value;
+                                       
+                                       if (($val % 86400) == 0) 
$this->fields[] = adodb_date('Y-m-d',$val);
+                                       else $this->fields[] = 
adodb_date('Y-m-d H:i:s',$val);
+                               }
+                               break;
+                       case 1: // null
+                               $this->fields[] = false;
+                               break;
+                       case 6: // currency is not supported properly;
+                               ADOConnection::outp( '<b>'.$f->Name.': currency 
type not supported by PHP</b>');
+                               $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(ADODB_ASSOC_CASE);
+               }
+               return true;
+       }
+       
+               function NextRecordSet()
+               {
+                       $rs = $this->_queryID;
+                       $this->_queryID = $rs->NextRecordSet();
+                       //$this->_queryID = $this->_QueryId->NextRecordSet();
+                       if ($this->_queryID == null) return false;
+                       
+                       $this->_currentRow = -1;
+                       $this->_currentPage = -1;
+                       $this->bind = false;
+                       $this->fields = false;
+                       $this->_flds = false;
+                       $this->_tarr = false;
+                       
+                       $this->_inited = false;
+                       $this->Init();
+                       return true;
+               }
+
+       function _close() {
+               $this->_flds = false;
+               @$this->_queryID->Close();// by Pete Dishman (address@hidden)
+               $this->_queryID = false;        
+       }
+
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,636 +1,639 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-       Microsoft ADO data driver. Requires ADO. Works only on MS Windows.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-       
-define("_ADODB_ADO_LAYER", 1 );
-/*--------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------*/
-
-       
-class ADODB_ado extends ADOConnection {
-       var $databaseType = "ado";      
-       var $_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;
-       var $_thisTransactions;
-       var $_cursor_type = 3; // 
3=adOpenStatic,0=adOpenForwardOnly,1=adOpenKeyset,2=adOpenDynamic
-       var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
-       var $_lock_type = -1;
-       var $_execute_option = -1;
-       var $poorAffectedRows = true; 
-       var $charPage;
-               
-       function ADODB_ado() 
-       {       
-               $this->_affectedRows = new VARIANT;
-       }
-
-       function ServerInfo()
-       {
-               if (!empty($this->_connectionID)) $desc = 
$this->_connectionID->provider;
-               return array('description' => $desc, 'version' => '');
-       }
-       
-       function _affectedrows()
-       {
-               if (PHP_VERSION >= 5) return $this->_affectedRows;
-               
-               return $this->_affectedRows->value;
-       }
-       
-       // you can also pass a connection string like this:
-       //
-       // $DB->Connect('USER 
ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-       function _connect($argHostname, $argUsername, $argPassword, 
$argProvider= 'MSDASQL')
-       {
-               try {
-               $u = 'UID';
-               $p = 'PWD';
-       
-               if (!empty($this->charPage))
-                       $dbc = new COM('ADODB.Connection',null,$this->charPage);
-               else
-                       $dbc = new COM('ADODB.Connection');
-                       
-               if (! $dbc) return false;
-
-               /* special support if provider is mssql or access */
-               if ($argProvider=='mssql') {
-                       $u = 'User Id';  //User parameter name for OLEDB
-                       $p = 'Password'; 
-                       $argProvider = "SQLOLEDB"; // SQL Server Provider
-                       
-                       // not yet
-                       //if ($argDatabasename) $argHostname .= ";Initial 
Catalog=$argDatabasename";
-                       
-                       //use trusted conection for SQL if username not 
specified
-                       if (!$argUsername) $argHostname .= 
";Trusted_Connection=Yes";
-               } else if ($argProvider=='access')
-                       $argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft 
Jet Provider
-               
-               if ($argProvider) $dbc->Provider = $argProvider;        
-               
-               if ($argUsername) $argHostname .= ";$u=$argUsername";
-               if ($argPassword)$argHostname .= ";$p=$argPassword";
-               
-               if ($this->debug) ADOConnection::outp( 
"Host=".$argHostname."<BR>\n version=$dbc->version");
-               // @ added below for php 4.0.1 and earlier
-               @$dbc->Open((string) $argHostname);
-               
-               $this->_connectionID = $dbc;
-               
-               $dbc->CursorLocation = $this->_cursor_location;
-               return  $dbc->State > 0;
-               } catch (exception $e) {
-               }
-               
-               return false;
-       }
-       
-       // returns true or false
-       function _pconnect($argHostname, $argUsername, $argPassword, 
$argProvider='MSDASQL')
-       {
-               return 
$this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-       }       
-       
-/*
-       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;
-               
-               address@hidden>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;
-               
-               address@hidden>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) 
-       {
-               try { // In PHP5, all COM errors are exceptions, so to maintain 
old behaviour...
-               
-               $dbc = $this->_connectionID;
-               
-       //      return rs       
-               if ($inputarr) {
-                       
-                       if (!empty($this->charPage))
-                               $oCmd = new 
COM('ADODB.Command',null,$this->charPage);
-                       else
-                               $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, 
$this->_execute_option);
-                       
-               if ($dbc->Errors->Count > 0) return false;
-               if (! $rs) return false;
-               
-               if ($rs->State == 0) return true; // 0 = adStateClosed means no 
records returned
-               return $rs;
-               
-               } catch (exception $e) {
-                       
-               }
-               return false;
-       }
-
-       
-       function BeginTrans() 
-       { 
-               if ($this->transOff) return true;
-               
-               if (isset($this->_thisTransactions))
-                       if (!$this->_thisTransactions) return false;
-               else {
-                       $o = $this->_connectionID->Properties("Transaction 
DDL");
-                       $this->_thisTransactions = $o ? true : false;
-                       if (!$o) return false;
-               }
-               @$this->_connectionID->BeginTrans();
-               $this->transCnt += 1;
-               return true;
-       }
-       function CommitTrans($ok=true) 
-       { 
-               if (!$ok) return $this->RollbackTrans();
-               if ($this->transOff) return true;
-               
-               @$this->_connectionID->CommitTrans();
-               if ($this->transCnt) @$this->transCnt -= 1;
-               return true;
-       }
-       function RollbackTrans() {
-               if ($this->transOff) return true;
-               @$this->_connectionID->RollbackTrans();
-               if ($this->transCnt) @$this->transCnt -= 1;
-               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,$mode=false)
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               $this->fetchMode = $mode;
-               return $this->ADORecordSet($id,$mode);
-       }
-
-
-       // 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;
-               $t = $f->Type;
-               $o->type = $this->MetaType($t);
-               $o->max_length = $f->DefinedSize;
-               $o->ado_type = $t;
-               
-
-               //print "off=$off name=$o->name type=$o->type 
len=$o->max_length<br>";
-               return $o;
-       }
-       
-       /* Use associative array to get fields array */
-       function Fields($colname)
-       {
-               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->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,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               
-               if (!is_numeric($t)) return $t;
-               
-               switch ($t) {
-               case 0:
-               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 or $rs->EOF) {
-                       $this->fields = false;
-                       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++) {
-                       //echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
-                       switch($t) {
-                       case 135: // timestamp
-                               if (!strlen((string)$f->value)) $this->fields[] 
= false;
-                               else {
-                                       if (!is_numeric($f->value)) $val = 
variant_date_to_timestamp($f->value);
-                                       else $val = $f->value;
-                                       $this->fields[] = adodb_date('Y-m-d 
H:i:s',$val);
-                               }
-                               break;                  
-                       case 133:// A date value (yyyymmdd) 
-                               if ($val = $f->value) {
-                                       $this->fields[] = 
substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
-                               } else
-                                       $this->fields[] = false;
-                               break;
-                       case 7: // adDate
-                               if (!strlen((string)$f->value)) $this->fields[] 
= false;
-                               else {
-                                       if (!is_numeric($f->value)) $val = 
variant_date_to_timestamp($f->value);
-                                       else $val = $f->value;
-                                       
-                                       if (($val % 86400) == 0) 
$this->fields[] = adodb_date('Y-m-d',$val);
-                                       else $this->fields[] = 
adodb_date('Y-m-d H:i:s',$val);
-                               }
-                               break;
-                       case 1: // null
-                               $this->fields[] = false;
-                               break;
-                       case 6: // currency is not supported properly;
-                               ADOConnection::outp( '<b>'.$f->Name.': currency 
type not supported by PHP</b>');
-                               $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(ADODB_ASSOC_CASE);
-               }
-               return true;
-       }
-       
-               function NextRecordSet()
-               {
-                       $rs = $this->_queryID;
-                       $this->_queryID = $rs->NextRecordSet();
-                       //$this->_queryID = $this->_QueryId->NextRecordSet();
-                       if ($this->_queryID == null) return false;
-                       
-                       $this->_currentRow = -1;
-                       $this->_currentPage = -1;
-                       $this->bind = false;
-                       $this->fields = false;
-                       $this->_flds = false;
-                       $this->_tarr = false;
-                       
-                       $this->_inited = false;
-                       $this->Init();
-                       return true;
-               }
-
-       function _close() {
-               $this->_flds = false;
-               @$this->_queryID->Close();// by Pete Dishman (address@hidden)
-               $this->_queryID = false;        
-       }
-
-}
-
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+       Microsoft ADO data driver. Requires ADO. Works only on MS Windows. PHP5 
compat version.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+       
+define("_ADODB_ADO_LAYER", 1 );
+/*--------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------*/
+
+       
+class ADODB_ado extends ADOConnection {
+       var $databaseType = "ado";      
+       var $_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;
+       var $_thisTransactions;
+       var $_cursor_type = 3; // 
3=adOpenStatic,0=adOpenForwardOnly,1=adOpenKeyset,2=adOpenDynamic
+       var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
+       var $_lock_type = -1;
+       var $_execute_option = -1;
+       var $poorAffectedRows = true; 
+       var $charPage;
+               
+       function ADODB_ado() 
+       {       
+               $this->_affectedRows = new VARIANT;
+       }
+
+       function ServerInfo()
+       {
+               if (!empty($this->_connectionID)) $desc = 
$this->_connectionID->provider;
+               return array('description' => $desc, 'version' => '');
+       }
+       
+       function _affectedrows()
+       {
+               if (PHP_VERSION >= 5) return $this->_affectedRows;
+               
+               return $this->_affectedRows->value;
+       }
+       
+       // you can also pass a connection string like this:
+       //
+       // $DB->Connect('USER 
ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
+       function _connect($argHostname, $argUsername, $argPassword, 
$argProvider= 'MSDASQL')
+       {
+               try {
+               $u = 'UID';
+               $p = 'PWD';
+       
+               if (!empty($this->charPage))
+                       $dbc = new COM('ADODB.Connection',null,$this->charPage);
+               else
+                       $dbc = new COM('ADODB.Connection');
+                       
+               if (! $dbc) return false;
+
+               /* special support if provider is mssql or access */
+               if ($argProvider=='mssql') {
+                       $u = 'User Id';  //User parameter name for OLEDB
+                       $p = 'Password'; 
+                       $argProvider = "SQLOLEDB"; // SQL Server Provider
+                       
+                       // not yet
+                       //if ($argDatabasename) $argHostname .= ";Initial 
Catalog=$argDatabasename";
+                       
+                       //use trusted conection for SQL if username not 
specified
+                       if (!$argUsername) $argHostname .= 
";Trusted_Connection=Yes";
+               } else if ($argProvider=='access')
+                       $argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft 
Jet Provider
+               
+               if ($argProvider) $dbc->Provider = $argProvider;        
+               
+               if ($argUsername) $argHostname .= ";$u=$argUsername";
+               if ($argPassword)$argHostname .= ";$p=$argPassword";
+               
+               if ($this->debug) ADOConnection::outp( 
"Host=".$argHostname."<BR>\n version=$dbc->version");
+               // @ added below for php 4.0.1 and earlier
+               @$dbc->Open((string) $argHostname);
+               
+               $this->_connectionID = $dbc;
+               
+               $dbc->CursorLocation = $this->_cursor_location;
+               return  $dbc->State > 0;
+               } catch (exception $e) {
+               }
+               
+               return false;
+       }
+       
+       // returns true or false
+       function _pconnect($argHostname, $argUsername, $argPassword, 
$argProvider='MSDASQL')
+       {
+               return 
$this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
+       }       
+       
+/*
+       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;
+               
+               address@hidden>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;
+               
+               address@hidden>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) 
+       {
+               try { // In PHP5, all COM errors are exceptions, so to maintain 
old behaviour...
+               
+               $dbc = $this->_connectionID;
+               
+       //      return rs       
+               if ($inputarr) {
+                       
+                       if (!empty($this->charPage))
+                               $oCmd = new 
COM('ADODB.Command',null,$this->charPage);
+                       else
+                               $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, 
$this->_execute_option);
+                       
+               if ($dbc->Errors->Count > 0) return false;
+               if (! $rs) return false;
+               
+               if ($rs->State == 0) return true; // 0 = adStateClosed means no 
records returned
+               return $rs;
+               
+               } catch (exception $e) {
+                       
+               }
+               return false;
+       }
+
+       
+       function BeginTrans() 
+       { 
+               if ($this->transOff) return true;
+               
+               if (isset($this->_thisTransactions))
+                       if (!$this->_thisTransactions) return false;
+               else {
+                       $o = $this->_connectionID->Properties("Transaction 
DDL");
+                       $this->_thisTransactions = $o ? true : false;
+                       if (!$o) return false;
+               }
+               @$this->_connectionID->BeginTrans();
+               $this->transCnt += 1;
+               return true;
+       }
+       function CommitTrans($ok=true) 
+       { 
+               if (!$ok) return $this->RollbackTrans();
+               if ($this->transOff) return true;
+               
+               @$this->_connectionID->CommitTrans();
+               if ($this->transCnt) @$this->transCnt -= 1;
+               return true;
+       }
+       function RollbackTrans() {
+               if ($this->transOff) return true;
+               @$this->_connectionID->RollbackTrans();
+               if ($this->transCnt) @$this->transCnt -= 1;
+               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,$mode=false)
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               $this->fetchMode = $mode;
+               return $this->ADORecordSet($id,$mode);
+       }
+
+
+       // 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;
+               $t = $f->Type;
+               $o->type = $this->MetaType($t);
+               $o->max_length = $f->DefinedSize;
+               $o->ado_type = $t;
+               
+
+               //print "off=$off name=$o->name type=$o->type 
len=$o->max_length<br>";
+               return $o;
+       }
+       
+       /* Use associative array to get fields array */
+       function Fields($colname)
+       {
+               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->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,$fieldobj=false)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               
+               if (!is_numeric($t)) return $t;
+               
+               switch ($t) {
+               case 0:
+               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 or $rs->EOF) {
+                       $this->fields = false;
+                       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++) {
+                       //echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
+                       switch($t) {
+                       case 135: // timestamp
+                               if (!strlen((string)$f->value)) $this->fields[] 
= false;
+                               else {
+                                       if (!is_numeric($f->value)) # $val = 
variant_date_to_timestamp($f->value);
+                                               // VT_DATE stores dates as 
(float) fractional days since 1899/12/30 00:00:00
+                                               $val= (float) 
variant_cast($f->value,VT_R8)*3600*24-2209161600;
+                                       else 
+                                               $val = $f->value;
+                                       $this->fields[] = adodb_date('Y-m-d 
H:i:s',$val);
+                               }
+                               break;                  
+                       case 133:// A date value (yyyymmdd) 
+                               if ($val = $f->value) {
+                                       $this->fields[] = 
substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
+                               } else
+                                       $this->fields[] = false;
+                               break;
+                       case 7: // adDate
+                               if (!strlen((string)$f->value)) $this->fields[] 
= false;
+                               else {
+                                       if (!is_numeric($f->value)) $val = 
variant_date_to_timestamp($f->value);
+                                       else $val = $f->value;
+                                       
+                                       if (($val % 86400) == 0) 
$this->fields[] = adodb_date('Y-m-d',$val);
+                                       else $this->fields[] = 
adodb_date('Y-m-d H:i:s',$val);
+                               }
+                               break;
+                       case 1: // null
+                               $this->fields[] = false;
+                               break;
+                       case 6: // currency is not supported properly;
+                               ADOConnection::outp( '<b>'.$f->Name.': currency 
type not supported by PHP</b>');
+                               $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(ADODB_ASSOC_CASE);
+               }
+               return true;
+       }
+       
+               function NextRecordSet()
+               {
+                       $rs = $this->_queryID;
+                       $this->_queryID = $rs->NextRecordSet();
+                       //$this->_queryID = $this->_QueryId->NextRecordSet();
+                       if ($this->_queryID == null) return false;
+                       
+                       $this->_currentRow = -1;
+                       $this->_currentPage = -1;
+                       $this->bind = false;
+                       $this->fields = false;
+                       $this->_flds = false;
+                       $this->_tarr = false;
+                       
+                       $this->_inited = false;
+                       $this->Init();
+                       return true;
+               }
+
+       function _close() {
+               $this->_flds = false;
+               @$this->_queryID->Close();// by Pete Dishman (address@hidden)
+               $this->_queryID = false;        
+       }
+
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php:1.2     Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php Tue Feb 21 13:47:42 2006
@@ -1,54 +1,54 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-Released under both BSD license and Lesser GPL library license. 
-Whenever there is any discrepancy between the two licenses, 
-the BSD license will take precedence. See License.txt. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-       Microsoft Access ADO data driver. Requires ADO and ODBC. Works only on 
MS Windows.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ADO_LAYER')) {
-       if (PHP_VERSION >= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
-       else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
-}
-
-class  ADODB_ado_access extends ADODB_ado {    
-       var $databaseType = 'ado_access';
-       var $hasTop = 'top';            // support mssql SELECT TOP 10 * FROM 
TABLE
-       var $fmtDate = "#Y-m-d#";
-       var $fmtTimeStamp = "#Y-m-d h:i:sA#";// note no comma
-       var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
-       var $sysTimeStamp = 'NOW';
-       var $hasTransactions = false;
-       
-       function ADODB_ado_access()
-       {
-               $this->ADODB_ado();
-       }
-       
-       function BeginTrans() { return false;}
-       
-       function CommitTrans() { return false;}
-       
-       function RollbackTrans() { return false;}
-
-}
-
- 
-class  ADORecordSet_ado_access extends ADORecordSet_ado {      
-       
-       var $databaseType = "ado_access";               
-       
-       function ADORecordSet_ado_access($id,$mode=false)
-       {
-               return $this->ADORecordSet_ado($id,$mode);
-       }
-}
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+Released under both BSD license and Lesser GPL library license. 
+Whenever there is any discrepancy between the two licenses, 
+the BSD license will take precedence. See License.txt. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+       Microsoft Access ADO data driver. Requires ADO and ODBC. Works only on 
MS Windows.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('_ADODB_ADO_LAYER')) {
+       if (PHP_VERSION >= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
+       else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
+}
+
+class  ADODB_ado_access extends ADODB_ado {    
+       var $databaseType = 'ado_access';
+       var $hasTop = 'top';            // support mssql SELECT TOP 10 * FROM 
TABLE
+       var $fmtDate = "#Y-m-d#";
+       var $fmtTimeStamp = "#Y-m-d h:i:sA#";// note no comma
+       var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
+       var $sysTimeStamp = 'NOW';
+       var $hasTransactions = false;
+       
+       function ADODB_ado_access()
+       {
+               $this->ADODB_ado();
+       }
+       
+       function BeginTrans() { return false;}
+       
+       function CommitTrans() { return false;}
+       
+       function RollbackTrans() { return false;}
+
+}
+
+ 
+class  ADORecordSet_ado_access extends ADORecordSet_ado {      
+       
+       var $databaseType = "ado_access";               
+       
+       function ADORecordSet_ado_access($id,$mode=false)
+       {
+               return $this->ADORecordSet_ado($id,$mode);
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php:1.2      Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php  Tue Feb 21 13:47:42 2006
@@ -1,98 +1,98 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client. 
-  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.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ADO_LAYER')) {
-       if (PHP_VERSION >= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
-       else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
-}
-
-
-class  ADODB_ado_mssql extends ADODB_ado {        
-       var $databaseType = 'ado_mssql';
-       var $hasTop = 'top';
-       var $hasInsertID = true;
-       var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-       var $sysTimeStamp = 'GetDate()';
-       var $leftOuter = '*=';
-       var $rightOuter = '=*';
-       var $ansiOuter = true; // for mssql7 or later
-       var $substr = "substring";
-       var $length = 'len';
-       
-       //var $_inTransaction = 1; // always open recordsets, so no transaction 
problems.
-       
-       function ADODB_ado_mssql()
-       {
-               $this->ADODB_ado();
-       }
-       
-       function _insertid()
-       {
-               return $this->GetOne('select @@identity');
-       }
-       
-       function _affectedrows()
-       {
-               return $this->GetOne('select @@rowcount');
-       }
-       
-       function MetaColumns($table)
-       {
-        $table = strtoupper($table);
-        $arr= array();
-        $dbc = $this->_connectionID;
-        
-        $osoptions = array();
-        $osoptions[0] = null;
-        $osoptions[1] = null;
-        $osoptions[2] = $table;
-        $osoptions[3] = null;
-        
-        address@hidden>OpenSchema(4, $osoptions);//tables
-
-        if ($adors){
-                while (!$adors->EOF){
-                        $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();
-        }
-        $false = false;
-               return empty($arr) ? $false : $arr;
-       }
-       
-       } // end class 
-       
-       class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        
-       
-       var $databaseType = 'ado_mssql';
-       
-       function ADORecordSet_ado_mssql($id,$mode=false)
-       {
-               return $this->ADORecordSet_ado($id,$mode);
-       }
-}
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client. 
+  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.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('_ADODB_ADO_LAYER')) {
+       if (PHP_VERSION >= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
+       else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
+}
+
+
+class  ADODB_ado_mssql extends ADODB_ado {        
+       var $databaseType = 'ado_mssql';
+       var $hasTop = 'top';
+       var $hasInsertID = true;
+       var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
+       var $sysTimeStamp = 'GetDate()';
+       var $leftOuter = '*=';
+       var $rightOuter = '=*';
+       var $ansiOuter = true; // for mssql7 or later
+       var $substr = "substring";
+       var $length = 'len';
+       
+       //var $_inTransaction = 1; // always open recordsets, so no transaction 
problems.
+       
+       function ADODB_ado_mssql()
+       {
+               $this->ADODB_ado();
+       }
+       
+       function _insertid()
+       {
+               return $this->GetOne('select @@identity');
+       }
+       
+       function _affectedrows()
+       {
+               return $this->GetOne('select @@rowcount');
+       }
+       
+       function MetaColumns($table)
+       {
+        $table = strtoupper($table);
+        $arr= array();
+        $dbc = $this->_connectionID;
+        
+        $osoptions = array();
+        $osoptions[0] = null;
+        $osoptions[1] = null;
+        $osoptions[2] = $table;
+        $osoptions[3] = null;
+        
+        address@hidden>OpenSchema(4, $osoptions);//tables
+
+        if ($adors){
+                while (!$adors->EOF){
+                        $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();
+        }
+        $false = false;
+               return empty($arr) ? $false : $arr;
+       }
+       
+       } // end class 
+       
+       class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        
+       
+       var $databaseType = 'ado_mssql';
+       
+       function ADORecordSet_ado_mssql($id,$mode=false)
+       {
+               return $this->ADORecordSet_ado($id,$mode);
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php:1.2  Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php      Tue Feb 21 
13:47:42 2006
@@ -1,91 +1,91 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Support Borland Interbase 6.5 and later
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
-
-class ADODB_borland_ibase extends ADODB_ibase {
-       var $databaseType = "borland_ibase";    
-       
-       function ADODB_borland_ibase()
-       {
-               $this->ADODB_ibase();
-       }
-       
-       function BeginTrans()
-       {        
-               if ($this->transOff) return true;
-               $this->transCnt += 1;
-               $this->autoCommit = false;
-               $this->_transactionID = ibase_trans($this->ibasetrans, 
$this->_connectionID);
-               return $this->_transactionID;
-       }
-       
-       function ServerInfo()
-       {
-               $arr['dialect'] = $this->dialect;
-               switch($arr['dialect']) {
-               case '': 
-               case '1': $s = 'Interbase 6.5, Dialect 1'; break;
-               case '2': $s = 'Interbase 6.5, Dialect 2'; break;
-               default:
-               case '3': $s = 'Interbase 6.5, Dialect 3'; break;
-               }
-               $arr['version'] = '6.5';
-               $arr['description'] = $s;
-               return $arr;
-       }
-       
-       // Note that Interbase 6.5 uses ROWS instead - don't you love forking 
wars!
-       //              SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
-       //              SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 
-- first 5 skip 2
-       // Firebird uses
-       //              SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE
-       function 
&SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
-       {
-               if ($nrows > 0) {
-                       if ($offset <= 0) $str = " ROWS $nrows "; 
-                       else {
-                               $a = $offset+1;
-                               $b = $offset+$nrows;
-                               $str = " ROWS $a TO $b";
-                       }
-               } else {
-                       // ok, skip 
-                       $a = $offset + 1;
-                       $str = " ROWS $a TO 999999999"; // 999 million
-               }
-               $sql .= $str;
-               
-               return ($secs2cache) ? 
-                               $this->CacheExecute($secs2cache,$sql,$inputarr)
-                       :
-                               $this->Execute($sql,$inputarr);
-       }
-       
-};
- 
-
-class  ADORecordSet_borland_ibase extends ADORecordSet_ibase { 
-       
-       var $databaseType = "borland_ibase";            
-       
-       function ADORecordSet_borland_ibase($id,$mode=false)
-       {
-               $this->ADORecordSet_ibase($id,$mode);
-       }
-}
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Support Borland Interbase 6.5 and later
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
+
+class ADODB_borland_ibase extends ADODB_ibase {
+       var $databaseType = "borland_ibase";    
+       
+       function ADODB_borland_ibase()
+       {
+               $this->ADODB_ibase();
+       }
+       
+       function BeginTrans()
+       {        
+               if ($this->transOff) return true;
+               $this->transCnt += 1;
+               $this->autoCommit = false;
+               $this->_transactionID = ibase_trans($this->ibasetrans, 
$this->_connectionID);
+               return $this->_transactionID;
+       }
+       
+       function ServerInfo()
+       {
+               $arr['dialect'] = $this->dialect;
+               switch($arr['dialect']) {
+               case '': 
+               case '1': $s = 'Interbase 6.5, Dialect 1'; break;
+               case '2': $s = 'Interbase 6.5, Dialect 2'; break;
+               default:
+               case '3': $s = 'Interbase 6.5, Dialect 3'; break;
+               }
+               $arr['version'] = '6.5';
+               $arr['description'] = $s;
+               return $arr;
+       }
+       
+       // Note that Interbase 6.5 uses ROWS instead - don't you love forking 
wars!
+       //              SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
+       //              SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 
-- first 5 skip 2
+       // Firebird uses
+       //              SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE
+       function 
&SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+       {
+               if ($nrows > 0) {
+                       if ($offset <= 0) $str = " ROWS $nrows "; 
+                       else {
+                               $a = $offset+1;
+                               $b = $offset+$nrows;
+                               $str = " ROWS $a TO $b";
+                       }
+               } else {
+                       // ok, skip 
+                       $a = $offset + 1;
+                       $str = " ROWS $a TO 999999999"; // 999 million
+               }
+               $sql .= $str;
+               
+               return ($secs2cache) ? 
+                               $this->CacheExecute($secs2cache,$sql,$inputarr)
+                       :
+                               $this->Execute($sql,$inputarr);
+       }
+       
+};
+ 
+
+class  ADORecordSet_borland_ibase extends ADORecordSet_ibase { 
+       
+       var $databaseType = "borland_ibase";            
+       
+       function ADORecordSet_borland_ibase($id,$mode=false)
+       {
+               $this->ADORecordSet_ibase($id,$mode);
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-csv.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-csv.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-csv.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-csv.inc.php:1.2    Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-csv.inc.php        Tue Feb 21 13:47:42 2006
@@ -1,203 +1,207 @@
-<?php
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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.
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (! defined("_ADODB_CSV_LAYER")) {
- define("_ADODB_CSV_LAYER", 1 );
-
-include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
- 
-class ADODB_csv extends ADOConnection {
-       var $databaseType = 'csv';
-       var $databaseProvider = 'csv';
-       var $hasInsertID = true;
-       var $hasAffectedRows = true;    
-       var $fmtTimeStamp = "'Y-m-d H:i:s'";
-       var $_affectedrows=0;
-       var $_insertid=0;
-       var $_url;
-       var $replaceQuote = "''"; // string to use to replace quotes
-       var $hasTransactions = false;
-       var $_errorNo = false;
-       
-       function ADODB_csv() 
-       {               
-       }
-       
-       function _insertid()
-       {
-                       return $this->_insertid;
-       }
-       
-       function _affectedrows()
-       {
-                       return $this->_affectedrows;
-       }
-  
-       function &MetaDatabases()
-       {
-               return false;
-       }
-
-       
-       // returns true or false
-       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               if (strtolower(substr($argHostname,0,7)) !== 'http://') return 
false;
-               $this->_url = $argHostname;
-               return true;    
-       }
-       
-       // returns true or false
-       function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               if (strtolower(substr($argHostname,0,7)) !== 'http://') return 
false;
-               $this->_url = $argHostname;
-               return true;
-       }
-       
-       function &MetaColumns($table) 
-       {
-               return false;
-       }
-               
-               
-       // parameters use PostgreSQL convention, not MySQL
-       function &SelectLimit($sql,$nrows=-1,$offset=-1)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $url = 
$this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
-                       (($this->fetchMode !== false)?$this->fetchMode : 
$ADODB_FETCH_MODE).
-                       "&offset=$offset";
-               $err = false;
-               $rs = csv2rs($url,$err,false);
-               
-               if ($this->debug) print "$url<br><i>$err</i><br>";
-
-               $at = strpos($err,'::::');
-               if ($at === false) {
-                       $this->_errorMsg = $err;
-                       $this->_errorNo = (integer)$err;
-               } else {
-                       $this->_errorMsg = substr($err,$at+4,1024);
-                       $this->_errorNo = -9999;
-               }
-               if ($this->_errorNo) 
-                       if ($fn = $this->raiseErrorFn) {
-                               
$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,'');
-                       }
-                       
-               if (is_object($rs)) {   
-               
-                       $rs->databaseType='csv';                
-                       $rs->fetchMode = ($this->fetchMode !== false) ?  
$this->fetchMode : $ADODB_FETCH_MODE;
-                       $rs->connection = &$this;
-               }
-               return $rs;
-       }
-       
-       // returns queryID or false
-       function &_Execute($sql,$inputarr=false)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               if (!$this->_bindInputArray && $inputarr) {
-                       $sqlarr = explode('?',$sql);
-                       $sql = '';
-                       $i = 0;
-                       foreach($inputarr as $v) {
-
-                               $sql .= $sqlarr[$i];
-                               if (gettype($v) == 'string')
-                                       $sql .= $this->qstr($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;
-               }
-               
-               $url =  $this->_url.'?sql='.urlencode($sql)."&fetch=".
-                       (($this->fetchMode !== false)?$this->fetchMode : 
$ADODB_FETCH_MODE);
-               $err = false;
-               
-               
-               $rs = csv2rs($url,$err,false);
-               if ($this->debug) print urldecode($url)."<br><i>$err</i><br>";
-               $at = strpos($err,'::::');
-               if ($at === false) {            
-                       $this->_errorMsg = $err;
-                       $this->_errorNo = (integer)$err;
-               } else {
-                       $this->_errorMsg = substr($err,$at+4,1024);
-                       $this->_errorNo = -9999;
-               }
-               
-               if ($this->_errorNo) 
-                       if ($fn = $this->raiseErrorFn) {
-                               
$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr);
-                       }
-               if (is_object($rs)) {
-                       $rs->fetchMode = ($this->fetchMode !== false) ?  
$this->fetchMode : $ADODB_FETCH_MODE;
-                       
-                       $this->_affectedrows = $rs->affectedrows;
-                       $this->_insertid = $rs->insertid;
-                       $rs->databaseType='csv';
-                       $rs->connection = &$this;
-               }
-               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,$mode=false)
-       {
-               $this->ADORecordset($id,$mode);
-       }
-       
-       function _close()
-       {
-               return true;
-       }
-}
-
-} // define
-       
+<?php
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 4.
+  
+  Currently unsupported: MetaDatabases, MetaTables and MetaColumns, and also 
inputarr in Execute.
+  Native types have been converted to MetaTypes.
+  Transactions not supported yet.
+  
+  Limitation of url length. For IIS, see MaxClientRequestBuffer registry value.
+  
+         http://support.microsoft.com/default.aspx?scid=kb;en-us;260694
+*/ 
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (! defined("_ADODB_CSV_LAYER")) {
+ define("_ADODB_CSV_LAYER", 1 );
+
+include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+ 
+class ADODB_csv extends ADOConnection {
+       var $databaseType = 'csv';
+       var $databaseProvider = 'csv';
+       var $hasInsertID = true;
+       var $hasAffectedRows = true;    
+       var $fmtTimeStamp = "'Y-m-d H:i:s'";
+       var $_affectedrows=0;
+       var $_insertid=0;
+       var $_url;
+       var $replaceQuote = "''"; // string to use to replace quotes
+       var $hasTransactions = false;
+       var $_errorNo = false;
+       
+       function ADODB_csv() 
+       {               
+       }
+       
+       function _insertid()
+       {
+                       return $this->_insertid;
+       }
+       
+       function _affectedrows()
+       {
+                       return $this->_affectedrows;
+       }
+  
+       function &MetaDatabases()
+       {
+               return false;
+       }
+
+       
+       // returns true or false
+       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               if (strtolower(substr($argHostname,0,7)) !== 'http://') return 
false;
+               $this->_url = $argHostname;
+               return true;    
+       }
+       
+       // returns true or false
+       function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               if (strtolower(substr($argHostname,0,7)) !== 'http://') return 
false;
+               $this->_url = $argHostname;
+               return true;
+       }
+       
+       function &MetaColumns($table) 
+       {
+               return false;
+       }
+               
+               
+       // parameters use PostgreSQL convention, not MySQL
+       function &SelectLimit($sql,$nrows=-1,$offset=-1)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $url = 
$this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
+                       (($this->fetchMode !== false)?$this->fetchMode : 
$ADODB_FETCH_MODE).
+                       "&offset=$offset";
+               $err = false;
+               $rs = csv2rs($url,$err,false);
+               
+               if ($this->debug) print "$url<br><i>$err</i><br>";
+
+               $at = strpos($err,'::::');
+               if ($at === false) {
+                       $this->_errorMsg = $err;
+                       $this->_errorNo = (integer)$err;
+               } else {
+                       $this->_errorMsg = substr($err,$at+4,1024);
+                       $this->_errorNo = -9999;
+               }
+               if ($this->_errorNo) 
+                       if ($fn = $this->raiseErrorFn) {
+                               
$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,'');
+                       }
+                       
+               if (is_object($rs)) {   
+               
+                       $rs->databaseType='csv';                
+                       $rs->fetchMode = ($this->fetchMode !== false) ?  
$this->fetchMode : $ADODB_FETCH_MODE;
+                       $rs->connection = &$this;
+               }
+               return $rs;
+       }
+       
+       // returns queryID or false
+       function &_Execute($sql,$inputarr=false)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               if (!$this->_bindInputArray && $inputarr) {
+                       $sqlarr = explode('?',$sql);
+                       $sql = '';
+                       $i = 0;
+                       foreach($inputarr as $v) {
+
+                               $sql .= $sqlarr[$i];
+                               if (gettype($v) == 'string')
+                                       $sql .= $this->qstr($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;
+               }
+               
+               $url =  $this->_url.'?sql='.urlencode($sql)."&fetch=".
+                       (($this->fetchMode !== false)?$this->fetchMode : 
$ADODB_FETCH_MODE);
+               $err = false;
+               
+               
+               $rs = csv2rs($url,$err,false);
+               if ($this->debug) print urldecode($url)."<br><i>$err</i><br>";
+               $at = strpos($err,'::::');
+               if ($at === false) {            
+                       $this->_errorMsg = $err;
+                       $this->_errorNo = (integer)$err;
+               } else {
+                       $this->_errorMsg = substr($err,$at+4,1024);
+                       $this->_errorNo = -9999;
+               }
+               
+               if ($this->_errorNo) 
+                       if ($fn = $this->raiseErrorFn) {
+                               
$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr);
+                       }
+               if (is_object($rs)) {
+                       $rs->fetchMode = ($this->fetchMode !== false) ?  
$this->fetchMode : $ADODB_FETCH_MODE;
+                       
+                       $this->_affectedrows = $rs->affectedrows;
+                       $this->_insertid = $rs->insertid;
+                       $rs->databaseType='csv';
+                       $rs->connection = &$this;
+               }
+               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,$mode=false)
+       {
+               $this->ADORecordset($id,$mode);
+       }
+       
+       function _close()
+       {
+               return true;
+       }
+}
+
+} // define
+       
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-db2.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-db2.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-db2.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-db2.inc.php:1.2    Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-db2.inc.php        Tue Feb 21 13:47:42 2006
@@ -1,323 +1,687 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  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 [above] was related to using a 3rd party
-odbc driver.
-
-Setting SQL_CUR_USE_ODBC
-========================
-To set SQL_CUR_USE_ODBC for drivers that require it, do this:
-
-$db = NewADOConnection('db2');
-$db->curMode = SQL_CUR_USE_ODBC;
-$db->Connect($dsn, $userid, $pwd);
-
-
-
-USING CLI INTERFACE
-===================
-
-I have had reports that the $host and $database params have to be reversed in 
-Connect() when using the CLI interface. From Halmai Csongor 
csongor.halmai#nexum.hu:
-
-> The symptom is that if I change the database engine from postgres or any 
other to DB2 then the following
-> connection command becomes wrong despite being described this version to be 
correct in the docs. 
->
-> $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, 
$DATABASE_AUTH_PASSWORD, $DATABASE_NAME )
->
-> In case of DB2 I had to swap the first and last arguments in order to 
connect properly. 
-
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-       include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-if (!defined('ADODB_DB2')){
-define('ADODB_DB2',1);
-
-class ADODB_DB2 extends ADODB_odbc {
-       var $databaseType = "db2";      
-       var $concat_operator = '||';
-       var $sysDate = 'CURRENT_DATE';
-       var $sysTimeStamp = 'CURRENT TIMESTAMP';
-       // The complete string representation of a timestamp has the form 
-       // yyyy-mm-dd-hh.mm.ss.nnnnnn.
-       var $fmtTimeStamp = "'Y-m-d-H.i.s'";
-       var $ansiOuter = true;
-       var $identitySQL = 'values IDENTITY_VAL_LOCAL()';
-       var $_bindInputArray = true;
-        var $hasInsertID = true;
-       
-       function ADODB_DB2()
-       {
-               if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = 
SQL_CUR_USE_ODBC;
-               $this->ADODB_odbc();
-       }
-       
-       function IfNull( $field, $ifNull ) 
-       {
-               return " COALESCE($field, $ifNull) "; // if DB2 UDB
-       }
-       
-       function ServerInfo()
-       {
-               //odbc_setoption($this->_connectionID,1,101 
/*SQL_ATTR_ACCESS_MODE*/, 1 /*SQL_MODE_READ_ONLY*/);
-               $vers = $this->GetOne('select versionnumber from 
sysibm.sysversions');
-               //odbc_setoption($this->_connectionID,1,101, 0 
/*SQL_MODE_READ_WRITE*/);
-               return array('description'=>'DB2 ODBC driver', 
'version'=>$vers);
-       }
-       
-       function _insertid()
-       {
-               return $this->GetOne($this->identitySQL);
-       }
-       
-       function RowLock($tables,$where)
-       {
-               if ($this->_autocommit) $this->BeginTrans();
-               return $this->GetOne("select 1 as ignore from $tables where 
$where for update");
-       }
-       
-       function &MetaTables($ttype=false,$showSchema=false, $qtable="%", 
$qschema="%")
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $qid = odbc_tables($this->_connectionID, "", $qschema, $qtable, 
"");
-               
-               $rs = new ADORecordSet_odbc($qid);
-               
-               $ADODB_FETCH_MODE = $savem;
-               if (!$rs) {
-                       $false = false;
-                       return $false;
-               }
-               $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
-               
-               $arr =& $rs->GetArray();
-               //print_r($arr);
-               
-               $rs->Close();
-               $arr2 = array();
-               
-               if ($ttype) {
-                       $isview = strncmp($ttype,'V',1) === 0;
-               }
-               for ($i=0; $i < sizeof($arr); $i++) {
-               
-                       if (!$arr[$i][2]) continue;
-                       if (strncmp($arr[$i][1],'SYS',3) === 0) continue;
-                       
-                       $type = $arr[$i][3];
-                       
-                       if ($showSchema) $arr[$i][2] = 
$arr[$i][1].'.'.$arr[$i][2];
-                       
-                       if ($ttype) { 
-                               if ($isview) {
-                                       if (strncmp($type,'V',1) === 0) $arr2[] 
= $arr[$i][2];
-                               } else if (strncmp($type,'T',1) === 0) $arr2[] 
= $arr[$i][2];
-                       } else if (strncmp($type,'S',1) !== 0) $arr2[] = 
$arr[$i][2];
-               }
-               return $arr2;
-       }
-       
-       
-       // Format date column in sql string given an input format that 
understands Y M D
-       function SQLDate($fmt, $col=false)
-       {       
-       // use right() and replace() ?
-               if (!$col) $col = $this->sysDate;
-               $s = '';
-               
-               $len = strlen($fmt);
-               for ($i=0; $i < $len; $i++) {
-                       if ($s) $s .= '||';
-                       $ch = $fmt[$i];
-                       switch($ch) {
-                       case 'Y':
-                       case 'y':
-                               $s .= "char(year($col))";
-                               break;
-                       case 'M':
-                               $s .= "substr(monthname($col),1,3)";
-                               break;
-                       case 'm':
-                               $s .= "right(digits(month($col)),2)";
-                               break;
-                       case 'D':
-                       case 'd':
-                               $s .= "right(digits(day($col)),2)";
-                               break;
-                       case 'H':
-                       case 'h':
-                               if ($col != $this->sysDate) $s .= 
"right(digits(hour($col)),2)";        
-                               else $s .= "''";
-                               break;
-                       case 'i':
-                       case 'I':
-                               if ($col != $this->sysDate)
-                                       $s .= "right(digits(minute($col)),2)";
-                                       else $s .= "''";
-                               break;
-                       case 'S':
-                       case 's':
-                               if ($col != $this->sysDate)
-                                       $s .= "right(digits(second($col)),2)";
-                               else $s .= "''";
-                               break;
-                       default:
-                               if ($ch == '\\') {
-                                       $i++;
-                                       $ch = substr($fmt,$i,1);
-                               }
-                               $s .= $this->qstr($ch);
-                       }
-               }
-               return $s;
-       } 
- 
-       
-       function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
-       {
-               if ($offset <= 0) {
-               // could also use " OPTIMIZE FOR $nrows ROWS "
-                       if ($nrows >= 0) $sql .=  " FETCH FIRST $nrows ROWS 
ONLY ";
-                       $rs =& $this->Execute($sql,$inputArr);
-               } else {
-                       if ($offset > 0 && $nrows < 0);
-                       else {
-                               $nrows += $offset;
-                               $sql .=  " FETCH FIRST $nrows ROWS ONLY ";
-                       }
-                       $rs =& 
ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
-               }
-               
-               return $rs;
-       }
-       
-};
- 
-
-class  ADORecordSet_db2 extends ADORecordSet_odbc {    
-       
-       var $databaseType = "db2";              
-       
-       function ADORecordSet_db2($id,$mode=false)
-       {
-               $this->ADORecordSet_odbc($id,$mode);
-       }
-
-       function MetaType($t,$len=-1,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               
-               switch (strtoupper($t)) {
-               case 'VARCHAR':
-               case 'CHAR':
-               case 'CHARACTER':
-               case 'C':
-                       if ($len <= $this->blobSize) return 'C';
-               
-               case 'LONGCHAR':
-               case 'TEXT':
-               case 'CLOB':
-               case 'DBCLOB': // double-byte
-               case 'X':
-                       return 'X';
-               
-               case 'BLOB':
-               case 'GRAPHIC':
-               case 'VARGRAPHIC':
-                       return 'B';
-                       
-               case 'DATE':
-               case 'D':
-                       return 'D';
-               
-               case 'TIME':
-               case 'TIMESTAMP':
-               case 'T':
-                       return 'T';
-               
-               //case 'BOOLEAN': 
-               //case 'BIT':
-               //      return 'L';
-                       
-               //case 'COUNTER':
-               //      return 'R';
-                       
-               case 'INT':
-               case 'INTEGER':
-               case 'BIGINT':
-               case 'SMALLINT':
-               case 'I':
-                       return 'I';
-                       
-               default: return 'N';
-               }
-       }
-}
-
-} //define
+<?php
+/* 
+  V4.72 21 Feb 2006  (c) 2006 John Lim (address@hidden). All rights reserved.
+
+This is a version of the ADODB driver for DB2.  It uses the 'ibm_db2' PECL 
extension for PHP
+  (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2.
+
+  Tested with PHP 5.1.1 and Apache 2.0.55 on Windows XP SP2.
+
+  This file was ported from "adodb-odbc.inc.php" by Larry Menard, 
"address@hidden".
+  I ripped out what I believed to be a lot of redundant or obsolete code, but 
there are
+  probably still some remnants of the ODBC support in this file; I'm relying 
on reviewers
+  of this code to point out any other things that can be removed.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+  define("_ADODB_DB2_LAYER", 2 );
+        
+/*--------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------*/
+
+
+class ADODB_db2 extends ADOConnection {
+       var $databaseType = "db2";      
+       var $fmtDate = "'Y-m-d'";
+       var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
+       var $replaceQuote = "''"; // string to use to replace quotes
+       var $dataProvider = "db2";
+       var $hasAffectedRows = true;
+
+       var $binmode = DB2_BINARY;
+
+       var $useFetchArray = false; // setting this to true will make array 
elements in FETCH_ASSOC mode case-sensitive
+                                                               // breaking 
backward-compat
+       var $_bindInputArray = false;   
+       var $_genSeqSQL = "create table %s (id integer)";
+       var $_autocommit = true;
+       var $_haserrorfunctions = true;
+       var $_lastAffectedRows = 0;
+       var $uCaseTables = true; // for meta* functions, uppercase table names
+       
+       function ADODB_db2() 
+       {       
+               $this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
+       }
+       
+               // returns true or false
+       function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+       {
+               global $php_errormsg;
+               
+               if (!function_exists('db2_connect')) {
+                       ADOConnection::outp("Warning: The old ODBC based DB2 
driver has been renamed 'odbc_db2'. This ADOdb driver calls PHP's native db2 
extension.");
+                       return null;
+               }
+               // This needs to be set before the connect().
+               // Replaces the odbc_binmode() call that was in Execute()
+               ini_set('ibm_db2.binmode', $this->binmode);
+
+               if ($argDatabasename) {
+                       $this->_connectionID = 
db2_connect($argDatabasename,$argUsername,$argPassword);
+               } else {
+                       $this->_connectionID = 
db2_connect($argDSN,$argUsername,$argPassword);
+               }
+               if (isset($php_errormsg)) $php_errormsg = '';
+
+               // For db2_connect(), there is an optional 4th arg.  If 
present, it must be
+               // an array of valid options.  So far, we don't use them.
+
+               $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+               if (isset($this->connectStmt)) 
$this->Execute($this->connectStmt);
+               
+               return $this->_connectionID != false;
+       }
+       
+       // returns true or false
+       function _pconnect($argDSN, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               global $php_errormsg;
+       
+               if (!function_exists('db2_connect')) return null;
+               
+               // This needs to be set before the connect().
+               // Replaces the odbc_binmode() call that was in Execute()
+               ini_set('ibm_db2.binmode', $this->binmode);
+
+               if (isset($php_errormsg)) $php_errormsg = '';
+               $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+               
+               if ($argDatabasename) {
+                       $this->_connectionID = 
db2_pconnect($argDatabasename,$argUsername,$argPassword);
+               } else {
+                       $this->_connectionID = 
db2_pconnect($argDSN,$argUsername,$argPassword);
+               }
+               if (isset($php_errormsg)) $php_errormsg = '';
+
+               $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+               if ($this->_connectionID && $this->autoRollback) 
@db2_rollback($this->_connectionID);
+               if (isset($this->connectStmt)) 
$this->Execute($this->connectStmt);
+               
+               return $this->_connectionID != false;
+       }
+
+       
+       function ServerInfo()
+       {
+       
+               if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
+                       $dsn = strtoupper($this->host);
+                       $first = true;
+                       $found = false;
+                       
+                       if (!function_exists('db2_data_source')) return false;
+                       
+                       while(true) {
+                               
+                               $rez = @db2_data_source($this->_connectionID,
+                                       $first ? SQL_FETCH_FIRST : 
SQL_FETCH_NEXT);
+                               $first = false;
+                               if (!is_array($rez)) break;
+                               if (strtoupper($rez['server']) == $dsn) {
+                                       $found = true;
+                                       break;
+                               }
+                       } 
+                       if (!$found) return ADOConnection::ServerInfo();
+                       if (!isset($rez['version'])) $rez['version'] = '';
+                       return $rez;
+               } else {
+                       return ADOConnection::ServerInfo();
+               }
+       }
+
+       
+       function CreateSequence($seqname='adodbseq',$start=1)
+       {
+               if (empty($this->_genSeqSQL)) return false;
+               $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+               if (!$ok) return false;
+               $start -= 1;
+               return $this->Execute("insert into $seqname values($start)");
+       }
+       
+       var $_dropSeqSQL = 'drop table %s';
+       function DropSequence($seqname)
+       {
+               if (empty($this->_dropSeqSQL)) return false;
+               return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+       }
+       
+       /*
+               This algorithm is not very efficient, but works even if table 
locking
+               is not available.
+               
+               Will return false if unable to generate an ID after $MAXLOOPS 
attempts.
+       */
+       function GenID($seq='adodbseq',$start=1)
+       {       
+               // if you have to modify the parameter below, your database is 
overloaded,
+               // or you need to implement generation of id's yourself!
+               $MAXLOOPS = 100;
+               while (--$MAXLOOPS>=0) {
+                       $num = $this->GetOne("select id from $seq");
+                       if ($num === false) {
+                               $this->Execute(sprintf($this->_genSeqSQL 
,$seq));       
+                               $start -= 1;
+                               $num = '0';
+                               $ok = $this->Execute("insert into $seq 
values($start)");
+                               if (!$ok) return false;
+                       } 
+                       $this->Execute("update $seq set id=id+1 where id=$num");
+                       
+                       if ($this->affected_rows() > 0) {
+                               $num += 1;
+                               $this->genID = $num;
+                               return $num;
+                       }
+               }
+               if ($fn = $this->raiseErrorFn) {
+                       $fn($this->databaseType,'GENID',-32000,"Unable to 
generate unique id after $MAXLOOPS attempts",$seq,$num);
+               }
+               return false;
+       }
+
+
+       function ErrorMsg()
+       {
+               if ($this->_haserrorfunctions) {
+                       if ($this->_errorMsg !== false) return $this->_errorMsg;
+                       if (empty($this->_connectionID)) return @db2_errormsg();
+                       return @db2_errormsg($this->_connectionID);
+               } else return ADOConnection::ErrorMsg();
+       }
+       
+       function ErrorNo()
+       {
+               
+               if ($this->_haserrorfunctions) {
+                       if ($this->_errorCode !== false) {
+                               // bug in 4.0.6, error number can be corrupted 
string (should be 6 digits)
+                               return (strlen($this->_errorCode)<=2) ? 0 : 
$this->_errorCode;
+                       }
+
+                       if (empty($this->_connectionID)) $e = @db2_error(); 
+                       else $e = @db2_error($this->_connectionID);
+                       
+                        // bug in 4.0.6, error number can be corrupted string 
(should be 6 digits)
+                        // so we check and patch
+                       if (strlen($e)<=2) return 0;
+                       return $e;
+               } else return ADOConnection::ErrorNo();
+       }
+       
+       
+
+       function BeginTrans()
+       {       
+               if (!$this->hasTransactions) return false;
+               if ($this->transOff) return true; 
+               $this->transCnt += 1;
+               $this->_autocommit = false;
+               return db2_autocommit($this->_connectionID,false);
+       }
+       
+       function CommitTrans($ok=true) 
+       { 
+               if ($this->transOff) return true; 
+               if (!$ok) return $this->RollbackTrans();
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->_autocommit = true;
+               $ret = db2_commit($this->_connectionID);
+               db2_autocommit($this->_connectionID,true);
+               return $ret;
+       }
+       
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true; 
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->_autocommit = true;
+               $ret = db2_rollback($this->_connectionID);
+               db2_autocommit($this->_connectionID,true);
+               return $ret;
+       }
+       
+       function MetaPrimaryKeys($table)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               if ($this->uCaseTables) $table = strtoupper($table);
+               $schema = '';
+               $this->_findschema($table,$schema);
+
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $qid = @db2_primarykeys($this->_connectionID,'',$schema,$table);
+               
+               if (!$qid) {
+                       $ADODB_FETCH_MODE = $savem;
+                       return false;
+               }
+               $rs = new ADORecordSet_db2($qid);
+               $ADODB_FETCH_MODE = $savem;
+               
+               if (!$rs) return false;
+               
+               $arr =& $rs->GetArray();
+               $rs->Close();
+               $arr2 = array();
+               for ($i=0; $i < sizeof($arr); $i++) {
+                       if ($arr[$i][3]) $arr2[] = $arr[$i][3];
+               }
+               return $arr2;
+       }
+       
+       
+       
+       function &MetaTables($ttype=false)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $qid = db2_tables($this->_connectionID);
+               
+               $rs = new ADORecordSet_db2($qid);
+               
+               $ADODB_FETCH_MODE = $savem;
+               if (!$rs) {
+                       $false = false;
+                       return $false;
+               }
+               
+               $arr =& $rs->GetArray();
+               
+               $rs->Close();
+               $arr2 = array();
+               
+               if ($ttype) {
+                       $isview = strncmp($ttype,'V',1) === 0;
+               }
+               for ($i=0; $i < sizeof($arr); $i++) {
+                       if (!$arr[$i][2]) continue;
+                       $type = $arr[$i][3];
+                       if ($ttype) { 
+                               if ($isview) {
+                                       if (strncmp($type,'V',1) === 0) $arr2[] 
= $arr[$i][2];
+                               } else if (strncmp($type,'SYS',3) !== 0) 
$arr2[] = $arr[$i][2];
+                       } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = 
$arr[$i][2];
+               }
+               return $arr2;
+       }
+       
+/*
+See 
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_data_type_changes.asp
+/ SQL data type codes /
+#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 (DB2VER >= 0x0300)
+#define SQL_DATETIME           9
+#endif
+#define SQL_VARCHAR            12
+
+
+/ One-parameter shortcuts for date/time data types /
+#if (DB2VER >= 0x0300)
+#define SQL_TYPE_DATE    91
+#define SQL_TYPE_TIME    92
+#define SQL_TYPE_TIMESTAMP 93
+
+#define SQL_UNICODE                             (-95)
+#define SQL_UNICODE_VARCHAR                     (-96)
+#define SQL_UNICODE_LONGVARCHAR                 (-97)
+*/
+       function DB2Types($t)
+       {
+               switch ((integer)$t) {
+               case 1: 
+               case 12:
+               case 0:
+               case -95:
+               case -96:
+                       return 'C';
+               case -97:
+               case -1: //text
+                       return 'X';
+               case -4: //image
+                       return 'B';
+                               
+               case 9: 
+               case 91:
+                       return 'D';
+               
+               case 10:
+               case 11:
+               case 92:
+               case 93:
+                       return 'T';
+                       
+               case 4:
+               case 5:
+               case -6:
+                       return 'I';
+                       
+               case -11: // uniqidentifier
+                       return 'R';
+               case -7: //bit
+                       return 'L';
+               
+               default:
+                       return 'N';
+               }
+       }
+       
+       function &MetaColumns($table)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $false = false;
+               if ($this->uCaseTables) $table = strtoupper($table);
+               $schema = '';
+               $this->_findschema($table,$schema);
+               
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       
+               $colname = "%";
+               $qid = db2_columns($this->_connectionID, "", $schema, $table, 
$colname);
+               if (empty($qid)) return $false;
+               
+               $rs =& new ADORecordSet_db2($qid);
+               $ADODB_FETCH_MODE = $savem;
+               
+               if (!$rs) return $false;
+               $rs->_fetch();
+               
+               $retarr = array();
+               
+               /*
+               $rs->fields indices
+               0 TABLE_QUALIFIER
+               1 TABLE_SCHEM
+               2 TABLE_NAME
+               3 COLUMN_NAME
+               4 DATA_TYPE
+               5 TYPE_NAME
+               6 PRECISION
+               7 LENGTH
+               8 SCALE
+               9 RADIX
+               10 NULLABLE
+               11 REMARKS
+               */
+               while (!$rs->EOF) {
+                       if (strtoupper(trim($rs->fields[2])) == $table && 
(!$schema || strtoupper($rs->fields[1]) == $schema)) {
+                               $fld = new ADOFieldObject();
+                               $fld->name = $rs->fields[3];
+                               $fld->type = $this->DB2Types($rs->fields[4]);
+                               
+                               // ref: 
http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
+                               // access uses precision to store length for 
char/varchar
+                               if ($fld->type == 'C' or $fld->type == 'X') {
+                                       if ($rs->fields[4] <= -95) // UNICODE
+                                               $fld->max_length = 
$rs->fields[7]/2;
+                                       else
+                                               $fld->max_length = 
$rs->fields[7];
+                               } else 
+                                       $fld->max_length = $rs->fields[7];
+                               $fld->not_null = !empty($rs->fields[10]);
+                               $fld->scale = $rs->fields[8];
+                               $retarr[strtoupper($fld->name)] = $fld; 
+                       } else if (sizeof($retarr)>0)
+                               break;
+                       $rs->MoveNext();
+               }
+               $rs->Close(); //-- crashes 4.03pl1 -- why?
+               
+               if (empty($retarr)) $retarr = false;
+               return $retarr;
+       }
+       
+       function Prepare($sql)
+       {
+               if (! $this->_bindInputArray) return $sql; // no binding
+               $stmt = db2_prepare($this->_connectionID,$sql);
+               if (!$stmt) {
+                       // we don't know whether db2 driver is parsing prepared 
stmts, so just return sql
+                       return $sql;
+               }
+               return array($sql,$stmt,false);
+       }
+
+       /* returns queryID or false */
+       function _query($sql,$inputarr=false) 
+       {
+       GLOBAL $php_errormsg;
+               if (isset($php_errormsg)) $php_errormsg = '';
+               $this->_error = '';
+               
+               if ($inputarr) {
+                       if (is_array($sql)) {
+                               $stmtid = $sql[1];
+                       } else {
+                               $stmtid = 
db2_prepare($this->_connectionID,$sql);
+       
+                               if ($stmtid == false) {
+                                       $this->_errorMsg = isset($php_errormsg) 
? $php_errormsg : '';
+                                       return false;
+                               }
+                       }
+                       
+                       if (! db2_execute($stmtid,$inputarr)) {
+                               if ($this->_haserrorfunctions) {
+                                       $this->_errorMsg = db2_errormsg();
+                                       $this->_errorCode = db2_error();
+                               }
+                               return false;
+                       }
+               
+               } else if (is_array($sql)) {
+                       $stmtid = $sql[1];
+                       if (!db2_execute($stmtid)) {
+                               if ($this->_haserrorfunctions) {
+                                       $this->_errorMsg = db2_errormsg();
+                                       $this->_errorCode = db2_error();
+                               }
+                               return false;
+                       }
+               } else
+                       $stmtid = db2_exec($this->_connectionID,$sql);
+               
+               $this->_lastAffectedRows = 0;
+               if ($stmtid) {
+                       if (@db2_num_fields($stmtid) == 0) {
+                               $this->_lastAffectedRows = 
db2_num_rows($stmtid);
+                               $stmtid = true;
+                       } else {
+                               $this->_lastAffectedRows = 0;
+                       }
+                       
+                       if ($this->_haserrorfunctions) {
+                               $this->_errorMsg = '';
+                               $this->_errorCode = 0;
+                       } else
+                               $this->_errorMsg = isset($php_errormsg) ? 
$php_errormsg : '';
+               } else {
+                       if ($this->_haserrorfunctions) {
+                               $this->_errorMsg = db2_stmt_errormsg();
+                               $this->_errorCode = db2_stmt_error();
+                       } else
+                               $this->_errorMsg = isset($php_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()
+       {
+               $ret = @db2_close($this->_connectionID);
+               $this->_connectionID = false;
+               return $ret;
+       }
+
+       function _affectedrows()
+       {
+               return $this->_lastAffectedRows;
+       }
+       
+}
+       
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_db2 extends ADORecordSet {  
+       
+       var $bind = false;
+       var $databaseType = "db2";              
+       var $dataProvider = "db2";
+       var $useFetchArray;
+       
+       function ADORecordSet_db2($id,$mode=false)
+       {
+               if ($mode === false) {  
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               $this->fetchMode = $mode;
+               
+               $this->_queryID = $id;
+       }
+
+
+       // returns the field object
+       function &FetchField($fieldOffset = -1) 
+       {
+               
+               $off=$fieldOffset+1; // offsets begin at 1
+               
+               $o= new ADOFieldObject();
+               $o->name = @db2_field_name($this->_queryID,$off);
+               $o->type = @db2_field_type($this->_queryID,$off);
+               $o->max_length = db2_field_width($this->_queryID,$off);
+               if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+               else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+               return $o;
+       }
+       
+       /* Use associative array to get fields array */
+       function Fields($colname)
+       {
+               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->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()
+       {
+       global $ADODB_COUNTRECS;
+               $this->_numOfRows = ($ADODB_COUNTRECS) ? 
@db2_num_rows($this->_queryID) : -1;
+               $this->_numOfFields = @db2_num_fields($this->_queryID);
+               // some silly drivers such as db2 as/400 and intersystems cache 
return _numOfRows = 0
+               if ($this->_numOfRows == 0) $this->_numOfRows = -1;
+       }       
+       
+       function _seek($row)
+       {
+               return false;
+       }
+       
+       // speed up SelectLimit() by switching to ADODB_FETCH_NUM as 
ADODB_FETCH_ASSOC is emulated
+       function &GetArrayLimit($nrows,$offset=-1) 
+       {
+               if ($offset <= 0) {
+                       $rs =& $this->GetArray($nrows);
+                       return $rs;
+               }
+               $savem = $this->fetchMode;
+               $this->fetchMode = ADODB_FETCH_NUM;
+               $this->Move($offset);
+               $this->fetchMode = $savem;
+               
+               if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+                       $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+               }
+               
+               $results = array();
+               $cnt = 0;
+               while (!$this->EOF && $nrows != $cnt) {
+                       $results[$cnt++] = $this->fields;
+                       $this->MoveNext();
+               }
+               
+               return $results;
+       }
+       
+       
+       function MoveNext() 
+       {
+               if ($this->_numOfRows != 0 && !$this->EOF) {            
+                       $this->_currentRow++;
+                       
+                       $this->fields = @db2_fetch_array($this->_queryID);
+                       if ($this->fields) {
+                               if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+                                       $this->fields =& 
$this->GetRowAssoc(ADODB_ASSOC_CASE);
+                               }
+                               return true;
+                       }
+               }
+               $this->fields = false;
+               $this->EOF = true;
+               return false;
+       }       
+       
+       function _fetch()
+       {
+
+               $this->fields = db2_fetch_array($this->_queryID);
+               if ($this->fields) {
+                       if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+                               $this->fields =& 
$this->GetRowAssoc(ADODB_ASSOC_CASE);
+                       }
+                       return true;
+               }
+               $this->fields = false;
+               return false;
+       }
+       
+       function _close() 
+       {
+               return @db2_free_result($this->_queryID);               
+       }
+
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php:1.2  Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php      Tue Feb 21 13:47:42 2006
@@ -1,265 +1,266 @@
-<?php
-/*
- @version V4.54 5 Nov 2004 (c) 2000-2004 John Lim (address@hidden). 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 <address@hidden>. 
-  Set tabs to 8.
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-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;
-
-               $s = implode(',',$arr);
-               if (sizeof($arr) > 0) return "CONCAT($s)";
-               else return '';
-       }
-       
-       // returns true or false
-       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               $this->_connectionID = 
fbsql_connect($argHostname,$argUsername,$argPassword);
-               if ($this->_connectionID === false) return false;
-               if ($argDatabasename) return $this->SelectDB($argDatabasename);
-               return true;    
-       }
-       
-       // 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,$mode=false) 
-       {
-               if (!$mode) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch ($mode) {
-               case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
-               default:
-               case ADODB_FETCH_BOTH: $this->fetchMode = FBSQL_BOTH; break;
-               case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
-               }
-               return $this->ADORecordSet($queryID);
-       }
-       
-       function _initrs()
-       {
-       GLOBAL $ADODB_COUNTRECS;
-               $this->_numOfRows = ($ADODB_COUNTRECS) ? 
@fbsql_num_rows($this->_queryID):-1;
-               $this->_numOfFields = @fbsql_num_fields($this->_queryID);
-       }
-       
-
-
-       function &FetchField($fieldOffset = -1) {
-               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,$this->fetchMode);
-               return ($this->fields == true);
-       }
-       
-       function _close() {
-               return @fbsql_free_result($this->_queryID);             
-       }
-       
-       function MetaType($t,$len=-1,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               $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
+<?php
+/*
+ @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). 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 <address@hidden>. 
+  Set tabs to 8.
+*/ 
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+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;
+
+               $s = implode(',',$arr);
+               if (sizeof($arr) > 0) return "CONCAT($s)";
+               else return '';
+       }
+       
+       // returns true or false
+       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               $this->_connectionID = 
fbsql_connect($argHostname,$argUsername,$argPassword);
+               if ($this->_connectionID === false) return false;
+               if ($argDatabasename) return $this->SelectDB($argDatabasename);
+               return true;    
+       }
+       
+       // 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->database = $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,$mode=false) 
+       {
+               if (!$mode) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               switch ($mode) {
+               case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
+               case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
+               case ADODB_FETCH_BOTH: 
+               default:
+               $this->fetchMode = FBSQL_BOTH; break;
+               }
+               return $this->ADORecordSet($queryID);
+       }
+       
+       function _initrs()
+       {
+       GLOBAL $ADODB_COUNTRECS;
+               $this->_numOfRows = ($ADODB_COUNTRECS) ? 
@fbsql_num_rows($this->_queryID):-1;
+               $this->_numOfFields = @fbsql_num_fields($this->_queryID);
+       }
+       
+
+
+       function &FetchField($fieldOffset = -1) {
+               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,$this->fetchMode);
+               return ($this->fields == true);
+       }
+       
+       function _close() {
+               return @fbsql_free_result($this->_queryID);             
+       }
+       
+       function MetaType($t,$len=-1,$fieldobj=false)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               $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
Index: phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php:1.2       Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php   Tue Feb 21 13:47:42 2006
@@ -1,75 +1,77 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
-
-class ADODB_firebird extends ADODB_ibase {
-       var $databaseType = "firebird"; 
-       var $dialect = 3;
-       
-       var $sysTimeStamp = "cast('NOW' as timestamp)";
-       
-       function ADODB_firebird()
-       {       
-               $this->ADODB_ibase();
-       }
-       
-       function ServerInfo()
-       {
-               $arr['dialect'] = $this->dialect;
-               switch($arr['dialect']) {
-               case '': 
-               case '1': $s = 'Firebird Dialect 1'; break;
-               case '2': $s = 'Firebird Dialect 2'; break;
-               default:
-               case '3': $s = 'Firebird Dialect 3'; break;
-               }
-               $arr['version'] = ADOConnection::_findvers($s);
-               $arr['description'] = $s;
-               return $arr;
-       }
-       
-       // Note that Interbase 6.5 uses this ROWS instead - don't you love 
forking wars!
-       //              SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
-       //              SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 
-- first 5 skip 2
-       function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, 
$secs=0)
-       {
-               $str = 'SELECT ';
-               if ($nrows >= 0) $str .= "FIRST $nrows "; 
-               $str .=($offset>=0) ? "SKIP $offset " : '';
-               
-               $sql = preg_replace('/^[ \t]*select/i',$str,$sql); 
-               if ($secs)
-                       $rs =& $this->CacheExecute($secs,$sql,$inputarr);
-               else
-                       $rs =& $this->Execute($sql,$inputarr);
-                       
-               return $rs;
-       }
-       
-       
-};
- 
-
-class  ADORecordSet_firebird extends ADORecordSet_ibase {      
-       
-       var $databaseType = "firebird";         
-       
-       function ADORecordSet_firebird($id,$mode=false)
-       {
-               $this->ADORecordSet_ibase($id,$mode);
-       }
-}
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
+
+class ADODB_firebird extends ADODB_ibase {
+       var $databaseType = "firebird"; 
+       var $dialect = 3;
+       
+       var $sysTimeStamp = "cast('NOW' as timestamp)";
+       
+       function ADODB_firebird()
+       {       
+               $this->ADODB_ibase();
+       }
+       
+       function ServerInfo()
+       {
+               $arr['dialect'] = $this->dialect;
+               switch($arr['dialect']) {
+               case '': 
+               case '1': $s = 'Firebird Dialect 1'; break;
+               case '2': $s = 'Firebird Dialect 2'; break;
+               default:
+               case '3': $s = 'Firebird Dialect 3'; break;
+               }
+               $arr['version'] = ADOConnection::_findvers($s);
+               $arr['description'] = $s;
+               return $arr;
+       }
+       
+       // Note that Interbase 6.5 uses this ROWS instead - don't you love 
forking wars!
+       //              SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
+       //              SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 
-- first 5 skip 2
+       function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, 
$secs=0)
+       {
+               $nrows = (integer) $nrows;
+               $offset = (integer) $offset;
+               $str = 'SELECT ';
+               if ($nrows >= 0) $str .= "FIRST $nrows "; 
+               $str .=($offset>=0) ? "SKIP $offset " : '';
+               
+               $sql = preg_replace('/^[ \t]*select/i',$str,$sql); 
+               if ($secs)
+                       $rs =& $this->CacheExecute($secs,$sql,$inputarr);
+               else
+                       $rs =& $this->Execute($sql,$inputarr);
+                       
+               return $rs;
+       }
+       
+       
+};
+ 
+
+class  ADORecordSet_firebird extends ADORecordSet_ibase {      
+       
+       var $databaseType = "firebird";         
+       
+       function ADORecordSet_firebird($id,$mode=false)
+       {
+               $this->ADORecordSet_ibase($id,$mode);
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php:1.2  Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php      Tue Feb 21 13:47:42 2006
@@ -1,855 +1,861 @@
-<?php
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.  
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Interbase data driver. Requires interbase client. Works on Windows and Unix.
-
-  3 Jan 2002 -- suggestions by Hans-Peter Oeri <address@hidden>
-       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,...)");
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB_ibase extends ADOConnection {
-       var $databaseType = "ibase";
-       var $dataProvider = "ibase";
-       var $replaceQuote = "''"; // string to use to replace quotes
-       var $ibase_datefmt = '%Y-%m-%d'; // For hours,mins,secs change to 
'%Y-%m-%d %H:%M:%S';
-       var $fmtDate = "'Y-m-d'";
-       var $ibase_timestampfmt = "%Y-%m-%d %H:%M:%S";
-       var $ibase_timefmt = "%H:%M:%S";
-       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\$%'";
-       //OPN STUFF start
-       var $metaColumnsSQL = "select a.rdb\$field_name, a.rdb\$null_flag, 
a.rdb\$default_source, b.rdb\$field_length, b.rdb\$field_scale, 
b.rdb\$field_sub_type, b.rdb\$field_precision, b.rdb\$field_type from 
rdb\$relation_fields a, rdb\$fields b where a.rdb\$field_source = 
b.rdb\$field_name and a.rdb\$relation_name = '%s' order by 
a.rdb\$field_position asc";
-       //OPN STUFF end
-       var $ibasetrans;
-       var $hasGenID = true;
-       var $_bindInputArray = true;
-       var $buffers = 0;
-       var $dialect = 1;
-       var $sysDate = "cast('TODAY' as timestamp)";
-       var $sysTimeStamp = "cast('NOW' as timestamp)";
-       var $ansiOuter = true;
-       var $hasAffectedRows = false;
-       var $poorAffectedRows = true;
-       var $blobEncodeType = 'C';
-       
-       function ADODB_ibase() 
-       {
-                if (defined('IBASE_DEFAULT')) $this->ibasetrans = 
IBASE_DEFAULT;
-       }
-       
-       
-          // returns true or false
-       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename,$persist=false)
-       {  
-               if (!function_exists('ibase_pconnect')) return null;
-               if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
-               $fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
-               $this->_connectionID = 
$fn($argHostname,$argUsername,$argPassword,
-                                       
$this->charSet,$this->buffers,$this->dialect);
-               
-               if ($this->dialect != 1) { // 
http://www.ibphoenix.com/ibp_60_del_id_ds.html
-                       $this->replaceQuote = "''";
-               }
-               if ($this->_connectionID === false) {
-                       $this->_handleerror();
-                       return false;
-               }
-               
-               // PHP5 change.
-               if (function_exists('ibase_timefmt')) {
-                       ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
-                       if ($this->dialect == 1) 
ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
-                       else 
ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
-                       ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
-                       
-               } else {
-                       ini_set("ibase.timestampformat", 
$this->ibase_timestampfmt);
-                       ini_set("ibase.dateformat", $this->ibase_datefmt);
-                       ini_set("ibase.timeformat", $this->ibase_timefmt);
-               }
-               return true;
-       }
-          // returns true or false
-       function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename,true);
-       }       
-       
-       
-       function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
-       {       
-               if ($internalKey) return array('RDB$DB_KEY');
-               
-               $table = strtoupper($table);
-               
-               $sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME
-       FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON 
I.RDB$INDEX_NAME=S.RDB$INDEX_NAME  
-       WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like 
\'RDB$PRIMARY%\'
-       ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
-
-               $a = $this->GetCol($sql,false,true);
-               if ($a && sizeof($a)>0) return $a;
-               return false;     
-       }
-       
-       function ServerInfo()
-       {
-               $arr['dialect'] = $this->dialect;
-               switch($arr['dialect']) {
-               case '': 
-               case '1': $s = 'Interbase 5.5 or earlier'; break;
-               case '2': $s = 'Interbase 5.6'; break;
-               default:
-               case '3': $s = 'Interbase 6.0'; break;
-               }
-               $arr['version'] = ADOConnection::_findvers($s);
-               $arr['description'] = $s;
-               return $arr;
-       }
-
-       function BeginTrans()
-       {        
-               if ($this->transOff) return true;
-               $this->transCnt += 1;
-               $this->autoCommit = false;
-               $this->_transactionID = 
$this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
-               return $this->_transactionID;
-       }
-       
-       function CommitTrans($ok=true) 
-       { 
-               if (!$ok) return $this->RollbackTrans();
-               if ($this->transOff) return true;
-               if ($this->transCnt) $this->transCnt -= 1;
-               $ret = false;
-               $this->autoCommit = true;
-               if ($this->_transactionID) {
-                                       //print ' commit ';
-                       $ret = ibase_commit($this->_transactionID);
-               }
-               $this->_transactionID = false;
-               return $ret;
-       }
-       
-       // there are some compat problems with ADODB_COUNTRECS=false and 
$this->_logsql currently.
-       // it appears that ibase extension cannot support multiple concurrent 
queryid's
-       function &_Execute($sql,$inputarr=false) 
-       {
-       global $ADODB_COUNTRECS;
-       
-               if ($this->_logsql) {
-                       $savecrecs = $ADODB_COUNTRECS;
-                       $ADODB_COUNTRECS = true; // force countrecs
-                       $ret =& ADOConnection::_Execute($sql,$inputarr);
-                       $ADODB_COUNTRECS = $savecrecs;
-               } else {
-                       $ret =& ADOConnection::_Execute($sql,$inputarr);
-               }
-               return $ret;
-       }
-       
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true;
-               if ($this->transCnt) $this->transCnt -= 1;
-               $ret = false;
-               $this->autoCommit = true;
-               if ($this->_transactionID) 
-                                 $ret = ibase_rollback($this->_transactionID);
-               $this->_transactionID = false;   
-               
-               return $ret;
-       }
-       
-       function &MetaIndexes ($table, $primary = FALSE, $owner=false)
-       {
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        $table = strtoupper($table);
-        $sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = 
'".$table."'";
-        if (!$primary) {
-               $sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
-        } else {
-               $sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
-        }
-        // get index details
-        $rs = $this->Execute($sql);
-        if (!is_object($rs)) {
-               // restore fetchmode
-               if (isset($savem)) {
-                   $this->SetFetchMode($savem);
-               }
-               $ADODB_FETCH_MODE = $save;
-            return FALSE;
-        }
-        
-        $indexes = array ();
-               while ($row = $rs->FetchRow()) {
-                       $index = $row[0];
-             if (!isset($indexes[$index])) {
-                       if (is_null($row[3])) {$row[3] = 0;}
-                     $indexes[$index] = array(
-                             'unique' => ($row[3] == 1),
-                             'columns' => array()
-                     );
-             }
-                       $sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE 
RDB\$INDEX_NAME = '".$name."' ORDER BY RDB\$FIELD_POSITION ASC";
-                       $rs1 = $this->Execute($sql);
-            while ($row1 = $rs1->FetchRow()) {
-               $indexes[$index]['columns'][$row1[2]] = $row1[1];
-               }
-               }
-        // restore fetchmode
-        if (isset($savem)) {
-            $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-        
-        return $indexes;
-       }
-
-       
-       // See http://community.borland.com/article/0,1410,25844,00.html
-       function RowLock($tables,$where,$col)
-       {
-               if ($this->autoCommit) $this->BeginTrans();
-               $this->Execute("UPDATE $table SET $col=$col WHERE $where "); // 
is this correct - jlim?
-               return 1;
-       }
-       
-       
-       function CreateSequence($seqname,$startID=1)
-       {
-               $ok = $this->Execute(("INSERT INTO RDB\$GENERATORS 
(RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
-               if (!$ok) return false;
-               return $this->Execute("SET GENERATOR $seqname TO 
".($startID-1).';');
-       }
-       
-       function DropSequence($seqname)
-       {
-               $seqname = strtoupper($seqname);
-               $this->Execute("delete from RDB\$GENERATORS where 
RDB\$GENERATOR_NAME='$seqname'");
-       }
-       
-       function GenID($seqname='adodbseq',$startID=1)
-       {
-               $getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
-               $rs = @$this->Execute($getnext);
-               if (!$rs) {
-                       $this->Execute(("INSERT INTO RDB\$GENERATORS 
(RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
-                       $this->Execute("SET GENERATOR $seqname TO 
".($startID-1).';');
-                       $rs = $this->Execute($getnext);
-               }
-               if ($rs && !$rs->EOF) $this->genID = (integer) 
reset($rs->fields);
-               else $this->genID = 0; // false
-               
-               if ($rs) $rs->Close();
-               
-               return $this->genID;
-       }
-
-       function SelectDB($dbName) 
-       {
-                  return false;
-       }
-
-       function _handleerror()
-       {
-               $this->_errorMsg = ibase_errmsg();
-       }
-
-       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;
-       }
-
-       function Prepare($sql)
-       {
-               $stmt = ibase_prepare($this->_connectionID,$sql);
-               if (!$stmt) return false;
-               return array($sql,$stmt);
-       }
-
-          // returns query ID if successful, otherwise false
-          // there have been reports of problems with nested queries - the 
code is probably not re-entrant?
-       function _query($sql,$iarr=false)
-       { 
-
-               if (!$this->autoCommit && $this->_transactionID) {
-                       $conn = $this->_transactionID;
-                       $docommit = false;
-               } else {
-                       $conn = $this->_connectionID;
-                       $docommit = true;
-               }
-               if (is_array($sql)) {
-                       $fn = 'ibase_execute';
-                       $sql = $sql[1];
-                       if (is_array($iarr)) {
-                               if  (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-                                       if ( !isset($iarr[0]) ) $iarr[0] = ''; 
// PHP5 compat hack
-                                       $fnarr =& array_merge( array($sql) , 
$iarr);
-                                       $ret = call_user_func_array($fn,$fnarr);
-                               } else {
-                                       switch(sizeof($iarr)) {
-                                       case 1: $ret = $fn($sql,$iarr[0]); 
break;
-                                       case 2: $ret = 
$fn($sql,$iarr[0],$iarr[1]); break;
-                                       case 3: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
-                                       case 4: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-                                       case 5: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-                                       case 6: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-                                       case 7: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-                                       default: ADOConnection::outp( "Too many 
parameters to ibase query $sql");
-                                       case 8: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]);
 break;
-                                       }
-                               }
-                       } else $ret = $fn($sql); 
-               } else {
-                       $fn = 'ibase_query';
-               
-                       if (is_array($iarr)) {  
-                               if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-                                       if (sizeof($iarr) == 0) $iarr[0] = ''; 
// PHP5 compat hack
-                                       $fnarr =& array_merge( 
array($conn,$sql) , $iarr);
-                                       $ret = call_user_func_array($fn,$fnarr);
-                               } else {
-                                       switch(sizeof($iarr)) {
-                                       case 1: $ret = 
$fn($conn,$sql,$iarr[0]); break;
-                                       case 2: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1]); break;
-                                       case 3: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
-                                       case 4: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-                                       case 5: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-                                       case 6: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-                                       case 7: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); 
break;
-                                       default: ADOConnection::outp( "Too many 
parameters to ibase query $sql");
-                                       case 8: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]);
 break;
-                                       }
-                               }
-                       } else $ret = $fn($conn,$sql); 
-               }
-               if ($docommit && $ret === true) 
ibase_commit($this->_connectionID);
-
-               $this->_handleerror();
-               return $ret;
-       }
-
-        // returns true or false
-        function _close()
-        {         
-               if (!$this->autoCommit) @ibase_rollback($this->_connectionID);
-               return @ibase_close($this->_connectionID);
-        }
-       
-       //OPN STUFF start
-       function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, 
$fprecision, $dialect3)
-       {
-               $fscale = abs($fscale);
-               $fld->max_length = $flen;
-               $fld->scale = null;
-               switch($ftype){
-                       case 7: 
-                       case 8:
-                               if ($dialect3) {
-                                   switch($fsubtype){
-                                       case 0: 
-                                               $fld->type = ($ftype == 7 ? 
'smallint' : 'integer');
-                                               break;
-                                       case 1: 
-                                               $fld->type = 'numeric';
-                                                       $fld->max_length = 
$fprecision;
-                                                       $fld->scale = $fscale;
-                                               break;
-                                       case 2:
-                                               $fld->type = 'decimal';
-                                                       $fld->max_length = 
$fprecision;
-                                                       $fld->scale = $fscale;
-                                               break;
-                                   } // switch
-                               } else {
-                                       if ($fscale !=0) {
-                                           $fld->type = 'decimal';
-                                               $fld->scale = $fscale;
-                                               $fld->max_length = ($ftype == 7 
? 4 : 9);
-                                       } else {
-                                               $fld->type = ($ftype == 7 ? 
'smallint' : 'integer');
-                                       }
-                               }
-                               break;
-                       case 16: 
-                               if ($dialect3) {
-                                   switch($fsubtype){
-                                       case 0: 
-                                               $fld->type = 'decimal';
-                                                       $fld->max_length = 18;
-                                                       $fld->scale = 0;
-                                               break;
-                                       case 1: 
-                                               $fld->type = 'numeric';
-                                                       $fld->max_length = 
$fprecision;
-                                                       $fld->scale = $fscale;
-                                               break;
-                                       case 2:
-                                               $fld->type = 'decimal';
-                                                       $fld->max_length = 
$fprecision;
-                                                       $fld->scale = $fscale;
-                                               break;
-                                   } // switch
-                               }
-                               break;
-                       case 10:
-                               $fld->type = 'float';
-                               break;
-                       case 14:
-                               $fld->type = 'char';
-                               break;
-                       case 27:
-                               if ($fscale !=0) {
-                                   $fld->type = 'decimal';
-                                       $fld->max_length = 15;
-                                       $fld->scale = 5;
-                               } else {
-                                       $fld->type = 'double';
-                               }
-                               break;
-                       case 35:
-                               if ($dialect3) {
-                                   $fld->type = 'timestamp';
-                               } else {
-                                       $fld->type = 'date';
-                               }
-                               break;
-                       case 12:
-                               $fld->type = 'date';
-                               break;
-                       case 13:
-                               $fld->type = 'time';
-                               break;
-                       case 37:
-                               $fld->type = 'varchar';
-                               break;
-                       case 40:
-                               $fld->type = 'cstring';
-                               break;
-                       case 261:
-                               $fld->type = 'blob';
-                               $fld->max_length = -1;
-                               break;
-               } // switch
-       }
-       //OPN STUFF end
-               // returns array of ADOFieldObjects for current table
-       function &MetaColumns($table) 
-       {
-       global $ADODB_FETCH_MODE;
-               
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       
-               $rs = 
$this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-       
-               $ADODB_FETCH_MODE = $save;
-               if ($rs === false) {
-                       $false = false;
-                       return $false;
-               }
-               
-               $retarr = array();
-               //OPN STUFF start
-               $dialect3 = ($this->dialect==3 ? true : false);
-               //OPN STUFF end
-               while (!$rs->EOF) { //print_r($rs->fields);
-                       $fld = new ADOFieldObject();
-                       $fld->name = trim($rs->fields[0]);
-                       //OPN STUFF start
-                       $this->_ConvertFieldType($fld, $rs->fields[7], 
$rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3);
-                       if (isset($rs->fields[1]) && $rs->fields[1]) {
-                               $fld->not_null = true;
-                       }                               
-                       if (isset($rs->fields[2])) {
-                               
-                               $fld->has_default = true;
-                               $d = substr($rs->fields[2],strlen('default '));
-                               switch ($fld->type)
-                               {
-                               case 'smallint':
-                               case 'integer': $fld->default_value = (int) $d; 
break;
-                               case 'char': 
-                               case 'blob':
-                               case 'text':
-                               case 'varchar': $fld->default_value = (string) 
substr($d,1,strlen($d)-2); break;
-                               case 'double':
-                               case 'float': $fld->default_value = (float) $d; 
break;
-                               default: $fld->default_value = $d; break;
-                               }
-               //      case 35:$tt = 'TIMESTAMP'; break;
-                       }
-                       if ((isset($rs->fields[5])) && ($fld->type == 'blob')) {
-                               $fld->sub_type = $rs->fields[5];
-                       } else {
-                               $fld->sub_type = null;
-                       }
-                       //OPN STUFF end
-                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = 
$fld;     
-                       else $retarr[strtoupper($fld->name)] = $fld;
-                       
-                       $rs->MoveNext();
-               }
-               $rs->Close();
-               return empty($retarr) ? false : $retarr;        
-       }
-       
-       function BlobEncode( $blob ) 
-       {
-               $blobid = ibase_blob_create( $this->_connectionID);
-               ibase_blob_add( $blobid, $blob );
-               return ibase_blob_close( $blobid );
-       }
-       
-       // since we auto-decode all blob's since 2.42, 
-       // BlobDecode should not do any transforms
-       function BlobDecode($blob)
-       {
-               return $blob; 
-       }
-       
-       
-       
-       
-       // old blobdecode function
-       // still used to auto-decode all blob's
-       function _BlobDecode( $blob ) 
-       {
-               $blobid = ibase_blob_open( $blob );
-               $realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd 
param is max size of blob -- Kevin Boillet <address@hidden>
-               while($string = ibase_blob_get($blobid, 8192)){ 
-                       $realblob .= $string; 
-               }
-               ibase_blob_close( $blobid );
-
-               return( $realblob );
-       } 
-       
-       function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-       { 
-               $fd = fopen($path,'rb'); 
-               if ($fd === false) return false; 
-               $blob_id = ibase_blob_create($this->_connectionID); 
-               
-               /* fill with data */ 
-               
-               while ($val = fread($fd,32768)){ 
-                       ibase_blob_add($blob_id, $val); 
-               } 
-               
-               /* close and get $blob_id_str for inserting into table */ 
-               $blob_id_str = ibase_blob_close($blob_id); 
-               
-               fclose($fd); 
-               return $this->Execute("UPDATE $table SET $column=(?) WHERE 
$where",array($blob_id_str)) != false; 
-       } 
-       
-       /*
-               Insert a null into the blob field of the table first.
-               Then use UpdateBlob to store the blob.
-               
-               Usage:
-                
-               $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, 
null)');
-               $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-       */
-       function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
-       { 
-       $blob_id = ibase_blob_create($this->_connectionID); 
-       
-       // ibase_blob_add($blob_id, $val); 
-       
-       // replacement that solves the problem by which only the first modulus 
64K / 
-       // of $val are stored at the blob field 
//////////////////////////////////// 
-       // Thx Abel Berenstein  aberenstein#afip.gov.ar
-       $len = strlen($val); 
-       $chunk_size = 32768; 
-       $tail_size = $len % $chunk_size; 
-       $n_chunks = ($len - $tail_size) / $chunk_size; 
-       
-       for ($n = 0; $n < $n_chunks; $n++) { 
-               $start = $n * $chunk_size; 
-               $data = substr($val, $start, $chunk_size); 
-               ibase_blob_add($blob_id, $data); 
-       } 
-       
-       if ($tail_size) {
-               $start = $n_chunks * $chunk_size; 
-               $data = substr($val, $start, $tail_size); 
-               ibase_blob_add($blob_id, $data); 
-       }
-       // end replacement 
///////////////////////////////////////////////////////// 
-       
-       $blob_id_str = ibase_blob_close($blob_id); 
-       
-       return $this->Execute("UPDATE $table SET $column=(?) WHERE 
$where",array($blob_id_str)) != false; 
-       
-       } 
-       
-       
-       function OldUpdateBlob($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;
-       }
-       
-       // Format date column in sql string given an input format that 
understands Y M D
-       // Only since Interbase 6.0 - uses EXTRACT
-       // problem - does not zero-fill the day and month yet
-       function SQLDate($fmt, $col=false)
-       {       
-               if (!$col) $col = $this->sysDate;
-               $s = '';
-               
-               $len = strlen($fmt);
-               for ($i=0; $i < $len; $i++) {
-                       if ($s) $s .= '||';
-                       $ch = $fmt[$i];
-                       switch($ch) {
-                       case 'Y':
-                       case 'y':
-                               $s .= "extract(year from $col)";
-                               break;
-                       case 'M':
-                       case 'm':
-                               $s .= "extract(month from $col)";
-                               break;
-                       case 'Q':
-                       case 'q':
-                               $s .= "cast(((extract(month from $col)+2) / 3) 
as integer)";
-                               break;
-                       case 'D':
-                       case 'd':
-                               $s .= "(extract(day from $col))";
-                               break;
-                       case 'H':
-                       case 'h':
-                         $s .= "(extract(hour from $col))";
-                         break;                        
-                       case 'I':
-                       case 'i':
-                         $s .= "(extract(minute from $col))";
-                         break;                
-                       case 'S':
-                       case 's':
-                         $s .= "CAST((extract(second from $col)) AS INTEGER)";
-                         break;        
-
-                       default:
-                               if ($ch == '\\') {
-                                       $i++;
-                                       $ch = substr($fmt,$i,1);
-                               }
-                               $s .= $this->qstr($ch);
-                               break;
-                       }
-               }
-               return $s;
-       }
-}
-
-/*--------------------------------------------------------------------------------------
-                Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_ibase extends ADORecordSet
-{
-
-       var $databaseType = "ibase";
-       var $bind=false;
-       var $_cacheType;
-       
-       function ADORecordset_ibase($id,$mode=false)
-       {
-       global $ADODB_FETCH_MODE;
-       
-                       $this->fetchMode = ($mode === false) ? 
$ADODB_FETCH_MODE : $mode;
-                       $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);
-                        switch (ADODB_ASSOC_CASE) {
-                        case 2: // the default
-                               $fld->name = ($ibf['alias']);
-                                if (empty($fld->name)) $fld->name = 
($ibf['name']);
-                                break;
-                        case 0: 
-                                $fld->name = strtoupper($ibf['alias']);
-                                if (empty($fld->name)) $fld->name = 
strtoupper($ibf['name']);
-                                break;
-                        case 1: 
-                               $fld->name = strtolower($ibf['alias']);
-                                if (empty($fld->name)) $fld->name = 
strtolower($ibf['name']);
-                                break;
-                        }
-                        
-                        $fld->type = $ibf['type'];
-                        $fld->max_length = $ibf['length'];
-                        
-                        /*       This needs to be populated from the metadata 
*/ 
-                        $fld->not_null = false;
-                        $fld->has_default = false;
-                        $fld->default_value = 'null';
-                        return $fld;
-       }
-
-       function _initrs()
-       {
-               $this->_numOfRows = -1;
-               $this->_numOfFields = @ibase_num_fields($this->_queryID);
-
-               // cache types for blob decode check
-               for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-                       $f1 = $this->FetchField($i); 
-                       $this->_cacheType[] = $f1->type;
-               }                               
-       }
-
-       function _seek($row)
-       {
-               return false;
-       }
-       
-       function _fetch() 
-       {
-               $f = @ibase_fetch_row($this->_queryID); 
-               if ($f === false) {
-                       $this->fields = false;
-                       return false;
-               }
-               // OPN stuff start - optimized
-               // fix missing nulls and decode blobs automatically
-       
-               global $ADODB_ANSI_PADDING_OFF;
-               //$ADODB_ANSI_PADDING_OFF=1;
-               $rtrim = !empty($ADODB_ANSI_PADDING_OFF);
-               
-               for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-                       if ($this->_cacheType[$i]=="BLOB") {
-                               if (isset($f[$i])) { 
-                                       $f[$i] = 
$this->connection->_BlobDecode($f[$i]); 
-                               } else { 
-                                       $f[$i] = null; 
-                               } 
-                       } else { 
-                               if (!isset($f[$i])) { 
-                                       $f[$i] = null; 
-                               } else if ($rtrim && is_string($f[$i])) {
-                                       $f[$i] = rtrim($f[$i]);
-                               }
-                       } 
-               } 
-               // OPN stuff end 
-               
-               $this->fields = $f;
-               if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-                       $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
-               } else if ($this->fetchMode == ADODB_FETCH_BOTH) {
-                       $this->fields =& 
array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
-               }
-               return true;
-       }
-
-       /* Use associative array to get fields array */
-       function Fields($colname)
-       {
-               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->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,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               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 'TIME': return 'T';
-                               //case 'T': return 'T';
-
-                               //case 'L': return 'L';
-               case 'INT': 
-               case 'SHORT':
-               case 'INTEGER': return 'I';
-               default: return 'N';
-               }
-       }
-
-}
+<?php
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.  
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Interbase data driver. Requires interbase client. Works on Windows and Unix.
+
+  3 Jan 2002 -- suggestions by Hans-Peter Oeri <address@hidden>
+       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,...)");
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB_ibase extends ADOConnection {
+       var $databaseType = "ibase";
+       var $dataProvider = "ibase";
+       var $replaceQuote = "''"; // string to use to replace quotes
+       var $ibase_datefmt = '%Y-%m-%d'; // For hours,mins,secs change to 
'%Y-%m-%d %H:%M:%S';
+       var $fmtDate = "'Y-m-d'";
+       var $ibase_timestampfmt = "%Y-%m-%d %H:%M:%S";
+       var $ibase_timefmt = "%H:%M:%S";
+       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\$%'";
+       //OPN STUFF start
+       var $metaColumnsSQL = "select a.rdb\$field_name, a.rdb\$null_flag, 
a.rdb\$default_source, b.rdb\$field_length, b.rdb\$field_scale, 
b.rdb\$field_sub_type, b.rdb\$field_precision, b.rdb\$field_type from 
rdb\$relation_fields a, rdb\$fields b where a.rdb\$field_source = 
b.rdb\$field_name and a.rdb\$relation_name = '%s' order by 
a.rdb\$field_position asc";
+       //OPN STUFF end
+       var $ibasetrans;
+       var $hasGenID = true;
+       var $_bindInputArray = true;
+       var $buffers = 0;
+       var $dialect = 1;
+       var $sysDate = "cast('TODAY' as timestamp)";
+       var $sysTimeStamp = "cast('NOW' as timestamp)";
+       var $ansiOuter = true;
+       var $hasAffectedRows = false;
+       var $poorAffectedRows = true;
+       var $blobEncodeType = 'C';
+       var $role = false;
+       
+       function ADODB_ibase() 
+       {
+                if (defined('IBASE_DEFAULT')) $this->ibasetrans = 
IBASE_DEFAULT;
+       }
+       
+       
+          // returns true or false
+       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename,$persist=false)
+       {  
+               if (!function_exists('ibase_pconnect')) return null;
+               if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
+               $fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
+               if ($this->role)
+                       $this->_connectionID = 
$fn($argHostname,$argUsername,$argPassword,
+                                       
$this->charSet,$this->buffers,$this->dialect,$this->role);
+               else    
+                       $this->_connectionID = 
$fn($argHostname,$argUsername,$argPassword,
+                                       
$this->charSet,$this->buffers,$this->dialect);
+               
+               if ($this->dialect != 1) { // 
http://www.ibphoenix.com/ibp_60_del_id_ds.html
+                       $this->replaceQuote = "''";
+               }
+               if ($this->_connectionID === false) {
+                       $this->_handleerror();
+                       return false;
+               }
+               
+               // PHP5 change.
+               if (function_exists('ibase_timefmt')) {
+                       ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
+                       if ($this->dialect == 1) 
ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
+                       else 
ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
+                       ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
+                       
+               } else {
+                       ini_set("ibase.timestampformat", 
$this->ibase_timestampfmt);
+                       ini_set("ibase.dateformat", $this->ibase_datefmt);
+                       ini_set("ibase.timeformat", $this->ibase_timefmt);
+               }
+               return true;
+       }
+          // returns true or false
+       function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename,true);
+       }       
+       
+       
+       function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
+       {       
+               if ($internalKey) return array('RDB$DB_KEY');
+               
+               $table = strtoupper($table);
+               
+               $sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME
+       FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON 
I.RDB$INDEX_NAME=S.RDB$INDEX_NAME  
+       WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like 
\'RDB$PRIMARY%\'
+       ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
+
+               $a = $this->GetCol($sql,false,true);
+               if ($a && sizeof($a)>0) return $a;
+               return false;     
+       }
+       
+       function ServerInfo()
+       {
+               $arr['dialect'] = $this->dialect;
+               switch($arr['dialect']) {
+               case '': 
+               case '1': $s = 'Interbase 5.5 or earlier'; break;
+               case '2': $s = 'Interbase 5.6'; break;
+               default:
+               case '3': $s = 'Interbase 6.0'; break;
+               }
+               $arr['version'] = ADOConnection::_findvers($s);
+               $arr['description'] = $s;
+               return $arr;
+       }
+
+       function BeginTrans()
+       {        
+               if ($this->transOff) return true;
+               $this->transCnt += 1;
+               $this->autoCommit = false;
+               $this->_transactionID = 
$this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
+               return $this->_transactionID;
+       }
+       
+       function CommitTrans($ok=true) 
+       { 
+               if (!$ok) return $this->RollbackTrans();
+               if ($this->transOff) return true;
+               if ($this->transCnt) $this->transCnt -= 1;
+               $ret = false;
+               $this->autoCommit = true;
+               if ($this->_transactionID) {
+                                       //print ' commit ';
+                       $ret = ibase_commit($this->_transactionID);
+               }
+               $this->_transactionID = false;
+               return $ret;
+       }
+       
+       // there are some compat problems with ADODB_COUNTRECS=false and 
$this->_logsql currently.
+       // it appears that ibase extension cannot support multiple concurrent 
queryid's
+       function &_Execute($sql,$inputarr=false) 
+       {
+       global $ADODB_COUNTRECS;
+       
+               if ($this->_logsql) {
+                       $savecrecs = $ADODB_COUNTRECS;
+                       $ADODB_COUNTRECS = true; // force countrecs
+                       $ret =& ADOConnection::_Execute($sql,$inputarr);
+                       $ADODB_COUNTRECS = $savecrecs;
+               } else {
+                       $ret =& ADOConnection::_Execute($sql,$inputarr);
+               }
+               return $ret;
+       }
+       
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true;
+               if ($this->transCnt) $this->transCnt -= 1;
+               $ret = false;
+               $this->autoCommit = true;
+               if ($this->_transactionID) 
+                                 $ret = ibase_rollback($this->_transactionID);
+               $this->_transactionID = false;   
+               
+               return $ret;
+       }
+       
+       function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+       {
+        // save old fetch mode
+        global $ADODB_FETCH_MODE;
+        $false = false;
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+        $table = strtoupper($table);
+        $sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = 
'".$table."'";
+        if (!$primary) {
+               $sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
+        } else {
+               $sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
+        }
+        // get index details
+        $rs = $this->Execute($sql);
+        if (!is_object($rs)) {
+               // restore fetchmode
+               if (isset($savem)) {
+                   $this->SetFetchMode($savem);
+               }
+               $ADODB_FETCH_MODE = $save;
+            return $false;
+        }
+        
+        $indexes = array();
+               while ($row = $rs->FetchRow()) {
+                       $index = $row[0];
+             if (!isset($indexes[$index])) {
+                       if (is_null($row[3])) {$row[3] = 0;}
+                     $indexes[$index] = array(
+                             'unique' => ($row[3] == 1),
+                             'columns' => array()
+                     );
+             }
+                       $sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE 
RDB\$INDEX_NAME = '".$index."' ORDER BY RDB\$FIELD_POSITION ASC";
+                       $rs1 = $this->Execute($sql);
+            while ($row1 = $rs1->FetchRow()) {
+               $indexes[$index]['columns'][$row1[2]] = $row1[1];
+               }
+               }
+        // restore fetchmode
+        if (isset($savem)) {
+            $this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+        
+        return $indexes;
+       }
+
+       
+       // See http://community.borland.com/article/0,1410,25844,00.html
+       function RowLock($tables,$where,$col)
+       {
+               if ($this->autoCommit) $this->BeginTrans();
+               $this->Execute("UPDATE $table SET $col=$col WHERE $where "); // 
is this correct - jlim?
+               return 1;
+       }
+       
+       
+       function CreateSequence($seqname,$startID=1)
+       {
+               $ok = $this->Execute(("INSERT INTO RDB\$GENERATORS 
(RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
+               if (!$ok) return false;
+               return $this->Execute("SET GENERATOR $seqname TO 
".($startID-1).';');
+       }
+       
+       function DropSequence($seqname)
+       {
+               $seqname = strtoupper($seqname);
+               $this->Execute("delete from RDB\$GENERATORS where 
RDB\$GENERATOR_NAME='$seqname'");
+       }
+       
+       function GenID($seqname='adodbseq',$startID=1)
+       {
+               $getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
+               $rs = @$this->Execute($getnext);
+               if (!$rs) {
+                       $this->Execute(("INSERT INTO RDB\$GENERATORS 
(RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
+                       $this->Execute("SET GENERATOR $seqname TO 
".($startID-1).';');
+                       $rs = $this->Execute($getnext);
+               }
+               if ($rs && !$rs->EOF) $this->genID = (integer) 
reset($rs->fields);
+               else $this->genID = 0; // false
+               
+               if ($rs) $rs->Close();
+               
+               return $this->genID;
+       }
+
+       function SelectDB($dbName) 
+       {
+                  return false;
+       }
+
+       function _handleerror()
+       {
+               $this->_errorMsg = ibase_errmsg();
+       }
+
+       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;
+       }
+
+       function Prepare($sql)
+       {
+               $stmt = ibase_prepare($this->_connectionID,$sql);
+               if (!$stmt) return false;
+               return array($sql,$stmt);
+       }
+
+          // returns query ID if successful, otherwise false
+          // there have been reports of problems with nested queries - the 
code is probably not re-entrant?
+       function _query($sql,$iarr=false)
+       { 
+
+               if (!$this->autoCommit && $this->_transactionID) {
+                       $conn = $this->_transactionID;
+                       $docommit = false;
+               } else {
+                       $conn = $this->_connectionID;
+                       $docommit = true;
+               }
+               if (is_array($sql)) {
+                       $fn = 'ibase_execute';
+                       $sql = $sql[1];
+                       if (is_array($iarr)) {
+                               if  (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
+                                       if ( !isset($iarr[0]) ) $iarr[0] = ''; 
// PHP5 compat hack
+                                       $fnarr =& array_merge( array($sql) , 
$iarr);
+                                       $ret = call_user_func_array($fn,$fnarr);
+                               } else {
+                                       switch(sizeof($iarr)) {
+                                       case 1: $ret = $fn($sql,$iarr[0]); 
break;
+                                       case 2: $ret = 
$fn($sql,$iarr[0],$iarr[1]); break;
+                                       case 3: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
+                                       case 4: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+                                       case 5: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+                                       case 6: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
+                                       case 7: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
+                                       default: ADOConnection::outp( "Too many 
parameters to ibase query $sql");
+                                       case 8: $ret = 
$fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]);
 break;
+                                       }
+                               }
+                       } else $ret = $fn($sql); 
+               } else {
+                       $fn = 'ibase_query';
+               
+                       if (is_array($iarr)) {  
+                               if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
+                                       if (sizeof($iarr) == 0) $iarr[0] = ''; 
// PHP5 compat hack
+                                       $fnarr =& array_merge( 
array($conn,$sql) , $iarr);
+                                       $ret = call_user_func_array($fn,$fnarr);
+                               } else {
+                                       switch(sizeof($iarr)) {
+                                       case 1: $ret = 
$fn($conn,$sql,$iarr[0]); break;
+                                       case 2: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1]); break;
+                                       case 3: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
+                                       case 4: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+                                       case 5: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+                                       case 6: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
+                                       case 7: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); 
break;
+                                       default: ADOConnection::outp( "Too many 
parameters to ibase query $sql");
+                                       case 8: $ret = 
$fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]);
 break;
+                                       }
+                               }
+                       } else $ret = $fn($conn,$sql); 
+               }
+               if ($docommit && $ret === true) 
ibase_commit($this->_connectionID);
+
+               $this->_handleerror();
+               return $ret;
+       }
+
+        // returns true or false
+        function _close()
+        {         
+               if (!$this->autoCommit) @ibase_rollback($this->_connectionID);
+               return @ibase_close($this->_connectionID);
+        }
+       
+       //OPN STUFF start
+       function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, 
$fprecision, $dialect3)
+       {
+               $fscale = abs($fscale);
+               $fld->max_length = $flen;
+               $fld->scale = null;
+               switch($ftype){
+                       case 7: 
+                       case 8:
+                               if ($dialect3) {
+                                   switch($fsubtype){
+                                       case 0: 
+                                               $fld->type = ($ftype == 7 ? 
'smallint' : 'integer');
+                                               break;
+                                       case 1: 
+                                               $fld->type = 'numeric';
+                                                       $fld->max_length = 
$fprecision;
+                                                       $fld->scale = $fscale;
+                                               break;
+                                       case 2:
+                                               $fld->type = 'decimal';
+                                                       $fld->max_length = 
$fprecision;
+                                                       $fld->scale = $fscale;
+                                               break;
+                                   } // switch
+                               } else {
+                                       if ($fscale !=0) {
+                                           $fld->type = 'decimal';
+                                               $fld->scale = $fscale;
+                                               $fld->max_length = ($ftype == 7 
? 4 : 9);
+                                       } else {
+                                               $fld->type = ($ftype == 7 ? 
'smallint' : 'integer');
+                                       }
+                               }
+                               break;
+                       case 16: 
+                               if ($dialect3) {
+                                   switch($fsubtype){
+                                       case 0: 
+                                               $fld->type = 'decimal';
+                                                       $fld->max_length = 18;
+                                                       $fld->scale = 0;
+                                               break;
+                                       case 1: 
+                                               $fld->type = 'numeric';
+                                                       $fld->max_length = 
$fprecision;
+                                                       $fld->scale = $fscale;
+                                               break;
+                                       case 2:
+                                               $fld->type = 'decimal';
+                                                       $fld->max_length = 
$fprecision;
+                                                       $fld->scale = $fscale;
+                                               break;
+                                   } // switch
+                               }
+                               break;
+                       case 10:
+                               $fld->type = 'float';
+                               break;
+                       case 14:
+                               $fld->type = 'char';
+                               break;
+                       case 27:
+                               if ($fscale !=0) {
+                                   $fld->type = 'decimal';
+                                       $fld->max_length = 15;
+                                       $fld->scale = 5;
+                               } else {
+                                       $fld->type = 'double';
+                               }
+                               break;
+                       case 35:
+                               if ($dialect3) {
+                                   $fld->type = 'timestamp';
+                               } else {
+                                       $fld->type = 'date';
+                               }
+                               break;
+                       case 12:
+                               $fld->type = 'date';
+                               break;
+                       case 13:
+                               $fld->type = 'time';
+                               break;
+                       case 37:
+                               $fld->type = 'varchar';
+                               break;
+                       case 40:
+                               $fld->type = 'cstring';
+                               break;
+                       case 261:
+                               $fld->type = 'blob';
+                               $fld->max_length = -1;
+                               break;
+               } // switch
+       }
+       //OPN STUFF end
+               // returns array of ADOFieldObjects for current table
+       function &MetaColumns($table) 
+       {
+       global $ADODB_FETCH_MODE;
+               
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       
+               $rs = 
$this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+       
+               $ADODB_FETCH_MODE = $save;
+               $false = false;
+               if ($rs === false) {
+                       return $false;
+               }
+               
+               $retarr = array();
+               //OPN STUFF start
+               $dialect3 = ($this->dialect==3 ? true : false);
+               //OPN STUFF end
+               while (!$rs->EOF) { //print_r($rs->fields);
+                       $fld = new ADOFieldObject();
+                       $fld->name = trim($rs->fields[0]);
+                       //OPN STUFF start
+                       $this->_ConvertFieldType($fld, $rs->fields[7], 
$rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3);
+                       if (isset($rs->fields[1]) && $rs->fields[1]) {
+                               $fld->not_null = true;
+                       }                               
+                       if (isset($rs->fields[2])) {
+                               
+                               $fld->has_default = true;
+                               $d = substr($rs->fields[2],strlen('default '));
+                               switch ($fld->type)
+                               {
+                               case 'smallint':
+                               case 'integer': $fld->default_value = (int) $d; 
break;
+                               case 'char': 
+                               case 'blob':
+                               case 'text':
+                               case 'varchar': $fld->default_value = (string) 
substr($d,1,strlen($d)-2); break;
+                               case 'double':
+                               case 'float': $fld->default_value = (float) $d; 
break;
+                               default: $fld->default_value = $d; break;
+                               }
+               //      case 35:$tt = 'TIMESTAMP'; break;
+                       }
+                       if ((isset($rs->fields[5])) && ($fld->type == 'blob')) {
+                               $fld->sub_type = $rs->fields[5];
+                       } else {
+                               $fld->sub_type = null;
+                       }
+                       //OPN STUFF end
+                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = 
$fld;     
+                       else $retarr[strtoupper($fld->name)] = $fld;
+                       
+                       $rs->MoveNext();
+               }
+               $rs->Close();
+               if ( empty($retarr)) return $false;
+               else return $retarr;    
+       }
+       
+       function BlobEncode( $blob ) 
+       {
+               $blobid = ibase_blob_create( $this->_connectionID);
+               ibase_blob_add( $blobid, $blob );
+               return ibase_blob_close( $blobid );
+       }
+       
+       // since we auto-decode all blob's since 2.42, 
+       // BlobDecode should not do any transforms
+       function BlobDecode($blob)
+       {
+               return $blob; 
+       }
+       
+       
+       
+       
+       // old blobdecode function
+       // still used to auto-decode all blob's
+       function _BlobDecode( $blob ) 
+       {
+               $blobid = ibase_blob_open( $blob );
+               $realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd 
param is max size of blob -- Kevin Boillet <address@hidden>
+               while($string = ibase_blob_get($blobid, 8192)){ 
+                       $realblob .= $string; 
+               }
+               ibase_blob_close( $blobid );
+
+               return( $realblob );
+       } 
+       
+       function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
+       { 
+               $fd = fopen($path,'rb'); 
+               if ($fd === false) return false; 
+               $blob_id = ibase_blob_create($this->_connectionID); 
+               
+               /* fill with data */ 
+               
+               while ($val = fread($fd,32768)){ 
+                       ibase_blob_add($blob_id, $val); 
+               } 
+               
+               /* close and get $blob_id_str for inserting into table */ 
+               $blob_id_str = ibase_blob_close($blob_id); 
+               
+               fclose($fd); 
+               return $this->Execute("UPDATE $table SET $column=(?) WHERE 
$where",array($blob_id_str)) != false; 
+       } 
+       
+       /*
+               Insert a null into the blob field of the table first.
+               Then use UpdateBlob to store the blob.
+               
+               Usage:
+                
+               $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, 
null)');
+               $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+       */
+       function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
+       { 
+       $blob_id = ibase_blob_create($this->_connectionID); 
+       
+       // ibase_blob_add($blob_id, $val); 
+       
+       // replacement that solves the problem by which only the first modulus 
64K / 
+       // of $val are stored at the blob field 
//////////////////////////////////// 
+       // Thx Abel Berenstein  aberenstein#afip.gov.ar
+       $len = strlen($val); 
+       $chunk_size = 32768; 
+       $tail_size = $len % $chunk_size; 
+       $n_chunks = ($len - $tail_size) / $chunk_size; 
+       
+       for ($n = 0; $n < $n_chunks; $n++) { 
+               $start = $n * $chunk_size; 
+               $data = substr($val, $start, $chunk_size); 
+               ibase_blob_add($blob_id, $data); 
+       } 
+       
+       if ($tail_size) {
+               $start = $n_chunks * $chunk_size; 
+               $data = substr($val, $start, $tail_size); 
+               ibase_blob_add($blob_id, $data); 
+       }
+       // end replacement 
///////////////////////////////////////////////////////// 
+       
+       $blob_id_str = ibase_blob_close($blob_id); 
+       
+       return $this->Execute("UPDATE $table SET $column=(?) WHERE 
$where",array($blob_id_str)) != false; 
+       
+       } 
+       
+       
+       function OldUpdateBlob($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;
+       }
+       
+       // Format date column in sql string given an input format that 
understands Y M D
+       // Only since Interbase 6.0 - uses EXTRACT
+       // problem - does not zero-fill the day and month yet
+       function SQLDate($fmt, $col=false)
+       {       
+               if (!$col) $col = $this->sysDate;
+               $s = '';
+               
+               $len = strlen($fmt);
+               for ($i=0; $i < $len; $i++) {
+                       if ($s) $s .= '||';
+                       $ch = $fmt[$i];
+                       switch($ch) {
+                       case 'Y':
+                       case 'y':
+                               $s .= "extract(year from $col)";
+                               break;
+                       case 'M':
+                       case 'm':
+                               $s .= "extract(month from $col)";
+                               break;
+                       case 'Q':
+                       case 'q':
+                               $s .= "cast(((extract(month from $col)+2) / 3) 
as integer)";
+                               break;
+                       case 'D':
+                       case 'd':
+                               $s .= "(extract(day from $col))";
+                               break;
+                       case 'H':
+                       case 'h':
+                         $s .= "(extract(hour from $col))";
+                         break;                        
+                       case 'I':
+                       case 'i':
+                         $s .= "(extract(minute from $col))";
+                         break;                
+                       case 'S':
+                       case 's':
+                         $s .= "CAST((extract(second from $col)) AS INTEGER)";
+                         break;        
+
+                       default:
+                               if ($ch == '\\') {
+                                       $i++;
+                                       $ch = substr($fmt,$i,1);
+                               }
+                               $s .= $this->qstr($ch);
+                               break;
+                       }
+               }
+               return $s;
+       }
+}
+
+/*--------------------------------------------------------------------------------------
+                Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_ibase extends ADORecordSet
+{
+
+       var $databaseType = "ibase";
+       var $bind=false;
+       var $_cacheType;
+       
+       function ADORecordset_ibase($id,$mode=false)
+       {
+       global $ADODB_FETCH_MODE;
+       
+                       $this->fetchMode = ($mode === false) ? 
$ADODB_FETCH_MODE : $mode;
+                       $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);
+                        switch (ADODB_ASSOC_CASE) {
+                        case 2: // the default
+                               $fld->name = ($ibf['alias']);
+                                if (empty($fld->name)) $fld->name = 
($ibf['name']);
+                                break;
+                        case 0: 
+                                $fld->name = strtoupper($ibf['alias']);
+                                if (empty($fld->name)) $fld->name = 
strtoupper($ibf['name']);
+                                break;
+                        case 1: 
+                               $fld->name = strtolower($ibf['alias']);
+                                if (empty($fld->name)) $fld->name = 
strtolower($ibf['name']);
+                                break;
+                        }
+                        
+                        $fld->type = $ibf['type'];
+                        $fld->max_length = $ibf['length'];
+                        
+                        /*       This needs to be populated from the metadata 
*/ 
+                        $fld->not_null = false;
+                        $fld->has_default = false;
+                        $fld->default_value = 'null';
+                        return $fld;
+       }
+
+       function _initrs()
+       {
+               $this->_numOfRows = -1;
+               $this->_numOfFields = @ibase_num_fields($this->_queryID);
+
+               // cache types for blob decode check
+               for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
+                       $f1 = $this->FetchField($i); 
+                       $this->_cacheType[] = $f1->type;
+               }                               
+       }
+
+       function _seek($row)
+       {
+               return false;
+       }
+       
+       function _fetch() 
+       {
+               $f = @ibase_fetch_row($this->_queryID); 
+               if ($f === false) {
+                       $this->fields = false;
+                       return false;
+               }
+               // OPN stuff start - optimized
+               // fix missing nulls and decode blobs automatically
+       
+               global $ADODB_ANSI_PADDING_OFF;
+               //$ADODB_ANSI_PADDING_OFF=1;
+               $rtrim = !empty($ADODB_ANSI_PADDING_OFF);
+               
+               for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
+                       if ($this->_cacheType[$i]=="BLOB") {
+                               if (isset($f[$i])) { 
+                                       $f[$i] = 
$this->connection->_BlobDecode($f[$i]); 
+                               } else { 
+                                       $f[$i] = null; 
+                               } 
+                       } else { 
+                               if (!isset($f[$i])) { 
+                                       $f[$i] = null; 
+                               } else if ($rtrim && is_string($f[$i])) {
+                                       $f[$i] = rtrim($f[$i]);
+                               }
+                       } 
+               } 
+               // OPN stuff end 
+               
+               $this->fields = $f;
+               if ($this->fetchMode == ADODB_FETCH_ASSOC) {
+                       $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
+               } else if ($this->fetchMode == ADODB_FETCH_BOTH) {
+                       $this->fields =& 
array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
+               }
+               return true;
+       }
+
+       /* Use associative array to get fields array */
+       function Fields($colname)
+       {
+               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->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,$fieldobj=false)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               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 'TIME': return 'T';
+                               //case 'T': return 'T';
+
+                               //case 'L': return 'L';
+               case 'INT': 
+               case 'SHORT':
+               case 'INTEGER': return 'I';
+               default: return 'N';
+               }
+       }
+
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-informix.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-informix.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-informix.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-informix.inc.php:1.2       Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-informix.inc.php   Tue Feb 21 13:47:42 2006
@@ -1,35 +1,35 @@
-<?php
-/**
-* @version V4.54 5 Nov 2004 (c) 2000-2004 John Lim (address@hidden). 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
-*
-* Informix 9 driver that supports SELECT FIRST
-*
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-informix72.inc.php');
-
-class ADODB_informix extends ADODB_informix72 {
-       var $databaseType = "informix";
-       var $hasTop = 'FIRST';
-       var $ansiOuter = true;
-}
-
-class ADORecordset_informix extends ADORecordset_informix72 {
-       var $databaseType = "informix";
-       
-       function ADORecordset_informix($id,$mode=false)
-       {
-               $this->ADORecordset_informix72($id,$mode);
-       }
-}
+<?php
+/**
+* @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). 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
+*
+* Informix 9 driver that supports SELECT FIRST
+*
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR.'/drivers/adodb-informix72.inc.php');
+
+class ADODB_informix extends ADODB_informix72 {
+       var $databaseType = "informix";
+       var $hasTop = 'FIRST';
+       var $ansiOuter = true;
+}
+
+class ADORecordset_informix extends ADORecordset_informix72 {
+       var $databaseType = "informix";
+       
+       function ADORecordset_informix($id,$mode=false)
+       {
+               $this->ADORecordset_informix72($id,$mode);
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php:1.2     Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php Tue Feb 21 13:47:42 2006
@@ -1,404 +1,475 @@
-<?php
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 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://adodb.sourceforge.net
-
-  Informix port by Mitchell T. Young (address@hidden)
-
-  Further mods by "Samuel CARRIERE" <address@hidden>
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('IFX_SCROLL')) define('IFX_SCROLL',1);
-
-class ADODB_informix72 extends ADOConnection {
-       var $databaseType = "informix72";
-       var $dataProvider = "informix";
-       var $replaceQuote = "''"; // string to use to replace quotes
-       var $fmtDate = "'Y-m-d'";
-       var $fmtTimeStamp = "'Y-m-d H:i:s'";
-       var $hasInsertID = true;
-       var $hasAffectedRows = true;
-    var $substr = 'substr';
-       var $metaTablesSQL="select tabname from systables where tabtype!=' ' 
and owner!='informix'"; //Don't get informix tables and pseudo-tables
-
-
-       var $metaColumnsSQL = 
-               "select c.colname, c.coltype, c.collength, d.default,c.colno
-               from syscolumns c, systables t,outer sysdefaults d
-               where c.tabid=t.tabid and d.tabid=t.tabid and d.colno=c.colno
-               and tabname='%s' order by c.colno";
-
-       var $metaPrimaryKeySQL =
-               "select part1,part2,part3,part4,part5,part6,part7,part8 from
-               systables t,sysconstraints s,sysindexes i where t.tabname='%s'
-               and s.tabid=t.tabid and s.constrtype='P'
-               and i.idxname=s.idxname";
-
-       var $concat_operator = '||';
-
-       var $lastQuery = false;
-       var $has_insertid = true;
-
-       var $_autocommit = true;
-       var $_bindInputArray = true;  // set to true if ADOConnection.Execute() 
permits binding of array parameters.
-       var $sysDate = 'TODAY';
-       var $sysTimeStamp = 'CURRENT';
-       var $cursorType = IFX_SCROLL; // IFX_SCROLL or IFX_HOLD or 0
-   
-       function ADODB_informix72()
-       {
-               // alternatively, use older method:
-               //putenv("DBDATE=Y4MD-");
-
-               // force ISO date format
-               putenv('GL_DATE=%Y-%m-%d');
-               
-               if (function_exists('ifx_byteasvarchar')) {
-                       ifx_byteasvarchar(1); // Mode "0" will return a blob 
id, and mode "1" will return a varchar with text content. 
-               ifx_textasvarchar(1); // Mode "0" will return a blob id, and 
mode "1" will return a varchar with text content. 
-               ifx_blobinfile_mode(0); // Mode "0" means save Byte-Blobs in 
memory, and mode "1" means save Byte-Blobs in a file.
-               }
-       }
-       
-       function ServerInfo()
-       {
-           if (isset($this->version)) return $this->version;
-       
-           $arr['description'] = $this->GetOne("select 
DBINFO('version','full') from systables where tabid = 1");
-           $arr['version'] = $this->GetOne("select DBINFO('version','major') 
|| DBINFO('version','minor') from systables where tabid = 1");
-           $this->version = $arr;
-           return $arr;
-       }
-
-
-
-       function _insertid()
-       {
-               $sqlca =ifx_getsqlca($this->lastQuery);
-               return @$sqlca["sqlerrd1"];
-       }
-
-       function _affectedrows()
-       {
-               if ($this->lastQuery) {
-                  return @ifx_affected_rows ($this->lastQuery);
-               }
-               return 0;
-       }
-
-       function BeginTrans()
-       {
-               if ($this->transOff) return true;
-               $this->transCnt += 1;
-               $this->Execute('BEGIN');
-               $this->_autocommit = false;
-               return true;
-       }
-
-       function CommitTrans($ok=true) 
-       { 
-               if (!$ok) return $this->RollbackTrans();
-               if ($this->transOff) return true;
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->Execute('COMMIT');
-               $this->_autocommit = true;
-               return true;
-       }
-
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true;
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->Execute('ROLLBACK');
-               $this->_autocommit = true;
-               return true;
-       }
-
-       function RowLock($tables,$where)
-       {
-               if ($this->_autocommit) $this->BeginTrans();
-               return $this->GetOne("select 1 as ignore from $tables where 
$where for update");
-       }
-
-       /*      Returns: the last error message from previous database operation
-               Note: This function is NOT available for Microsoft SQL Server.  
*/
-
-       function ErrorMsg() 
-       {
-               if (!empty($this->_logsql)) return $this->_errorMsg;
-               $this->_errorMsg = ifx_errormsg();
-               return $this->_errorMsg;
-       }
-
-       function ErrorNo()
-       {
-               preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse); //!EOS
-               if (is_array($parse) && isset($parse[1])) return 
(int)$parse[1]; 
-               return 0;
-       }
-
-   
-    function &MetaColumns($table)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               if (!empty($this->metaColumnsSQL)) {
-                       $save = $ADODB_FETCH_MODE;
-                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                       if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
-                       $rs = 
$this->Execute(sprintf($this->metaColumnsSQL,$table));
-                       if (isset($savem)) $this->SetFetchMode($savem);
-                       $ADODB_FETCH_MODE = $save;
-                       if ($rs === false) return false;
-                       $rspkey = 
$this->Execute(sprintf($this->metaPrimaryKeySQL,$table)); //Added to get 
primary key colno items
-
-                       $retarr = array();
-                       while (!$rs->EOF) { //print_r($rs->fields);
-                               $fld = new ADOFieldObject();
-                               $fld->name = $rs->fields[0];
-                               $fld->type = $rs->fields[1];
-                               $fld->primary_key=$rspkey->fields && 
array_search($rs->fields[4],$rspkey->fields); //Added to set primary key flag
-                               $fld->max_length = $rs->fields[2];
-                               if (trim($rs->fields[3]) != "AAAAAA 0") {
-                                       $fld->has_default = 1;
-                                       $fld->default_value = $rs->fields[3];
-                               } else {
-                                       $fld->has_default = 0;
-                               }
-
-                $retarr[strtolower($fld->name)] = $fld;        
-                               $rs->MoveNext();
-                       }
-
-                       $rs->Close();
-                       return $retarr; 
-               }
-
-               return false;
-       }
-       
-   function &xMetaColumns($table)
-   {
-               return ADOConnection::MetaColumns($table,false);
-   }
-
-   function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
-   {
-               $type = ($blobtype == 'TEXT') ? 1 : 0;
-               $blobid = ifx_create_blob($type,0,$val);
-               return $this->Execute("UPDATE $table SET $column=(?) WHERE 
$where",array($blobid));
-   }
-
-   function BlobDecode($blobid)
-   {
-               return function_exists('ifx_byteasvarchar') ? $blobid : 
@ifx_get_blob($blobid);
-   }
-   
-       // returns true or false
-   function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               if (!function_exists('ifx_connect')) return null;
-               
-               $dbs = $argDatabasename . "@" . $argHostname;
-               if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); 
-               putenv("INFORMIXSERVER=".trim($argHostname)); 
-               $this->_connectionID = 
ifx_connect($dbs,$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)
-       {
-               if (!function_exists('ifx_connect')) return null;
-               
-               $dbs = $argDatabasename . "@" . $argHostname;
-               putenv("INFORMIXSERVER=".trim($argHostname)); 
-               $this->_connectionID = 
ifx_pconnect($dbs,$argUsername,$argPassword);
-               if ($this->_connectionID === false) return false;
-               #if ($argDatabasename) return $this->SelectDB($argDatabasename);
-               return true;
-       }
-/*
-       // ifx_do does not accept bind parameters - weird ???
-       function Prepare($sql)
-       {
-               $stmt = ifx_prepare($sql);
-               if (!$stmt) return $sql;
-               else return array($sql,$stmt);
-       }
-*/
-       // returns query ID if successful, otherwise false
-       function _query($sql,$inputarr)
-       {
-       global $ADODB_COUNTRECS;
-       
-         // String parameters have to be converted using ifx_create_char
-         if ($inputarr) {
-                foreach($inputarr as $v) {
-                       if (gettype($v) == 'string') {
-                          $tab[] = ifx_create_char($v);
-                       }
-                       else {
-                          $tab[] = $v;
-                       }
-                }
-         }
-
-         // In case of select statement, we use a scroll cursor in order
-         // to be able to call "move", or "movefirst" statements
-         if (!$ADODB_COUNTRECS && preg_match("/^\s*select/is", $sql)) {
-                if ($inputarr) {
-                       $this->lastQuery = ifx_query($sql,$this->_connectionID, 
$this->cursorType, $tab);
-                }
-                else {
-                       $this->lastQuery = ifx_query($sql,$this->_connectionID, 
$this->cursorType);
-                }
-         }
-         else {
-                if ($inputarr) {
-                       $this->lastQuery = ifx_query($sql,$this->_connectionID, 
$tab);
-                }
-                else {
-                       $this->lastQuery = ifx_query($sql,$this->_connectionID);
-                }
-         }
-
-         // Following line have been commented because autocommit mode is
-         // not supported by informix SE 7.2
-
-         //if ($this->_autocommit) ifx_query('COMMIT',$this->_connectionID);
-
-               return $this->lastQuery;
-       }
-
-       // returns true or false
-       function _close()
-       {
-               $this->lastQuery = false;
-               return ifx_close($this->_connectionID);
-       }
-}
-
-
-/*--------------------------------------------------------------------------------------
-        Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_informix72 extends ADORecordSet {
-
-       var $databaseType = "informix72";
-       var $canSeek = true;
-       var $_fieldprops = false;
-
-       function ADORecordset_informix72($id,$mode=false)
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               $this->fetchMode = $mode;
-               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 (empty($this->_fieldprops)) {
-                       $fp = ifx_fieldproperties($this->_queryID);
-                       foreach($fp as $k => $v) {
-                               $o = new ADOFieldObject;
-                               $o->name = $k;
-                               $arr = split(';',$v); 
//"SQLTYPE;length;precision;scale;ISNULLABLE"
-                               $o->type = $arr[0];
-                               $o->max_length = $arr[1];
-                               $this->_fieldprops[] = $o;
-                               $o->not_null = $arr[4]=="N";
-                       }
-               }
-               return $this->_fieldprops[$fieldOffset];
-       }
-
-       function _initrs()
-       {
-               $this->_numOfRows = -1; // ifx_affected_rows not reliable, only 
returns estimate -- ($ADODB_COUNTRECS)? ifx_affected_rows($this->_queryID):-1;
-               $this->_numOfFields = ifx_num_fields($this->_queryID);
-       }
-
-       function _seek($row)
-       {
-               return @ifx_fetch_row($this->_queryID, (int) $row);
-       }
-
-   function MoveLast()
-   {
-         $this->fields = @ifx_fetch_row($this->_queryID, "LAST");
-         if ($this->fields) $this->EOF = false;
-         $this->_currentRow = -1;
-
-         if ($this->fetchMode == ADODB_FETCH_NUM) {
-                foreach($this->fields as $v) {
-                       $arr[] = $v;
-                }
-                $this->fields = $arr;
-         }
-
-         return true;
-   }
-
-   function MoveFirst()
-       {
-         $this->fields = @ifx_fetch_row($this->_queryID, "FIRST");
-         if ($this->fields) $this->EOF = false;
-         $this->_currentRow = 0;
-
-         if ($this->fetchMode == ADODB_FETCH_NUM) {
-                foreach($this->fields as $v) {
-                       $arr[] = $v;
-                }
-                $this->fields = $arr;
-         }
-
-         return true;
-   }
-
-   function _fetch($ignore_fields=false)
-   {
-
-               $this->fields = @ifx_fetch_row($this->_queryID);
-
-               if (!is_array($this->fields)) return false;
-
-               if ($this->fetchMode == ADODB_FETCH_NUM) {
-                       foreach($this->fields as $v) {
-                               $arr[] = $v;
-                       }
-                       $this->fields = $arr;
-               }
-               return 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 ifx_free_result($this->_queryID);
-       }
-
-}
+<?php
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 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://adodb.sourceforge.net
+
+  Informix port by Mitchell T. Young (address@hidden)
+
+  Further mods by "Samuel CARRIERE" <address@hidden>
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('IFX_SCROLL')) define('IFX_SCROLL',1);
+
+class ADODB_informix72 extends ADOConnection {
+       var $databaseType = "informix72";
+       var $dataProvider = "informix";
+       var $replaceQuote = "''"; // string to use to replace quotes
+       var $fmtDate = "'Y-m-d'";
+       var $fmtTimeStamp = "'Y-m-d H:i:s'";
+       var $hasInsertID = true;
+       var $hasAffectedRows = true;
+    var $substr = 'substr';
+       var $metaTablesSQL="select tabname,tabtype from systables where tabtype 
in ('T','V') and owner!='informix'"; //Don't get informix tables and 
pseudo-tables
+
+
+       var $metaColumnsSQL = 
+               "select c.colname, c.coltype, c.collength, d.default,c.colno
+               from syscolumns c, systables t,outer sysdefaults d
+               where c.tabid=t.tabid and d.tabid=t.tabid and d.colno=c.colno
+               and tabname='%s' order by c.colno";
+
+       var $metaPrimaryKeySQL =
+               "select part1,part2,part3,part4,part5,part6,part7,part8 from
+               systables t,sysconstraints s,sysindexes i where t.tabname='%s'
+               and s.tabid=t.tabid and s.constrtype='P'
+               and i.idxname=s.idxname";
+
+       var $concat_operator = '||';
+
+       var $lastQuery = false;
+       var $has_insertid = true;
+
+       var $_autocommit = true;
+       var $_bindInputArray = true;  // set to true if ADOConnection.Execute() 
permits binding of array parameters.
+       var $sysDate = 'TODAY';
+       var $sysTimeStamp = 'CURRENT';
+       var $cursorType = IFX_SCROLL; // IFX_SCROLL or IFX_HOLD or 0
+   
+       function ADODB_informix72()
+       {
+               // alternatively, use older method:
+               //putenv("DBDATE=Y4MD-");
+
+               // force ISO date format
+               putenv('GL_DATE=%Y-%m-%d');
+               
+               if (function_exists('ifx_byteasvarchar')) {
+                       ifx_byteasvarchar(1); // Mode "0" will return a blob 
id, and mode "1" will return a varchar with text content. 
+               ifx_textasvarchar(1); // Mode "0" will return a blob id, and 
mode "1" will return a varchar with text content. 
+               ifx_blobinfile_mode(0); // Mode "0" means save Byte-Blobs in 
memory, and mode "1" means save Byte-Blobs in a file.
+               }
+       }
+       
+       function ServerInfo()
+       {
+           if (isset($this->version)) return $this->version;
+       
+           $arr['description'] = $this->GetOne("select 
DBINFO('version','full') from systables where tabid = 1");
+           $arr['version'] = $this->GetOne("select DBINFO('version','major') 
|| DBINFO('version','minor') from systables where tabid = 1");
+           $this->version = $arr;
+           return $arr;
+       }
+
+
+
+       function _insertid()
+       {
+               $sqlca =ifx_getsqlca($this->lastQuery);
+               return @$sqlca["sqlerrd1"];
+       }
+
+       function _affectedrows()
+       {
+               if ($this->lastQuery) {
+                  return @ifx_affected_rows ($this->lastQuery);
+               }
+               return 0;
+       }
+
+       function BeginTrans()
+       {
+               if ($this->transOff) return true;
+               $this->transCnt += 1;
+               $this->Execute('BEGIN');
+               $this->_autocommit = false;
+               return true;
+       }
+
+       function CommitTrans($ok=true) 
+       { 
+               if (!$ok) return $this->RollbackTrans();
+               if ($this->transOff) return true;
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->Execute('COMMIT');
+               $this->_autocommit = true;
+               return true;
+       }
+
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true;
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->Execute('ROLLBACK');
+               $this->_autocommit = true;
+               return true;
+       }
+
+       function RowLock($tables,$where,$flds='1 as ignore')
+       {
+               if ($this->_autocommit) $this->BeginTrans();
+               return $this->GetOne("select $flds from $tables where $where 
for update");
+       }
+
+       /*      Returns: the last error message from previous database operation
+               Note: This function is NOT available for Microsoft SQL Server.  
*/
+
+       function ErrorMsg() 
+       {
+               if (!empty($this->_logsql)) return $this->_errorMsg;
+               $this->_errorMsg = ifx_errormsg();
+               return $this->_errorMsg;
+       }
+
+       function ErrorNo()
+       {
+               preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse);
+               if (is_array($parse) && isset($parse[1])) return 
(int)$parse[1]; 
+               return 0;
+       }
+
+   
+    function &MetaColumns($table)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $false = false;
+               if (!empty($this->metaColumnsSQL)) {
+                       $save = $ADODB_FETCH_MODE;
+                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+                       if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
+                       $rs = 
$this->Execute(sprintf($this->metaColumnsSQL,$table));
+                       if (isset($savem)) $this->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+                       if ($rs === false) return $false;
+                       $rspkey = 
$this->Execute(sprintf($this->metaPrimaryKeySQL,$table)); //Added to get 
primary key colno items
+
+                       $retarr = array();
+                       while (!$rs->EOF) { //print_r($rs->fields);
+                               $fld = new ADOFieldObject();
+                               $fld->name = $rs->fields[0];
+/*  //!eos.
+                                               $rs->fields[1] is not the 
correct adodb type
+                                               $rs->fields[2] is not correct 
max_length, because can include not-null bit
+
+                               $fld->type = $rs->fields[1];
+                               $fld->primary_key=$rspkey->fields && 
array_search($rs->fields[4],$rspkey->fields); //Added to set primary key flag
+                               $fld->max_length = $rs->fields[2];*/
+                               $pr=ifx_props($rs->fields[1],$rs->fields[2]); 
//!eos
+                               $fld->type = $pr[0] ;//!eos
+                               $fld->primary_key=$rspkey->fields && 
array_search($rs->fields[4],$rspkey->fields);
+                               $fld->max_length = $pr[1]; //!eos
+                               $fld->precision = $pr[2] ;//!eos
+                               $fld->not_null = $pr[3]=="N"; //!eos
+
+                               if (trim($rs->fields[3]) != "AAAAAA 0") {
+                                       $fld->has_default = 1;
+                                       $fld->default_value = $rs->fields[3];
+                               } else {
+                                       $fld->has_default = 0;
+                               }
+
+                $retarr[strtolower($fld->name)] = $fld;        
+                               $rs->MoveNext();
+                       }
+
+                       $rs->Close();
+                       $rspKey->Close(); //!eos
+                       return $retarr; 
+               }
+
+               return $false;
+       }
+       
+   function &xMetaColumns($table)
+   {
+               return ADOConnection::MetaColumns($table,false);
+   }
+
+        function MetaForeignKeys($table, $owner=false, $upper=false) //!Eos
+       {
+               $sql = "
+                       select tr.tabname,updrule,delrule,
+                       i.part1 o1,i2.part1 d1,i.part2 o2,i2.part2 d2,i.part3 
o3,i2.part3 d3,i.part4 o4,i2.part4 d4,
+                       i.part5 o5,i2.part5 d5,i.part6 o6,i2.part6 d6,i.part7 
o7,i2.part7 d7,i.part8 o8,i2.part8 d8
+                       from systables t,sysconstraints s,sysindexes i,
+                       sysreferences r,systables tr,sysconstraints 
s2,sysindexes i2
+                       where t.tabname='$table'
+                       and s.tabid=t.tabid and s.constrtype='R' and 
r.constrid=s.constrid
+                       and i.idxname=s.idxname and tr.tabid=r.ptabid
+                       and s2.constrid=r.primary and i2.idxname=s2.idxname";
+
+               $rs = $this->Execute($sql);
+               if (!$rs || $rs->EOF)  return false;
+               $arr =& $rs->GetArray();
+               $a = array();
+               foreach($arr as $v) {
+                       $coldest=$this->metaColumnNames($v["tabname"]);
+                       $colorig=$this->metaColumnNames($table);
+                       $colnames=array();
+                       for($i=1;$i<=8 && $v["o$i"] ;$i++) {
+                               
$colnames[]=$coldest[$v["d$i"]-1]."=".$colorig[$v["o$i"]-1];
+                       }
+                       if($upper)
+                               $a[strtoupper($v["tabname"])] =  $colnames;
+                       else
+                               $a[$v["tabname"]] =  $colnames;
+               }
+               return $a;
+        }
+
+   function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
+   {
+               $type = ($blobtype == 'TEXT') ? 1 : 0;
+               $blobid = ifx_create_blob($type,0,$val);
+               return $this->Execute("UPDATE $table SET $column=(?) WHERE 
$where",array($blobid));
+   }
+
+   function BlobDecode($blobid)
+   {
+               return function_exists('ifx_byteasvarchar') ? $blobid : 
@ifx_get_blob($blobid);
+   }
+   
+       // returns true or false
+   function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               if (!function_exists('ifx_connect')) return null;
+               
+               $dbs = $argDatabasename . "@" . $argHostname;
+               if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); 
+               putenv("INFORMIXSERVER=".trim($argHostname)); 
+               $this->_connectionID = 
ifx_connect($dbs,$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)
+       {
+               if (!function_exists('ifx_connect')) return null;
+               
+               $dbs = $argDatabasename . "@" . $argHostname;
+               putenv("INFORMIXSERVER=".trim($argHostname)); 
+               $this->_connectionID = 
ifx_pconnect($dbs,$argUsername,$argPassword);
+               if ($this->_connectionID === false) return false;
+               #if ($argDatabasename) return $this->SelectDB($argDatabasename);
+               return true;
+       }
+/*
+       // ifx_do does not accept bind parameters - weird ???
+       function Prepare($sql)
+       {
+               $stmt = ifx_prepare($sql);
+               if (!$stmt) return $sql;
+               else return array($sql,$stmt);
+       }
+*/
+       // returns query ID if successful, otherwise false
+       function _query($sql,$inputarr)
+       {
+       global $ADODB_COUNTRECS;
+       
+         // String parameters have to be converted using ifx_create_char
+         if ($inputarr) {
+                foreach($inputarr as $v) {
+                       if (gettype($v) == 'string') {
+                          $tab[] = ifx_create_char($v);
+                       }
+                       else {
+                          $tab[] = $v;
+                       }
+                }
+         }
+
+         // In case of select statement, we use a scroll cursor in order
+         // to be able to call "move", or "movefirst" statements
+         if (!$ADODB_COUNTRECS && preg_match("/^\s*select/is", $sql)) {
+                if ($inputarr) {
+                       $this->lastQuery = ifx_query($sql,$this->_connectionID, 
$this->cursorType, $tab);
+                }
+                else {
+                       $this->lastQuery = ifx_query($sql,$this->_connectionID, 
$this->cursorType);
+                }
+         }
+         else {
+                if ($inputarr) {
+                       $this->lastQuery = ifx_query($sql,$this->_connectionID, 
$tab);
+                }
+                else {
+                       $this->lastQuery = ifx_query($sql,$this->_connectionID);
+                }
+         }
+
+         // Following line have been commented because autocommit mode is
+         // not supported by informix SE 7.2
+
+         //if ($this->_autocommit) ifx_query('COMMIT',$this->_connectionID);
+
+               return $this->lastQuery;
+       }
+
+       // returns true or false
+       function _close()
+       {
+               $this->lastQuery = false;
+               return ifx_close($this->_connectionID);
+       }
+}
+
+
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_informix72 extends ADORecordSet {
+
+       var $databaseType = "informix72";
+       var $canSeek = true;
+       var $_fieldprops = false;
+
+       function ADORecordset_informix72($id,$mode=false)
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               $this->fetchMode = $mode;
+               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 (empty($this->_fieldprops)) {
+                       $fp = ifx_fieldproperties($this->_queryID);
+                       foreach($fp as $k => $v) {
+                               $o = new ADOFieldObject;
+                               $o->name = $k;
+                               $arr = split(';',$v); 
//"SQLTYPE;length;precision;scale;ISNULLABLE"
+                               $o->type = $arr[0];
+                               $o->max_length = $arr[1];
+                               $this->_fieldprops[] = $o;
+                               $o->not_null = $arr[4]=="N";
+                       }
+               }
+               $ret = $this->_fieldprops[$fieldOffset];
+               return $ret;
+       }
+
+       function _initrs()
+       {
+               $this->_numOfRows = -1; // ifx_affected_rows not reliable, only 
returns estimate -- ($ADODB_COUNTRECS)? ifx_affected_rows($this->_queryID):-1;
+               $this->_numOfFields = ifx_num_fields($this->_queryID);
+       }
+
+       function _seek($row)
+       {
+               return @ifx_fetch_row($this->_queryID, (int) $row);
+       }
+
+   function MoveLast()
+   {
+         $this->fields = @ifx_fetch_row($this->_queryID, "LAST");
+         if ($this->fields) $this->EOF = false;
+         $this->_currentRow = -1;
+
+         if ($this->fetchMode == ADODB_FETCH_NUM) {
+                foreach($this->fields as $v) {
+                       $arr[] = $v;
+                }
+                $this->fields = $arr;
+         }
+
+         return true;
+   }
+
+   function MoveFirst()
+       {
+         $this->fields = @ifx_fetch_row($this->_queryID, "FIRST");
+         if ($this->fields) $this->EOF = false;
+         $this->_currentRow = 0;
+
+         if ($this->fetchMode == ADODB_FETCH_NUM) {
+                foreach($this->fields as $v) {
+                       $arr[] = $v;
+                }
+                $this->fields = $arr;
+         }
+
+         return true;
+   }
+
+   function _fetch($ignore_fields=false)
+   {
+
+               $this->fields = @ifx_fetch_row($this->_queryID);
+
+               if (!is_array($this->fields)) return false;
+
+               if ($this->fetchMode == ADODB_FETCH_NUM) {
+                       foreach($this->fields as $v) {
+                               $arr[] = $v;
+                       }
+                       $this->fields = $arr;
+               }
+               return 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 ifx_free_result($this->_queryID);
+       }
+
+}
+/** !Eos
+* Auxiliar function to Parse coltype,collength. Used by Metacolumns
+* return: array ($mtype,$length,$precision,$nullable) (similar to 
ifx_fieldpropierties)
+*/
+function ifx_props($coltype,$collength){
+       $itype=fmod($coltype+1,256);
+       $nullable=floor(($coltype+1) /256) ?"N":"Y";
+       $mtype=substr(" CIIFFNNDN TBXCC     ",$itype,1);
+       switch ($itype){
+               case 2:
+                       $length=4;
+               case 6:
+               case 9:
+               case 14:
+                       $length=floor($collength/256);
+                       $precision=fmod($collength,256);
+                       break;
+               default:
+                       $precision=0;
+                       $length=$collength;
+       }
+       return array($mtype,$length,$precision,$nullable);
+}
+
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,311 +1,406 @@
-<?php
-/*
-  V4.54 5 Nov 2004  (c) 2000-2004 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.
-  
-  
-  Joshua Eldridge (joshuae74#hotmail.com)
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB_ldap extends ADOConnection {
-    var $databaseType = 'ldap';
-       var $dataProvider = 'ldap';
-       
-       # Connection information
-    var $username = false;
-    var $password = false;
-    
-    # Used during searches
-    var $filter;
-    var $dn;
-
-
-       function ADODB_ldap() 
-       {               
-
-       }
-               
-       // returns true or false
-       
-       function _connect( $host, $username, $password, $ldapbase )
-       {
-
-          if ( !function_exists( 'ldap_connect' ) ) return null;
-          
-          $conn_info = array( $host );
-          
-          if ( strstr( $host, ':' ) ) {
-              $conn_info = split( ':', $host );
-          } 
-
-          $this->_connectionID = ldap_connect( $conn_info[0], $conn_info[1] ) 
-              or die( 'Could not connect to ' . $this->_connectionID );
-          if ($username && $password) {
-              $bind = ldap_bind( $this->_connectionID, $username, $password ) 
-                  or die( 'Could not bind to ' . $this->_connectionID . ' with 
$username & $password');
-          } else {
-              $bind = ldap_bind( $this->_connectionID ) 
-                  or die( 'Could not bind anonymously to ' . 
$this->_connectionID );
-          }
-          return $this->_connectionID;
-    }
-    
-       
-       /* returns _queryID or false */
-       function _query($sql,$inputarr)
-       {
-          $rs = ldap_search( $this->_connectionID, $this->database, $sql );
-       return $rs; 
-               
-       }
-
-    /* closes the LDAP connection */
-       function _close()
-       {
-               @ldap_close( $this->_connectionID );
-               $this->_connectionID = false;
-       }
-    
-    function ServerInfo()
-    {
-        if( is_array( $this->version ) ) return $this->version;
-        $version = array();
-        /*
-        Determines how aliases are handled during search. 
-        LDAP_DEREF_NEVER (0x00)
-        LDAP_DEREF_SEARCHING (0x01)
-        LDAP_DEREF_FINDING (0x02)
-        LDAP_DEREF_ALWAYS (0x03)
-        The LDAP_DEREF_SEARCHING value means aliases are dereferenced during 
the search but 
-        not when locating the base object of the search. The 
LDAP_DEREF_FINDING value means 
-        aliases are dereferenced when locating the base object but not during 
the search.  
-        Default: LDAP_DEREF_NEVER
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, 
$version['LDAP_OPT_DEREF'] ) ;
-        switch ( $version['LDAP_OPT_DEREF'] ) {
-          case 0:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_NEVER';
-          case 1:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_SEARCHING';
-          case 2:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_FINDING';
-          case 3:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS';
-        }
-        
-        /* 
-        A limit on the number of entries to return from a search. 
-        LDAP_NO_LIMIT (0) means no limit.
-        Default: LDAP_NO_LIMIT
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_SIZELIMIT, 
$version['LDAP_OPT_SIZELIMIT'] );
-        if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) {
-           $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT';
-        }
-        
-        /*
-        A limit on the number of seconds to spend on a search. 
-        LDAP_NO_LIMIT (0) means no limit.
-        Default: LDAP_NO_LIMIT
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_TIMELIMIT, 
$version['LDAP_OPT_TIMELIMIT'] );
-        if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) {
-           $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT';
-        }
-        
-        /*
-        Determines whether the LDAP library automatically follows referrals 
returned by LDAP servers or not. 
-        LDAP_OPT_ON
-        LDAP_OPT_OFF
-        Default: ON
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_REFERRALS, 
$version['LDAP_OPT_REFERRALS'] );
-        if ( $version['LDAP_OPT_REFERRALS'] == 0 ) {
-           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF';
-        } else {
-           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON';
-        
-        }
-        /*
-        Determines whether LDAP I/O operations are automatically restarted if 
they abort prematurely. 
-        LDAP_OPT_ON
-        LDAP_OPT_OFF
-        Default: OFF
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_RESTART, 
$version['LDAP_OPT_RESTART'] );
-        if ( $version['LDAP_OPT_RESTART'] == 0 ) {
-           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF';
-        } else {
-           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON';
-        
-        }
-        /*
-        This option indicates the version of the LDAP protocol used when 
communicating with the primary LDAP server.
-        LDAP_VERSION2 (2)
-        LDAP_VERSION3 (3)
-        Default: LDAP_VERSION2 (2)
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_PROTOCOL_VERSION, 
$version['LDAP_OPT_PROTOCOL_VERSION'] );
-        if ( $version['LDAP_OPT_PROTOCOL_VERSION'] == 2 ) {
-           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2';
-        } else {
-           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3';
-        
-        }
-        /* The host name (or list of hosts) for the primary LDAP server. */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, 
$version['LDAP_OPT_HOST_NAME'] ); 
-        ldap_get_option( $this->_connectionID, OPT_ERROR_NUMBER, 
$version['OPT_ERROR_NUMBER'] ); 
-        ldap_get_option( $this->_connectionID, OPT_ERROR_STRING, 
$version['OPT_ERROR_STRING'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, 
$version['LDAP_OPT_MATCHED_DN'] ); 
-        
-        return $this->version = $version;
-    
-    }
-}
-       
-/*--------------------------------------------------------------------------------------
-        Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_ldap extends ADORecordSet{  
-       
-       var $databaseType = "ldap";
-       var $canSeek = false;
-       var $_entryID; /* keeps track of the entry resource identifier */
-       
-       function ADORecordSet_ldap($queryID,$mode=false) 
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch ($mode)
-               {
-               case ADODB_FETCH_NUM: 
-                 $this->fetchMode = LDAP_NUM; 
-               break;
-               case ADODB_FETCH_ASSOC: 
-                 $this->fetchMode = LDAP_ASSOC; 
-               break;
-               default:
-               case ADODB_FETCH_DEFAULT:
-               case ADODB_FETCH_BOTH: 
-                 $this->fetchMode = LDAP_BOTH; 
-               break;
-               }
-       
-               $this->ADORecordSet($queryID);  
-       }
-       
-       function _initrs()
-       {
-          /* 
-          This could be teaked to respect the $COUNTRECS directive from ADODB
-          It's currently being used in the _fetch() function and the
-          GetAssoc() function
-       */
-           $this->_numOfRows = ldap_count_entries( 
$this->connection->_connectionID, $this->_queryID );
-
-       }
-
-    /*
-    Return whole recordset as a multi-dimensional associative array
-       */
-       function &GetAssoc($force_array = false, $first2cols = false) 
-       {
-               $records = $this->_numOfRows;
-        $results = array();
-            for ( $i=0; $i < $records; $i++ ) {
-                foreach ( $this->fields as $k=>$v ) {
-                    if ( is_array( $v ) ) {
-                        if ( $v['count'] == 1 ) {
-                            $results[$i][$k] = $v[0];
-                        } else {
-                            array_shift( $v );
-                            $results[$i][$k] = $v;
-                        } 
-                    }
-                }
-            }
-        
-               return $results; 
-       }
-    
-    function &GetRowAssoc()
-       {
-        $results = array();
-        foreach ( $this->fields as $k=>$v ) {
-            if ( is_array( $v ) ) {
-                if ( $v['count'] == 1 ) {
-                    $results[$k] = $v[0];
-                } else {
-                    array_shift( $v );
-                    $results[$k] = $v;
-                } 
-            }
-        }
- 
-               return $results; 
-       }
-               
-    function GetRowNums()
-    {
-        $results = array();
-        foreach ( $this->fields as $k=>$v ) {
-        static $i = 0;
-            if (is_array( $v )) {
-                if ( $v['count'] == 1 ) {
-                    $results[$i] = $v[0];
-                } else {
-                    array_shift( $v );
-                    $results[$i] = $v;
-                } 
-            $i++;
-            }
-        }
-        return $results;
-    }
-       
-       function _fetch()
-       {               
-               if ( $this->_currentRow >= $this->_numOfRows && 
$this->_numOfRows >= 0 )
-               return false;
-               
-        if ( $this->_currentRow == 0 ) {
-                 $this->_entryID = ldap_first_entry( 
$this->connection->_connectionID, $this->_queryID );
-        } else {
-          $this->_entryID = ldap_next_entry( $this->connection->_connectionID, 
$this->_entryID );
-        }
-           
-           $this->fields = ldap_get_attributes( 
$this->connection->_connectionID, $this->_entryID );
-           $this->_numOfFields = $this->fields['count'];       
-           switch ( $this->fetchMode ) {
-            
-            case LDAP_ASSOC:
-            $this->fields = $this->GetRowAssoc();
-            break;
-            
-            case LDAP_NUM:
-            $this->fields = $this->GetRowNums();
-            break;
-            
-            case LDAP_BOTH:
-            default:
-            break;
-        }
-        return ( is_array( $this->fields ) );        
-       }
-       
-       function _close() {
-               @ldap_free_result( $this->_queryID );   
-               $this->_queryID = false;
-       }
-       
-}
+<?php
+/*
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights 
reserved.
+   Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 8.
+  
+  Revision 1: (02/25/2005) Updated codebase to include the 
_inject_bind_options function. This allows
+  users to access the options in the ldap_set_option function appropriately. 
Most importantly
+  LDAP Version 3 is now supported. See the examples for more information. Also 
fixed some minor
+  bugs that surfaced when PHP error levels were set high.
+  
+  Joshua Eldridge (joshuae74#hotmail.com)
+*/ 
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('LDAP_ASSOC')) {
+        define('LDAP_ASSOC',ADODB_FETCH_ASSOC);
+        define('LDAP_NUM',ADODB_FETCH_NUM);
+        define('LDAP_BOTH',ADODB_FETCH_BOTH);
+}
+
+class ADODB_ldap extends ADOConnection {
+    var $databaseType = 'ldap';
+       var $dataProvider = 'ldap';
+       
+       # Connection information
+    var $username = false;
+    var $password = false;
+    
+    # Used during searches
+    var $filter;
+    var $dn;
+       var $version;
+       var $port = 389;
+
+       # Options configuration information
+       var $LDAP_CONNECT_OPTIONS;
+
+       function ADODB_ldap() 
+       {               
+       }
+               
+       // returns true or false
+       
+       function _connect( $host, $username, $password, $ldapbase)
+       {
+       global $LDAP_CONNECT_OPTIONS;
+               
+               if ( !function_exists( 'ldap_connect' ) ) return null;
+               
+               $conn_info = array( $host,$this->port);
+               
+               if ( strstr( $host, ':' ) ) {
+                   $conn_info = split( ':', $host );
+               } 
+               
+               $this->_connectionID = ldap_connect( $conn_info[0], 
$conn_info[1] );
+               if (!$this->_connectionID) {
+                       $e = 'Could not connect to ' . $conn_info[0];
+                       $this->_errorMsg = $e;
+                       if ($this->debug) ADOConnection::outp($e);
+                       return false;
+               }
+               if( count( $LDAP_CONNECT_OPTIONS ) > 0 ) {
+                       $this->_inject_bind_options( $LDAP_CONNECT_OPTIONS );
+               }
+               
+               if ($username) {
+                   $bind = ldap_bind( $this->_connectionID, $username, 
$password );
+               } else {
+                       $username = 'anonymous';
+                   $bind = ldap_bind( $this->_connectionID );          
+               }
+               
+               if (!$bind) {
+                       $e = 'Could not bind to ' . $conn_info[0] . " as 
".$username;
+                       $this->_errorMsg = $e;
+                       if ($this->debug) ADOConnection::outp($e);
+                       return false;
+               }
+               $this->_errorMsg = '';
+               $this->database = $ldapbase;
+               return $this->_connectionID;
+       }
+    
+/*
+       Valid Domain Values for LDAP Options:
+
+       LDAP_OPT_DEREF (integer)
+       LDAP_OPT_SIZELIMIT (integer)
+       LDAP_OPT_TIMELIMIT (integer)
+       LDAP_OPT_PROTOCOL_VERSION (integer)
+       LDAP_OPT_ERROR_NUMBER (integer)
+       LDAP_OPT_REFERRALS (boolean)
+       LDAP_OPT_RESTART (boolean)
+       LDAP_OPT_HOST_NAME (string)
+       LDAP_OPT_ERROR_STRING (string)
+       LDAP_OPT_MATCHED_DN (string)
+       LDAP_OPT_SERVER_CONTROLS (array)
+       LDAP_OPT_CLIENT_CONTROLS (array)
+
+       Make sure to set this BEFORE calling Connect()
+
+       Example:
+
+       $LDAP_CONNECT_OPTIONS = Array(
+               Array (
+                       "OPTION_NAME"=>LDAP_OPT_DEREF,
+                       "OPTION_VALUE"=>2
+               ),
+               Array (
+                       "OPTION_NAME"=>LDAP_OPT_SIZELIMIT,
+                       "OPTION_VALUE"=>100
+               ),
+               Array (
+                       "OPTION_NAME"=>LDAP_OPT_TIMELIMIT,
+                       "OPTION_VALUE"=>30
+               ),
+               Array (
+                       "OPTION_NAME"=>LDAP_OPT_PROTOCOL_VERSION,
+                       "OPTION_VALUE"=>3
+               ),
+               Array (
+                       "OPTION_NAME"=>LDAP_OPT_ERROR_NUMBER,
+                       "OPTION_VALUE"=>13
+               ),
+               Array (
+                       "OPTION_NAME"=>LDAP_OPT_REFERRALS,
+                       "OPTION_VALUE"=>FALSE
+               ),
+               Array (
+                       "OPTION_NAME"=>LDAP_OPT_RESTART,
+                       "OPTION_VALUE"=>FALSE
+               )
+       );
+*/
+
+       function _inject_bind_options( $options ) {
+               foreach( $options as $option ) {
+                       ldap_set_option( $this->_connectionID, 
$option["OPTION_NAME"], $option["OPTION_VALUE"] )
+                               or die( "Unable to set server option: " . 
$option["OPTION_NAME"] );
+               }
+       }
+       
+       /* returns _queryID or false */
+       function _query($sql,$inputarr)
+       {
+               $rs = ldap_search( $this->_connectionID, $this->database, $sql 
);
+               $this->_errorMsg = ($rs) ? '' : 'Search error on '.$sql;
+               return $rs; 
+       }
+
+    /* closes the LDAP connection */
+       function _close()
+       {
+               @ldap_close( $this->_connectionID );
+               $this->_connectionID = false;
+       }
+    
+       function SelectDB($db) {
+               $this->database = $db;
+               return true;
+       } // SelectDB
+
+    function ServerInfo()
+    {
+        if( !empty( $this->version ) ) return $this->version;
+        $version = array();
+        /*
+        Determines how aliases are handled during search. 
+        LDAP_DEREF_NEVER (0x00)
+        LDAP_DEREF_SEARCHING (0x01)
+        LDAP_DEREF_FINDING (0x02)
+        LDAP_DEREF_ALWAYS (0x03)
+        The LDAP_DEREF_SEARCHING value means aliases are dereferenced during 
the search but 
+        not when locating the base object of the search. The 
LDAP_DEREF_FINDING value means 
+        aliases are dereferenced when locating the base object but not during 
the search.  
+        Default: LDAP_DEREF_NEVER
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, 
$version['LDAP_OPT_DEREF'] ) ;
+        switch ( $version['LDAP_OPT_DEREF'] ) {
+          case 0:
+            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_NEVER';
+          case 1:
+            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_SEARCHING';
+          case 2:
+            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_FINDING';
+          case 3:
+            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS';
+        }
+        
+        /* 
+        A limit on the number of entries to return from a search. 
+        LDAP_NO_LIMIT (0) means no limit.
+        Default: LDAP_NO_LIMIT
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_SIZELIMIT, 
$version['LDAP_OPT_SIZELIMIT'] );
+        if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) {
+           $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT';
+        }
+        
+        /*
+        A limit on the number of seconds to spend on a search. 
+        LDAP_NO_LIMIT (0) means no limit.
+        Default: LDAP_NO_LIMIT
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_TIMELIMIT, 
$version['LDAP_OPT_TIMELIMIT'] );
+        if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) {
+           $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT';
+        }
+        
+        /*
+        Determines whether the LDAP library automatically follows referrals 
returned by LDAP servers or not. 
+        LDAP_OPT_ON
+        LDAP_OPT_OFF
+        Default: ON
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_REFERRALS, 
$version['LDAP_OPT_REFERRALS'] );
+        if ( $version['LDAP_OPT_REFERRALS'] == 0 ) {
+           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF';
+        } else {
+           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON';
+        
+        }
+        /*
+        Determines whether LDAP I/O operations are automatically restarted if 
they abort prematurely. 
+        LDAP_OPT_ON
+        LDAP_OPT_OFF
+        Default: OFF
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_RESTART, 
$version['LDAP_OPT_RESTART'] );
+        if ( $version['LDAP_OPT_RESTART'] == 0 ) {
+           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF';
+        } else {
+           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON';
+        
+        }
+        /*
+        This option indicates the version of the LDAP protocol used when 
communicating with the primary LDAP server.
+        LDAP_VERSION2 (2)
+        LDAP_VERSION3 (3)
+        Default: LDAP_VERSION2 (2)
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_PROTOCOL_VERSION, 
$version['LDAP_OPT_PROTOCOL_VERSION'] );
+        if ( $version['LDAP_OPT_PROTOCOL_VERSION'] == 2 ) {
+           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2';
+        } else {
+           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3';
+        
+        }
+        /* The host name (or list of hosts) for the primary LDAP server. */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, 
$version['LDAP_OPT_HOST_NAME'] ); 
+        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, 
$version['LDAP_OPT_ERROR_NUMBER'] ); 
+        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, 
$version['LDAP_OPT_ERROR_STRING'] ); 
+        ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, 
$version['LDAP_OPT_MATCHED_DN'] ); 
+        
+        return $this->version = $version;
+    
+    }
+}
+       
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_ldap extends ADORecordSet{  
+       
+       var $databaseType = "ldap";
+       var $canSeek = false;
+       var $_entryID; /* keeps track of the entry resource identifier */
+       
+       function ADORecordSet_ldap($queryID,$mode=false) 
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               switch ($mode)
+               {
+               case ADODB_FETCH_NUM: 
+                 $this->fetchMode = LDAP_NUM; 
+               break;
+               case ADODB_FETCH_ASSOC: 
+                 $this->fetchMode = LDAP_ASSOC; 
+               break;
+               case ADODB_FETCH_DEFAULT:
+               case ADODB_FETCH_BOTH: 
+               default:
+                 $this->fetchMode = LDAP_BOTH; 
+               break;
+               }
+       
+               $this->ADORecordSet($queryID);  
+       }
+       
+       function _initrs()
+       {
+          /* 
+          This could be teaked to respect the $COUNTRECS directive from ADODB
+          It's currently being used in the _fetch() function and the
+          GetAssoc() function
+       */
+           $this->_numOfRows = ldap_count_entries( 
$this->connection->_connectionID, $this->_queryID );
+
+       }
+
+    /*
+    Return whole recordset as a multi-dimensional associative array
+       */
+       function &GetAssoc($force_array = false, $first2cols = false) 
+       {
+               $records = $this->_numOfRows;
+        $results = array();
+            for ( $i=0; $i < $records; $i++ ) {
+                foreach ( $this->fields as $k=>$v ) {
+                    if ( is_array( $v ) ) {
+                        if ( $v['count'] == 1 ) {
+                            $results[$i][$k] = $v[0];
+                        } else {
+                            array_shift( $v );
+                            $results[$i][$k] = $v;
+                        } 
+                    }
+                }
+            }
+        
+               return $results; 
+       }
+    
+    function &GetRowAssoc()
+       {
+        $results = array();
+        foreach ( $this->fields as $k=>$v ) {
+            if ( is_array( $v ) ) {
+                if ( $v['count'] == 1 ) {
+                    $results[$k] = $v[0];
+                } else {
+                    array_shift( $v );
+                    $results[$k] = $v;
+                } 
+            }
+        }
+ 
+               return $results; 
+       }
+               
+    function GetRowNums()
+    {
+        $results = array();
+        foreach ( $this->fields as $k=>$v ) {
+        static $i = 0;
+            if (is_array( $v )) {
+                if ( $v['count'] == 1 ) {
+                    $results[$i] = $v[0];
+                } else {
+                    array_shift( $v );
+                    $results[$i] = $v;
+                } 
+            $i++;
+            }
+        }
+        return $results;
+    }
+       
+       function _fetch()
+       {               
+               if ( $this->_currentRow >= $this->_numOfRows && 
$this->_numOfRows >= 0 )
+               return false;
+               
+        if ( $this->_currentRow == 0 ) {
+                 $this->_entryID = ldap_first_entry( 
$this->connection->_connectionID, $this->_queryID );
+        } else {
+          $this->_entryID = ldap_next_entry( $this->connection->_connectionID, 
$this->_entryID );
+        }
+           
+           $this->fields = ldap_get_attributes( 
$this->connection->_connectionID, $this->_entryID );
+           $this->_numOfFields = $this->fields['count'];       
+           switch ( $this->fetchMode ) {
+            
+            case LDAP_ASSOC:
+            $this->fields = $this->GetRowAssoc();
+            break;
+            
+            case LDAP_NUM:
+                       $this->fields = 
array_merge($this->GetRowNums(),$this->GetRowAssoc());
+            break;
+            
+            case LDAP_BOTH:
+            default:
+                       $this->fields = $this->GetRowNums();
+            break;
+        }
+        return ( is_array( $this->fields ) );        
+       }
+       
+       function _close() {
+               @ldap_free_result( $this->_queryID );   
+               $this->_queryID = false;
+       }
+       
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php:1.2  Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php      Tue Feb 21 13:47:42 2006
@@ -1,993 +1,1024 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Native mssql driver. Requires mssql client. Works on Windows. 
-  To configure for Unix, see 
-       http://phpbuilder.com/columns/alberto20000919.php3
-       
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-//----------------------------------------------------------------
-// MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
-// and this causes tons of problems because localized versions of 
-// MSSQL will return the dates in dmy or  mdy order; and also the 
-// month strings depends on what language has been configured. The 
-// following two variables allow you to control the localization
-// settings - Ugh.
-//
-// MORE LOCALIZATION INFO
-// ----------------------
-// To configure datetime, look for and modify sqlcommn.loc, 
-//     typically found in c:\mssql\install
-// Also read :
-//      http://support.microsoft.com/default.aspx?scid=kb;EN-US;q220918
-// Alternatively use:
-//        CONVERT(char(12),datecol,120)
-//----------------------------------------------------------------
-
-
-// has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
-if (ADODB_PHPVER >= 0x4300) {
-// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
-       ini_set('mssql.datetimeconvert',0); 
-} else {
-global $ADODB_mssql_mths;              // array, months must be upper-case
-
-
-       $ADODB_mssql_date_order = 'mdy'; 
-       $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);
-}
-
-//---------------------------------------------------------------------------
-// Call this to autoset $ADODB_mssql_date_order at the beginning of your code,
-// just after you connect to the database. Supports mdy and dmy only.
-// Not required for PHP 4.2.0 and above.
-function AutoDetect_MSSQL_Date_Order($conn)
-{
-global $ADODB_mssql_date_order;
-       $adate = $conn->GetOne('select getdate()');
-       if ($adate) {
-               $anum = (int) $adate;
-               if ($anum > 0) {
-                       if ($anum > 31) {
-                               //ADOConnection::outp( "MSSQL: YYYY-MM-DD date 
format not supported currently");
-                       } else
-                               $ADODB_mssql_date_order = 'dmy';
-               } else
-                       $ADODB_mssql_date_order = 'mdy';
-       }
-}
-
-class ADODB_mssql extends ADOConnection {
-       var $databaseType = "mssql";    
-       var $dataProvider = "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 $substr = "substring";
-       var $length = 'len';
-       var $hasAffectedRows = true;
-       var $metaDatabasesSQL = "select name from sysdatabases where name <> 
'master'";
-       var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' 
end 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','dtproperties'))";
-       var $metaColumnsSQL = # xtype==61 is datetime
-"select c.name,t.name,c.length,
-       (case when c.xusertype=61 then 0 else c.xprec end),
-       (case when c.xusertype=61 then 0 else c.xscale end) 
-       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 = 'top';            // support mssql SELECT TOP 10 * FROM 
TABLE
-       var $hasGenID = true;
-       var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-       var $sysTimeStamp = 'GetDate()';
-       var $_has_mssql_init;
-       var $maxParameterLen = 4000;
-       var $arrayClass = 'ADORecordSet_array_mssql';
-       var $uniqueSort = true;
-       var $leftOuter = '*=';
-       var $rightOuter = '=*';
-       var $ansiOuter = true; // for mssql7 or later
-       var $poorAffectedRows = true;
-       var $identitySQL = 'select @@IDENTITY'; // 'select SCOPE_IDENTITY'; # 
for mssql 2000
-       var $uniqueOrderBy = true;
-       var $_bindInputArray = true;
-       
-       
-       function ADODB_mssql() 
-       {               
-               $this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
-       }
-
-       function ServerInfo()
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $stmt = $this->PrepareSP('sp_server_info');
-               $val = 2;
-               if ($this->fetchMode === false) {
-                       $savem = $ADODB_FETCH_MODE;
-                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               } else 
-                       $savem = $this->SetFetchMode(ADODB_FETCH_NUM);
-               
-               
-               $this->Parameter($stmt,$val,'attribute_id');
-               $row = $this->GetRow($stmt);
-               
-               //$row = $this->GetRow("execute sp_server_info 2");
-               
-               if ($this->fetchMode === false) {
-                       $ADODB_FETCH_MODE = $savem;
-               } else
-                       $this->SetFetchMode($savem);
-               
-               $arr['description'] = $row[2];
-               $arr['version'] = ADOConnection::_findvers($arr['description']);
-               return $arr;
-       }
-       
-       function IfNull( $field, $ifNull ) 
-       {
-               return " ISNULL($field, $ifNull) "; // if MS SQL Server
-       }
-       
-       function _insertid()
-       {
-       // SCOPE_IDENTITY()
-       // Returns the last IDENTITY value inserted into an IDENTITY column in 
-       // the same scope. A scope is a module -- a stored procedure, trigger, 
-       // function, or batch. Thus, two statements are in the same scope if 
-       // they are in the same stored procedure, function, or batch.
-                       return $this->GetOne($this->identitySQL);
-       }
-
-       function _affectedrows()
-       {
-               return $this->GetOne('select @@rowcount');
-       }
-
-       var $_dropSeqSQL = "drop table %s";
-       
-       function CreateSequence($seq='adodbseq',$start=1)
-       {
-               $start -= 1;
-               $this->Execute("create table $seq (id float(53))");
-               $ok = $this->Execute("insert into $seq with (tablock,holdlock) 
values($start)");
-               if (!$ok) {
-                               $this->Execute('ROLLBACK TRANSACTION adodbseq');
-                               return false;
-               }
-               $this->Execute('COMMIT TRANSACTION adodbseq'); 
-               return true;
-       }
-
-       function GenID($seq='adodbseq',$start=1)
-       {
-               //$this->debug=1;
-               $this->Execute('BEGIN TRANSACTION adodbseq');
-               $ok = $this->Execute("update $seq with (tablock,holdlock) set 
id = id + 1");
-               if (!$ok) {
-                       $this->Execute("create table $seq (id float(53))");
-                       $ok = $this->Execute("insert into $seq with 
(tablock,holdlock) values($start)");
-                       if (!$ok) {
-                               $this->Execute('ROLLBACK TRANSACTION adodbseq');
-                               return false;
-                       }
-                       $this->Execute('COMMIT TRANSACTION adodbseq'); 
-                       return $start;
-               }
-               $num = $this->GetOne("select id from $seq");
-               $this->Execute('COMMIT TRANSACTION adodbseq'); 
-               return $num;
-               
-               // in old implementation, pre 1.90, we returned GUID...
-               //return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) 
AS 'Char'");
-       }
-       
-
-       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
-       {
-               if ($nrows > 0 && $offset <= 0) {
-                       $sql = preg_replace(
-                               
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows 
",$sql);
-                       $rs =& $this->Execute($sql,$inputarr);
-               } else
-                       $rs =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-       
-               return $rs;
-       }
-       
-       
-       // Format date column in sql string given an input format that 
understands Y M D
-       function SQLDate($fmt, $col=false)
-       {       
-               if (!$col) $col = $this->sysTimeStamp;
-               $s = '';
-               
-               $len = strlen($fmt);
-               for ($i=0; $i < $len; $i++) {
-                       if ($s) $s .= '+';
-                       $ch = $fmt[$i];
-                       switch($ch) {
-                       case 'Y':
-                       case 'y':
-                               $s .= "datename(yyyy,$col)";
-                               break;
-                       case 'M':
-                               $s .= "convert(char(3),$col,0)";
-                               break;
-                       case 'm':
-                               $s .= "replace(str(month($col),2),' ','0')";
-                               break;
-                       case 'Q':
-                       case 'q':
-                               $s .= "datename(quarter,$col)";
-                               break;
-                       case 'D':
-                       case 'd':
-                               $s .= "replace(str(day($col),2),' ','0')";
-                               break;
-                       case 'h':
-                               $s .= 
"substring(convert(char(14),$col,0),13,2)";
-                               break;
-                       
-                       case 'H':
-                               $s .= "replace(str(datepart(hh,$col),2),' 
','0')";
-                               break;
-                               
-                       case 'i':
-                               $s .= "replace(str(datepart(mi,$col),2),' 
','0')";
-                               break;
-                       case 's':
-                               $s .= "replace(str(datepart(ss,$col),2),' 
','0')";
-                               break;
-                       case 'a':
-                       case 'A':
-                               $s .= 
"substring(convert(char(19),$col,0),18,2)";
-                               break;
-                               
-                       default:
-                               if ($ch == '\\') {
-                                       $i++;
-                                       $ch = substr($fmt,$i,1);
-                               }
-                               $s .= $this->qstr($ch);
-                               break;
-                       }
-               }
-               return $s;
-       }
-
-       
-       function BeginTrans()
-       {
-               if ($this->transOff) return true; 
-               $this->transCnt += 1;
-               $this->Execute('BEGIN TRAN');
-               return true;
-       }
-               
-       function CommitTrans($ok=true) 
-       { 
-               if ($this->transOff) return true; 
-               if (!$ok) return $this->RollbackTrans();
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->Execute('COMMIT TRAN');
-               return true;
-       }
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true; 
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->Execute('ROLLBACK TRAN');
-               return true;
-       }
-       
-       /*
-               Usage:
-               
-               $this->BeginTrans();
-               $this->RowLock('table1,table2','table1.id=33 and 
table2.id=table1.id'); # lock row 33 for both tables
-               
-               # some operation on both tables table1 and table2
-               
-               $this->CommitTrans();
-               
-               See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
-       */
-       function RowLock($tables,$where) 
-       {
-               if (!$this->transCnt) $this->BeginTrans();
-               return $this->GetOne("select top 1 null as ignore from $tables 
with (ROWLOCK,HOLDLOCK) where $where");
-       }
-       
-       
-       function &MetaIndexes($table,$primary=false)
-       {
-               $table = $this->qstr($table);
-
-               $sql = "SELECT i.name AS ind_name, C.name AS col_name, 
USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
-                       CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 
2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
-                       CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-                       FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON 
o.id = i.id 
-                       INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND 
I.Indid = K.Indid 
-                       INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid 
= C.Colid
-                       WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 
AND O.Name LIKE $table
-                       ORDER BY O.name, I.Name, K.keyno";
-
-               global $ADODB_FETCH_MODE;
-               $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-               $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-               return FALSE;
-        }
-
-               $indexes = array();
-               while ($row = $rs->FetchRow()) {
-                       if (!$primary && $row[5]) continue;
-                       
-            $indexes[$row[0]]['unique'] = $row[6];
-            $indexes[$row[0]]['columns'][] = $row[1];
-       }
-        return $indexes;
-       }
-       
-       function MetaForeignKeys($table, $owner=false, $upper=false)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $table = $this->qstr(strtoupper($table));
-               
-               $sql = 
-"select object_name(constid) as constraint_name,
-       col_name(fkeyid, fkey) as column_name,
-       object_name(rkeyid) as referenced_table_name,
-       col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where upper(object_name(fkeyid)) = $table
-order by constraint_name, referenced_table_name, keyno";
-               
-               $constraints =& $this->GetArray($sql);
-               
-               $ADODB_FETCH_MODE = $save;
-               
-               $arr = false;
-               foreach($constraints as $constr) {
-                       //print_r($constr);
-                       $arr[$constr[0]][$constr[2]][] = 
$constr[1].'='.$constr[3]; 
-               }
-               if (!$arr) return false;
-               
-               $arr2 = false;
-               
-               foreach($arr as $k => $v) {
-                       foreach($v as $a => $b) {
-                               if ($upper) $a = strtoupper($a);
-                               $arr2[$a] = $b;
-                       }
-               }
-               return $arr2;
-       }
-
-       //From: Fernando Moreira <address@hidden>
-       function MetaDatabases() 
-       { 
-               if(@mssql_select_db("master")) { 
-                                $qry=$this->metaDatabasesSQL; 
-                                if(address@hidden($qry)){ 
-                                                $tmpAr=$ar=array(); 
-                                                while(address@hidden($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); 
-       } 
-
-       // "Stein-Aksel Basma" <address@hidden>
-       // tested with MSSQL 2000
-       function &MetaPrimaryKeys($table)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $schema = '';
-               $this->_findschema($table,$schema);
-               if (!$schema) $schema = $this->database;
-               if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
-
-               $sql = "select distinct k.column_name,ordinal_position from 
information_schema.key_column_usage k,
-               information_schema.table_constraints tc 
-               where tc.constraint_name = k.constraint_name and 
tc.constraint_type =
-               'PRIMARY KEY' and k.table_name = '$table' $schema order by 
ordinal_position ";
-               
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $a = $this->GetCol($sql);
-               $ADODB_FETCH_MODE = $savem;
-               
-               if ($a && sizeof($a)>0) return $a;
-               return false;     
-       }
-
-       
-       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-       {
-               if ($mask) {
-                       $save = $this->metaTablesSQL;
-                       $mask = $this->qstr(($mask));
-                       $this->metaTablesSQL .= " AND name like $mask";
-               }
-               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
-               
-               if ($mask) {
-                       $this->metaTablesSQL = $save;
-               }
-               return $ret;
-       }
- 
-       function SelectDB($dbName) 
-       {
-               $this->databaseName = $dbName;
-               if ($this->_connectionID) {
-                       return @mssql_select_db($dbName);               
-               }
-               else return false;      
-       }
-       
-       function ErrorMsg() 
-       {
-               if (empty($this->_errorMsg)){
-                       $this->_errorMsg = mssql_get_last_message();
-               }
-               return $this->_errorMsg;
-       }
-       
-       function ErrorNo() 
-       {
-               if ($this->_logsql && $this->_errorCode !== false) return 
$this->_errorCode;
-               if (empty($this->_errorMsg)) {
-                       $this->_errorMsg = mssql_get_last_message();
-               }
-               $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)
-       {
-               if (!function_exists('mssql_pconnect')) return null;
-               $this->_connectionID = 
mssql_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)
-       {
-               if (!function_exists('mssql_pconnect')) return null;
-               $this->_connectionID = 
mssql_pconnect($argHostname,$argUsername,$argPassword);
-               if ($this->_connectionID === false) return false;
-               
-               // persistent connections can forget to rollback on crash, so 
we do it here.
-               if ($this->autoRollback) {
-                       $cnt = $this->GetOne('select @@TRANCOUNT');
-                       while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); 
-               }
-               if ($argDatabasename) return $this->SelectDB($argDatabasename);
-               return true;    
-       }
-       
-       function Prepare($sql)
-       {
-               $sqlarr = explode('?',$sql);
-               if (sizeof($sqlarr) <= 1) return $sql;
-               $sql2 = $sqlarr[0];
-               for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
-                       $sql2 .=  '@P'.($i-1) . $sqlarr[$i];
-               } 
-               return array($sql,$this->qstr($sql2),$max);
-       }
-       
-       function PrepareSP($sql)
-       {
-               if (!$this->_has_mssql_init) {
-                       ADOConnection::outp( "PrepareSP: mssql_init only 
available since PHP 4.1.0");
-                       return $sql;
-               }
-               $stmt = mssql_init($sql,$this->_connectionID);
-               if (!$stmt)  return $sql;
-               return array($sql,$stmt);
-       }
-       
-       /* 
-       Usage:
-               $stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, 
@myid and @group
-               
-               # note that the parameter does not have @ in front!
-               $db->Parameter($stmt,$id,'myid');
-               $db->Parameter($stmt,$group,'group',false,64);
-               $db->Execute($stmt);
-               
-               @param $stmt Statement returned by Prepare() or PrepareSP().
-               @param $var PHP variable to bind to. Can set to null (for 
isNull support).
-               @param $name Name of stored procedure variable name to bind to.
-               @param [$isOutput] Indicates direction of parameter 0/false=IN  
1=OUT  2= IN/OUT. This is ignored in oci8.
-               @param [$maxLen] Holds an maximum length of the variable.
-               @param [$type] The data type of $var. Legal values depend on 
driver.
-               
-               See mssql_bind documentation at php.net.
-       */
-       function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, 
$type=false)
-       {
-               if (!$this->_has_mssql_init) {
-                       ADOConnection::outp( "Parameter: mssql_bind only 
available since PHP 4.1.0");
-                       return $sql;
-               }
-
-               $isNull = is_null($var); // php 4.0.4 and above...
-                       
-               if ($type === false) 
-                       switch(gettype($var)) {
-                       default:
-                       case 'string': $type = SQLCHAR; break;
-                       case 'double': $type = SQLFLT8; break;
-                       case 'integer': $type = SQLINT4; break;
-                       case 'boolean': $type = SQLINT1; break; # SQLBIT not 
supported in 4.1.0
-                       }
-               
-               if  ($this->debug) {
-                       $prefix = ($isOutput) ? 'Out' : 'In';
-                       $ztype = (empty($type)) ? 'false' : $type;
-                       ADOConnection::outp( "{$prefix}Parameter(\$stmt, 
\$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
-               }
-               /*
-                       See http://phplens.com/lens/lensforum/msgs.php?id=7231
-                       
-                       RETVAL is HARD CODED into php_mssql extension:
-                       The return value (a long integer value) is treated like 
a special OUTPUT parameter, 
-                       called "RETVAL" (without the @). See the example at 
mssql_execute to 
-                       see how it works. - type: one of this new supported PHP 
constants. 
-                               SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, 
SQLINT4, SQLBIT,SQLFLT8 
-               */
-               if ($name !== 'RETVAL') $name = '@'.$name;
-               return mssql_bind($stmt[1], $name, $var, $type, $isOutput, 
$isNull, $maxLen);
-       }
-       
-       /* 
-               Unfortunately, it appears that mssql cannot handle varbinary > 
255 chars
-               So all your blobs must be of type "image".
-               
-               Remember to set in php.ini the following...
-               
-               ; Valid range 0 - 2147483647. Default = 4096. 
-               mssql.textlimit = 0 ; zero to pass through 
-
-               ; Valid range 0 - 2147483647. Default = 4096. 
-               mssql.textsize = 0 ; zero to pass through 
-       */
-       function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-       {
-       
-               if (strtoupper($blobtype) == 'CLOB') {
-                       $sql = "UPDATE $table SET $column='" . $val . "' WHERE 
$where";
-                       return $this->Execute($sql) != false;
-               }
-               $sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE 
$where";
-               return $this->Execute($sql) != false;
-       }
-       
-       // returns query ID if successful, otherwise false
-       function _query($sql,$inputarr)
-       {
-               $this->_errorMsg = false;
-               if (is_array($inputarr)) {
-                       
-                       # bind input params with sp_executesql: 
-                       # see 
http://www.quest-pipelines.com/newsletter-v3/0402_F.htm
-                       # works only with sql server 7 and newer
-                       if (!is_array($sql)) $sql = $this->Prepare($sql);
-                       $params = '';
-                       $decl = '';
-                       $i = 0;
-                       foreach($inputarr as $v) {
-                               if ($decl) {
-                                       $decl .= ', ';
-                                       $params .= ', ';
-                               }       
-                               if (is_string($v)) {
-                                       $len = strlen($v);
-                                       if ($len == 0) $len = 1;
-                                       
-                                       if ($len > 4000 ) {
-                                               // NVARCHAR is max 4000 chars. 
Let's use NTEXT
-                                               $decl .= "@P$i NTEXT";
-                                       } else {
-                                               $decl .= "@P$i NVARCHAR($len)";
-                                       }
-
-                                       $params .= "@P$i=N". 
(strncmp($v,"'",1)==0? $v : $this->qstr($v));
-                               } else if (is_integer($v)) {
-                                       $decl .= "@P$i INT";
-                                       $params .= "@P$i=".$v;
-                               } else if (is_float($v)) {
-                                       $decl .= "@P$i FLOAT";
-                                       $params .= "@P$i=".$v;
-                               } else if (is_bool($v)) {
-                                       $decl .= "@P$i INT"; # Used INT just in 
case BIT in not supported on the user's MSSQL version. It will cast 
appropriately.
-                                       $params .= "@P$i=".(($v)?'1':'0'); # 
True == 1 in MSSQL BIT fields and acceptable for storing logical true in an int 
field
-                               } else {
-                                       $decl .= "@P$i CHAR"; # Used char 
because a type is required even when the value is to be NULL.
-                                       $params .= "@P$i=NULL";
-                                       }
-                               $i += 1;
-                       }
-                       $decl = $this->qstr($decl);
-                       if ($this->debug) ADOConnection::outp("<font 
size=-1>sp_executesql N{$sql[1]},N$decl,$params</font>");
-                       $rez = mssql_query("sp_executesql 
N{$sql[1]},N$decl,$params");
-                       
-               } else if (is_array($sql)) {
-                       # PrepareSP()
-                       $rez = mssql_execute($sql[1]);
-                       
-               } else {
-                       $rez = mssql_query($sql,$this->_connectionID);
-               }
-               return $rez;
-       }
-       
-       // returns true or false
-       function _close()
-       { 
-               if ($this->transCnt) $this->RollbackTrans();
-               $rez = @mssql_close($this->_connectionID);
-               $this->_connectionID = false;
-               return $rez;
-       }
-       
-       // mssql uses a default date like Dec 30 2000 12:00AM
-       function UnixDate($v)
-       {
-               return ADORecordSet_array_mssql::UnixDate($v);
-       }
-       
-       function UnixTimeStamp($v)
-       {
-               return ADORecordSet_array_mssql::UnixTimeStamp($v);
-       }       
-}
-       
-/*--------------------------------------------------------------------------------------
-        Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_mssql extends ADORecordSet {        
-
-       var $databaseType = "mssql";
-       var $canSeek = true;
-       var $hasFetchAssoc; // see 
http://phplens.com/lens/lensforum/msgs.php?id=6083
-       // _mths works only in non-localised system
-       
-       function ADORecordset_mssql($id,$mode=false)
-       {
-               // freedts check...
-               $this->hasFetchAssoc = function_exists('mssql_fetch_assoc');
-
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               $this->fetchMode = $mode;
-               return $this->ADORecordSet($id,$mode);
-       }
-       
-       
-       function _initrs()
-       {
-       GLOBAL $ADODB_COUNTRECS;        
-               $this->_numOfRows = ($ADODB_COUNTRECS)? 
@mssql_num_rows($this->_queryID):-1;
-               $this->_numOfFields = @mssql_num_fields($this->_queryID);
-       }
-       
-
-       //Contributed by "Sven Axelsson" <address@hidden>
-       // get next resultset - requires PHP 4.0.5 or later
-       function NextRecordSet()
-       {
-               if (!mssql_next_result($this->_queryID)) return false;
-               $this->_inited = false;
-               $this->bind = false;
-               $this->_currentRow = -1;
-               $this->Init();
-               return true;
-       }
-
-       /* Use associative array to get fields array */
-       function Fields($colname)
-       {
-               if ($this->fetchMode != ADODB_FETCH_NUM) return 
$this->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 _seek($row) 
-       {
-               return @mssql_data_seek($this->_queryID, $row);
-       }
-
-       // speedup
-       function MoveNext() 
-       {
-               if ($this->EOF) return false;
-               
-               $this->_currentRow++;
-               
-               if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-                       if ($this->fetchMode & ADODB_FETCH_NUM) {
-                               //ADODB_FETCH_BOTH mode
-                               $this->fields = 
@mssql_fetch_array($this->_queryID);
-                       }
-                       else {
-                               if ($this->hasFetchAssoc) {// only for PHP 
4.2.0 or later
-                                        $this->fields = 
@mssql_fetch_assoc($this->_queryID);
-                               } else {
-                                       $flds = 
@mssql_fetch_array($this->_queryID);
-                                       if (is_array($flds)) {
-                                               $fassoc = array();
-                                               foreach($flds as $k => $v) {
-                                                       if (is_numeric($k)) 
continue;
-                                                       $fassoc[$k] = $v;
-                                               }
-                                               $this->fields = $fassoc;
-                                       } else
-                                               $this->fields = false;
-                               }
-                       }
-                       
-                       if (is_array($this->fields)) {
-                               if (ADODB_ASSOC_CASE == 0) {
-                                       foreach($this->fields as $k=>$v) {
-                                               $this->fields[strtolower($k)] = 
$v;
-                                       }
-                               } else if (ADODB_ASSOC_CASE == 1) {
-                                       foreach($this->fields as $k=>$v) {
-                                               $this->fields[strtoupper($k)] = 
$v;
-                                       }
-                               }
-                       }
-               } else {
-                       $this->fields = @mssql_fetch_row($this->_queryID);
-               }
-               if ($this->fields) return true;
-               $this->EOF = true;
-               
-               return false;
-       }
-
-       
-       // 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) 
-       {
-               if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-                       if ($this->fetchMode & ADODB_FETCH_NUM) {
-                               //ADODB_FETCH_BOTH mode
-                               $this->fields = 
@mssql_fetch_array($this->_queryID);
-                       } else {
-                               if ($this->hasFetchAssoc) // only for PHP 4.2.0 
or later
-                                       $this->fields = 
@mssql_fetch_assoc($this->_queryID);
-                               else {
-                                       $this->fields = 
@mssql_fetch_array($this->_queryID);
-                                       if (@is_array($$this->fields)) {
-                                               $fassoc = array();
-                                               foreach($$this->fields as $k => 
$v) {
-                                                       if (is_integer($k)) 
continue;
-                                                       $fassoc[$k] = $v;
-                                               }
-                                               $this->fields = $fassoc;
-                                       }
-                               }
-                       }
-                       
-                       if (!$this->fields) {
-                       } else if (ADODB_ASSOC_CASE == 0) {
-                               foreach($this->fields as $k=>$v) {
-                                       $this->fields[strtolower($k)] = $v;
-                               }
-                       } else if (ADODB_ASSOC_CASE == 1) {
-                               foreach($this->fields as $k=>$v) {
-                                       $this->fields[strtoupper($k)] = $v;
-                               }
-                       }
-               } else {
-                       $this->fields = @mssql_fetch_row($this->_queryID);
-               }
-               return $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() 
-       {
-               $rez = mssql_free_result($this->_queryID);      
-               $this->_queryID = false;
-               return $rez;
-       }
-       // mssql uses a default date like Dec 30 2000 12:00AM
-       function UnixDate($v)
-       {
-               return ADORecordSet_array_mssql::UnixDate($v);
-       }
-       
-       function UnixTimeStamp($v)
-       {
-               return ADORecordSet_array_mssql::UnixTimeStamp($v);
-       }
-       
-}
-
-
-class ADORecordSet_array_mssql extends ADORecordSet_array {
-       function ADORecordSet_array_mssql($id=-1,$mode=false) 
-       {
-               $this->ADORecordSet_array($id,$mode);
-       }
-       
-               // mssql uses a default date like Dec 30 2000 12:00AM
-       function UnixDate($v)
-       {
-       
-               if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) 
return parent::UnixDate($v);
-               
-       global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-       
-               //Dec 30 2000 12:00AM 
-               if ($ADODB_mssql_date_order == 'dmy') {
-                       if (!preg_match( "|^([0-9]{1,2})[-/\. 
]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-                               return parent::UnixDate($v);
-                       }
-                       if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-                       
-                       $theday = $rr[1];
-                       $themth =  substr(strtoupper($rr[2]),0,3);
-               } else {
-                       if (!preg_match( "|^([A-Za-z]{3})[-/\. 
]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-                               return parent::UnixDate($v);
-                       }
-                       if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-                       
-                       $theday = $rr[2];
-                       $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,$theday,$rr[3]);
-       }
-       
-       function UnixTimeStamp($v)
-       {
-       
-               if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) 
return parent::UnixTimeStamp($v);
-               
-       global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-       
-               //Dec 30 2000 12:00AM
-                if ($ADODB_mssql_date_order == 'dmy') {
-                        if (!preg_match( "|^([0-9]{1,2})[-/\. 
]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-                       ,$v, $rr)) return parent::UnixTimeStamp($v);
-                       if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-               
-                       $theday = $rr[1];
-                       $themth =  substr(strtoupper($rr[2]),0,3);
-               } else {
-                       if (!preg_match( "|^([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] <= TIMESTAMP_FIRST_YEAR) return 0;
-               
-                       $theday = $rr[2];
-                       $themth = substr(strtoupper($rr[1]),0,3);
-               }
-               
-               $themth = $ADODB_mssql_mths[$themth];
-               if ($themth <= 0) return false;
-               
-               switch (strtoupper($rr[6])) {
-               case 'P':
-                       if ($rr[4]<12) $rr[4] += 12;
-                       break;
-               case 'A':
-                       if ($rr[4]==12) $rr[4] = 0;
-                       break;
-               default:
-                       break;
-               }
-               // h-m-s-MM-DD-YY
-               return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
-       }
-}
-
-/*
-Code Example 1:
-
-select         object_name(constid) as constraint_name,
-               object_name(fkeyid) as table_name, 
-        col_name(fkeyid, fkey) as column_name,
-       object_name(rkeyid) as referenced_table_name,
-       col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where object_name(fkeyid) = x
-order by constraint_name, table_name, referenced_table_name,  keyno
-
-Code Example 2:
-select         constraint_name,
-       column_name,
-       ordinal_position
-from information_schema.key_column_usage
-where constraint_catalog = db_name()
-and table_name = x
-order by constraint_name, ordinal_position
-
-http://www.databasejournal.com/scripts/article.php/1440551
-*/
-
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Native mssql driver. Requires mssql client. Works on Windows. 
+  To configure for Unix, see 
+       http://phpbuilder.com/columns/alberto20000919.php3
+       
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+//----------------------------------------------------------------
+// MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
+// and this causes tons of problems because localized versions of 
+// MSSQL will return the dates in dmy or  mdy order; and also the 
+// month strings depends on what language has been configured. The 
+// following two variables allow you to control the localization
+// settings - Ugh.
+//
+// MORE LOCALIZATION INFO
+// ----------------------
+// To configure datetime, look for and modify sqlcommn.loc, 
+//     typically found in c:\mssql\install
+// Also read :
+//      http://support.microsoft.com/default.aspx?scid=kb;EN-US;q220918
+// Alternatively use:
+//        CONVERT(char(12),datecol,120)
+//----------------------------------------------------------------
+
+
+// has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
+if (ADODB_PHPVER >= 0x4300) {
+// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
+       ini_set('mssql.datetimeconvert',0); 
+} else {
+global $ADODB_mssql_mths;              // array, months must be upper-case
+
+
+       $ADODB_mssql_date_order = 'mdy'; 
+       $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);
+}
+
+//---------------------------------------------------------------------------
+// Call this to autoset $ADODB_mssql_date_order at the beginning of your code,
+// just after you connect to the database. Supports mdy and dmy only.
+// Not required for PHP 4.2.0 and above.
+function AutoDetect_MSSQL_Date_Order($conn)
+{
+global $ADODB_mssql_date_order;
+       $adate = $conn->GetOne('select getdate()');
+       if ($adate) {
+               $anum = (int) $adate;
+               if ($anum > 0) {
+                       if ($anum > 31) {
+                               //ADOConnection::outp( "MSSQL: YYYY-MM-DD date 
format not supported currently");
+                       } else
+                               $ADODB_mssql_date_order = 'dmy';
+               } else
+                       $ADODB_mssql_date_order = 'mdy';
+       }
+}
+
+class ADODB_mssql extends ADOConnection {
+       var $databaseType = "mssql";    
+       var $dataProvider = "mssql";
+       var $replaceQuote = "''"; // string to use to replace quotes
+       var $fmtDate = "'Y-m-d'";
+       var $fmtTimeStamp = "'Y-m-d H:i:s'";
+       var $hasInsertID = true;
+       var $substr = "substring";
+       var $length = 'len';
+       var $hasAffectedRows = true;
+       var $metaDatabasesSQL = "select name from sysdatabases where name <> 
'master'";
+       var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' 
end 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','dtproperties'))";
+       var $metaColumnsSQL = # xtype==61 is datetime
+"select c.name,t.name,c.length,
+       (case when c.xusertype=61 then 0 else c.xprec end),
+       (case when c.xusertype=61 then 0 else c.xscale end) 
+       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 = 'top';            // support mssql SELECT TOP 10 * FROM 
TABLE
+       var $hasGenID = true;
+       var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
+       var $sysTimeStamp = 'GetDate()';
+       var $_has_mssql_init;
+       var $maxParameterLen = 4000;
+       var $arrayClass = 'ADORecordSet_array_mssql';
+       var $uniqueSort = true;
+       var $leftOuter = '*=';
+       var $rightOuter = '=*';
+       var $ansiOuter = true; // for mssql7 or later
+       var $poorAffectedRows = true;
+       var $identitySQL = 'select @@IDENTITY'; // 'select SCOPE_IDENTITY'; # 
for mssql 2000
+       var $uniqueOrderBy = true;
+       var $_bindInputArray = true;
+       
+       function ADODB_mssql() 
+       {               
+               $this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
+       }
+
+       function ServerInfo()
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $stmt = $this->PrepareSP('sp_server_info');
+               $val = 2;
+               if ($this->fetchMode === false) {
+                       $savem = $ADODB_FETCH_MODE;
+                       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               } else 
+                       $savem = $this->SetFetchMode(ADODB_FETCH_NUM);
+               
+               
+               $this->Parameter($stmt,$val,'attribute_id');
+               $row = $this->GetRow($stmt);
+               
+               //$row = $this->GetRow("execute sp_server_info 2");
+               
+               
+               if ($this->fetchMode === false) {
+                       $ADODB_FETCH_MODE = $savem;
+               } else
+                       $this->SetFetchMode($savem);
+               
+               $arr['description'] = $row[2];
+               $arr['version'] = ADOConnection::_findvers($arr['description']);
+               return $arr;
+       }
+       
+       function IfNull( $field, $ifNull ) 
+       {
+               return " ISNULL($field, $ifNull) "; // if MS SQL Server
+       }
+       
+       function _insertid()
+       {
+       // SCOPE_IDENTITY()
+       // Returns the last IDENTITY value inserted into an IDENTITY column in 
+       // the same scope. A scope is a module -- a stored procedure, trigger, 
+       // function, or batch. Thus, two statements are in the same scope if 
+       // they are in the same stored procedure, function, or batch.
+                       return $this->GetOne($this->identitySQL);
+       }
+
+       function _affectedrows()
+       {
+               return $this->GetOne('select @@rowcount');
+       }
+
+       var $_dropSeqSQL = "drop table %s";
+       
+       function CreateSequence($seq='adodbseq',$start=1)
+       {
+               
+               $this->Execute('BEGIN TRANSACTION adodbseq');
+               $start -= 1;
+               $this->Execute("create table $seq (id float(53))");
+               $ok = $this->Execute("insert into $seq with (tablock,holdlock) 
values($start)");
+               if (!$ok) {
+                               $this->Execute('ROLLBACK TRANSACTION adodbseq');
+                               return false;
+               }
+               $this->Execute('COMMIT TRANSACTION adodbseq'); 
+               return true;
+       }
+
+       function GenID($seq='adodbseq',$start=1)
+       {
+               //$this->debug=1;
+               $this->Execute('BEGIN TRANSACTION adodbseq');
+               $ok = $this->Execute("update $seq with (tablock,holdlock) set 
id = id + 1");
+               if (!$ok) {
+                       $this->Execute("create table $seq (id float(53))");
+                       $ok = $this->Execute("insert into $seq with 
(tablock,holdlock) values($start)");
+                       if (!$ok) {
+                               $this->Execute('ROLLBACK TRANSACTION adodbseq');
+                               return false;
+                       }
+                       $this->Execute('COMMIT TRANSACTION adodbseq'); 
+                       return $start;
+               }
+               $num = $this->GetOne("select id from $seq");
+               $this->Execute('COMMIT TRANSACTION adodbseq'); 
+               return $num;
+               
+               // in old implementation, pre 1.90, we returned GUID...
+               //return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) 
AS 'Char'");
+       }
+       
+
+       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
+       {
+               if ($nrows > 0 && $offset <= 0) {
+                       $sql = preg_replace(
+                               
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows 
",$sql);
+                       $rs =& $this->Execute($sql,$inputarr);
+               } else
+                       $rs =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+       
+               return $rs;
+       }
+       
+       
+       // Format date column in sql string given an input format that 
understands Y M D
+       function SQLDate($fmt, $col=false)
+       {       
+               if (!$col) $col = $this->sysTimeStamp;
+               $s = '';
+               
+               $len = strlen($fmt);
+               for ($i=0; $i < $len; $i++) {
+                       if ($s) $s .= '+';
+                       $ch = $fmt[$i];
+                       switch($ch) {
+                       case 'Y':
+                       case 'y':
+                               $s .= "datename(yyyy,$col)";
+                               break;
+                       case 'M':
+                               $s .= "convert(char(3),$col,0)";
+                               break;
+                       case 'm':
+                               $s .= "replace(str(month($col),2),' ','0')";
+                               break;
+                       case 'Q':
+                       case 'q':
+                               $s .= "datename(quarter,$col)";
+                               break;
+                       case 'D':
+                       case 'd':
+                               $s .= "replace(str(day($col),2),' ','0')";
+                               break;
+                       case 'h':
+                               $s .= 
"substring(convert(char(14),$col,0),13,2)";
+                               break;
+                       
+                       case 'H':
+                               $s .= "replace(str(datepart(hh,$col),2),' 
','0')";
+                               break;
+                               
+                       case 'i':
+                               $s .= "replace(str(datepart(mi,$col),2),' 
','0')";
+                               break;
+                       case 's':
+                               $s .= "replace(str(datepart(ss,$col),2),' 
','0')";
+                               break;
+                       case 'a':
+                       case 'A':
+                               $s .= 
"substring(convert(char(19),$col,0),18,2)";
+                               break;
+                               
+                       default:
+                               if ($ch == '\\') {
+                                       $i++;
+                                       $ch = substr($fmt,$i,1);
+                               }
+                               $s .= $this->qstr($ch);
+                               break;
+                       }
+               }
+               return $s;
+       }
+
+       
+       function BeginTrans()
+       {
+               if ($this->transOff) return true; 
+               $this->transCnt += 1;
+               $this->Execute('BEGIN TRAN');
+               return true;
+       }
+               
+       function CommitTrans($ok=true) 
+       { 
+               if ($this->transOff) return true; 
+               if (!$ok) return $this->RollbackTrans();
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->Execute('COMMIT TRAN');
+               return true;
+       }
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true; 
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->Execute('ROLLBACK TRAN');
+               return true;
+       }
+       
+       /*
+               Usage:
+               
+               $this->BeginTrans();
+               $this->RowLock('table1,table2','table1.id=33 and 
table2.id=table1.id'); # lock row 33 for both tables
+               
+               # some operation on both tables table1 and table2
+               
+               $this->CommitTrans();
+               
+               See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
+       */
+       function RowLock($tables,$where,$flds='top 1 null as ignore') 
+       {
+               if (!$this->transCnt) $this->BeginTrans();
+               return $this->GetOne("select $flds from $tables with 
(ROWLOCK,HOLDLOCK) where $where");
+       }
+       
+       
+       function &MetaIndexes($table,$primary=false)
+       {
+               $table = $this->qstr($table);
+
+               $sql = "SELECT i.name AS ind_name, C.name AS col_name, 
USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+                       CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 
2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
+                       CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
+                       FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON 
o.id = i.id 
+                       INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND 
I.Indid = K.Indid 
+                       INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid 
= C.Colid
+                       WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 
AND O.Name LIKE $table
+                       ORDER BY O.name, I.Name, K.keyno";
+
+               global $ADODB_FETCH_MODE;
+               $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+        
+        $rs = $this->Execute($sql);
+        if (isset($savem)) {
+               $this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+        if (!is_object($rs)) {
+               return FALSE;
+        }
+
+               $indexes = array();
+               while ($row = $rs->FetchRow()) {
+                       if (!$primary && $row[5]) continue;
+                       
+            $indexes[$row[0]]['unique'] = $row[6];
+            $indexes[$row[0]]['columns'][] = $row[1];
+       }
+        return $indexes;
+       }
+       
+       function MetaForeignKeys($table, $owner=false, $upper=false)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $table = $this->qstr(strtoupper($table));
+               
+               $sql = 
+"select object_name(constid) as constraint_name,
+       col_name(fkeyid, fkey) as column_name,
+       object_name(rkeyid) as referenced_table_name,
+       col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where upper(object_name(fkeyid)) = $table
+order by constraint_name, referenced_table_name, keyno";
+               
+               $constraints =& $this->GetArray($sql);
+               
+               $ADODB_FETCH_MODE = $save;
+               
+               $arr = false;
+               foreach($constraints as $constr) {
+                       //print_r($constr);
+                       $arr[$constr[0]][$constr[2]][] = 
$constr[1].'='.$constr[3]; 
+               }
+               if (!$arr) return false;
+               
+               $arr2 = false;
+               
+               foreach($arr as $k => $v) {
+                       foreach($v as $a => $b) {
+                               if ($upper) $a = strtoupper($a);
+                               $arr2[$a] = $b;
+                       }
+               }
+               return $arr2;
+       }
+
+       //From: Fernando Moreira <address@hidden>
+       function MetaDatabases() 
+       { 
+               if(@mssql_select_db("master")) { 
+                                $qry=$this->metaDatabasesSQL; 
+                                if(address@hidden($qry)){ 
+                                                $tmpAr=$ar=array(); 
+                                                while(address@hidden($rs)) 
+                                                                
$ar[]=$tmpAr[0]; 
+                                               
@mssql_select_db($this->database); 
+                                                if(sizeof($ar)) 
+                                                                return($ar); 
+                                                else 
+                                                                return(false); 
+                                } else { 
+                                                
@mssql_select_db($this->database); 
+                                                return(false); 
+                                } 
+                } 
+                return(false); 
+       } 
+
+       // "Stein-Aksel Basma" <address@hidden>
+       // tested with MSSQL 2000
+       function &MetaPrimaryKeys($table)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $schema = '';
+               $this->_findschema($table,$schema);
+               if (!$schema) $schema = $this->database;
+               if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+
+               $sql = "select distinct k.column_name,ordinal_position from 
information_schema.key_column_usage k,
+               information_schema.table_constraints tc 
+               where tc.constraint_name = k.constraint_name and 
tc.constraint_type =
+               'PRIMARY KEY' and k.table_name = '$table' $schema order by 
ordinal_position ";
+               
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $a = $this->GetCol($sql);
+               $ADODB_FETCH_MODE = $savem;
+               
+               if ($a && sizeof($a)>0) return $a;
+               $false = false;
+               return $false;    
+       }
+
+       
+       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+       {
+               if ($mask) {
+                       $save = $this->metaTablesSQL;
+                       $mask = $this->qstr(($mask));
+                       $this->metaTablesSQL .= " AND name like $mask";
+               }
+               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
+               
+               if ($mask) {
+                       $this->metaTablesSQL = $save;
+               }
+               return $ret;
+       }
+ 
+       function SelectDB($dbName) 
+       {
+               $this->database = $dbName;
+               $this->databaseName = $dbName; # obsolete, retained for compat 
with older adodb versions
+               if ($this->_connectionID) {
+                       return @mssql_select_db($dbName);               
+               }
+               else return false;      
+       }
+       
+       function ErrorMsg() 
+       {
+               if (empty($this->_errorMsg)){
+                       $this->_errorMsg = mssql_get_last_message();
+               }
+               return $this->_errorMsg;
+       }
+       
+       function ErrorNo() 
+       {
+               if ($this->_logsql && $this->_errorCode !== false) return 
$this->_errorCode;
+               if (empty($this->_errorMsg)) {
+                       $this->_errorMsg = mssql_get_last_message();
+               }
+               $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)
+       {
+               if (!function_exists('mssql_pconnect')) return null;
+               $this->_connectionID = 
mssql_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)
+       {
+               if (!function_exists('mssql_pconnect')) return null;
+               $this->_connectionID = 
mssql_pconnect($argHostname,$argUsername,$argPassword);
+               if ($this->_connectionID === false) return false;
+               
+               // persistent connections can forget to rollback on crash, so 
we do it here.
+               if ($this->autoRollback) {
+                       $cnt = $this->GetOne('select @@TRANCOUNT');
+                       while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); 
+               }
+               if ($argDatabasename) return $this->SelectDB($argDatabasename);
+               return true;    
+       }
+       
+       function Prepare($sql)
+       {
+               $sqlarr = explode('?',$sql);
+               if (sizeof($sqlarr) <= 1) return $sql;
+               $sql2 = $sqlarr[0];
+               for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
+                       $sql2 .=  '@P'.($i-1) . $sqlarr[$i];
+               } 
+               return array($sql,$this->qstr($sql2),$max);
+       }
+       
+       function PrepareSP($sql)
+       {
+               if (!$this->_has_mssql_init) {
+                       ADOConnection::outp( "PrepareSP: mssql_init only 
available since PHP 4.1.0");
+                       return $sql;
+               }
+               $stmt = mssql_init($sql,$this->_connectionID);
+               if (!$stmt)  return $sql;
+               return array($sql,$stmt);
+       }
+       
+       // returns concatenated string
+    // MSSQL requires integers to be cast as strings
+    // automatically cast every datatype to VARCHAR(255)
+    // @author David Rogers (introspectshun)
+    function Concat()
+    {
+            $s = "";
+            $arr = func_get_args();
+
+            // Split single record on commas, if possible
+            if (sizeof($arr) == 1) {
+                foreach ($arr as $arg) {
+                    $args = explode(',', $arg);
+                }
+                $arr = $args;
+            }
+
+            array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS 
VARCHAR(255))";'));
+            $s = implode('+',$arr);
+            if (sizeof($arr) > 0) return "$s";
+            
+                       return '';
+    }
+       
+       /* 
+       Usage:
+               $stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, 
@myid and @group
+               
+               # note that the parameter does not have @ in front!
+               $db->Parameter($stmt,$id,'myid');
+               $db->Parameter($stmt,$group,'group',false,64);
+               $db->Execute($stmt);
+               
+               @param $stmt Statement returned by Prepare() or PrepareSP().
+               @param $var PHP variable to bind to. Can set to null (for 
isNull support).
+               @param $name Name of stored procedure variable name to bind to.
+               @param [$isOutput] Indicates direction of parameter 0/false=IN  
1=OUT  2= IN/OUT. This is ignored in oci8.
+               @param [$maxLen] Holds an maximum length of the variable.
+               @param [$type] The data type of $var. Legal values depend on 
driver.
+               
+               See mssql_bind documentation at php.net.
+       */
+       function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, 
$type=false)
+       {
+               if (!$this->_has_mssql_init) {
+                       ADOConnection::outp( "Parameter: mssql_bind only 
available since PHP 4.1.0");
+                       return false;
+               }
+
+               $isNull = is_null($var); // php 4.0.4 and above...
+                       
+               if ($type === false) 
+                       switch(gettype($var)) {
+                       default:
+                       case 'string': $type = SQLCHAR; break;
+                       case 'double': $type = SQLFLT8; break;
+                       case 'integer': $type = SQLINT4; break;
+                       case 'boolean': $type = SQLINT1; break; # SQLBIT not 
supported in 4.1.0
+                       }
+               
+               if  ($this->debug) {
+                       $prefix = ($isOutput) ? 'Out' : 'In';
+                       $ztype = (empty($type)) ? 'false' : $type;
+                       ADOConnection::outp( "{$prefix}Parameter(\$stmt, 
\$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
+               }
+               /*
+                       See http://phplens.com/lens/lensforum/msgs.php?id=7231
+                       
+                       RETVAL is HARD CODED into php_mssql extension:
+                       The return value (a long integer value) is treated like 
a special OUTPUT parameter, 
+                       called "RETVAL" (without the @). See the example at 
mssql_execute to 
+                       see how it works. - type: one of this new supported PHP 
constants. 
+                               SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, 
SQLINT4, SQLBIT,SQLFLT8 
+               */
+               if ($name !== 'RETVAL') $name = '@'.$name;
+               return mssql_bind($stmt[1], $name, $var, $type, $isOutput, 
$isNull, $maxLen);
+       }
+       
+       /* 
+               Unfortunately, it appears that mssql cannot handle varbinary > 
255 chars
+               So all your blobs must be of type "image".
+               
+               Remember to set in php.ini the following...
+               
+               ; Valid range 0 - 2147483647. Default = 4096. 
+               mssql.textlimit = 0 ; zero to pass through 
+
+               ; Valid range 0 - 2147483647. Default = 4096. 
+               mssql.textsize = 0 ; zero to pass through 
+       */
+       function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+       {
+       
+               if (strtoupper($blobtype) == 'CLOB') {
+                       $sql = "UPDATE $table SET $column='" . $val . "' WHERE 
$where";
+                       return $this->Execute($sql) != false;
+               }
+               $sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE 
$where";
+               return $this->Execute($sql) != false;
+       }
+       
+       // returns query ID if successful, otherwise false
+       function _query($sql,$inputarr)
+       {
+               $this->_errorMsg = false;
+               if (is_array($inputarr)) {
+                       
+                       # bind input params with sp_executesql: 
+                       # see 
http://www.quest-pipelines.com/newsletter-v3/0402_F.htm
+                       # works only with sql server 7 and newer
+                       if (!is_array($sql)) $sql = $this->Prepare($sql);
+                       $params = '';
+                       $decl = '';
+                       $i = 0;
+                       foreach($inputarr as $v) {
+                               if ($decl) {
+                                       $decl .= ', ';
+                                       $params .= ', ';
+                               }       
+                               if (is_string($v)) {
+                                       $len = strlen($v);
+                                       if ($len == 0) $len = 1;
+                                       
+                                       if ($len > 4000 ) {
+                                               // NVARCHAR is max 4000 chars. 
Let's use NTEXT
+                                               $decl .= "@P$i NTEXT";
+                                       } else {
+                                               $decl .= "@P$i NVARCHAR($len)";
+                                       }
+
+                                       $params .= "@P$i=N". 
(strncmp($v,"'",1)==0? $v : $this->qstr($v));
+                               } else if (is_integer($v)) {
+                                       $decl .= "@P$i INT";
+                                       $params .= "@P$i=".$v;
+                               } else if (is_float($v)) {
+                                       $decl .= "@P$i FLOAT";
+                                       $params .= "@P$i=".$v;
+                               } else if (is_bool($v)) {
+                                       $decl .= "@P$i INT"; # Used INT just in 
case BIT in not supported on the user's MSSQL version. It will cast 
appropriately.
+                                       $params .= "@P$i=".(($v)?'1':'0'); # 
True == 1 in MSSQL BIT fields and acceptable for storing logical true in an int 
field
+                               } else {
+                                       $decl .= "@P$i CHAR"; # Used char 
because a type is required even when the value is to be NULL.
+                                       $params .= "@P$i=NULL";
+                                       }
+                               $i += 1;
+                       }
+                       $decl = $this->qstr($decl);
+                       if ($this->debug) ADOConnection::outp("<font 
size=-1>sp_executesql N{$sql[1]},N$decl,$params</font>");
+                       $rez = mssql_query("sp_executesql 
N{$sql[1]},N$decl,$params");
+                       
+               } else if (is_array($sql)) {
+                       # PrepareSP()
+                       $rez = mssql_execute($sql[1]);
+                       
+               } else {
+                       $rez = mssql_query($sql,$this->_connectionID);
+               }
+               return $rez;
+       }
+       
+       // returns true or false
+       function _close()
+       { 
+               if ($this->transCnt) $this->RollbackTrans();
+               $rez = @mssql_close($this->_connectionID);
+               $this->_connectionID = false;
+               return $rez;
+       }
+       
+       // mssql uses a default date like Dec 30 2000 12:00AM
+       function UnixDate($v)
+       {
+               return ADORecordSet_array_mssql::UnixDate($v);
+       }
+       
+       function UnixTimeStamp($v)
+       {
+               return ADORecordSet_array_mssql::UnixTimeStamp($v);
+       }       
+}
+       
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_mssql extends ADORecordSet {        
+
+       var $databaseType = "mssql";
+       var $canSeek = true;
+       var $hasFetchAssoc; // see 
http://phplens.com/lens/lensforum/msgs.php?id=6083
+       // _mths works only in non-localised system
+       
+       function ADORecordset_mssql($id,$mode=false)
+       {
+               // freedts check...
+               $this->hasFetchAssoc = function_exists('mssql_fetch_assoc');
+
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+
+               }
+               $this->fetchMode = $mode;
+               return $this->ADORecordSet($id,$mode);
+       }
+       
+       
+       function _initrs()
+       {
+       GLOBAL $ADODB_COUNTRECS;        
+               $this->_numOfRows = ($ADODB_COUNTRECS)? 
@mssql_num_rows($this->_queryID):-1;
+               $this->_numOfFields = @mssql_num_fields($this->_queryID);
+       }
+       
+
+       //Contributed by "Sven Axelsson" <address@hidden>
+       // get next resultset - requires PHP 4.0.5 or later
+       function NextRecordSet()
+       {
+               if (!mssql_next_result($this->_queryID)) return false;
+               $this->_inited = false;
+               $this->bind = false;
+               $this->_currentRow = -1;
+               $this->Init();
+               return true;
+       }
+
+       /* Use associative array to get fields array */
+       function Fields($colname)
+       {
+               if ($this->fetchMode != ADODB_FETCH_NUM) return 
$this->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) {
+                       $f = @mssql_fetch_field($this->_queryID, $fieldOffset);
+               }
+               else if ($fieldOffset == -1) {  /*      The $fieldOffset 
argument is not provided thus its -1   */
+                       $f = @mssql_fetch_field($this->_queryID);
+               }
+               $false = false;
+               if (empty($f)) return $false;
+               return $f;
+       }
+       
+       function _seek($row) 
+       {
+               return @mssql_data_seek($this->_queryID, $row);
+       }
+
+       // speedup
+       function MoveNext() 
+       {
+               if ($this->EOF) return false;
+               
+               $this->_currentRow++;
+               
+               if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+                       if ($this->fetchMode & ADODB_FETCH_NUM) {
+                               //ADODB_FETCH_BOTH mode
+                               $this->fields = 
@mssql_fetch_array($this->_queryID);
+                       }
+                       else {
+                               if ($this->hasFetchAssoc) {// only for PHP 
4.2.0 or later
+                                        $this->fields = 
@mssql_fetch_assoc($this->_queryID);
+                               } else {
+                                       $flds = 
@mssql_fetch_array($this->_queryID);
+                                       if (is_array($flds)) {
+                                               $fassoc = array();
+                                               foreach($flds as $k => $v) {
+                                                       if (is_numeric($k)) 
continue;
+                                                       $fassoc[$k] = $v;
+                                               }
+                                               $this->fields = $fassoc;
+                                       } else
+                                               $this->fields = false;
+                               }
+                       }
+                       
+                       if (is_array($this->fields)) {
+                               if (ADODB_ASSOC_CASE == 0) {
+                                       foreach($this->fields as $k=>$v) {
+                                               $this->fields[strtolower($k)] = 
$v;
+                                       }
+                               } else if (ADODB_ASSOC_CASE == 1) {
+                                       foreach($this->fields as $k=>$v) {
+                                               $this->fields[strtoupper($k)] = 
$v;
+                                       }
+                               }
+                       }
+               } else {
+                       $this->fields = @mssql_fetch_row($this->_queryID);
+               }
+               if ($this->fields) return true;
+               $this->EOF = true;
+               
+               return false;
+       }
+
+       
+       // 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) 
+       {
+               if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+                       if ($this->fetchMode & ADODB_FETCH_NUM) {
+                               //ADODB_FETCH_BOTH mode
+                               $this->fields = 
@mssql_fetch_array($this->_queryID);
+                       } else {
+                               if ($this->hasFetchAssoc) // only for PHP 4.2.0 
or later
+                                       $this->fields = 
@mssql_fetch_assoc($this->_queryID);
+                               else {
+                                       $this->fields = 
@mssql_fetch_array($this->_queryID);
+                                       if (@is_array($$this->fields)) {
+                                               $fassoc = array();
+                                               foreach($$this->fields as $k => 
$v) {
+                                                       if (is_integer($k)) 
continue;
+                                                       $fassoc[$k] = $v;
+                                               }
+                                               $this->fields = $fassoc;
+                                       }
+                               }
+                       }
+                       
+                       if (!$this->fields) {
+                       } else if (ADODB_ASSOC_CASE == 0) {
+                               foreach($this->fields as $k=>$v) {
+                                       $this->fields[strtolower($k)] = $v;
+                               }
+                       } else if (ADODB_ASSOC_CASE == 1) {
+                               foreach($this->fields as $k=>$v) {
+                                       $this->fields[strtoupper($k)] = $v;
+                               }
+                       }
+               } else {
+                       $this->fields = @mssql_fetch_row($this->_queryID);
+               }
+               return $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() 
+       {
+               $rez = mssql_free_result($this->_queryID);      
+               $this->_queryID = false;
+               return $rez;
+       }
+       // mssql uses a default date like Dec 30 2000 12:00AM
+       function UnixDate($v)
+       {
+               return ADORecordSet_array_mssql::UnixDate($v);
+       }
+       
+       function UnixTimeStamp($v)
+       {
+               return ADORecordSet_array_mssql::UnixTimeStamp($v);
+       }
+       
+}
+
+
+class ADORecordSet_array_mssql extends ADORecordSet_array {
+       function ADORecordSet_array_mssql($id=-1,$mode=false) 
+       {
+               $this->ADORecordSet_array($id,$mode);
+       }
+       
+               // mssql uses a default date like Dec 30 2000 12:00AM
+       function UnixDate($v)
+       {
+       
+               if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) 
return parent::UnixDate($v);
+               
+       global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+       
+               //Dec 30 2000 12:00AM 
+               if ($ADODB_mssql_date_order == 'dmy') {
+                       if (!preg_match( "|^([0-9]{1,2})[-/\. 
]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+                               return parent::UnixDate($v);
+                       }
+                       if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+                       
+                       $theday = $rr[1];
+                       $themth =  substr(strtoupper($rr[2]),0,3);
+               } else {
+                       if (!preg_match( "|^([A-Za-z]{3})[-/\. 
]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+                               return parent::UnixDate($v);
+                       }
+                       if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+                       
+                       $theday = $rr[2];
+                       $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,$theday,$rr[3]);
+       }
+       
+       function UnixTimeStamp($v)
+       {
+       
+               if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) 
return parent::UnixTimeStamp($v);
+               
+       global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+       
+               //Dec 30 2000 12:00AM
+                if ($ADODB_mssql_date_order == 'dmy') {
+                        if (!preg_match( "|^([0-9]{1,2})[-/\. 
]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+                       ,$v, $rr)) return parent::UnixTimeStamp($v);
+                       if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+               
+                       $theday = $rr[1];
+                       $themth =  substr(strtoupper($rr[2]),0,3);
+               } else {
+                       if (!preg_match( "|^([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] <= TIMESTAMP_FIRST_YEAR) return 0;
+               
+                       $theday = $rr[2];
+                       $themth = substr(strtoupper($rr[1]),0,3);
+               }
+               
+               $themth = $ADODB_mssql_mths[$themth];
+               if ($themth <= 0) return false;
+               
+               switch (strtoupper($rr[6])) {
+               case 'P':
+                       if ($rr[4]<12) $rr[4] += 12;
+                       break;
+               case 'A':
+                       if ($rr[4]==12) $rr[4] = 0;
+                       break;
+               default:
+                       break;
+               }
+               // h-m-s-MM-DD-YY
+               return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
+       }
+}
+
+/*
+Code Example 1:
+
+select         object_name(constid) as constraint_name,
+               object_name(fkeyid) as table_name, 
+        col_name(fkeyid, fkey) as column_name,
+       object_name(rkeyid) as referenced_table_name,
+       col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where object_name(fkeyid) = x
+order by constraint_name, table_name, referenced_table_name,  keyno
+
+Code Example 2:
+select         constraint_name,
+       column_name,
+       ordinal_position
+from information_schema.key_column_usage
+where constraint_catalog = db_name()
+and table_name = x
+order by constraint_name, ordinal_position
+
+http://www.databasejournal.com/scripts/article.php/1440551
+*/
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php:1.2        Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,62 +1,62 @@
-<?php
-/**
-* @version V4.54 5 Nov 2004 (c) 2000-2004 John Lim (address@hidden). 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
-*
-*  Portable MSSQL Driver that supports || instead of +
-*
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-
-/*
-       The big difference between mssqlpo and it's parent mssql is that 
mssqlpo supports
-       the more standard || string concatenation operator.
-*/
-       
-include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php');
-
-class ADODB_mssqlpo extends ADODB_mssql {
-       var $databaseType = "mssqlpo";
-       var $concat_operator = '||'; 
-       
-       function ADODB_mssqlpo()
-       {
-               ADODB_mssql::ADODB_mssql();
-       }
-
-       function PrepareSP($sql)
-       {
-               if (!$this->_has_mssql_init) {
-                       ADOConnection::outp( "PrepareSP: mssql_init only 
available since PHP 4.1.0");
-                       return $sql;
-               }
-               if (is_string($sql)) $sql = str_replace('||','+',$sql);
-               $stmt = mssql_init($sql,$this->_connectionID);
-               if (!$stmt)  return $sql;
-               return array($sql,$stmt);
-       }
-       
-       function _query($sql,$inputarr)
-       {
-               if (is_string($sql)) $sql = str_replace('||','+',$sql);
-               return ADODB_mssql::_query($sql,$inputarr);
-       }
-}
-
-class ADORecordset_mssqlpo extends ADORecordset_mssql {
-       var $databaseType = "mssqlpo";
-       function ADORecordset_mssqlpo($id,$mode=false)
-       {
-               $this->ADORecordset_mssql($id,$mode);
-       }
-}
+<?php
+/**
+* @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). 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
+*
+*  Portable MSSQL Driver that supports || instead of +
+*
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+
+/*
+       The big difference between mssqlpo and it's parent mssql is that 
mssqlpo supports
+       the more standard || string concatenation operator.
+*/
+       
+include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php');
+
+class ADODB_mssqlpo extends ADODB_mssql {
+       var $databaseType = "mssqlpo";
+       var $concat_operator = '||'; 
+       
+       function ADODB_mssqlpo()
+       {
+               ADODB_mssql::ADODB_mssql();
+       }
+
+       function PrepareSP($sql)
+       {
+               if (!$this->_has_mssql_init) {
+                       ADOConnection::outp( "PrepareSP: mssql_init only 
available since PHP 4.1.0");
+                       return $sql;
+               }
+               if (is_string($sql)) $sql = str_replace('||','+',$sql);
+               $stmt = mssql_init($sql,$this->_connectionID);
+               if (!$stmt)  return $sql;
+               return array($sql,$stmt);
+       }
+       
+       function _query($sql,$inputarr)
+       {
+               if (is_string($sql)) $sql = str_replace('||','+',$sql);
+               return ADODB_mssql::_query($sql,$inputarr);
+       }
+}
+
+class ADORecordset_mssqlpo extends ADORecordset_mssql {
+       var $databaseType = "mssqlpo";
+       function ADORecordset_mssqlpo($id,$mode=false)
+       {
+               $this->ADORecordset_mssql($id,$mode);
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php:1.2  Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php      Tue Feb 21 13:47:42 2006
@@ -1,700 +1,775 @@
-<?php
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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 
(address@hidden)
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (! defined("_ADODB_MYSQL_LAYER")) {
- define("_ADODB_MYSQL_LAYER", 1 );
-
-class ADODB_mysql extends ADOConnection {
-       var $databaseType = 'mysql';
-       var $dataProvider = '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;
-       var $isoDates = true; // accepts dates in ISO format
-       var $sysDate = 'CURDATE()';
-       var $sysTimeStamp = 'NOW()';
-       var $hasTransactions = false;
-       var $forceNewConnect = false;
-       var $poorAffectedRows = true;
-       var $clientFlags = 0;
-       var $substr = "substring";
-       var $nameQuote = '`';           /// string to use to quote identifiers 
and names
-       
-       function ADODB_mysql() 
-       {                       
-               if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
-       }
-       
-       function ServerInfo()
-       {
-               $arr['description'] = ADOConnection::GetOne("select version()");
-               $arr['version'] = ADOConnection::_findvers($arr['description']);
-               return $arr;
-       }
-       
-       function IfNull( $field, $ifNull ) 
-       {
-               return " IFNULL($field, $ifNull) "; // if MySQL
-       }
-       
-       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-       {       
-               $save = $this->metaTablesSQL;
-               if ($showSchema && is_string($showSchema)) {
-                       $this->metaTablesSQL .= " from $showSchema";
-               }
-               
-               if ($mask) {
-                       $mask = $this->qstr($mask);
-                       $this->metaTablesSQL .= " like $mask";
-               }
-               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
-               
-               $this->metaTablesSQL = $save;
-               return $ret;
-       }
-       
-       
-       function &MetaIndexes ($table, $primary = FALSE, $owner=false)
-       {
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        
-               $false = false;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        
-        // get index details
-        $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
-        
-        // restore fetchmode
-        if (isset($savem)) {
-                $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-        
-        if (!is_object($rs)) {
-                return $false;
-        }
-        
-        $indexes = array ();
-        
-        // parse index data into array
-        while ($row = $rs->FetchRow()) {
-                if ($primary == FALSE AND $row[2] == 'PRIMARY') {
-                        continue;
-                }
-                
-                if (!isset($indexes[$row[2]])) {
-                        $indexes[$row[2]] = array(
-                                'unique' => ($row[1] == 0),
-                                'columns' => array()
-                        );
-                }
-                
-                $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
-        }
-        
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index )
-        {
-                ksort ($indexes[$index]['columns']);
-        }
-        
-        return $indexes;
-       }
-
-       
-       // if magic quotes disabled, use mysql_real_escape_string()
-       function qstr($s,$magic_quotes=false)
-       {
-               if (!$magic_quotes) {
-               
-                       if (ADODB_PHPVER >= 0x4300) {
-                               if (is_resource($this->_connectionID))
-                                       return 
"'".mysql_real_escape_string($s,$this->_connectionID)."'";
-                       }
-                       if ($this->replaceQuote[0] == '\\'){
-                               $s = 
adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-                       }
-                       return  
"'".str_replace("'",$this->replaceQuote,$s)."'"; 
-               }
-               
-               // undo magic quotes for "
-               $s = str_replace('\\"','"',$s);
-               return "'$s'";
-       }
-       
-       function _insertid()
-       {
-               return mysql_insert_id($this->_connectionID);
-       }
-       
-       function GetOne($sql,$inputarr=false)
-       {
-               if (strncasecmp($sql,'sele',4) == 0) {
-                       $rs =& $this->SelectLimit($sql,1,-1,$inputarr);
-                       if ($rs) {
-                               $rs->Close();
-                               if ($rs->EOF) return false;
-                               return reset($rs->fields);
-                       }
-               } else {
-                       return ADOConnection::GetOne($sql,$inputarr);
-               }
-               return false;
-       }
-       
-       function BeginTrans()
-       {
-               if ($this->debug) ADOConnection::outp("Transactions not 
supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver");
-       }
-       
-       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 (%s)";
-       var $_dropSeqSQL = "drop table %s";
-       
-       function CreateSequence($seqname='adodbseq',$startID=1)
-       {
-               if (empty($this->_genSeqSQL)) return false;
-               $u = strtoupper($seqname);
-               
-               $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-               if (!$ok) return false;
-               return 
$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-       }
-       
-
-       function GenID($seqname='adodbseq',$startID=1)
-       {
-               // post-nuke sets hasGenID to false
-               if (!$this->hasGenID) return false;
-               
-               $savelog = $this->_logsql;
-               $this->_logsql = false;
-               $getnext = sprintf($this->_genIDSQL,$seqname);
-               $holdtransOK = $this->_transOK; // save the current status
-               $rs = @$this->Execute($getnext);
-               if (!$rs) {
-                       if ($holdtransOK) $this->_transOK = true; //if the 
status was ok before reset
-                       $u = strtoupper($seqname);
-                       $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-                       
$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-                       $rs = $this->Execute($getnext);
-               }
-               $this->genID = mysql_insert_id($this->_connectionID);
-               
-               if ($rs) $rs->Close();
-               
-               $this->_logsql = $savelog;
-               return $this->genID;
-       }
-       
-       function &MetaDatabases()
-       {
-               $qid = mysql_list_dbs($this->_connectionID);
-               $arr = array();
-               $i = 0;
-               $max = mysql_num_rows($qid);
-               while ($i < $max) {
-                       $db = mysql_tablename($qid,$i);
-                       if ($db != 'mysql') $arr[] = $db;
-                       $i += 1;
-               }
-               return $arr;
-       }
-       
-               
-       // Format date column in sql string given an input format that 
understands Y M D
-       function SQLDate($fmt, $col=false)
-       {       
-               if (!$col) $col = $this->sysTimeStamp;
-               $s = 'DATE_FORMAT('.$col.",'";
-               $concat = false;
-               $len = strlen($fmt);
-               for ($i=0; $i < $len; $i++) {
-                       $ch = $fmt[$i];
-                       switch($ch) {
-                               
-                       default:
-                               if ($ch == '\\') {
-                                       $i++;
-                                       $ch = substr($fmt,$i,1);
-                               }
-                               /** FALL THROUGH */
-                       case '-':
-                       case '/':
-                               $s .= $ch;
-                               break;
-                               
-                       case 'Y':
-                       case 'y':
-                               $s .= '%Y';
-                               break;
-                       case 'M':
-                               $s .= '%b';
-                               break;
-                               
-                       case 'm':
-                               $s .= '%m';
-                               break;
-                       case 'D':
-                       case 'd':
-                               $s .= '%d';
-                               break;
-                       
-                       case 'Q':
-                       case 'q':
-                               $s .= "'),Quarter($col)";
-                               
-                               if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
-                               else $s .= ",('";
-                               $concat = true;
-                               break;
-                       
-                       case 'H': 
-                               $s .= '%H';
-                               break;
-                               
-                       case 'h':
-                               $s .= '%I';
-                               break;
-                               
-                       case 'i':
-                               $s .= '%i';
-                               break;
-                               
-                       case 's':
-                               $s .= '%s';
-                               break;
-                               
-                       case 'a':
-                       case 'A':
-                               $s .= '%p';
-                               break;
-                               
-
-                       }
-               }
-               $s.="')";
-               if ($concat) $s = "CONCAT($s)";
-               return $s;
-       }
-       
-
-       // returns concatenated string
-       // much easier to run "mysqld --ansi" or "mysqld 
--sql-mode=PIPES_AS_CONCAT" and use || operator
-       function Concat()
-       {
-               $s = "";
-               $arr = func_get_args();
-               
-               // suggestion by address@hidden
-               $s = implode(',',$arr); 
-               if (strlen($s) > 0) return "CONCAT($s)";
-               else return '';
-       }
-       
-       function OffsetDate($dayFraction,$date=false)
-       {               
-               if (!$date) $date = $this->sysDate;
-               return 
"from_unixtime(unix_timestamp($date)+($dayFraction)*24*3600)";
-       }
-       
-       // returns true or false
-       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               if (ADODB_PHPVER >= 0x4300)
-                       $this->_connectionID = 
mysql_connect($argHostname,$argUsername,$argPassword,
-                                                                               
                $this->forceNewConnect,$this->clientFlags);
-               else if (ADODB_PHPVER >= 0x4200)
-                       $this->_connectionID = 
mysql_connect($argHostname,$argUsername,$argPassword,
-                                                                               
                $this->forceNewConnect);
-               else
-                       $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)
-       {
-               if (ADODB_PHPVER >= 0x4300)
-                       $this->_connectionID = 
mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
-               else
-                       $this->_connectionID = 
mysql_pconnect($argHostname,$argUsername,$argPassword);
-               if ($this->_connectionID === false) return false;
-               if ($this->autoRollback) $this->RollbackTrans();
-               if ($argDatabasename) return $this->SelectDB($argDatabasename);
-               return true;    
-       }
-       
-       function _nconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               $this->forceNewConnect = true;
-               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename);
-       }
-       
-       function &MetaColumns($table) 
-       {
-       
-               global $ADODB_FETCH_MODE;
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
-               $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-               if (isset($savem)) $this->SetFetchMode($savem);
-               $ADODB_FETCH_MODE = $save;
-               if (!is_object($rs)) {
-                       $false = false;
-                       return $false;
-               }
-                       
-               $retarr = array();
-               while (!$rs->EOF){
-                       $fld = new ADOFieldObject();
-                       $fld->name = $rs->fields[0];
-                       $type = $rs->fields[1];
-                       
-                       // split type into type(length):
-                       $fld->scale = null;
-                       if (preg_match("/^(.+)\((\d+),(\d+)/", $type, 
$query_array)) {
-                               $fld->type = $query_array[1];
-                               $fld->max_length = is_numeric($query_array[2]) 
? $query_array[2] : -1;
-                               $fld->scale = is_numeric($query_array[3]) ? 
$query_array[3] : -1;
-                       } elseif (preg_match("/^(.+)\((\d+)/", $type, 
$query_array)) {
-                               $fld->type = $query_array[1];
-                               $fld->max_length = is_numeric($query_array[2]) 
? $query_array[2] : -1;
-                       } else {
-                               $fld->type = $type;
-                               $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($type,'blob') !== false);
-                       $fld->unsigned = (strpos($type,'unsigned') !== false);
-                               
-                       if (!$fld->binary) {
-                               $d = $rs->fields[4];
-                               if ($d != '' && $d != 'NULL') {
-                                       $fld->has_default = true;
-                                       $fld->default_value = $d;
-                               } else {
-                                       $fld->has_default = false;
-                               }
-                       }
-                       
-                       if ($save == ADODB_FETCH_NUM) {
-                               $retarr[] = $fld;
-                       } else {
-                               $retarr[strtoupper($fld->name)] = $fld;
-                       }
-                               $rs->MoveNext();
-                       }
-               
-                       $rs->Close();
-                       return $retarr; 
-       }
-               
-       // 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,$secs=0)
-       {
-               $offsetStr =($offset>=0) ? "$offset," : '';
-               // jason judge, see 
http://phplens.com/lens/lensforum/msgs.php?id=9220
-               if ($nrows < 0) $nrows = '18446744073709551615'; 
-               
-               if ($secs)
-                       $rs =& $this->CacheExecute($secs,$sql." LIMIT 
$offsetStr$nrows",$inputarr);
-               else
-                       $rs =& $this->Execute($sql." LIMIT 
$offsetStr$nrows",$inputarr);
-               return $rs;
-       }
-       
-       // 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 ($this->_logsql) return $this->_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 ($this->_logsql) return $this->_errorCode;
-               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;
-       }
-
-       
-       /*
-       * Maximum size of C field
-       */
-       function CharMax()
-       {
-               return 255; 
-       }
-       
-       /*
-       * Maximum size of X field
-       */
-       function TextMax()
-       {
-               return 4294967295; 
-       }
-       
-}
-       
-/*--------------------------------------------------------------------------------------
-        Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-
-class ADORecordSet_mysql extends ADORecordSet{ 
-       
-       var $databaseType = "mysql";
-       var $canSeek = true;
-       
-       function ADORecordSet_mysql($queryID,$mode=false) 
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch ($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->adodbFetchMode = $mode;
-               $this->ADORecordSet($queryID);  
-       }
-       
-       function _initrs()
-       {
-       //GLOBAL $ADODB_COUNTRECS;
-       //      $this->_numOfRows = ($ADODB_COUNTRECS) ? 
@mysql_num_rows($this->_queryID):-1;
-               $this->_numOfRows = @mysql_num_rows($this->_queryID);
-               $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 
(address@hidden)
-                       //$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 (address@hidden)
-                       //$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 
$this->fields;
-               $row =& ADORecordSet::GetRowAssoc($upper);
-               return $row;
-       }
-       
-       /* Use associative array to get fields array */
-       function Fields($colname)
-       {       
-               // added @ by "Michael William Miller" <address@hidden>
-               if ($this->fetchMode != MYSQL_NUM) return 
@$this->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 _seek($row)
-       {
-               if ($this->_numOfRows == 0) return false;
-               return @mysql_data_seek($this->_queryID,$row);
-       }
-       
-       function MoveNext()
-       {
-               //return adodb_movenext($this);
-               //if (defined('ADODB_EXTENSION')) return adodb_movenext($this);
-               if (@$this->fields =& 
mysql_fetch_array($this->_queryID,$this->fetchMode)) {
-                       $this->_currentRow += 1;
-                       return true;
-               }
-               if (!$this->EOF) {
-                       $this->_currentRow += 1;
-                       $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)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               
-               $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 'YEAR':
-               case 'DATE': return 'D';
-               
-               case 'TIME':
-               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';
-               }
-       }
-
-}
-
-class ADORecordSet_ext_mysql extends ADORecordSet_mysql {      
-       function ADORecordSet_ext_mysql($queryID,$mode=false) 
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch ($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->adodbFetchMode = $mode;
-               $this->ADORecordSet($queryID);
-       }
-       
-       function MoveNext()
-       {
-               return @adodb_movenext($this);
-       }
-}
-
-
-}
+<?php
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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 
(address@hidden)
+*/ 
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (! defined("_ADODB_MYSQL_LAYER")) {
+ define("_ADODB_MYSQL_LAYER", 1 );
+
+class ADODB_mysql extends ADOConnection {
+       var $databaseType = 'mysql';
+       var $dataProvider = '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;
+       var $isoDates = true; // accepts dates in ISO format
+       var $sysDate = 'CURDATE()';
+       var $sysTimeStamp = 'NOW()';
+       var $hasTransactions = false;
+       var $forceNewConnect = false;
+       var $poorAffectedRows = true;
+       var $clientFlags = 0;
+       var $substr = "substring";
+       var $nameQuote = '`';           /// string to use to quote identifiers 
and names
+       
+       function ADODB_mysql() 
+       {                       
+               if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
+       }
+       
+       function ServerInfo()
+       {
+               $arr['description'] = ADOConnection::GetOne("select version()");
+               $arr['version'] = ADOConnection::_findvers($arr['description']);
+               return $arr;
+       }
+       
+       function IfNull( $field, $ifNull ) 
+       {
+               return " IFNULL($field, $ifNull) "; // if MySQL
+       }
+       
+       
+       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+       {       
+               $save = $this->metaTablesSQL;
+               if ($showSchema && is_string($showSchema)) {
+                       $this->metaTablesSQL .= " from $showSchema";
+               }
+               
+               if ($mask) {
+                       $mask = $this->qstr($mask);
+                       $this->metaTablesSQL .= " like $mask";
+               }
+               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
+               
+               $this->metaTablesSQL = $save;
+               return $ret;
+       }
+       
+       
+       function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+       {
+        // save old fetch mode
+        global $ADODB_FETCH_MODE;
+        
+               $false = false;
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+        
+        // get index details
+        $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
+        
+        // restore fetchmode
+        if (isset($savem)) {
+                $this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+        
+        if (!is_object($rs)) {
+                return $false;
+        }
+        
+        $indexes = array ();
+        
+        // parse index data into array
+        while ($row = $rs->FetchRow()) {
+                if ($primary == FALSE AND $row[2] == 'PRIMARY') {
+                        continue;
+                }
+                
+                if (!isset($indexes[$row[2]])) {
+                        $indexes[$row[2]] = array(
+                                'unique' => ($row[1] == 0),
+                                'columns' => array()
+                        );
+                }
+                
+                $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
+        }
+        
+        // sort columns by order in the index
+        foreach ( array_keys ($indexes) as $index )
+        {
+                ksort ($indexes[$index]['columns']);
+        }
+        
+        return $indexes;
+       }
+
+       
+       // if magic quotes disabled, use mysql_real_escape_string()
+       function qstr($s,$magic_quotes=false)
+       {
+               if (!$magic_quotes) {
+               
+                       if (ADODB_PHPVER >= 0x4300) {
+                               if (is_resource($this->_connectionID))
+                                       return 
"'".mysql_real_escape_string($s,$this->_connectionID)."'";
+                       }
+                       if ($this->replaceQuote[0] == '\\'){
+                               $s = 
adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+                       }
+                       return  
"'".str_replace("'",$this->replaceQuote,$s)."'"; 
+               }
+               
+               // undo magic quotes for "
+               $s = str_replace('\\"','"',$s);
+               return "'$s'";
+       }
+       
+       function _insertid()
+       {
+               return ADOConnection::GetOne('SELECT LAST_INSERT_ID()');
+               //return mysql_insert_id($this->_connectionID);
+       }
+       
+       function GetOne($sql,$inputarr=false)
+       {
+               if (strncasecmp($sql,'sele',4) == 0) {
+                       $rs =& $this->SelectLimit($sql,1,-1,$inputarr);
+                       if ($rs) {
+                               $rs->Close();
+                               if ($rs->EOF) return false;
+                               return reset($rs->fields);
+                       }
+               } else {
+                       return ADOConnection::GetOne($sql,$inputarr);
+               }
+               return false;
+       }
+       
+       function BeginTrans()
+       {
+               if ($this->debug) ADOConnection::outp("Transactions not 
supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver");
+       }
+       
+       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 (%s)";
+       var $_dropSeqSQL = "drop table %s";
+       
+       function CreateSequence($seqname='adodbseq',$startID=1)
+       {
+               if (empty($this->_genSeqSQL)) return false;
+               $u = strtoupper($seqname);
+               
+               $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+               if (!$ok) return false;
+               return 
$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+       }
+       
+
+       function GenID($seqname='adodbseq',$startID=1)
+       {
+               // post-nuke sets hasGenID to false
+               if (!$this->hasGenID) return false;
+               
+               $savelog = $this->_logsql;
+               $this->_logsql = false;
+               $getnext = sprintf($this->_genIDSQL,$seqname);
+               $holdtransOK = $this->_transOK; // save the current status
+               $rs = @$this->Execute($getnext);
+               if (!$rs) {
+                       if ($holdtransOK) $this->_transOK = true; //if the 
status was ok before reset
+                       $u = strtoupper($seqname);
+                       $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+                       
$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+                       $rs = $this->Execute($getnext);
+               }
+               $this->genID = mysql_insert_id($this->_connectionID);
+               
+               if ($rs) $rs->Close();
+               
+               $this->_logsql = $savelog;
+               return $this->genID;
+       }
+       
+       function &MetaDatabases()
+       {
+               $qid = mysql_list_dbs($this->_connectionID);
+               $arr = array();
+               $i = 0;
+               $max = mysql_num_rows($qid);
+               while ($i < $max) {
+                       $db = mysql_tablename($qid,$i);
+                       if ($db != 'mysql') $arr[] = $db;
+                       $i += 1;
+               }
+               return $arr;
+       }
+       
+               
+       // Format date column in sql string given an input format that 
understands Y M D
+       function SQLDate($fmt, $col=false)
+       {       
+               if (!$col) $col = $this->sysTimeStamp;
+               $s = 'DATE_FORMAT('.$col.",'";
+               $concat = false;
+               $len = strlen($fmt);
+               for ($i=0; $i < $len; $i++) {
+                       $ch = $fmt[$i];
+                       switch($ch) {
+                               
+                       default:
+                               if ($ch == '\\') {
+                                       $i++;
+                                       $ch = substr($fmt,$i,1);
+                               }
+                               /** FALL THROUGH */
+                       case '-':
+                       case '/':
+                               $s .= $ch;
+                               break;
+                               
+                       case 'Y':
+                       case 'y':
+                               $s .= '%Y';
+                               break;
+                       case 'M':
+                               $s .= '%b';
+                               break;
+                               
+                       case 'm':
+                               $s .= '%m';
+                               break;
+                       case 'D':
+                       case 'd':
+                               $s .= '%d';
+                               break;
+                       
+                       case 'Q':
+                       case 'q':
+                               $s .= "'),Quarter($col)";
+                               
+                               if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
+                               else $s .= ",('";
+                               $concat = true;
+                               break;
+                       
+                       case 'H': 
+                               $s .= '%H';
+                               break;
+                               
+                       case 'h':
+                               $s .= '%I';
+                               break;
+                               
+                       case 'i':
+                               $s .= '%i';
+                               break;
+                               
+                       case 's':
+                               $s .= '%s';
+                               break;
+                               
+                       case 'a':
+                       case 'A':
+                               $s .= '%p';
+                               break;
+                               
+                       case 'w':
+                               $s .= '%w';
+                               break;
+                               
+                        case 'W':
+                               $s .= '%U';
+                               break;
+                               
+                       case 'l':
+                               $s .= '%W';
+                               break;
+                       }
+               }
+               $s.="')";
+               if ($concat) $s = "CONCAT($s)";
+               return $s;
+       }
+       
+
+       // returns concatenated string
+       // much easier to run "mysqld --ansi" or "mysqld 
--sql-mode=PIPES_AS_CONCAT" and use || operator
+       function Concat()
+       {
+               $s = "";
+               $arr = func_get_args();
+               
+               // suggestion by address@hidden
+               $s = implode(',',$arr); 
+               if (strlen($s) > 0) return "CONCAT($s)";
+               else return '';
+       }
+       
+       function OffsetDate($dayFraction,$date=false)
+       {               
+               if (!$date) $date = $this->sysDate;
+               $fraction = $dayFraction * 24 * 3600;
+               return "from_unixtime(unix_timestamp($date)+$fraction)";
+       }
+       
+       // returns true or false
+       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               if (!empty($this->port)) $argHostname .= ":".$this->port;
+               
+               if (ADODB_PHPVER >= 0x4300)
+                       $this->_connectionID = 
mysql_connect($argHostname,$argUsername,$argPassword,
+                                                                               
                $this->forceNewConnect,$this->clientFlags);
+               else if (ADODB_PHPVER >= 0x4200)
+                       $this->_connectionID = 
mysql_connect($argHostname,$argUsername,$argPassword,
+                                                                               
                $this->forceNewConnect);
+               else
+                       $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)
+       {
+               if (!empty($this->port)) $argHostname .= ":".$this->port;
+               
+               if (ADODB_PHPVER >= 0x4300)
+                       $this->_connectionID = 
mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
+               else
+                       $this->_connectionID = 
mysql_pconnect($argHostname,$argUsername,$argPassword);
+               if ($this->_connectionID === false) return false;
+               if ($this->autoRollback) $this->RollbackTrans();
+               if ($argDatabasename) return $this->SelectDB($argDatabasename);
+               return true;    
+       }
+       
+       function _nconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               $this->forceNewConnect = true;
+               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename);
+       }
+       
+       function &MetaColumns($table) 
+       {
+               $this->_findschema($table,$schema);
+               if ($schema) {
+                       $dbName = $this->database;
+                       $this->SelectDB($schema);
+               }
+               global $ADODB_FETCH_MODE;
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               
+               if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
+               $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+               
+               if ($schema) {
+                       $this->SelectDB($dbName);
+               }
+               
+               if (isset($savem)) $this->SetFetchMode($savem);
+               $ADODB_FETCH_MODE = $save;
+               if (!is_object($rs)) {
+                       $false = false;
+                       return $false;
+               }
+                       
+               $retarr = array();
+               while (!$rs->EOF){
+                       $fld = new ADOFieldObject();
+                       $fld->name = $rs->fields[0];
+                       $type = $rs->fields[1];
+                       
+                       // split type into type(length):
+                       $fld->scale = null;
+                       if (preg_match("/^(.+)\((\d+),(\d+)/", $type, 
$query_array)) {
+                               $fld->type = $query_array[1];
+                               $fld->max_length = is_numeric($query_array[2]) 
? $query_array[2] : -1;
+                               $fld->scale = is_numeric($query_array[3]) ? 
$query_array[3] : -1;
+                       } elseif (preg_match("/^(.+)\((\d+)/", $type, 
$query_array)) {
+                               $fld->type = $query_array[1];
+                               $fld->max_length = is_numeric($query_array[2]) 
? $query_array[2] : -1;
+                       } elseif (preg_match("/^(enum)\((.*)\)$/i", $type, 
$query_array)) {
+                               $fld->type = $query_array[1];
+                               $arr = explode(",",$query_array[2]);
+                               $fld->enums = $arr;
+                               $zlen = max(array_map("strlen",$arr)) - 2; // 
PHP >= 4.0.6
+                               $fld->max_length = ($zlen > 0) ? $zlen : 1;
+                       } else {
+                               $fld->type = $type;
+                               $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($type,'blob') !== false);
+                       $fld->unsigned = (strpos($type,'unsigned') !== false);
+                               
+                       if (!$fld->binary) {
+                               $d = $rs->fields[4];
+                               if ($d != '' && $d != 'NULL') {
+                                       $fld->has_default = true;
+                                       $fld->default_value = $d;
+                               } else {
+                                       $fld->has_default = false;
+                               }
+                       }
+                       
+                       if ($save == ADODB_FETCH_NUM) {
+                               $retarr[] = $fld;
+                       } else {
+                               $retarr[strtoupper($fld->name)] = $fld;
+                       }
+                               $rs->MoveNext();
+                       }
+               
+                       $rs->Close();
+                       return $retarr; 
+       }
+               
+       // returns true or false
+       function SelectDB($dbName) 
+       {
+               $this->database = $dbName;
+               $this->databaseName = $dbName; # obsolete, retained for compat 
with older adodb versions
+               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,$secs=0)
+       {
+               $offsetStr =($offset>=0) ? ((integer)$offset)."," : '';
+               // jason judge, see 
http://phplens.com/lens/lensforum/msgs.php?id=9220
+               if ($nrows < 0) $nrows = '18446744073709551615'; 
+               
+               if ($secs)
+                       $rs =& $this->CacheExecute($secs,$sql." LIMIT 
$offsetStr".((integer)$nrows),$inputarr);
+               else
+                       $rs =& $this->Execute($sql." LIMIT 
$offsetStr".((integer)$nrows),$inputarr);
+               return $rs;
+       }
+       
+       // 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 ($this->_logsql) return $this->_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 ($this->_logsql) return $this->_errorCode;
+               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;
+       }
+
+       
+       /*
+       * Maximum size of C field
+       */
+       function CharMax()
+       {
+               return 255; 
+       }
+       
+       /*
+       * Maximum size of X field
+       */
+       function TextMax()
+       {
+               return 4294967295; 
+       }
+       
+       // "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
+       function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, 
$associative = FALSE )
+     {
+         if ( !empty($owner) ) {
+            $table = "$owner.$table";
+         }
+         $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', 
$table));
+                if ($associative) $create_sql = $a_create_table["Create 
Table"];
+         else $create_sql  = $a_create_table[1];
+
+         $matches = array();
+
+         if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` 
\(`(.*?)`\)/", $create_sql, $matches)) return false;
+            $foreign_keys = array();            
+         $num_keys = count($matches[0]);
+         for ( $i = 0;  $i < $num_keys;  $i ++ ) {
+             $my_field  = explode('`, `', $matches[1][$i]);
+             $ref_table = $matches[2][$i];
+             $ref_field = explode('`, `', $matches[3][$i]);
+
+             if ( $upper ) {
+                 $ref_table = strtoupper($ref_table);
+             }
+
+             $foreign_keys[$ref_table] = array();
+             $num_fields = count($my_field);
+             for ( $j = 0;  $j < $num_fields;  $j ++ ) {
+                 if ( $associative ) {
+                     $foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
+                 } else {
+                     $foreign_keys[$ref_table][] = 
"{$my_field[$j]}={$ref_field[$j]}";
+                 }
+             }
+         }
+         
+         return  $foreign_keys;
+     }
+        
+       
+}
+       
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+
+class ADORecordSet_mysql extends ADORecordSet{ 
+       
+       var $databaseType = "mysql";
+       var $canSeek = true;
+       
+       function ADORecordSet_mysql($queryID,$mode=false) 
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               switch ($mode)
+               {
+               case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+               case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+               case ADODB_FETCH_DEFAULT:
+               case ADODB_FETCH_BOTH:
+               default:
+                       $this->fetchMode = MYSQL_BOTH; break;
+               }
+               $this->adodbFetchMode = $mode;
+               $this->ADORecordSet($queryID);  
+       }
+       
+       function _initrs()
+       {
+       //GLOBAL $ADODB_COUNTRECS;
+       //      $this->_numOfRows = ($ADODB_COUNTRECS) ? 
@mysql_num_rows($this->_queryID):-1;
+               $this->_numOfRows = @mysql_num_rows($this->_queryID);
+               $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 
(address@hidden)
+                       //$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 (address@hidden)
+               //$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 
$this->fields;
+               $row =& ADORecordSet::GetRowAssoc($upper);
+               return $row;
+       }
+       
+       /* Use associative array to get fields array */
+       function Fields($colname)
+       {       
+               // added @ by "Michael William Miller" <address@hidden>
+               if ($this->fetchMode != MYSQL_NUM) return 
@$this->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 _seek($row)
+       {
+               if ($this->_numOfRows == 0) return false;
+               return @mysql_data_seek($this->_queryID,$row);
+       }
+       
+       function MoveNext()
+       {
+               //return adodb_movenext($this);
+               //if (defined('ADODB_EXTENSION')) return adodb_movenext($this);
+               if (@$this->fields = 
mysql_fetch_array($this->_queryID,$this->fetchMode)) {
+                       $this->_currentRow += 1;
+                       return true;
+               }
+               if (!$this->EOF) {
+                       $this->_currentRow += 1;
+                       $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)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               
+               $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 'YEAR':
+               case 'DATE': return 'D';
+               
+               case 'TIME':
+               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';
+               }
+       }
+
+}
+
+class ADORecordSet_ext_mysql extends ADORecordSet_mysql {      
+       function ADORecordSet_ext_mysql($queryID,$mode=false) 
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               switch ($mode)
+               {
+               case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+               case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+               case ADODB_FETCH_DEFAULT:
+               case ADODB_FETCH_BOTH:
+               default:
+               $this->fetchMode = MYSQL_BOTH; break;
+               }
+               $this->adodbFetchMode = $mode;
+               $this->ADORecordSet($queryID);
+       }
+       
+       function MoveNext()
+       {
+               return @adodb_movenext($this);
+       }
+}
+
+
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php:1.2 Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php     Tue Feb 21 13:47:42 2006
@@ -1,818 +1,986 @@
-<?php
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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.
- 
-21 October 2003: MySQLi extension implementation by Arjen de Rijke 
(address@hidden)
-Based on adodb 3.40
-*/ 
-
-// security - hide paths
-//if (!defined('ADODB_DIR')) die();
-
-if (! defined("_ADODB_MYSQLI_LAYER")) {
- define("_ADODB_MYSQLI_LAYER", 1 );
-
- // disable adodb extension - currently incompatible.
- global $ADODB_EXTENSION; $ADODB_EXTENSION = false;
-
-class ADODB_mysqli extends ADOConnection {
-       var $databaseType = 'mysqli';
-       var $dataProvider = 'native';
-       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;
-       var $isoDates = true; // accepts dates in ISO format
-       var $sysDate = 'CURDATE()';
-       var $sysTimeStamp = 'NOW()';
-       var $hasTransactions = false;
-       var $forceNewConnect = false;
-       var $poorAffectedRows = true;
-       var $clientFlags = 0;
-       var $substr = "substring";
-       var $port = false;
-       var $socket = false;
-       var $_bindInputArray = false;
-       var $nameQuote = '`';           /// string to use to quote identifiers 
and names
-       
-       function ADODB_mysqli() 
-       {                       
-         if(!extension_loaded("mysqli"))
-             trigger_error("You must have the mysqli extension installed.", 
E_USER_ERROR);
-           
-       }
-       
-
-       // returns true or false
-       // To add: parameter int $port,
-       //         parameter string $socket
-       function _connect($argHostname = NULL, 
-                         $argUsername = NULL, 
-                         $argPassword = NULL, 
-                         $argDatabasename = NULL, $persist=false)
-         {
-           $this->_connectionID = @mysqli_init();
-           
-           if (is_null($this->_connectionID)) {
-             // mysqli_init only fails if insufficient memory
-             if ($this->debug) 
-                               ADOConnection::outp("mysqli_init() failed : "  
. $this->ErrorMsg());
-             return false;
-           }
-           // Set connection options
-           // Not implemented now
-           // mysqli_options($this->_connection,,);
-           if (mysqli_real_connect($this->_connectionID,
-                                   $argHostname,
-                                   $argUsername,
-                                   $argPassword,
-                                   $argDatabasename,
-                                       $this->port,
-                                       $this->socket,
-                                       $this->clientFlags))
-             {
-               if ($argDatabasename)  return $this->SelectDB($argDatabasename);
-                 
-               
-               return true;
-          }
-           else {
-                       if ($this->debug) 
-                               ADOConnection::outp("Could't connect : "  . 
$this->ErrorMsg());
-                       return false;
-             }
-         }
-       
-       // returns true or false
-       // How to force a persistent connection
-       function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename, true);
-
-       }
-       
-       // When is this used? Close old connection first?
-       // In _connect(), check $this->forceNewConnect? 
-       function _nconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-         {
-           $this->forceNewConnect = true;
-           $this->_connect($argHostname, $argUsername, $argPassword, 
$argDatabasename);
-         }
-       
-       function IfNull( $field, $ifNull ) 
-       {
-               return " IFNULL($field, $ifNull) "; // if MySQL
-       }
-       
-       function ServerInfo()
-       {
-               $arr['description'] = $this->GetOne("select version()");
-               $arr['version'] = ADOConnection::_findvers($arr['description']);
-               return $arr;
-       }
-       
-       
-       function BeginTrans()
-       {         
-               if ($this->transOff) return true;
-               $this->transCnt += 1;
-               $this->Execute('SET AUTOCOMMIT=0');
-               $this->Execute('BEGIN');
-               return true;
-       }
-       
-       function CommitTrans($ok=true) 
-       {
-               if ($this->transOff) return true; 
-               if (!$ok) return $this->RollbackTrans();
-               
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->Execute('COMMIT');
-               $this->Execute('SET AUTOCOMMIT=1');
-               return true;
-       }
-       
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true;
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->Execute('ROLLBACK');
-               $this->Execute('SET AUTOCOMMIT=1');
-               return true;
-       }
-       
-       // if magic quotes disabled, use mysql_real_escape_string()
-       // From readme.htm:
-       // Quotes a string to be sent to the database. The $magic_quotes_enabled
-       // 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 qstr and once 
-       // by the magic_quotes_gpc.
-       //
-       //Eg. $s = $db->qstr(HTTP_GET_VARS['name'],get_magic_quotes_gpc());
-       function qstr($s, $magic_quotes = false)
-       {
-               if (!$magic_quotes) {
-               if (PHP_VERSION >= 5)
-                       return "'" . 
mysqli_real_escape_string($this->_connectionID, $s) . "'";   
-           
-               if ($this->replaceQuote[0] == '\\')
-                       $s = 
adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-           return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-         }
-         // undo magic quotes for "
-         $s = str_replace('\\"','"',$s);
-         return "'$s'";
-       }
-       
-       function _insertid()
-       {
-         $result = @mysqli_insert_id($this->_connectionID);
-         if ($result == -1){
-             if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed 
: "  . $this->ErrorMsg());
-         }
-         return $result;
-       }
-       
-       // Only works for INSERT, UPDATE and DELETE query's
-       function _affectedrows()
-       {
-         $result =  @mysqli_affected_rows($this->_connectionID);
-         if ($result == -1) {
-             if ($this->debug) ADOConnection::outp("mysqli_affected_rows() 
failed : "  . $this->ErrorMsg());
-         }
-         return $result;
-       }
-  
-       // 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 (%s)";
-       var $_dropSeqSQL = "drop table %s";
-       
-       function CreateSequence($seqname='adodbseq',$startID=1)
-       {
-               if (empty($this->_genSeqSQL)) return false;
-               $u = strtoupper($seqname);
-               
-               $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-               if (!$ok) return false;
-               return 
$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-       }
-       
-       function GenID($seqname='adodbseq',$startID=1)
-       {
-               // post-nuke sets hasGenID to false
-               if (!$this->hasGenID) return false;
-               
-               $getnext = sprintf($this->_genIDSQL,$seqname);
-               $holdtransOK = $this->_transOK; // save the current status
-               $rs = @$this->Execute($getnext);
-               if (!$rs) {
-                       if ($holdtransOK) $this->_transOK = true; //if the 
status was ok before reset
-                       $u = strtoupper($seqname);
-                       $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-                       
$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-                       $rs = $this->Execute($getnext);
-               }
-               $this->genID = mysqli_insert_id($this->_connectionID);
-               
-               if ($rs) $rs->Close();
-               
-               return $this->genID;
-       }
-       
-       function &MetaDatabases()
-       {
-               $query = "SHOW DATABASES";
-               $ret =& $this->Execute($query);
-               return $ret;
-       }
-
-         
-       function &MetaIndexes ($table, $primary = FALSE)
-       {
-               // save old fetch mode
-               global $ADODB_FETCH_MODE;
-               
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               if ($this->fetchMode !== FALSE) {
-                      $savem = $this->SetFetchMode(FALSE);
-               }
-               
-               // get index details
-               $rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
-               
-               // restore fetchmode
-               if (isset($savem)) {
-                       $this->SetFetchMode($savem);
-               }
-               $ADODB_FETCH_MODE = $save;
-               
-               if (!is_object($rs)) {
-                       return FALSE;
-               }
-               
-               $indexes = array ();
-               
-               // parse index data into array
-               while ($row = $rs->FetchRow()) {
-                       if ($primary == FALSE AND $row[2] == 'PRIMARY') {
-                               continue;
-                       }
-                       
-                       if (!isset($indexes[$row[2]])) {
-                               $indexes[$row[2]] = array(
-                                       'unique' => ($row[1] == 0),
-                                       'columns' => array()
-                               );
-                       }
-                       
-                       $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
-               }
-               
-               // sort columns by order in the index
-               foreach ( array_keys ($indexes) as $index )
-               {
-                       ksort ($indexes[$index]['columns']);
-               }
-               
-               return $indexes;
-       }
-
-       
-       // Format date column in sql string given an input format that 
understands Y M D
-       function SQLDate($fmt, $col=false)
-       {       
-               if (!$col) $col = $this->sysTimeStamp;
-               $s = 'DATE_FORMAT('.$col.",'";
-               $concat = false;
-               $len = strlen($fmt);
-               for ($i=0; $i < $len; $i++) {
-                       $ch = $fmt[$i];
-                       switch($ch) {
-                       case 'Y':
-                       case 'y':
-                               $s .= '%Y';
-                               break;
-                       case 'Q':
-                       case 'q':
-                               $s .= "'),Quarter($col)";
-                               
-                               if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
-                               else $s .= ",('";
-                               $concat = true;
-                               break;
-                       case 'M':
-                               $s .= '%b';
-                               break;
-                               
-                       case 'm':
-                               $s .= '%m';
-                               break;
-                       case 'D':
-                       case 'd':
-                               $s .= '%d';
-                               break;
-                       
-                       case 'H': 
-                               $s .= '%H';
-                               break;
-                               
-                       case 'h':
-                               $s .= '%I';
-                               break;
-                               
-                       case 'i':
-                               $s .= '%i';
-                               break;
-                               
-                       case 's':
-                               $s .= '%s';
-                               break;
-                               
-                       case 'a':
-                       case 'A':
-                               $s .= '%p';
-                               break;
-                               
-                       default:
-                               
-                               if ($ch == '\\') {
-                                       $i++;
-                                       $ch = substr($fmt,$i,1);
-                               }
-                               $s .= $ch;
-                               break;
-                       }
-               }
-               $s.="')";
-               if ($concat) $s = "CONCAT($s)";
-               return $s;
-       }
-       
-       // returns concatenated string
-       // much easier to run "mysqld --ansi" or "mysqld 
--sql-mode=PIPES_AS_CONCAT" and use || operator
-       function Concat()
-       {
-               $s = "";
-               $arr = func_get_args();
-               
-               // suggestion by address@hidden
-               $s = implode(',',$arr); 
-               if (strlen($s) > 0) return "CONCAT($s)";
-               else return '';
-       }
-       
-       // dayFraction is a day in floating point
-       function OffsetDate($dayFraction,$date=false)
-       {               
-               if (!$date) 
-                 $date = $this->sysDate;
-               return 
"from_unixtime(unix_timestamp($date)+($dayFraction)*24*3600)";
-       }
-       
-       
-       function &MetaColumns($table) 
-       {
-               if (!$this->metaColumnsSQL)
-                       return false;
-               
-               global $ADODB_FETCH_MODE;
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               if ($this->fetchMode !== false)
-                       $savem = $this->SetFetchMode(false);
-               $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-               if (isset($savem)) $this->SetFetchMode($savem);
-               $ADODB_FETCH_MODE = $save;
-               if (!is_object($rs))
-                       return false;
-               
-               $retarr = array();
-               while (!$rs->EOF) {
-                       $fld = new ADOFieldObject();
-                       $fld->name = $rs->fields[0];
-                       $type = $rs->fields[1];
-                       
-                       // split type into type(length):
-                       $fld->scale = null;
-                       if (preg_match("/^(.+)\((\d+),(\d+)/", $type, 
$query_array)) {
-                               $fld->type = $query_array[1];
-                               $fld->max_length = is_numeric($query_array[2]) 
? $query_array[2] : -1;
-                               $fld->scale = is_numeric($query_array[3]) ? 
$query_array[3] : -1;
-                       } elseif (preg_match("/^(.+)\((\d+)/", $type, 
$query_array)) {
-                               $fld->type = $query_array[1];
-                               $fld->max_length = is_numeric($query_array[2]) 
? $query_array[2] : -1;
-                       } else {
-                               $fld->type = $type;
-                               $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($type,'blob') !== false);
-                       $fld->unsigned = (strpos($type,'unsigned') !== false);
-
-                       if (!$fld->binary) {
-                               $d = $rs->fields[4];
-                               if ($d != '' && $d != 'NULL') {
-                                       $fld->has_default = true;
-                                       $fld->default_value = $d;
-                               } else {
-                                       $fld->has_default = false;
-                               }
-                       }
-                       
-                       if ($save == ADODB_FETCH_NUM) {
-                               $retarr[] = $fld;
-                       } else {
-                               $retarr[strtoupper($fld->name)] = $fld;
-                       }
-                       $rs->MoveNext();
-               }
-               
-               $rs->Close();
-               return $retarr;
-       }
-               
-       // returns true or false
-       function SelectDB($dbName) 
-       {
-//         $this->_connectionID = 
$this->mysqli_resolve_link($this->_connectionID);
-           $this->databaseName = $dbName;
-           if ($this->_connectionID) {
-               $result = @mysqli_select_db($this->_connectionID, $dbName);
-                       if (!$result) {
-                       ADOConnection::outp("Select of database " . $dbName . " 
failed. " . $this->ErrorMsg());
-                       }
-                       return $result;         
-               }
-           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," : '';
-               
-               if ($secs)
-                       $rs =& $this->CacheExecute($secs, $sql . " LIMIT 
$offsetStr$nrows" , $inputarr , $arg3);
-               else
-                       $rs =& $this->Execute($sql . " LIMIT $offsetStr$nrows" 
, $inputarr , $arg3);
-                       
-               return $rs;
-       }
-       
-       
-       function Prepare($sql)
-       {
-               return $sql;
-               
-               $stmt = $this->_connectionID->prepare($sql);
-               if (!$stmt) {
-                       echo $this->ErrorMsg();
-                       return $sql;
-               }
-               return array($sql,$stmt);
-       }
-       
-       
-       // returns queryID or false
-       function _query($sql, $inputarr)
-       {
-       global $ADODB_COUNTRECS;
-               
-               if (is_array($sql)) {
-                       $stmt = $sql[1];
-                       $a = '';
-                       foreach($inputarr as $k => $v) {
-                               if (is_string($v)) $a .= 's';
-                               else if (is_integer($v)) $a .= 'i'; 
-                               else $a .= 'd';
-                       }
-                       
-                       $fnarr =& array_merge( array($stmt,$a) , $inputarr);
-                       $ret = 
call_user_func_array('mysqli_stmt_bind_param',$fnarr);
-
-                       $ret = mysqli_stmt_execute($stmt);
-                       return $ret;
-               }
-               if (!$mysql_res =  mysqli_query($this->_connectionID, $sql, 
($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
-                   if ($this->debug) ADOConnection::outp("Query: " . $sql . " 
failed. " . $this->ErrorMsg());
-                   return false;
-               }
-               
-               return $mysql_res;
-       }
-
-       /*      Returns: the last error message from previous database 
operation        */      
-       function ErrorMsg() 
-         {
-           if (empty($this->_connectionID)) 
-             $this->_errorMsg = @mysqli_error();
-           else 
-             $this->_errorMsg = @mysqli_error($this->_connectionID);
-           return $this->_errorMsg;
-         }
-       
-       /*      Returns: the last error number from previous database operation 
*/      
-       function ErrorNo() 
-         {
-           if (empty($this->_connectionID))  
-             return @mysqli_errno();
-           else 
-             return @mysqli_errno($this->_connectionID);
-         }
-       
-       // returns true or false
-       function _close()
-         {
-           @mysqli_close($this->_connectionID);
-           $this->_connectionID = false;
-         }
-
-       /*
-       * Maximum size of C field
-       */
-       function CharMax()
-       {
-               return 255; 
-       }
-       
-       /*
-       * Maximum size of X field
-       */
-       function TextMax()
-       {
-         return 4294967295; 
-       }
-
-
-}
- 
-/*--------------------------------------------------------------------------------------
-        Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_mysqli extends ADORecordSet{        
-       
-       var $databaseType = "mysqli";
-       var $canSeek = true;
-       
-       function ADORecordSet_mysqli($queryID, $mode = false) 
-       {
-         if ($mode === false) 
-          { 
-             global $ADODB_FETCH_MODE;
-             $mode = $ADODB_FETCH_MODE;
-          }
-          
-         switch ($mode)
-           {
-           case ADODB_FETCH_NUM: 
-             $this->fetchMode = MYSQLI_NUM; 
-             break;
-           case ADODB_FETCH_ASSOC:
-             $this->fetchMode = MYSQLI_ASSOC; 
-             break;
-           case ADODB_FETCH_DEFAULT:
-           case ADODB_FETCH_BOTH:
-           default:
-             $this->fetchMode = MYSQLI_BOTH; 
-             break;
-           }
-         $this->adodbFetchMode = $mode;
-         $this->ADORecordSet($queryID);        
-       }
-       
-       function _initrs()
-       {
-       global $ADODB_COUNTRECS;
-       
-               $this->_numOfRows = $ADODB_COUNTRECS ? 
@mysqli_num_rows($this->_queryID) : -1;
-               $this->_numOfFields = @mysqli_num_fields($this->_queryID);
-       }
-       
-       function &FetchField($fieldOffset = -1) 
-       {       
-         $fieldnr = $fieldOffset;
-         if ($fieldOffset != -1) {
-           $fieldOffset = mysqli_field_seek($this->_queryID, $fieldnr);
-         }
-         $o = mysqli_fetch_field($this->_queryID);
-         return $o;
-       }
-
-       function &GetRowAssoc($upper = true)
-       {
-         if ($this->fetchMode == MYSQLI_ASSOC && !$upper) 
-           return $this->fields;
-         $row =& ADORecordSet::GetRowAssoc($upper);
-         return $row;
-       }
-       
-       /* Use associative array to get fields array */
-       function Fields($colname)
-       {       
-         if ($this->fetchMode != MYSQLI_NUM) 
-           return @$this->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 _seek($row)
-       {
-         if ($this->_numOfRows == 0) 
-           return false;
-
-         if ($row < 0)
-           return false;
-
-         mysqli_data_seek($this->_queryID, $row);
-         $this->EOF = false;
-         return true;
-       }
-               
-       // 10% speedup to move MoveNext to child class
-       // This is the only implementation that works now (23-10-2003).
-       // Other functions return no or the wrong results.
-       function MoveNext() 
-       {
-               if ($this->EOF) return false;
-               $this->_currentRow++;
-               $this->fields = 
@mysqli_fetch_array($this->_queryID,$this->fetchMode);
-               
-               if (is_array($this->fields)) return true;
-               $this->EOF = true;
-               return false;
-       }       
-       
-       function _fetch()
-       {
-               $this->fields = 
mysqli_fetch_array($this->_queryID,$this->fetchMode);  
-               return is_array($this->fields);
-       }
-       
-       function _close() 
-       {
-               mysqli_free_result($this->_queryID); 
-               $this->_queryID = false;        
-       }
-       
-/*
-
-0 = MYSQLI_TYPE_DECIMAL
-1 = MYSQLI_TYPE_CHAR
-1 = MYSQLI_TYPE_TINY
-2 = MYSQLI_TYPE_SHORT
-3 = MYSQLI_TYPE_LONG
-4 = MYSQLI_TYPE_FLOAT
-5 = MYSQLI_TYPE_DOUBLE
-6 = MYSQLI_TYPE_NULL
-7 = MYSQLI_TYPE_TIMESTAMP
-8 = MYSQLI_TYPE_LONGLONG
-9 = MYSQLI_TYPE_INT24
-10 = MYSQLI_TYPE_DATE
-11 = MYSQLI_TYPE_TIME
-12 = MYSQLI_TYPE_DATETIME
-13 = MYSQLI_TYPE_YEAR
-14 = MYSQLI_TYPE_NEWDATE
-247 = MYSQLI_TYPE_ENUM
-248 = MYSQLI_TYPE_SET
-249 = MYSQLI_TYPE_TINY_BLOB
-250 = MYSQLI_TYPE_MEDIUM_BLOB
-251 = MYSQLI_TYPE_LONG_BLOB
-252 = MYSQLI_TYPE_BLOB
-253 = MYSQLI_TYPE_VAR_STRING
-254 = MYSQLI_TYPE_STRING
-255 = MYSQLI_TYPE_GEOMETRY
-*/
-
-       function MetaType($t, $len = -1, $fieldobj = false)
-       {
-               if (is_object($t)) {
-                   $fieldobj = $t;
-                   $t = $fieldobj->type;
-                   $len = $fieldobj->max_length;
-               }
-               
-               
-                $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': */
-               
-               case MYSQLI_TYPE_TINY_BLOB :
-               case MYSQLI_TYPE_CHAR :
-               case MYSQLI_TYPE_STRING :
-               case MYSQLI_TYPE_ENUM :
-               case MYSQLI_TYPE_SET :
-               case 253 :
-                  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':*/
-               
-               case MYSQLI_TYPE_BLOB :
-               case MYSQLI_TYPE_LONG_BLOB :
-               case MYSQLI_TYPE_MEDIUM_BLOB :
-               
-                  return !empty($fieldobj->binary) ? 'B' : 'X';
-               /*case 'YEAR':
-               case 'DATE': */
-               case MYSQLI_TYPE_DATE :
-               case MYSQLI_TYPE_YEAR :
-               
-                  return 'D';
-               
-               /*case 'TIME':
-               case 'DATETIME':
-               case 'TIMESTAMP':*/
-               
-               case MYSQLI_TYPE_DATETIME :
-               case MYSQLI_TYPE_NEWDATE :
-               case MYSQLI_TYPE_TIME :
-               case MYSQLI_TYPE_TIMESTAMP :
-               
-                       return 'T';
-               
-               /*case 'INT': 
-               case 'INTEGER':
-               case 'BIGINT':
-               case 'TINYINT':
-               case 'MEDIUMINT':
-               case 'SMALLINT': 
-               */
-               case MYSQLI_TYPE_INT24 :
-               case MYSQLI_TYPE_LONG :
-               case MYSQLI_TYPE_LONGLONG :
-               case MYSQLI_TYPE_SHORT :
-               case MYSQLI_TYPE_TINY :
-               
-                  if (!empty($fieldobj->primary_key)) return 'R';
-                  
-                  return 'I';
-               
-               /*
-                  // Added floating-point types
-                  // Maybe not necessery.
-                case 'FLOAT':
-                case 'DOUBLE':
-                  //           case 'DOUBLE PRECISION':
-                case 'DECIMAL':
-                case 'DEC':
-                case 'FIXED':*/
-                default:
-                       if (!is_numeric($t)) echo "<p>--- Error in type 
matching $t -----</p>"; 
-                       return 'N';
-               }
-       } // function
-       
-
-} // rs class
- 
-}
-
+<?php
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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.
+ 
+21 October 2003: MySQLi extension implementation by Arjen de Rijke 
(address@hidden)
+Based on adodb 3.40
+*/ 
+
+// security - hide paths
+//if (!defined('ADODB_DIR')) die();
+
+if (! defined("_ADODB_MYSQLI_LAYER")) {
+ define("_ADODB_MYSQLI_LAYER", 1 );
+ 
+ // PHP5 compat...
+ if (! defined("MYSQLI_BINARY_FLAG"))  define("MYSQLI_BINARY_FLAG", 128); 
+ if (!defined('MYSQLI_READ_DEFAULT_GROUP')) 
define('MYSQLI_READ_DEFAULT_GROUP',1);
+
+ // disable adodb extension - currently incompatible.
+ global $ADODB_EXTENSION; $ADODB_EXTENSION = false;
+
+class ADODB_mysqli extends ADOConnection {
+       var $databaseType = 'mysqli';
+       var $dataProvider = 'native';
+       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;
+       var $isoDates = true; // accepts dates in ISO format
+       var $sysDate = 'CURDATE()';
+       var $sysTimeStamp = 'NOW()';
+       var $hasTransactions = true;
+       var $forceNewConnect = false;
+       var $poorAffectedRows = true;
+       var $clientFlags = 0;
+       var $substr = "substring";
+       var $port = false;
+       var $socket = false;
+       var $_bindInputArray = false;
+       var $nameQuote = '`';           /// string to use to quote identifiers 
and names
+       var $optionFlags = array(array(MYSQLI_READ_DEFAULT_GROUP,0));
+       
+       function ADODB_mysqli() 
+       {                       
+        // if(!extension_loaded("mysqli"))
+             ;//trigger_error("You must have the mysqli extension installed.", 
E_USER_ERROR);
+           
+       }
+       
+
+       // returns true or false
+       // To add: parameter int $port,
+       //         parameter string $socket
+       function _connect($argHostname = NULL, 
+                         $argUsername = NULL, 
+                         $argPassword = NULL, 
+                         $argDatabasename = NULL, $persist=false)
+         {
+                if(!extension_loaded("mysqli")) {
+                       return null;
+                }
+           $this->_connectionID = @mysqli_init();
+           
+           if (is_null($this->_connectionID)) {
+             // mysqli_init only fails if insufficient memory
+             if ($this->debug) 
+                               ADOConnection::outp("mysqli_init() failed : "  
. $this->ErrorMsg());
+             return false;
+           }
+               /*
+               I suggest a simple fix which would enable adodb and mysqli 
driver to
+               read connection options from the standard mysql configuration 
file
+               /etc/my.cnf - "Bastien Duclaux" <bduclaux#yahoo.com>
+               */
+               foreach($this->optionFlags as $arr) {   
+                       mysqli_options($this->_connectionID,$arr[0],$arr[1]);
+               }
+
+               #if (!empty($this->port)) $argHostname .= ":".$this->port;
+               $ok = mysqli_real_connect($this->_connectionID,
+                                   $argHostname,
+                                   $argUsername,
+                                   $argPassword,
+                                   $argDatabasename,
+                                       $this->port,
+                                       $this->socket,
+                                       $this->clientFlags);
+            
+               if ($ok) {
+                       if ($argDatabasename)  return 
$this->SelectDB($argDatabasename);
+                       return true;
+          } else {
+                       if ($this->debug) 
+                               ADOConnection::outp("Could't connect : "  . 
$this->ErrorMsg());
+                       return false;
+          }
+       }
+       
+       // returns true or false
+       // How to force a persistent connection
+       function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename, true);
+
+       }
+       
+       // When is this used? Close old connection first?
+       // In _connect(), check $this->forceNewConnect? 
+       function _nconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+         {
+           $this->forceNewConnect = true;
+           return $this->_connect($argHostname, $argUsername, $argPassword, 
$argDatabasename);
+         }
+       
+       function IfNull( $field, $ifNull ) 
+       {
+               return " IFNULL($field, $ifNull) "; // if MySQL
+       }
+       
+       function ServerInfo()
+       {
+               $arr['description'] = $this->GetOne("select version()");
+               $arr['version'] = ADOConnection::_findvers($arr['description']);
+               return $arr;
+       }
+       
+       
+       function BeginTrans()
+       {         
+               if ($this->transOff) return true;
+               $this->transCnt += 1;
+               $this->Execute('SET AUTOCOMMIT=0');
+               $this->Execute('BEGIN');
+               return true;
+       }
+       
+       function CommitTrans($ok=true) 
+       {
+               if ($this->transOff) return true; 
+               if (!$ok) return $this->RollbackTrans();
+               
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->Execute('COMMIT');
+               $this->Execute('SET AUTOCOMMIT=1');
+               return true;
+       }
+       
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true;
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->Execute('ROLLBACK');
+               $this->Execute('SET AUTOCOMMIT=1');
+               return true;
+       }
+       
+       function RowLock($tables,$where='',$flds='1 as adodb_ignore') 
+       {
+               if ($this->transCnt==0) $this->BeginTrans();
+               if ($where) $where = ' where '.$where;
+               $rs =& $this->Execute("select $flds from $tables $where for 
update");
+               return !empty($rs); 
+       }
+       
+       // if magic quotes disabled, use mysql_real_escape_string()
+       // From readme.htm:
+       // Quotes a string to be sent to the database. The $magic_quotes_enabled
+       // 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 qstr and once 
+       // by the magic_quotes_gpc.
+       //
+       //Eg. $s = $db->qstr(_GET['name'],get_magic_quotes_gpc());
+       function qstr($s, $magic_quotes = false)
+       {
+               if (!$magic_quotes) {
+               if (PHP_VERSION >= 5)
+                       return "'" . 
mysqli_real_escape_string($this->_connectionID, $s) . "'";   
+           
+               if ($this->replaceQuote[0] == '\\')
+                       $s = 
adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+           return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+         }
+         // undo magic quotes for "
+         $s = str_replace('\\"','"',$s);
+         return "'$s'";
+       }
+       
+       function _insertid()
+       {
+         $result = @mysqli_insert_id($this->_connectionID);
+         if ($result == -1){
+             if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed 
: "  . $this->ErrorMsg());
+         }
+         return $result;
+       }
+       
+       // Only works for INSERT, UPDATE and DELETE query's
+       function _affectedrows()
+       {
+         $result =  @mysqli_affected_rows($this->_connectionID);
+         if ($result == -1) {
+             if ($this->debug) ADOConnection::outp("mysqli_affected_rows() 
failed : "  . $this->ErrorMsg());
+         }
+         return $result;
+       }
+  
+       // 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 (%s)";
+       var $_dropSeqSQL = "drop table %s";
+       
+       function CreateSequence($seqname='adodbseq',$startID=1)
+       {
+               if (empty($this->_genSeqSQL)) return false;
+               $u = strtoupper($seqname);
+               
+               $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+               if (!$ok) return false;
+               return 
$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+       }
+       
+       function GenID($seqname='adodbseq',$startID=1)
+       {
+               // post-nuke sets hasGenID to false
+               if (!$this->hasGenID) return false;
+               
+               $getnext = sprintf($this->_genIDSQL,$seqname);
+               $holdtransOK = $this->_transOK; // save the current status
+               $rs = @$this->Execute($getnext);
+               if (!$rs) {
+                       if ($holdtransOK) $this->_transOK = true; //if the 
status was ok before reset
+                       $u = strtoupper($seqname);
+                       $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+                       
$this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+                       $rs = $this->Execute($getnext);
+               }
+               $this->genID = mysqli_insert_id($this->_connectionID);
+               
+               if ($rs) $rs->Close();
+               
+               return $this->genID;
+       }
+       
+       function &MetaDatabases()
+       {
+               $query = "SHOW DATABASES";
+               $ret =& $this->Execute($query);
+               if ($ret && is_object($ret)){
+                  $arr = array();
+                       while (!$ret->EOF){
+                               $db = $ret->Fields('Database');
+                               if ($db != 'mysql') $arr[] = $db;
+                               $ret->MoveNext();
+                       }
+                  return $arr;
+               }
+        return $ret;
+       }
+
+         
+       function &MetaIndexes ($table, $primary = FALSE)
+       {
+               // save old fetch mode
+               global $ADODB_FETCH_MODE;
+               
+               $false = false;
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->fetchMode !== FALSE) {
+                      $savem = $this->SetFetchMode(FALSE);
+               }
+               
+               // get index details
+               $rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
+               
+               // restore fetchmode
+               if (isset($savem)) {
+                       $this->SetFetchMode($savem);
+               }
+               $ADODB_FETCH_MODE = $save;
+               
+               if (!is_object($rs)) {
+                       return $false;
+               }
+               
+               $indexes = array ();
+               
+               // parse index data into array
+               while ($row = $rs->FetchRow()) {
+                       if ($primary == FALSE AND $row[2] == 'PRIMARY') {
+                               continue;
+                       }
+                       
+                       if (!isset($indexes[$row[2]])) {
+                               $indexes[$row[2]] = array(
+                                       'unique' => ($row[1] == 0),
+                                       'columns' => array()
+                               );
+                       }
+                       
+                       $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
+               }
+               
+               // sort columns by order in the index
+               foreach ( array_keys ($indexes) as $index )
+               {
+                       ksort ($indexes[$index]['columns']);
+               }
+               
+               return $indexes;
+       }
+
+       
+       // Format date column in sql string given an input format that 
understands Y M D
+       function SQLDate($fmt, $col=false)
+       {       
+               if (!$col) $col = $this->sysTimeStamp;
+               $s = 'DATE_FORMAT('.$col.",'";
+               $concat = false;
+               $len = strlen($fmt);
+               for ($i=0; $i < $len; $i++) {
+                       $ch = $fmt[$i];
+                       switch($ch) {
+                       case 'Y':
+                       case 'y':
+                               $s .= '%Y';
+                               break;
+                       case 'Q':
+                       case 'q':
+                               $s .= "'),Quarter($col)";
+                               
+                               if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
+                               else $s .= ",('";
+                               $concat = true;
+                               break;
+                       case 'M':
+                               $s .= '%b';
+                               break;
+                               
+                       case 'm':
+                               $s .= '%m';
+                               break;
+                       case 'D':
+                       case 'd':
+                               $s .= '%d';
+                               break;
+                       
+                       case 'H': 
+                               $s .= '%H';
+                               break;
+                               
+                       case 'h':
+                               $s .= '%I';
+                               break;
+                               
+                       case 'i':
+                               $s .= '%i';
+                               break;
+                               
+                       case 's':
+                               $s .= '%s';
+                               break;
+                               
+                       case 'a':
+                       case 'A':
+                               $s .= '%p';
+                               break;
+                       
+                       case 'w':
+                               $s .= '%w';
+                               break;
+                               
+                       case 'l':
+                               $s .= '%W';
+                               break;
+                               
+                       default:
+                               
+                               if ($ch == '\\') {
+                                       $i++;
+                                       $ch = substr($fmt,$i,1);
+                               }
+                               $s .= $ch;
+                               break;
+                       }
+               }
+               $s.="')";
+               if ($concat) $s = "CONCAT($s)";
+               return $s;
+       }
+       
+       // returns concatenated string
+       // much easier to run "mysqld --ansi" or "mysqld 
--sql-mode=PIPES_AS_CONCAT" and use || operator
+       function Concat()
+       {
+               $s = "";
+               $arr = func_get_args();
+               
+               // suggestion by address@hidden
+               $s = implode(',',$arr); 
+               if (strlen($s) > 0) return "CONCAT($s)";
+               else return '';
+       }
+       
+       // dayFraction is a day in floating point
+       function OffsetDate($dayFraction,$date=false)
+       {               
+               if (!$date) 
+                 $date = $this->sysDate;
+               return 
"from_unixtime(unix_timestamp($date)+($dayFraction)*24*3600)";
+       }
+       
+       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+       {       
+               $save = $this->metaTablesSQL;
+               if ($showSchema && is_string($showSchema)) {
+                       $this->metaTablesSQL .= " from $showSchema";
+               }
+               
+               if ($mask) {
+                       $mask = $this->qstr($mask);
+                       $this->metaTablesSQL .= " like $mask";
+               }
+               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
+               
+               $this->metaTablesSQL = $save;
+               return $ret;
+       }
+       
+       // "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
+       function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, 
$associative = FALSE )
+       {
+           if ( !empty($owner) ) {
+              $table = "$owner.$table";
+           }
+           $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', 
$table));
+               if ($associative) $create_sql = $a_create_table["Create Table"];
+           else $create_sql  = $a_create_table[1];
+       
+           $matches = array();
+       
+           if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` 
\(`(.*?)`\)/", $create_sql, $matches)) return false;
+               $foreign_keys = array();                 
+           $num_keys = count($matches[0]);
+           for ( $i = 0;  $i < $num_keys;  $i ++ ) {
+               $my_field  = explode('`, `', $matches[1][$i]);
+               $ref_table = $matches[2][$i];
+               $ref_field = explode('`, `', $matches[3][$i]);
+       
+               if ( $upper ) {
+                   $ref_table = strtoupper($ref_table);
+               }
+       
+               $foreign_keys[$ref_table] = array();
+               $num_fields               = count($my_field);
+               for ( $j = 0;  $j < $num_fields;  $j ++ ) {
+                   if ( $associative ) {
+                       $foreign_keys[$ref_table][$ref_field[$j]] = 
$my_field[$j];
+                   } else {
+                       $foreign_keys[$ref_table][] = 
"{$my_field[$j]}={$ref_field[$j]}";
+                   }
+               }
+           }
+           
+           return  $foreign_keys;
+       }
+       
+       function &MetaColumns($table) 
+       {
+               $false = false;
+               if (!$this->metaColumnsSQL)
+                       return $false;
+               
+               global $ADODB_FETCH_MODE;
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->fetchMode !== false)
+                       $savem = $this->SetFetchMode(false);
+               $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+               if (isset($savem)) $this->SetFetchMode($savem);
+               $ADODB_FETCH_MODE = $save;
+               if (!is_object($rs))
+                       return $false;
+               
+               $retarr = array();
+               while (!$rs->EOF) {
+                       $fld = new ADOFieldObject();
+                       $fld->name = $rs->fields[0];
+                       $type = $rs->fields[1];
+                       
+                       // split type into type(length):
+                       $fld->scale = null;
+                       if (preg_match("/^(.+)\((\d+),(\d+)/", $type, 
$query_array)) {
+                               $fld->type = $query_array[1];
+                               $fld->max_length = is_numeric($query_array[2]) 
? $query_array[2] : -1;
+                               $fld->scale = is_numeric($query_array[3]) ? 
$query_array[3] : -1;
+                       } elseif (preg_match("/^(.+)\((\d+)/", $type, 
$query_array)) {
+                               $fld->type = $query_array[1];
+                               $fld->max_length = is_numeric($query_array[2]) 
? $query_array[2] : -1;
+                       } elseif (preg_match("/^(enum)\((.*)\)$/i", $type, 
$query_array)) {
+                               $fld->type = $query_array[1];
+                               $fld->max_length = 
max(array_map("strlen",explode(",",$query_array[2]))) - 2; // PHP >= 4.0.6
+                               $fld->max_length = ($fld->max_length == 0 ? 1 : 
$fld->max_length);
+                       } else {
+                               $fld->type = $type;
+                               $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($type,'blob') !== false);
+                       $fld->unsigned = (strpos($type,'unsigned') !== false);
+
+                       if (!$fld->binary) {
+                               $d = $rs->fields[4];
+                               if ($d != '' && $d != 'NULL') {
+                                       $fld->has_default = true;
+                                       $fld->default_value = $d;
+                               } else {
+                                       $fld->has_default = false;
+                               }
+                       }
+                       
+                       if ($save == ADODB_FETCH_NUM) {
+                               $retarr[] = $fld;
+                       } else {
+                               $retarr[strtoupper($fld->name)] = $fld;
+                       }
+                       $rs->MoveNext();
+               }
+               
+               $rs->Close();
+               return $retarr;
+       }
+               
+       // returns true or false
+       function SelectDB($dbName) 
+       {
+//         $this->_connectionID = 
$this->mysqli_resolve_link($this->_connectionID);
+           $this->database = $dbName;
+               $this->databaseName = $dbName; # obsolete, retained for compat 
with older adodb versions
+               
+           if ($this->_connectionID) {
+               $result = @mysqli_select_db($this->_connectionID, $dbName);
+                       if (!$result) {
+                       ADOConnection::outp("Select of database " . $dbName . " 
failed. " . $this->ErrorMsg());
+                       }
+                       return $result;         
+               }
+           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," : '';
+               if ($nrows < 0) $nrows = '18446744073709551615';
+               
+               if ($secs)
+                       $rs =& $this->CacheExecute($secs, $sql . " LIMIT 
$offsetStr$nrows" , $inputarr , $arg3);
+               else
+                       $rs =& $this->Execute($sql . " LIMIT $offsetStr$nrows" 
, $inputarr , $arg3);
+                       
+               return $rs;
+       }
+       
+       
+       function Prepare($sql)
+       {
+               return $sql;
+               
+               $stmt = $this->_connectionID->prepare($sql);
+               if (!$stmt) {
+                       echo $this->ErrorMsg();
+                       return $sql;
+               }
+               return array($sql,$stmt);
+       }
+       
+       
+       // returns queryID or false
+       function _query($sql, $inputarr)
+       {
+       global $ADODB_COUNTRECS;
+               
+               if (is_array($sql)) {
+                       $stmt = $sql[1];
+                       $a = '';
+                       foreach($inputarr as $k => $v) {
+                               if (is_string($v)) $a .= 's';
+                               else if (is_integer($v)) $a .= 'i'; 
+                               else $a .= 'd';
+                       }
+                       
+                       $fnarr = array_merge( array($stmt,$a) , $inputarr);
+                       $ret = 
call_user_func_array('mysqli_stmt_bind_param',$fnarr);
+
+                       $ret = mysqli_stmt_execute($stmt);
+                       return $ret;
+               }
+               if (!$mysql_res =  mysqli_query($this->_connectionID, $sql, 
($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
+                   if ($this->debug) ADOConnection::outp("Query: " . $sql . " 
failed. " . $this->ErrorMsg());
+                   return false;
+               }
+               
+               return $mysql_res;
+       }
+
+       /*      Returns: the last error message from previous database 
operation        */      
+       function ErrorMsg() 
+         {
+           if (empty($this->_connectionID)) 
+             $this->_errorMsg = @mysqli_connect_error();
+           else 
+             $this->_errorMsg = @mysqli_error($this->_connectionID);
+           return $this->_errorMsg;
+         }
+       
+       /*      Returns: the last error number from previous database operation 
*/      
+       function ErrorNo() 
+         {
+           if (empty($this->_connectionID))  
+             return @mysqli_connect_errno();
+           else 
+             return @mysqli_errno($this->_connectionID);
+         }
+       
+       // returns true or false
+       function _close()
+         {
+           @mysqli_close($this->_connectionID);
+           $this->_connectionID = false;
+         }
+
+       /*
+       * Maximum size of C field
+       */
+       function CharMax()
+       {
+               return 255; 
+       }
+       
+       /*
+       * Maximum size of X field
+       */
+       function TextMax()
+       {
+         return 4294967295; 
+       }
+
+
+
+       // this is a set of functions for managing client encoding - very 
important if the encodings
+       // of your database and your output target (i.e. HTML) don't match
+       // for instance, you may have UTF8 database and server it on-site as 
latin1 etc.
+       // GetCharSet - get the name of the character set the client is using 
now
+       // Under Windows, the functions should work with MySQL 4.1.11 and 
above, the set of charsets supported
+       // depends on compile flags of mysql distribution 
+
+  function GetCharSet()
+  {
+    //we will use ADO's builtin property charSet
+    if (!is_callable($this->_connectionID,'character_set_name'))
+       return false;
+       
+    $this->charSet = @$this->_connectionID->character_set_name();
+    if (!$this->charSet) {
+      return false;
+    } else {
+      return $this->charSet;
+    }
+  }
+
+  // SetCharSet - switch the client encoding
+  function SetCharSet($charset_name)
+  {
+    if (!is_callable($this->_connectionID,'set_charset'))
+       return false;
+
+    if ($this->charSet !== $charset_name) {
+      $if = @$this->_connectionID->set_charset($charset_name);
+      if ($if == "0" & $this->GetCharSet() == $charset_name) {
+        return true;
+      } else return false;
+    } else return true;
+  }
+
+
+
+
+}
+ 
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_mysqli extends ADORecordSet{        
+       
+       var $databaseType = "mysqli";
+       var $canSeek = true;
+       
+       function ADORecordSet_mysqli($queryID, $mode = false) 
+       {
+         if ($mode === false) 
+          { 
+             global $ADODB_FETCH_MODE;
+             $mode = $ADODB_FETCH_MODE;
+          }
+          
+         switch ($mode)
+           {
+           case ADODB_FETCH_NUM: 
+             $this->fetchMode = MYSQLI_NUM; 
+             break;
+           case ADODB_FETCH_ASSOC:
+             $this->fetchMode = MYSQLI_ASSOC; 
+             break;
+           case ADODB_FETCH_DEFAULT:
+           case ADODB_FETCH_BOTH:
+           default:
+             $this->fetchMode = MYSQLI_BOTH; 
+             break;
+           }
+         $this->adodbFetchMode = $mode;
+         $this->ADORecordSet($queryID);        
+       }
+       
+       function _initrs()
+       {
+       global $ADODB_COUNTRECS;
+       
+               $this->_numOfRows = $ADODB_COUNTRECS ? 
@mysqli_num_rows($this->_queryID) : -1;
+               $this->_numOfFields = @mysqli_num_fields($this->_queryID);
+       }
+       
+/*
+1      = MYSQLI_NOT_NULL_FLAG
+2      = MYSQLI_PRI_KEY_FLAG
+4      = MYSQLI_UNIQUE_KEY_FLAG
+8      = MYSQLI_MULTIPLE_KEY_FLAG
+16     = MYSQLI_BLOB_FLAG
+32     = MYSQLI_UNSIGNED_FLAG
+64     = MYSQLI_ZEROFILL_FLAG
+128    = MYSQLI_BINARY_FLAG
+256    = MYSQLI_ENUM_FLAG
+512    = MYSQLI_AUTO_INCREMENT_FLAG
+1024   = MYSQLI_TIMESTAMP_FLAG
+2048   = MYSQLI_SET_FLAG
+32768  = MYSQLI_NUM_FLAG
+16384  = MYSQLI_PART_KEY_FLAG
+32768  = MYSQLI_GROUP_FLAG
+65536  = MYSQLI_UNIQUE_FLAG
+131072 = MYSQLI_BINCMP_FLAG
+*/
+
+       function &FetchField($fieldOffset = -1) 
+       {       
+               $fieldnr = $fieldOffset;
+               if ($fieldOffset != -1) {
+                 $fieldOffset = mysqli_field_seek($this->_queryID, $fieldnr);
+               }
+               $o = mysqli_fetch_field($this->_queryID);
+               /* Properties of an ADOFieldObject as set by MetaColumns */
+               $o->primary_key = $o->flags & MYSQLI_PRI_KEY_FLAG;
+               $o->not_null = $o->flags & MYSQLI_NOT_NULL_FLAG;
+               $o->auto_increment = $o->flags & MYSQLI_AUTO_INCREMENT_FLAG;
+               $o->binary = $o->flags & MYSQLI_BINARY_FLAG;
+               // $o->blob = $o->flags & MYSQLI_BLOB_FLAG; /* not returned by 
MetaColumns */
+               $o->unsigned = $o->flags & MYSQLI_UNSIGNED_FLAG;
+
+               return $o;
+       }
+
+       function &GetRowAssoc($upper = true)
+       {
+               if ($this->fetchMode == MYSQLI_ASSOC && !$upper) 
+                 return $this->fields;
+               $row =& ADORecordSet::GetRowAssoc($upper);
+               return $row;
+       }
+       
+       /* Use associative array to get fields array */
+       function Fields($colname)
+       {       
+         if ($this->fetchMode != MYSQLI_NUM) 
+           return @$this->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 _seek($row)
+       {
+         if ($this->_numOfRows == 0) 
+           return false;
+
+         if ($row < 0)
+           return false;
+
+         mysqli_data_seek($this->_queryID, $row);
+         $this->EOF = false;
+         return true;
+       }
+               
+       // 10% speedup to move MoveNext to child class
+       // This is the only implementation that works now (23-10-2003).
+       // Other functions return no or the wrong results.
+       function MoveNext() 
+       {
+               if ($this->EOF) return false;
+               $this->_currentRow++;
+               $this->fields = 
@mysqli_fetch_array($this->_queryID,$this->fetchMode);
+               
+               if (is_array($this->fields)) return true;
+               $this->EOF = true;
+               return false;
+       }       
+       
+       function _fetch()
+       {
+               $this->fields = 
mysqli_fetch_array($this->_queryID,$this->fetchMode);  
+               return is_array($this->fields);
+       }
+       
+       function _close() 
+       {
+               mysqli_free_result($this->_queryID); 
+               $this->_queryID = false;        
+       }
+       
+/*
+
+0 = MYSQLI_TYPE_DECIMAL
+1 = MYSQLI_TYPE_CHAR
+1 = MYSQLI_TYPE_TINY
+2 = MYSQLI_TYPE_SHORT
+3 = MYSQLI_TYPE_LONG
+4 = MYSQLI_TYPE_FLOAT
+5 = MYSQLI_TYPE_DOUBLE
+6 = MYSQLI_TYPE_NULL
+7 = MYSQLI_TYPE_TIMESTAMP
+8 = MYSQLI_TYPE_LONGLONG
+9 = MYSQLI_TYPE_INT24
+10 = MYSQLI_TYPE_DATE
+11 = MYSQLI_TYPE_TIME
+12 = MYSQLI_TYPE_DATETIME
+13 = MYSQLI_TYPE_YEAR
+14 = MYSQLI_TYPE_NEWDATE
+247 = MYSQLI_TYPE_ENUM
+248 = MYSQLI_TYPE_SET
+249 = MYSQLI_TYPE_TINY_BLOB
+250 = MYSQLI_TYPE_MEDIUM_BLOB
+251 = MYSQLI_TYPE_LONG_BLOB
+252 = MYSQLI_TYPE_BLOB
+253 = MYSQLI_TYPE_VAR_STRING
+254 = MYSQLI_TYPE_STRING
+255 = MYSQLI_TYPE_GEOMETRY
+*/
+
+       function MetaType($t, $len = -1, $fieldobj = false)
+       {
+               if (is_object($t)) {
+                   $fieldobj = $t;
+                   $t = $fieldobj->type;
+                   $len = $fieldobj->max_length;
+               }
+               
+               
+                $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': 
+               
+               case MYSQLI_TYPE_TINY_BLOB :
+               case MYSQLI_TYPE_CHAR :
+               case MYSQLI_TYPE_STRING :
+               case MYSQLI_TYPE_ENUM :
+               case MYSQLI_TYPE_SET :
+               case 253 :
+                  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':
+               
+               case MYSQLI_TYPE_BLOB :
+               case MYSQLI_TYPE_LONG_BLOB :
+               case MYSQLI_TYPE_MEDIUM_BLOB :
+               
+                  return !empty($fieldobj->binary) ? 'B' : 'X';
+               case 'YEAR':
+               case 'DATE': 
+               case MYSQLI_TYPE_DATE :
+               case MYSQLI_TYPE_YEAR :
+               
+                  return 'D';
+               
+               case 'TIME':
+               case 'DATETIME':
+               case 'TIMESTAMP':
+               
+               case MYSQLI_TYPE_DATETIME :
+               case MYSQLI_TYPE_NEWDATE :
+               case MYSQLI_TYPE_TIME :
+               case MYSQLI_TYPE_TIMESTAMP :
+               
+                       return 'T';
+               
+               case 'INT': 
+               case 'INTEGER':
+               case 'BIGINT':
+               case 'TINYINT':
+               case 'MEDIUMINT':
+               case 'SMALLINT': 
+               
+               case MYSQLI_TYPE_INT24 :
+               case MYSQLI_TYPE_LONG :
+               case MYSQLI_TYPE_LONGLONG :
+               case MYSQLI_TYPE_SHORT :
+               case MYSQLI_TYPE_TINY :
+               
+                  if (!empty($fieldobj->primary_key)) return 'R';
+                  
+                  return 'I';
+               
+               
+                  // Added floating-point types
+                  // Maybe not necessery.
+                case 'FLOAT':
+                case 'DOUBLE':
+                  //           case 'DOUBLE PRECISION':
+                case 'DECIMAL':
+                case 'DEC':
+                case 'FIXED':
+                default:
+                       //if (!is_numeric($t)) echo "<p>--- Error in type 
matching $t -----</p>"; 
+                       return 'N';
+               }
+       } // function
+       
+
+} // rs class
+ 
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php:1.2 Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php     Tue Feb 21 13:47:42 2006
@@ -1,125 +1,138 @@
-<?php
-
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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 <address@hidden>
-  
-  Requires mysql client. Works on Windows and Unix.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
-
-
-class ADODB_mysqlt extends ADODB_mysql {
-       var $databaseType = 'mysqlt';
-       var $ansiOuter = true; // for Version 3.23.17 or later
-       var $hasTransactions = true;
-       var $autoRollback = true; // apparently mysql does not autorollback 
properly 
-       
-       function ADODB_mysqlt() 
-       {                       
-       global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 
'ext_';
-       }
-       
-       function BeginTrans()
-       {         
-               if ($this->transOff) return true;
-               $this->transCnt += 1;
-               $this->Execute('SET AUTOCOMMIT=0');
-               $this->Execute('BEGIN');
-               return true;
-       }
-       
-       function CommitTrans($ok=true) 
-       {
-               if ($this->transOff) return true; 
-               if (!$ok) return $this->RollbackTrans();
-               
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->Execute('COMMIT');
-               $this->Execute('SET AUTOCOMMIT=1');
-               return true;
-       }
-       
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true;
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->Execute('ROLLBACK');
-               $this->Execute('SET AUTOCOMMIT=1');
-               return true;
-       }
-       
-}
-
-class ADORecordSet_mysqlt extends ADORecordSet_mysql{  
-       var $databaseType = "mysqlt";
-       
-       function ADORecordSet_mysqlt($queryID,$mode=false) 
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch ($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 MoveNext()
-       {
-               if (@$this->fields =& 
mysql_fetch_array($this->_queryID,$this->fetchMode)) {
-                       $this->_currentRow += 1;
-                       return true;
-               }
-               if (!$this->EOF) {
-                       $this->_currentRow += 1;
-                       $this->EOF = true;
-               }
-               return false;
-       }
-}
-
-class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {    
-
-       function ADORecordSet_ext_mysqli($queryID,$mode=false) 
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch ($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 MoveNext()
-       {
-               return adodb_movenext($this);
-       }
-}
-
+<?php
+
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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 <address@hidden>
+  
+  Requires mysql client. Works on Windows and Unix.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
+
+
+class ADODB_mysqlt extends ADODB_mysql {
+       var $databaseType = 'mysqlt';
+       var $ansiOuter = true; // for Version 3.23.17 or later
+       var $hasTransactions = true;
+       var $autoRollback = true; // apparently mysql does not autorollback 
properly 
+       
+       function ADODB_mysqlt() 
+       {                       
+       global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 
'ext_';
+       }
+       
+       function BeginTrans()
+       {         
+               if ($this->transOff) return true;
+               $this->transCnt += 1;
+               $this->Execute('SET AUTOCOMMIT=0');
+               $this->Execute('BEGIN');
+               return true;
+       }
+       
+       function CommitTrans($ok=true) 
+       {
+               if ($this->transOff) return true; 
+               if (!$ok) return $this->RollbackTrans();
+               
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->Execute('COMMIT');
+               $this->Execute('SET AUTOCOMMIT=1');
+               return true;
+       }
+       
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true;
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->Execute('ROLLBACK');
+               $this->Execute('SET AUTOCOMMIT=1');
+               return true;
+       }
+       
+       function RowLock($tables,$where='',$flds='1 as adodb_ignore') 
+       {
+               if ($this->transCnt==0) $this->BeginTrans();
+               if ($where) $where = ' where '.$where;
+               $rs =& $this->Execute("select $flds from $tables $where for 
update");
+               return !empty($rs); 
+       }
+       
+}
+
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{  
+       var $databaseType = "mysqlt";
+       
+       function ADORecordSet_mysqlt($queryID,$mode=false) 
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               
+               switch ($mode)
+               {
+               case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+               case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+               
+               case ADODB_FETCH_DEFAULT:
+               case ADODB_FETCH_BOTH:
+               default: $this->fetchMode = MYSQL_BOTH; break;
+               }
+       
+               $this->adodbFetchMode = $mode;
+               $this->ADORecordSet($queryID);  
+       }
+       
+       function MoveNext()
+       {
+               if (@$this->fields = 
mysql_fetch_array($this->_queryID,$this->fetchMode)) {
+                       $this->_currentRow += 1;
+                       return true;
+               }
+               if (!$this->EOF) {
+                       $this->_currentRow += 1;
+                       $this->EOF = true;
+               }
+               return false;
+       }
+}
+
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {    
+
+       function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               switch ($mode)
+               {
+               case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+               case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+               
+               case ADODB_FETCH_DEFAULT:
+               case ADODB_FETCH_BOTH:
+               default: 
+                       $this->fetchMode = MYSQL_BOTH; break;
+               }
+               $this->adodbFetchMode = $mode;
+               $this->ADORecordSet($queryID);  
+       }
+       
+       function MoveNext()
+       {
+               return adodb_movenext($this);
+       }
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php:1.2        Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,168 +1,170 @@
-<?php
-/*
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (jlim#natsoft.com.my). All rights 
reserved.
- 
-  First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
- Based on the previous postgres drivers.
- http://www.netezza.com/
- Major Additions/Changes:
-    MetaDatabasesSQL, MetaTablesSQL, MetaColumnsSQL
-    Note: You have to have admin privileges to access the system tables
-    Removed non-working keys code (Netezza has no concept of keys)
-    Fixed the way data types and lengths are returned in MetaColumns()
-    as well as added the default lengths for certain types
-    Updated public variables for Netezza
-    Still need to remove blob functions, as Netezza doesn't suppport blob
-*/
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-postgres64.inc.php');
-
-class ADODB_netezza extends ADODB_postgres64 {
-    var $databaseType = 'netezza';     
-       var $dataProvider = 'netezza';
-       var $hasInsertID = false;
-       var $_resultid = false;
-       var $concat_operator='||';
-       var $random = 'random';
-       var $metaDatabasesSQL = "select objname from _v_object_data where 
objtype='database' order by 1";
-    var $metaTablesSQL = "select objname from _v_object_data where 
objtype='table' order by 1";
-       var $isoDates = true; // accepts dates in ISO format
-       var $sysDate = "CURRENT_DATE";
-       var $sysTimeStamp = "CURRENT_TIMESTAMP";
-       var $blobEncodeType = 'C';
-       var $metaColumnsSQL = "SELECT attname, atttype FROM 
_v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
-       var $metaColumnsSQL1 = "SELECT attname, atttype FROM 
_v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
-       // netezza doesn't have keys. it does have distributions, so maybe this 
is 
-       // something that can be pulled from the system tables
-       var $metaKeySQL = "";
-       var $hasAffectedRows = true;
-       var $hasLimit = true;   
-       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 G:i:s'"; // used by DBTimeStamp as the 
default timestamp fmt.
-       var $ansiOuter = true;
-       var $autoRollback = true; // apparently pgsql does not autorollback 
properly before 4.3.4
-                                                       // 
http://bugs.php.net/bug.php?id=25404
-
-                                                       
-       function ADODB_netezza() 
-       {
-       
-       }
-       
-       function &MetaColumns($table,$upper=true) 
-       {
-       
-       // Changed this function to support Netezza which has no concept of keys
-       // could posisbly work on other things from the system table later.
-       
-       global $ADODB_FETCH_MODE;
-       
-               $table = strtolower($table);
-
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
-               
-               $rs =& 
$this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
-               if (isset($savem)) $this->SetFetchMode($savem);
-               $ADODB_FETCH_MODE = $save;
-               
-               if ($rs === false) return false;
-
-               $retarr = array();
-               while (!$rs->EOF) {     
-                       $fld = new ADOFieldObject();
-                       $fld->name = $rs->fields[0];
-                       
-                       // since we're returning type and length as one string, 
-                       // split them out here.
-                       
-                       if ($first = strstr($rs->fields[1], "(")) {
-                        $fld->max_length = trim($first, "()");
-                       } else {
-                        $fld->max_length = -1;
-                       }
-               
-                       if ($first = strpos($rs->fields[1], "(")) {
-                        $fld->type = substr($rs->fields[1], 0, $first);
-                       } else {
-                        $fld->type = $rs->fields[1];
-                       }
-                       
-                       switch ($fld->type) {
-                        case "byteint":
-                        case "boolean":
-                        $fld->max_length = 1;
-                        break;
-                        case "smallint":
-                        $fld->max_length = 2;
-                        break;
-                        case "integer":
-                        case "numeric":
-                        case "date":
-                        $fld->max_length = 4;
-                        break;
-                        case "bigint":
-                        case "time":
-                        case "timestamp":
-                        $fld->max_length = 8;
-                        break;
-                        case "timetz":
-                        case "time with time zone":
-                        $fld->max_length = 12;
-                        break;
-                       }
-                       
-                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = 
$fld;     
-                       else $retarr[($upper) ? strtoupper($fld->name) : 
$fld->name] = $fld;
-                       
-                       $rs->MoveNext();
-               }
-               $rs->Close();
-               return $retarr; 
-               
-       }
-
-               
-}
-       
-/*--------------------------------------------------------------------------------------
-        Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_netezza extends ADORecordSet_postgres64
-{
-       var $databaseType = "netezza";
-       var $canSeek = true;
-       
-       function ADORecordSet_netezza($queryID,$mode=false) 
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch ($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);
-       }
-       
-       // _initrs modified to disable blob handling
-       function _initrs()
-       {
-       global $ADODB_COUNTRECS;
-               $this->_numOfRows = ($ADODB_COUNTRECS)? 
@pg_numrows($this->_queryID):-1;
-               $this->_numOfFields = @pg_numfields($this->_queryID);
-       }
-
-}
-?>
+<?php
+/*
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights 
reserved.
+ 
+  First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
+ Based on the previous postgres drivers.
+ http://www.netezza.com/
+ Major Additions/Changes:
+    MetaDatabasesSQL, MetaTablesSQL, MetaColumnsSQL
+    Note: You have to have admin privileges to access the system tables
+    Removed non-working keys code (Netezza has no concept of keys)
+    Fixed the way data types and lengths are returned in MetaColumns()
+    as well as added the default lengths for certain types
+    Updated public variables for Netezza
+    Still need to remove blob functions, as Netezza doesn't suppport blob
+*/
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR.'/drivers/adodb-postgres64.inc.php');
+
+class ADODB_netezza extends ADODB_postgres64 {
+    var $databaseType = 'netezza';     
+       var $dataProvider = 'netezza';
+       var $hasInsertID = false;
+       var $_resultid = false;
+       var $concat_operator='||';
+       var $random = 'random';
+       var $metaDatabasesSQL = "select objname from _v_object_data where 
objtype='database' order by 1";
+    var $metaTablesSQL = "select objname from _v_object_data where 
objtype='table' order by 1";
+       var $isoDates = true; // accepts dates in ISO format
+       var $sysDate = "CURRENT_DATE";
+       var $sysTimeStamp = "CURRENT_TIMESTAMP";
+       var $blobEncodeType = 'C';
+       var $metaColumnsSQL = "SELECT attname, atttype FROM 
_v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
+       var $metaColumnsSQL1 = "SELECT attname, atttype FROM 
_v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
+       // netezza doesn't have keys. it does have distributions, so maybe this 
is 
+       // something that can be pulled from the system tables
+       var $metaKeySQL = "";
+       var $hasAffectedRows = true;
+       var $hasLimit = true;   
+       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 G:i:s'"; // used by DBTimeStamp as the 
default timestamp fmt.
+       var $ansiOuter = true;
+       var $autoRollback = true; // apparently pgsql does not autorollback 
properly before 4.3.4
+                                                       // 
http://bugs.php.net/bug.php?id=25404
+
+                                                       
+       function ADODB_netezza() 
+       {
+       
+       }
+       
+       function &MetaColumns($table,$upper=true) 
+       {
+       
+       // Changed this function to support Netezza which has no concept of keys
+       // could posisbly work on other things from the system table later.
+       
+       global $ADODB_FETCH_MODE;
+       
+               $table = strtolower($table);
+
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
+               
+               $rs =& 
$this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+               if (isset($savem)) $this->SetFetchMode($savem);
+               $ADODB_FETCH_MODE = $save;
+               
+               if ($rs === false) return false;
+
+               $retarr = array();
+               while (!$rs->EOF) {     
+                       $fld = new ADOFieldObject();
+                       $fld->name = $rs->fields[0];
+                       
+                       // since we're returning type and length as one string, 
+                       // split them out here.
+                       
+                       if ($first = strstr($rs->fields[1], "(")) {
+                        $fld->max_length = trim($first, "()");
+                       } else {
+                        $fld->max_length = -1;
+                       }
+               
+                       if ($first = strpos($rs->fields[1], "(")) {
+                        $fld->type = substr($rs->fields[1], 0, $first);
+                       } else {
+                        $fld->type = $rs->fields[1];
+                       }
+                       
+                       switch ($fld->type) {
+                        case "byteint":
+                        case "boolean":
+                        $fld->max_length = 1;
+                        break;
+                        case "smallint":
+                        $fld->max_length = 2;
+                        break;
+                        case "integer":
+                        case "numeric":
+                        case "date":
+                        $fld->max_length = 4;
+                        break;
+                        case "bigint":
+                        case "time":
+                        case "timestamp":
+                        $fld->max_length = 8;
+                        break;
+                        case "timetz":
+                        case "time with time zone":
+                        $fld->max_length = 12;
+                        break;
+                       }
+                       
+                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = 
$fld;     
+                       else $retarr[($upper) ? strtoupper($fld->name) : 
$fld->name] = $fld;
+                       
+                       $rs->MoveNext();
+               }
+               $rs->Close();
+               return $retarr; 
+               
+       }
+
+               
+}
+       
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_netezza extends ADORecordSet_postgres64
+{
+       var $databaseType = "netezza";
+       var $canSeek = true;
+       
+       function ADORecordSet_netezza($queryID,$mode=false) 
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               switch ($mode)
+               {
+               case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
+               case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
+               
+               case ADODB_FETCH_DEFAULT:
+               case ADODB_FETCH_BOTH:
+               default: $this->fetchMode = PGSQL_BOTH; break;
+               }
+               $this->adodbFetchMode = $mode;
+               $this->ADORecordSet($queryID);
+       }
+       
+       // _initrs modified to disable blob handling
+       function _initrs()
+       {
+       global $ADODB_COUNTRECS;
+               $this->_numOfRows = ($ADODB_COUNTRECS)? 
@pg_numrows($this->_queryID):-1;
+               $this->_numOfFields = @pg_numfields($this->_queryID);
+       }
+
+}
+?>
Index: phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,1310 +1,1484 @@
-<?php
-/*
-
-  version V4.54 5 Nov 2004 (c) 2000-2004 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://adodb.sourceforge.net
-  
-  Code contributed by George Fourlanos <address@hidden>
-  
-  13 Nov 2000 jlim - removed all ora_* references.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-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. 
-*/
-
-# define the LOB descriptor type for the given type
-# returns false if no LOB descriptor
-function oci_lob_desc($type) {
-       switch ($type) {
-               case OCI_B_BFILE: $result = OCI_D_FILE; break;
-               case OCI_B_CFILEE: $result = OCI_D_FILE; break;
-               case OCI_B_CLOB: $result = OCI_D_LOB; break;
-               case OCI_B_BLOB: $result = OCI_D_LOB; break;
-               case OCI_B_ROWID: $result = OCI_D_ROWID; break;
-               default: $result = false; break;
-       }
-       return $result;
-}
-
-class ADODB_oci8 extends ADOConnection {
-       var $databaseType = 'oci8';
-       var $dataProvider = 'oci8';
-       var $replaceQuote = "''"; // string to use to replace quotes
-       var $concat_operator='||';
-       var $sysDate = "TRUNC(SYSDATE)";
-       var $sysTimeStamp = 'SYSDATE';
-       var $metaDatabasesSQL = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME 
NOT IN ('SYS','SYSTEM','DBSNMP','OUTLN') ORDER BY 1";
-       var $_stmt;
-       var $_commit = OCI_COMMIT_ON_SUCCESS;
-       var $_initdate = true; // init date to YYYY-MM-DD
-       var $metaTablesSQL = "select table_name,table_type from cat where 
table_type in ('TABLE','VIEW')";
-       var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, 
NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by 
address@hidden net
-       var $_bindInputArray = true;
-       var $hasGenID = true;
-       var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
-       var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s";
-       var $_dropSeqSQL = "DROP SEQUENCE %s";
-       var $hasAffectedRows = true;
-       var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
-       var $noNullStrings = false;
-       var $connectSID = false;
-       var $_bind = false;
-       var $_hasOCIFetchStatement = false;
-       var $_getarray = false; // currently not working
-       var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT 
OUTER, $col (+)= $value for RIGHT OUTER
-       var $session_sharing_force_blob = false; // alter session on updateblob 
if set to true 
-       var $firstrows = true; // enable first rows optimization on 
SelectLimit()
-       var $selectOffsetAlg1 = 100; // when to use 1st algorithm of 
selectlimit.
-       var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 
'RRRR-MM-DD HH24:MI:SS'
-       var $useDBDateFormatForTextInput=false;
-       var $datetime = false; // MetaType('DATE') returns 'D' 
(datetime==false) or 'T' (datetime == true)
-       var $_refLOBs = array();
-       
-       // var $ansiOuter = true; // if oracle9
-    
-       function ADODB_oci8() 
-       {
-               $this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-               if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
-       }
-       
-       /*  Function &MetaColumns($table) added by address@hidden/
-       function &MetaColumns($table) 
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
-               
-               $rs = 
$this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-               
-               if (isset($savem)) $this->SetFetchMode($savem);
-               $ADODB_FETCH_MODE = $save;
-               if (!$rs) {
-                       $false = 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];
-                       $fld->scale = $rs->fields[3];
-                       if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
-                               $fld->type ='INT';
-                       $fld->max_length = $rs->fields[4];
-               }       
-                       $fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 
0);
-                       $fld->binary = (strpos($fld->type,'BLOB') !== false);
-                       $fld->default_value = $rs->fields[6];
-                       
-                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = 
$fld;     
-                       else $retarr[strtoupper($fld->name)] = $fld;
-                       $rs->MoveNext();
-               }
-               $rs->Close();
-               return $retarr;
-       }
-       
-       function Time()
-       {
-               $rs =& $this->Execute("select 
TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
-               if ($rs && !$rs->EOF) return 
$this->UnixTimeStamp(reset($rs->fields));
-               
-               return false;
-       }
- 
-/*
-
-  Multiple modes of connection are supported:
-  
-  a. Local Database
-    $conn->Connect(false,'scott','tiger');
-  
-  b. From tnsnames.ora
-    $conn->Connect(false,'scott','tiger',$tnsname); 
-    $conn->Connect($tnsname,'scott','tiger'); 
-  
-  c. Server + service name
-    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
-  
-  d. Server + SID
-       $conn->connectSID = true;
-       $conn->Connect($serveraddress,'scott,'tiger',$SID);
-
-
-Example TNSName:
----------------
-NATSOFT.DOMAIN =
-  (DESCRIPTION =
-       (ADDRESS_LIST =
-         (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
-       )
-       (CONNECT_DATA =
-         (SERVICE_NAME = natsoft.domain)
-       )
-  )
-  
-  There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force 
new connection
-       
-*/
-       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename,$mode=0)
-       {
-               if (!function_exists('OCIPLogon')) return null;
-               
-               
-        $this->_errorMsg = false;
-               $this->_errorCode = false;
-               
-               if($argHostname) { // added by Jorma Tuomainen <address@hidden>
-                       if (empty($argDatabasename)) $argDatabasename = 
$argHostname;
-                       else {
-                               if(strpos($argHostname,":")) {
-                                       $argHostinfo=explode(":",$argHostname);
-                                       $argHostname=$argHostinfo[0];
-                                       $argHostport=$argHostinfo[1];
-                               } else {
-                                       $argHostport="1521";
-                               }
-                               
-                               if ($this->connectSID) {
-                                       
$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-                                       
.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-                               } else
-                                       
$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>";
-               if ($mode==1) {
-                       $this->_connectionID = ($this->charSet) ? 
-                               OCIPLogon($argUsername,$argPassword, 
$argDatabasename)
-                               :
-                               OCIPLogon($argUsername,$argPassword, 
$argDatabasename, $this->charSet)
-                               ;
-                       if ($this->_connectionID && $this->autoRollback)  
OCIrollback($this->_connectionID);
-               } else if ($mode==2) {
-                       $this->_connectionID = ($this->charSet) ? 
-                               OCINLogon($argUsername,$argPassword, 
$argDatabasename)
-                               :
-                               OCINLogon($argUsername,$argPassword, 
$argDatabasename, $this->charSet);
-                               
-               } else {
-                       $this->_connectionID = ($this->charSet) ? 
-                               OCILogon($argUsername,$argPassword, 
$argDatabasename)
-                               :
-                               OCILogon($argUsername,$argPassword, 
$argDatabasename,$this->charSet);
-               }
-               if ($this->_connectionID === false) return false;
-               if ($this->_initdate) {
-                       $this->Execute("ALTER SESSION SET 
NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
-               }
-               
-               // looks like: 
-               // Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production 
With the Partitioning option JServer Release 8.1.7.0.0 - Production
-               // $vers = OCIServerVersion($this->_connectionID);
-               // if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
-               return true;
-       }
-       
-       function ServerInfo()
-       {
-               $arr['compat'] = $this->GetOne('select value from 
sys.database_compatible_level');
-               $arr['description'] = @OCIServerVersion($this->_connectionID);
-               $arr['version'] = ADOConnection::_findvers($arr['description']);
-               return $arr;
-       }
-               // returns true or false
-       function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename,1);
-       }
-       
-       // returns true or false
-       function _nconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename,2);
-       }
-       
-       function _affectedrows()
-       {
-               if (is_resource($this->_stmt)) return 
@OCIRowCount($this->_stmt);
-               return 0;
-       }
-       
-       function IfNull( $field, $ifNull ) 
-       {
-               return " NVL($field, $ifNull) "; // if Oracle
-       }
-       
-       // format and return date string in database date format
-       function DBDate($d)
-       {
-               if (empty($d) && $d !== 0) return 'null';
-               
-               if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-               return 
"TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
-       }
-
-       
-       // format and return date string in database timestamp format
-       function DBTimeStamp($ts)
-       {
-               if (empty($ts) && $ts !== 0) return 'null';
-               if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-               return 
'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
-       }
-       
-       function RowLock($tables,$where) 
-       {
-               if ($this->autoCommit) $this->BeginTrans();
-               return $this->GetOne("select 1 as ignore from $tables where 
$where for update");
-       }
-       
-       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-       {
-               if ($mask) {
-                       $save = $this->metaTablesSQL;
-                       $mask = $this->qstr(strtoupper($mask));
-                       $this->metaTablesSQL .= " AND table_name like $mask";
-               }
-               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
-               
-               if ($mask) {
-                       $this->metaTablesSQL = $save;
-               }
-               return $ret;
-       }
-       
-       function BeginTrans()
-       {       
-               if ($this->transOff) return true;
-               $this->transCnt += 1;
-               $this->autoCommit = false;
-               $this->_commit = OCI_DEFAULT;
-               return true;
-       }
-       
-       function CommitTrans($ok=true) 
-       { 
-               if ($this->transOff) return true;
-               if (!$ok) return $this->RollbackTrans();
-               
-               if ($this->transCnt) $this->transCnt -= 1;
-               $ret = OCIcommit($this->_connectionID);
-               $this->_commit = OCI_COMMIT_ON_SUCCESS;
-               $this->autoCommit = true;
-               return $ret;
-       }
-       
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true;
-               if ($this->transCnt) $this->transCnt -= 1;
-               $ret = OCIrollback($this->_connectionID);
-               $this->_commit = OCI_COMMIT_ON_SUCCESS;
-               $this->autoCommit = true;
-               return $ret;
-       }
-       
-       
-       function SelectDB($dbName) 
-       {
-               return false;
-       }
-
-       function ErrorMsg() 
-       {
-               if ($this->_errorMsg !== false) return $this->_errorMsg;
-
-               if (is_resource($this->_stmt)) $arr = @OCIerror($this->_stmt);
-               if (empty($arr)) {
-                       $arr = @OCIerror($this->_connectionID);
-                       if ($arr === false) $arr = @OCIError();
-                       if ($arr === false) return '';
-               }
-               $this->_errorMsg = $arr['message'];
-               $this->_errorCode = $arr['code'];
-               return $this->_errorMsg;
-       }
-
-       function ErrorNo() 
-       {
-               if ($this->_errorCode !== false) return $this->_errorCode;
-               
-               if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
-               if (empty($arr)) {
-                       $arr = @OCIError($this->_connectionID);
-                       if ($arr == false) $arr = @OCIError();
-                       if ($arr == false) return '';
-               }
-               
-               $this->_errorMsg = $arr['message'];
-               $this->_errorCode = $arr['code'];
-               
-               return $arr['code'];
-       }
-       
-       // Format date column in sql string given an input format that 
understands Y M D
-       function SQLDate($fmt, $col=false)
-       {       
-               if (!$col) $col = $this->sysTimeStamp;
-               $s = 'TO_CHAR('.$col.",'";
-               
-               $len = strlen($fmt);
-               for ($i=0; $i < $len; $i++) {
-                       $ch = $fmt[$i];
-                       switch($ch) {
-                       case 'Y':
-                       case 'y':
-                               $s .= 'YYYY';
-                               break;
-                       case 'Q':
-                       case 'q':
-                               $s .= 'Q';
-                               break;
-                               
-                       case 'M':
-                               $s .= 'Mon';
-                               break;
-                               
-                       case 'm':
-                               $s .= 'MM';
-                               break;
-                       case 'D':
-                       case 'd':
-                               $s .= 'DD';
-                               break;
-                       
-                       case 'H':
-                               $s.= 'HH24';
-                               break;
-                               
-                       case 'h':
-                               $s .= 'HH';
-                               break;
-                               
-                       case 'i':
-                               $s .= 'MI';
-                               break;
-                       
-                       case 's':
-                               $s .= 'SS';
-                               break;
-                       
-                       case 'a':
-                       case 'A':
-                               $s .= 'AM';
-                               break;
-                               
-                       default:
-                       // handle escape characters...
-                               if ($ch == '\\') {
-                                       $i++;
-                                       $ch = substr($fmt,$i,1);
-                               }
-                               if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-                               else $s .= '"'.$ch.'"';
-                               
-                       }
-               }
-               return $s. "')";
-       }
-       
-       
-       /*
-       This algorithm makes use of
-       
-       a. FIRST_ROWS hint
-       The FIRST_ROWS hint explicitly chooses the approach to optimize 
response time, 
-       that is, minimum resource usage to return the first row. Results will 
be returned 
-       as soon as they are identified. 
-
-       b. Uses rownum tricks to obtain only the required rows from a given 
offset.
-        As this uses complicated sql statements, we only use this if the 
$offset >= 100. 
-        This idea by Tomas V V Cox.
-        
-        This implementation does not appear to work with oracle 8.0.5 or 
earlier. Comment
-        out this function then, and the slower SelectLimit() in the base class 
will be used.
-       */
-       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
-       {
-               // seems that oracle only supports 1 hint comment in 8i
-               if ($this->firstrows) {
-                       if (strpos($sql,'/*+') !== false)
-                               $sql = str_replace('/*+ ','/*+FIRST_ROWS 
',$sql);
-                       else
-                               $sql = preg_replace('/^[ 
\t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-               }
-               
-               if ($offset < $this->selectOffsetAlg1) {
-                       if ($nrows > 0) {       
-                               if ($offset > 0) $nrows += $offset;
-                               //$inputarr['adodb_rownum'] = $nrows;
-                               if ($this->databaseType == 'oci8po') {
-                                       $sql = "select * from (".$sql.") where 
rownum <= ?";
-                               } else {
-                                       $sql = "select * from (".$sql.") where 
rownum <= :adodb_offset";
-                               } 
-                               $inputarr['adodb_offset'] = $nrows;
-                               $nrows = -1;
-                       }
-                       // note that $nrows = 0 still has to work ==> no rows 
returned
-
-                       $rs =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-                       return $rs;
-                       
-               } else {
-                        // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
-                       
-                        // Let Oracle return the name of the columns
-                       $q_fields = "SELECT * FROM (".$sql.") WHERE NULL = 
NULL";
-                        
-                       $false = false;
-                       if (! $stmt_arr = $this->Prepare($q_fields)) {
-                               return $false;
-                       }
-                       $stmt = $stmt_arr[1];
-                        
-                        if (is_array($inputarr)) {
-                               foreach($inputarr as $k => $v) {
-                                       if (is_array($v)) {
-                                               if (sizeof($v) == 2) // 
suggested by address@hidden
-                                                       
OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-                                               else
-                                                       
OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-                                       } else {
-                                               $len = -1;
-                                               if ($v === ' ') $len = 1;
-                                               if (isset($bindarr)) {  // is 
prepared sql, so no need to ocibindbyname again
-                                                       $bindarr[$k] = $v;
-                                               } else {                        
        // dynamic sql, so rebind every time
-                                                       
OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-                                               }
-                                       }
-                               }
-                       }
-                       
-                        if (!OCIExecute($stmt, OCI_DEFAULT)) {
-                                OCIFreeStatement($stmt); 
-                                return $false;
-                        }
-                        
-                        $ncols = OCINumCols($stmt);
-                        for ( $i = 1; $i <= $ncols; $i++ ) {
-                                $cols[] = '"'.OCIColumnName($stmt, $i).'"';
-                        }
-                        $result = false;
-                       
-                        OCIFreeStatement($stmt); 
-                        $fields = implode(',', $cols);
-                        $nrows += $offset;
-                        $offset += 1; // in Oracle rownum starts at 1
-                       
-                       if ($this->databaseType == 'oci8po') {
-                                        $sql = "SELECT $fields FROM".
-                                         "(SELECT rownum as adodb_rownum, 
$fields FROM".
-                                         " ($sql) WHERE rownum <= ?".
-                                         ") WHERE adodb_rownum >= ?";
-                               } else {
-                                        $sql = "SELECT $fields FROM".
-                                         "(SELECT rownum as adodb_rownum, 
$fields FROM".
-                                         " ($sql) WHERE rownum <= 
:adodb_nrows".
-                                         ") WHERE adodb_rownum >= 
:adodb_offset";
-                               } 
-                               $inputarr['adodb_nrows'] = $nrows;
-                               $inputarr['adodb_offset'] = $offset;
-                               
-                       if ($secs2cache>0) $rs =& 
$this->CacheExecute($secs2cache, $sql,$inputarr);
-                       else $rs =& $this->Execute($sql,$inputarr);
-                       return $rs;
-               }
-       
-       }
-       
-       /**
-       * Usage:
-       * Store BLOBs and CLOBs
-       *
-       * Example: to store $var in a blob
-       *
-       *       $conn->Execute('insert into TABLE (id,ablob) 
values(12,empty_blob())');
-       *       $conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 
'BLOB');
-       *       
-       *       $blobtype supports 'BLOB' and 'CLOB', but you need to change to 
'empty_clob()'.
-       *
-       *  to get length of LOB:
-       *       select DBMS_LOB.GETLENGTH(ablob) from TABLE
-       *
-       * If you are using CURSOR_SHARING = force, it appears this will case a 
segfault
-       * under oracle 8.1.7.0. Run:
-       *        $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-       * before UpdateBlob() then...
-       */
-
-       function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-       {
-               
-               //if (strlen($val) < 4000) return $this->Execute("UPDATE $table 
SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
-               
-               switch(strtoupper($blobtype)) {
-               default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown 
blobtype=$blobtype"); return false;
-               case 'BLOB': $type = OCI_B_BLOB; break;
-               case 'CLOB': $type = OCI_B_CLOB; break;
-               }
-               
-               if ($this->databaseType == 'oci8po') 
-                       $sql = "UPDATE $table set $column=EMPTY_{$blobtype}() 
WHERE $where RETURNING $column INTO ?";
-               else 
-                       $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);
-               if ($this->session_sharing_force_blob) $this->Execute('ALTER 
SESSION SET CURSOR_SHARING=EXACT');
-               $commit = $this->autoCommit;
-               if ($commit) $this->BeginTrans();
-               $rs = $this->Execute($sql,$arr);
-               if ($rez = !empty($rs)) $desc->save($val);
-               $desc->free();
-               if ($commit) $this->CommitTrans();
-               if ($this->session_sharing_force_blob) $this->Execute('ALTER 
SESSION SET CURSOR_SHARING=FORCE');
-               
-               if ($rez) $rs->Close();
-               return $rez;
-       }
-       
-       /**
-       * Usage:  store file pointed to by $var in a blob
-       */
-       function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
-       {
-               switch(strtoupper($blobtype)) {
-               default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown 
blobtype=$blobtype"); return false;
-               case 'BLOB': $type = OCI_B_BLOB; break;
-               case 'CLOB': $type = OCI_B_CLOB; break;
-               }
-               
-               if ($this->databaseType == 'oci8po') 
-                       $sql = "UPDATE $table set $column=EMPTY_{$blobtype}() 
WHERE $where RETURNING $column INTO ?";
-               else 
-                       $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 = ADODB_oci8::Execute($sql,$arr);
-               if ($rez = !empty($rs)) $desc->savefile($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,$cursor=false)
-       {
-       static $BINDNUM = 0;
-       
-               $stmt = OCIParse($this->_connectionID,$sql);
-
-               if (!$stmt) return false;
-
-               $BINDNUM += 1;
-               
-               $sttype = @OCIStatementType($stmt);
-               if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
-                       return array($sql,$stmt,0,$BINDNUM, ($cursor) ? 
OCINewCursor($this->_connectionID) : false);
-               }
-               return array($sql,$stmt,0,$BINDNUM);
-       }
-       
-       /*
-               Call an oracle stored procedure and return a cursor variable. 
-               Convert the cursor variable into a recordset. 
-               Concept by Robert Tuttle address@hidden
-               
-               Example:
-                       Note: we return a cursor variable in :RS2
-                       $rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); 
END;",'RS2');
-                       
-                       $rs = $db->ExecuteCursor(
-                               "BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
-                               'RS2',
-                               array('VAR1' => 'Mr Bean'));
-                       
-       */
-       function &ExecuteCursor($sql,$cursorName='rs',$params=false)
-       {
-               if (is_array($sql)) $stmt = $sql;
-               else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate 
OCINewCursor
-                       
-               if (is_array($stmt) && sizeof($stmt) >= 5) {
-                       $this->Parameter($stmt, $ignoreCur, $cursorName, false, 
-1, OCI_B_CURSOR);
-                       if ($params) {
-                               foreach($params as $k => $v) {
-                                       $this->Parameter($stmt,$params[$k], $k);
-                               }
-                       }
-               }
-               return $this->Execute($stmt);
-       }
-       
-       /*
-               Bind a variable -- very, very fast for executing repeated 
statements in oracle. 
-               Better than using
-                       for ($i = 0; $i < $max; $i++) { 
-                               $p1 = ?; $p2 = ?; $p3 = ?;
-                               $this->Execute("insert into table (col0, col1, 
col2) values (:0, :1, :2)", 
-                                       array($p1,$p2,$p3));
-                       }
-               
-               Usage:
-                       $stmt = $DB->Prepare("insert into table (col0, col1, 
col2) values (:0, :1, :2)");
-                       $DB->Bind($stmt, $p1);
-                       $DB->Bind($stmt, $p2);
-                       $DB->Bind($stmt, $p3);
-                       for ($i = 0; $i < $max; $i++) { 
-                               $p1 = ?; $p2 = ?; $p3 = ?;
-                               $DB->Execute($stmt);
-                       }
-                       
-               Some timings:           
-                       ** Test table has 3 cols, and 1 index. Test to insert 
1000 records
-                       Time 0.6081s (1644.60 inserts/sec) with direct 
OCIParse/OCIExecute
-                       Time 0.6341s (1577.16 inserts/sec) with ADOdb 
Prepare/Bind/Execute
-                       Time 1.5533s ( 643.77 inserts/sec) with pure SQL using 
Execute
-                       
-               Now if PHP only had batch/bulk updating like Java or PL/SQL...
-       
-               Note that the order of parameters differs from OCIBindByName,
-               because we default the names to :0, :1, :2
-       */
-       function 
Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
-       {
-               
-               if (!is_array($stmt)) return false;
-        
-        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
-            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
-        }
-        
-               if ($name == false) {
-                       if ($type !== false) $rez = 
OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
-                       else $rez = 
OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
-                       $stmt[2] += 1;
-               } else if (oci_lob_desc($type)) {
-                       if ($this->debug) {
-                               ADOConnection::outp("<b>Bind</b>: name = 
$name");
-                       }
-            //we have to create a new Descriptor here
-                       $numlob = count($this -> _refLOBs);
-               $this -> _refLOBs[$numlob]['LOB'] = 
OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
-                       $this -> _refLOBs[$numlob]['TYPE'] = $isOutput;
-                       
-                       $tmp = &$this -> _refLOBs[$numlob]['LOB'];
-               $rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
-                       if ($this->debug) {
-                               ADOConnection::outp("<b>Bind</b>: descriptor 
has been allocated, var binded");
-                       }
-                       
-                       // if type is input then write data to lob now
-                       if ($isOutput == false) {
-                               $var = $this -> BlobEncode($var);
-                               $tmp -> WriteTemporary($var);
-                               if ($this->debug) {
-                                       ADOConnection::outp("<b>Bind</b>: LOB 
has been written to temp");
-                               }
-                       } else {
-                               $this -> _refLOBs[$numlob]['VAR'] = &$var;
-                       }
-                       $rez = $tmp;
-               } else {
-                       if ($this->debug) 
-                               ADOConnection::outp("<b>Bind</b>: name = 
$name");
-                       
-                       if ($type !== false) $rez = 
OCIBindByName($stmt[1],":".$name,$var,$size,$type);
-                       else $rez = 
OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
-               }
-               
-               return $rez;
-       }
-       
-       function Param($name,$type=false)
-       {
-               return ':'.$name;
-       }
-       
-       /* 
-       Usage:
-               $stmt = $db->Prepare('select * from table where id =:myid and 
group=:group');
-               $db->Parameter($stmt,$id,'myid');
-               $db->Parameter($stmt,$group,'group');
-               $db->Execute($stmt);
-               
-               @param $stmt Statement returned by Prepare() or PrepareSP().
-               @param $var PHP variable to bind to
-               @param $name Name of stored procedure variable name to bind to.
-               @param [$isOutput] Indicates direction of parameter 0/false=IN  
1=OUT  2= IN/OUT. This is ignored in oci8.
-               @param [$maxLen] Holds an maximum length of the variable.
-               @param [$type] The data type of $var. Legal values depend on 
driver.
-               
-               See OCIBindByName documentation at php.net.
-       */
-       function 
Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
-       {
-                       if  ($this->debug) {
-                               $prefix = ($isOutput) ? 'Out' : 'In';
-                               $ztype = (empty($type)) ? 'false' : $type;
-                               ADOConnection::outp( 
"{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, 
\$type=$ztype);");
-                       }
-                       return 
$this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
-       }
-       
-       /*
-       returns query ID if successful, otherwise false
-       this version supports:
-       
-          1. $db->execute('select * from table');
-          
-          2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-                 $db->execute($prepared_statement, array(1,2,3));
-                 
-          3. $db->execute('insert into table (a,b,c) values 
(:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
-          
-          4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-                 $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
-                 $db->execute($stmt);
-       */ 
-       function _query($sql,$inputarr)
-       {
-               
-               if (is_array($sql)) { // is prepared sql
-                       $stmt = $sql[1];
-                       
-                       // we try to bind to permanent array, so that 
OCIBindByName is persistent
-                       // and carried out once only - note that max array 
element size is 4000 chars
-                       if (is_array($inputarr)) {
-                               $bindpos = $sql[3];
-                               if (isset($this->_bind[$bindpos])) {
-                               // all tied up already
-                                       $bindarr = &$this->_bind[$bindpos];
-                               } else {
-                               // one statement to bind them all
-                                       $bindarr = array();
-                                       foreach($inputarr as $k => $v) {
-                                               $bindarr[$k] = $v;
-                                               
OCIBindByName($stmt,":$k",$bindarr[$k],4000);
-                                       }
-                                       $this->_bind[$bindpos] = &$bindarr;
-                               }
-                       }
-               } else {
-                       $stmt=OCIParse($this->_connectionID,$sql);
-               }
-                       
-               $this->_stmt = $stmt;
-               if (!$stmt) return false;
-       
-               if (defined('ADODB_PREFETCH_ROWS')) 
@OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
-                       
-               if (is_array($inputarr)) {
-                       foreach($inputarr as $k => $v) {
-                               if (is_array($v)) {
-                                       if (sizeof($v) == 2) // suggested by 
address@hidden
-                                               
OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-                                       else
-                                               
OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-                                       
-                                       if ($this->debug==99) echo "name=:$k",' 
var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'<br>';
-                               } else {
-                                       $len = -1;
-                                       if ($v === ' ') $len = 1;
-                                       if (isset($bindarr)) {  // is prepared 
sql, so no need to ocibindbyname again
-                                               $bindarr[$k] = $v;
-                                       } else {                                
// dynamic sql, so rebind every time
-                                               
OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-                                       }
-                               }
-                       }
-               }
-               
-        $this->_errorMsg = false;
-               $this->_errorCode = false;
-               if (OCIExecute($stmt,$this->_commit)) {
-//OCIInternalDebug(1);                 
-                       if (count($this -> _refLOBs) > 0) {
-               
-                               foreach ($this -> _refLOBs as $key => $value) {
-                                       if ($this -> _refLOBs[$key]['TYPE'] == 
true) {
-                                               $tmp = $this -> 
_refLOBs[$key]['LOB'] -> load();
-                                               if ($this -> debug) {
-                                                       
ADOConnection::outp("<b>OUT LOB</b>: LOB has been loaded. <br>");
-                                               }
-                                               //$_GLOBALS[$this -> 
_refLOBs[$key]['VAR']] = $tmp;
-                                               $this -> _refLOBs[$key]['VAR'] 
= $tmp;
-                                       }
-                                       $this -> _refLOBs[$key]['LOB'] -> 
free();
-                                       unset($this -> _refLOBs[$key]);
-                               }
-                       }
-               
-            switch (@OCIStatementType($stmt)) {
-                case "SELECT":
-                                       return $stmt;
-                               
-                               case 'DECLARE':
-                case "BEGIN":
-                    if (is_array($sql) && !empty($sql[4])) {
-                                               $cursor = $sql[4];
-                                               if (is_resource($cursor)) {
-                                                       $ok = 
OCIExecute($cursor);      
-                               return $cursor;
-                                               }
-                                               return $stmt;
-                    } else {
-                                               if (is_resource($stmt)) {
-                                                       OCIFreeStatement($stmt);
-                                                       return true;
-                                               }
-                        return $stmt;
-                    }
-                    break;
-                default :
-                                       // ociclose -- no because it could be 
used in a LOB?
-                    return true;
-            }
-               }
-               return false;
-       }
-       
-       // returns true or false
-       function _close()
-       {
-               if (!$this->_connectionID) return;
-               
-               if (!$this->autoCommit) OCIRollback($this->_connectionID);
-               if (count($this -> _refLOBs) > 0) {
-                       foreach ($this -> _refLOBs as $key => $value) {
-                               $this -> _refLOBs[$key] -> free();
-                               unset($this -> _refLOBs[$key]);
-                       }
-               }
-               OCILogoff($this->_connectionID);
-               
-               $this->_stmt = false;
-               $this->_connectionID = false;
-       }
-       
-       function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
-       {
-               if ($internalKey) return array('ROWID');
-               
-       // tested with oracle 8.1.7
-               $table = strtoupper($table);
-               if ($owner) {
-                       $owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER 
= UPPER('$owner')))";
-                       $ptab = 'ALL_';
-               } else {
-                       $owner_clause = '';
-                       $ptab = 'USER_';
-               }
-               $sql = "
-SELECT /*+ RULE */ distinct b.column_name
-   FROM {$ptab}CONSTRAINTS a
-         , {$ptab}CONS_COLUMNS b
-  WHERE ( UPPER(b.table_name) = ('$table'))
-       AND (UPPER(a.table_name) = ('$table') and a.constraint_type = 'P')
-       $owner_clause
-       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[] = reset($v);
-                       }
-                       return $a;
-               }
-               else return false;
-       }
-       
-       // http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
-       function MetaForeignKeys($table, $owner=false)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $table = $this->qstr(strtoupper($table));
-               if (!$owner) {
-                       $owner = $this->user;
-                       $tabp = 'user_';
-               } else
-                       $tabp = 'all_';
-                       
-               $owner = ' and owner='.$this->qstr(strtoupper($owner));
-               
-               $sql = 
-"select constraint_name,r_owner,r_constraint_name 
-       from {$tabp}constraints
-       where constraint_type = 'R' and table_name = $table $owner";
-               
-               $constraints =& $this->GetArray($sql);
-               $arr = false;
-               foreach($constraints as $constr) {
-                       $cons = $this->qstr($constr[0]);
-                       $rowner = $this->qstr($constr[1]);
-                       $rcons = $this->qstr($constr[2]);
-                       $cols = $this->GetArray("select column_name from 
{$tabp}cons_columns where constraint_name=$cons $owner order by position");
-                       $tabcol = $this->GetArray("select 
table_name,column_name from {$tabp}cons_columns where owner=$rowner and 
constraint_name=$rcons order by position");
-                       
-                       if ($cols && $tabcol) 
-                               for ($i=0, $max=sizeof($cols); $i < $max; $i++) 
{
-                                       $arr[$tabcol[$i][0]] = 
$cols[$i][0].'='.$tabcol[$i][1];
-                               }
-               }
-               $ADODB_FETCH_MODE = $save;
-               
-               return $arr;
-       }
-
-       
-       function CharMax()
-       {
-               return 4000;
-       }
-       
-       function TextMax()
-       {
-               return 4000;
-       }
-       
-       /**
-        * Quotes a string.
-        * 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 ($this->noNullStrings && strlen($s)==0)$s = ' ';
-               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);
-               
-               $s = str_replace('\\\\','\\',$s);
-               return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
-               
-       }
-       
-}
-
-/*--------------------------------------------------------------------------------------
-                Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oci8 extends ADORecordSet {
-
-       var $databaseType = 'oci8';
-       var $bind=false;
-       var $_fieldobjs;
-       //var $_arr = false;
-               
-       function ADORecordset_oci8($queryID,$mode=false)
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch ($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->adodbFetchMode = $mode;
-               $this->_queryID = $queryID;
-       }
-
-
-       function Init()
-       {
-               if ($this->_inited) return;
-               
-               $this->_inited = true;
-               if ($this->_queryID) {
-                       
-                       $this->_currentRow = 0;
-                       @$this->_initrs();
-                       $this->EOF = !$this->_fetch();
-                       
-                       /*
-                       // based on idea by Gaetano Giunta to detect unusual 
oracle errors
-                       // see 
http://phplens.com/lens/lensforum/msgs.php?id=6771
-                       $err = OCIError($this->_queryID);
-                       if ($err && $this->connection->debug) 
ADOConnection::outp($err);
-                       */
-                       
-                       if (!is_array($this->fields)) {
-                               $this->_numOfRows = 0;
-                               $this->fields = array();
-                       }
-               } else {
-                       $this->fields = array();
-                       $this->_numOfRows = 0;
-                       $this->_numOfFields = 0;
-                       $this->EOF = true;
-               }
-       }
-       
-       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);
-               }
-       }
-
-         /*            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 ($p != 0 && $sc == 0) $fld->type = 'INT';
-                       //echo " $this->name ($p.$sc) ";
-               }
-               return $fld;
-       }
-       
-       /* For some reason, OCIcolumnname fails when called after _initrs() so 
we cache it */
-       function &FetchField($fieldOffset = -1)
-       {
-               return $this->_fieldobjs[$fieldOffset];
-       }
-       
-       
-       /*
-       // 10% speedup to move MoveNext to child class
-       function _MoveNext() 
-       {
-       //global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return 
@adodb_movenext($this);
-               
-               if ($this->EOF) return false;
-               
-               $this->_currentRow++;
-               
if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
-                       return true;
-               $this->EOF = true;
-               
-               return false;
-       }       */
-       
-       
-       function MoveNext()
-       {
-               if 
(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-                       $this->_currentRow += 1;
-                       return true;
-               }
-               if (!$this->EOF) {
-                       $this->_currentRow += 1;
-                       $this->EOF = true;
-               }
-               return false;
-       }
-       
-       
-       /* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() 
*/
-       function &GetArrayLimit($nrows,$offset=-1) 
-       {
-               if ($offset <= 0) {
-                       $arr =& $this->GetArray($nrows);
-                       return $arr;
-               }
-               for ($i=1; $i < $offset; $i++) 
-                       if (address@hidden($this->_queryID)) return array();
-                       
-               if 
(address@hidden($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 _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() 
-       {
-               if ($this->connection->_stmt === $this->_queryID) 
$this->connection->_stmt = false;
-               @OCIFreeStatement($this->_queryID);
-               $this->_queryID = false;
-               
-       }
-
-       function MetaType($t,$len=-1)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               switch (strtoupper($t)) {
-               case 'VARCHAR':
-               case 'VARCHAR2':
-               case 'CHAR':
-               case 'VARBINARY':
-               case 'BINARY':
-               case 'NCHAR':
-               case 'NVARCHAR':
-               case 'NVARCHAR2':
-                                if (isset($this) && $len <= $this->blobSize) 
return 'C';
-               
-               case 'NCLOB':
-               case 'LONG':
-               case 'LONG VARCHAR':
-               case 'CLOB':
-               return 'X';
-               
-               case 'LONG RAW':
-               case 'LONG VARBINARY':
-               case 'BLOB':
-                       return 'B';
-               
-               case 'DATE': 
-                       return  ($this->connection->datetime) ? 'T' : 'D';
-               
-               
-               case 'TIMESTAMP': return 'T';
-               
-               case 'INT': 
-               case 'SMALLINT':
-               case 'INTEGER': 
-                       return 'I';
-                       
-               default: return 'N';
-               }
-       }
-}
-
-class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {        
-       function ADORecordSet_ext_oci8($queryID,$mode=false) 
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch ($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->adodbFetchMode = $mode;
-               $this->_queryID = $queryID;
-       }
-       
-       function MoveNext()
-       {
-               return adodb_movenext($this);
-       }
-}
-?>
\ No newline at end of file
+<?php
+/*
+
+  version V4.72 21 Feb 2006 (c) 2000-2006 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://adodb.sourceforge.net
+  
+  Code contributed by George Fourlanos <address@hidden>
+  
+  13 Nov 2000 jlim - removed all ora_* references.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+/*
+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. 
+*/
+
+# define the LOB descriptor type for the given type
+# returns false if no LOB descriptor
+function oci_lob_desc($type) {
+       switch ($type) {
+               case OCI_B_BFILE: $result = OCI_D_FILE; break;
+               case OCI_B_CFILEE: $result = OCI_D_FILE; break;
+               case OCI_B_CLOB: $result = OCI_D_LOB; break;
+               case OCI_B_BLOB: $result = OCI_D_LOB; break;
+               case OCI_B_ROWID: $result = OCI_D_ROWID; break;
+               default: $result = false; break;
+       }
+       return $result;
+}
+
+class ADODB_oci8 extends ADOConnection {
+       var $databaseType = 'oci8';
+       var $dataProvider = 'oci8';
+       var $replaceQuote = "''"; // string to use to replace quotes
+       var $concat_operator='||';
+       var $sysDate = "TRUNC(SYSDATE)";
+       var $sysTimeStamp = 'SYSDATE';
+       var $metaDatabasesSQL = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME 
NOT IN ('SYS','SYSTEM','DBSNMP','OUTLN') ORDER BY 1";
+       var $_stmt;
+       var $_commit = OCI_COMMIT_ON_SUCCESS;
+       var $_initdate = true; // init date to YYYY-MM-DD
+       var $metaTablesSQL = "select table_name,table_type from cat where 
table_type in ('TABLE','VIEW')";
+       var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, 
NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by 
address@hidden net
+       var $_bindInputArray = true;
+       var $hasGenID = true;
+       var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
+       var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s";
+       var $_dropSeqSQL = "DROP SEQUENCE %s";
+       var $hasAffectedRows = true;
+       var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
+       var $noNullStrings = false;
+       var $connectSID = false;
+       var $_bind = false;
+       var $_hasOCIFetchStatement = false;
+       var $_getarray = false; // currently not working
+       var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT 
OUTER, $col (+)= $value for RIGHT OUTER
+       var $session_sharing_force_blob = false; // alter session on updateblob 
if set to true 
+       var $firstrows = true; // enable first rows optimization on 
SelectLimit()
+       var $selectOffsetAlg1 = 100; // when to use 1st algorithm of 
selectlimit.
+       var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 
'RRRR-MM-DD HH24:MI:SS'
+       var $useDBDateFormatForTextInput=false;
+       var $datetime = false; // MetaType('DATE') returns 'D' 
(datetime==false) or 'T' (datetime == true)
+       var $_refLOBs = array();
+       
+       // var $ansiOuter = true; // if oracle9
+    
+       function ADODB_oci8() 
+       {
+               $this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
+               if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
+       }
+       
+       /*  Function &MetaColumns($table) added by address@hidden/
+       function &MetaColumns($table) 
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $false = false;
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
+               
+               $rs = 
$this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+               
+               if (isset($savem)) $this->SetFetchMode($savem);
+               $ADODB_FETCH_MODE = $save;
+               if (!$rs) {
+                       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];
+                       $fld->scale = $rs->fields[3];
+                       if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
+                               $fld->type ='INT';
+                       $fld->max_length = $rs->fields[4];
+               }       
+                       $fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 
0);
+                       $fld->binary = (strpos($fld->type,'BLOB') !== false);
+                       $fld->default_value = $rs->fields[6];
+                       
+                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = 
$fld;     
+                       else $retarr[strtoupper($fld->name)] = $fld;
+                       $rs->MoveNext();
+               }
+               $rs->Close();
+               if (empty($retarr))
+                       return  $false;
+               else 
+                       return $retarr;
+       }
+       
+       function Time()
+       {
+               $rs =& $this->Execute("select 
TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
+               if ($rs && !$rs->EOF) return 
$this->UnixTimeStamp(reset($rs->fields));
+               
+               return false;
+       }
+ 
+/*
+
+  Multiple modes of connection are supported:
+  
+  a. Local Database
+    $conn->Connect(false,'scott','tiger');
+  
+  b. From tnsnames.ora
+    $conn->Connect(false,'scott','tiger',$tnsname); 
+    $conn->Connect($tnsname,'scott','tiger'); 
+  
+  c. Server + service name
+    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
+  
+  d. Server + SID
+       $conn->connectSID = true;
+       $conn->Connect($serveraddress,'scott,'tiger',$SID);
+
+
+Example TNSName:
+---------------
+NATSOFT.DOMAIN =
+  (DESCRIPTION =
+       (ADDRESS_LIST =
+         (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
+       )
+       (CONNECT_DATA =
+         (SERVICE_NAME = natsoft.domain)
+       )
+  )
+  
+  There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force 
new connection
+       
+*/
+       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename,$mode=0)
+       {
+               if (!function_exists('OCIPLogon')) return null;
+               
+               
+        $this->_errorMsg = false;
+               $this->_errorCode = false;
+               
+               if($argHostname) { // added by Jorma Tuomainen <address@hidden>
+                       if (empty($argDatabasename)) $argDatabasename = 
$argHostname;
+                       else {
+                               if(strpos($argHostname,":")) {
+                                       $argHostinfo=explode(":",$argHostname);
+                                       $argHostname=$argHostinfo[0];
+                                       $argHostport=$argHostinfo[1];
+                               } else {
+                                       $argHostport = empty($this->port)?  
"1521" : $this->port;
+                               }
+                               
+                               if ($this->connectSID) {
+                                       
$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+                                       
.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
+                               } else
+                                       
$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>";
+               if ($mode==1) {
+                       $this->_connectionID = ($this->charSet) ? 
+                               OCIPLogon($argUsername,$argPassword, 
$argDatabasename)
+                               :
+                               OCIPLogon($argUsername,$argPassword, 
$argDatabasename, $this->charSet)
+                               ;
+                       if ($this->_connectionID && $this->autoRollback)  
OCIrollback($this->_connectionID);
+               } else if ($mode==2) {
+                       $this->_connectionID = ($this->charSet) ? 
+                               OCINLogon($argUsername,$argPassword, 
$argDatabasename)
+                               :
+                               OCINLogon($argUsername,$argPassword, 
$argDatabasename, $this->charSet);
+                               
+               } else {
+                       $this->_connectionID = ($this->charSet) ? 
+                               OCILogon($argUsername,$argPassword, 
$argDatabasename)
+                               :
+                               OCILogon($argUsername,$argPassword, 
$argDatabasename,$this->charSet);
+               }
+               if (!$this->_connectionID) return false;
+               if ($this->_initdate) {
+                       $this->Execute("ALTER SESSION SET 
NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
+               }
+               
+               // looks like: 
+               // Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production 
With the Partitioning option JServer Release 8.1.7.0.0 - Production
+               // $vers = OCIServerVersion($this->_connectionID);
+               // if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
+               return true;
+       }
+       
+       function ServerInfo()
+       {
+               $arr['compat'] = $this->GetOne('select value from 
sys.database_compatible_level');
+               $arr['description'] = @OCIServerVersion($this->_connectionID);
+               $arr['version'] = ADOConnection::_findvers($arr['description']);
+               return $arr;
+       }
+               // returns true or false
+       function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename,1);
+       }
+       
+       // returns true or false
+       function _nconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename,2);
+       }
+       
+       function _affectedrows()
+       {
+               if (is_resource($this->_stmt)) return 
@OCIRowCount($this->_stmt);
+               return 0;
+       }
+       
+       function IfNull( $field, $ifNull ) 
+       {
+               return " NVL($field, $ifNull) "; // if Oracle
+       }
+       
+       // format and return date string in database date format
+       function DBDate($d)
+       {
+               if (empty($d) && $d !== 0) return 'null';
+               
+               if (is_string($d)) $d = ADORecordSet::UnixDate($d);
+               return 
"TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
+       }
+
+       
+       // format and return date string in database timestamp format
+       function DBTimeStamp($ts)
+       {
+               if (empty($ts) && $ts !== 0) return 'null';
+               if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
+               return 
'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
+       }
+       
+       function RowLock($tables,$where,$flds='1 as ignore') 
+       {
+               if ($this->autoCommit) $this->BeginTrans();
+               return $this->GetOne("select $flds from $tables where $where 
for update");
+       }
+       
+       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+       {
+               if ($mask) {
+                       $save = $this->metaTablesSQL;
+                       $mask = $this->qstr(strtoupper($mask));
+                       $this->metaTablesSQL .= " AND upper(table_name) like 
$mask";
+               }
+               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
+               
+               if ($mask) {
+                       $this->metaTablesSQL = $save;
+               }
+               return $ret;
+       }
+       
+       // Mark Newnham 
+       function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+       {
+        // save old fetch mode
+        global $ADODB_FETCH_MODE;
+
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+
+               // get index details
+               $table = strtoupper($table);
+
+               // get Primary index
+               $primary_key = '';
+
+               $false = false;
+               $rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS 
WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'",$table));
+               if ($row = $rs->FetchRow())
+                  $primary_key = $row[1]; //constraint_name
+
+               if ($primary==TRUE && $primary_key=='') {
+                        if (isset($savem)) 
+                $this->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+                       return $false; //There is no primary key
+               }
+
+        $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, 
ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, 
ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE 
UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND 
ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
+
+               
+        if (!is_object($rs)) {
+                       if (isset($savem)) 
+                               $this->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+            return $false;
+        }
+
+               $indexes = array ();
+        // parse index data into array
+
+        while ($row = $rs->FetchRow()) {
+                       if ($primary && $row[0] != $primary_key) continue;
+            if (!isset($indexes[$row[0]])) {
+                               $indexes[$row[0]] = array(
+                                  'unique' => ($row[1] == 'UNIQUE'),
+                                  'columns' => array()
+                               );
+            }
+            $indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
+        }
+
+        // sort columns by order in the index
+        foreach ( array_keys ($indexes) as $index ) {
+            ksort ($indexes[$index]['columns']);
+        }
+
+               if (isset($savem)) { 
+            $this->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+               }
+        return $indexes;
+       }
+       
+       function BeginTrans()
+       {       
+               if ($this->transOff) return true;
+               $this->transCnt += 1;
+               $this->autoCommit = false;
+               $this->_commit = OCI_DEFAULT;
+               return true;
+       }
+       
+       function CommitTrans($ok=true) 
+       { 
+               if ($this->transOff) return true;
+               if (!$ok) return $this->RollbackTrans();
+               
+               if ($this->transCnt) $this->transCnt -= 1;
+               $ret = OCIcommit($this->_connectionID);
+               $this->_commit = OCI_COMMIT_ON_SUCCESS;
+               $this->autoCommit = true;
+               return $ret;
+       }
+       
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true;
+               if ($this->transCnt) $this->transCnt -= 1;
+               $ret = OCIrollback($this->_connectionID);
+               $this->_commit = OCI_COMMIT_ON_SUCCESS;
+               $this->autoCommit = true;
+               return $ret;
+       }
+       
+       
+       function SelectDB($dbName) 
+       {
+               return false;
+       }
+
+       function ErrorMsg() 
+       {
+               if ($this->_errorMsg !== false) return $this->_errorMsg;
+
+               if (is_resource($this->_stmt)) $arr = @OCIerror($this->_stmt);
+               if (empty($arr)) {
+                       $arr = @OCIerror($this->_connectionID);
+                       if ($arr === false) $arr = @OCIError();
+                       if ($arr === false) return '';
+               }
+               $this->_errorMsg = $arr['message'];
+               $this->_errorCode = $arr['code'];
+               return $this->_errorMsg;
+       }
+
+       function ErrorNo() 
+       {
+               if ($this->_errorCode !== false) return $this->_errorCode;
+               
+               if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
+               if (empty($arr)) {
+                       $arr = @OCIError($this->_connectionID);
+                       if ($arr == false) $arr = @OCIError();
+                       if ($arr == false) return '';
+               }
+               
+               $this->_errorMsg = $arr['message'];
+               $this->_errorCode = $arr['code'];
+               
+               return $arr['code'];
+       }
+       
+       // Format date column in sql string given an input format that 
understands Y M D
+       function SQLDate($fmt, $col=false)
+       {       
+               if (!$col) $col = $this->sysTimeStamp;
+               $s = 'TO_CHAR('.$col.",'";
+               
+               $len = strlen($fmt);
+               for ($i=0; $i < $len; $i++) {
+                       $ch = $fmt[$i];
+                       switch($ch) {
+                       case 'Y':
+                       case 'y':
+                               $s .= 'YYYY';
+                               break;
+                       case 'Q':
+                       case 'q':
+                               $s .= 'Q';
+                               break;
+                               
+                       case 'M':
+                               $s .= 'Mon';
+                               break;
+                               
+                       case 'm':
+                               $s .= 'MM';
+                               break;
+                       case 'D':
+                       case 'd':
+                               $s .= 'DD';
+                               break;
+                       
+                       case 'H':
+                               $s.= 'HH24';
+                               break;
+                               
+                       case 'h':
+                               $s .= 'HH';
+                               break;
+                               
+                       case 'i':
+                               $s .= 'MI';
+                               break;
+                       
+                       case 's':
+                               $s .= 'SS';
+                               break;
+                       
+                       case 'a':
+                       case 'A':
+                               $s .= 'AM';
+                               break;
+                               
+                       case 'w':
+                               $s .= 'D';
+                               break;
+                               
+                       case 'l':
+                               $s .= 'DAY';
+                               break;
+                               
+                        case 'W':
+                               $s .= 'WW';
+                               break;
+                               
+                       default:
+                       // handle escape characters...
+                               if ($ch == '\\') {
+                                       $i++;
+                                       $ch = substr($fmt,$i,1);
+                               }
+                               if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
+                               else $s .= '"'.$ch.'"';
+                               
+                       }
+               }
+               return $s. "')";
+       }
+       
+       
+       /*
+       This algorithm makes use of
+       
+       a. FIRST_ROWS hint
+       The FIRST_ROWS hint explicitly chooses the approach to optimize 
response time, 
+       that is, minimum resource usage to return the first row. Results will 
be returned 
+       as soon as they are identified. 
+
+       b. Uses rownum tricks to obtain only the required rows from a given 
offset.
+        As this uses complicated sql statements, we only use this if the 
$offset >= 100. 
+        This idea by Tomas V V Cox.
+        
+        This implementation does not appear to work with oracle 8.0.5 or 
earlier. Comment
+        out this function then, and the slower SelectLimit() in the base class 
will be used.
+       */
+       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
+       {
+               // seems that oracle only supports 1 hint comment in 8i
+               if ($this->firstrows) {
+                       if (strpos($sql,'/*+') !== false)
+                               $sql = str_replace('/*+ ','/*+FIRST_ROWS 
',$sql);
+                       else
+                               $sql = preg_replace('/^[ 
\t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
+               }
+               
+               if ($offset < $this->selectOffsetAlg1) {
+                       if ($nrows > 0) {       
+                               if ($offset > 0) $nrows += $offset;
+                               //$inputarr['adodb_rownum'] = $nrows;
+                               if ($this->databaseType == 'oci8po') {
+                                       $sql = "select * from (".$sql.") where 
rownum <= ?";
+                               } else {
+                                       $sql = "select * from (".$sql.") where 
rownum <= :adodb_offset";
+                               } 
+                               $inputarr['adodb_offset'] = $nrows;
+                               $nrows = -1;
+                       }
+                       // note that $nrows = 0 still has to work ==> no rows 
returned
+
+                       $rs =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+                       return $rs;
+                       
+               } else {
+                        // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
+                       
+                        // Let Oracle return the name of the columns
+                       $q_fields = "SELECT * FROM (".$sql.") WHERE NULL = 
NULL";
+                        
+                       $false = false;
+                       if (! $stmt_arr = $this->Prepare($q_fields)) {
+                               return $false;
+                       }
+                       $stmt = $stmt_arr[1];
+                        
+                        if (is_array($inputarr)) {
+                               foreach($inputarr as $k => $v) {
+                                       if (is_array($v)) {
+                                               if (sizeof($v) == 2) // 
suggested by address@hidden
+                                                       
OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
+                                               else
+                                                       
OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+                                       } else {
+                                               $len = -1;
+                                               if ($v === ' ') $len = 1;
+                                               if (isset($bindarr)) {  // is 
prepared sql, so no need to ocibindbyname again
+                                                       $bindarr[$k] = $v;
+                                               } else {                        
        // dynamic sql, so rebind every time
+                                                       
OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+                                               }
+                                       }
+                               }
+                       }
+                       
+                        if (!OCIExecute($stmt, OCI_DEFAULT)) {
+                                OCIFreeStatement($stmt); 
+                                return $false;
+                        }
+                        
+                        $ncols = OCINumCols($stmt);
+                        for ( $i = 1; $i <= $ncols; $i++ ) {
+                                $cols[] = '"'.OCIColumnName($stmt, $i).'"';
+                        }
+                        $result = false;
+                       
+                        OCIFreeStatement($stmt); 
+                        $fields = implode(',', $cols);
+                        $nrows += $offset;
+                        $offset += 1; // in Oracle rownum starts at 1
+                       
+                       if ($this->databaseType == 'oci8po') {
+                                        $sql = "SELECT $fields FROM".
+                                         "(SELECT rownum as adodb_rownum, 
$fields FROM".
+                                         " ($sql) WHERE rownum <= ?".
+                                         ") WHERE adodb_rownum >= ?";
+                               } else {
+                                        $sql = "SELECT $fields FROM".
+                                         "(SELECT rownum as adodb_rownum, 
$fields FROM".
+                                         " ($sql) WHERE rownum <= 
:adodb_nrows".
+                                         ") WHERE adodb_rownum >= 
:adodb_offset";
+                               } 
+                               $inputarr['adodb_nrows'] = $nrows;
+                               $inputarr['adodb_offset'] = $offset;
+                               
+                       if ($secs2cache>0) $rs =& 
$this->CacheExecute($secs2cache, $sql,$inputarr);
+                       else $rs =& $this->Execute($sql,$inputarr);
+                       return $rs;
+               }
+       
+       }
+       
+       /**
+       * Usage:
+       * Store BLOBs and CLOBs
+       *
+       * Example: to store $var in a blob
+       *
+       *       $conn->Execute('insert into TABLE (id,ablob) 
values(12,empty_blob())');
+       *       $conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 
'BLOB');
+       *       
+       *       $blobtype supports 'BLOB' and 'CLOB', but you need to change to 
'empty_clob()'.
+       *
+       *  to get length of LOB:
+       *       select DBMS_LOB.GETLENGTH(ablob) from TABLE
+       *
+       * If you are using CURSOR_SHARING = force, it appears this will case a 
segfault
+       * under oracle 8.1.7.0. Run:
+       *        $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+       * before UpdateBlob() then...
+       */
+
+       function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+       {
+               
+               //if (strlen($val) < 4000) return $this->Execute("UPDATE $table 
SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
+               
+               switch(strtoupper($blobtype)) {
+               default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown 
blobtype=$blobtype"); return false;
+               case 'BLOB': $type = OCI_B_BLOB; break;
+               case 'CLOB': $type = OCI_B_CLOB; break;
+               }
+               
+               if ($this->databaseType == 'oci8po') 
+                       $sql = "UPDATE $table set $column=EMPTY_{$blobtype}() 
WHERE $where RETURNING $column INTO ?";
+               else 
+                       $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);
+               if ($this->session_sharing_force_blob) $this->Execute('ALTER 
SESSION SET CURSOR_SHARING=EXACT');
+               $commit = $this->autoCommit;
+               if ($commit) $this->BeginTrans();
+               $rs = $this->_Execute($sql,$arr);
+               if ($rez = !empty($rs)) $desc->save($val);
+               $desc->free();
+               if ($commit) $this->CommitTrans();
+               if ($this->session_sharing_force_blob) $this->Execute('ALTER 
SESSION SET CURSOR_SHARING=FORCE');
+               
+               if ($rez) $rs->Close();
+               return $rez;
+       }
+       
+       /**
+       * Usage:  store file pointed to by $var in a blob
+       */
+       function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
+       {
+               switch(strtoupper($blobtype)) {
+               default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown 
blobtype=$blobtype"); return false;
+               case 'BLOB': $type = OCI_B_BLOB; break;
+               case 'CLOB': $type = OCI_B_CLOB; break;
+               }
+               
+               if ($this->databaseType == 'oci8po') 
+                       $sql = "UPDATE $table set $column=EMPTY_{$blobtype}() 
WHERE $where RETURNING $column INTO ?";
+               else 
+                       $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 = ADODB_oci8::Execute($sql,$arr);
+               if ($rez = !empty($rs)) $desc->savefile($val);
+               $desc->free();
+               $this->CommitTrans();
+               
+               if ($rez) $rs->Close();
+               return $rez;
+       }
+
+               /**
+        * Execute SQL 
+        *
+        * @param sql           SQL statement to execute, or possibly an array 
holding prepared statement ($sql[0] will hold sql text)
+        * @param [inputarr]    holds the input data to bind to. Null elements 
will be set to null.
+        * @return              RecordSet or false
+        */
+       function &Execute($sql,$inputarr=false) 
+       {
+               if ($this->fnExecute) {
+                       $fn = $this->fnExecute;
+                       $ret =& $fn($this,$sql,$inputarr);
+                       if (isset($ret)) return $ret;
+               }
+               if ($inputarr) {
+                       #if (!is_array($inputarr)) $inputarr = array($inputarr);
+                       
+                       $element0 = reset($inputarr);
+                       
+                       # is_object check because oci8 descriptors can be 
passed in
+                       if (is_array($element0) && 
!is_object(reset($element0))) {
+                               if (is_string($sql))
+                                       $stmt = $this->Prepare($sql);
+                               else
+                                       $stmt = $sql;
+                                       
+                               foreach($inputarr as $arr) {
+                                       $ret =& $this->_Execute($stmt,$arr);
+                                       if (!$ret) return $ret;
+                               }
+                       } else {
+                               $ret =& $this->_Execute($sql,$inputarr);
+                       }
+                       
+               } else {
+                       $ret =& $this->_Execute($sql,false);
+               }
+
+               return $ret;
+       }
+       
+       /*
+               Example of usage:
+               
+               $stmt = $this->Prepare('insert into emp (empno, ename) values 
(:empno, :ename)');
+       */
+       function Prepare($sql,$cursor=false)
+       {
+       static $BINDNUM = 0;
+       
+               $stmt = OCIParse($this->_connectionID,$sql);
+
+               if (!$stmt) return false;
+
+               $BINDNUM += 1;
+               
+               $sttype = @OCIStatementType($stmt);
+               if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
+                       return array($sql,$stmt,0,$BINDNUM, ($cursor) ? 
OCINewCursor($this->_connectionID) : false);
+               }
+               return array($sql,$stmt,0,$BINDNUM);
+       }
+       
+       /*
+               Call an oracle stored procedure and returns a cursor variable 
as a recordset. 
+               Concept by Robert Tuttle address@hidden
+               
+               Example:
+                       Note: we return a cursor variable in :RS2
+                       $rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); 
END;",'RS2');
+                       
+                       $rs = $db->ExecuteCursor(
+                               "BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
+                               'RS2',
+                               array('VAR1' => 'Mr Bean'));
+                       
+       */
+       function &ExecuteCursor($sql,$cursorName='rs',$params=false)
+       {
+               if (is_array($sql)) $stmt = $sql;
+               else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate 
OCINewCursor
+       
+               if (is_array($stmt) && sizeof($stmt) >= 5) {
+                       $hasref = true;
+                       $ignoreCur = false;
+                       $this->Parameter($stmt, $ignoreCur, $cursorName, false, 
-1, OCI_B_CURSOR);
+                       if ($params) {
+                               foreach($params as $k => $v) {
+                                       $this->Parameter($stmt,$params[$k], $k);
+                               }
+                       }
+               } else
+                       $hasref = false;
+                       
+               $rs =& $this->Execute($stmt);
+               if ($rs) {
+                       if ($rs->databaseType == 'array') 
OCIFreeCursor($stmt[4]);
+                       else if ($hasref) $rs->_refcursor = $stmt[4];
+               }
+               return $rs;
+       }
+       
+       /*
+               Bind a variable -- very, very fast for executing repeated 
statements in oracle. 
+               Better than using
+                       for ($i = 0; $i < $max; $i++) { 
+                               $p1 = ?; $p2 = ?; $p3 = ?;
+                               $this->Execute("insert into table (col0, col1, 
col2) values (:0, :1, :2)", 
+                                       array($p1,$p2,$p3));
+                       }
+               
+               Usage:
+                       $stmt = $DB->Prepare("insert into table (col0, col1, 
col2) values (:0, :1, :2)");
+                       $DB->Bind($stmt, $p1);
+                       $DB->Bind($stmt, $p2);
+                       $DB->Bind($stmt, $p3);
+                       for ($i = 0; $i < $max; $i++) { 
+                               $p1 = ?; $p2 = ?; $p3 = ?;
+                               $DB->Execute($stmt);
+                       }
+                       
+               Some timings:           
+                       ** Test table has 3 cols, and 1 index. Test to insert 
1000 records
+                       Time 0.6081s (1644.60 inserts/sec) with direct 
OCIParse/OCIExecute
+                       Time 0.6341s (1577.16 inserts/sec) with ADOdb 
Prepare/Bind/Execute
+                       Time 1.5533s ( 643.77 inserts/sec) with pure SQL using 
Execute
+                       
+               Now if PHP only had batch/bulk updating like Java or PL/SQL...
+       
+               Note that the order of parameters differs from OCIBindByName,
+               because we default the names to :0, :1, :2
+       */
+       function 
Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
+       {
+               
+               if (!is_array($stmt)) return false;
+        
+        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
+            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
+        }
+        
+               if ($name == false) {
+                       if ($type !== false) $rez = 
OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
+                       else $rez = 
OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
+                       $stmt[2] += 1;
+               } else if (oci_lob_desc($type)) {
+                       if ($this->debug) {
+                               ADOConnection::outp("<b>Bind</b>: name = 
$name");
+                       }
+            //we have to create a new Descriptor here
+                       $numlob = count($this->_refLOBs);
+               $this->_refLOBs[$numlob]['LOB'] = 
OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
+                       $this->_refLOBs[$numlob]['TYPE'] = $isOutput;
+                       
+                       $tmp = &$this->_refLOBs[$numlob]['LOB'];
+               $rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
+                       if ($this->debug) {
+                               ADOConnection::outp("<b>Bind</b>: descriptor 
has been allocated, var (".$name.") binded");
+                       }
+                       
+                       // if type is input then write data to lob now
+                       if ($isOutput == false) {
+                               $var = $this->BlobEncode($var);
+                               $tmp->WriteTemporary($var);
+                               $this->_refLOBs[$numlob]['VAR'] = &$var;
+                               if ($this->debug) {
+                                       ADOConnection::outp("<b>Bind</b>: LOB 
has been written to temp");
+                               }
+                       } else {
+                               $this->_refLOBs[$numlob]['VAR'] = &$var;
+                       }
+                       $rez = $tmp;
+               } else {
+                       if ($this->debug) 
+                               ADOConnection::outp("<b>Bind</b>: name = 
$name");
+                       
+                       if ($type !== false) $rez = 
OCIBindByName($stmt[1],":".$name,$var,$size,$type);
+                       else $rez = 
OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
+               }
+               
+               return $rez;
+       }
+       
+       function Param($name,$type=false)
+       {
+               return ':'.$name;
+       }
+       
+       /* 
+       Usage:
+               $stmt = $db->Prepare('select * from table where id =:myid and 
group=:group');
+               $db->Parameter($stmt,$id,'myid');
+               $db->Parameter($stmt,$group,'group');
+               $db->Execute($stmt);
+               
+               @param $stmt Statement returned by Prepare() or PrepareSP().
+               @param $var PHP variable to bind to
+               @param $name Name of stored procedure variable name to bind to.
+               @param [$isOutput] Indicates direction of parameter 0/false=IN  
1=OUT  2= IN/OUT. This is ignored in oci8.
+               @param [$maxLen] Holds an maximum length of the variable.
+               @param [$type] The data type of $var. Legal values depend on 
driver.
+               
+               See OCIBindByName documentation at php.net.
+       */
+       function 
Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
+       {
+                       if  ($this->debug) {
+                               $prefix = ($isOutput) ? 'Out' : 'In';
+                               $ztype = (empty($type)) ? 'false' : $type;
+                               ADOConnection::outp( 
"{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, 
\$type=$ztype);");
+                       }
+                       return 
$this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
+       }
+       
+       /*
+       returns query ID if successful, otherwise false
+       this version supports:
+       
+          1. $db->execute('select * from table');
+          
+          2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
+                 $db->execute($prepared_statement, array(1,2,3));
+                 
+          3. $db->execute('insert into table (a,b,c) values 
(:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
+          
+          4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
+                 $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
+                 $db->execute($stmt);
+       */ 
+       function _query($sql,$inputarr)
+       {
+               if (is_array($sql)) { // is prepared sql
+                       $stmt = $sql[1];
+                       
+                       // we try to bind to permanent array, so that 
OCIBindByName is persistent
+                       // and carried out once only - note that max array 
element size is 4000 chars
+                       if (is_array($inputarr)) {
+                               $bindpos = $sql[3];
+                               if (isset($this->_bind[$bindpos])) {
+                               // all tied up already
+                                       $bindarr = &$this->_bind[$bindpos];
+                               } else {
+                               // one statement to bind them all
+                                       $bindarr = array();
+                                       foreach($inputarr as $k => $v) {
+                                               $bindarr[$k] = $v;
+                                               
OCIBindByName($stmt,":$k",$bindarr[$k],is_string($v) && strlen($v)>4000 ? -1 : 
4000);
+                                       }
+                                       $this->_bind[$bindpos] = &$bindarr;
+                               }
+                       }
+               } else {
+                       $stmt=OCIParse($this->_connectionID,$sql);
+               }
+                       
+               $this->_stmt = $stmt;
+               if (!$stmt) return false;
+       
+               if (defined('ADODB_PREFETCH_ROWS')) 
@OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
+                       
+               if (is_array($inputarr)) {
+                       foreach($inputarr as $k => $v) {
+                               if (is_array($v)) {
+                                       if (sizeof($v) == 2) // suggested by 
address@hidden
+                                               
OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
+                                       else
+                                               
OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+                                       
+                                       if ($this->debug==99) echo "name=:$k",' 
var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'<br>';
+                               } else {
+                                       $len = -1;
+                                       if ($v === ' ') $len = 1;
+                                       if (isset($bindarr)) {  // is prepared 
sql, so no need to ocibindbyname again
+                                               $bindarr[$k] = $v;
+                                       } else {                                
// dynamic sql, so rebind every time
+                                               
OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+                                       }
+                               }
+                       }
+               }
+               
+        $this->_errorMsg = false;
+               $this->_errorCode = false;
+               if (OCIExecute($stmt,$this->_commit)) {
+//OCIInternalDebug(1);                 
+                       if (count($this -> _refLOBs) > 0) {
+               
+                               foreach ($this -> _refLOBs as $key => $value) {
+                                       if ($this -> _refLOBs[$key]['TYPE'] == 
true) {
+                                               $tmp = $this -> 
_refLOBs[$key]['LOB'] -> load();
+                                               if ($this -> debug) {
+                                                       
ADOConnection::outp("<b>OUT LOB</b>: LOB has been loaded. <br>");
+                                               }
+                                               //$_GLOBALS[$this -> 
_refLOBs[$key]['VAR']] = $tmp;
+                                               $this -> _refLOBs[$key]['VAR'] 
= $tmp;
+                                       } else {
+                        
$this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
+                                               $this -> 
_refLOBs[$key]['LOB']->free();
+                                               unset($this -> _refLOBs[$key]);
+                        if ($this->debug) {
+                                                       
ADOConnection::outp("<b>IN LOB</b>: LOB has been saved. <br>");
+                                               }
+                    }                                  
+                               }
+                       }
+               
+            switch (@OCIStatementType($stmt)) {
+                case "SELECT":
+                                       return $stmt;
+                               
+                               case 'DECLARE':
+                case "BEGIN":
+                    if (is_array($sql) && !empty($sql[4])) {
+                                               $cursor = $sql[4];
+                                               if (is_resource($cursor)) {
+                                                       $ok = 
OCIExecute($cursor);      
+                               return $cursor;
+                                               }
+                                               return $stmt;
+                    } else {
+                                               if (is_resource($stmt)) {
+                                                       OCIFreeStatement($stmt);
+                                                       return true;
+                                               }
+                        return $stmt;
+                    }
+                    break;
+                default :
+                                       // ociclose -- no because it could be 
used in a LOB?
+                    return true;
+            }
+               }
+               return false;
+       }
+       
+       // returns true or false
+       function _close()
+       {
+               if (!$this->_connectionID) return;
+               
+               if (!$this->autoCommit) OCIRollback($this->_connectionID);
+               if (count($this->_refLOBs) > 0) {
+                       foreach ($this ->_refLOBs as $key => $value) {
+                               $this->_refLOBs[$key]['LOB']->free();
+                               unset($this->_refLOBs[$key]);
+                       }
+               }
+               OCILogoff($this->_connectionID);
+               
+               $this->_stmt = false;
+               $this->_connectionID = false;
+       }
+       
+       function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
+       {
+               if ($internalKey) return array('ROWID');
+               
+       // tested with oracle 8.1.7
+               $table = strtoupper($table);
+               if ($owner) {
+                       $owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER 
= UPPER('$owner')))";
+                       $ptab = 'ALL_';
+               } else {
+                       $owner_clause = '';
+                       $ptab = 'USER_';
+               }
+               $sql = "
+SELECT /*+ RULE */ distinct b.column_name
+   FROM {$ptab}CONSTRAINTS a
+         , {$ptab}CONS_COLUMNS b
+  WHERE ( UPPER(b.table_name) = ('$table'))
+       AND (UPPER(a.table_name) = ('$table') and a.constraint_type = 'P')
+       $owner_clause
+       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[] = reset($v);
+                       }
+                       return $a;
+               }
+               else return false;
+       }
+       
+       // http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
+       function MetaForeignKeys($table, $owner=false)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $table = $this->qstr(strtoupper($table));
+               if (!$owner) {
+                       $owner = $this->user;
+                       $tabp = 'user_';
+               } else
+                       $tabp = 'all_';
+                       
+               $owner = ' and owner='.$this->qstr(strtoupper($owner));
+               
+               $sql = 
+"select constraint_name,r_owner,r_constraint_name 
+       from {$tabp}constraints
+       where constraint_type = 'R' and table_name = $table $owner";
+               
+               $constraints =& $this->GetArray($sql);
+               $arr = false;
+               foreach($constraints as $constr) {
+                       $cons = $this->qstr($constr[0]);
+                       $rowner = $this->qstr($constr[1]);
+                       $rcons = $this->qstr($constr[2]);
+                       $cols = $this->GetArray("select column_name from 
{$tabp}cons_columns where constraint_name=$cons $owner order by position");
+                       $tabcol = $this->GetArray("select 
table_name,column_name from {$tabp}cons_columns where owner=$rowner and 
constraint_name=$rcons order by position");
+                       
+                       if ($cols && $tabcol) 
+                               for ($i=0, $max=sizeof($cols); $i < $max; $i++) 
{
+                                       $arr[$tabcol[$i][0]] = 
$cols[$i][0].'='.$tabcol[$i][1];
+                               }
+               }
+               $ADODB_FETCH_MODE = $save;
+               
+               return $arr;
+       }
+
+       
+       function CharMax()
+       {
+               return 4000;
+       }
+       
+       function TextMax()
+       {
+               return 4000;
+       }
+       
+       /**
+        * Quotes a string.
+        * 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 ($this->noNullStrings && strlen($s)==0)$s = ' ';
+               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);
+               
+               $s = str_replace('\\\\','\\',$s);
+               return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
+               
+       }
+       
+}
+
+/*--------------------------------------------------------------------------------------
+                Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oci8 extends ADORecordSet {
+
+       var $databaseType = 'oci8';
+       var $bind=false;
+       var $_fieldobjs;
+       
+       //var $_arr = false;
+               
+       function ADORecordset_oci8($queryID,$mode=false)
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               switch ($mode)
+               {
+               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;
+               case ADODB_FETCH_NUM: 
+               default:
+               $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; 
break;
+               }
+               
+               $this->adodbFetchMode = $mode;
+               $this->_queryID = $queryID;
+       }
+
+
+       function Init()
+       {
+               if ($this->_inited) return;
+               
+               $this->_inited = true;
+               if ($this->_queryID) {
+                       
+                       $this->_currentRow = 0;
+                       @$this->_initrs();
+                       $this->EOF = !$this->_fetch();
+                       
+                       /*
+                       // based on idea by Gaetano Giunta to detect unusual 
oracle errors
+                       // see 
http://phplens.com/lens/lensforum/msgs.php?id=6771
+                       $err = OCIError($this->_queryID);
+                       if ($err && $this->connection->debug) 
ADOConnection::outp($err);
+                       */
+                       
+                       if (!is_array($this->fields)) {
+                               $this->_numOfRows = 0;
+                               $this->fields = array();
+                       }
+               } else {
+                       $this->fields = array();
+                       $this->_numOfRows = 0;
+                       $this->_numOfFields = 0;
+                       $this->EOF = true;
+               }
+       }
+       
+       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);
+               }
+       }
+
+         /*            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 ($p != 0 && $sc == 0) $fld->type = 'INT';
+                       //echo " $this->name ($p.$sc) ";
+               }
+               return $fld;
+       }
+       
+       /* For some reason, OCIcolumnname fails when called after _initrs() so 
we cache it */
+       function &FetchField($fieldOffset = -1)
+       {
+               return $this->_fieldobjs[$fieldOffset];
+       }
+       
+       
+       /*
+       // 10% speedup to move MoveNext to child class
+       function _MoveNext() 
+       {
+       //global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return 
@adodb_movenext($this);
+               
+               if ($this->EOF) return false;
+               
+               $this->_currentRow++;
+               
if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
+                       return true;
+               $this->EOF = true;
+               
+               return false;
+       }       */
+       
+       
+       function MoveNext()
+       {
+               if 
(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+                       $this->_currentRow += 1;
+                       return true;
+               }
+               if (!$this->EOF) {
+                       $this->_currentRow += 1;
+                       $this->EOF = true;
+               }
+               return false;
+       }
+       
+       /*
+       # does not work as first record is retrieved in _initrs(), so is not 
included in GetArray()
+       function &GetArray($nRows = -1) 
+       {
+       global $ADODB_OCI8_GETARRAY;
+       
+               if (true ||  !empty($ADODB_OCI8_GETARRAY)) {
+                       # does not support $ADODB_ANSI_PADDING_OFF
+       
+                       //OCI_RETURN_NULLS and OCI_RETURN_LOBS is set by 
OCIfetchstatement
+                       switch($this->adodbFetchMode) {
+                       case ADODB_FETCH_NUM:
+                       
+                               $ncols = @OCIfetchstatement($this->_queryID, 
$results, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW+OCI_NUM);
+                               $results = 
array_merge(array($this->fields),$results);
+                               return $results;
+                               
+                       case ADODB_FETCH_ASSOC: 
+                               if (ADODB_ASSOC_CASE != 2 || 
$this->databaseType != 'oci8') break;
+                               
+                               $ncols = @OCIfetchstatement($this->_queryID, 
$assoc, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW);
+                               $results =& 
array_merge(array($this->fields),$assoc);
+                               return $results;
+                       
+                       default:
+                               break;
+                       }
+               }
+                       
+               $results =& ADORecordSet::GetArray($nRows);
+               return $results;
+               
+       } */
+       
+       /* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() 
*/
+       function &GetArrayLimit($nrows,$offset=-1) 
+       {
+               if ($offset <= 0) {
+                       $arr =& $this->GetArray($nrows);
+                       return $arr;
+               }
+               for ($i=1; $i < $offset; $i++) 
+                       if (address@hidden($this->_queryID)) return array();
+                       
+               if 
(address@hidden($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 _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() 
+       {
+               if ($this->connection->_stmt === $this->_queryID) 
$this->connection->_stmt = false;
+               if (!empty($this->_refcursor)) {
+                       OCIFreeCursor($this->_refcursor);
+                       $this->_refcursor = false;
+               }
+               @OCIFreeStatement($this->_queryID);
+               $this->_queryID = false;
+               
+       }
+
+       function MetaType($t,$len=-1)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               switch (strtoupper($t)) {
+               case 'VARCHAR':
+               case 'VARCHAR2':
+               case 'CHAR':
+               case 'VARBINARY':
+               case 'BINARY':
+               case 'NCHAR':
+               case 'NVARCHAR':
+               case 'NVARCHAR2':
+                                if (isset($this) && $len <= $this->blobSize) 
return 'C';
+               
+               case 'NCLOB':
+               case 'LONG':
+               case 'LONG VARCHAR':
+               case 'CLOB':
+               return 'X';
+               
+               case 'LONG RAW':
+               case 'LONG VARBINARY':
+               case 'BLOB':
+                       return 'B';
+               
+               case 'DATE': 
+                       return  ($this->connection->datetime) ? 'T' : 'D';
+               
+               
+               case 'TIMESTAMP': return 'T';
+               
+               case 'INT': 
+               case 'SMALLINT':
+               case 'INTEGER': 
+                       return 'I';
+                       
+               default: return 'N';
+               }
+       }
+}
+
+class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {        
+       function ADORecordSet_ext_oci8($queryID,$mode=false) 
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               switch ($mode)
+               {
+               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;
+               case ADODB_FETCH_NUM: 
+               default: $this->fetchMode = 
OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+               }
+               $this->adodbFetchMode = $mode;
+               $this->_queryID = $queryID;
+       }
+       
+       function MoveNext()
+       {
+               return adodb_movenext($this);
+       }
+}
+?>
Index: phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php:1.2 Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php     Tue Feb 21 13:47:42 2006
@@ -1,59 +1,59 @@
-<?php
-/** 
- * @version V4.54 5 Nov 2004 (c) 2000-2004 John Lim (address@hidden). 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 8.0.5 driver
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
-
-class ADODB_oci805 extends ADODB_oci8 {
-       var $databaseType = "oci805";   
-       var $connectSID = true;
-       
-       function ADODB_oci805() 
-       {
-               $this->ADODB_oci8();
-       }
-       
-       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
-       {
-               // seems that oracle only supports 1 hint comment in 8i
-               if (strpos($sql,'/*+') !== false)
-                       $sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
-               else
-                       $sql = preg_replace('/^[ \t\n]*select/i','SELECT 
/*+FIRST_ROWS*/',$sql);
-               
-               /* 
-                       The following is only available from 8.1.5 because 
order by in inline views not 
-                       available before then...
-                       http://www.jlcomp.demon.co.uk/faq/top_sql.html
-               if ($nrows > 0) {       
-                       if ($offset > 0) $nrows += $offset;
-                       $sql = "select * from ($sql) where rownum <= $nrows";
-                       $nrows = -1;
-               }
-               */
-
-               return 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-       }
-}
-
-class ADORecordset_oci805 extends ADORecordset_oci8 {  
-       var $databaseType = "oci805";
-       function ADORecordset_oci805($id,$mode=false)
-       {
-               $this->ADORecordset_oci8($id,$mode);
-       }
-}
+<?php
+/** 
+ * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). 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 8.0.5 driver
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
+
+class ADODB_oci805 extends ADODB_oci8 {
+       var $databaseType = "oci805";   
+       var $connectSID = true;
+       
+       function ADODB_oci805() 
+       {
+               $this->ADODB_oci8();
+       }
+       
+       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
+       {
+               // seems that oracle only supports 1 hint comment in 8i
+               if (strpos($sql,'/*+') !== false)
+                       $sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
+               else
+                       $sql = preg_replace('/^[ \t\n]*select/i','SELECT 
/*+FIRST_ROWS*/',$sql);
+               
+               /* 
+                       The following is only available from 8.1.5 because 
order by in inline views not 
+                       available before then...
+                       http://www.jlcomp.demon.co.uk/faq/top_sql.html
+               if ($nrows > 0) {       
+                       if ($offset > 0) $nrows += $offset;
+                       $sql = "select * from ($sql) where rownum <= $nrows";
+                       $nrows = -1;
+               }
+               */
+
+               return 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+       }
+}
+
+class ADORecordset_oci805 extends ADORecordset_oci8 {  
+       var $databaseType = "oci805";
+       function ADORecordset_oci805($id,$mode=false)
+       {
+               $this->ADORecordset_oci8($id,$mode);
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php:1.2 Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php     Tue Feb 21 13:47:42 2006
@@ -1,209 +1,217 @@
-<?php
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 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://adodb.sourceforge.net
-  
-  Portable version of oci8 driver, to make it more similar to other database 
drivers.
-  The main differences are
-
-   1. that the OCI_ASSOC names are in lowercase instead of uppercase.
-   2. bind variables are mapped using ? instead of :<bindvar>
-
-   Should some emulation of RecordCount() be implemented?
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
-
-class ADODB_oci8po extends ADODB_oci8 {
-       var $databaseType = 'oci8po';
-       var $dataProvider = 'oci8';
-       var $metaColumnsSQL = "select lower(cname),coltype,width, SCALE, 
PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; 
//changed by address@hidden net
-       var $metaTablesSQL = "select lower(table_name),table_type from cat 
where table_type in ('TABLE','VIEW')";
-       
-       function ADODB_oci8po()
-       {
-               $this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-               # oci8po does not support adodb extension: adodb_movenext()
-       }
-       
-       function Param($name)
-       {
-               return '?';
-       }
-       
-       function Prepare($sql,$cursor=false)
-       {
-               $sqlarr = explode('?',$sql);
-               $sql = $sqlarr[0];
-               for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
-                       $sql .=  ':'.($i-1) . $sqlarr[$i];
-               } 
-               return ADODB_oci8::Prepare($sql,$cursor);
-       }
-       
-       // emulate handling of parameters ? ?, replacing with :bind0 :bind1
-       function _query($sql,$inputarr)
-       {
-               if (is_array($inputarr)) {
-                       $i = 0;
-                       if (is_array($sql)) {
-                               foreach($inputarr as $v) {
-                                       $arr['bind'.$i++] = $v;
-                               } 
-                       } else {
-                               $sqlarr = explode('?',$sql);
-                               $sql = $sqlarr[0];
-                               foreach($inputarr as $k => $v) {
-                                       $sql .=  ":$k" . $sqlarr[++$i];
-                               }
-                       }
-               }
-               return ADODB_oci8::_query($sql,$inputarr);
-       }
-}
-
-/*--------------------------------------------------------------------------------------
-                Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oci8po extends ADORecordset_oci8 {
-
-       var $databaseType = 'oci8po';
-       
-       function ADORecordset_oci8po($queryID,$mode=false)
-       {
-               $this->ADORecordset_oci8($queryID,$mode);
-       }
-
-       function Fields($colname)
-       {
-               if ($this->fetchMode & OCI_ASSOC) return 
$this->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)]];
-       }
-       
-       // lowercase field names...
-       function &_FetchField($fieldOffset = -1)
-       {
-                $fld = new ADOFieldObject;
-                $fieldOffset += 1;
-                $fld->name = strtolower(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;
-       }
-       /*
-       function MoveNext()
-       {
-               if 
(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-                       $this->_currentRow += 1;
-                       return true;
-               }
-               if (!$this->EOF) {
-                       $this->_currentRow += 1;
-                       $this->EOF = true;
-               }
-               return false;
-       }*/
-
-       // 10% speedup to move MoveNext to child class
-       function MoveNext() 
-       {
-               
if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-               global $ADODB_ANSI_PADDING_OFF;
-                       $this->_currentRow++;
-                       
-                       if ($this->fetchMode & OCI_ASSOC) 
$this->_updatefields();
-                       if (!empty($ADODB_ANSI_PADDING_OFF)) {
-                               foreach($this->fields as $k => $v) {
-                                       if (is_string($v)) $this->fields[$k] = 
rtrim($v);
-                               }
-                       }
-                       return true;
-               }
-               if (!$this->EOF) {
-                       $this->EOF = true;
-                       $this->_currentRow++;
-               }
-               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 (address@hidden($this->_queryID)) return array();
-                       
-               if 
(address@hidden($this->_queryID,$this->fields,$this->fetchMode)) return array();
-               if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-               $results = array();
-               $cnt = 0;
-               while (!$this->EOF && $nrows != $cnt) {
-                       $results[$cnt++] = $this->fields;
-                       $this->MoveNext();
-               }
-               
-               return $results;
-       }
-
-       // Create associative array
-       function _updatefields()
-       {
-               if (ADODB_ASSOC_CASE == 2) return; // native
-       
-               $arr = array();
-               $lowercase = (ADODB_ASSOC_CASE == 0);
-               
-               foreach($this->fields as $k => $v) {
-                       if (is_integer($k)) $arr[$k] = $v;
-                       else {
-                               if ($lowercase)
-                                       $arr[strtolower($k)] = $v;
-                               else
-                                       $arr[strtoupper($k)] = $v;
-                       }
-               }
-               $this->fields = $arr;
-       }
-       
-       function _fetch() 
-       {
-               $ret = 
@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
-               if ($ret) {
-               global $ADODB_ANSI_PADDING_OFF;
-       
-                               if ($this->fetchMode & OCI_ASSOC) 
$this->_updatefields();
-                               if (!empty($ADODB_ANSI_PADDING_OFF)) {
-                                       foreach($this->fields as $k => $v) {
-                                               if (is_string($v)) 
$this->fields[$k] = rtrim($v);
-                                       }
-                               }
-               }
-               return $ret;
-       }
-       
-}
-
-
+<?php
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 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://adodb.sourceforge.net
+  
+  Portable version of oci8 driver, to make it more similar to other database 
drivers.
+  The main differences are
+
+   1. that the OCI_ASSOC names are in lowercase instead of uppercase.
+   2. bind variables are mapped using ? instead of :<bindvar>
+
+   Should some emulation of RecordCount() be implemented?
+  
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
+
+class ADODB_oci8po extends ADODB_oci8 {
+       var $databaseType = 'oci8po';
+       var $dataProvider = 'oci8';
+       var $metaColumnsSQL = "select lower(cname),coltype,width, SCALE, 
PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; 
//changed by address@hidden net
+       var $metaTablesSQL = "select lower(table_name),table_type from cat 
where table_type in ('TABLE','VIEW')";
+       
+       function ADODB_oci8po()
+       {
+               $this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
+               # oci8po does not support adodb extension: adodb_movenext()
+       }
+       
+       function Param($name)
+       {
+               return '?';
+       }
+       
+       function Prepare($sql,$cursor=false)
+       {
+               $sqlarr = explode('?',$sql);
+               $sql = $sqlarr[0];
+               for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
+                       $sql .=  ':'.($i-1) . $sqlarr[$i];
+               } 
+               return ADODB_oci8::Prepare($sql,$cursor);
+       }
+       
+       // emulate handling of parameters ? ?, replacing with :bind0 :bind1
+       function _query($sql,$inputarr)
+       {
+               if (is_array($inputarr)) {
+                       $i = 0;
+                       if (is_array($sql)) {
+                               foreach($inputarr as $v) {
+                                       $arr['bind'.$i++] = $v;
+                               } 
+                       } else {
+                               $sqlarr = explode('?',$sql);
+                               $sql = $sqlarr[0];
+                               foreach($inputarr as $k => $v) {
+                                       $sql .=  ":$k" . $sqlarr[++$i];
+                               }
+                       }
+               }
+               return ADODB_oci8::_query($sql,$inputarr);
+       }
+}
+
+/*--------------------------------------------------------------------------------------
+                Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oci8po extends ADORecordset_oci8 {
+
+       var $databaseType = 'oci8po';
+       
+       function ADORecordset_oci8po($queryID,$mode=false)
+       {
+               $this->ADORecordset_oci8($queryID,$mode);
+       }
+
+       function Fields($colname)
+       {
+               if ($this->fetchMode & OCI_ASSOC) return 
$this->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)]];
+       }
+       
+       // lowercase field names...
+       function &_FetchField($fieldOffset = -1)
+       {
+                $fld = new ADOFieldObject;
+                $fieldOffset += 1;
+                $fld->name = strtolower(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;
+       }
+       /*
+       function MoveNext()
+       {
+               if 
(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+                       $this->_currentRow += 1;
+                       return true;
+               }
+               if (!$this->EOF) {
+                       $this->_currentRow += 1;
+                       $this->EOF = true;
+               }
+               return false;
+       }*/
+
+       // 10% speedup to move MoveNext to child class
+       function MoveNext() 
+       {
+               
if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+               global $ADODB_ANSI_PADDING_OFF;
+                       $this->_currentRow++;
+                       
+                       if ($this->fetchMode & OCI_ASSOC) 
$this->_updatefields();
+                       if (!empty($ADODB_ANSI_PADDING_OFF)) {
+                               foreach($this->fields as $k => $v) {
+                                       if (is_string($v)) $this->fields[$k] = 
rtrim($v);
+                               }
+                       }
+                       return true;
+               }
+               if (!$this->EOF) {
+                       $this->EOF = true;
+                       $this->_currentRow++;
+               }
+               return false;
+       }       
+       
+       /* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() 
*/
+       function &GetArrayLimit($nrows,$offset=-1) 
+       {
+               if ($offset <= 0) {
+                       $arr = $this->GetArray($nrows);
+                       return $arr;
+               }
+               for ($i=1; $i < $offset; $i++) 
+                       if (address@hidden($this->_queryID)) {
+                               $arr = array();
+                               return $arr;
+                       }
+               if 
(address@hidden($this->_queryID,$this->fields,$this->fetchMode)) {
+                       $arr = array();
+                       return $arr;
+               }
+               if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
+               $results = array();
+               $cnt = 0;
+               while (!$this->EOF && $nrows != $cnt) {
+                       $results[$cnt++] = $this->fields;
+                       $this->MoveNext();
+               }
+               
+               return $results;
+       }
+
+       // Create associative array
+       function _updatefields()
+       {
+               if (ADODB_ASSOC_CASE == 2) return; // native
+       
+               $arr = array();
+               $lowercase = (ADODB_ASSOC_CASE == 0);
+               
+               foreach($this->fields as $k => $v) {
+                       if (is_integer($k)) $arr[$k] = $v;
+                       else {
+                               if ($lowercase)
+                                       $arr[strtolower($k)] = $v;
+                               else
+                                       $arr[strtoupper($k)] = $v;
+                       }
+               }
+               $this->fields = $arr;
+       }
+       
+       function _fetch() 
+       {
+               $ret = 
@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
+               if ($ret) {
+               global $ADODB_ANSI_PADDING_OFF;
+       
+                               if ($this->fetchMode & OCI_ASSOC) 
$this->_updatefields();
+                               if (!empty($ADODB_ANSI_PADDING_OFF)) {
+                                       foreach($this->fields as $k => $v) {
+                                               if (is_string($v)) 
$this->fields[$k] = rtrim($v);
+                                       }
+                               }
+               }
+               return $ret;
+       }
+       
+}
+
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,738 +1,738 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 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://adodb.sourceforge.net
-  
-  Requires ODBC. Works on Windows and Unix.
-*/
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-  define("_ADODB_ODBC_LAYER", 2 );
-        
-/*--------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------*/
-
-
-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 $useFetchArray = false; // setting this to true will make array 
elements in FETCH_ASSOC mode case-sensitive
-                                                               // breaking 
backward-compat
-       //var $longreadlen = 8000; // default number of chars to return for a 
Blob/Long field
-       var $_bindInputArray = false;   
-       var $curmode = SQL_CUR_USE_DRIVER; // See sqlext.h, SQL_CUR_DEFAULT == 
SQL_CUR_USE_DRIVER == 2L
-       var $_genSeqSQL = "create table %s (id integer)";
-       var $_autocommit = true;
-       var $_haserrorfunctions = true;
-       var $_has_stupid_odbc_fetch_api_change = true;
-       var $_lastAffectedRows = 0;
-       var $uCaseTables = true; // for meta* functions, uppercase table names
-       
-       function ADODB_odbc() 
-       {       
-               $this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
-               $this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 
0x4200;
-       }
-       
-               // returns true or false
-       function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
-       {
-       global $php_errormsg;
-               
-               if (!function_exists('odbc_connect')) return null;
-               
-               if ($this->debug && $argDatabasename && $this->databaseType != 
'vfp') {
-                       ADOConnection::outp("For odbc Connect(), 
$argDatabasename is not used. Place dsn in 1st parameter.");
-               }
-               if (isset($php_errormsg)) $php_errormsg = '';
-               if ($this->curmode === false) $this->_connectionID = 
odbc_connect($argDSN,$argUsername,$argPassword);
-               else $this->_connectionID = 
odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
-               $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-               if (isset($this->connectStmt)) 
$this->Execute($this->connectStmt);
-               
-               return $this->_connectionID != false;
-       }
-       
-       // returns true or false
-       function _pconnect($argDSN, $argUsername, $argPassword, 
$argDatabasename)
-       {
-       global $php_errormsg;
-       
-               if (!function_exists('odbc_connect')) return null;
-               
-               if (isset($php_errormsg)) $php_errormsg = '';
-               $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-               if ($this->debug && $argDatabasename) {
-                       ADOConnection::outp("For odbc PConnect(), 
$argDatabasename is not used. Place dsn in 1st parameter.");
-               }
-       //      print "dsn=$argDSN u=$argUsername p=$argPassword<br>"; flush();
-               if ($this->curmode === false) $this->_connectionID = 
odbc_connect($argDSN,$argUsername,$argPassword);
-               else $this->_connectionID = 
odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
-               
-               $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-               if ($this->_connectionID && $this->autoRollback) 
@odbc_rollback($this->_connectionID);
-               if (isset($this->connectStmt)) 
$this->Execute($this->connectStmt);
-               
-               return $this->_connectionID != false;
-       }
-
-       
-       function ServerInfo()
-       {
-       
-               if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
-                       $dsn = strtoupper($this->host);
-                       $first = true;
-                       $found = false;
-                       
-                       if (!function_exists('odbc_data_source')) return false;
-                       
-                       while(true) {
-                               
-                               $rez = @odbc_data_source($this->_connectionID,
-                                       $first ? SQL_FETCH_FIRST : 
SQL_FETCH_NEXT);
-                               $first = false;
-                               if (!is_array($rez)) break;
-                               if (strtoupper($rez['server']) == $dsn) {
-                                       $found = true;
-                                       break;
-                               }
-                       } 
-                       if (!$found) return ADOConnection::ServerInfo();
-                       if (!isset($rez['version'])) $rez['version'] = '';
-                       return $rez;
-               } else {
-                       return ADOConnection::ServerInfo();
-               }
-       }
-
-       
-       function CreateSequence($seqname='adodbseq',$start=1)
-       {
-               if (empty($this->_genSeqSQL)) return false;
-               $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-               if (!$ok) return false;
-               $start -= 1;
-               return $this->Execute("insert into $seqname values($start)");
-       }
-       
-       var $_dropSeqSQL = 'drop table %s';
-       function DropSequence($seqname)
-       {
-               if (empty($this->_dropSeqSQL)) return false;
-               return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-       }
-       
-       /*
-               This algorithm is not very efficient, but works even if table 
locking
-               is not available.
-               
-               Will return false if unable to generate an ID after $MAXLOOPS 
attempts.
-       */
-       function GenID($seq='adodbseq',$start=1)
-       {       
-               // if you have to modify the parameter below, your database is 
overloaded,
-               // or you need to implement generation of id's yourself!
-               $MAXLOOPS = 100;
-               //$this->debug=1;
-               while (--$MAXLOOPS>=0) {
-                       $num = $this->GetOne("select id from $seq");
-                       if ($num === false) {
-                               $this->Execute(sprintf($this->_genSeqSQL 
,$seq));       
-                               $start -= 1;
-                               $num = '0';
-                               $ok = $this->Execute("insert into $seq 
values($start)");
-                               if (!$ok) return false;
-                       } 
-                       $this->Execute("update $seq set id=id+1 where id=$num");
-                       
-                       if ($this->affected_rows() > 0) {
-                               $num += 1;
-                               $this->genID = $num;
-                               return $num;
-                       }
-               }
-               if ($fn = $this->raiseErrorFn) {
-                       $fn($this->databaseType,'GENID',-32000,"Unable to 
generate unique id after $MAXLOOPS attempts",$seq,$num);
-               }
-               return false;
-       }
-
-
-       function ErrorMsg()
-       {
-               if ($this->_haserrorfunctions) {
-                       if ($this->_errorMsg !== false) return $this->_errorMsg;
-                       if (empty($this->_connectionID)) return 
@odbc_errormsg();
-                       return @odbc_errormsg($this->_connectionID);
-               } else return ADOConnection::ErrorMsg();
-       }
-       
-       function ErrorNo()
-       {
-               
-               if ($this->_haserrorfunctions) {
-                       if ($this->_errorCode !== false) {
-                               // bug in 4.0.6, error number can be corrupted 
string (should be 6 digits)
-                               return (strlen($this->_errorCode)<=2) ? 0 : 
$this->_errorCode;
-                       }
-
-                       if (empty($this->_connectionID)) $e = @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();
-       }
-       
-       
-
-       function BeginTrans()
-       {       
-               if (!$this->hasTransactions) return false;
-               if ($this->transOff) return true; 
-               $this->transCnt += 1;
-               $this->_autocommit = false;
-               return odbc_autocommit($this->_connectionID,false);
-       }
-       
-       function CommitTrans($ok=true) 
-       { 
-               if ($this->transOff) return true; 
-               if (!$ok) return $this->RollbackTrans();
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->_autocommit = true;
-               $ret = odbc_commit($this->_connectionID);
-               odbc_autocommit($this->_connectionID,true);
-               return $ret;
-       }
-       
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true; 
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->_autocommit = true;
-               $ret = odbc_rollback($this->_connectionID);
-               odbc_autocommit($this->_connectionID,true);
-               return $ret;
-       }
-       
-       function MetaPrimaryKeys($table)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               if ($this->uCaseTables) $table = strtoupper($table);
-               $schema = '';
-               $this->_findschema($table,$schema);
-
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $qid = 
@odbc_primarykeys($this->_connectionID,'',$schema,$table);
-               
-               if (!$qid) {
-                       $ADODB_FETCH_MODE = $savem;
-                       return false;
-               }
-               $rs = new ADORecordSet_odbc($qid);
-               $ADODB_FETCH_MODE = $savem;
-               
-               if (!$rs) return false;
-               $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
-               
-               $arr =& $rs->GetArray();
-               $rs->Close();
-               //print_r($arr);
-               $arr2 = array();
-               for ($i=0; $i < sizeof($arr); $i++) {
-                       if ($arr[$i][3]) $arr2[] = $arr[$i][3];
-               }
-               return $arr2;
-       }
-       
-       
-       
-       function &MetaTables($ttype=false)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $qid = odbc_tables($this->_connectionID);
-               
-               $rs = new ADORecordSet_odbc($qid);
-               
-               $ADODB_FETCH_MODE = $savem;
-               if (!$rs) {
-                       $false = false;
-                       return $false;
-               }
-               $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
-               
-               $arr =& $rs->GetArray();
-               //print_r($arr);
-               
-               $rs->Close();
-               $arr2 = array();
-               
-               if ($ttype) {
-                       $isview = strncmp($ttype,'V',1) === 0;
-               }
-               for ($i=0; $i < sizeof($arr); $i++) {
-                       if (!$arr[$i][2]) continue;
-                       $type = $arr[$i][3];
-                       if ($ttype) { 
-                               if ($isview) {
-                                       if (strncmp($type,'V',1) === 0) $arr2[] 
= $arr[$i][2];
-                               } else if (strncmp($type,'SYS',3) !== 0) 
$arr2[] = $arr[$i][2];
-                       } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = 
$arr[$i][2];
-               }
-               return $arr2;
-       }
-       
-/*
-See 
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
-/ 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
-
-#define SQL_UNICODE                             (-95)
-#define SQL_UNICODE_VARCHAR                     (-96)
-#define SQL_UNICODE_LONGVARCHAR                 (-97)
-*/
-       function ODBCTypes($t)
-       {
-               switch ((integer)$t) {
-               case 1: 
-               case 12:
-               case 0:
-               case -95:
-               case -96:
-                       return 'C';
-               case -97:
-               case -1: //text
-                       return 'X';
-               case -4: //image
-                       return 'B';
-                               
-               case 9: 
-               case 91:
-                       return 'D';
-               
-               case 10:
-               case 11:
-               case 92:
-               case 93:
-                       return 'T';
-                       
-               case 4:
-               case 5:
-               case -6:
-                       return 'I';
-                       
-               case -11: // uniqidentifier
-                       return 'R';
-               case -7: //bit
-                       return 'L';
-               
-               default:
-                       return 'N';
-               }
-       }
-       
-       function &MetaColumns($table)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $false = false;
-               if ($this->uCaseTables) $table = strtoupper($table);
-               $schema = '';
-               $this->_findschema($table,$schema);
-               
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       
-               /*if (false) { // after testing, confirmed that the following 
does not work becoz of a bug
-                       $qid2 = odbc_tables($this->_connectionID);
-                       $rs = new ADORecordSet_odbc($qid2);             
-                       $ADODB_FETCH_MODE = $savem;
-                       if (!$rs) return false;
-                       $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
-                       $rs->_fetch();
-                       
-                       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),'%');
-               } */
-               
-               switch ($this->databaseType) {
-               case 'access':
-               case 'vfp':
-                       $qid = 
odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
-                       break;
-               
-               
-               case 'db2':
-            $colname = "%";
-            $qid = odbc_columns($this->_connectionID, "", $schema, $table, 
$colname);
-            break;
-                       
-               default:
-                       $qid = 
@odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
-                       if (empty($qid)) $qid = 
odbc_columns($this->_connectionID);
-                       break;
-               }
-               if (empty($qid)) return $false;
-               
-               $rs =& new ADORecordSet_odbc($qid);
-               $ADODB_FETCH_MODE = $savem;
-               
-               if (!$rs) return $false;
-               $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
-               $rs->_fetch();
-               
-               $retarr = array();
-               
-               /*
-               $rs->fields indices
-               0 TABLE_QUALIFIER
-               1 TABLE_SCHEM
-               2 TABLE_NAME
-               3 COLUMN_NAME
-               4 DATA_TYPE
-               5 TYPE_NAME
-               6 PRECISION
-               7 LENGTH
-               8 SCALE
-               9 RADIX
-               10 NULLABLE
-               11 REMARKS
-               */
-               while (!$rs->EOF) {
-               //      adodb_pr($rs->fields);
-                       if (strtoupper(trim($rs->fields[2])) == $table && 
(!$schema || strtoupper($rs->fields[1]) == $schema)) {
-                               $fld = new ADOFieldObject();
-                               $fld->name = $rs->fields[3];
-                               $fld->type = $this->ODBCTypes($rs->fields[4]);
-                               
-                               // ref: 
http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
-                               // access uses precision to store length for 
char/varchar
-                               if ($fld->type == 'C' or $fld->type == 'X') {
-                                       if ($this->databaseType == 'access') 
-                                               $fld->max_length = 
$rs->fields[6];
-                                       else if ($rs->fields[4] <= -95) // 
UNICODE
-                                               $fld->max_length = 
$rs->fields[7]/2;
-                                       else
-                                               $fld->max_length = 
$rs->fields[7];
-                               } else 
-                                       $fld->max_length = $rs->fields[7];
-                               $fld->not_null = !empty($rs->fields[10]);
-                               $fld->scale = $rs->fields[8];
-                               $retarr[strtoupper($fld->name)] = $fld; 
-                       } else if (sizeof($retarr)>0)
-                               break;
-                       $rs->MoveNext();
-               }
-               $rs->Close(); //-- crashes 4.03pl1 -- why?
-               
-               return empty($retarr) ? $false : $retarr;
-       }
-       
-       function Prepare($sql)
-       {
-               if (! $this->_bindInputArray) return $sql; // no binding
-               $stmt = odbc_prepare($this->_connectionID,$sql);
-               if (!$stmt) {
-                       // we don't know whether odbc driver is parsing 
prepared stmts, so just return sql
-                       return $sql;
-               }
-               return array($sql,$stmt,false);
-       }
-
-       /* returns queryID or false */
-       function _query($sql,$inputarr=false) 
-       {
-       GLOBAL $php_errormsg;
-               if (isset($php_errormsg)) $php_errormsg = '';
-               $this->_error = '';
-               
-               if ($inputarr) {
-                       if (is_array($sql)) {
-                               $stmtid = $sql[1];
-                       } else {
-                               $stmtid = 
odbc_prepare($this->_connectionID,$sql);
-       
-                               if ($stmtid == false) {
-                                       $this->_errorMsg = isset($php_errormsg) 
? $php_errormsg : '';
-                                       return false;
-                               }
-                       }
-                       
-                       if (! odbc_execute($stmtid,$inputarr)) {
-                               //@odbc_free_result($stmtid);
-                               if ($this->_haserrorfunctions) {
-                                       $this->_errorMsg = odbc_errormsg();
-                                       $this->_errorCode = odbc_error();
-                               }
-                               return false;
-                       }
-               
-               } else if (is_array($sql)) {
-                       $stmtid = $sql[1];
-                       if (!odbc_execute($stmtid)) {
-                               //@odbc_free_result($stmtid);
-                               if ($this->_haserrorfunctions) {
-                                       $this->_errorMsg = odbc_errormsg();
-                                       $this->_errorCode = odbc_error();
-                               }
-                               return false;
-                       }
-               } else
-                       $stmtid = odbc_exec($this->_connectionID,$sql);
-               
-               $this->_lastAffectedRows = 0;
-               if ($stmtid) {
-                       if (@odbc_num_fields($stmtid) == 0) {
-                               $this->_lastAffectedRows = 
odbc_num_rows($stmtid);
-                               $stmtid = true;
-                       } else {
-                               $this->_lastAffectedRows = 0;
-                               odbc_binmode($stmtid,$this->binmode);
-                               odbc_longreadlen($stmtid,$this->maxblobsize);
-                       }
-                       
-                       if ($this->_haserrorfunctions) {
-                               $this->_errorMsg = '';
-                               $this->_errorCode = 0;
-                       } else
-                               $this->_errorMsg = isset($php_errormsg) ? 
$php_errormsg : '';
-               } else {
-                       if ($this->_haserrorfunctions) {
-                               $this->_errorMsg = odbc_errormsg();
-                               $this->_errorCode = odbc_error();
-                       } else
-                               $this->_errorMsg = isset($php_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()
-       {
-               $ret = @odbc_close($this->_connectionID);
-               $this->_connectionID = false;
-               return $ret;
-       }
-
-       function _affectedrows()
-       {
-               return $this->_lastAffectedRows;
-       }
-       
-}
-       
-/*--------------------------------------------------------------------------------------
-        Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_odbc extends ADORecordSet { 
-       
-       var $bind = false;
-       var $databaseType = "odbc";             
-       var $dataProvider = "odbc";
-       var $useFetchArray;
-       var $_has_stupid_odbc_fetch_api_change;
-       
-       function ADORecordSet_odbc($id,$mode=false)
-       {
-               if ($mode === false) {  
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               $this->fetchMode = $mode;
-               
-               $this->_queryID = $id;
-               
-               // the following is required for mysql odbc driver in 4.3.1 -- 
why?
-               $this->EOF = false;
-               $this->_currentRow = -1;
-               //$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);
-               if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-               else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-               return $o;
-       }
-       
-       /* Use associative array to get fields array */
-       function Fields($colname)
-       {
-               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->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()
-       {
-       global $ADODB_COUNTRECS;
-               $this->_numOfRows = ($ADODB_COUNTRECS) ? 
@odbc_num_rows($this->_queryID) : -1;
-               $this->_numOfFields = @odbc_num_fields($this->_queryID);
-               // some silly drivers such as db2 as/400 and intersystems cache 
return _numOfRows = 0
-               if ($this->_numOfRows == 0) $this->_numOfRows = -1;
-               //$this->useFetchArray = $this->connection->useFetchArray;
-               $this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 
0x4200;
-       }       
-       
-       function _seek($row)
-       {
-               return false;
-       }
-       
-       // speed up SelectLimit() by switching to ADODB_FETCH_NUM as 
ADODB_FETCH_ASSOC is emulated
-       function &GetArrayLimit($nrows,$offset=-1) 
-       {
-               if ($offset <= 0) {
-                       $rs =& $this->GetArray($nrows);
-                       return $rs;
-               }
-               $savem = $this->fetchMode;
-               $this->fetchMode = ADODB_FETCH_NUM;
-               $this->Move($offset);
-               $this->fetchMode = $savem;
-               
-               if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-                       $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-               }
-               
-               $results = array();
-               $cnt = 0;
-               while (!$this->EOF && $nrows != $cnt) {
-                       $results[$cnt++] = $this->fields;
-                       $this->MoveNext();
-               }
-               
-               return $results;
-       }
-       
-       
-       function MoveNext() 
-       {
-               if ($this->_numOfRows != 0 && !$this->EOF) {            
-                       $this->_currentRow++;
-                       
-                       if ($this->_has_stupid_odbc_fetch_api_change)
-                               $rez = 
@odbc_fetch_into($this->_queryID,$this->fields);
-                       else {
-                               $row = 0;
-                               $rez = 
@odbc_fetch_into($this->_queryID,$row,$this->fields);
-                       }
-                       if ($rez) {
-                               if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-                                       $this->fields =& 
$this->GetRowAssoc(ADODB_ASSOC_CASE);
-                               }
-                               return true;
-                       }
-               }
-               $this->fields = false;
-               $this->EOF = true;
-               return false;
-       }       
-       
-       function _fetch()
-       {
-               
-               if ($this->_has_stupid_odbc_fetch_api_change)
-                       $rez = 
@odbc_fetch_into($this->_queryID,$this->fields,$row);
-               else {
-                       $row = 0;
-                       $rez = 
@odbc_fetch_into($this->_queryID,$row,$this->fields);
-               }
-               if ($rez) {
-                       if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-                               $this->fields =& 
$this->GetRowAssoc(ADODB_ASSOC_CASE);
-                       }
-                       return true;
-               }
-               $this->fields = false;
-               return false;
-       }
-       
-       function _close() 
-       {
-               return @odbc_free_result($this->_queryID);              
-       }
-
-}
-
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Requires ODBC. Works on Windows and Unix.
+*/
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+  define("_ADODB_ODBC_LAYER", 2 );
+        
+/*--------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------*/
+
+
+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 $useFetchArray = false; // setting this to true will make array 
elements in FETCH_ASSOC mode case-sensitive
+                                                               // breaking 
backward-compat
+       //var $longreadlen = 8000; // default number of chars to return for a 
Blob/Long field
+       var $_bindInputArray = false;   
+       var $curmode = SQL_CUR_USE_DRIVER; // See sqlext.h, SQL_CUR_DEFAULT == 
SQL_CUR_USE_DRIVER == 2L
+       var $_genSeqSQL = "create table %s (id integer)";
+       var $_autocommit = true;
+       var $_haserrorfunctions = true;
+       var $_has_stupid_odbc_fetch_api_change = true;
+       var $_lastAffectedRows = 0;
+       var $uCaseTables = true; // for meta* functions, uppercase table names
+       
+       function ADODB_odbc() 
+       {       
+               $this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
+               $this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 
0x4200;
+       }
+       
+               // returns true or false
+       function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+       {
+       global $php_errormsg;
+               
+               if (!function_exists('odbc_connect')) return null;
+               
+               if ($this->debug && $argDatabasename && $this->databaseType != 
'vfp') {
+                       ADOConnection::outp("For odbc Connect(), 
$argDatabasename is not used. Place dsn in 1st parameter.");
+               }
+               if (isset($php_errormsg)) $php_errormsg = '';
+               if ($this->curmode === false) $this->_connectionID = 
odbc_connect($argDSN,$argUsername,$argPassword);
+               else $this->_connectionID = 
odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
+               $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+               if (isset($this->connectStmt)) 
$this->Execute($this->connectStmt);
+               
+               return $this->_connectionID != false;
+       }
+       
+       // returns true or false
+       function _pconnect($argDSN, $argUsername, $argPassword, 
$argDatabasename)
+       {
+       global $php_errormsg;
+       
+               if (!function_exists('odbc_connect')) return null;
+               
+               if (isset($php_errormsg)) $php_errormsg = '';
+               $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+               if ($this->debug && $argDatabasename) {
+                       ADOConnection::outp("For odbc PConnect(), 
$argDatabasename is not used. Place dsn in 1st parameter.");
+               }
+       //      print "dsn=$argDSN u=$argUsername p=$argPassword<br>"; flush();
+               if ($this->curmode === false) $this->_connectionID = 
odbc_connect($argDSN,$argUsername,$argPassword);
+               else $this->_connectionID = 
odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
+               
+               $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+               if ($this->_connectionID && $this->autoRollback) 
@odbc_rollback($this->_connectionID);
+               if (isset($this->connectStmt)) 
$this->Execute($this->connectStmt);
+               
+               return $this->_connectionID != false;
+       }
+
+       
+       function ServerInfo()
+       {
+       
+               if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
+                       $dsn = strtoupper($this->host);
+                       $first = true;
+                       $found = false;
+                       
+                       if (!function_exists('odbc_data_source')) return false;
+                       
+                       while(true) {
+                               
+                               $rez = @odbc_data_source($this->_connectionID,
+                                       $first ? SQL_FETCH_FIRST : 
SQL_FETCH_NEXT);
+                               $first = false;
+                               if (!is_array($rez)) break;
+                               if (strtoupper($rez['server']) == $dsn) {
+                                       $found = true;
+                                       break;
+                               }
+                       } 
+                       if (!$found) return ADOConnection::ServerInfo();
+                       if (!isset($rez['version'])) $rez['version'] = '';
+                       return $rez;
+               } else {
+                       return ADOConnection::ServerInfo();
+               }
+       }
+
+       
+       function CreateSequence($seqname='adodbseq',$start=1)
+       {
+               if (empty($this->_genSeqSQL)) return false;
+               $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+               if (!$ok) return false;
+               $start -= 1;
+               return $this->Execute("insert into $seqname values($start)");
+       }
+       
+       var $_dropSeqSQL = 'drop table %s';
+       function DropSequence($seqname)
+       {
+               if (empty($this->_dropSeqSQL)) return false;
+               return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+       }
+       
+       /*
+               This algorithm is not very efficient, but works even if table 
locking
+               is not available.
+               
+               Will return false if unable to generate an ID after $MAXLOOPS 
attempts.
+       */
+       function GenID($seq='adodbseq',$start=1)
+       {       
+               // if you have to modify the parameter below, your database is 
overloaded,
+               // or you need to implement generation of id's yourself!
+               $MAXLOOPS = 100;
+               //$this->debug=1;
+               while (--$MAXLOOPS>=0) {
+                       $num = $this->GetOne("select id from $seq");
+                       if ($num === false) {
+                               $this->Execute(sprintf($this->_genSeqSQL 
,$seq));       
+                               $start -= 1;
+                               $num = '0';
+                               $ok = $this->Execute("insert into $seq 
values($start)");
+                               if (!$ok) return false;
+                       } 
+                       $this->Execute("update $seq set id=id+1 where id=$num");
+                       
+                       if ($this->affected_rows() > 0) {
+                               $num += 1;
+                               $this->genID = $num;
+                               return $num;
+                       }
+               }
+               if ($fn = $this->raiseErrorFn) {
+                       $fn($this->databaseType,'GENID',-32000,"Unable to 
generate unique id after $MAXLOOPS attempts",$seq,$num);
+               }
+               return false;
+       }
+
+
+       function ErrorMsg()
+       {
+               if ($this->_haserrorfunctions) {
+                       if ($this->_errorMsg !== false) return $this->_errorMsg;
+                       if (empty($this->_connectionID)) return 
@odbc_errormsg();
+                       return @odbc_errormsg($this->_connectionID);
+               } else return ADOConnection::ErrorMsg();
+       }
+       
+       function ErrorNo()
+       {
+               
+               if ($this->_haserrorfunctions) {
+                       if ($this->_errorCode !== false) {
+                               // bug in 4.0.6, error number can be corrupted 
string (should be 6 digits)
+                               return (strlen($this->_errorCode)<=2) ? 0 : 
$this->_errorCode;
+                       }
+
+                       if (empty($this->_connectionID)) $e = @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();
+       }
+       
+       
+
+       function BeginTrans()
+       {       
+               if (!$this->hasTransactions) return false;
+               if ($this->transOff) return true; 
+               $this->transCnt += 1;
+               $this->_autocommit = false;
+               return odbc_autocommit($this->_connectionID,false);
+       }
+       
+       function CommitTrans($ok=true) 
+       { 
+               if ($this->transOff) return true; 
+               if (!$ok) return $this->RollbackTrans();
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->_autocommit = true;
+               $ret = odbc_commit($this->_connectionID);
+               odbc_autocommit($this->_connectionID,true);
+               return $ret;
+       }
+       
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true; 
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->_autocommit = true;
+               $ret = odbc_rollback($this->_connectionID);
+               odbc_autocommit($this->_connectionID,true);
+               return $ret;
+       }
+       
+       function MetaPrimaryKeys($table)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               if ($this->uCaseTables) $table = strtoupper($table);
+               $schema = '';
+               $this->_findschema($table,$schema);
+
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $qid = 
@odbc_primarykeys($this->_connectionID,'',$schema,$table);
+               
+               if (!$qid) {
+                       $ADODB_FETCH_MODE = $savem;
+                       return false;
+               }
+               $rs = new ADORecordSet_odbc($qid);
+               $ADODB_FETCH_MODE = $savem;
+               
+               if (!$rs) return false;
+               $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
+               
+               $arr =& $rs->GetArray();
+               $rs->Close();
+               //print_r($arr);
+               $arr2 = array();
+               for ($i=0; $i < sizeof($arr); $i++) {
+                       if ($arr[$i][3]) $arr2[] = $arr[$i][3];
+               }
+               return $arr2;
+       }
+       
+       
+       
+       function &MetaTables($ttype=false)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $qid = odbc_tables($this->_connectionID);
+               
+               $rs = new ADORecordSet_odbc($qid);
+               
+               $ADODB_FETCH_MODE = $savem;
+               if (!$rs) {
+                       $false = false;
+                       return $false;
+               }
+               $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
+               
+               $arr =& $rs->GetArray();
+               //print_r($arr);
+               
+               $rs->Close();
+               $arr2 = array();
+               
+               if ($ttype) {
+                       $isview = strncmp($ttype,'V',1) === 0;
+               }
+               for ($i=0; $i < sizeof($arr); $i++) {
+                       if (!$arr[$i][2]) continue;
+                       $type = $arr[$i][3];
+                       if ($ttype) { 
+                               if ($isview) {
+                                       if (strncmp($type,'V',1) === 0) $arr2[] 
= $arr[$i][2];
+                               } else if (strncmp($type,'SYS',3) !== 0) 
$arr2[] = $arr[$i][2];
+                       } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = 
$arr[$i][2];
+               }
+               return $arr2;
+       }
+       
+/*
+See 
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
+/ 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
+
+#define SQL_UNICODE                             (-95)
+#define SQL_UNICODE_VARCHAR                     (-96)
+#define SQL_UNICODE_LONGVARCHAR                 (-97)
+*/
+       function ODBCTypes($t)
+       {
+               switch ((integer)$t) {
+               case 1: 
+               case 12:
+               case 0:
+               case -95:
+               case -96:
+                       return 'C';
+               case -97:
+               case -1: //text
+                       return 'X';
+               case -4: //image
+                       return 'B';
+                               
+               case 9: 
+               case 91:
+                       return 'D';
+               
+               case 10:
+               case 11:
+               case 92:
+               case 93:
+                       return 'T';
+                       
+               case 4:
+               case 5:
+               case -6:
+                       return 'I';
+                       
+               case -11: // uniqidentifier
+                       return 'R';
+               case -7: //bit
+                       return 'L';
+               
+               default:
+                       return 'N';
+               }
+       }
+       
+       function &MetaColumns($table)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $false = false;
+               if ($this->uCaseTables) $table = strtoupper($table);
+               $schema = '';
+               $this->_findschema($table,$schema);
+               
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       
+               /*if (false) { // after testing, confirmed that the following 
does not work becoz of a bug
+                       $qid2 = odbc_tables($this->_connectionID);
+                       $rs = new ADORecordSet_odbc($qid2);             
+                       $ADODB_FETCH_MODE = $savem;
+                       if (!$rs) return false;
+                       $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
+                       $rs->_fetch();
+                       
+                       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),'%');
+               } */
+               
+               switch ($this->databaseType) {
+               case 'access':
+               case 'vfp':
+                       $qid = 
odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
+                       break;
+               
+               
+               case 'db2':
+            $colname = "%";
+            $qid = odbc_columns($this->_connectionID, "", $schema, $table, 
$colname);
+            break;
+                       
+               default:
+                       $qid = 
@odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
+                       if (empty($qid)) $qid = 
odbc_columns($this->_connectionID);
+                       break;
+               }
+               if (empty($qid)) return $false;
+               
+               $rs =& new ADORecordSet_odbc($qid);
+               $ADODB_FETCH_MODE = $savem;
+               
+               if (!$rs) return $false;
+               $rs->_has_stupid_odbc_fetch_api_change = 
$this->_has_stupid_odbc_fetch_api_change;
+               $rs->_fetch();
+               
+               $retarr = array();
+               
+               /*
+               $rs->fields indices
+               0 TABLE_QUALIFIER
+               1 TABLE_SCHEM
+               2 TABLE_NAME
+               3 COLUMN_NAME
+               4 DATA_TYPE
+               5 TYPE_NAME
+               6 PRECISION
+               7 LENGTH
+               8 SCALE
+               9 RADIX
+               10 NULLABLE
+               11 REMARKS
+               */
+               while (!$rs->EOF) {
+               //      adodb_pr($rs->fields);
+                       if (strtoupper(trim($rs->fields[2])) == $table && 
(!$schema || strtoupper($rs->fields[1]) == $schema)) {
+                               $fld = new ADOFieldObject();
+                               $fld->name = $rs->fields[3];
+                               $fld->type = $this->ODBCTypes($rs->fields[4]);
+                               
+                               // ref: 
http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
+                               // access uses precision to store length for 
char/varchar
+                               if ($fld->type == 'C' or $fld->type == 'X') {
+                                       if ($this->databaseType == 'access') 
+                                               $fld->max_length = 
$rs->fields[6];
+                                       else if ($rs->fields[4] <= -95) // 
UNICODE
+                                               $fld->max_length = 
$rs->fields[7]/2;
+                                       else
+                                               $fld->max_length = 
$rs->fields[7];
+                               } else 
+                                       $fld->max_length = $rs->fields[7];
+                               $fld->not_null = !empty($rs->fields[10]);
+                               $fld->scale = $rs->fields[8];
+                               $retarr[strtoupper($fld->name)] = $fld; 
+                       } else if (sizeof($retarr)>0)
+                               break;
+                       $rs->MoveNext();
+               }
+               $rs->Close(); //-- crashes 4.03pl1 -- why?
+               
+               if (empty($retarr)) $retarr = false;
+               return $retarr;
+       }
+       
+       function Prepare($sql)
+       {
+               if (! $this->_bindInputArray) return $sql; // no binding
+               $stmt = odbc_prepare($this->_connectionID,$sql);
+               if (!$stmt) {
+                       // we don't know whether odbc driver is parsing 
prepared stmts, so just return sql
+                       return $sql;
+               }
+               return array($sql,$stmt,false);
+       }
+
+       /* returns queryID or false */
+       function _query($sql,$inputarr=false) 
+       {
+       GLOBAL $php_errormsg;
+               if (isset($php_errormsg)) $php_errormsg = '';
+               $this->_error = '';
+               
+               if ($inputarr) {
+                       if (is_array($sql)) {
+                               $stmtid = $sql[1];
+                       } else {
+                               $stmtid = 
odbc_prepare($this->_connectionID,$sql);
+       
+                               if ($stmtid == false) {
+                                       $this->_errorMsg = isset($php_errormsg) 
? $php_errormsg : '';
+                                       return false;
+                               }
+                       }
+                       
+                       if (! odbc_execute($stmtid,$inputarr)) {
+                               //@odbc_free_result($stmtid);
+                               if ($this->_haserrorfunctions) {
+                                       $this->_errorMsg = odbc_errormsg();
+                                       $this->_errorCode = odbc_error();
+                               }
+                               return false;
+                       }
+               
+               } else if (is_array($sql)) {
+                       $stmtid = $sql[1];
+                       if (!odbc_execute($stmtid)) {
+                               //@odbc_free_result($stmtid);
+                               if ($this->_haserrorfunctions) {
+                                       $this->_errorMsg = odbc_errormsg();
+                                       $this->_errorCode = odbc_error();
+                               }
+                               return false;
+                       }
+               } else
+                       $stmtid = odbc_exec($this->_connectionID,$sql);
+               
+               $this->_lastAffectedRows = 0;
+               if ($stmtid) {
+                       if (@odbc_num_fields($stmtid) == 0) {
+                               $this->_lastAffectedRows = 
odbc_num_rows($stmtid);
+                               $stmtid = true;
+                       } else {
+                               $this->_lastAffectedRows = 0;
+                               odbc_binmode($stmtid,$this->binmode);
+                               odbc_longreadlen($stmtid,$this->maxblobsize);
+                       }
+                       
+                       if ($this->_haserrorfunctions) {
+                               $this->_errorMsg = '';
+                               $this->_errorCode = 0;
+                       } else
+                               $this->_errorMsg = isset($php_errormsg) ? 
$php_errormsg : '';
+               } else {
+                       if ($this->_haserrorfunctions) {
+                               $this->_errorMsg = odbc_errormsg();
+                               $this->_errorCode = odbc_error();
+                       } else
+                               $this->_errorMsg = isset($php_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()
+       {
+               $ret = @odbc_close($this->_connectionID);
+               $this->_connectionID = false;
+               return $ret;
+       }
+
+       function _affectedrows()
+       {
+               return $this->_lastAffectedRows;
+       }
+       
+}
+       
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_odbc extends ADORecordSet { 
+       
+       var $bind = false;
+       var $databaseType = "odbc";             
+       var $dataProvider = "odbc";
+       var $useFetchArray;
+       var $_has_stupid_odbc_fetch_api_change;
+       
+       function ADORecordSet_odbc($id,$mode=false)
+       {
+               if ($mode === false) {  
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               $this->fetchMode = $mode;
+               
+               $this->_queryID = $id;
+               
+               // the following is required for mysql odbc driver in 4.3.1 -- 
why?
+               $this->EOF = false;
+               $this->_currentRow = -1;
+               //$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);
+               if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+               else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+               return $o;
+       }
+       
+       /* Use associative array to get fields array */
+       function Fields($colname)
+       {
+               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->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()
+       {
+       global $ADODB_COUNTRECS;
+               $this->_numOfRows = ($ADODB_COUNTRECS) ? 
@odbc_num_rows($this->_queryID) : -1;
+               $this->_numOfFields = @odbc_num_fields($this->_queryID);
+               // some silly drivers such as db2 as/400 and intersystems cache 
return _numOfRows = 0
+               if ($this->_numOfRows == 0) $this->_numOfRows = -1;
+               //$this->useFetchArray = $this->connection->useFetchArray;
+               $this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 
0x4200;
+       }       
+       
+       function _seek($row)
+       {
+               return false;
+       }
+       
+       // speed up SelectLimit() by switching to ADODB_FETCH_NUM as 
ADODB_FETCH_ASSOC is emulated
+       function &GetArrayLimit($nrows,$offset=-1) 
+       {
+               if ($offset <= 0) {
+                       $rs =& $this->GetArray($nrows);
+                       return $rs;
+               }
+               $savem = $this->fetchMode;
+               $this->fetchMode = ADODB_FETCH_NUM;
+               $this->Move($offset);
+               $this->fetchMode = $savem;
+               
+               if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+                       $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+               }
+               
+               $results = array();
+               $cnt = 0;
+               while (!$this->EOF && $nrows != $cnt) {
+                       $results[$cnt++] = $this->fields;
+                       $this->MoveNext();
+               }
+               
+               return $results;
+       }
+       
+       
+       function MoveNext() 
+       {
+               if ($this->_numOfRows != 0 && !$this->EOF) {            
+                       $this->_currentRow++;
+                       
+                       if ($this->_has_stupid_odbc_fetch_api_change)
+                               $rez = 
@odbc_fetch_into($this->_queryID,$this->fields);
+                       else {
+                               $row = 0;
+                               $rez = 
@odbc_fetch_into($this->_queryID,$row,$this->fields);
+                       }
+                       if ($rez) {
+                               if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+                                       $this->fields =& 
$this->GetRowAssoc(ADODB_ASSOC_CASE);
+                               }
+                               return true;
+                       }
+               }
+               $this->fields = false;
+               $this->EOF = true;
+               return false;
+       }       
+       
+       function _fetch()
+       {
+
+               if ($this->_has_stupid_odbc_fetch_api_change)
+                       $rez = @odbc_fetch_into($this->_queryID,$this->fields);
+               else {
+                       $row = 0;
+                       $rez = 
@odbc_fetch_into($this->_queryID,$row,$this->fields);
+               }
+               if ($rez) {
+                       if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+                               $this->fields =& 
$this->GetRowAssoc(ADODB_ASSOC_CASE);
+                       }
+                       return true;
+               }
+               $this->fields = false;
+               return false;
+       }
+       
+       function _close() 
+       {
+               return @odbc_free_result($this->_queryID);              
+       }
+
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php:1.2     Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php Tue Feb 21 13:47:42 2006
@@ -1,252 +1,254 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  MSSQL support via ODBC. Requires ODBC. Works on Windows and Unix. 
-  For Unix configuration, see 
http://phpbuilder.com/columns/alberto20000919.php3
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-       include(ADODB_DIR."/drivers/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 $metaTablesSQL="select name,case when type='U' then 'T' else 'V' 
end 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 = 'top';            // support mssql/interbase SELECT TOP 
10 * FROM TABLE
-       var $sysDate = 'GetDate()';
-       var $sysTimeStamp = 'GetDate()';
-       var $leftOuter = '*=';
-       var $rightOuter = '=*';
-       var $substr = 'substring';
-       var $length = 'len';
-       var $ansiOuter = true; // for mssql7 or later
-       var $identitySQL = 'select @@IDENTITY'; // 'select SCOPE_IDENTITY'; # 
for mssql 2000
-       var $hasInsertID = true;
-       var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET 
CONCAT_NULL_YIELDS_NULL is ON, 
-                                                                               
                                  # concatenating a null value with a string 
yields a NULL result
-       
-       function ADODB_odbc_mssql()
-       {
-               $this->ADODB_odbc();
-               $this->curmode = SQL_CUR_USE_ODBC;      
-       }
-
-       // crashes php...
-       function ServerInfo()
-       {
-       global $ADODB_FETCH_MODE;
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $row = $this->GetRow("execute sp_server_info 2");
-               $ADODB_FETCH_MODE = $save;
-               if (!is_array($row)) return false;
-               $arr['description'] = $row[2];
-               $arr['version'] = ADOConnection::_findvers($arr['description']);
-               return $arr;
-       }
-
-       function IfNull( $field, $ifNull ) 
-       {
-               return " ISNULL($field, $ifNull) "; // if MS SQL Server
-       }
-       
-       function _insertid()
-       {
-       // SCOPE_IDENTITY()
-       // Returns the last IDENTITY value inserted into an IDENTITY column in 
-       // the same scope. A scope is a module -- a stored procedure, trigger, 
-       // function, or batch. Thus, two statements are in the same scope if 
-       // they are in the same stored procedure, function, or batch.
-                       return $this->GetOne($this->identitySQL);
-       }
-       
-       
-       function MetaForeignKeys($table, $owner=false, $upper=false)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $table = $this->qstr(strtoupper($table));
-               
-               $sql = 
-"select object_name(constid) as constraint_name,
-       col_name(fkeyid, fkey) as column_name,
-       object_name(rkeyid) as referenced_table_name,
-       col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where upper(object_name(fkeyid)) = $table
-order by constraint_name, referenced_table_name, keyno";
-               
-               $constraints =& $this->GetArray($sql);
-               
-               $ADODB_FETCH_MODE = $save;
-               
-               $arr = false;
-               foreach($constraints as $constr) {
-                       //print_r($constr);
-                       $arr[$constr[0]][$constr[2]][] = 
$constr[1].'='.$constr[3]; 
-               }
-               if (!$arr) return false;
-               
-               $arr2 = false;
-               
-               foreach($arr as $k => $v) {
-                       foreach($v as $a => $b) {
-                               if ($upper) $a = strtoupper($a);
-                               $arr2[$a] = $b;
-                       }
-               }
-               return $arr2;
-       }
-       
-       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-       {
-               if ($mask) {$this->debug=1;
-                       $save = $this->metaTablesSQL;
-                       $mask = $this->qstr($mask);
-                       $this->metaTablesSQL .= " AND name like $mask";
-               }
-               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
-               
-               if ($mask) {
-                       $this->metaTablesSQL = $save;
-               }
-               return $ret;
-       }
-       
-       function &MetaColumns($table)
-       {
-               return ADOConnection::MetaColumns($table);
-       }
-       
-       function _query($sql,$inputarr)
-       {
-               if (is_string($sql)) $sql = str_replace('||','+',$sql);
-               return ADODB_odbc::_query($sql,$inputarr);
-       }
-       
-       // "Stein-Aksel Basma" <address@hidden>
-       // tested with MSSQL 2000
-       function &MetaPrimaryKeys($table)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $schema = '';
-               $this->_findschema($table,$schema);
-               //if (!$schema) $schema = $this->database;
-               if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
-       
-               $sql = "select distinct k.column_name,ordinal_position from 
information_schema.key_column_usage k,
-               information_schema.table_constraints tc 
-               where tc.constraint_name = k.constraint_name and 
tc.constraint_type =
-               'PRIMARY KEY' and k.table_name = '$table' $schema order by 
ordinal_position ";
-               
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-               $a = $this->GetCol($sql);
-               $ADODB_FETCH_MODE = $savem;
-               
-               if ($a && sizeof($a)>0) return $a;
-               return false;     
-       }
-       
-       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
-       {
-               if ($nrows > 0 && $offset <= 0) {
-                       $sql = preg_replace(
-                               
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows 
",$sql);
-                       $rs =& $this->Execute($sql,$inputarr);
-               } else
-                       $rs =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-                       
-               return $rs;
-       }
-       
-       // Format date column in sql string given an input format that 
understands Y M D
-       function SQLDate($fmt, $col=false)
-       {       
-               if (!$col) $col = $this->sysTimeStamp;
-               $s = '';
-               
-               $len = strlen($fmt);
-               for ($i=0; $i < $len; $i++) {
-                       if ($s) $s .= '+';
-                       $ch = $fmt[$i];
-                       switch($ch) {
-                       case 'Y':
-                       case 'y':
-                               $s .= "datename(yyyy,$col)";
-                               break;
-                       case 'M':
-                               $s .= "convert(char(3),$col,0)";
-                               break;
-                       case 'm':
-                               $s .= "replace(str(month($col),2),' ','0')";
-                               break;
-                       case 'Q':
-                       case 'q':
-                               $s .= "datename(quarter,$col)";
-                               break;
-                       case 'D':
-                       case 'd':
-                               $s .= "replace(str(day($col),2),' ','0')";
-                               break;
-                       case 'h':
-                               $s .= 
"substring(convert(char(14),$col,0),13,2)";
-                               break;
-                       
-                       case 'H':
-                               $s .= "replace(str(datepart(hh,$col),2),' 
','0')";
-                               break;
-                               
-                       case 'i':
-                               $s .= "replace(str(datepart(mi,$col),2),' 
','0')";
-                               break;
-                       case 's':
-                               $s .= "replace(str(datepart(ss,$col),2),' 
','0')";
-                               break;
-                       case 'a':
-                       case 'A':
-                               $s .= 
"substring(convert(char(19),$col,0),18,2)";
-                               break;
-                               
-                       default:
-                               if ($ch == '\\') {
-                                       $i++;
-                                       $ch = substr($fmt,$i,1);
-                               }
-                               $s .= $this->qstr($ch);
-                               break;
-                       }
-               }
-               return $s;
-       }
-
-} 
- 
-class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {     
-       
-       var $databaseType = 'odbc_mssql';
-       
-       function ADORecordSet_odbc_mssql($id,$mode=false)
-       {
-               return $this->ADORecordSet_odbc($id,$mode);
-       }       
-}
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  MSSQL support via ODBC. Requires ODBC. Works on Windows and Unix. 
+  For Unix configuration, see 
http://phpbuilder.com/columns/alberto20000919.php3
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+       include(ADODB_DIR."/drivers/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:s'";
+       var $_bindInputArray = true;
+       var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' 
end 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 = 'top';            // support mssql/interbase SELECT TOP 
10 * FROM TABLE
+       var $sysDate = 'GetDate()';
+       var $sysTimeStamp = 'GetDate()';
+       var $leftOuter = '*=';
+       var $rightOuter = '=*';
+       var $substr = 'substring';
+       var $length = 'len';
+       var $ansiOuter = true; // for mssql7 or later
+       var $identitySQL = 'select @@IDENTITY'; // 'select SCOPE_IDENTITY'; # 
for mssql 2000
+       var $hasInsertID = true;
+       var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET 
CONCAT_NULL_YIELDS_NULL is ON, 
+                                                                               
                                  # concatenating a null value with a string 
yields a NULL result
+       
+       function ADODB_odbc_mssql()
+       {
+               $this->ADODB_odbc();
+               //$this->curmode = SQL_CUR_USE_ODBC;    
+       }
+
+       // crashes php...
+       function ServerInfo()
+       {
+       global $ADODB_FETCH_MODE;
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $row = $this->GetRow("execute sp_server_info 2");
+               $ADODB_FETCH_MODE = $save;
+               if (!is_array($row)) return false;
+               $arr['description'] = $row[2];
+               $arr['version'] = ADOConnection::_findvers($arr['description']);
+               return $arr;
+       }
+
+       function IfNull( $field, $ifNull ) 
+       {
+               return " ISNULL($field, $ifNull) "; // if MS SQL Server
+       }
+       
+       function _insertid()
+       {
+       // SCOPE_IDENTITY()
+       // Returns the last IDENTITY value inserted into an IDENTITY column in 
+       // the same scope. A scope is a module -- a stored procedure, trigger, 
+       // function, or batch. Thus, two statements are in the same scope if 
+       // they are in the same stored procedure, function, or batch.
+                       return $this->GetOne($this->identitySQL);
+       }
+       
+       
+       function MetaForeignKeys($table, $owner=false, $upper=false)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $table = $this->qstr(strtoupper($table));
+               
+               $sql = 
+"select object_name(constid) as constraint_name,
+       col_name(fkeyid, fkey) as column_name,
+       object_name(rkeyid) as referenced_table_name,
+       col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where upper(object_name(fkeyid)) = $table
+order by constraint_name, referenced_table_name, keyno";
+               
+               $constraints =& $this->GetArray($sql);
+               
+               $ADODB_FETCH_MODE = $save;
+               
+               $arr = false;
+               foreach($constraints as $constr) {
+                       //print_r($constr);
+                       $arr[$constr[0]][$constr[2]][] = 
$constr[1].'='.$constr[3]; 
+               }
+               if (!$arr) return false;
+               
+               $arr2 = false;
+               
+               foreach($arr as $k => $v) {
+                       foreach($v as $a => $b) {
+                               if ($upper) $a = strtoupper($a);
+                               $arr2[$a] = $b;
+                       }
+               }
+               return $arr2;
+       }
+       
+       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+       {
+               if ($mask) {$this->debug=1;
+                       $save = $this->metaTablesSQL;
+                       $mask = $this->qstr($mask);
+                       $this->metaTablesSQL .= " AND name like $mask";
+               }
+               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
+               
+               if ($mask) {
+                       $this->metaTablesSQL = $save;
+               }
+               return $ret;
+       }
+       
+       function &MetaColumns($table)
+       {
+               $arr = ADOConnection::MetaColumns($table);
+               return $arr;
+       }
+       
+       function _query($sql,$inputarr)
+       {
+               if (is_string($sql)) $sql = str_replace('||','+',$sql);
+               return ADODB_odbc::_query($sql,$inputarr);
+       }
+       
+       // "Stein-Aksel Basma" <address@hidden>
+       // tested with MSSQL 2000
+       function &MetaPrimaryKeys($table)
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $schema = '';
+               $this->_findschema($table,$schema);
+               //if (!$schema) $schema = $this->database;
+               if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+       
+               $sql = "select distinct k.column_name,ordinal_position from 
information_schema.key_column_usage k,
+               information_schema.table_constraints tc 
+               where tc.constraint_name = k.constraint_name and 
tc.constraint_type =
+               'PRIMARY KEY' and k.table_name = '$table' $schema order by 
ordinal_position ";
+               
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+               $a = $this->GetCol($sql);
+               $ADODB_FETCH_MODE = $savem;
+               
+               if ($a && sizeof($a)>0) return $a;
+               $false = false;
+               return $false;    
+       }
+       
+       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
+       {
+               if ($nrows > 0 && $offset <= 0) {
+                       $sql = preg_replace(
+                               
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows 
",$sql);
+                       $rs =& $this->Execute($sql,$inputarr);
+               } else
+                       $rs =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+                       
+               return $rs;
+       }
+       
+       // Format date column in sql string given an input format that 
understands Y M D
+       function SQLDate($fmt, $col=false)
+       {       
+               if (!$col) $col = $this->sysTimeStamp;
+               $s = '';
+               
+               $len = strlen($fmt);
+               for ($i=0; $i < $len; $i++) {
+                       if ($s) $s .= '+';
+                       $ch = $fmt[$i];
+                       switch($ch) {
+                       case 'Y':
+                       case 'y':
+                               $s .= "datename(yyyy,$col)";
+                               break;
+                       case 'M':
+                               $s .= "convert(char(3),$col,0)";
+                               break;
+                       case 'm':
+                               $s .= "replace(str(month($col),2),' ','0')";
+                               break;
+                       case 'Q':
+                       case 'q':
+                               $s .= "datename(quarter,$col)";
+                               break;
+                       case 'D':
+                       case 'd':
+                               $s .= "replace(str(day($col),2),' ','0')";
+                               break;
+                       case 'h':
+                               $s .= 
"substring(convert(char(14),$col,0),13,2)";
+                               break;
+                       
+                       case 'H':
+                               $s .= "replace(str(datepart(hh,$col),2),' 
','0')";
+                               break;
+                               
+                       case 'i':
+                               $s .= "replace(str(datepart(mi,$col),2),' 
','0')";
+                               break;
+                       case 's':
+                               $s .= "replace(str(datepart(ss,$col),2),' 
','0')";
+                               break;
+                       case 'a':
+                       case 'A':
+                               $s .= 
"substring(convert(char(19),$col,0),18,2)";
+                               break;
+                               
+                       default:
+                               if ($ch == '\\') {
+                                       $i++;
+                                       $ch = substr($fmt,$i,1);
+                               }
+                               $s .= $this->qstr($ch);
+                               break;
+                       }
+               }
+               return $s;
+       }
+
+} 
+ 
+class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {     
+       
+       var $databaseType = 'odbc_mssql';
+       
+       function ADORecordSet_odbc_mssql($id,$mode=false)
+       {
+               return $this->ADORecordSet_odbc($id,$mode);
+       }       
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php:1.2    Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php        Tue Feb 21 
13:47:42 2006
@@ -1,114 +1,115 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Oracle support via ODBC. Requires ODBC. Works on Windows. 
-*/
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-       include(ADODB_DIR."/drivers/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 $sysDate = "TRUNC(SYSDATE)";
-       var $sysTimeStamp = 'SYSDATE';
-       
-       //var $_bindInputArray = false;
-       
-       function ADODB_odbc_oracle()
-       {
-               $this->ADODB_odbc();
-       }
-               
-       function &MetaTables() 
-       {
-               $false = false;
-               $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;
-       }
-       
-       function &MetaColumns($table) 
-       {
-               
-               $rs = 
$this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-               if ($rs === false) {    
-                       $false = 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];
-                       
-                       
-                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = 
$fld;     
-                       else $retarr[strtoupper($fld->name)] = $fld;
-                       
-                       $rs->MoveNext();
-               }
-               $rs->Close();
-               return $retarr; 
-       }
-
-       // 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,$mode=false)
-       {
-               return $this->ADORecordSet_odbc($id,$mode);
-       }
-}
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Oracle support via ODBC. Requires ODBC. Works on Windows. 
+*/
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+       include(ADODB_DIR."/drivers/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 $sysDate = "TRUNC(SYSDATE)";
+       var $sysTimeStamp = 'SYSDATE';
+       
+       //var $_bindInputArray = false;
+       
+       function ADODB_odbc_oracle()
+       {
+               $this->ADODB_odbc();
+       }
+               
+       function &MetaTables() 
+       {
+               $false = false;
+               $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;
+       }
+       
+       function &MetaColumns($table) 
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $rs = 
$this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+               if ($rs === false) {    
+                       $false = 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];
+                       
+                       
+                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = 
$fld;     
+                       else $retarr[strtoupper($fld->name)] = $fld;
+                       
+                       $rs->MoveNext();
+               }
+               $rs->Close();
+               return $retarr; 
+       }
+
+       // 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,$mode=false)
+       {
+               return $this->ADORecordSet_odbc($id,$mode);
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php:1.2  Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php      Tue Feb 21 13:47:42 2006
@@ -1,727 +1,732 @@
-<?php
-/*
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-  Latest version is available at http://adodb.sourceforge.net
-*/
-// Code contributed by "stefan bogdan" <sbogdan#rsb.ro>
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-define("_ADODB_ODBTP_LAYER", 2 );
-
-class ADODB_odbtp extends ADOConnection{
-       var $databaseType = "odbtp";
-       var $dataProvider = "odbtp";
-       var $fmtDate = "'Y-m-d'";
-       var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
-       var $replaceQuote = "''"; // string to use to replace quotes
-       var $odbc_driver = 0;
-       var $hasAffectedRows = true;
-       var $hasInsertID = false;
-       var $hasGenID = true;
-       var $hasMoveFirst = true;
-
-       var $_genSeqSQL = "create table %s (seq_name char(30) not null unique , 
seq_value integer not null)";
-       var $_dropSeqSQL = "delete from adodb_seq where seq_name = '%s'";
-       var $_bindInputArray = false;
-       var $_useUnicodeSQL = false;
-       var $_canPrepareSP = false;
-       var $_dontPoolDBC = true;
-
-       function ADODB_odbtp()
-       {
-       }
-
-       function ServerInfo()
-       {
-               return array('description' => @odbtp_get_attr( 
ODB_ATTR_DBMSNAME, $this->_connectionID),
-                            'version' => @odbtp_get_attr( ODB_ATTR_DBMSVER, 
$this->_connectionID));
-       }
-
-       function ErrorMsg()
-       {
-               if (empty($this->_connectionID)) return @odbtp_last_error();
-               return @odbtp_last_error($this->_connectionID);
-       }
-
-       function ErrorNo()
-       {
-               if (empty($this->_connectionID)) return 
@odbtp_last_error_state();
-                       return @odbtp_last_error_state($this->_connectionID);
-       }
-
-       function _insertid()
-       {
-       // SCOPE_IDENTITY()
-       // Returns the last IDENTITY value inserted into an IDENTITY column in
-       // the same scope. A scope is a module -- a stored procedure, trigger,
-       // function, or batch. Thus, two statements are in the same scope if
-       // they are in the same stored procedure, function, or batch.
-                       return $this->GetOne($this->identitySQL);
-       }
-
-       function _affectedrows()
-       {
-               if ($this->_queryID) {
-                       return @odbtp_affected_rows ($this->_queryID);
-          } else
-               return 0;
-       }
-
-       function CreateSequence($seqname='adodbseq',$start=1)
-       {
-               //verify existence
-               $num = $this->GetOne("select seq_value from adodb_seq");
-               $seqtab='adodb_seq';
-               if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
-                       $path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, 
$this->_connectionID );
-                       //if using vfp dbc file
-                       if( !strcasecmp(strrchr($path, '.'), '.dbc') )
-                $path = substr($path,0,strrpos($path,'\/'));
-               $seqtab = $path . '/' . $seqtab;
-        }
-               if($num == false) {
-                       if (empty($this->_genSeqSQL)) return false;
-                       $ok = $this->Execute(sprintf($this->_genSeqSQL 
,$seqtab));
-               }
-               $num = $this->GetOne("select seq_value from adodb_seq where 
seq_name='$seqname'");
-               if ($num) {
-                       return false;
-               }
-               $start -= 1;
-               return $this->Execute("insert into adodb_seq 
values('$seqname',$start)");
-       }
-
-       function DropSequence($seqname)
-       {
-               if (empty($this->_dropSeqSQL)) return false;
-               return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-       }
-
-       function GenID($seq='adodbseq',$start=1)
-       {
-               $seqtab='adodb_seq';
-               if( $this->odbc_driver == ODB_DRIVER_FOXPRO) {
-                       $path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, 
$this->_connectionID );
-                       //if using vfp dbc file
-                       if( !strcasecmp(strrchr($path, '.'), '.dbc') )
-                $path = substr($path,0,strrpos($path,'\/'));
-               $seqtab = $path . '/' . $seqtab;
-        }
-               $MAXLOOPS = 100;
-               while (--$MAXLOOPS>=0) {
-                       $num = $this->GetOne("select seq_value from adodb_seq 
where seq_name='$seq'");
-                       if ($num === false) {
-                               //verify if abodb_seq table exist
-                               $ok = $this->GetOne("select seq_value from 
adodb_seq ");
-                               if(!$ok) {
-                                       //creating the sequence table adodb_seq
-                                       
$this->Execute(sprintf($this->_genSeqSQL ,$seqtab));
-                               }
-                               $start -= 1;
-                               $num = '0';
-                               $ok = $this->Execute("insert into adodb_seq 
values('$seq',$start)");
-                               if (!$ok) return false;
-                       }
-                       $ok = $this->Execute("update adodb_seq set 
seq_value=seq_value+1 where seq_name='$seq'");
-                       if($ok) {
-                               $num += 1;
-                               $this->genID = $num;
-                               return $num;
-                       }
-               }
-       if ($fn = $this->raiseErrorFn) {
-               $fn($this->databaseType,'GENID',-32000,"Unable to generate 
unique id after $MAXLOOPS attempts",$seq,$num);
-       }
-               return false;
-       }
-
-       //example for $UserOrDSN
-       //for visual fox : DRIVER={Microsoft Visual FoxPro 
Driver};SOURCETYPE=DBF;SOURCEDB=c:\YourDbfFileDir;EXCLUSIVE=NO;
-       //for visual fox dbc: DRIVER={Microsoft Visual FoxPro 
Driver};SOURCETYPE=DBC;SOURCEDB=c:\YourDbcFileDir\mydb.dbc;EXCLUSIVE=NO;
-       //for access : DRIVER={Microsoft Access Driver 
(*.mdb)};DBQ=c:\path_to_access_db\base_test.mdb;UID=root;PWD=;
-       //for mssql : DRIVER={SQL 
Server};SERVER=myserver;UID=myuid;PWD=mypwd;DATABASE=OdbtpTest;
-       //if uid & pwd can be separate
-    function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', 
$argDatabase='')
-       {
-               $this->_connectionID = 
@odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
-               if ($this->_connectionID === false) {
-                       $this->_errorMsg = $this->ErrorMsg() ;
-                       return false;
-               }
-               if ($this->_dontPoolDBC) {
-                       if (function_exists('odbtp_dont_pool_dbc'))
-                               @odbtp_dont_pool_dbc($this->_connectionID);
-               }
-               else {
-                       $this->_dontPoolDBC = true;
-               }
-               $this->odbc_driver = @odbtp_get_attr(ODB_ATTR_DRIVER, 
$this->_connectionID);
-               $dbms = strtolower(@odbtp_get_attr(ODB_ATTR_DBMSNAME, 
$this->_connectionID));
-               $this->odbc_name = $dbms;
-               
-               // Account for inconsistent DBMS names
-               if( $this->odbc_driver == ODB_DRIVER_ORACLE )
-                       $dbms = 'oracle';
-               else if( $this->odbc_driver == ODB_DRIVER_SYBASE )
-                       $dbms = 'sybase';
-
-               // Set DBMS specific attributes
-               switch( $dbms ) {
-                       case 'microsoft sql server':
-                               $this->databaseType = 'odbtp_mssql';
-                               $this->fmtDate = "'Y-m-d'";
-                               $this->fmtTimeStamp = "'Y-m-d h:i:sA'";
-                               $this->sysDate = 
'convert(datetime,convert(char,GetDate(),102),102)';
-                               $this->sysTimeStamp = 'GetDate()';
-                               $this->ansiOuter = true;
-                               $this->leftOuter = '*=';
-                               $this->rightOuter = '=*';
-                $this->hasTop = 'top';
-                               $this->hasInsertID = true;
-                               $this->hasTransactions = true;
-                               $this->_bindInputArray = true;
-                               $this->_canSelectDb = true;
-                               $this->substr = "substring";
-                               $this->length = 'len';
-                               $this->identitySQL = 'select @@IDENTITY';
-                               $this->metaDatabasesSQL = "select name from 
master..sysdatabases where name <> 'master'";
-                               $this->_canPrepareSP = true;
-                               break;
-                       case 'access':
-                               $this->databaseType = 'odbtp_access';
-                               $this->fmtDate = "#Y-m-d#";
-                               $this->fmtTimeStamp = "#Y-m-d h:i:sA#";
-                               $this->sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
-                               $this->sysTimeStamp = 'NOW';
-                $this->hasTop = 'top';
-                               $this->hasTransactions = false;
-                               $this->_canPrepareSP = true;  // For MS Access 
only.
-                               break;
-                       case 'visual foxpro':
-                               $this->databaseType = 'odbtp_vfp';
-                               $this->fmtDate = "{^Y-m-d}";
-                               $this->fmtTimeStamp = "{^Y-m-d, h:i:sA}";
-                               $this->sysDate = 'date()';
-                               $this->sysTimeStamp = 'datetime()';
-                               $this->ansiOuter = true;
-                $this->hasTop = 'top';
-                               $this->hasTransactions = false;
-                               $this->replaceQuote = "'+chr(39)+'";
-                               $this->true = '.T.';
-                               $this->false = '.F.';
-                               break;
-                       case 'oracle':
-                               $this->databaseType = 'odbtp_oci8';
-                               $this->fmtDate = "'Y-m-d 00:00:00'";
-                               $this->fmtTimeStamp = "'Y-m-d h:i:sA'";
-                               $this->sysDate = 'TRUNC(SYSDATE)';
-                               $this->sysTimeStamp = 'SYSDATE';
-                               $this->hasTransactions = true;
-                               $this->_bindInputArray = true;
-                               $this->concat_operator = '||';
-                               break;
-                       case 'sybase':
-                               $this->databaseType = 'odbtp_sybase';
-                               $this->fmtDate = "'Y-m-d'";
-                               $this->fmtTimeStamp = "'Y-m-d H:i:s'";
-                               $this->sysDate = 'GetDate()';
-                               $this->sysTimeStamp = 'GetDate()';
-                               $this->leftOuter = '*=';
-                               $this->rightOuter = '=*';
-                               $this->hasInsertID = true;
-                               $this->hasTransactions = true;
-                               $this->identitySQL = 'select @@IDENTITY';
-                               break;
-                       default:
-                               $this->databaseType = 'odbtp';
-                               if( @odbtp_get_attr(ODB_ATTR_TXNCAPABLE, 
$this->_connectionID) )
-                                       $this->hasTransactions = true;
-                               else
-                                       $this->hasTransactions = false;
-               }
-        @odbtp_set_attr(ODB_ATTR_FULLCOLINFO, TRUE, $this->_connectionID );
-
-               if ($this->_useUnicodeSQL )
-                       @odbtp_set_attr(ODB_ATTR_UNICODESQL, TRUE, 
$this->_connectionID);
-
-        return true;
-       }
-
-       function _pconnect($HostOrInterface, $UserOrDSN='', $argPassword='', 
$argDatabase='')
-       {
-               $this->_dontPoolDBC = false;
-               return $this->_connect($HostOrInterface, $UserOrDSN, 
$argPassword, $argDatabase);
-       }
-
-       function SelectDB($dbName)
-       {
-               if (address@hidden($dbName, $this->_connectionID)) {
-                       return false;
-               }
-               $this->databaseName = $dbName;
-               return true;
-       }
-       
-       function &MetaTables($ttype='',$showSchema=false,$mask=false)
-       {
-       global $ADODB_FETCH_MODE;
-
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               if ($this->fetchMode !== false) $savefm = 
$this->SetFetchMode(false);
-               
-               $arr =& $this->GetArray("||SQLTables||||$ttype");
-               
-               if (isset($savefm)) $this->SetFetchMode($savefm);
-               $ADODB_FETCH_MODE = $savem;
-
-               $arr2 = array();
-               for ($i=0; $i < sizeof($arr); $i++) {
-                       if ($arr[$i][3] == 'SYSTEM TABLE' )     continue;
-                       if ($arr[$i][2])
-                               $arr2[] = $showSchema ? 
$arr[$i][1].'.'.$arr[$i][2] : $arr[$i][2];
-               }
-               return $arr2;
-       }
-       
-       function &MetaColumns($table,$upper=true)
-       {
-       global $ADODB_FETCH_MODE;
-
-               $schema = false;
-               $this->_findschema($table,$schema);
-               if ($upper) $table = strtoupper($table);
-
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               if ($this->fetchMode !== false) $savefm = 
$this->SetFetchMode(false);
-               
-               $rs = $this->Execute( "||SQLColumns||$schema|$table" );
-               
-               if (isset($savefm)) $this->SetFetchMode($savefm);
-               $ADODB_FETCH_MODE = $savem;
-
-               if (!$rs || $rs->EOF) {
-                       $false = false;
-                       return $false;
-               }
-               while (!$rs->EOF) {
-                       //print_r($rs->fields);
-                       if (strtoupper($rs->fields[2]) == $table) {
-                               $fld = new ADOFieldObject();
-                               $fld->name = $rs->fields[3];
-                               $fld->type = $rs->fields[5];
-                               $fld->max_length = $rs->fields[6];
-                       $fld->not_null = !empty($rs->fields[9]);
-                               $fld->scale = $rs->fields[7];
-                               if (!is_null($rs->fields[12])) {
-                                       $fld->has_default = true;
-                                       $fld->default_value = $rs->fields[12];
-                               }
-                               $retarr[strtoupper($fld->name)] = $fld;
-                       } else if (sizeof($retarr)>0)
-                               break;
-                       $rs->MoveNext();
-               }
-               $rs->Close();
-
-               return $retarr;
-       }
-
-       function &MetaPrimaryKeys($table, $owner='')
-       {
-       global $ADODB_FETCH_MODE;
-
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $arr =& $this->GetArray("||SQLPrimaryKeys||$owner|$table");
-               $ADODB_FETCH_MODE = $savem;
-
-               //print_r($arr);
-               $arr2 = array();
-               for ($i=0; $i < sizeof($arr); $i++) {
-                       if ($arr[$i][3]) $arr2[] = $arr[$i][3];
-               }
-               return $arr2;
-       }
-
-       function &MetaForeignKeys($table, $owner='', $upper=false)
-       {
-       global $ADODB_FETCH_MODE;
-
-               $savem = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $constraints =& 
$this->GetArray("||SQLForeignKeys|||||$owner|$table");
-               $ADODB_FETCH_MODE = $savem;
-
-               $arr = false;
-               foreach($constraints as $constr) {
-                       //print_r($constr);
-                       $arr[$constr[11]][$constr[2]][] = 
$constr[7].'='.$constr[3];
-               }
-               if (!$arr) {
-                       $false = false;
-                       return $false;
-               }
-               
-               $arr2 = array();
-
-               foreach($arr as $k => $v) {
-                       foreach($v as $a => $b) {
-                               if ($upper) $a = strtoupper($a);
-                               $arr2[$a] = $b;
-                       }
-               }
-               return $arr2;
-       }
-
-       function BeginTrans()
-       {
-               if (!$this->hasTransactions) return false;
-               if ($this->transOff) return true;
-               $this->transCnt += 1;
-               $this->autoCommit = false;
-               if (defined('ODB_TXN_DEFAULT'))
-                       $txn = ODB_TXN_DEFAULT;
-               else
-                       $txn = ODB_TXN_READUNCOMMITTED;
-               $rs = 
@odbtp_set_attr(ODB_ATTR_TRANSACTIONS,$txn,$this->_connectionID);
-               if(!$rs) return false;
-               return true;
-       }
-
-       function CommitTrans($ok=true)
-       {
-               if ($this->transOff) return true;
-               if (!$ok) return $this->RollbackTrans();
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->autoCommit = true;
-               if( ($ret = @odbtp_commit($this->_connectionID)) )
-                       $ret = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS, 
ODB_TXN_NONE, $this->_connectionID);//set transaction off
-               return $ret;
-       }
-
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true;
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->autoCommit = true;
-               if( ($ret = @odbtp_rollback($this->_connectionID)) )
-                       $ret = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS, 
ODB_TXN_NONE, $this->_connectionID);//set transaction off
-               return $ret;
-       }
-
-       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
-       {
-               // TOP requires ORDER BY for Visual FoxPro
-               if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
-                       if (!preg_match('/ORDER[ \t\r\n]+BY/is',$sql)) $sql .= 
' ORDER BY 1';
-               }
-               return 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-       }
-
-       function Prepare($sql)
-       {
-               if (! $this->_bindInputArray) return $sql; // no binding
-               $stmt = @odbtp_prepare($sql,$this->_connectionID);
-               if (!$stmt) {
-               //      print "Prepare Error for ($sql) 
".$this->ErrorMsg()."<br>";
-                       return $sql;
-               }
-               return array($sql,$stmt,false);
-       }
-
-       function PrepareSP($sql)
-       {
-               if (!$this->_canPrepareSP) return $sql; // Can't prepare 
procedures
-
-               $stmt = @odbtp_prepare_proc($sql,$this->_connectionID);
-               if (!$stmt) return false;
-               return array($sql,$stmt);
-       }
-
-       /*
-       Usage:
-               $stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, 
@myid and @group
-
-               # note that the parameter does not have @ in front!
-               $db->Parameter($stmt,$id,'myid');
-               $db->Parameter($stmt,$group,'group',false,64);
-               $db->Parameter($stmt,$group,'photo',false,100000,ODB_BINARY);
-               $db->Execute($stmt);
-
-               @param $stmt Statement returned by Prepare() or PrepareSP().
-               @param $var PHP variable to bind to. Can set to null (for 
isNull support).
-               @param $name Name of stored procedure variable name to bind to.
-               @param [$isOutput] Indicates direction of parameter 0/false=IN  
1=OUT  2= IN/OUT. This is ignored in odbtp.
-               @param [$maxLen] Holds an maximum length of the variable.
-               @param [$type] The data type of $var. Legal values depend on 
driver.
-
-               See odbtp_attach_param documentation at 
http://odbtp.sourceforge.net.
-       */
-       function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=0, 
$type=0)
-       {
-               if ( $this->odbc_driver == ODB_DRIVER_JET ) {
-                       $name = '['.$name.']';
-                       if( !$type && $this->_useUnicodeSQL
-                               && @odbtp_param_bindtype($stmt[1], $name) == 
ODB_CHAR )
-                       {
-                               $type = ODB_WCHAR;
-                       }
-               }
-               else {
-                       $name = '@'.$name;
-               }
-               return @odbtp_attach_param($stmt[1], $name, $var, $type, 
$maxLen);
-       }
-
-       /*
-               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='image')
-       {
-               $sql = "UPDATE $table SET $column = ? WHERE $where";
-               if( !($stmt = @odbtp_prepare($sql, $this->_connectionID)) )
-                       return false;
-               if( address@hidden( $stmt, 1, ODB_BINARY, 1000000, $blobtype ) )
-                       return false;
-               if( address@hidden( $stmt, 1, $val ) )
-                       return false;
-               return @odbtp_execute( $stmt ) != false;
-       }
-
-       function IfNull( $field, $ifNull )
-       {
-               switch( $this->odbc_driver ) {
-                       case ODB_DRIVER_MSSQL:
-                               return " ISNULL($field, $ifNull) ";
-                       case ODB_DRIVER_JET:
-                               return " IIF(IsNull($field), $ifNull, $field) ";
-               }
-               return " CASE WHEN $field is null THEN $ifNull ELSE $field END 
";
-       }
-
-       function _query($sql,$inputarr=false)
-       {
-               if ($inputarr) {
-                       if (is_array($sql)) {
-                               $stmtid = $sql[1];
-                       } else {
-                               $stmtid = 
@odbtp_prepare($sql,$this->_connectionID);
-                               if ($stmtid == false) {
-                                       $this->_errorMsg = $php_errormsg;
-                                       return false;
-                               }
-                       }
-                       $num_params = @odbtp_num_params( $stmtid );
-                       for( $param = 1; $param <= $num_params; $param++ ) {
-                               @odbtp_input( $stmtid, $param );
-                               @odbtp_set( $stmtid, $param, 
$inputarr[$param-1] );
-                       }
-                       if (address@hidden($stmtid) ) {
-                               return false;
-                       }
-               } else if (is_array($sql)) {
-                       $stmtid = $sql[1];
-                       if (address@hidden($stmtid)) {
-                               return false;
-                       }
-               } else {
-                       $stmtid = @odbtp_query($sql,$this->_connectionID);
-               }
-               $this->_lastAffectedRows = 0;
-               if ($stmtid) {
-                               $this->_lastAffectedRows = 
@odbtp_affected_rows($stmtid);
-               }
-        return $stmtid;
-       }
-
-       function _close()
-       {
-               $ret = @odbtp_close($this->_connectionID);
-               $this->_connectionID = false;
-               return $ret;
-       }
-}
-
-class ADORecordSet_odbtp extends ADORecordSet {
-
-       var $databaseType = 'odbtp';
-       var $canSeek = true;
-
-       function ADORecordSet_odbtp($queryID,$mode=false)
-       {
-               if ($mode === false) {
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               $this->fetchMode = $mode;
-               $this->ADORecordSet($queryID);
-       }
-
-       function _initrs()
-       {
-               $this->_numOfFields = @odbtp_num_fields($this->_queryID);
-               if (!($this->_numOfRows = @odbtp_num_rows($this->_queryID)))
-                       $this->_numOfRows = -1;
-
-               if (!$this->connection->_useUnicodeSQL) return;
-
-               if ($this->connection->odbc_driver == ODB_DRIVER_JET) {
-                       if (address@hidden(ODB_ATTR_MAPCHARTOWCHAR,
-                                            $this->connection->_connectionID))
-                       {
-                               for ($f = 0; $f < $this->_numOfFields; $f++) {
-                                       if 
(@odbtp_field_bindtype($this->_queryID, $f) == ODB_CHAR)
-                                               
@odbtp_bind_field($this->_queryID, $f, ODB_WCHAR);
-                               }
-                       }
-               }
-       }
-
-       function &FetchField($fieldOffset = 0)
-       {
-               $off=$fieldOffset; // offsets begin at 0
-               $o= new ADOFieldObject();
-               $o->name = @odbtp_field_name($this->_queryID,$off);
-               $o->type = @odbtp_field_type($this->_queryID,$off);
-        $o->max_length = @odbtp_field_length($this->_queryID,$off);
-               if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-               else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-               return $o;
-       }
-
-       function _seek($row)
-       {
-               return @odbtp_data_seek($this->_queryID, $row);
-       }
-
-       function fields($colname)
-       {
-               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->fields[$colname];
-
-               if (!$this->bind) {
-                       $this->bind = array();
-                       for ($i=0; $i < $this->_numOfFields; $i++) {
-                               $name = @odbtp_field_name( $this->_queryID, $i 
);
-                               $this->bind[strtoupper($name)] = $i;
-                       }
-               }
-               return $this->fields[$this->bind[strtoupper($colname)]];
-       }
-
-       function _fetch_odbtp($type=0)
-       {
-               switch ($this->fetchMode) {
-                       case ADODB_FETCH_NUM:
-                               $this->fields = 
@odbtp_fetch_row($this->_queryID, $type);
-                               break;
-                       case ADODB_FETCH_ASSOC:
-                               $this->fields = 
@odbtp_fetch_assoc($this->_queryID, $type);
-                               break;
-            default:
-                               $this->fields = 
@odbtp_fetch_array($this->_queryID, $type);
-               }
-               return is_array($this->fields);
-       }
-
-       function _fetch()
-       {
-               return $this->_fetch_odbtp();
-       }
-
-       function MoveFirst()
-       {
-               if (!$this->_fetch_odbtp(ODB_FETCH_FIRST)) return false;
-               $this->EOF = false;
-               $this->_currentRow = 0;
-               return true;
-    }
-
-       function MoveLast()
-       {
-               if (!$this->_fetch_odbtp(ODB_FETCH_LAST)) return false;
-               $this->EOF = false;
-               $this->_currentRow = $this->_numOfRows - 1;
-               return true;
-       }
-
-       function NextRecordSet()
-       {
-               if (address@hidden($this->_queryID)) return false;
-               $this->_inited = false;
-               $this->bind = false;
-               $this->_currentRow = -1;
-               $this->Init();
-               return true;
-       }
-
-       function _close()
-       {
-               return @odbtp_free_query($this->_queryID);
-       }
-}
-
-class ADORecordSet_odbtp_mssql extends ADORecordSet_odbtp {
-
-       var $databaseType = 'odbtp_mssql';
-
-       function ADORecordSet_odbtp_mssql($id,$mode=false)
-       {
-               return $this->ADORecordSet_odbtp($id,$mode);
-       }
-}
-
-class ADORecordSet_odbtp_access extends ADORecordSet_odbtp {
-
-       var $databaseType = 'odbtp_access';
-
-       function ADORecordSet_odbtp_access($id,$mode=false)
-       {
-               return $this->ADORecordSet_odbtp($id,$mode);
-       }
-}
-
-class ADORecordSet_odbtp_vfp extends ADORecordSet_odbtp {
-
-       var $databaseType = 'odbtp_vfp';
-
-       function ADORecordSet_odbtp_vfp($id,$mode=false)
-       {
-               return $this->ADORecordSet_odbtp($id,$mode);
-       }
-}
-
-class ADORecordSet_odbtp_oci8 extends ADORecordSet_odbtp {
-
-       var $databaseType = 'odbtp_oci8';
-
-       function ADORecordSet_odbtp_oci8($id,$mode=false)
-       {
-               return $this->ADORecordSet_odbtp($id,$mode);
-       }
-}
-
-class ADORecordSet_odbtp_sybase extends ADORecordSet_odbtp {
-
-       var $databaseType = 'odbtp_sybase';
-
-       function ADORecordSet_odbtp_sybase($id,$mode=false)
-       {
-               return $this->ADORecordSet_odbtp($id,$mode);
-       }
-}
-?>
+<?php
+/*
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence. See License.txt.
+  Set tabs to 4 for best viewing.
+  Latest version is available at http://adodb.sourceforge.net
+*/
+// Code contributed by "stefan bogdan" <sbogdan#rsb.ro>
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+define("_ADODB_ODBTP_LAYER", 2 );
+
+class ADODB_odbtp extends ADOConnection{
+       var $databaseType = "odbtp";
+       var $dataProvider = "odbtp";
+       var $fmtDate = "'Y-m-d'";
+       var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
+       var $replaceQuote = "''"; // string to use to replace quotes
+       var $odbc_driver = 0;
+       var $hasAffectedRows = true;
+       var $hasInsertID = false;
+       var $hasGenID = true;
+       var $hasMoveFirst = true;
+
+       var $_genSeqSQL = "create table %s (seq_name char(30) not null unique , 
seq_value integer not null)";
+       var $_dropSeqSQL = "delete from adodb_seq where seq_name = '%s'";
+       var $_bindInputArray = false;
+       var $_useUnicodeSQL = false;
+       var $_canPrepareSP = false;
+       var $_dontPoolDBC = true;
+
+       function ADODB_odbtp()
+       {
+       }
+
+       function ServerInfo()
+       {
+               return array('description' => @odbtp_get_attr( 
ODB_ATTR_DBMSNAME, $this->_connectionID),
+                            'version' => @odbtp_get_attr( ODB_ATTR_DBMSVER, 
$this->_connectionID));
+       }
+
+       function ErrorMsg()
+       {
+               if (empty($this->_connectionID)) return @odbtp_last_error();
+               return @odbtp_last_error($this->_connectionID);
+       }
+
+       function ErrorNo()
+       {
+               if (empty($this->_connectionID)) return 
@odbtp_last_error_state();
+                       return @odbtp_last_error_state($this->_connectionID);
+       }
+
+       function _insertid()
+       {
+       // SCOPE_IDENTITY()
+       // Returns the last IDENTITY value inserted into an IDENTITY column in
+       // the same scope. A scope is a module -- a stored procedure, trigger,
+       // function, or batch. Thus, two statements are in the same scope if
+       // they are in the same stored procedure, function, or batch.
+                       return $this->GetOne($this->identitySQL);
+       }
+
+       function _affectedrows()
+       {
+               if ($this->_queryID) {
+                       return @odbtp_affected_rows ($this->_queryID);
+          } else
+               return 0;
+       }
+
+       function CreateSequence($seqname='adodbseq',$start=1)
+       {
+               //verify existence
+               $num = $this->GetOne("select seq_value from adodb_seq");
+               $seqtab='adodb_seq';
+               if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
+                       $path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, 
$this->_connectionID );
+                       //if using vfp dbc file
+                       if( !strcasecmp(strrchr($path, '.'), '.dbc') )
+                $path = substr($path,0,strrpos($path,'\/'));
+               $seqtab = $path . '/' . $seqtab;
+        }
+               if($num == false) {
+                       if (empty($this->_genSeqSQL)) return false;
+                       $ok = $this->Execute(sprintf($this->_genSeqSQL 
,$seqtab));
+               }
+               $num = $this->GetOne("select seq_value from adodb_seq where 
seq_name='$seqname'");
+               if ($num) {
+                       return false;
+               }
+               $start -= 1;
+               return $this->Execute("insert into adodb_seq 
values('$seqname',$start)");
+       }
+
+       function DropSequence($seqname)
+       {
+               if (empty($this->_dropSeqSQL)) return false;
+               return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+       }
+
+       function GenID($seq='adodbseq',$start=1)
+       {
+               $seqtab='adodb_seq';
+               if( $this->odbc_driver == ODB_DRIVER_FOXPRO) {
+                       $path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, 
$this->_connectionID );
+                       //if using vfp dbc file
+                       if( !strcasecmp(strrchr($path, '.'), '.dbc') )
+                $path = substr($path,0,strrpos($path,'\/'));
+               $seqtab = $path . '/' . $seqtab;
+        }
+               $MAXLOOPS = 100;
+               while (--$MAXLOOPS>=0) {
+                       $num = $this->GetOne("select seq_value from adodb_seq 
where seq_name='$seq'");
+                       if ($num === false) {
+                               //verify if abodb_seq table exist
+                               $ok = $this->GetOne("select seq_value from 
adodb_seq ");
+                               if(!$ok) {
+                                       //creating the sequence table adodb_seq
+                                       
$this->Execute(sprintf($this->_genSeqSQL ,$seqtab));
+                               }
+                               $start -= 1;
+                               $num = '0';
+                               $ok = $this->Execute("insert into adodb_seq 
values('$seq',$start)");
+                               if (!$ok) return false;
+                       }
+                       $ok = $this->Execute("update adodb_seq set 
seq_value=seq_value+1 where seq_name='$seq'");
+                       if($ok) {
+                               $num += 1;
+                               $this->genID = $num;
+                               return $num;
+                       }
+               }
+       if ($fn = $this->raiseErrorFn) {
+               $fn($this->databaseType,'GENID',-32000,"Unable to generate 
unique id after $MAXLOOPS attempts",$seq,$num);
+       }
+               return false;
+       }
+
+       //example for $UserOrDSN
+       //for visual fox : DRIVER={Microsoft Visual FoxPro 
Driver};SOURCETYPE=DBF;SOURCEDB=c:\YourDbfFileDir;EXCLUSIVE=NO;
+       //for visual fox dbc: DRIVER={Microsoft Visual FoxPro 
Driver};SOURCETYPE=DBC;SOURCEDB=c:\YourDbcFileDir\mydb.dbc;EXCLUSIVE=NO;
+       //for access : DRIVER={Microsoft Access Driver 
(*.mdb)};DBQ=c:\path_to_access_db\base_test.mdb;UID=root;PWD=;
+       //for mssql : DRIVER={SQL 
Server};SERVER=myserver;UID=myuid;PWD=mypwd;DATABASE=OdbtpTest;
+       //if uid & pwd can be separate
+    function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', 
$argDatabase='')
+       {
+               $this->_connectionID = 
@odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
+               if ($this->_connectionID === false) {
+                       $this->_errorMsg = $this->ErrorMsg() ;
+                       return false;
+               }
+               if ($this->_dontPoolDBC) {
+                       if (function_exists('odbtp_dont_pool_dbc'))
+                               @odbtp_dont_pool_dbc($this->_connectionID);
+               }
+               else {
+                       $this->_dontPoolDBC = true;
+               }
+               $this->odbc_driver = @odbtp_get_attr(ODB_ATTR_DRIVER, 
$this->_connectionID);
+               $dbms = strtolower(@odbtp_get_attr(ODB_ATTR_DBMSNAME, 
$this->_connectionID));
+               $this->odbc_name = $dbms;
+               
+               // Account for inconsistent DBMS names
+               if( $this->odbc_driver == ODB_DRIVER_ORACLE )
+                       $dbms = 'oracle';
+               else if( $this->odbc_driver == ODB_DRIVER_SYBASE )
+                       $dbms = 'sybase';
+
+               // Set DBMS specific attributes
+               switch( $dbms ) {
+                       case 'microsoft sql server':
+                               $this->databaseType = 'odbtp_mssql';
+                               $this->fmtDate = "'Y-m-d'";
+                               $this->fmtTimeStamp = "'Y-m-d h:i:sA'";
+                               $this->sysDate = 
'convert(datetime,convert(char,GetDate(),102),102)';
+                               $this->sysTimeStamp = 'GetDate()';
+                               $this->ansiOuter = true;
+                               $this->leftOuter = '*=';
+                               $this->rightOuter = '=*';
+                $this->hasTop = 'top';
+                               $this->hasInsertID = true;
+                               $this->hasTransactions = true;
+                               $this->_bindInputArray = true;
+                               $this->_canSelectDb = true;
+                               $this->substr = "substring";
+                               $this->length = 'len';
+                               $this->identitySQL = 'select @@IDENTITY';
+                               $this->metaDatabasesSQL = "select name from 
master..sysdatabases where name <> 'master'";
+                               $this->_canPrepareSP = true;
+                               break;
+                       case 'access':
+                               $this->databaseType = 'odbtp_access';
+                               $this->fmtDate = "#Y-m-d#";
+                               $this->fmtTimeStamp = "#Y-m-d h:i:sA#";
+                               $this->sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
+                               $this->sysTimeStamp = 'NOW';
+                $this->hasTop = 'top';
+                               $this->hasTransactions = false;
+                               $this->_canPrepareSP = true;  // For MS Access 
only.
+                               break;
+                       case 'visual foxpro':
+                               $this->databaseType = 'odbtp_vfp';
+                               $this->fmtDate = "{^Y-m-d}";
+                               $this->fmtTimeStamp = "{^Y-m-d, h:i:sA}";
+                               $this->sysDate = 'date()';
+                               $this->sysTimeStamp = 'datetime()';
+                               $this->ansiOuter = true;
+                $this->hasTop = 'top';
+                               $this->hasTransactions = false;
+                               $this->replaceQuote = "'+chr(39)+'";
+                               $this->true = '.T.';
+                               $this->false = '.F.';
+                               break;
+                       case 'oracle':
+                               $this->databaseType = 'odbtp_oci8';
+                               $this->fmtDate = "'Y-m-d 00:00:00'";
+                               $this->fmtTimeStamp = "'Y-m-d h:i:sA'";
+                               $this->sysDate = 'TRUNC(SYSDATE)';
+                               $this->sysTimeStamp = 'SYSDATE';
+                               $this->hasTransactions = true;
+                               $this->_bindInputArray = true;
+                               $this->concat_operator = '||';
+                               break;
+                       case 'sybase':
+                               $this->databaseType = 'odbtp_sybase';
+                               $this->fmtDate = "'Y-m-d'";
+                               $this->fmtTimeStamp = "'Y-m-d H:i:s'";
+                               $this->sysDate = 'GetDate()';
+                               $this->sysTimeStamp = 'GetDate()';
+                               $this->leftOuter = '*=';
+                               $this->rightOuter = '=*';
+                               $this->hasInsertID = true;
+                               $this->hasTransactions = true;
+                               $this->identitySQL = 'select @@IDENTITY';
+                               break;
+                       default:
+                               $this->databaseType = 'odbtp';
+                               if( @odbtp_get_attr(ODB_ATTR_TXNCAPABLE, 
$this->_connectionID) )
+                                       $this->hasTransactions = true;
+                               else
+                                       $this->hasTransactions = false;
+               }
+        @odbtp_set_attr(ODB_ATTR_FULLCOLINFO, TRUE, $this->_connectionID );
+
+               if ($this->_useUnicodeSQL )
+                       @odbtp_set_attr(ODB_ATTR_UNICODESQL, TRUE, 
$this->_connectionID);
+
+        return true;
+       }
+
+       function _pconnect($HostOrInterface, $UserOrDSN='', $argPassword='', 
$argDatabase='')
+       {
+               $this->_dontPoolDBC = false;
+               return $this->_connect($HostOrInterface, $UserOrDSN, 
$argPassword, $argDatabase);
+       }
+
+       function SelectDB($dbName)
+       {
+               if (address@hidden($dbName, $this->_connectionID)) {
+                       return false;
+               }
+               $this->database = $dbName;
+               $this->databaseName = $dbName; # obsolete, retained for compat 
with older adodb versions
+               return true;
+       }
+       
+       function &MetaTables($ttype='',$showSchema=false,$mask=false)
+       {
+       global $ADODB_FETCH_MODE;
+
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->fetchMode !== false) $savefm = 
$this->SetFetchMode(false);
+               
+               $arr =& $this->GetArray("||SQLTables||||$ttype");
+               
+               if (isset($savefm)) $this->SetFetchMode($savefm);
+               $ADODB_FETCH_MODE = $savem;
+
+               $arr2 = array();
+               for ($i=0; $i < sizeof($arr); $i++) {
+                       if ($arr[$i][3] == 'SYSTEM TABLE' )     continue;
+                       if ($arr[$i][2])
+                               $arr2[] = $showSchema ? 
$arr[$i][1].'.'.$arr[$i][2] : $arr[$i][2];
+               }
+               return $arr2;
+       }
+       
+       function &MetaColumns($table,$upper=true)
+       {
+       global $ADODB_FETCH_MODE;
+
+               $schema = false;
+               $this->_findschema($table,$schema);
+               if ($upper) $table = strtoupper($table);
+
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->fetchMode !== false) $savefm = 
$this->SetFetchMode(false);
+               
+               $rs = $this->Execute( "||SQLColumns||$schema|$table" );
+               
+               if (isset($savefm)) $this->SetFetchMode($savefm);
+               $ADODB_FETCH_MODE = $savem;
+
+               if (!$rs || $rs->EOF) {
+                       $false = false;
+                       return $false;
+               }
+               $retarr = array();
+               while (!$rs->EOF) {
+                       //print_r($rs->fields);
+                       if (strtoupper($rs->fields[2]) == $table) {
+                               $fld = new ADOFieldObject();
+                               $fld->name = $rs->fields[3];
+                               $fld->type = $rs->fields[5];
+                               $fld->max_length = $rs->fields[6];
+                       $fld->not_null = !empty($rs->fields[9]);
+                               $fld->scale = $rs->fields[7];
+                               if (!is_null($rs->fields[12])) {
+                                       $fld->has_default = true;
+                                       $fld->default_value = $rs->fields[12];
+                               }
+                               $retarr[strtoupper($fld->name)] = $fld;
+                       } else if (!empty($retarr))
+                               break;
+                       $rs->MoveNext();
+               }
+               $rs->Close();
+
+               return $retarr;
+       }
+
+       function &MetaPrimaryKeys($table, $owner='')
+       {
+       global $ADODB_FETCH_MODE;
+
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $arr =& $this->GetArray("||SQLPrimaryKeys||$owner|$table");
+               $ADODB_FETCH_MODE = $savem;
+
+               //print_r($arr);
+               $arr2 = array();
+               for ($i=0; $i < sizeof($arr); $i++) {
+                       if ($arr[$i][3]) $arr2[] = $arr[$i][3];
+               }
+               return $arr2;
+       }
+
+       function &MetaForeignKeys($table, $owner='', $upper=false)
+       {
+       global $ADODB_FETCH_MODE;
+
+               $savem = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $constraints =& 
$this->GetArray("||SQLForeignKeys|||||$owner|$table");
+               $ADODB_FETCH_MODE = $savem;
+
+               $arr = false;
+               foreach($constraints as $constr) {
+                       //print_r($constr);
+                       $arr[$constr[11]][$constr[2]][] = 
$constr[7].'='.$constr[3];
+               }
+               if (!$arr) {
+                       $false = false;
+                       return $false;
+               }
+               
+               $arr2 = array();
+
+               foreach($arr as $k => $v) {
+                       foreach($v as $a => $b) {
+                               if ($upper) $a = strtoupper($a);
+                               $arr2[$a] = $b;
+                       }
+               }
+               return $arr2;
+       }
+
+       function BeginTrans()
+       {
+               if (!$this->hasTransactions) return false;
+               if ($this->transOff) return true;
+               $this->transCnt += 1;
+               $this->autoCommit = false;
+               if (defined('ODB_TXN_DEFAULT'))
+                       $txn = ODB_TXN_DEFAULT;
+               else
+                       $txn = ODB_TXN_READUNCOMMITTED;
+               $rs = 
@odbtp_set_attr(ODB_ATTR_TRANSACTIONS,$txn,$this->_connectionID);
+               if(!$rs) return false;
+               return true;
+       }
+
+       function CommitTrans($ok=true)
+       {
+               if ($this->transOff) return true;
+               if (!$ok) return $this->RollbackTrans();
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->autoCommit = true;
+               if( ($ret = @odbtp_commit($this->_connectionID)) )
+                       $ret = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS, 
ODB_TXN_NONE, $this->_connectionID);//set transaction off
+               return $ret;
+       }
+
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true;
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->autoCommit = true;
+               if( ($ret = @odbtp_rollback($this->_connectionID)) )
+                       $ret = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS, 
ODB_TXN_NONE, $this->_connectionID);//set transaction off
+               return $ret;
+       }
+
+       function &SelectLimit($sql,$nrows=-1,$offset=-1, 
$inputarr=false,$secs2cache=0)
+       {
+               // TOP requires ORDER BY for Visual FoxPro
+               if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
+                       if (!preg_match('/ORDER[ \t\r\n]+BY/is',$sql)) $sql .= 
' ORDER BY 1';
+               }
+               $ret =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+               return $ret;
+       }
+
+       function Prepare($sql)
+       {
+               if (! $this->_bindInputArray) return $sql; // no binding
+               $stmt = @odbtp_prepare($sql,$this->_connectionID);
+               if (!$stmt) {
+               //      print "Prepare Error for ($sql) 
".$this->ErrorMsg()."<br>";
+                       return $sql;
+               }
+               return array($sql,$stmt,false);
+       }
+
+       function PrepareSP($sql)
+       {
+               if (!$this->_canPrepareSP) return $sql; // Can't prepare 
procedures
+
+               $stmt = @odbtp_prepare_proc($sql,$this->_connectionID);
+               if (!$stmt) return false;
+               return array($sql,$stmt);
+       }
+
+       /*
+       Usage:
+               $stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, 
@myid and @group
+
+               # note that the parameter does not have @ in front!
+               $db->Parameter($stmt,$id,'myid');
+               $db->Parameter($stmt,$group,'group',false,64);
+               $db->Parameter($stmt,$group,'photo',false,100000,ODB_BINARY);
+               $db->Execute($stmt);
+
+               @param $stmt Statement returned by Prepare() or PrepareSP().
+               @param $var PHP variable to bind to. Can set to null (for 
isNull support).
+               @param $name Name of stored procedure variable name to bind to.
+               @param [$isOutput] Indicates direction of parameter 0/false=IN  
1=OUT  2= IN/OUT. This is ignored in odbtp.
+               @param [$maxLen] Holds an maximum length of the variable.
+               @param [$type] The data type of $var. Legal values depend on 
driver.
+
+               See odbtp_attach_param documentation at 
http://odbtp.sourceforge.net.
+       */
+       function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=0, 
$type=0)
+       {
+               if ( $this->odbc_driver == ODB_DRIVER_JET ) {
+                       $name = '['.$name.']';
+                       if( !$type && $this->_useUnicodeSQL
+                               && @odbtp_param_bindtype($stmt[1], $name) == 
ODB_CHAR )
+                       {
+                               $type = ODB_WCHAR;
+                       }
+               }
+               else {
+                       $name = '@'.$name;
+               }
+               return @odbtp_attach_param($stmt[1], $name, $var, $type, 
$maxLen);
+       }
+
+       /*
+               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='image')
+       {
+               $sql = "UPDATE $table SET $column = ? WHERE $where";
+               if( !($stmt = @odbtp_prepare($sql, $this->_connectionID)) )
+                       return false;
+               if( address@hidden( $stmt, 1, ODB_BINARY, 1000000, $blobtype ) )
+                       return false;
+               if( address@hidden( $stmt, 1, $val ) )
+                       return false;
+               return @odbtp_execute( $stmt ) != false;
+       }
+
+       function IfNull( $field, $ifNull )
+       {
+               switch( $this->odbc_driver ) {
+                       case ODB_DRIVER_MSSQL:
+                               return " ISNULL($field, $ifNull) ";
+                       case ODB_DRIVER_JET:
+                               return " IIF(IsNull($field), $ifNull, $field) ";
+               }
+               return " CASE WHEN $field is null THEN $ifNull ELSE $field END 
";
+       }
+
+       function _query($sql,$inputarr=false)
+       {
+       global $php_errormsg;
+       
+               if ($inputarr) {
+                       if (is_array($sql)) {
+                               $stmtid = $sql[1];
+                       } else {
+                               $stmtid = 
@odbtp_prepare($sql,$this->_connectionID);
+                               if ($stmtid == false) {
+                                       $this->_errorMsg = $php_errormsg;
+                                       return false;
+                               }
+                       }
+                       $num_params = @odbtp_num_params( $stmtid );
+                       for( $param = 1; $param <= $num_params; $param++ ) {
+                               @odbtp_input( $stmtid, $param );
+                               @odbtp_set( $stmtid, $param, 
$inputarr[$param-1] );
+                       }
+                       if (address@hidden($stmtid) ) {
+                               return false;
+                       }
+               } else if (is_array($sql)) {
+                       $stmtid = $sql[1];
+                       if (address@hidden($stmtid)) {
+                               return false;
+                       }
+               } else {
+                       $stmtid = @odbtp_query($sql,$this->_connectionID);
+               }
+               $this->_lastAffectedRows = 0;
+               if ($stmtid) {
+                               $this->_lastAffectedRows = 
@odbtp_affected_rows($stmtid);
+               }
+        return $stmtid;
+       }
+
+       function _close()
+       {
+               $ret = @odbtp_close($this->_connectionID);
+               $this->_connectionID = false;
+               return $ret;
+       }
+}
+
+class ADORecordSet_odbtp extends ADORecordSet {
+
+       var $databaseType = 'odbtp';
+       var $canSeek = true;
+
+       function ADORecordSet_odbtp($queryID,$mode=false)
+       {
+               if ($mode === false) {
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               $this->fetchMode = $mode;
+               $this->ADORecordSet($queryID);
+       }
+
+       function _initrs()
+       {
+               $this->_numOfFields = @odbtp_num_fields($this->_queryID);
+               if (!($this->_numOfRows = @odbtp_num_rows($this->_queryID)))
+                       $this->_numOfRows = -1;
+
+               if (!$this->connection->_useUnicodeSQL) return;
+
+               if ($this->connection->odbc_driver == ODB_DRIVER_JET) {
+                       if (address@hidden(ODB_ATTR_MAPCHARTOWCHAR,
+                                            $this->connection->_connectionID))
+                       {
+                               for ($f = 0; $f < $this->_numOfFields; $f++) {
+                                       if 
(@odbtp_field_bindtype($this->_queryID, $f) == ODB_CHAR)
+                                               
@odbtp_bind_field($this->_queryID, $f, ODB_WCHAR);
+                               }
+                       }
+               }
+       }
+
+       function &FetchField($fieldOffset = 0)
+       {
+               $off=$fieldOffset; // offsets begin at 0
+               $o= new ADOFieldObject();
+               $o->name = @odbtp_field_name($this->_queryID,$off);
+               $o->type = @odbtp_field_type($this->_queryID,$off);
+        $o->max_length = @odbtp_field_length($this->_queryID,$off);
+               if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+               else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+               return $o;
+       }
+
+       function _seek($row)
+       {
+               return @odbtp_data_seek($this->_queryID, $row);
+       }
+
+       function fields($colname)
+       {
+               if ($this->fetchMode & ADODB_FETCH_ASSOC) return 
$this->fields[$colname];
+
+               if (!$this->bind) {
+                       $this->bind = array();
+                       for ($i=0; $i < $this->_numOfFields; $i++) {
+                               $name = @odbtp_field_name( $this->_queryID, $i 
);
+                               $this->bind[strtoupper($name)] = $i;
+                       }
+               }
+               return $this->fields[$this->bind[strtoupper($colname)]];
+       }
+
+       function _fetch_odbtp($type=0)
+       {
+               switch ($this->fetchMode) {
+                       case ADODB_FETCH_NUM:
+                               $this->fields = 
@odbtp_fetch_row($this->_queryID, $type);
+                               break;
+                       case ADODB_FETCH_ASSOC:
+                               $this->fields = 
@odbtp_fetch_assoc($this->_queryID, $type);
+                               break;
+            default:
+                               $this->fields = 
@odbtp_fetch_array($this->_queryID, $type);
+               }
+               return is_array($this->fields);
+       }
+
+       function _fetch()
+       {
+               return $this->_fetch_odbtp();
+       }
+
+       function MoveFirst()
+       {
+               if (!$this->_fetch_odbtp(ODB_FETCH_FIRST)) return false;
+               $this->EOF = false;
+               $this->_currentRow = 0;
+               return true;
+    }
+
+       function MoveLast()
+       {
+               if (!$this->_fetch_odbtp(ODB_FETCH_LAST)) return false;
+               $this->EOF = false;
+               $this->_currentRow = $this->_numOfRows - 1;
+               return true;
+       }
+
+       function NextRecordSet()
+       {
+               if (address@hidden($this->_queryID)) return false;
+               $this->_inited = false;
+               $this->bind = false;
+               $this->_currentRow = -1;
+               $this->Init();
+               return true;
+       }
+
+       function _close()
+       {
+               return @odbtp_free_query($this->_queryID);
+       }
+}
+
+class ADORecordSet_odbtp_mssql extends ADORecordSet_odbtp {
+
+       var $databaseType = 'odbtp_mssql';
+
+       function ADORecordSet_odbtp_mssql($id,$mode=false)
+       {
+               return $this->ADORecordSet_odbtp($id,$mode);
+       }
+}
+
+class ADORecordSet_odbtp_access extends ADORecordSet_odbtp {
+
+       var $databaseType = 'odbtp_access';
+
+       function ADORecordSet_odbtp_access($id,$mode=false)
+       {
+               return $this->ADORecordSet_odbtp($id,$mode);
+       }
+}
+
+class ADORecordSet_odbtp_vfp extends ADORecordSet_odbtp {
+
+       var $databaseType = 'odbtp_vfp';
+
+       function ADORecordSet_odbtp_vfp($id,$mode=false)
+       {
+               return $this->ADORecordSet_odbtp($id,$mode);
+       }
+}
+
+class ADORecordSet_odbtp_oci8 extends ADORecordSet_odbtp {
+
+       var $databaseType = 'odbtp_oci8';
+
+       function ADORecordSet_odbtp_oci8($id,$mode=false)
+       {
+               return $this->ADORecordSet_odbtp($id,$mode);
+       }
+}
+
+class ADORecordSet_odbtp_sybase extends ADORecordSet_odbtp {
+
+       var $databaseType = 'odbtp_sybase';
+
+       function ADORecordSet_odbtp_sybase($id,$mode=false)
+       {
+               return $this->ADORecordSet_odbtp($id,$mode);
+       }
+}
+?>
Index: phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php:1.2  Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php      Tue Feb 21 
13:47:42 2006
@@ -1,39 +1,39 @@
-<?php
-/*
-       V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-// Code contributed by "Robert Twitty" <rtwitty#neutron.ushmm.org>
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-    Because the ODBTP server sends and reads UNICODE text data using UTF-8
-    encoding, the following HTML meta tag must be included within the HTML
-    head section of every HTML form and script page:
-
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-    Also, all SQL query strings must be submitted as UTF-8 encoded text.
-*/
-
-if (!defined('_ADODB_ODBTP_LAYER')) {
-       include(ADODB_DIR."/drivers/adodb-odbtp.inc.php");
-}
-
-class ADODB_odbtp_unicode extends ADODB_odbtp {
-       var $databaseType = 'odbtp';
-       var $_useUnicodeSQL = true;
-
-       function ADODB_odbtp_unicode()
-       {
-               $this->ADODB_odbtp();
-       }
-}
-?>
+<?php
+/*
+       V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence. See License.txt.
+  Set tabs to 4 for best viewing.
+  Latest version is available at http://adodb.sourceforge.net
+*/
+
+// Code contributed by "Robert Twitty" <rtwitty#neutron.ushmm.org>
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+/*
+    Because the ODBTP server sends and reads UNICODE text data using UTF-8
+    encoding, the following HTML meta tag must be included within the HTML
+    head section of every HTML form and script page:
+
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+    Also, all SQL query strings must be submitted as UTF-8 encoded text.
+*/
+
+if (!defined('_ADODB_ODBTP_LAYER')) {
+       include(ADODB_DIR."/drivers/adodb-odbtp.inc.php");
+}
+
+class ADODB_odbtp_unicode extends ADODB_odbtp {
+       var $databaseType = 'odbtp';
+       var $_useUnicodeSQL = true;
+
+       function ADODB_odbtp_unicode()
+       {
+               $this->ADODB_odbtp();
+       }
+}
+?>
Index: phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php:1.2 Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php     Tue Feb 21 13:47:42 2006
@@ -1,320 +1,320 @@
-<?php
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Oracle data driver. Requires Oracle client. Works on Windows and Unix and 
Oracle 7.
-  
-  If you are using Oracle 8 or later, use the oci8 driver which is much better 
and more reliable.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-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";
-       var $sysDate = "TO_DATE(TO_CHAR(SYSDATE,'YYYY-MM-DD'),'YYYY-MM-DD')";
-       var $sysTimeStamp = 'SYSDATE';
-       var $connectSID = true;
-       
-       function ADODB_oracle() 
-       {
-       }
-
-       // format and return date string in database date format
-       function DBDate($d)
-       {
-               if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-               return 
'TO_DATE('.adodb_date($this->fmtDate,$d).",'YYYY-MM-DD')";
-       }
-       
-       // format and return date string in database timestamp format
-       function DBTimeStamp($ts)
-       {
-
-               if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
-               return 
'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
-       }
-
-       
-       function BeginTrans()
-       {         
-                $this->autoCommit = false;
-                ora_commitoff($this->_connectionID);
-                return true;
-       }
-
-       
-       function CommitTrans($ok=true) 
-       { 
-                  if (!$ok) return $this->RollbackTrans();
-                  $ret = ora_commit($this->_connectionID);
-                  ora_commiton($this->_connectionID);
-                  return $ret;
-       }
-
-       
-       function RollbackTrans()
-       {
-               $ret = ora_rollback($this->_connectionID);
-               ora_commiton($this->_connectionID);
-               return $ret;
-       }
-
-
-       /* there seems to be a bug in the oracle extension -- always returns 
ORA-00000 - no error */
-       function ErrorMsg() 
-       {   
-        if ($this->_errorMsg !== false) return $this->_errorMsg;
-
-        if (is_resource($this->_curs)) $this->_errorMsg = 
@ora_error($this->_curs);
-               if (empty($this->_errorMsg)) $this->_errorMsg = 
@ora_error($this->_connectionID);
-               return $this->_errorMsg;
-       }
-
- 
-       function ErrorNo() 
-       {
-               if ($this->_errorCode !== false) return $this->_errorCode;
-
-               if (is_resource($this->_curs)) $this->_errorCode = 
@ora_errorcode($this->_curs);
-               if (empty($this->_errorCode)) $this->_errorCode = 
@ora_errorcode($this->_connectionID);
-        return $this->_errorCode;
-       }
-
-       
-
-               // returns true or false
-               function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename, $mode=0)
-               {
-                       if (!function_exists('ora_plogon')) return null;
-                               
-            // <G. Giunta 2003/03/03/> Reset error messages before connecting
-            $this->_errorMsg = false;
-                   $this->_errorCode = false;
-        
-            // G. Giunta 2003/08/13 - This looks danegrously suspicious: why 
should we want to set
-            // the oracle home to the host name of remote DB?
-//                     if ($argHostname) putenv("ORACLE_HOME=$argHostname");
-
-                       if($argHostname) { // code copied from version 
submitted for oci8 by Jorma Tuomainen <address@hidden>
-                               if (empty($argDatabasename)) $argDatabasename = 
$argHostname;
-                               else {
-                                       if(strpos($argHostname,":")) {
-                                               
$argHostinfo=explode(":",$argHostname);
-                                               $argHostname=$argHostinfo[0];
-                                               $argHostport=$argHostinfo[1];
-                                       } else {
-                                               $argHostport="1521";
-                                       }
-
-
-                                       if ($this->connectSID) {
-                                               
$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-                                               
.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-                                       } else
-                                               
$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-                                               
.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
-                               }
-
-                       }
-
-                       if ($argDatabasename) $argUsername .= 
"@$argDatabasename";
-
-               //if ($argHostname) print "<p>Connect: 1st argument should be 
left blank for $this->databaseType</p>";
-                       if ($mode = 1)
-                               $this->_connectionID = 
ora_plogon($argUsername,$argPassword);
-                       else
-                               $this->_connectionID = 
ora_logon($argUsername,$argPassword);
-                       if ($this->_connectionID === false) return false;
-                       if ($this->autoCommit) 
ora_commiton($this->_connectionID);
-                       if ($this->_initdate) {
-                               $rs = $this->_query("ALTER SESSION SET 
NLS_DATE_FORMAT='YYYY-MM-DD'");
-                               if ($rs) ora_close($rs);
-                       }
-
-                       return true;
-               }
-
-
-               // returns true or false
-               function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-               {
-                       return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename, 1);
-               }
-
-
-               // returns query ID if successful, otherwise false
-               function _query($sql,$inputarr=false)
-               {
-            // <G. Giunta 2003/03/03/> Reset error messages before executing
-            $this->_errorMsg = false;
-                   $this->_errorCode = false;
-
-                       $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;
-            // <G. Giunta 2004/03/03> before we close the cursor, we have to 
store the error message
-            // that we can obtain ONLY from the cursor (and not from the 
connection)
-            $this->_errorCode = @ora_errorcode($curs);
-            $this->_errorMsg = @ora_error($curs);
-            // </G. Giunta 2004/03/03>            
-                       @ora_close($curs);
-                       return false;
-               }
-
-
-               // returns true or false
-               function _close()
-               {
-                       return @ora_logoff($this->_connectionID);
-               }
-
-
-
-}
-
-
-/*--------------------------------------------------------------------------------------
-                Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oracle extends ADORecordSet {
-
-       var $databaseType = "oracle";
-       var $bind = false;
-
-       function ADORecordset_oracle($queryID,$mode=false)
-       {
-               
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               $this->fetchMode = $mode;
-               
-               $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
-               if ($this->fetchMode & ADODB_FETCH_ASSOC)
-                       return 
@ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
-               else 
-                       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)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               
-               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';
-               }
-       }
-}
+<?php
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Oracle data driver. Requires Oracle client. Works on Windows and Unix and 
Oracle 7.
+  
+  If you are using Oracle 8 or later, use the oci8 driver which is much better 
and more reliable.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+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";
+       var $sysDate = "TO_DATE(TO_CHAR(SYSDATE,'YYYY-MM-DD'),'YYYY-MM-DD')";
+       var $sysTimeStamp = 'SYSDATE';
+       var $connectSID = true;
+       
+       function ADODB_oracle() 
+       {
+       }
+
+       // format and return date string in database date format
+       function DBDate($d)
+       {
+               if (is_string($d)) $d = ADORecordSet::UnixDate($d);
+               return 
'TO_DATE('.adodb_date($this->fmtDate,$d).",'YYYY-MM-DD')";
+       }
+       
+       // format and return date string in database timestamp format
+       function DBTimeStamp($ts)
+       {
+
+               if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
+               return 
'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
+       }
+
+       
+       function BeginTrans()
+       {         
+                $this->autoCommit = false;
+                ora_commitoff($this->_connectionID);
+                return true;
+       }
+
+       
+       function CommitTrans($ok=true) 
+       { 
+                  if (!$ok) return $this->RollbackTrans();
+                  $ret = ora_commit($this->_connectionID);
+                  ora_commiton($this->_connectionID);
+                  return $ret;
+       }
+
+       
+       function RollbackTrans()
+       {
+               $ret = ora_rollback($this->_connectionID);
+               ora_commiton($this->_connectionID);
+               return $ret;
+       }
+
+
+       /* there seems to be a bug in the oracle extension -- always returns 
ORA-00000 - no error */
+       function ErrorMsg() 
+       {   
+        if ($this->_errorMsg !== false) return $this->_errorMsg;
+
+        if (is_resource($this->_curs)) $this->_errorMsg = 
@ora_error($this->_curs);
+               if (empty($this->_errorMsg)) $this->_errorMsg = 
@ora_error($this->_connectionID);
+               return $this->_errorMsg;
+       }
+
+ 
+       function ErrorNo() 
+       {
+               if ($this->_errorCode !== false) return $this->_errorCode;
+
+               if (is_resource($this->_curs)) $this->_errorCode = 
@ora_errorcode($this->_curs);
+               if (empty($this->_errorCode)) $this->_errorCode = 
@ora_errorcode($this->_connectionID);
+        return $this->_errorCode;
+       }
+
+       
+
+               // returns true or false
+               function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename, $mode=0)
+               {
+                       if (!function_exists('ora_plogon')) return null;
+                               
+            // <G. Giunta 2003/03/03/> Reset error messages before connecting
+            $this->_errorMsg = false;
+                   $this->_errorCode = false;
+        
+            // G. Giunta 2003/08/13 - This looks danegrously suspicious: why 
should we want to set
+            // the oracle home to the host name of remote DB?
+//                     if ($argHostname) putenv("ORACLE_HOME=$argHostname");
+
+                       if($argHostname) { // code copied from version 
submitted for oci8 by Jorma Tuomainen <address@hidden>
+                               if (empty($argDatabasename)) $argDatabasename = 
$argHostname;
+                               else {
+                                       if(strpos($argHostname,":")) {
+                                               
$argHostinfo=explode(":",$argHostname);
+                                               $argHostname=$argHostinfo[0];
+                                               $argHostport=$argHostinfo[1];
+                                       } else {
+                                               $argHostport="1521";
+                                       }
+
+
+                                       if ($this->connectSID) {
+                                               
$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+                                               
.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
+                                       } else
+                                               
$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+                                               
.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
+                               }
+
+                       }
+
+                       if ($argDatabasename) $argUsername .= 
"@$argDatabasename";
+
+               //if ($argHostname) print "<p>Connect: 1st argument should be 
left blank for $this->databaseType</p>";
+                       if ($mode = 1)
+                               $this->_connectionID = 
ora_plogon($argUsername,$argPassword);
+                       else
+                               $this->_connectionID = 
ora_logon($argUsername,$argPassword);
+                       if ($this->_connectionID === false) return false;
+                       if ($this->autoCommit) 
ora_commiton($this->_connectionID);
+                       if ($this->_initdate) {
+                               $rs = $this->_query("ALTER SESSION SET 
NLS_DATE_FORMAT='YYYY-MM-DD'");
+                               if ($rs) ora_close($rs);
+                       }
+
+                       return true;
+               }
+
+
+               // returns true or false
+               function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+               {
+                       return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabasename, 1);
+               }
+
+
+               // returns query ID if successful, otherwise false
+               function _query($sql,$inputarr=false)
+               {
+            // <G. Giunta 2003/03/03/> Reset error messages before executing
+            $this->_errorMsg = false;
+                   $this->_errorCode = false;
+
+                       $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;
+            // <G. Giunta 2004/03/03> before we close the cursor, we have to 
store the error message
+            // that we can obtain ONLY from the cursor (and not from the 
connection)
+            $this->_errorCode = @ora_errorcode($curs);
+            $this->_errorMsg = @ora_error($curs);
+            // </G. Giunta 2004/03/03>            
+                       @ora_close($curs);
+                       return false;
+               }
+
+
+               // returns true or false
+               function _close()
+               {
+                       return @ora_logoff($this->_connectionID);
+               }
+
+
+
+}
+
+
+/*--------------------------------------------------------------------------------------
+                Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oracle extends ADORecordSet {
+
+       var $databaseType = "oracle";
+       var $bind = false;
+
+       function ADORecordset_oracle($queryID,$mode=false)
+       {
+               
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               $this->fetchMode = $mode;
+               
+               $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
+               if ($this->fetchMode & ADODB_FETCH_ASSOC)
+                       return 
@ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
+               else 
+                       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)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               
+               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
Index: phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php:1.2    Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php        Tue Feb 21 13:47:42 2006
@@ -1,319 +1,562 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 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://adodb.sourceforge.net
-  
-  Requires ODBC. Works on Windows and Unix.
-*/
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-        
-/*--------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------*/
-
-
-class ADODB_pdo extends ADOConnection {
-       var $databaseType = "pdo";      
-       var $dataProvider = "pdo";
-       var $fmtDate = "'Y-m-d'";
-       var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
-       var $replaceQuote = "''"; // string to use to replace quotes
-       var $hasAffectedRows = true;
-       var $_bindInputArray = true;    
-       var $_genSeqSQL = "create table %s (id integer)";
-       var $_autocommit = true;
-       var $_haserrorfunctions = true;
-       var $_lastAffectedRows = 0;
-       
-       var $stmt = false;
-       
-       function ADODB_pdo() 
-       {
-       }
-       
-
-       // returns true or false
-       function _connect($argDSN, $argUsername, $argPassword, 
$argDatabasename, $persist=false)
-       {
-               $this->_connectionID = new PDO($argDSN, $argUsername, 
$argPassword);
-               if ($this->_connectionID) {
-                       switch(ADODB_ASSOC_CASE){
-                       case 0: $m = PDO_CASE_LOWER; break;
-                       case 1: $m = PDO_CASE_UPPER; break;
-                       default:
-                       case 2: $m = PDO_CASE_NATURAL; break;
-                       }
-                       
-                       
//$this->_connectionID->setAttribute(PDO_ATTR_ERRMODE,PDO_ERRMODE_SILENT );
-                       $this->_connectionID->setAttribute(PDO_ATTR_CASE,$m);
-                       
-                       
//$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,true);
-                       
-                       return true;
-               }
-               return false;
-       }
-       
-       // returns true or false
-       function _pconnect($argDSN, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               return $this->_connect($argDSN, $argUsername, $argPassword, 
$argDatabasename, true);
-       }
-       
-       function ErrorMsg()
-       {
-               if ($this->_stmt) $arr = $this->_stmt->errorInfo();
-               else $arr = $this->_connectionID->errorInfo();
-               
-               if ($arr) {
-                       if ($arr[0]) return $arr[2];
-                       else return '';
-               } else return '-1';
-       }
-       
-       function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-       {
-               $obj = $stmt[1];
-               if ($type) $obj->bindParam($name,$var,$type,$maxLen);
-               else $obj->bindParam($name, $var);
-       }
-       
-       function ErrorNo()
-       {
-               
-               if ($this->_stmt) return $this->_stmt->errorCode();
-               else return $this->_connectionID->errorInfo();
-       }
-
-       function BeginTrans()
-       {       
-               if (!$this->hasTransactions) return false;
-               if ($this->transOff) return true; 
-               $this->transCnt += 1;
-               $this->_autocommit = false;
-               $this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,false);
-               return $this->_connectionID->beginTransaction();
-       }
-       
-       function CommitTrans($ok=true) 
-       { 
-               if ($this->transOff) return true; 
-               if (!$ok) return $this->RollbackTrans();
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->_autocommit = true;
-               
-               $ret = $this->_connectionID->commit();
-               $this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,true);
-               return $ret;
-       }
-       
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true; 
-               if ($this->transCnt) $this->transCnt -= 1;
-               $this->_autocommit = true;
-               
-               $ret = $this->_connectionID->rollback();
-               $this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,true);
-               return $ret;
-       }
-       
-       function Prepare($sql)
-       {
-               $this->_stmt = $this->_connectionID->prepare($sql);
-               if ($this->_stmt) return array($sql,$this->_stmt);
-               
-               return false;
-       }
-       
-       function PrepareStmt($sql)
-       {
-               $stmt = $this->_connectionID->prepare($sql);
-               if (!$stmt) return false;
-               $obj = new ADOPDOStatement($stmt,$this);
-               return $obj;
-       }
-
-       /* returns queryID or false */
-       function _query($sql,$inputarr=false) 
-       {
-               if (is_array($sql)) {
-                       $stmt = $sql[1];
-               } else {
-                       $stmt = $this->_connectionID->prepare($sql);            
-               }
-               if ($stmt) {
-                       if ($inputarr) $stmt->execute($inputarr);
-                       else $stmt->execute();
-               }
-               $this->_stmt = $stmt;
-               return $stmt;
-       }
-
-       // returns true or false
-       function _close()
-       {
-               $this->_stmt = false;
-               return true;
-       }
-
-       function _affectedrows()
-       {
-               return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
-       }
-       
-       function _insertid()
-       {
-               return ($this->_connectionID) ? 
$this->_connectionID->lastInsertId() : 0;
-       }
-}
-
-class ADOPDOStatement {
-
-       var $databaseType = "pdo";              
-       var $dataProvider = "pdo";
-       var $_stmt;
-       var $_connectionID;
-       
-       function ADOPDOStatement($stmt,$connection)
-       {
-               $this->_stmt = $stmt;
-               $this->_connectionID = $connection;
-       }
-       
-       function Execute($inputArr=false)
-       {
-               $savestmt = $this->_connectionID->_stmt;
-               $rs = 
$this->_connectionID->Execute(array(false,$this->_stmt),$inputArr);
-               $this->_connectionID->_stmt = $savestmt;
-               return $rs;
-       }
-       
-       function InParameter(&$var,$name,$maxLen=4000,$type=false)
-       {
-
-               if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
-               else $this->_stmt->bindParam($name, $var);
-       }
-       
-       function Affected_Rows()
-       {
-               return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
-       }
-       
-       function ErrorMsg()
-       {
-               if ($this->_stmt) $arr = $this->_stmt->errorInfo();
-               else $arr = $this->_connectionID->errorInfo();
-               print_r($arr);
-               if ($arr) {
-                       if ($arr[0]) return $arr[2];
-                       else return '';
-               } else return '-1';
-       }
-       
-       function ErrorNo()
-       {
-               if ($this->_stmt) return $this->_stmt->errorCode();
-               else return $this->_connectionID->errorInfo();
-       }
-}
-
-/*--------------------------------------------------------------------------------------
-        Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_pdo extends ADORecordSet {  
-       
-       var $bind = false;
-       var $databaseType = "pdo";              
-       var $dataProvider = "pdo";
-       
-       function ADORecordSet_pdo($id,$mode=false)
-       {
-               if ($mode === false) {  
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch($mode) {
-               default:
-               case ADODB_FETCH_BOTH: $mode = PDO_FETCH_BOTH; break;
-               case ADODB_FETCH_NUM: $mode = PDO_FETCH_NUM; break;
-               case ADODB_FETCH_ASSOC:  $mode = PDO_FETCH_ASSOC; break;
-               }
-               $this->fetchMode = $mode;
-               
-               $this->_queryID = $id;
-               $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);
-               if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-               else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-               return $o;
-       }
-       
-       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->_currentRow == -1) {
-                       $this->_currentRow = 0;
-                       if ($this->EOF = ($this->_fetch() === false)) {
-                               $this->_numOfRows = 0; // _numOfRows could be -1
-                       }
-                       $this->_numOfFields = sizeof($this->fields);
-               } else {
-                       $this->EOF = true;
-               }
-       }
-       
-               
-       function _initrs()
-       {
-       global $ADODB_COUNTRECS;
-       
-               $this->_numOfRows = ($ADODB_COUNTRECS) ? 
@$this->_queryID->rowCount() : -1;
-               if (!$this->_numOfRows) $this->_numOfRows = -1;
-               $this->_numOfFields =0;
-       }       
-       
-       function _seek($row)
-       {
-               return false;
-       }
-       
-       function _fetch()
-       {
-               $this->fields = $this->_queryID->fetch($this->fetchMode);
-               return !empty($this->fields);
-       }
-       
-       function _close() 
-       {
-               $this->_queryID = false;
-       }
-
-}
-
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Requires ODBC. Works on Windows and Unix.
+
+       Problems: 
+               Where is float/decimal type in pdo_param_type
+               LOB handling for CLOB/BLOB differs significantly
+*/
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+
+/*
+enum pdo_param_type {
+PDO::PARAM_NULL, 0
+
+/* int as in long (the php native int type).
+ * If you mark a column as an int, PDO expects get_col to return
+ * a pointer to a long 
+PDO::PARAM_INT, 1
+
+/* get_col ptr should point to start of the string buffer 
+PDO::PARAM_STR, 2
+
+/* get_col: when len is 0 ptr should point to a php_stream *,
+ * otherwise it should behave like a string. Indicate a NULL field
+ * value by setting the ptr to NULL 
+PDO::PARAM_LOB, 3
+
+/* get_col: will expect the ptr to point to a new PDOStatement object handle,
+ * but this isn't wired up yet 
+PDO::PARAM_STMT, 4 /* hierarchical result set 
+
+/* get_col ptr should point to a zend_bool 
+PDO::PARAM_BOOL, 5
+
+
+/* magic flag to denote a parameter as being input/output 
+PDO::PARAM_INPUT_OUTPUT = 0x80000000
+};
+*/
+       
+function adodb_pdo_type($t)
+{
+       switch($t) {
+       case 2: return 'VARCHAR';
+       case 3: return 'BLOB';
+       default: return 'NUMERIC';
+       }
+}
+        
+/*--------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------*/
+
+////////////////////////////////////////////////
+
+
+
+class ADODB_pdo_base extends ADODB_pdo {
+
+       var $sysDate = "'?'";
+       var $sysTimeStamp = "'?'";
+       
+
+       function _init($parentDriver)
+       {
+               $parentDriver->_bindInputArray = true;
+               
#$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
+       }
+       
+       function ServerInfo()
+       {
+               return ADOConnection::ServerInfo();
+       }
+       
+       function 
SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+       {
+               $ret = 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+               return $ret;
+       }
+       
+       function MetaTables()
+       {
+               return false;
+       }
+       
+       function MetaColumns()
+       {
+               return false;
+       }
+}
+
+
+class ADODB_pdo extends ADOConnection {
+       var $databaseType = "pdo";      
+       var $dataProvider = "pdo";
+       var $fmtDate = "'Y-m-d'";
+       var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
+       var $replaceQuote = "''"; // string to use to replace quotes
+       var $hasAffectedRows = true;
+       var $_bindInputArray = true;    
+       var $_genSeqSQL = "create table %s (id integer)";
+       var $_autocommit = true;
+       var $_haserrorfunctions = true;
+       var $_lastAffectedRows = 0;
+       
+       var $_errormsg = false;
+       var $_errorno = false;
+       
+       var $dsnType = '';
+       var $stmt = false;
+       
+       function ADODB_pdo()
+       {
+       }
+       
+       function _UpdatePDO()
+       {
+               $d = &$this->_driver;
+               $this->fmtDate = $d->fmtDate;
+               $this->fmtTimeStamp = $d->fmtTimeStamp;
+               $this->replaceQuote = $d->replaceQuote;
+               $this->sysDate = $d->sysDate;
+               $this->sysTimeStamp = $d->sysTimeStamp;
+               $this->random = $d->random;
+               $this->concat_operator = $d->concat_operator;
+               $this->nameQuote = $d->nameQuote;
+               
+               $d->_init($this);
+       }
+       
+       function Time()
+       {
+               if (!empty($this->_driver->_hasdual)) $sql = "select 
$this->sysTimeStamp from dual";
+               else $sql = "select $this->sysTimeStamp";
+               
+               $rs =& $this->_Execute($sql);
+               if ($rs && !$rs->EOF) return 
$this->UnixTimeStamp(reset($rs->fields));
+               
+               return false;
+       }
+       
+       // returns true or false
+       function _connect($argDSN, $argUsername, $argPassword, 
$argDatabasename, $persist=false)
+       {
+               $at = strpos($argDSN,':');
+               $this->dsnType = substr($argDSN,0,$at);
+
+               if ($argDatabasename) {
+                       $argDSN .= ';dbname='.$argDatabasename;
+               }
+               try {
+                       $this->_connectionID = new PDO($argDSN, $argUsername, 
$argPassword);
+               } catch (Exception $e) {
+                       $this->_connectionID = false;
+                       $this->_errorno = -1;
+                       //var_dump($e);
+                       $this->_errormsg = 'Connection attempt failed: 
'.$e->getMessage();
+                       return false;
+               }
+               
+               if ($this->_connectionID) {
+                       switch(ADODB_ASSOC_CASE){
+                       case 0: $m = PDO::CASE_LOWER; break;
+                       case 1: $m = PDO::CASE_UPPER; break;
+                       default:
+                       case 2: $m = PDO::CASE_NATURAL; break;
+                       }
+                       
+                       
//$this->_connectionID->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_SILENT );
+                       $this->_connectionID->setAttribute(PDO::ATTR_CASE,$m);
+                       
+                       $class = 'ADODB_pdo_'.$this->dsnType;
+                       
//$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
+                       switch($this->dsnType) {
+                       case 'oci':
+                       case 'mysql':
+                       case 'pgsql':
+                       case 'mssql':
+                               
include_once(ADODB_DIR.'/drivers/adodb-pdo_'.$this->dsnType.'.inc.php');
+                               break;
+                       }
+                       if (class_exists($class))
+                               $this->_driver = new $class();
+                       else
+                               $this->_driver = new ADODB_pdo_base();
+                       
+                       $this->_driver->_connectionID = $this->_connectionID;
+                       $this->_UpdatePDO();
+                       return true;
+               }
+               $this->_driver = new ADODB_pdo_base();
+               return false;
+       }
+       
+       // returns true or false
+       function _pconnect($argDSN, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               return $this->_connect($argDSN, $argUsername, $argPassword, 
$argDatabasename, true);
+       }
+       
+       
/*------------------------------------------------------------------------------*/
+       
+       
+       function 
SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+       {       
+               $save = $this->_driver->fetchMode;
+               $this->_driver->fetchMode = $this->fetchMode;
+               $this->_driver->debug = $this->debug;
+               $ret = 
$this->_driver->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+               $this->_driver->fetchMode = $save;
+               return $ret;
+       }
+       
+       
+       function ServerInfo()
+       {
+               return $this->_driver->ServerInfo();
+       }
+       
+       function MetaTables($ttype=false,$showSchema=false,$mask=false)
+       {
+               return $this->_driver->MetaTables($ttype,$showSchema,$mask);
+       }
+       
+       function MetaColumns($table,$normalize=true)
+       {
+               return $this->_driver->MetaColumns($table,$normalize);
+       }
+       
+       function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
+       {
+               $obj = $stmt[1];
+               if ($type) $obj->bindParam($name,$var,$type,$maxLen);
+               else $obj->bindParam($name, $var);
+       }
+       
+       
+       function ErrorMsg()
+       {
+               if ($this->_errormsg !== false) return $this->_errormsg;
+               if (!empty($this->_stmt)) $arr = $this->_stmt->errorInfo();
+               else if (!empty($this->_connectionID)) $arr = 
$this->_connectionID->errorInfo();
+               else return 'No Connection Established';
+               
+               
+               if ($arr) {
+                       if (sizeof($arr)<2) return '';
+                       if ((integer)$arr[1]) return $arr[2];
+                       else return '';
+               } else return '-1';
+       }
+       
+
+       function ErrorNo()
+       {
+               if ($this->_errorno !== false) return $this->_errorno;
+               if (!empty($this->_stmt)) $err = $this->_stmt->errorCode();
+               else if (!empty($this->_connectionID)) {
+                       $arr = $this->_connectionID->errorInfo();
+                       if (isset($arr[0])) $err = $arr[0];
+                       else $err = -1;
+               } else
+                       return 0;
+                       
+               if ($err == '00000') return 0; // allows empty check
+               return $err;
+       }
+
+       function BeginTrans()
+       {       
+               if (!$this->hasTransactions) return false;
+               if ($this->transOff) return true; 
+               $this->transCnt += 1;
+               $this->_autocommit = false;
+               $this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,false);
+               return $this->_connectionID->beginTransaction();
+       }
+       
+       function CommitTrans($ok=true) 
+       { 
+               if (!$this->hasTransactions) return false;
+               if ($this->transOff) return true; 
+               if (!$ok) return $this->RollbackTrans();
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->_autocommit = true;
+               
+               $ret = $this->_connectionID->commit();
+               $this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
+               return $ret;
+       }
+       
+       function RollbackTrans()
+       {
+               if (!$this->hasTransactions) return false;
+               if ($this->transOff) return true; 
+               if ($this->transCnt) $this->transCnt -= 1;
+               $this->_autocommit = true;
+               
+               $ret = $this->_connectionID->rollback();
+               $this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
+               return $ret;
+       }
+       
+       function Prepare($sql)
+       {
+               $this->_stmt = $this->_connectionID->prepare($sql);
+               if ($this->_stmt) return array($sql,$this->_stmt);
+               
+               return false;
+       }
+       
+       function PrepareStmt($sql)
+       {
+               $stmt = $this->_connectionID->prepare($sql);
+               if (!$stmt) return false;
+               $obj = new ADOPDOStatement($stmt,$this);
+               return $obj;
+       }
+
+       /* returns queryID or false */
+       function _query($sql,$inputarr=false) 
+       {
+               if (is_array($sql)) {
+                       $stmt = $sql[1];
+               } else {
+                       $stmt = $this->_connectionID->prepare($sql);
+               }
+               
+               if ($stmt) {
+                       $this->_driver->debug = $this->debug;
+                       if ($inputarr) $ok = $stmt->execute($inputarr);
+                       else $ok = $stmt->execute();
+               } 
+               
+               
+               $this->_errormsg = false;
+               $this->_errorno = false;
+                       
+               if ($ok) {
+                       $this->_stmt = $stmt;
+                       return $stmt;
+               }
+               
+               if ($stmt) {
+                       
+                       $arr = $stmt->errorinfo();
+                       if ((integer)$arr[1]) {
+                               $this->_errormsg = $arr[2];
+                               $this->_errorno = $arr[1];
+                       }
+
+               } else {
+                       $this->_errormsg = false;
+                       $this->_errorno = false;
+               }
+               return false;
+       }
+
+       // returns true or false
+       function _close()
+       {
+               $this->_stmt = false;
+               return true;
+       }
+
+       function _affectedrows()
+       {
+               return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
+       }
+       
+       function _insertid()
+       {
+               return ($this->_connectionID) ? 
$this->_connectionID->lastInsertId() : 0;
+       }
+}
+
+class ADOPDOStatement {
+
+       var $databaseType = "pdo";              
+       var $dataProvider = "pdo";
+       var $_stmt;
+       var $_connectionID;
+       
+       function ADOPDOStatement($stmt,$connection)
+       {
+               $this->_stmt = $stmt;
+               $this->_connectionID = $connection;
+       }
+       
+       function Execute($inputArr=false)
+       {
+               $savestmt = $this->_connectionID->_stmt;
+               $rs = 
$this->_connectionID->Execute(array(false,$this->_stmt),$inputArr);
+               $this->_connectionID->_stmt = $savestmt;
+               return $rs;
+       }
+       
+       function InParameter(&$var,$name,$maxLen=4000,$type=false)
+       {
+
+               if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
+               else $this->_stmt->bindParam($name, $var);
+       }
+       
+       function Affected_Rows()
+       {
+               return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
+       }
+       
+       function ErrorMsg()
+       {
+               if ($this->_stmt) $arr = $this->_stmt->errorInfo();
+               else $arr = $this->_connectionID->errorInfo();
+
+               if (is_array($arr)) {
+                       if ((integer) $arr[0] && isset($arr[2])) return $arr[2];
+                       else return '';
+               } else return '-1';
+       }
+       
+       function NumCols()
+       {
+               return ($this->_stmt) ? $this->_stmt->columnCount() : 0;
+       }
+       
+       function ErrorNo()
+       {
+               if ($this->_stmt) return $this->_stmt->errorCode();
+               else return $this->_connectionID->errorInfo();
+       }
+}
+
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_pdo extends ADORecordSet {  
+       
+       var $bind = false;
+       var $databaseType = "pdo";              
+       var $dataProvider = "pdo";
+       
+       function ADORecordSet_pdo($id,$mode=false)
+       {
+               if ($mode === false) {  
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               $this->adodbFetchMode = $mode;
+               switch($mode) {
+               case ADODB_FETCH_NUM: $mode = PDO::FETCH_NUM; break;
+               case ADODB_FETCH_ASSOC:  $mode = PDO::FETCH_ASSOC; break;
+               
+               case ADODB_FETCH_BOTH: 
+               default: $mode = PDO::FETCH_BOTH; break;
+               }
+               $this->fetchMode = $mode;
+               
+               $this->_queryID = $id;
+               $this->ADORecordSet($id);
+       }
+
+       
+       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->_currentRow == -1) {
+                       $this->_currentRow = 0;
+                       if ($this->EOF = ($this->_fetch() === false)) {
+                               $this->_numOfRows = 0; // _numOfRows could be -1
+                       }
+               } else {
+                       $this->EOF = true;
+               }
+       }
+       
+       function _initrs()
+       {
+       global $ADODB_COUNTRECS;
+       
+               $this->_numOfRows = ($ADODB_COUNTRECS) ? 
@$this->_queryID->rowCount() : -1;
+               if (!$this->_numOfRows) $this->_numOfRows = -1;
+               $this->_numOfFields = $this->_queryID->columnCount();
+       }
+
+       // returns the field object
+       function &FetchField($fieldOffset = -1) 
+       {
+               $off=$fieldOffset+1; // offsets begin at 1
+               
+               $o= new ADOFieldObject();
+               $arr = @$this->_queryID->getColumnMeta($fieldOffset);
+               if (!$arr) {
+                       $o->name = 'bad getColumnMeta()';
+                       $o->max_length = -1;
+                       $o->type = 'VARCHAR';
+                       $o->precision = 0;
+       #               $false = false;
+                       return $o;
+               }
+               //adodb_pr($arr);
+               $o->name = $arr['name'];
+               if (isset($arr['native_type'])) $o->type = $arr['native_type'];
+               else $o->type = adodb_pdo_type($arr['pdo_type']);
+               $o->max_length = $arr['len'];
+               $o->precision = $arr['precision'];
+               
+               if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+               else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+               return $o;
+       }
+       
+       function _seek($row)
+       {
+               return false;
+       }
+       
+       function _fetch()
+       {
+               if (!$this->_queryID) return false;
+               
+               $this->fields = $this->_queryID->fetch($this->fetchMode);
+               return !empty($this->fields);
+       }
+       
+       function _close() 
+       {
+               $this->_queryID = false;
+       }
+       
+       function Fields($colname)
+       {
+               if ($this->adodbFetchMode != ADODB_FETCH_NUM) return 
@$this->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)]];
+       }
+
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php:1.2       Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php   Tue Feb 21 13:47:42 2006
@@ -1,14 +1,14 @@
-<?php
-/*
- V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 4.
-  
-  NOTE: Since 3.31, this file is no longer used, and the "postgres" driver is
-  remapped to "postgres7". Maintaining multiple postgres drivers is no easy
-  job, so hopefully this will ensure greater consistency and fewer bugs.
-*/
-
+<?php
+/*
+ V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 4.
+  
+  NOTE: Since 3.31, this file is no longer used, and the "postgres" driver is
+  remapped to "postgres7". Maintaining multiple postgres drivers is no easy
+  job, so hopefully this will ensure greater consistency and fewer bugs.
+*/
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php:1.2     Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php Tue Feb 21 13:47:42 2006
@@ -1,994 +1,1047 @@
-<?php
-/*
- V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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 (address@hidden) - DBNet 
Informatica & Comunicaciones. 
-  08 Nov 2000 jlim - Minor corrections, removing mysql stuff
-  09 Nov 2000 jlim - added insertid support suggested by "Christopher 
Kings-Lynne" <address@hidden>
-                                       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" <address@hidden>
-  27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by 
"Lennie" <address@hidden>
-  15 Dec 2000 jlim - added changes suggested by Additional code changes by 
"Eric G. Werk" address@hidden 
-  31 Jan 2002 jlim - finally installed postgresql. testing
-  01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
-  
-  See http://www.varlena.com/varlena/GeneralBits/47.php
-  
-       -- What indexes are on my table?
-       select * from pg_indexes where tablename = 'tablename';
-       
-       -- What triggers are on my table?
-       select c.relname as "Table", t.tgname as "Trigger Name", 
-          t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
-          t.tgisconstraint as "Is Constraint", cc.relname as "Referenced 
Table",
-          p.proname as "Function Name"
-       from pg_trigger t, pg_class c, pg_class cc, pg_proc p
-       where t.tgfoid = p.oid and t.tgrelid = c.oid
-          and t.tgconstrrelid = cc.oid
-          and c.relname = 'tablename';
-       
-       -- What constraints are on my table?
-       select r.relname as "Table", c.conname as "Constraint Name",
-          contype as "Constraint Type", conkey as "Key Columns",
-          confkey as "Foreign Columns", consrc as "Source"
-       from pg_class r, pg_constraint c
-       where r.oid = c.conrelid
-          and relname = 'tablename';
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-function adodb_addslashes($s)
-{
-       $len = strlen($s);
-       if ($len == 0) return "''";
-       if (strncmp($s,"'",1) === 0 && substr(s,$len-1) == "'") return $s; // 
already quoted
-       
-       return "'".addslashes($s)."'";
-}
-
-class ADODB_postgres64 extends ADOConnection{
-       var $databaseType = 'postgres64';
-       var $dataProvider = 'postgres';
-       var $hasInsertID = true;
-       var $_resultid = false;
-       var $concat_operator='||';
-       var $metaDatabasesSQL = "select datname from pg_database where datname 
not in ('template0','template1') order by 1";
-    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename 
not like 'pg\_%'
-       and tablename not in ('sql_features', 'sql_implementation_info', 
'sql_languages',
-        'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
-       union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
-       //"select tablename from pg_tables where tablename not like 'pg_%' 
order by 1";
-       var $isoDates = true; // accepts dates in ISO format
-       var $sysDate = "CURRENT_DATE";
-       var $sysTimeStamp = "CURRENT_TIMESTAMP";
-       var $blobEncodeType = 'C';
-       var $metaColumnsSQL = "SELECT 
a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
-               FROM pg_class c, pg_attribute a,pg_type t 
-               WHERE relkind = 'r' AND (c.relname='%s' or c.relname = 
lower('%s')) and a.attname not like '....%%'
-AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY 
a.attnum";
-
-       var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, 
a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
-WHERE relkind = 'r' AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-       and a.attname not like '....%%' 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 $hasAffectedRows = true;
-       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 G: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 START %s";
-       var $_dropSeqSQL = "DROP SEQUENCE %s";
-       var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from 
pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by 
d.adnum";
-       var $random = 'random()';               /// random function
-       var $autoRollback = true; // apparently pgsql does not autorollback 
properly before 4.3.4
-                                                       // 
http://bugs.php.net/bug.php?id=25404
-                                                       
-       var $_bindInputArray = false; // requires postgresql 7.3+ and ability 
to modify database
-       
-       // 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_postgres64() 
-       {
-       // changes the metaColumnsSQL, adds columns: attnum[6]
-       }
-       
-       function ServerInfo()
-       {
-               if (isset($this->version)) return $this->version;
-               
-               $arr['description'] = $this->GetOne("select version()");
-               $arr['version'] = ADOConnection::_findvers($arr['description']);
-               $this->version = $arr;
-               return $arr;
-       }
-
-       function IfNull( $field, $ifNull ) 
-       {
-               return " coalesce($field, $ifNull) "; 
-       }
-
-       // 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($table,$column)
-       {
-               if (!is_resource($this->_resultid) || 
get_resource_type($this->_resultid) !== 'pgsql result') return false;
-               $oid = pg_getlastoid($this->_resultid);
-               // to really return the id, we need the table and column-name, 
else we can only return the oid != id
-               return empty($table) || empty($column) ? $oid : 
$this->GetOne("SELECT $column FROM $table WHERE oid=".(int)$oid);
-       }
-
-// 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()
-   {
-               if (!is_resource($this->_resultid) || 
get_resource_type($this->_resultid) !== 'pgsql result') return false;
-               return pg_cmdtuples($this->_resultid);
-   }
-   
-       
-               // returns true/false
-       function BeginTrans()
-       {
-               if ($this->transOff) return true;
-               $this->transCnt += 1;
-               return @pg_Exec($this->_connectionID, "begin");
-       }
-       
-       function RowLock($tables,$where) 
-       {
-               if (!$this->transCnt) $this->BeginTrans();
-               return $this->GetOne("select 1 as ignore from $tables where 
$where for update");
-       }
-
-       // returns true/false. 
-       function CommitTrans($ok=true) 
-       { 
-               if ($this->transOff) return true;
-               if (!$ok) return $this->RollbackTrans();
-               
-               $this->transCnt -= 1;
-               return @pg_Exec($this->_connectionID, "commit");
-       }
-       
-       // returns true/false
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true;
-               $this->transCnt -= 1;
-               return @pg_Exec($this->_connectionID, "rollback");
-       }
-       
-       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-       {
-               $info = $this->ServerInfo();
-               if ($info['version'] >= 7.3) {
-               $this->metaTablesSQL = "select tablename,'T' from pg_tables 
where tablename not like 'pg\_%'
-                         and schemaname  not in ( 
'pg_catalog','information_schema')
-       union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and 
schemaname  not in ( 'pg_catalog','information_schema') ";
-               }
-               if ($mask) {
-                       $save = $this->metaTablesSQL;
-                       $mask = $this->qstr(strtolower($mask));
-                       if ($info['version']>=7.3)
-                               $this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname 
not in ( 'pg_catalog','information_schema')  
- union 
-select viewname,'V' from pg_views where viewname like $mask and schemaname  
not in ( 'pg_catalog','information_schema')  ";
-                       else
-                               $this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
-select viewname,'V' from pg_views where viewname like $mask";
-               }
-               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
-               
-               if ($mask) {
-                       $this->metaTablesSQL = $save;
-               }
-               return $ret;
-       }
-       
-       /*
-       // if magic quotes disabled, use pg_escape_string()
-       function qstr($s,$magic_quotes=false)
-       {
-               if (!$magic_quotes) {
-                       if (ADODB_PHPVER >= 0x4200) {
-                               return  "'".pg_escape_string($s)."'";
-                       }
-                       if ($this->replaceQuote[0] == '\\'){
-                               $s = 
adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-                       }
-                       return  
"'".str_replace("'",$this->replaceQuote,$s)."'"; 
-               }
-               
-               // undo magic quotes for "
-               $s = str_replace('\\"','"',$s);
-               return "'$s'";
-       }
-       */
-       
-       
-       // Format date column in sql string given an input format that 
understands Y M D
-       function SQLDate($fmt, $col=false)
-       {       
-               if (!$col) $col = $this->sysTimeStamp;
-               $s = 'TO_CHAR('.$col.",'";
-               
-               $len = strlen($fmt);
-               for ($i=0; $i < $len; $i++) {
-                       $ch = $fmt[$i];
-                       switch($ch) {
-                       case 'Y':
-                       case 'y':
-                               $s .= 'YYYY';
-                               break;
-                       case 'Q':
-                       case 'q':
-                               $s .= 'Q';
-                               break;
-                               
-                       case 'M':
-                               $s .= 'Mon';
-                               break;
-                               
-                       case 'm':
-                               $s .= 'MM';
-                               break;
-                       case 'D':
-                       case 'd':
-                               $s .= 'DD';
-                               break;
-                       
-                       case 'H':
-                               $s.= 'HH24';
-                               break;
-                               
-                       case 'h':
-                               $s .= 'HH';
-                               break;
-                               
-                       case 'i':
-                               $s .= 'MI';
-                               break;
-                       
-                       case 's':
-                               $s .= 'SS';
-                               break;
-                       
-                       case 'a':
-                       case 'A':
-                               $s .= 'AM';
-                               break;
-                               
-                       default:
-                       // handle escape characters...
-                               if ($ch == '\\') {
-                                       $i++;
-                                       $ch = substr($fmt,$i,1);
-                               }
-                               if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-                               else $s .= '"'.$ch.'"';
-                               
-                       }
-               }
-               return $s. "')";
-       }
-       
-       
-       
-       /* 
-       * Load a Large Object from a file 
-       * - the procedure stores the object id in the table and imports the 
object using 
-       * postgres proprietary blob handling routines 
-       *
-       * contributed by Mattia Rossi address@hidden
-       * modified for safe mode by juraj chlebec
-       */ 
-       function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-       { 
-               pg_exec ($this->_connectionID, "begin"); 
-               
-               $fd = fopen($path,'r');
-               $contents = fread($fd,filesize($path));
-               fclose($fd);
-               
-               $oid = pg_lo_create($this->_connectionID);
-               $handle = pg_lo_open($this->_connectionID, $oid, 'w');
-               pg_lo_write($handle, $contents);
-               pg_lo_close($handle);
-               
-               // $oid = pg_lo_import ($path); 
-               pg_exec($this->_connectionID, "commit"); 
-               $rs = 
ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype); 
-               $rez = !empty($rs); 
-               return $rez; 
-       } 
-       
-       /*
-               Hueristic - not guaranteed to work.
-       */
-       function GuessOID($oid)
-       {
-               if (strlen($oid)>16) return false;
-               return is_numeric($oid);
-       }
-       
-       /* 
-       * If an OID is detected, then we use pg_lo_* to open the oid file and 
read the
-       * real blob from the db using the oid supplied as a parameter. If you 
are storing
-       * blobs using bytea, we autodetect and process it so this function is 
not needed.
-       *
-       * contributed by Mattia Rossi address@hidden
-       *
-       * see http://www.postgresql.org/idocs/index.php?largeobjects.html
-       *
-       * Since adodb 4.54, this returns the blob, instead of sending it to 
stdout. Also
-       * added maxsize parameter, which defaults to $db->maxblobsize if not 
defined.
-       */ 
-       function BlobDecode($blob,$maxsize=false,$hastrans=true) 
-       {
-               if (!$this->GuessOID($blob)) return $blob;
-               
-               if ($hastrans) @pg_exec($this->_connectionID,"begin"); 
-               $fd = @pg_lo_open($this->_connectionID,$blob,"r");
-               if ($fd === false) {
-                       if ($hastrans) @pg_exec($this->_connectionID,"commit");
-                       return $blob;
-               }
-               if (!$maxsize) $maxsize = $this->maxblobsize;
-               $realblob = @pg_loread($fd,$maxsize); 
-               @pg_loclose($fd); 
-               if ($hastrans) @pg_exec($this->_connectionID,"commit"); 
-               return $realblob;
-       } 
-       
-       /* 
-               See 
http://www.postgresql.org/idocs/index.php?datatype-binary.html
-               
-               NOTE: SQL string literals (input strings) must be preceded with 
two backslashes 
-               due to the fact that they must pass through two parsers in the 
PostgreSQL 
-               backend.
-       */
-       function BlobEncode($blob)
-       {
-               if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
-               
-               /*92=backslash, 0=null, 39=single-quote*/
-               $badch = array(chr(92),chr(0),chr(39)); # \  null  '
-               $fixch = array('\\\\134','\\\\000','\\\\047');
-               return adodb_str_replace($badch,$fixch,$blob);
-               
-               // note that there is a pg_escape_bytea function only for php 
4.2.0 or later
-       }
-       
-       function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-       {
-               // do not use bind params which uses qstr(), as blobencode() 
already quotes data
-               return $this->Execute("UPDATE $table SET 
$column='".$this->BlobEncode($val)."'::bytea WHERE $where");
-       }
-       
-       function OffsetDate($dayFraction,$date=false)
-       {               
-               if (!$date) $date = $this->sysDate;
-               return "($date+interval'$dayFraction days')";
-       }
-       
-
-       // for schema support, pass in the $table param "$schema.$tabname".
-       // converts field names to lowercase, $upper is ignored
-       function &MetaColumns($table,$normalize=true) 
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $schema = false;
-               $this->_findschema($table,$schema);
-               
-               if ($normalize) $table = strtolower($table);
-
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
-               
-               if ($schema) $rs =& 
$this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
-               else $rs =& 
$this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
-               if (isset($savem)) $this->SetFetchMode($savem);
-               $ADODB_FETCH_MODE = $save;
-               
-               if ($rs === false) {
-                       $false = 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.
-                       
-                       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-                       
-                       $rskey = 
$this->Execute(sprintf($this->metaKeySQL,($table)));
-                       // fetch all result in once for performance.
-                       $keys =& $rskey->GetArray();
-                       if (isset($savem)) $this->SetFetchMode($savem);
-                       $ADODB_FETCH_MODE = $save;
-                       
-                       $rskey->Close();
-                       unset($rskey);
-               }
-
-               $rsdefa = array();
-               if (!empty($this->metaDefaultsSQL)) {
-                       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-                       $sql = sprintf($this->metaDefaultsSQL, ($table));
-                       $rsdef = $this->Execute($sql);
-                       if (isset($savem)) $this->SetFetchMode($savem);
-                       $ADODB_FETCH_MODE = $save;
-                       
-                       if ($rsdef) {
-                               while (!$rsdef->EOF) {
-                                       $num = $rsdef->fields['num'];
-                                       $s = $rsdef->fields['def'];
-                                       if (strpos($s,'::')===false && 
substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
-                                               $s = substr($s, 1);
-                                               $s = substr($s, 0, strlen($s) - 
1);
-                                       }
-
-                                       $rsdefa[$num] = $s;
-                                       $rsdef->MoveNext();
-                               }
-                       } else {
-                               ADOConnection::outp( "==> SQL => " . $sql);
-                       }
-                       unset($rsdef);
-               }
-       
-               $retarr = array();
-               while (!$rs->EOF) {     
-                       $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;
-                       if ($fld->type == 'numeric') {
-                               $fld->scale = $fld->max_length & 0xFFFF;
-                               $fld->max_length >>= 16;
-                       }
-                       // dannym
-                       // 5 hasdefault; 6 num-of-column
-                       $fld->has_default = ($rs->fields[5] == 't');
-                       if ($fld->has_default) {
-                               $fld->default_value = $rsdefa[$rs->fields[6]];
-                       }
-
-                       //Freek
-                       if ($rs->fields[4] == $this->true) {
-                               $fld->not_null = true;
-                       }
-                       
-                       // Freek
-                       if (is_array($keys)) {
-                               foreach($keys as $key) {
-                                       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?
-                               }
-                       }
-                       
-                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = 
$fld;     
-                       else $retarr[($normalize) ? strtoupper($fld->name) : 
$fld->name] = $fld;
-                       
-                       $rs->MoveNext();
-               }
-               $rs->Close();
-               return $retarr; 
-               
-       }
-
-         function &MetaIndexes ($table, $primary = FALSE)
-      {
-         global $ADODB_FETCH_MODE;
-                
-                               $schema = false;
-                               $this->_findschema($table,$schema);
-
-                               if ($schema) { // requires pgsql 7.3+ - 
pg_namespace used.
-                                       $sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns" 
-FROM pg_catalog.pg_class c 
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid 
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-       ,pg_namespace n 
-WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and 
c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\' 
AND i.indisprimary=false';
-                               } else {
-                       $sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
-FROM pg_catalog.pg_class c
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-WHERE c2.relname=\'%s\' or c2.relname=lower(\'%s\')';
-                       }
-                                           
-                if ($primary == FALSE) {
-                       $sql .= ' AND i.indisprimary=false;';
-                }
-                
-                $save = $ADODB_FETCH_MODE;
-                $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                if ($this->fetchMode !== FALSE) {
-                        $savem = $this->SetFetchMode(FALSE);
-                }
-                
-                $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
-                if (isset($savem)) {
-                        $this->SetFetchMode($savem);
-                }
-                $ADODB_FETCH_MODE = $save;
-
-                if (!is_object($rs)) {
-                       $false = false;
-                                       return $false;
-                }
-                               
-                $col_names = $this->MetaColumnNames($table,true);
-                $indexes = array();
-                while ($row = $rs->FetchRow()) {
-                        $columns = array();
-                        foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col - 1];
-                        }
-                        
-                        $indexes[$row[0]] = array(
-                                'unique' => ($row[1] == 't'),
-                                'columns' => $columns
-                        );
-                }
-                return $indexes;
-        }
-
-       // 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='',$ctype=0)
-       {
-               
-               if (!function_exists('pg_pconnect')) return null;
-               
-               $this->_errorMsg = false;
-               
-               if ($user || $pwd || $db) {
-                       $user = adodb_addslashes($user);
-                       $pwd = adodb_addslashes($pwd);
-                       if (strlen($db) == 0) $db = 'template1';
-                       $db = adodb_addslashes($db);
-                       if ($str)  {
-                               $host = split(":", $str);
-                               if ($host[0]) $str = 
"host=".adodb_addslashes($host[0]);
-                               else $str = 'host=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";
-               
-               if ($ctype === 1) { // persistent
-                       $this->_connectionID = pg_pconnect($str);
-               } else {
-                       if ($ctype === -1) { // nconnect, we trick pgsql ext by 
changing the connection str
-                       static $ncnt;
-                       
-                               if (empty($ncnt)) $ncnt = 1;
-                               else $ncnt += 1;
-                               
-                               $str .= str_repeat(' ',$ncnt);
-                       }
-                       $this->_connectionID = pg_connect($str);
-               }
-               if ($this->_connectionID === false) return false;
-               $this->Execute("set datestyle='ISO'");
-               return true;
-       }
-       
-       function _nconnect($argHostname, $argUsername, $argPassword, 
$argDatabaseName)
-       {
-               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabaseName,-1);
-       }
-        
-       // 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='')
-       {
-               return $this->_connect($str,$user,$pwd,$db,1);
-       }
-       
-
-       // returns queryID or false
-       function _query($sql,$inputarr)
-       {
-               
-               if ($inputarr) {
-               /*
-                       It appears that PREPARE/EXECUTE is slower for many 
queries.
-                       
-                       For query executed 1000 times:
-                       "select id,firstname,lastname from adoxyz 
-                               where firstname not like ? and lastname not 
like ? and id = ?"
-                               
-                       with plan = 1.51861286163 secs
-                       no plan =   1.26903700829 secs
-
-                       
-
-               */
-                       $plan = 'P'.md5($sql);
-                               
-                       $execp = '';
-                       foreach($inputarr as $v) {
-                               if ($execp) $execp .= ',';
-                               if (is_string($v)) {
-                                       if (strncmp($v,"'",1) !== 0) $execp .= 
$this->qstr($v);
-                               } else {
-                                       $execp .= $v;
-                               }
-                       }
-                       
-                       if ($execp) $exsql = "EXECUTE $plan ($execp)";
-                       else $exsql = "EXECUTE $plan";
-                       
-                       $rez = @pg_exec($this->_connectionID,$exsql);
-                       if (!$rez) {
-                       # Perhaps plan does not exist? Prepare/compile plan.
-                               $params = '';
-                               foreach($inputarr as $v) {
-                                       if ($params) $params .= ',';
-                                       if (is_string($v)) {
-                                               $params .= 'VARCHAR';
-                                       } else if (is_integer($v)) {
-                                               $params .= 'INTEGER';
-                                       } else {
-                                               $params .= "REAL";
-                                       }
-                               }
-                               $sqlarr = explode('?',$sql);
-                               //print_r($sqlarr);
-                               $sql = '';
-                               $i = 1;
-                               foreach($sqlarr as $v) {
-                                       $sql .= $v.' $'.$i;
-                                       $i++;
-                               }
-                               $s = "PREPARE $plan ($params) AS 
".substr($sql,0,strlen($sql)-2);               
-                               //adodb_pr($s);
-                               pg_exec($this->_connectionID,$s);
-                               echo $this->ErrorMsg();
-                       }
-                       
-                       $rez = pg_exec($this->_connectionID,$exsql);
-               } else {
-                       $this->_errorMsg = false;
-                       //adodb_backtrace();
-                       $rez = pg_exec($this->_connectionID,$sql);
-               }
-               // check if no data returned, then no need to create real 
recordset
-               if ($rez && pg_numfields($rez) <= 0) {
-                       if (is_resource($this->_resultid) && 
get_resource_type($this->_resultid) === 'pgsql result') {
-                               pg_freeresult($this->_resultid);
-                       }
-                       $this->_resultid = $rez;
-                       return true;
-               }
-               
-               return $rez;
-       }
-       
-
-       /*      Returns: the last error message from previous database 
operation        */      
-       function ErrorMsg() 
-       {
-               if ($this->_errorMsg !== false) return $this->_errorMsg;
-               if (ADODB_PHPVER >= 0x4300) {
-                       if (!empty($this->_resultid)) {
-                               $this->_errorMsg = 
@pg_result_error($this->_resultid);
-                               if ($this->_errorMsg) return $this->_errorMsg;
-                       }
-                       
-                       if (!empty($this->_connectionID)) {
-                               $this->_errorMsg = 
@pg_last_error($this->_connectionID);
-                       } else $this->_errorMsg = @pg_last_error();
-               } else {
-                       if (empty($this->_connectionID)) $this->_errorMsg = 
@pg_errormessage();
-                       else $this->_errorMsg = 
@pg_errormessage($this->_connectionID);
-               }
-               return $this->_errorMsg;
-       }
-       
-       function ErrorNo()
-       {
-               $e = $this->ErrorMsg();
-               if (strlen($e)) {
-                       return ADOConnection::MetaError($e);
-                }
-                return 0;
-       }
-
-       // returns true or false
-       function _close()
-       {
-               if ($this->transCnt) $this->RollbackTrans();
-               if ($this->_resultid) {
-                       @pg_freeresult($this->_resultid);
-                       $this->_resultid = false;
-               }
-               @pg_close($this->_connectionID);
-               $this->_connectionID = false;
-               return true;
-       }
-       
-       
-       /*
-       * Maximum size of C field
-       */
-       function CharMax()
-       {
-               return 1000000000;  // should be 1 Gb?
-       }
-       
-       /*
-       * Maximum size of X field
-       */
-       function TextMax()
-       {
-               return 1000000000; // should be 1 Gb?
-       }
-       
-               
-}
-       
-/*--------------------------------------------------------------------------------------
-        Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_postgres64 extends ADORecordSet{
-       var $_blobArr;
-       var $databaseType = "postgres64";
-       var $canSeek = true;
-       function ADORecordSet_postgres64($queryID,$mode=false) 
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch ($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->adodbFetchMode = $mode;
-               $this->ADORecordSet($queryID);
-       }
-       
-       function &GetRowAssoc($upper=true)
-       {
-               if ($this->fetchMode == PGSQL_ASSOC && !$upper) return 
$this->fields;
-               $row =& ADORecordSet::GetRowAssoc($upper);
-               return $row;
-       }
-
-       function _initrs()
-       {
-       global $ADODB_COUNTRECS;
-               $qid = $this->_queryID;
-               $this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($qid):-1;
-               $this->_numOfFields = @pg_numfields($qid);
-               
-               // cache types for blob decode check
-               for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {  
-                       if (pg_fieldtype($qid,$i) == 'bytea') {
-                               $this->_blobArr[$i] = pg_fieldname($qid,$i);
-                       }
-               }
-       }
-
-               /* Use associative array to get fields array */
-       function Fields($colname)
-       {
-               if ($this->fetchMode != PGSQL_NUM) return 
@$this->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($off = 0) 
-       {
-               // 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);
-               return $o;      
-       }
-
-       function _seek($row)
-       {
-               return @pg_fetch_row($this->_queryID,$row);
-       }
-       
-       function _decode($blob)
-       {
-               
eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
-               return $realblob;       
-       }
-       
-       function _fixblobs()
-       {
-               if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == 
PGSQL_BOTH) {
-                       foreach($this->_blobArr as $k => $v) {
-                               $this->fields[$k] = 
ADORecordSet_postgres64::_decode($this->fields[$k]);
-                       }
-               }
-               if ($this->fetchMode == PGSQL_ASSOC || $this->fetchMode == 
PGSQL_BOTH) {
-                       foreach($this->_blobArr as $k => $v) {
-                               $this->fields[$v] = 
ADORecordSet_postgres64::_decode($this->fields[$v]);
-                       }
-               }
-       }
-       
-       // 10% speedup to move MoveNext to child class
-       function MoveNext() 
-       {
-               if (!$this->EOF) {
-                       $this->_currentRow++;
-                       if ($this->_numOfRows < 0 || $this->_numOfRows > 
$this->_currentRow) {
-                               $this->fields = 
@pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-                               if (is_array($this->fields) && $this->fields) {
-                                       if (isset($this->_blobArr)) 
$this->_fixblobs();
-                                       return true;
-                               }
-                       }
-                       $this->fields = false;
-                       $this->EOF = true;
-               }
-               return false;
-       }               
-       
-       function _fetch()
-       {
-                               
-               if ($this->_currentRow >= $this->_numOfRows && 
$this->_numOfRows >= 0)
-               return false;
-
-               $this->fields = 
@pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-               
-       if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-                       
-               return (is_array($this->fields));
-       }
-
-       function _close() 
-       { 
-               return @pg_freeresult($this->_queryID);
-       }
-
-       function MetaType($t,$len=-1,$fieldobj=false)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               switch (strtoupper($t)) {
-                               case 'MONEY': // stupid, postgres expects money 
to be a string
-                               case 'INTERVAL':
-                               case 'CHAR':
-                               case 'CHARACTER':
-                               case 'VARCHAR':
-                               case 'NAME':
-                               case 'BPCHAR':
-                               case '_VARCHAR':
-                                       if ($len <= $this->blobSize) return 'C';
-                               
-                               case 'TEXT':
-                                       return 'X';
-               
-                               case 'IMAGE': // user defined type
-                               case 'BLOB': // user defined type
-                               case 'BIT':     // This is a bit string, not a 
single bit, so don't return 'L'
-                               case 'VARBIT':
-                               case 'BYTEA':
-                                       return 'B';
-                               
-                               case 'BOOL':
-                               case 'BOOLEAN':
-                                       return 'L';
-                               
-                               case 'DATE':
-                                       return 'D';
-                               
-                               case 'TIME':
-                               case 'DATETIME':
-                               case 'TIMESTAMP':
-                               case 'TIMESTAMPTZ':
-                                       return 'T';
-                               
-                               case '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';
-                       }
-       }
-
-}
-?>
+<?php
+/*
+ V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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 (address@hidden) - DBNet 
Informatica & Comunicaciones. 
+  08 Nov 2000 jlim - Minor corrections, removing mysql stuff
+  09 Nov 2000 jlim - added insertid support suggested by "Christopher 
Kings-Lynne" <address@hidden>
+                                       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" <address@hidden>
+  27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by 
"Lennie" <address@hidden>
+  15 Dec 2000 jlim - added changes suggested by Additional code changes by 
"Eric G. Werk" address@hidden 
+  31 Jan 2002 jlim - finally installed postgresql. testing
+  01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
+  
+  See http://www.varlena.com/varlena/GeneralBits/47.php
+  
+       -- What indexes are on my table?
+       select * from pg_indexes where tablename = 'tablename';
+       
+       -- What triggers are on my table?
+       select c.relname as "Table", t.tgname as "Trigger Name", 
+          t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
+          t.tgisconstraint as "Is Constraint", cc.relname as "Referenced 
Table",
+          p.proname as "Function Name"
+       from pg_trigger t, pg_class c, pg_class cc, pg_proc p
+       where t.tgfoid = p.oid and t.tgrelid = c.oid
+          and t.tgconstrrelid = cc.oid
+          and c.relname = 'tablename';
+       
+       -- What constraints are on my table?
+       select r.relname as "Table", c.conname as "Constraint Name",
+          contype as "Constraint Type", conkey as "Key Columns",
+          confkey as "Foreign Columns", consrc as "Source"
+       from pg_class r, pg_constraint c
+       where r.oid = c.conrelid
+          and relname = 'tablename';
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+function adodb_addslashes($s)
+{
+       $len = strlen($s);
+       if ($len == 0) return "''";
+       if (strncmp($s,"'",1) === 0 && substr($s,$len-1) == "'") return $s; // 
already quoted
+       
+       return "'".addslashes($s)."'";
+}
+
+class ADODB_postgres64 extends ADOConnection{
+       var $databaseType = 'postgres64';
+       var $dataProvider = 'postgres';
+       var $hasInsertID = true;
+       var $_resultid = false;
+       var $concat_operator='||';
+       var $metaDatabasesSQL = "select datname from pg_database where datname 
not in ('template0','template1') order by 1";
+    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename 
not like 'pg\_%'
+       and tablename not in ('sql_features', 'sql_implementation_info', 
'sql_languages',
+        'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
+       union 
+        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
+       //"select tablename from pg_tables where tablename not like 'pg_%' 
order by 1";
+       var $isoDates = true; // accepts dates in ISO format
+       var $sysDate = "CURRENT_DATE";
+       var $sysTimeStamp = "CURRENT_TIMESTAMP";
+       var $blobEncodeType = 'C';
+       var $metaColumnsSQL = "SELECT 
a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
+               FROM pg_class c, pg_attribute a,pg_type t 
+               WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = 
lower('%s')) and a.attname not like '....%%'
+AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY 
a.attnum";
+
+       // used when schema defined
+       var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, 
a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
+FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
+WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
+ and c.relnamespace=n.oid and n.nspname='%s' 
+       and a.attname not like '....%%' 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 $hasAffectedRows = true;
+       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 = 'TRUE';             // string that represents TRUE for a 
database
+       var $false = 'FALSE';           // 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 START %s";
+       var $_dropSeqSQL = "DROP SEQUENCE %s";
+       var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from 
pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by 
d.adnum";
+       var $random = 'random()';               /// random function
+       var $autoRollback = true; // apparently pgsql does not autorollback 
properly before php 4.3.4
+                                                       // 
http://bugs.php.net/bug.php?id=25404
+                                                       
+       var $_bindInputArray = false; // requires postgresql 7.3+ and ability 
to modify database
+       var $disableBlobs = false; // set to true to disable blob checking, 
resulting in 2-5% improvement in performance.
+       
+       // 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_postgres64() 
+       {
+       // changes the metaColumnsSQL, adds columns: attnum[6]
+       }
+       
+       function ServerInfo()
+       {
+               if (isset($this->version)) return $this->version;
+               
+               $arr['description'] = $this->GetOne("select version()");
+               $arr['version'] = ADOConnection::_findvers($arr['description']);
+               $this->version = $arr;
+               return $arr;
+       }
+
+       function IfNull( $field, $ifNull ) 
+       {
+               return " coalesce($field, $ifNull) "; 
+       }
+
+       // 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($table,$column)
+       {
+               if (!is_resource($this->_resultid) || 
get_resource_type($this->_resultid) !== 'pgsql result') return false;
+               $oid = pg_getlastoid($this->_resultid);
+               // to really return the id, we need the table and column-name, 
else we can only return the oid != id
+               return empty($table) || empty($column) ? $oid : 
$this->GetOne("SELECT $column FROM $table WHERE oid=".(int)$oid);
+       }
+
+// 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()
+   {
+               if (!is_resource($this->_resultid) || 
get_resource_type($this->_resultid) !== 'pgsql result') return false;
+               return pg_cmdtuples($this->_resultid);
+   }
+   
+       
+               // returns true/false
+       function BeginTrans()
+       {
+               if ($this->transOff) return true;
+               $this->transCnt += 1;
+               return @pg_Exec($this->_connectionID, "begin");
+       }
+       
+       function RowLock($tables,$where,$flds='1 as ignore') 
+       {
+               if (!$this->transCnt) $this->BeginTrans();
+               return $this->GetOne("select $flds from $tables where $where 
for update");
+       }
+
+       // returns true/false. 
+       function CommitTrans($ok=true) 
+       { 
+               if ($this->transOff) return true;
+               if (!$ok) return $this->RollbackTrans();
+               
+               $this->transCnt -= 1;
+               return @pg_Exec($this->_connectionID, "commit");
+       }
+       
+       // returns true/false
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true;
+               $this->transCnt -= 1;
+               return @pg_Exec($this->_connectionID, "rollback");
+       }
+       
+       function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+       {
+               $info = $this->ServerInfo();
+               if ($info['version'] >= 7.3) {
+               $this->metaTablesSQL = "select tablename,'T' from pg_tables 
where tablename not like 'pg\_%'
+                         and schemaname  not in ( 
'pg_catalog','information_schema')
+       union 
+        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and 
schemaname  not in ( 'pg_catalog','information_schema') ";
+               }
+               if ($mask) {
+                       $save = $this->metaTablesSQL;
+                       $mask = $this->qstr(strtolower($mask));
+                       if ($info['version']>=7.3)
+                               $this->metaTablesSQL = "
+select tablename,'T' from pg_tables where tablename like $mask and schemaname 
not in ( 'pg_catalog','information_schema')  
+ union 
+select viewname,'V' from pg_views where viewname like $mask and schemaname  
not in ( 'pg_catalog','information_schema')  ";
+                       else
+                               $this->metaTablesSQL = "
+select tablename,'T' from pg_tables where tablename like $mask 
+ union 
+select viewname,'V' from pg_views where viewname like $mask";
+               }
+               $ret =& ADOConnection::MetaTables($ttype,$showSchema);
+               
+               if ($mask) {
+                       $this->metaTablesSQL = $save;
+               }
+               return $ret;
+       }
+       
+       
+       // if magic quotes disabled, use pg_escape_string()
+       function qstr($s,$magic_quotes=false)
+       {
+               if (!$magic_quotes) {
+                       if (ADODB_PHPVER >= 0x4200) {
+                               return  "'".pg_escape_string($s)."'";
+                       }
+                       if ($this->replaceQuote[0] == '\\'){
+                               $s = 
adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
+                       }
+                       return  
"'".str_replace("'",$this->replaceQuote,$s)."'"; 
+               }
+               
+               // undo magic quotes for "
+               $s = str_replace('\\"','"',$s);
+               return "'$s'";
+       }
+       
+       
+       
+       // Format date column in sql string given an input format that 
understands Y M D
+       function SQLDate($fmt, $col=false)
+       {       
+               if (!$col) $col = $this->sysTimeStamp;
+               $s = 'TO_CHAR('.$col.",'";
+               
+               $len = strlen($fmt);
+               for ($i=0; $i < $len; $i++) {
+                       $ch = $fmt[$i];
+                       switch($ch) {
+                       case 'Y':
+                       case 'y':
+                               $s .= 'YYYY';
+                               break;
+                       case 'Q':
+                       case 'q':
+                               $s .= 'Q';
+                               break;
+                               
+                       case 'M':
+                               $s .= 'Mon';
+                               break;
+                               
+                       case 'm':
+                               $s .= 'MM';
+                               break;
+                       case 'D':
+                       case 'd':
+                               $s .= 'DD';
+                               break;
+                       
+                       case 'H':
+                               $s.= 'HH24';
+                               break;
+                               
+                       case 'h':
+                               $s .= 'HH';
+                               break;
+                               
+                       case 'i':
+                               $s .= 'MI';
+                               break;
+                       
+                       case 's':
+                               $s .= 'SS';
+                               break;
+                       
+                       case 'a':
+                       case 'A':
+                               $s .= 'AM';
+                               break;
+                               
+                       case 'w':
+                               $s .= 'D';
+                               break;
+                       
+                       case 'l':
+                               $s .= 'DAY';
+                               break;
+                       
+                        case 'W':
+                               $s .= 'WW';
+                               break;
+
+                       default:
+                       // handle escape characters...
+                               if ($ch == '\\') {
+                                       $i++;
+                                       $ch = substr($fmt,$i,1);
+                               }
+                               if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
+                               else $s .= '"'.$ch.'"';
+                               
+                       }
+               }
+               return $s. "')";
+       }
+       
+       
+       
+       /* 
+       * Load a Large Object from a file 
+       * - the procedure stores the object id in the table and imports the 
object using 
+       * postgres proprietary blob handling routines 
+       *
+       * contributed by Mattia Rossi address@hidden
+       * modified for safe mode by juraj chlebec
+       */ 
+       function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
+       { 
+               pg_exec ($this->_connectionID, "begin"); 
+               
+               $fd = fopen($path,'r');
+               $contents = fread($fd,filesize($path));
+               fclose($fd);
+               
+               $oid = pg_lo_create($this->_connectionID);
+               $handle = pg_lo_open($this->_connectionID, $oid, 'w');
+               pg_lo_write($handle, $contents);
+               pg_lo_close($handle);
+               
+               // $oid = pg_lo_import ($path); 
+               pg_exec($this->_connectionID, "commit"); 
+               $rs = 
ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype); 
+               $rez = !empty($rs); 
+               return $rez; 
+       } 
+       
+       /*
+       * Deletes/Unlinks a Blob from the database, otherwise it 
+       * will be left behind
+       *
+       * Returns TRUE on success or FALSE on failure.
+       *
+       * contributed by Todd Rogers todd#windfox.net
+       */
+       function BlobDelete( $blob )
+       {
+               pg_exec ($this->_connectionID, "begin");
+               $result = @pg_lo_unlink($blob);
+               pg_exec ($this->_connectionID, "commit");
+               return( $result );
+       }
+
+       /*
+               Hueristic - not guaranteed to work.
+       */
+       function GuessOID($oid)
+       {
+               if (strlen($oid)>16) return false;
+               return is_numeric($oid);
+       }
+       
+       /* 
+       * If an OID is detected, then we use pg_lo_* to open the oid file and 
read the
+       * real blob from the db using the oid supplied as a parameter. If you 
are storing
+       * blobs using bytea, we autodetect and process it so this function is 
not needed.
+       *
+       * contributed by Mattia Rossi address@hidden
+       *
+       * see http://www.postgresql.org/idocs/index.php?largeobjects.html
+       *
+       * Since adodb 4.54, this returns the blob, instead of sending it to 
stdout. Also
+       * added maxsize parameter, which defaults to $db->maxblobsize if not 
defined.
+       */ 
+       function BlobDecode($blob,$maxsize=false,$hastrans=true) 
+       {
+               if (!$this->GuessOID($blob)) return $blob;
+               
+               if ($hastrans) @pg_exec($this->_connectionID,"begin"); 
+               $fd = @pg_lo_open($this->_connectionID,$blob,"r");
+               if ($fd === false) {
+                       if ($hastrans) @pg_exec($this->_connectionID,"commit");
+                       return $blob;
+               }
+               if (!$maxsize) $maxsize = $this->maxblobsize;
+               $realblob = @pg_loread($fd,$maxsize); 
+               @pg_loclose($fd); 
+               if ($hastrans) @pg_exec($this->_connectionID,"commit"); 
+               return $realblob;
+       }
+       
+       /* 
+               See 
http://www.postgresql.org/idocs/index.php?datatype-binary.html
+               
+               NOTE: SQL string literals (input strings) must be preceded with 
two backslashes 
+               due to the fact that they must pass through two parsers in the 
PostgreSQL 
+               backend.
+       */
+       function BlobEncode($blob)
+       {
+               if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
+               
+               /*92=backslash, 0=null, 39=single-quote*/
+               $badch = array(chr(92),chr(0),chr(39)); # \  null  '
+               $fixch = array('\\\\134','\\\\000','\\\\047');
+               return adodb_str_replace($badch,$fixch,$blob);
+               
+               // note that there is a pg_escape_bytea function only for php 
4.2.0 or later
+       }
+       
+       // assumes bytea for blob, and varchar for clob
+       function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+       {
+       
+               if ($blobtype == 'CLOB') {
+               return $this->Execute("UPDATE $table SET $column=" . 
$this->qstr($val) . " WHERE $where");
+               }
+               // do not use bind params which uses qstr(), as blobencode() 
already quotes data
+               return $this->Execute("UPDATE $table SET 
$column='".$this->BlobEncode($val)."'::bytea WHERE $where");
+       }
+       
+       function OffsetDate($dayFraction,$date=false)
+       {               
+               if (!$date) $date = $this->sysDate;
+               else if (strncmp($date,"'",1) == 0) {
+                       $len = strlen($date);
+                       if (10 <= $len && $len <= 12) $date = 'date '.$date;
+                       else $date = 'timestamp '.$date;
+               }
+               return "($date+interval'$dayFraction days')";
+       }
+       
+
+       // for schema support, pass in the $table param "$schema.$tabname".
+       // converts field names to lowercase, $upper is ignored
+       // see http://phplens.com/lens/lensforum/msgs.php?id=14018 for more info
+       function &MetaColumns($table,$normalize=true) 
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $schema = false;
+               $false = false;
+               $this->_findschema($table,$schema);
+               
+               if ($normalize) $table = strtolower($table);
+
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->fetchMode !== false) $savem = 
$this->SetFetchMode(false);
+               
+               if ($schema) $rs =& 
$this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
+               else $rs =& 
$this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+               if (isset($savem)) $this->SetFetchMode($savem);
+               $ADODB_FETCH_MODE = $save;
+               
+               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.
+                       
+                       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+                       
+                       $rskey = 
$this->Execute(sprintf($this->metaKeySQL,($table)));
+                       // fetch all result in once for performance.
+                       $keys =& $rskey->GetArray();
+                       if (isset($savem)) $this->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+                       
+                       $rskey->Close();
+                       unset($rskey);
+               }
+
+               $rsdefa = array();
+               if (!empty($this->metaDefaultsSQL)) {
+                       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+                       $sql = sprintf($this->metaDefaultsSQL, ($table));
+                       $rsdef = $this->Execute($sql);
+                       if (isset($savem)) $this->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+                       
+                       if ($rsdef) {
+                               while (!$rsdef->EOF) {
+                                       $num = $rsdef->fields['num'];
+                                       $s = $rsdef->fields['def'];
+                                       if (strpos($s,'::')===false && 
substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
+                                               $s = substr($s, 1);
+                                               $s = substr($s, 0, strlen($s) - 
1);
+                                       }
+
+                                       $rsdefa[$num] = $s;
+                                       $rsdef->MoveNext();
+                               }
+                       } else {
+                               ADOConnection::outp( "==> SQL => " . $sql);
+                       }
+                       unset($rsdef);
+               }
+       
+               $retarr = array();
+               while (!$rs->EOF) {     
+                       $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;
+                       if ($fld->type == 'numeric') {
+                               $fld->scale = $fld->max_length & 0xFFFF;
+                               $fld->max_length >>= 16;
+                       }
+                       // dannym
+                       // 5 hasdefault; 6 num-of-column
+                       $fld->has_default = ($rs->fields[5] == 't');
+                       if ($fld->has_default) {
+                               $fld->default_value = $rsdefa[$rs->fields[6]];
+                       }
+
+                       //Freek
+                       $fld->not_null = $rs->fields[4] == 't';
+                       
+                       
+                       // Freek
+                       if (is_array($keys)) {
+                               foreach($keys as $key) {
+                                       if ($fld->name == $key['column_name'] 
AND $key['primary_key'] == 't') 
+                                               $fld->primary_key = true;
+                                       if ($fld->name == $key['column_name'] 
AND $key['unique_key'] == 't') 
+                                               $fld->unique = true; // What 
name is more compatible?
+                               }
+                       }
+                       
+                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = 
$fld;     
+                       else $retarr[($normalize) ? strtoupper($fld->name) : 
$fld->name] = $fld;
+                       
+                       $rs->MoveNext();
+               }
+               $rs->Close();
+               if (empty($retarr))
+                       return  $false;
+               else
+                       return $retarr; 
+               
+       }
+
+         function &MetaIndexes ($table, $primary = FALSE)
+      {
+         global $ADODB_FETCH_MODE;
+                
+                               $schema = false;
+                               $this->_findschema($table,$schema);
+
+                               if ($schema) { // requires pgsql 7.3+ - 
pg_namespace used.
+                                       $sql = '
+SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns" 
+FROM pg_catalog.pg_class c 
+JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid 
+JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+       ,pg_namespace n 
+WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and 
c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\'';
+                               } else {
+                       $sql = '
+SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
+FROM pg_catalog.pg_class c
+JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
+JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
+                       }
+                                           
+                if ($primary == FALSE) {
+                       $sql .= ' AND i.indisprimary=false;';
+                }
+                
+                $save = $ADODB_FETCH_MODE;
+                $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+                if ($this->fetchMode !== FALSE) {
+                        $savem = $this->SetFetchMode(FALSE);
+                }
+                
+                $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
+                if (isset($savem)) {
+                        $this->SetFetchMode($savem);
+                }
+                $ADODB_FETCH_MODE = $save;
+
+                if (!is_object($rs)) {
+                       $false = false;
+                                       return $false;
+                }
+                               
+                $col_names = $this->MetaColumnNames($table,true);
+                $indexes = array();
+                while ($row = $rs->FetchRow()) {
+                        $columns = array();
+                        foreach (explode(' ', $row[2]) as $col) {
+                                $columns[] = $col_names[$col - 1];
+                        }
+                        
+                        $indexes[$row[0]] = array(
+                                'unique' => ($row[1] == 't'),
+                                'columns' => $columns
+                        );
+                }
+                return $indexes;
+        }
+
+       // 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='',$ctype=0)
+       {
+               
+               if (!function_exists('pg_connect')) return null;
+               
+               $this->_errorMsg = false;
+               
+               if ($user || $pwd || $db) {
+                       $user = adodb_addslashes($user);
+                       $pwd = adodb_addslashes($pwd);
+                       if (strlen($db) == 0) $db = 'template1';
+                       $db = adodb_addslashes($db);
+                       if ($str)  {
+                               $host = split(":", $str);
+                               if ($host[0]) $str = 
"host=".adodb_addslashes($host[0]);
+                               else $str = 'host=localhost';
+                               if (isset($host[1])) $str .= " port=$host[1]";
+                               else if (!empty($this->port)) $str .= " 
port=".$this->port;
+                       }
+                               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";
+               
+               if ($ctype === 1) { // persistent
+                       $this->_connectionID = pg_pconnect($str);
+               } else {
+                       if ($ctype === -1) { // nconnect, we trick pgsql ext by 
changing the connection str
+                       static $ncnt;
+                       
+                               if (empty($ncnt)) $ncnt = 1;
+                               else $ncnt += 1;
+                               
+                               $str .= str_repeat(' ',$ncnt);
+                       }
+                       $this->_connectionID = pg_connect($str);
+               }
+               if ($this->_connectionID === false) return false;
+               $this->Execute("set datestyle='ISO'");
+               return true;
+       }
+       
+       function _nconnect($argHostname, $argUsername, $argPassword, 
$argDatabaseName)
+       {
+               return $this->_connect($argHostname, $argUsername, 
$argPassword, $argDatabaseName,-1);
+       }
+        
+       // 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='')
+       {
+               return $this->_connect($str,$user,$pwd,$db,1);
+       }
+       
+
+       // returns queryID or false
+       function _query($sql,$inputarr)
+       {
+               
+               if ($inputarr) {
+               /*
+                       It appears that PREPARE/EXECUTE is slower for many 
queries.
+                       
+                       For query executed 1000 times:
+                       "select id,firstname,lastname from adoxyz 
+                               where firstname not like ? and lastname not 
like ? and id = ?"
+                               
+                       with plan = 1.51861286163 secs
+                       no plan =   1.26903700829 secs
+
+                       
+
+               */
+                       $plan = 'P'.md5($sql);
+                               
+                       $execp = '';
+                       foreach($inputarr as $v) {
+                               if ($execp) $execp .= ',';
+                               if (is_string($v)) {
+                                       if (strncmp($v,"'",1) !== 0) $execp .= 
$this->qstr($v);
+                               } else {
+                                       $execp .= $v;
+                               }
+                       }
+                       
+                       if ($execp) $exsql = "EXECUTE $plan ($execp)";
+                       else $exsql = "EXECUTE $plan";
+                       
+                       $rez = @pg_exec($this->_connectionID,$exsql);
+                       if (!$rez) {
+                       # Perhaps plan does not exist? Prepare/compile plan.
+                               $params = '';
+                               foreach($inputarr as $v) {
+                                       if ($params) $params .= ',';
+                                       if (is_string($v)) {
+                                               $params .= 'VARCHAR';
+                                       } else if (is_integer($v)) {
+                                               $params .= 'INTEGER';
+                                       } else {
+                                               $params .= "REAL";
+                                       }
+                               }
+                               $sqlarr = explode('?',$sql);
+                               //print_r($sqlarr);
+                               $sql = '';
+                               $i = 1;
+                               foreach($sqlarr as $v) {
+                                       $sql .= $v.' $'.$i;
+                                       $i++;
+                               }
+                               $s = "PREPARE $plan ($params) AS 
".substr($sql,0,strlen($sql)-2);               
+                               //adodb_pr($s);
+                               pg_exec($this->_connectionID,$s);
+                               echo $this->ErrorMsg();
+                       }
+                       
+                       $rez = pg_exec($this->_connectionID,$exsql);
+               } else {
+                       $this->_errorMsg = false;
+                       //adodb_backtrace();
+                       $rez = pg_exec($this->_connectionID,$sql);
+               }
+               // check if no data returned, then no need to create real 
recordset
+               if ($rez && pg_numfields($rez) <= 0) {
+                       if (is_resource($this->_resultid) && 
get_resource_type($this->_resultid) === 'pgsql result') {
+                               pg_freeresult($this->_resultid);
+                       }
+                       $this->_resultid = $rez;
+                       return true;
+               }
+               
+               return $rez;
+       }
+       
+       function _errconnect()
+       {
+               if (defined('DB_ERROR_CONNECT_FAILED')) return 
DB_ERROR_CONNECT_FAILED;
+               else return 'Database connection failed';
+       }
+
+       /*      Returns: the last error message from previous database 
operation        */      
+       function ErrorMsg() 
+       {
+               if ($this->_errorMsg !== false) return $this->_errorMsg;
+               if (ADODB_PHPVER >= 0x4300) {
+                       if (!empty($this->_resultid)) {
+                               $this->_errorMsg = 
@pg_result_error($this->_resultid);
+                               if ($this->_errorMsg) return $this->_errorMsg;
+                       }
+                       
+                       if (!empty($this->_connectionID)) {
+                               $this->_errorMsg = 
@pg_last_error($this->_connectionID);
+                       } else $this->_errorMsg = $this->_errconnect();
+               } else {
+                       if (empty($this->_connectionID)) $this->_errconnect();
+                       else $this->_errorMsg = 
@pg_errormessage($this->_connectionID);
+               }
+               return $this->_errorMsg;
+       }
+       
+       function ErrorNo()
+       {
+               $e = $this->ErrorMsg();
+               if (strlen($e)) {
+                       return ADOConnection::MetaError($e);
+                }
+                return 0;
+       }
+
+       // returns true or false
+       function _close()
+       {
+               if ($this->transCnt) $this->RollbackTrans();
+               if ($this->_resultid) {
+                       @pg_freeresult($this->_resultid);
+                       $this->_resultid = false;
+               }
+               @pg_close($this->_connectionID);
+               $this->_connectionID = false;
+               return true;
+       }
+       
+       
+       /*
+       * Maximum size of C field
+       */
+       function CharMax()
+       {
+               return 1000000000;  // should be 1 Gb?
+       }
+       
+       /*
+       * Maximum size of X field
+       */
+       function TextMax()
+       {
+               return 1000000000; // should be 1 Gb?
+       }
+       
+               
+}
+       
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_postgres64 extends ADORecordSet{
+       var $_blobArr;
+       var $databaseType = "postgres64";
+       var $canSeek = true;
+       function ADORecordSet_postgres64($queryID,$mode=false) 
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               switch ($mode)
+               {
+               case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
+               case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
+               
+               case ADODB_FETCH_DEFAULT:
+               case ADODB_FETCH_BOTH:
+               default: $this->fetchMode = PGSQL_BOTH; break;
+               }
+               $this->adodbFetchMode = $mode;
+               $this->ADORecordSet($queryID);
+       }
+       
+       function &GetRowAssoc($upper=true)
+       {
+               if ($this->fetchMode == PGSQL_ASSOC && !$upper) return 
$this->fields;
+               $row =& ADORecordSet::GetRowAssoc($upper);
+               return $row;
+       }
+
+       function _initrs()
+       {
+       global $ADODB_COUNTRECS;
+               $qid = $this->_queryID;
+               $this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($qid):-1;
+               $this->_numOfFields = @pg_numfields($qid);
+               
+               // cache types for blob decode check
+               // apparently pg_fieldtype actually performs an sql query on 
the database to get the type.
+               if (empty($this->connection->noBlobs))
+               for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {  
+                       if (pg_fieldtype($qid,$i) == 'bytea') {
+                               $this->_blobArr[$i] = pg_fieldname($qid,$i);
+                       }
+               }
+       }
+
+               /* Use associative array to get fields array */
+       function Fields($colname)
+       {
+               if ($this->fetchMode != PGSQL_NUM) return 
@$this->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($off = 0) 
+       {
+               // 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);
+               return $o;      
+       }
+
+       function _seek($row)
+       {
+               return @pg_fetch_row($this->_queryID,$row);
+       }
+       
+       function _decode($blob)
+       {
+               
eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
+               return $realblob;       
+       }
+       
+       function _fixblobs()
+       {
+               if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == 
PGSQL_BOTH) {
+                       foreach($this->_blobArr as $k => $v) {
+                               $this->fields[$k] = 
ADORecordSet_postgres64::_decode($this->fields[$k]);
+                       }
+               }
+               if ($this->fetchMode == PGSQL_ASSOC || $this->fetchMode == 
PGSQL_BOTH) {
+                       foreach($this->_blobArr as $k => $v) {
+                               $this->fields[$v] = 
ADORecordSet_postgres64::_decode($this->fields[$v]);
+                       }
+               }
+       }
+       
+       // 10% speedup to move MoveNext to child class
+       function MoveNext() 
+       {
+               if (!$this->EOF) {
+                       $this->_currentRow++;
+                       if ($this->_numOfRows < 0 || $this->_numOfRows > 
$this->_currentRow) {
+                               $this->fields = 
@pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+                               if (is_array($this->fields) && $this->fields) {
+                                       if (isset($this->_blobArr)) 
$this->_fixblobs();
+                                       return true;
+                               }
+                       }
+                       $this->fields = false;
+                       $this->EOF = true;
+               }
+               return false;
+       }               
+       
+       function _fetch()
+       {
+                               
+               if ($this->_currentRow >= $this->_numOfRows && 
$this->_numOfRows >= 0)
+               return false;
+
+               $this->fields = 
@pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+               
+               if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
+                       
+               return (is_array($this->fields));
+       }
+
+       function _close() 
+       { 
+               return @pg_freeresult($this->_queryID);
+       }
+
+       function MetaType($t,$len=-1,$fieldobj=false)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               switch (strtoupper($t)) {
+                               case 'MONEY': // stupid, postgres expects money 
to be a string
+                               case 'INTERVAL':
+                               case 'CHAR':
+                               case 'CHARACTER':
+                               case 'VARCHAR':
+                               case 'NAME':
+                               case 'BPCHAR':
+                               case '_VARCHAR':
+                               case 'INET':
+                                       if ($len <= $this->blobSize) return 'C';
+                               
+                               case 'TEXT':
+                                       return 'X';
+               
+                               case 'IMAGE': // user defined type
+                               case 'BLOB': // user defined type
+                               case 'BIT':     // This is a bit string, not a 
single bit, so don't return 'L'
+                               case 'VARBIT':
+                               case 'BYTEA':
+                                       return 'B';
+                               
+                               case 'BOOL':
+                               case 'BOOLEAN':
+                                       return 'L';
+                               
+                               case 'DATE':
+                                       return 'D';
+                               
+                               case 'TIME':
+                               case 'DATETIME':
+                               case 'TIMESTAMP':
+                               case 'TIMESTAMPTZ':
+                                       return 'T';
+                               
+                               case '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';
+                       }
+       }
+
+}
+?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php:1.2      Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php  Tue Feb 21 13:47:42 2006
@@ -1,265 +1,262 @@
-<?php
-/*
- V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 4.
-  
-  Postgres7 support.
-  28 Feb 2001: Currently indicate that we support LIMIT
-  01 Dec 2001: dannym added support for default values
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR."/drivers/adodb-postgres64.inc.php");
-
-class ADODB_postgres7 extends ADODB_postgres64 {
-       var $databaseType = 'postgres7';        
-       var $hasLimit = true;   // set to true for pgsql 6.5+ only. support 
pgsql/mysql SELECT * FROM TABLE LIMIT 10
-       var $ansiOuter = true;
-       var $charSet = true; //set to true for Postgres 7 and above - PG client 
supports encodings
-       
-       function ADODB_postgres7() 
-       {
-               $this->ADODB_postgres64();
-               if (ADODB_ASSOC_CASE !== 2) {
-                       $this->rsPrefix .= 'assoc_';
-               }
-       }
-
-       
-       // the following should be compat with postgresql 7.2, 
-       // which makes obsolete the LIMIT limit,offset syntax
-        function 
&SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-        {
-                $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
-                $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
-                if ($secs2cache)
-                       $rs =& 
$this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-                else
-                       $rs =& 
$this->Execute($sql."$limitStr$offsetStr",$inputarr);
-               
-               return $rs;
-        }
-       /*
-       function Prepare($sql)
-       {
-               $info = $this->ServerInfo();
-               if ($info['version']>=7.3) {
-                       return array($sql,false);
-               }
-               return $sql;
-       }
-       */
-
-       // from  Edward Jaramilla, improved version - works on pg 7.4
-function MetaForeignKeys($table, $owner=false, $upper=false)
-{
-       $sql = 'SELECT t.tgargs as args
-       FROM
-       pg_trigger t,pg_class c,pg_proc p
-       WHERE
-       t.tgenabled AND
-       t.tgrelid = c.oid AND
-       t.tgfoid = p.oid AND
-       p.proname = \'RI_FKey_check_ins\' AND
-       c.relname = \''.strtolower($table).'\'
-       ORDER BY
-               t.tgrelid';
-       
-       $rs = $this->Execute($sql);
-       
-       if ($rs && !$rs->EOF) {
-               $arr =& $rs->GetArray();
-               $a = array();
-               foreach($arr as $v)
-               {
-                       $data = explode(chr(0), $v['args']);
-                       if ($upper) {
-                               $a[strtoupper($data[2])][] = 
strtoupper($data[4].'='.$data[5]);
-                       } else {
-                       $a[$data[2]][] = $data[4].'='.$data[5];
-                       }
-               }
-               return $a;
-       }
-       return false;
-}
-
-
-
-    function xMetaForeignKeys($table, $owner=false, $upper=false)
-       {
-
-        $sql = '
-SELECT t.tgargs as args
-   FROM pg_trigger t,
-        pg_class c,
-        pg_class c2,
-        pg_proc f
-   WHERE t.tgenabled
-   AND t.tgrelid=c.oid
-   AND t.tgconstrrelid=c2.oid
-   AND t.tgfoid=f.oid
-   AND f.proname ~ \'^RI_FKey_check_ins\'
-   AND t.tgargs like \'$1\\\000'.strtolower($table).'%\'
-   ORDER BY t.tgrelid';
-
-        $rs = $this->Execute($sql);
-               if ($rs && !$rs->EOF) {
-                       $arr =& $rs->GetArray();
-                       $a = array();
-                       foreach($arr as $v) {
-                $data = explode(chr(0), $v['args']);
-                if ($upper) {
-                    $a[] = array(strtoupper($data[2]) => 
strtoupper($data[4].'='.$data[5]));
-                } else {
-                    $a[] = array($data[2] => $data[4].'='.$data[5]);
-                }
-                
-                       }
-                       return $a;
-               }
-               else return false;
-    }
-       
-        // this is a set of functions for managing client encoding - very 
important if the encodings
-       // of your database and your output target (i.e. HTML) don't match
-       //for instance, you may have UNICODE database and server it on-site as 
WIN1251 etc.
-       // GetCharSet - get the name of the character set the client is using 
now
-       // the functions should work with Postgres 7.0 and above, the set of 
charsets supported
-       // depends on compile flags of postgres distribution - if no charsets 
were compiled into the server
-       // it will return 'SQL_ANSI' always
-       function GetCharSet()
-       {
-               //we will use ADO's builtin property charSet
-               $this->charSet = @pg_client_encoding($this->_connectionID);
-               if (!$this->charSet) {
-                       return false;
-               } else {
-                       return $this->charSet;
-               }
-       }
-       
-       // SetCharSet - switch the client encoding
-       function SetCharSet($charset_name)
-       {
-               $this->GetCharSet();
-               if ($this->charSet !== $charset_name) {
-                       $if = pg_set_client_encoding($this->_connectionID, 
$charset_name);
-                       if ($if == "0" & $this->GetCharSet() == $charset_name) {
-                               return true;
-                       } else return false;
-               } else return true;
-       }
-
-}
-       
-/*--------------------------------------------------------------------------------------
-        Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
-
-       var $databaseType = "postgres7";
-       
-       
-       function ADORecordSet_postgres7($queryID,$mode=false) 
-       {
-               $this->ADORecordSet_postgres64($queryID,$mode);
-       }
-       
-               // 10% speedup to move MoveNext to child class
-       function MoveNext() 
-       {
-               if (!$this->EOF) {
-                       $this->_currentRow++;
-                       if ($this->_numOfRows < 0 || $this->_numOfRows > 
$this->_currentRow) {
-                               $this->fields = 
@pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-                       
-                               if (is_array($this->fields)) {
-                                       if ($this->fields && 
isset($this->_blobArr)) $this->_fixblobs();
-                                       return true;
-                               }
-                       }
-                       $this->fields = false;
-                       $this->EOF = true;
-               }
-               return false;
-       }               
-
-}
-
-class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
-
-       var $databaseType = "postgres7";
-       
-       
-       function ADORecordSet_assoc_postgres7($queryID,$mode=false) 
-       {
-               $this->ADORecordSet_postgres64($queryID,$mode);
-       }
-       
-       function _fetch()
-       {
-               if ($this->_currentRow >= $this->_numOfRows && 
$this->_numOfRows >= 0)
-               return false;
-
-               $this->fields = 
@pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-               
-               if ($this->fields) {
-                       if (isset($this->_blobArr)) $this->_fixblobs();
-                       $this->_updatefields();
-               }
-                       
-               return (is_array($this->fields));
-       }
-       
-               // Create associative array
-       function _updatefields()
-       {
-               if (ADODB_ASSOC_CASE == 2) return; // native
-       
-               $arr = array();
-               $lowercase = (ADODB_ASSOC_CASE == 0);
-               
-               foreach($this->fields as $k => $v) {
-                       if (is_integer($k)) $arr[$k] = $v;
-                       else {
-                               if ($lowercase)
-                                       $arr[strtolower($k)] = $v;
-                               else
-                                       $arr[strtoupper($k)] = $v;
-                       }
-               }
-               $this->fields = $arr;
-       }
-       
-       function MoveNext() 
-       {
-               if (!$this->EOF) {
-                       $this->_currentRow++;
-                       if ($this->_numOfRows < 0 || $this->_numOfRows > 
$this->_currentRow) {
-                               $this->fields = 
@pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-                       
-                               if (is_array($this->fields)) {
-                                       if ($this->fields) {
-                                               if (isset($this->_blobArr)) 
$this->_fixblobs();
-                                       
-                                               $this->_updatefields();
-                                       }
-                                       return true;
-                               }
-                       }
-                       
-                       
-                       $this->fields = false;
-                       $this->EOF = true;
-               }
-               return false;
-       }
-}
+<?php
+/*
+ V4.72 21 Feb 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+  Set tabs to 4.
+  
+  Postgres7 support.
+  28 Feb 2001: Currently indicate that we support LIMIT
+  01 Dec 2001: dannym added support for default values
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-postgres64.inc.php");
+
+class ADODB_postgres7 extends ADODB_postgres64 {
+       var $databaseType = 'postgres7';        
+       var $hasLimit = true;   // set to true for pgsql 6.5+ only. support 
pgsql/mysql SELECT * FROM TABLE LIMIT 10
+       var $ansiOuter = true;
+       var $charSet = true; //set to true for Postgres 7 and above - PG client 
supports encodings
+       
+       function ADODB_postgres7() 
+       {
+               $this->ADODB_postgres64();
+               if (ADODB_ASSOC_CASE !== 2) {
+                       $this->rsPrefix .= 'assoc_';
+               }
+               $this->_bindInputArray = PHP_VERSION >= 5.1;
+       }
+
+       
+       // the following should be compat with postgresql 7.2, 
+       // which makes obsolete the LIMIT limit,offset syntax
+        function 
&SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+        {
+                $offsetStr = ($offset >= 0) ? " OFFSET ".((integer)$offset) : 
'';
+                $limitStr  = ($nrows >= 0)  ? " LIMIT ".((integer)$nrows) : '';
+                if ($secs2cache)
+                       $rs =& 
$this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+                else
+                       $rs =& 
$this->Execute($sql."$limitStr$offsetStr",$inputarr);
+               
+               return $rs;
+        }
+       /*
+       function Prepare($sql)
+       {
+               $info = $this->ServerInfo();
+               if ($info['version']>=7.3) {
+                       return array($sql,false);
+               }
+               return $sql;
+       }
+       */
+
+       // from  Edward Jaramilla, improved version - works on pg 7.4
+       function MetaForeignKeys($table, $owner=false, $upper=false)
+       {
+               $sql = 'SELECT t.tgargs as args
+               FROM
+               pg_trigger t,pg_class c,pg_proc p
+               WHERE
+               t.tgenabled AND
+               t.tgrelid = c.oid AND
+               t.tgfoid = p.oid AND
+               p.proname = \'RI_FKey_check_ins\' AND
+               c.relname = \''.strtolower($table).'\'
+               ORDER BY
+                       t.tgrelid';
+               
+               $rs =& $this->Execute($sql);
+               
+               if ($rs && !$rs->EOF) {
+                       $arr =& $rs->GetArray();
+                       $a = array();
+                       foreach($arr as $v)
+                       {
+                               $data = explode(chr(0), $v['args']);
+                               if ($upper) {
+                                       $a[strtoupper($data[2])][] = 
strtoupper($data[4].'='.$data[5]);
+                               } else {
+                               $a[$data[2]][] = $data[4].'='.$data[5];
+                               }
+                       }
+                       return $a;
+               }
+               return false;
+       }
+
+       function _query($sql,$inputarr)
+       {
+               if (! $this->_bindInputArray) {
+                       // We don't have native support for parameterized 
queries, so let's emulate it at the parent
+                       return ADODB_postgres64::_query($sql, $inputarr);
+               }
+               // -- added Cristiano da Cunha Duarte
+               if ($inputarr) {
+                       $sqlarr = explode('?',trim($sql));
+                       $sql = '';
+                       $i = 1;
+                       $last = sizeof($sqlarr)-1;
+                       foreach($sqlarr as $v) {
+                               if ($last < $i) $sql .= $v;
+                               else $sql .= $v.' $'.$i;
+                               $i++;
+                       }
+                       
+                       $rez = pg_query_params($this->_connectionID,$sql, 
$inputarr);
+               } else {
+                       $rez = pg_query($this->_connectionID,$sql);
+               }
+               // check if no data returned, then no need to create real 
recordset
+               if ($rez && pg_numfields($rez) <= 0) {
+                       if (is_resource($this->_resultid) && 
get_resource_type($this->_resultid) === 'pgsql result') {
+                               pg_freeresult($this->_resultid);
+                       }
+                       $this->_resultid = $rez;
+                       return true;
+               }               
+               return $rez;
+       }
+       
+        // this is a set of functions for managing client encoding - very 
important if the encodings
+       // of your database and your output target (i.e. HTML) don't match
+       //for instance, you may have UNICODE database and server it on-site as 
WIN1251 etc.
+       // GetCharSet - get the name of the character set the client is using 
now
+       // the functions should work with Postgres 7.0 and above, the set of 
charsets supported
+       // depends on compile flags of postgres distribution - if no charsets 
were compiled into the server
+       // it will return 'SQL_ANSI' always
+       function GetCharSet()
+       {
+               //we will use ADO's builtin property charSet
+               $this->charSet = @pg_client_encoding($this->_connectionID);
+               if (!$this->charSet) {
+                       return false;
+               } else {
+                       return $this->charSet;
+               }
+       }
+       
+       // SetCharSet - switch the client encoding
+       function SetCharSet($charset_name)
+       {
+               $this->GetCharSet();
+               if ($this->charSet !== $charset_name) {
+                       $if = pg_set_client_encoding($this->_connectionID, 
$charset_name);
+                       if ($if == "0" & $this->GetCharSet() == $charset_name) {
+                               return true;
+                       } else return false;
+               } else return true;
+       }
+
+}
+       
+/*--------------------------------------------------------------------------------------
+        Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
+
+       var $databaseType = "postgres7";
+       
+       
+       function ADORecordSet_postgres7($queryID,$mode=false) 
+       {
+               $this->ADORecordSet_postgres64($queryID,$mode);
+       }
+       
+               // 10% speedup to move MoveNext to child class
+       function MoveNext() 
+       {
+               if (!$this->EOF) {
+                       $this->_currentRow++;
+                       if ($this->_numOfRows < 0 || $this->_numOfRows > 
$this->_currentRow) {
+                               $this->fields = 
@pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+                       
+                               if (is_array($this->fields)) {
+                                       if ($this->fields && 
isset($this->_blobArr)) $this->_fixblobs();
+                                       return true;
+                               }
+                       }
+                       $this->fields = false;
+                       $this->EOF = true;
+               }
+               return false;
+       }               
+
+}
+
+class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
+
+       var $databaseType = "postgres7";
+       
+       
+       function ADORecordSet_assoc_postgres7($queryID,$mode=false) 
+       {
+               $this->ADORecordSet_postgres64($queryID,$mode);
+       }
+       
+       function _fetch()
+       {
+               if ($this->_currentRow >= $this->_numOfRows && 
$this->_numOfRows >= 0)
+               return false;
+
+               $this->fields = 
@pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+               
+               if ($this->fields) {
+                       if (isset($this->_blobArr)) $this->_fixblobs();
+                       $this->_updatefields();
+               }
+                       
+               return (is_array($this->fields));
+       }
+       
+               // Create associative array
+       function _updatefields()
+       {
+               if (ADODB_ASSOC_CASE == 2) return; // native
+       
+               $arr = array();
+               $lowercase = (ADODB_ASSOC_CASE == 0);
+               
+               foreach($this->fields as $k => $v) {
+                       if (is_integer($k)) $arr[$k] = $v;
+                       else {
+                               if ($lowercase)
+                                       $arr[strtolower($k)] = $v;
+                               else
+                                       $arr[strtoupper($k)] = $v;
+                       }
+               }
+               $this->fields = $arr;
+       }
+       
+       function MoveNext() 
+       {
+               if (!$this->EOF) {
+                       $this->_currentRow++;
+                       if ($this->_numOfRows < 0 || $this->_numOfRows > 
$this->_currentRow) {
+                               $this->fields = 
@pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+                       
+                               if (is_array($this->fields)) {
+                                       if ($this->fields) {
+                                               if (isset($this->_blobArr)) 
$this->_fixblobs();
+                                       
+                                               $this->_updatefields();
+                                       }
+                                       return true;
+                               }
+                       }
+                       
+                       
+                       $this->fields = false;
+                       $this->EOF = true;
+               }
+               return false;
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php:1.2  Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php      Tue Feb 21 13:47:42 2006
@@ -1,33 +1,33 @@
-<?php
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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.
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (! defined("_ADODB_PROXY_LAYER")) {
-        define("_ADODB_PROXY_LAYER", 1 );
-        include(ADODB_DIR."/drivers/adodb-csv.inc.php");
-        
-       class ADODB_proxy extends ADODB_csv {
-               var $databaseType = 'proxy';
-               var $databaseProvider = 'csv';
-       }
-       class ADORecordset_proxy extends ADORecordset_csv {
-       var $databaseType = "proxy";            
-       
-               function ADORecordset_proxy($id,$mode=false) 
-               {
-                       $this->ADORecordset($id,$mode);
-               }
-       };
-} // define
-       
+<?php
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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.
+*/ 
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (! defined("_ADODB_PROXY_LAYER")) {
+        define("_ADODB_PROXY_LAYER", 1 );
+        include(ADODB_DIR."/drivers/adodb-csv.inc.php");
+        
+       class ADODB_proxy extends ADODB_csv {
+               var $databaseType = 'proxy';
+               var $databaseProvider = 'csv';
+       }
+       class ADORecordset_proxy extends ADORecordset_csv {
+       var $databaseType = "proxy";            
+       
+               function ADORecordset_proxy($id,$mode=false) 
+               {
+                       $this->ADORecordset($id,$mode);
+               }
+       };
+} // define
+       
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php:1.2  Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php      Tue Feb 21 13:47:42 2006
@@ -1,184 +1,184 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  SAPDB data driver. Requires ODBC.
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-       include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-if (!defined('ADODB_SAPDB')){
-define('ADODB_SAPDB',1);
-
-class ADODB_SAPDB extends ADODB_odbc {
-       var $databaseType = "sapdb";    
-       var $concat_operator = '||';
-       var $sysDate = 'DATE';
-       var $sysTimeStamp = 'TIMESTAMP';
-       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 $hasInsertId = true;
-       var $_bindInputArray = true;
-       
-       function ADODB_SAPDB()
-       {
-               //if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = 
SQL_CUR_USE_ODBC;
-               $this->ADODB_odbc();
-       }
-       
-       function ServerInfo()
-       {
-               $info = ADODB_odbc::ServerInfo();
-               if (!$info['version'] && 
preg_match('/([0-9.]+)/',$info['description'],$matches)) {
-                       $info['version'] = $matches[1];
-               }
-               return $info;
-       }
-
-       function MetaPrimaryKeys($table)
-       {
-               $table = $this->Quote(strtoupper($table));
-
-               return $this->GetCol("SELECT columnname FROM COLUMNS WHERE 
tablename=$table AND mode='KEY' ORDER BY pos");
-       }
-               
-       function &MetaIndexes ($table, $primary = FALSE)
-       {
-               $table = $this->Quote(strtoupper($table));
-
-               $sql = "SELECT INDEXNAME,TYPE,COLUMNNAME FROM INDEXCOLUMNS ".
-                       " WHERE TABLENAME=$table".
-                       " ORDER BY INDEXNAME,COLUMNNO";
-
-               global $ADODB_FETCH_MODE;
-               $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-               $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-               return FALSE;
-        }
-
-               $indexes = array();
-               while ($row = $rs->FetchRow()) {
-            $indexes[$row[0]]['unique'] = $row[1] == 'UNIQUE';
-            $indexes[$row[0]]['columns'][] = $row[2];
-       }
-               if ($primary) {
-                       $indexes['SYSPRIMARYKEYINDEX'] = array(
-                                       'unique' => True,       // by definition
-                                       'columns' => $this->GetCol("SELECT 
columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos"),
-                               );
-               }
-        return $indexes;
-       }
-       
-       function &MetaColumns ($table)
-       {
-               global $ADODB_FETCH_MODE;
-               $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-               $table = $this->Quote(strtoupper($table));
-               
-               $retarr = array();
-               foreach($this->GetAll("SELECT 
COLUMNNAME,DATATYPE,LEN,DEC,NULLABLE,MODE,\"DEFAULT\",CASE WHEN \"DEFAULT\" IS 
NULL THEN 0 ELSE 1 END AS HAS_DEFAULT FROM COLUMNS WHERE tablename=$table ORDER 
BY pos") as $column)
-               {
-                       $fld = new ADOFieldObject();
-                       $fld->name = $column[0];
-                       $fld->type = $column[1];
-                       $fld->max_length = $fld->type == 'LONG' ? 2147483647 : 
$column[2];
-                       $fld->scale = $column[3];
-                       $fld->not_null = $column[4] == 'NO';
-                       $fld->primary_key = $column[5] == 'KEY';
-                       if ($fld->has_default = $column[7]) {
-                               if ($fld->primary_key && $column[6] == 'DEFAULT 
SERIAL (1)') {
-                                       $fld->auto_increment = true;
-                                       $fld->has_default = false;
-                               } else {
-                                       $fld->default_value = $column[6];
-                                       switch($fld->type) {
-                                               case 'VARCHAR':
-                                               case 'CHARACTER':
-                                               case 'LONG':
-                                                       $fld->default_value = 
$column[6];
-                                                       break;
-                                               default:
-                                                       $fld->default_value = 
trim($column[6]);
-                                                       break;
-                                       }
-                               }
-                       }
-                       $retarr[$fld->name] = $fld;     
-               }
-        if (isset($savem)) {
-               $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-               return $retarr;
-       }
-       
-       function MetaColumnNames($table)
-       {
-               $table = $this->Quote(strtoupper($table));
-
-               return $this->GetCol("SELECT columnname FROM COLUMNS WHERE 
tablename=$table ORDER BY pos");
-       }
-       
-       // unlike it seems, this depends on the db-session and works in a 
multiuser environment
-       function _insertid($table,$column)
-       {
-               return empty($table) ? False : $this->GetOne("SELECT 
$table.CURRVAL FROM DUAL");
-       }
-
-       /*
-               SelectLimit implementation problems:
-       
-               The following will return random 10 rows as order by performed 
after "WHERE rowno<10"
-               which is not ideal...
-               
-                       select * from table where rowno < 10 order by 1
-         
-               This means that we have to use the adoconnection base class 
SelectLimit when
-               there is an "order by".
-               
-               See 
http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
-        */
-       
-};
- 
-
-class  ADORecordSet_sapdb extends ADORecordSet_odbc {  
-       
-       var $databaseType = "sapdb";            
-       
-       function ADORecordSet_sapdb($id,$mode=false)
-       {
-               $this->ADORecordSet_odbc($id,$mode);
-       }
-}
-
-} //define
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  SAPDB data driver. Requires ODBC.
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+       include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
+}
+if (!defined('ADODB_SAPDB')){
+define('ADODB_SAPDB',1);
+
+class ADODB_SAPDB extends ADODB_odbc {
+       var $databaseType = "sapdb";    
+       var $concat_operator = '||';
+       var $sysDate = 'DATE';
+       var $sysTimeStamp = 'TIMESTAMP';
+       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 $hasInsertId = true;
+       var $_bindInputArray = true;
+       
+       function ADODB_SAPDB()
+       {
+               //if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = 
SQL_CUR_USE_ODBC;
+               $this->ADODB_odbc();
+       }
+       
+       function ServerInfo()
+       {
+               $info = ADODB_odbc::ServerInfo();
+               if (!$info['version'] && 
preg_match('/([0-9.]+)/',$info['description'],$matches)) {
+                       $info['version'] = $matches[1];
+               }
+               return $info;
+       }
+
+       function MetaPrimaryKeys($table)
+       {
+               $table = $this->Quote(strtoupper($table));
+
+               return $this->GetCol("SELECT columnname FROM COLUMNS WHERE 
tablename=$table AND mode='KEY' ORDER BY pos");
+       }
+               
+       function &MetaIndexes ($table, $primary = FALSE)
+       {
+               $table = $this->Quote(strtoupper($table));
+
+               $sql = "SELECT INDEXNAME,TYPE,COLUMNNAME FROM INDEXCOLUMNS ".
+                       " WHERE TABLENAME=$table".
+                       " ORDER BY INDEXNAME,COLUMNNO";
+
+               global $ADODB_FETCH_MODE;
+               $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+        
+        $rs = $this->Execute($sql);
+        if (isset($savem)) {
+               $this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+        if (!is_object($rs)) {
+               return FALSE;
+        }
+
+               $indexes = array();
+               while ($row = $rs->FetchRow()) {
+            $indexes[$row[0]]['unique'] = $row[1] == 'UNIQUE';
+            $indexes[$row[0]]['columns'][] = $row[2];
+       }
+               if ($primary) {
+                       $indexes['SYSPRIMARYKEYINDEX'] = array(
+                                       'unique' => True,       // by definition
+                                       'columns' => $this->GetCol("SELECT 
columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos"),
+                               );
+               }
+        return $indexes;
+       }
+       
+       function &MetaColumns ($table)
+       {
+               global $ADODB_FETCH_MODE;
+               $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+               $table = $this->Quote(strtoupper($table));
+               
+               $retarr = array();
+               foreach($this->GetAll("SELECT 
COLUMNNAME,DATATYPE,LEN,DEC,NULLABLE,MODE,\"DEFAULT\",CASE WHEN \"DEFAULT\" IS 
NULL THEN 0 ELSE 1 END AS HAS_DEFAULT FROM COLUMNS WHERE tablename=$table ORDER 
BY pos") as $column)
+               {
+                       $fld = new ADOFieldObject();
+                       $fld->name = $column[0];
+                       $fld->type = $column[1];
+                       $fld->max_length = $fld->type == 'LONG' ? 2147483647 : 
$column[2];
+                       $fld->scale = $column[3];
+                       $fld->not_null = $column[4] == 'NO';
+                       $fld->primary_key = $column[5] == 'KEY';
+                       if ($fld->has_default = $column[7]) {
+                               if ($fld->primary_key && $column[6] == 'DEFAULT 
SERIAL (1)') {
+                                       $fld->auto_increment = true;
+                                       $fld->has_default = false;
+                               } else {
+                                       $fld->default_value = $column[6];
+                                       switch($fld->type) {
+                                               case 'VARCHAR':
+                                               case 'CHARACTER':
+                                               case 'LONG':
+                                                       $fld->default_value = 
$column[6];
+                                                       break;
+                                               default:
+                                                       $fld->default_value = 
trim($column[6]);
+                                                       break;
+                                       }
+                               }
+                       }
+                       $retarr[$fld->name] = $fld;     
+               }
+        if (isset($savem)) {
+               $this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+               return $retarr;
+       }
+       
+       function MetaColumnNames($table)
+       {
+               $table = $this->Quote(strtoupper($table));
+
+               return $this->GetCol("SELECT columnname FROM COLUMNS WHERE 
tablename=$table ORDER BY pos");
+       }
+       
+       // unlike it seems, this depends on the db-session and works in a 
multiuser environment
+       function _insertid($table,$column)
+       {
+               return empty($table) ? False : $this->GetOne("SELECT 
$table.CURRVAL FROM DUAL");
+       }
+
+       /*
+               SelectLimit implementation problems:
+       
+               The following will return random 10 rows as order by performed 
after "WHERE rowno<10"
+               which is not ideal...
+               
+                       select * from table where rowno < 10 order by 1
+         
+               This means that we have to use the adoconnection base class 
SelectLimit when
+               there is an "order by".
+               
+               See 
http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
+        */
+       
+};
+ 
+
+class  ADORecordSet_sapdb extends ADORecordSet_odbc {  
+       
+       var $databaseType = "sapdb";            
+       
+       function ADORecordSet_sapdb($id,$mode=false)
+       {
+               $this->ADORecordSet_odbc($id,$mode);
+       }
+}
+
+} //define
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php:1.2    Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php        Tue Feb 21 
13:47:42 2006
@@ -1,169 +1,169 @@
-<?php
-/* 
-version V4.54 5 Nov 2004 (c) 2000-2004  John Lim (address@hidden).  All rights
-reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-
-  Latest version is available at http://adodb.sourceforge.net
-
-  21.02.2002 - Wade Johnson address@hidden
-                          Extended ODBC class for Sybase SQLAnywhere.
-   1) Added support to retrieve the last row insert ID on tables with
-         primary key column using autoincrement function.
-
-   2) Added blob support.  Usage:
-                a) create blob variable on db server:
-
-               $dbconn->create_blobvar($blobVarName);
-
-         b) load blob var from file.  $filename must be complete path
-
-         $dbcon->load_blobvar_from_file($blobVarName, $filename);
-
-         c) Use the $blobVarName in SQL insert or update statement in the 
values
-         clause:
-
-               $recordSet = $dbconn->Execute('INSERT INTO tabname (idcol, 
blobcol) '
-               .
-          'VALUES (\'test\', ' . $blobVarName . ')');
-
-        instead of loading blob from a file, you can also load from 
-         an unformatted (raw) blob variable:
-         $dbcon->load_blobvar_from_var($blobVarName, $varName);
-
-         d) drop blob variable on db server to free up resources:
-         $dbconn->drop_blobvar($blobVarName);
-
-  Sybase_SQLAnywhere data driver. Requires ODBC.
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
- include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-
-if (!defined('ADODB_SYBASE_SQLANYWHERE')){
-
- define('ADODB_SYBASE_SQLANYWHERE',1);
-
- class ADODB_sqlanywhere extends ADODB_odbc {
-       var $databaseType = "sqlanywhere";      
-       var $hasInsertID = true;
-       
-       function ADODB_sqlanywhere()
-       {
-               $this->ADODB_odbc();
-       }
-
-        function _insertid() {
-          return $this->GetOne('select @@identity');
-        }
-
-  function create_blobvar($blobVarName) {
-   $this->Execute("create variable $blobVarName long binary");
-   return;
-  }
-
-  function drop_blobvar($blobVarName) {
-   $this->Execute("drop variable $blobVarName");
-   return;
-  }
-
-  function load_blobvar_from_file($blobVarName, $filename) {
-   $chunk_size = 1000;
-
-   $fd = fopen ($filename, "rb");
-
-   $integer_chunks = (integer)filesize($filename) / $chunk_size;
-   $modulus = filesize($filename) % $chunk_size;
-   if ($modulus != 0){
-       $integer_chunks += 1;
-   }
-
-   for($loop=1;$loop<=$integer_chunks;$loop++){
-       $contents = fread ($fd, $chunk_size);
-       $contents = bin2hex($contents);
-
-       $hexstring = '';
-
-       for($loop2=0;$loop2<strlen($contents);$loop2+=2){
-        $hexstring .= '\x' . substr($contents,$loop2,2);
-        }
-
-       $hexstring = $this->qstr($hexstring);
-
-       $this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
-   }
-
-   fclose ($fd);
-   return;
-  }
-
-  function load_blobvar_from_var($blobVarName, &$varName) {
-   $chunk_size = 1000;
-
-   $integer_chunks = (integer)strlen($varName) / $chunk_size;
-   $modulus = strlen($varName) % $chunk_size;
-   if ($modulus != 0){
-       $integer_chunks += 1;
-   }
-
-   for($loop=1;$loop<=$integer_chunks;$loop++){
-       $contents = substr ($varName, (($loop - 1) * $chunk_size), $chunk_size);
-       $contents = bin2hex($contents);
-
-       $hexstring = '';
-
-       for($loop2=0;$loop2<strlen($contents);$loop2+=2){
-        $hexstring .= '\x' . substr($contents,$loop2,2);
-        }
-
-       $hexstring = $this->qstr($hexstring);
-
-       $this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
-   }
-
-   return;
-  }
-
- /*
-  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')
-  {
-   $blobVarName = 'hold_blob';
-   $this->create_blobvar($blobVarName);
-   $this->load_blobvar_from_var($blobVarName, $val);
-   $this->Execute("UPDATE $table SET $column=$blobVarName WHERE $where");
-   $this->drop_blobvar($blobVarName);
-   return true;
-  }
- }; //class
-
- class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {   
-
-  var $databaseType = "sqlanywhere";           
-
- function ADORecordSet_sqlanywhere($id,$mode=false)
- {
-  $this->ADORecordSet_odbc($id,$mode);
- }
-
-
- }; //class
-
-
-} //define
-?>
+<?php
+/* 
+version V4.72 21 Feb 2006 (c) 2000-2006  John Lim (address@hidden).  All rights
+reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+
+  Latest version is available at http://adodb.sourceforge.net
+
+  21.02.2002 - Wade Johnson address@hidden
+                          Extended ODBC class for Sybase SQLAnywhere.
+   1) Added support to retrieve the last row insert ID on tables with
+         primary key column using autoincrement function.
+
+   2) Added blob support.  Usage:
+                a) create blob variable on db server:
+
+               $dbconn->create_blobvar($blobVarName);
+
+         b) load blob var from file.  $filename must be complete path
+
+         $dbcon->load_blobvar_from_file($blobVarName, $filename);
+
+         c) Use the $blobVarName in SQL insert or update statement in the 
values
+         clause:
+
+               $recordSet = $dbconn->Execute('INSERT INTO tabname (idcol, 
blobcol) '
+               .
+          'VALUES (\'test\', ' . $blobVarName . ')');
+
+        instead of loading blob from a file, you can also load from 
+         an unformatted (raw) blob variable:
+         $dbcon->load_blobvar_from_var($blobVarName, $varName);
+
+         d) drop blob variable on db server to free up resources:
+         $dbconn->drop_blobvar($blobVarName);
+
+  Sybase_SQLAnywhere data driver. Requires ODBC.
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+ include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
+}
+
+if (!defined('ADODB_SYBASE_SQLANYWHERE')){
+
+ define('ADODB_SYBASE_SQLANYWHERE',1);
+
+ class ADODB_sqlanywhere extends ADODB_odbc {
+       var $databaseType = "sqlanywhere";      
+       var $hasInsertID = true;
+       
+       function ADODB_sqlanywhere()
+       {
+               $this->ADODB_odbc();
+       }
+
+        function _insertid() {
+          return $this->GetOne('select @@identity');
+        }
+
+  function create_blobvar($blobVarName) {
+   $this->Execute("create variable $blobVarName long binary");
+   return;
+  }
+
+  function drop_blobvar($blobVarName) {
+   $this->Execute("drop variable $blobVarName");
+   return;
+  }
+
+  function load_blobvar_from_file($blobVarName, $filename) {
+   $chunk_size = 1000;
+
+   $fd = fopen ($filename, "rb");
+
+   $integer_chunks = (integer)filesize($filename) / $chunk_size;
+   $modulus = filesize($filename) % $chunk_size;
+   if ($modulus != 0){
+       $integer_chunks += 1;
+   }
+
+   for($loop=1;$loop<=$integer_chunks;$loop++){
+       $contents = fread ($fd, $chunk_size);
+       $contents = bin2hex($contents);
+
+       $hexstring = '';
+
+       for($loop2=0;$loop2<strlen($contents);$loop2+=2){
+        $hexstring .= '\x' . substr($contents,$loop2,2);
+        }
+
+       $hexstring = $this->qstr($hexstring);
+
+       $this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
+   }
+
+   fclose ($fd);
+   return;
+  }
+
+  function load_blobvar_from_var($blobVarName, &$varName) {
+   $chunk_size = 1000;
+
+   $integer_chunks = (integer)strlen($varName) / $chunk_size;
+   $modulus = strlen($varName) % $chunk_size;
+   if ($modulus != 0){
+       $integer_chunks += 1;
+   }
+
+   for($loop=1;$loop<=$integer_chunks;$loop++){
+       $contents = substr ($varName, (($loop - 1) * $chunk_size), $chunk_size);
+       $contents = bin2hex($contents);
+
+       $hexstring = '';
+
+       for($loop2=0;$loop2<strlen($contents);$loop2+=2){
+        $hexstring .= '\x' . substr($contents,$loop2,2);
+        }
+
+       $hexstring = $this->qstr($hexstring);
+
+       $this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
+   }
+
+   return;
+  }
+
+ /*
+  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')
+  {
+   $blobVarName = 'hold_blob';
+   $this->create_blobvar($blobVarName);
+   $this->load_blobvar_from_var($blobVarName, $val);
+   $this->Execute("UPDATE $table SET $column=$blobVarName WHERE $where");
+   $this->drop_blobvar($blobVarName);
+   return true;
+  }
+ }; //class
+
+ class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {   
+
+  var $databaseType = "sqlanywhere";           
+
+ function ADORecordSet_sqlanywhere($id,$mode=false)
+ {
+  $this->ADORecordSet_odbc($id,$mode);
+ }
+
+
+ }; //class
+
+
+} //define
+?>
Index: phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php:1.2 Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php     Tue Feb 21 13:47:42 2006
@@ -1,326 +1,398 @@
-<?php
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-
-  Latest version is available at http://adodb.sourceforge.net
-  
-  SQLite info: http://www.hwaci.com/sw/sqlite/
-    
-  Install Instructions:
-  ====================
-  1. Place this in adodb/drivers
-  2. Rename the file, remove the .txt prefix.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB_sqlite extends ADOConnection {
-       var $databaseType = "sqlite";
-       var $replaceQuote = "''"; // string to use to replace quotes
-       var $concat_operator='||';
-       var $_errorNo = 0;
-       var $hasLimit = true;   
-       var $hasInsertID = true;                /// supports autoincrement ID?
-       var $hasAffectedRows = true;    /// supports affected rows for 
update/delete?
-       var $metaTablesSQL = "SELECT name FROM sqlite_master WHERE type='table' 
ORDER BY name";
-       var $sysDate = "adodb_date('Y-m-d')";
-       var $sysTimeStamp = "adodb_date('Y-m-d H:i:s')";
-       var $fmtTimeStamp = "'Y-m-d H:i:s'";
-       
-       function ADODB_sqlite() 
-       {
-       }
-       
-/*
-  function __get($name) 
-  {
-       switch($name) {
-       case 'sysDate': return "'".date($this->fmtDate)."'";
-       case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
-       }
-  }*/
-       
-       function ServerInfo()
-       {
-               $arr['version'] = sqlite_libversion();
-               $arr['description'] = 'SQLite ';
-               $arr['encoding'] = sqlite_libencoding();
-               return $arr;
-       }
-       
-       function BeginTrans()
-       {         
-                if ($this->transOff) return true; 
-                $ret = $this->Execute("BEGIN TRANSACTION");
-                $this->transCnt += 1;
-                return true;
-       }
-       
-       function CommitTrans($ok=true) 
-       { 
-               if ($this->transOff) return true; 
-               if (!$ok) return $this->RollbackTrans();
-               $ret = $this->Execute("COMMIT");
-               if ($this->transCnt>0)$this->transCnt -= 1;
-               return !empty($ret);
-       }
-       
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true; 
-               $ret = $this->Execute("ROLLBACK");
-               if ($this->transCnt>0)$this->transCnt -= 1;
-               return !empty($ret);
-       }
-
-       function _insertid()
-       {
-               return sqlite_last_insert_rowid($this->_connectionID);
-       }
-       
-       function _affectedrows()
-       {
-        return sqlite_changes($this->_connectionID);
-    }
-       
-       function ErrorMsg() 
-       {
-               if ($this->_logsql) return $this->_errorMsg;
-               return ($this->_errorNo) ? sqlite_error_string($this->_errorNo) 
: '';
-       }
- 
-       function ErrorNo() 
-       {
-               return $this->_errorNo;
-       }
-       
-       function SQLDate($fmt, $col=false)
-       {
-               $fmt = $this->qstr($fmt);
-               return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
-       }
-       
-       function &MetaColumns($tab)
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $rs = $this->Execute("select * from $tab limit 1");
-               if (!$rs) {
-                       $false = false;
-                       return $false;
-               }
-               $arr = array();
-               for ($i=0,$max=$rs->_numOfFields; $i < $max; $i++) {
-                       $fld =& $rs->FetchField($i);
-                       if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] =& 
$fld;    
-                       else $arr[strtoupper($fld->name)] =& $fld;
-               }
-               $rs->Close();
-               return $arr;
-       }
-       
-       function _createFunctions()
-       {
-               @sqlite_create_function($this->_connectionID, 'adodb_date', 
'adodb_date', 1);
-               @sqlite_create_function($this->_connectionID, 'adodb_date2', 
'adodb_date2', 2);
-       }
-       
-
-       // returns true or false
-       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               if (!function_exists('sqlite_open')) return null;
-               
-               $this->_connectionID = sqlite_open($argHostname);
-               if ($this->_connectionID === false) return false;
-               $this->_createFunctions();
-               return true;
-       }
-       
-       // returns true or false
-       function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               if (!function_exists('sqlite_open')) return null;
-               
-               $this->_connectionID = sqlite_popen($argHostname);
-               if ($this->_connectionID === false) return false;
-               $this->_createFunctions();
-               return true;
-       }
-
-       // returns query ID if successful, otherwise false
-       function _query($sql,$inputarr=false)
-       {
-               $rez = sqlite_query($sql,$this->_connectionID);
-               if (!$rez) {
-                       $this->_errorNo = 
sqlite_last_error($this->_connectionID);
-               }
-               
-               return $rez;
-       }
-       
-       function 
&SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-       {
-               $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
-               $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? 
' LIMIT 999999999' : '');
-               if ($secs2cache)
-                       $rs =& 
$this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-               else
-                       $rs =& 
$this->Execute($sql."$limitStr$offsetStr",$inputarr);
-                       
-               return $rs;
-       }
-       
-       /*
-               This algorithm is not very efficient, but works even if table 
locking
-               is not available.
-               
-               Will return false if unable to generate an ID after $MAXLOOPS 
attempts.
-       */
-       var $_genSeqSQL = "create table %s (id integer)";
-       
-       function GenID($seq='adodbseq',$start=1)
-       {       
-               // if you have to modify the parameter below, your database is 
overloaded,
-               // or you need to implement generation of id's yourself!
-               $MAXLOOPS = 100;
-               //$this->debug=1;
-               while (--$MAXLOOPS>=0) {
-                       @($num = $this->GetOne("select id from $seq"));
-                       if ($num === false) {
-                               $this->Execute(sprintf($this->_genSeqSQL 
,$seq));       
-                               $start -= 1;
-                               $num = '0';
-                               $ok = $this->Execute("insert into $seq 
values($start)");
-                               if (!$ok) return false;
-                       } 
-                       $this->Execute("update $seq set id=id+1 where id=$num");
-                       
-                       if ($this->affected_rows() > 0) {
-                               $num += 1;
-                               $this->genID = $num;
-                               return $num;
-                       }
-               }
-               if ($fn = $this->raiseErrorFn) {
-                       $fn($this->databaseType,'GENID',-32000,"Unable to 
generate unique id after $MAXLOOPS attempts",$seq,$num);
-               }
-               return false;
-       }
-
-       function CreateSequence($seqname='adodbseq',$start=1)
-       {
-               if (empty($this->_genSeqSQL)) return false;
-               $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-               if (!$ok) return false;
-               $start -= 1;
-               return $this->Execute("insert into $seqname values($start)");
-       }
-       
-       var $_dropSeqSQL = 'drop table %s';
-       function DropSequence($seqname)
-       {
-               if (empty($this->_dropSeqSQL)) return false;
-               return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-       }
-       
-       // returns true or false
-       function _close()
-       {
-               return @sqlite_close($this->_connectionID);
-       }
-
-
-}
-
-/*--------------------------------------------------------------------------------------
-                Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_sqlite extends ADORecordSet {
-
-       var $databaseType = "sqlite";
-       var $bind = false;
-
-       function ADORecordset_sqlite($queryID,$mode=false)
-       {
-               
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               switch($mode) {
-               case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
-               case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
-               default: $this->fetchMode = SQLITE_BOTH; break;
-               }
-               $this->adodbFetchMode = $mode;
-               
-               $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;
-       }
-
-
-       function &FetchField($fieldOffset = -1)
-       {
-               $fld = new ADOFieldObject;
-               $fld->name = sqlite_field_name($this->_queryID, $fieldOffset);
-               $fld->type = 'VARCHAR';
-               $fld->max_length = -1;
-               return $fld;
-       }
-       
-   function _initrs()
-   {
-               $this->_numOfRows = @sqlite_num_rows($this->_queryID);
-               $this->_numOfFields = @sqlite_num_fields($this->_queryID);
-   }
-
-       function Fields($colname)
-       {
-               if ($this->fetchMode != SQLITE_NUM) return 
$this->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 _seek($row)
-   {
-               return sqlite_seek($this->_queryID, $row);
-   }
-
-       function _fetch($ignore_fields=false) 
-       {
-               $this->fields = 
@sqlite_fetch_array($this->_queryID,$this->fetchMode);
-               return !empty($this->fields);
-       }
-       
-       function _close() 
-       {
-       }
-
-}
+<?php
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+
+  Latest version is available at http://adodb.sourceforge.net
+  
+  SQLite info: http://www.hwaci.com/sw/sqlite/
+    
+  Install Instructions:
+  ====================
+  1. Place this in adodb/drivers
+  2. Rename the file, remove the .txt prefix.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB_sqlite extends ADOConnection {
+       var $databaseType = "sqlite";
+       var $replaceQuote = "''"; // string to use to replace quotes
+       var $concat_operator='||';
+       var $_errorNo = 0;
+       var $hasLimit = true;   
+       var $hasInsertID = true;                /// supports autoincrement ID?
+       var $hasAffectedRows = true;    /// supports affected rows for 
update/delete?
+       var $metaTablesSQL = "SELECT name FROM sqlite_master WHERE type='table' 
ORDER BY name";
+       var $sysDate = "adodb_date('Y-m-d')";
+       var $sysTimeStamp = "adodb_date('Y-m-d H:i:s')";
+       var $fmtTimeStamp = "'Y-m-d H:i:s'";
+       
+       function ADODB_sqlite() 
+       {
+       }
+       
+/*
+  function __get($name) 
+  {
+       switch($name) {
+       case 'sysDate': return "'".date($this->fmtDate)."'";
+       case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
+       }
+  }*/
+       
+       function ServerInfo()
+       {
+               $arr['version'] = sqlite_libversion();
+               $arr['description'] = 'SQLite ';
+               $arr['encoding'] = sqlite_libencoding();
+               return $arr;
+       }
+       
+       function BeginTrans()
+       {         
+                if ($this->transOff) return true; 
+                $ret = $this->Execute("BEGIN TRANSACTION");
+                $this->transCnt += 1;
+                return true;
+       }
+       
+       function CommitTrans($ok=true) 
+       { 
+               if ($this->transOff) return true; 
+               if (!$ok) return $this->RollbackTrans();
+               $ret = $this->Execute("COMMIT");
+               if ($this->transCnt>0)$this->transCnt -= 1;
+               return !empty($ret);
+       }
+       
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true; 
+               $ret = $this->Execute("ROLLBACK");
+               if ($this->transCnt>0)$this->transCnt -= 1;
+               return !empty($ret);
+       }
+       
+       // mark newnham
+       function &MetaColumns($tab)
+       {
+         global $ADODB_FETCH_MODE;
+         $false = false;
+         $save = $ADODB_FETCH_MODE;
+         $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+         if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+         $rs = $this->Execute("PRAGMA table_info('$tab')");
+         if (isset($savem)) $this->SetFetchMode($savem);
+         if (!$rs) {
+           $ADODB_FETCH_MODE = $save; 
+           return $false;
+         }
+         $arr = array();
+         while ($r = $rs->FetchRow()) {
+           $type = explode('(',$r['type']);
+           $size = '';
+           if (sizeof($type)==2)
+           $size = trim($type[1],')');
+           $fn = strtoupper($r['name']);
+           $fld = new ADOFieldObject;
+           $fld->name = $r['name'];
+           $fld->type = $type[0];
+           $fld->max_length = $size;
+           $fld->not_null = $r['notnull'];
+           $fld->default_value = $r['dflt_value'];
+           $fld->scale = 0;
+           if ($save == ADODB_FETCH_NUM) $arr[] = $fld;        
+           else $arr[strtoupper($fld->name)] = $fld;
+         }
+         $rs->Close();
+         $ADODB_FETCH_MODE = $save;
+         return $arr;
+       }
+       
+       function _init($parentDriver)
+       {
+       
+               $parentDriver->hasTransactions = false;
+               $parentDriver->hasInsertID = true;
+       }
+
+       function _insertid()
+       {
+               return sqlite_last_insert_rowid($this->_connectionID);
+       }
+       
+       function _affectedrows()
+       {
+        return sqlite_changes($this->_connectionID);
+    }
+       
+       function ErrorMsg() 
+       {
+               if ($this->_logsql) return $this->_errorMsg;
+               return ($this->_errorNo) ? sqlite_error_string($this->_errorNo) 
: '';
+       }
+ 
+       function ErrorNo() 
+       {
+               return $this->_errorNo;
+       }
+       
+       function SQLDate($fmt, $col=false)
+       {
+               $fmt = $this->qstr($fmt);
+               return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
+       }
+       
+       
+       function _createFunctions()
+       {
+               @sqlite_create_function($this->_connectionID, 'adodb_date', 
'adodb_date', 1);
+               @sqlite_create_function($this->_connectionID, 'adodb_date2', 
'adodb_date2', 2);
+       }
+       
+
+       // returns true or false
+       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               if (!function_exists('sqlite_open')) return null;
+               if (empty($argHostname) && $argDatabasename) $argHostname = 
$argDatabasename;
+               
+               $this->_connectionID = sqlite_open($argHostname);
+               if ($this->_connectionID === false) return false;
+               $this->_createFunctions();
+               return true;
+       }
+       
+       // returns true or false
+       function _pconnect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               if (!function_exists('sqlite_open')) return null;
+               if (empty($argHostname) && $argDatabasename) $argHostname = 
$argDatabasename;
+               
+               $this->_connectionID = sqlite_popen($argHostname);
+               if ($this->_connectionID === false) return false;
+               $this->_createFunctions();
+               return true;
+       }
+
+       // returns query ID if successful, otherwise false
+       function _query($sql,$inputarr=false)
+       {
+               $rez = sqlite_query($sql,$this->_connectionID);
+               if (!$rez) {
+                       $this->_errorNo = 
sqlite_last_error($this->_connectionID);
+               }
+               
+               return $rez;
+       }
+       
+       function 
&SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+       {
+               $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
+               $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? 
' LIMIT 999999999' : '');
+               if ($secs2cache)
+                       $rs =& 
$this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+               else
+                       $rs =& 
$this->Execute($sql."$limitStr$offsetStr",$inputarr);
+                       
+               return $rs;
+       }
+       
+       /*
+               This algorithm is not very efficient, but works even if table 
locking
+               is not available.
+               
+               Will return false if unable to generate an ID after $MAXLOOPS 
attempts.
+       */
+       var $_genSeqSQL = "create table %s (id integer)";
+       
+       function GenID($seq='adodbseq',$start=1)
+       {       
+               // if you have to modify the parameter below, your database is 
overloaded,
+               // or you need to implement generation of id's yourself!
+               $MAXLOOPS = 100;
+               //$this->debug=1;
+               while (--$MAXLOOPS>=0) {
+                       @($num = $this->GetOne("select id from $seq"));
+                       if ($num === false) {
+                               $this->Execute(sprintf($this->_genSeqSQL 
,$seq));       
+                               $start -= 1;
+                               $num = '0';
+                               $ok = $this->Execute("insert into $seq 
values($start)");
+                               if (!$ok) return false;
+                       } 
+                       $this->Execute("update $seq set id=id+1 where id=$num");
+                       
+                       if ($this->affected_rows() > 0) {
+                               $num += 1;
+                               $this->genID = $num;
+                               return $num;
+                       }
+               }
+               if ($fn = $this->raiseErrorFn) {
+                       $fn($this->databaseType,'GENID',-32000,"Unable to 
generate unique id after $MAXLOOPS attempts",$seq,$num);
+               }
+               return false;
+       }
+
+       function CreateSequence($seqname='adodbseq',$start=1)
+       {
+               if (empty($this->_genSeqSQL)) return false;
+               $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+               if (!$ok) return false;
+               $start -= 1;
+               return $this->Execute("insert into $seqname values($start)");
+       }
+       
+       var $_dropSeqSQL = 'drop table %s';
+       function DropSequence($seqname)
+       {
+               if (empty($this->_dropSeqSQL)) return false;
+               return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+       }
+       
+       // returns true or false
+       function _close()
+       {
+               return @sqlite_close($this->_connectionID);
+       }
+
+       function &MetaIndexes($table, $primary = FALSE, $owner=false)
+       {
+               $false = false;
+               // save old fetch mode
+        global $ADODB_FETCH_MODE;
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+               $SQL=sprintf("SELECT name,sql FROM sqlite_master WHERE 
type='index' AND tbl_name='%s'", strtolower($table));
+        $rs = $this->Execute($SQL);
+        if (!is_object($rs)) {
+                       if (isset($savem)) 
+                               $this->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+            return $false;
+        }
+
+               $indexes = array ();
+               while ($row = $rs->FetchRow()) {
+                       if ($primary && preg_match("/primary/i",$row[1]) == 0) 
continue;
+            if (!isset($indexes[$row[0]])) {
+
+                       $indexes[$row[0]] = array(
+                                  'unique' => preg_match("/unique/i",$row[1]),
+                                  'columns' => array());
+                       }
+                       /**
+                         * There must be a more elegant way of doing this,
+                         * the index elements appear in the SQL statement
+                         * in cols[1] between parentheses
+                         * e.g CREATE UNIQUE INDEX ware_0 ON warehouse 
(org,warehouse)
+                         */
+                       $cols = explode("(",$row[1]);
+                       $cols = explode(")",$cols[1]);
+                       array_pop($cols);
+                       $indexes[$row[0]]['columns'] = $cols;
+               }
+               if (isset($savem)) { 
+            $this->SetFetchMode($savem);
+                       $ADODB_FETCH_MODE = $save;
+               }
+        return $indexes;
+       }
+
+}
+
+/*--------------------------------------------------------------------------------------
+                Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_sqlite extends ADORecordSet {
+
+       var $databaseType = "sqlite";
+       var $bind = false;
+
+       function ADORecordset_sqlite($queryID,$mode=false)
+       {
+               
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               switch($mode) {
+               case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
+               case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
+               default: $this->fetchMode = SQLITE_BOTH; break;
+               }
+               $this->adodbFetchMode = $mode;
+               
+               $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;
+       }
+
+
+       function &FetchField($fieldOffset = -1)
+       {
+               $fld = new ADOFieldObject;
+               $fld->name = sqlite_field_name($this->_queryID, $fieldOffset);
+               $fld->type = 'VARCHAR';
+               $fld->max_length = -1;
+               return $fld;
+       }
+       
+   function _initrs()
+   {
+               $this->_numOfRows = @sqlite_num_rows($this->_queryID);
+               $this->_numOfFields = @sqlite_num_fields($this->_queryID);
+   }
+
+       function Fields($colname)
+       {
+               if ($this->fetchMode != SQLITE_NUM) return 
$this->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 _seek($row)
+   {
+               return sqlite_seek($this->_queryID, $row);
+   }
+
+       function _fetch($ignore_fields=false) 
+       {
+               $this->fields = 
@sqlite_fetch_array($this->_queryID,$this->fetchMode);
+               return !empty($this->fields);
+       }
+       
+       function _close() 
+       {
+       }
+
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php:1.2       Thu Dec 30 
06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php   Tue Feb 21 13:47:42 2006
@@ -1,62 +1,62 @@
-<?php
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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.
-
-  Portable version of sqlite driver, to make it more similar to other database 
drivers.
-  The main differences are
-
-   1. When selecting (joining) multiple tables, in assoc mode the table
-         names are included in the assoc keys in the "sqlite" driver.
-         
-         In "sqlitepo" driver, the table names are stripped from the returned 
column names. 
-         When this results in a conflict,  the first field get preference.
-
-       Contributed by Herman Kuiper  herman#ozuzo.net  
-*/
-
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-sqlite.inc.php');
-
-class ADODB_sqlitepo extends ADODB_sqlite {
-   var $databaseType = 'sqlitepo';
-
-   function ADODB_sqlitepo()
-   {
-      $this->ADODB_sqlite();
-   }
-}
-
-/*--------------------------------------------------------------------------------------
-       Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_sqlitepo extends ADORecordset_sqlite {
-
-   var $databaseType = 'sqlitepo';
-
-   function ADORecordset_sqlitepo($queryID,$mode=false)
-   {
-      $this->ADORecordset_sqlite($queryID,$mode);
-   }
-   
-   // Modified to strip table names from returned fields
-   function _fetch($ignore_fields=false)
-   {
-      $this->fields = array();
-      $fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
-      if(is_array($fields))
-         foreach($fields as $n => $v)
-         {
-            if(($p = strpos($n, ".")) !== false)
-               $n = substr($n, $p+1);
-            $this->fields[$n] = $v;
-         }
-
-      return !empty($this->fields);
-   }
-}
+<?php
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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.
+
+  Portable version of sqlite driver, to make it more similar to other database 
drivers.
+  The main differences are
+
+   1. When selecting (joining) multiple tables, in assoc mode the table
+         names are included in the assoc keys in the "sqlite" driver.
+         
+         In "sqlitepo" driver, the table names are stripped from the returned 
column names. 
+         When this results in a conflict,  the first field get preference.
+
+       Contributed by Herman Kuiper  herman#ozuzo.net  
+*/
+
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR.'/drivers/adodb-sqlite.inc.php');
+
+class ADODB_sqlitepo extends ADODB_sqlite {
+   var $databaseType = 'sqlitepo';
+
+   function ADODB_sqlitepo()
+   {
+      $this->ADODB_sqlite();
+   }
+}
+
+/*--------------------------------------------------------------------------------------
+       Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_sqlitepo extends ADORecordset_sqlite {
+
+   var $databaseType = 'sqlitepo';
+
+   function ADORecordset_sqlitepo($queryID,$mode=false)
+   {
+      $this->ADORecordset_sqlite($queryID,$mode);
+   }
+   
+   // Modified to strip table names from returned fields
+   function _fetch($ignore_fields=false)
+   {
+      $this->fields = array();
+      $fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
+      if(is_array($fields))
+         foreach($fields as $n => $v)
+         {
+            if(($p = strpos($n, ".")) !== false)
+               $n = substr($n, $p+1);
+            $this->fields[$n] = $v;
+         }
+
+      return !empty($this->fields);
+   }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php:1.2 Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php     Tue Feb 21 13:47:42 2006
@@ -1,413 +1,418 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 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://adodb.sourceforge.net
-  
-  Sybase driver contributed by Toni (address@hidden)
-  
-  - MSSQL date patch applied.
-  
-  Date patch by Toni 15 Feb 2002
-*/
- 
- // security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB_sybase extends ADOConnection {
-       var $databaseType = "sybase";   
-       var $dataProvider = 'sybase';
-       var $replaceQuote = "''"; // string to use to replace quotes
-       var $fmtDate = "'Y-m-d'";
-       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'";
-       // see 
http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
-       var $metaColumnsSQL = "SELECT c.column_name, c.column_type, c.width 
FROM syscolumn c, systable t WHERE t.table_name='%s' AND c.table_id=t.table_id 
AND t.table_type='BASE'";
-       /*
-       "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 = '+'; 
-       var $arrayClass = 'ADORecordSet_array_sybase';
-       var $sysDate = 'GetDate()';
-       var $leftOuter = '*=';
-       var $rightOuter = '=*';
-       
-       function ADODB_sybase() 
-       {                       
-       }
- 
-       // might require begintrans -- committrans
-       function _insertid()
-       {
-               return $this->GetOne('select @@identity');
-       }
-         // might require begintrans -- committrans
-       function _affectedrows()
-       {
-          return $this->GetOne('select @@rowcount');
-       }
-
-                         
-       function BeginTrans()
-       {       
-       
-               if ($this->transOff) return true;
-               $this->transCnt += 1;
-                  
-               $this->Execute('BEGIN TRAN');
-               return true;
-       }
-       
-       function CommitTrans($ok=true) 
-       { 
-               if ($this->transOff) return true;
-               
-               if (!$ok) return $this->RollbackTrans();
-       
-               $this->transCnt -= 1;
-               $this->Execute('COMMIT TRAN');
-               return true;
-       }
-       
-       function RollbackTrans()
-       {
-               if ($this->transOff) return true;
-               $this->transCnt -= 1;
-               $this->Execute('ROLLBACK TRAN');
-               return true;
-       }
-       
-       // http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
-       function RowLock($tables,$where) 
-       {
-               if (!$this->_hastrans) $this->BeginTrans();
-               $tables = str_replace(',',' HOLDLOCK,',$tables);
-               return $this->GetOne("select top 1 null as ignore from $tables 
HOLDLOCK where $where");
-               
-       }       
-               
-       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()
-       {
-               if ($this->_logsql) return $this->_errorMsg;
-               if (function_exists('sybase_get_last_message'))
-                       $this->_errorMsg = sybase_get_last_message();
-               else
-                       $this->_errorMsg = isset($php_errormsg) ? $php_errormsg 
: 'SYBASE error messages not supported on this platform';
-               return $this->_errorMsg;
-       }
-
-       // returns true or false
-       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
-       {
-               if (!function_exists('sybase_connect')) return null;
-               
-               $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)
-       {
-               if (!function_exists('sybase_connect')) return null;
-               
-               $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)
-       {
-       global $ADODB_COUNTRECS;
-       
-               if ($ADODB_COUNTRECS == false && ADODB_PHPVER >= 0x4300)
-                       return 
sybase_unbuffered_query($sql,$this->_connectionID);
-               else
-                       return sybase_query($sql,$this->_connectionID);
-       }
-       
-       // See http://www.isug.com/Sybase_FAQ/ASE/section6.2.html#6.2.12
-       function 
&SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-       {
-               if ($secs2cache > 0) {// we do not cache rowcount, so we have 
to load entire recordset
-                       $rs =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-                       return $rs;
-               }
-               $cnt = ($nrows >= 0) ? $nrows : 999999999;
-               if ($offset > 0 && $cnt) $cnt += $offset;
-               
-               $this->Execute("set rowcount $cnt"); 
-               $rs =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
-               $this->Execute("set rowcount 0");
-               
-               return $rs;
-       }
-
-       // returns true or false
-       function _close()
-       { 
-               return @sybase_close($this->_connectionID);
-       }
-       
-       function UnixDate($v)
-       {
-               return ADORecordSet_array_sybase::UnixDate($v);
-       }
-       
-       function UnixTimeStamp($v)
-       {
-               return ADORecordSet_array_sybase::UnixTimeStamp($v);
-       }       
-       
-       
-
-       # Added 2003-10-05 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- 
http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase 
compatible version
-    // Format date column in sql string given an input format that understands 
Y M D
-    function SQLDate($fmt, $col=false)
-    {
-        if (!$col) $col = $this->sysTimeStamp;
-        $s = '';
-
-        $len = strlen($fmt);
-        for ($i=0; $i < $len; $i++) {
-            if ($s) $s .= '+';
-            $ch = $fmt[$i];
-            switch($ch) {
-            case 'Y':
-            case 'y':
-                $s .= "datename(yy,$col)";
-                break;
-            case 'M':
-                $s .= "convert(char(3),$col,0)";
-                break;
-            case 'm':
-                $s .= "replace(str(month($col),2),' ','0')";
-                break;
-            case 'Q':
-            case 'q':
-                $s .= "datename(qq,$col)";
-                break;
-            case 'D':
-            case 'd':
-                $s .= "replace(str(datepart(dd,$col),2),' ','0')";
-                break;
-            case 'h':
-                $s .= "substring(convert(char(14),$col,0),13,2)";
-                break;
-
-            case 'H':
-                $s .= "replace(str(datepart(hh,$col),2),' ','0')";
-                break;
-
-            case 'i':
-                $s .= "replace(str(datepart(mi,$col),2),' ','0')";
-                break;
-            case 's':
-                $s .= "replace(str(datepart(ss,$col),2),' ','0')";
-                break;
-            case 'a':
-            case 'A':
-                $s .= "substring(convert(char(19),$col,0),18,2)";
-                break;
-
-            default:
-                if ($ch == '\\') {
-                    $i++;
-                    $ch = substr($fmt,$i,1);
-                }
-                $s .= $this->qstr($ch);
-                break;
-            }
-        }
-        return $s;
-    }
-       
-       # Added 2003-10-07 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- 
http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase 
compatible version
-    function MetaPrimaryKeys($table)
-    {
-        $sql = "SELECT c.column_name " .
-               "FROM syscolumn c, systable t " .
-               "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
-               "AND t.table_type='BASE' " .
-               "AND c.pkey = 'Y' " .
-               "ORDER BY c.column_id";
-
-        $a = $this->GetCol($sql);
-        if ($a && sizeof($a)>0) return $a;
-        return false;
-    }
-}
-       
-/*--------------------------------------------------------------------------------------
-        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,$mode=false)
-       {
-               if ($mode === false) { 
-                       global $ADODB_FETCH_MODE;
-                       $mode = $ADODB_FETCH_MODE;
-               }
-               if (!$mode) $this->fetchMode = ADODB_FETCH_ASSOC;
-               else $this->fetchMode = $mode;
-               return $this->ADORecordSet($id,$mode);
-       }
-       
-       /*      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) 
-       {
-               if ($this->fetchMode == ADODB_FETCH_NUM) {
-                       $this->fields = @sybase_fetch_row($this->_queryID);
-               } else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-                       $this->fields = @sybase_fetch_row($this->_queryID);
-                       if (is_array($this->fields)) {
-                               $this->fields = 
$this->GetRowAssoc(ADODB_ASSOC_CASE);
-                               return true;
-                       }
-                       return false;
-               }  else {
-                       $this->fields = @sybase_fetch_array($this->_queryID);
-               }
-               if ( is_array($this->fields)) {
-                       return true;
-               }
-
-               return false;
-       }
-       
-       /*      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)
-       {
-               return ADORecordSet_array_sybase::UnixDate($v);
-       }
-       
-       function UnixTimeStamp($v)
-       {
-               return ADORecordSet_array_sybase::UnixTimeStamp($v);
-       }
-}
-
-class ADORecordSet_array_sybase extends ADORecordSet_array {
-       function ADORecordSet_array_sybase($id=-1)
-       {
-               $this->ADORecordSet_array($id);
-       }
-       
-               // sybase/mssql uses a default date like Dec 30 2000 12:00AM
-       function UnixDate($v)
-       {
-       global $ADODB_sybase_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] <= TIMESTAMP_FIRST_YEAR) 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;
-               //11.02.2001 Toni Tunkkari address@hidden
-               //Changed [0-9] to [0-9 ] in day conversion
-               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] <= TIMESTAMP_FIRST_YEAR) return 0;
-               
-               $themth = substr(strtoupper($rr[1]),0,3);
-               $themth = $ADODB_sybase_mths[$themth];
-               if ($themth <= 0) return false;
-               
-               switch (strtoupper($rr[6])) {
-               case 'P':
-                       if ($rr[4]<12) $rr[4] += 12;
-                       break;
-               case 'A':
-                       if ($rr[4]==12) $rr[4] = 0;
-                       break;
-               default:
-                       break;
-               }
-               // h-m-s-MM-DD-YY
-               return  mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
-       }
-}
-?>
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 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://adodb.sourceforge.net
+  
+  Sybase driver contributed by Toni (address@hidden)
+  
+  - MSSQL date patch applied.
+  
+  Date patch by Toni 15 Feb 2002
+*/
+ 
+ // security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB_sybase extends ADOConnection {
+       var $databaseType = "sybase";   
+       var $dataProvider = 'sybase';
+       var $replaceQuote = "''"; // string to use to replace quotes
+       var $fmtDate = "'Y-m-d'";
+       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'";
+       // see 
http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
+       var $metaColumnsSQL = "SELECT c.column_name, c.column_type, c.width 
FROM syscolumn c, systable t WHERE t.table_name='%s' AND c.table_id=t.table_id 
AND t.table_type='BASE'";
+       /*
+       "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 = '+'; 
+       var $arrayClass = 'ADORecordSet_array_sybase';
+       var $sysDate = 'GetDate()';
+       var $leftOuter = '*=';
+       var $rightOuter = '=*';
+       
+       function ADODB_sybase() 
+       {                       
+       }
+ 
+       // might require begintrans -- committrans
+       function _insertid()
+       {
+               return $this->GetOne('select @@identity');
+       }
+         // might require begintrans -- committrans
+       function _affectedrows()
+       {
+          return $this->GetOne('select @@rowcount');
+       }
+
+                         
+       function BeginTrans()
+       {       
+       
+               if ($this->transOff) return true;
+               $this->transCnt += 1;
+                  
+               $this->Execute('BEGIN TRAN');
+               return true;
+       }
+       
+       function CommitTrans($ok=true) 
+       { 
+               if ($this->transOff) return true;
+               
+               if (!$ok) return $this->RollbackTrans();
+       
+               $this->transCnt -= 1;
+               $this->Execute('COMMIT TRAN');
+               return true;
+       }
+       
+       function RollbackTrans()
+       {
+               if ($this->transOff) return true;
+               $this->transCnt -= 1;
+               $this->Execute('ROLLBACK TRAN');
+               return true;
+       }
+       
+       // http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
+       function RowLock($tables,$where,$flds='top 1 null as ignore') 
+       {
+               if (!$this->_hastrans) $this->BeginTrans();
+               $tables = str_replace(',',' HOLDLOCK,',$tables);
+               return $this->GetOne("select $flds from $tables HOLDLOCK where 
$where");
+               
+       }       
+               
+       function SelectDB($dbName) 
+       {
+               $this->database = $dbName;
+               $this->databaseName = $dbName; # obsolete, retained for compat 
with older adodb versions
+               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()
+       {
+               if ($this->_logsql) return $this->_errorMsg;
+               if (function_exists('sybase_get_last_message'))
+                       $this->_errorMsg = sybase_get_last_message();
+               else
+                       $this->_errorMsg = isset($php_errormsg) ? $php_errormsg 
: 'SYBASE error messages not supported on this platform';
+               return $this->_errorMsg;
+       }
+
+       // returns true or false
+       function _connect($argHostname, $argUsername, $argPassword, 
$argDatabasename)
+       {
+               if (!function_exists('sybase_connect')) return null;
+               
+               $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)
+       {
+               if (!function_exists('sybase_connect')) return null;
+               
+               $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)
+       {
+       global $ADODB_COUNTRECS;
+       
+               if ($ADODB_COUNTRECS == false && ADODB_PHPVER >= 0x4300)
+                       return 
sybase_unbuffered_query($sql,$this->_connectionID);
+               else
+                       return sybase_query($sql,$this->_connectionID);
+       }
+       
+       // See http://www.isug.com/Sybase_FAQ/ASE/section6.2.html#6.2.12
+       function 
&SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+       {
+               if ($secs2cache > 0) {// we do not cache rowcount, so we have 
to load entire recordset
+                       $rs =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+                       return $rs;
+               }
+               
+               $nrows = (integer) $nrows;
+               $offset = (integer) $offset;
+               
+               $cnt = ($nrows >= 0) ? $nrows : 999999999;
+               if ($offset > 0 && $cnt) $cnt += $offset;
+               
+               $this->Execute("set rowcount $cnt"); 
+               $rs =& 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
+               $this->Execute("set rowcount 0");
+               
+               return $rs;
+       }
+
+       // returns true or false
+       function _close()
+       { 
+               return @sybase_close($this->_connectionID);
+       }
+       
+       function UnixDate($v)
+       {
+               return ADORecordSet_array_sybase::UnixDate($v);
+       }
+       
+       function UnixTimeStamp($v)
+       {
+               return ADORecordSet_array_sybase::UnixTimeStamp($v);
+       }       
+       
+       
+
+       # Added 2003-10-05 by Chris Phillipson
+    # Used ASA SQL Reference Manual -- 
http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
+    # to convert similar Microsoft SQL*Server (mssql) API into Sybase 
compatible version
+    // Format date column in sql string given an input format that understands 
Y M D
+    function SQLDate($fmt, $col=false)
+    {
+        if (!$col) $col = $this->sysTimeStamp;
+        $s = '';
+
+        $len = strlen($fmt);
+        for ($i=0; $i < $len; $i++) {
+            if ($s) $s .= '+';
+            $ch = $fmt[$i];
+            switch($ch) {
+            case 'Y':
+            case 'y':
+                $s .= "datename(yy,$col)";
+                break;
+            case 'M':
+                $s .= "convert(char(3),$col,0)";
+                break;
+            case 'm':
+                $s .= "replace(str(month($col),2),' ','0')";
+                break;
+            case 'Q':
+            case 'q':
+                $s .= "datename(qq,$col)";
+                break;
+            case 'D':
+            case 'd':
+                $s .= "replace(str(datepart(dd,$col),2),' ','0')";
+                break;
+            case 'h':
+                $s .= "substring(convert(char(14),$col,0),13,2)";
+                break;
+
+            case 'H':
+                $s .= "replace(str(datepart(hh,$col),2),' ','0')";
+                break;
+
+            case 'i':
+                $s .= "replace(str(datepart(mi,$col),2),' ','0')";
+                break;
+            case 's':
+                $s .= "replace(str(datepart(ss,$col),2),' ','0')";
+                break;
+            case 'a':
+            case 'A':
+                $s .= "substring(convert(char(19),$col,0),18,2)";
+                break;
+
+            default:
+                if ($ch == '\\') {
+                    $i++;
+                    $ch = substr($fmt,$i,1);
+                }
+                $s .= $this->qstr($ch);
+                break;
+            }
+        }
+        return $s;
+    }
+       
+       # Added 2003-10-07 by Chris Phillipson
+    # Used ASA SQL Reference Manual -- 
http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
+    # to convert similar Microsoft SQL*Server (mssql) API into Sybase 
compatible version
+    function MetaPrimaryKeys($table)
+    {
+        $sql = "SELECT c.column_name " .
+               "FROM syscolumn c, systable t " .
+               "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
+               "AND t.table_type='BASE' " .
+               "AND c.pkey = 'Y' " .
+               "ORDER BY c.column_id";
+
+        $a = $this->GetCol($sql);
+        if ($a && sizeof($a)>0) return $a;
+        return false;
+    }
+}
+       
+/*--------------------------------------------------------------------------------------
+        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,$mode=false)
+       {
+               if ($mode === false) { 
+                       global $ADODB_FETCH_MODE;
+                       $mode = $ADODB_FETCH_MODE;
+               }
+               if (!$mode) $this->fetchMode = ADODB_FETCH_ASSOC;
+               else $this->fetchMode = $mode;
+               $this->ADORecordSet($id,$mode);
+       }
+       
+       /*      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) 
+       {
+               if ($this->fetchMode == ADODB_FETCH_NUM) {
+                       $this->fields = @sybase_fetch_row($this->_queryID);
+               } else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
+                       $this->fields = @sybase_fetch_row($this->_queryID);
+                       if (is_array($this->fields)) {
+                               $this->fields = 
$this->GetRowAssoc(ADODB_ASSOC_CASE);
+                               return true;
+                       }
+                       return false;
+               }  else {
+                       $this->fields = @sybase_fetch_array($this->_queryID);
+               }
+               if ( is_array($this->fields)) {
+                       return true;
+               }
+
+               return false;
+       }
+       
+       /*      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)
+       {
+               return ADORecordSet_array_sybase::UnixDate($v);
+       }
+       
+       function UnixTimeStamp($v)
+       {
+               return ADORecordSet_array_sybase::UnixTimeStamp($v);
+       }
+}
+
+class ADORecordSet_array_sybase extends ADORecordSet_array {
+       function ADORecordSet_array_sybase($id=-1)
+       {
+               $this->ADORecordSet_array($id);
+       }
+       
+               // sybase/mssql uses a default date like Dec 30 2000 12:00AM
+       function UnixDate($v)
+       {
+       global $ADODB_sybase_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] <= TIMESTAMP_FIRST_YEAR) 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;
+               //11.02.2001 Toni Tunkkari address@hidden
+               //Changed [0-9] to [0-9 ] in day conversion
+               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] <= TIMESTAMP_FIRST_YEAR) return 0;
+               
+               $themth = substr(strtoupper($rr[1]),0,3);
+               $themth = $ADODB_sybase_mths[$themth];
+               if ($themth <= 0) return false;
+               
+               switch (strtoupper($rr[6])) {
+               case 'P':
+                       if ($rr[4]<12) $rr[4] += 12;
+                       break;
+               case 'A':
+                       if ($rr[4]==12) $rr[4] = 0;
+                       break;
+               default:
+                       break;
+               }
+               // h-m-s-MM-DD-YY
+               return  mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
+       }
+}
+?>
Index: phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php
diff -u phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php:1.2 
phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php:1.3
--- phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php:1.2    Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php        Tue Feb 21 13:47:42 2006
@@ -1,106 +1,107 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-       include(ADODB_DIR."/drivers/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 = 'top';            // support mssql SELECT TOP 10 * FROM 
TABLE
-       var $_bindInputArray = false; // strangely enough, setting to true does 
not work reliably
-       var $sysTimeStamp = 'datetime()';
-       var $sysDate = 'date()';
-       var $ansiOuter = true;
-       var $hasTransactions = false;
-       var $curmode = false ; // See sqlext.h, SQL_CUR_DEFAULT == 
SQL_CUR_USE_DRIVER == 2L
-       
-       function ADODB_vfp()
-       {
-               $this->ADODB_odbc();
-       }
-       
-       function Time()
-       {
-               return time();
-       }
-       
-       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,$secs2cache=0)
-       {
-               $this->hasTop = preg_match('/ORDER[ \t\r\n]+BY/is',$sql) ? 
'top' : false;
-               return 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-       }
-       
-
-
-};
- 
-
-class  ADORecordSet_vfp extends ADORecordSet_odbc {    
-       
-       var $databaseType = "vfp";              
-
-       
-       function ADORecordSet_vfp($id,$mode=false)
-       {
-               return $this->ADORecordSet_odbc($id,$mode);
-       }
-
-       function MetaType($t,$len=-1)
-       {
-               if (is_object($t)) {
-                       $fieldobj = $t;
-                       $t = $fieldobj->type;
-                       $len = $fieldobj->max_length;
-               }
-               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
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+       include(ADODB_DIR."/drivers/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 = 'top';            // support mssql SELECT TOP 10 * FROM 
TABLE
+       var $_bindInputArray = false; // strangely enough, setting to true does 
not work reliably
+       var $sysTimeStamp = 'datetime()';
+       var $sysDate = 'date()';
+       var $ansiOuter = true;
+       var $hasTransactions = false;
+       var $curmode = false ; // See sqlext.h, SQL_CUR_DEFAULT == 
SQL_CUR_USE_DRIVER == 2L
+       
+       function ADODB_vfp()
+       {
+               $this->ADODB_odbc();
+       }
+       
+       function Time()
+       {
+               return time();
+       }
+       
+       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,$secs2cache=0)
+       {
+               $this->hasTop = preg_match('/ORDER[ \t\r\n]+BY/is',$sql) ? 
'top' : false;
+               $ret = 
ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+               return $ret;
+       }
+       
+
+
+};
+ 
+
+class  ADORecordSet_vfp extends ADORecordSet_odbc {    
+       
+       var $databaseType = "vfp";              
+
+       
+       function ADORecordSet_vfp($id,$mode=false)
+       {
+               return $this->ADORecordSet_odbc($id,$mode);
+       }
+
+       function MetaType($t,$len=-1)
+       {
+               if (is_object($t)) {
+                       $fieldobj = $t;
+                       $t = $fieldobj->type;
+                       $len = $fieldobj->max_length;
+               }
+               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
Index: phpgwapi/inc/adodb/lang/adodb-ar.inc.php
diff -u phpgwapi/inc/adodb/lang/adodb-ar.inc.php:1.2 
phpgwapi/inc/adodb/lang/adodb-ar.inc.php:1.3
--- phpgwapi/inc/adodb/lang/adodb-ar.inc.php:1.2        Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/lang/adodb-ar.inc.php    Tue Feb 21 13:47:42 2006
@@ -22,7 +22,7 @@
            DB_ERROR_SYNTAX             => 'ÎØÃ Ýí ÇáÕíÛÉ',
            DB_ERROR_UNSUPPORTED        => 'ÛíÑ ãÏÚæã',
            DB_ERROR_VALUE_COUNT_ON_ROW => 'ÚÏÏ ÇáÞíã Ýí ÇáÓÌá',
-           DB_ERROR_INVALID_DSN        => 'DNS ÛíÑ ÕÍíÍ',
+           DB_ERROR_INVALID_DSN        => 'DSN ÛíÑ ÕÍíÍ',
            DB_ERROR_CONNECT_FAILED     => 'ÝÔá ÚãáíÉ ÇáÅÊÕÇá',
            0                          => 'áíÓ åäÇáß ÃÎØÇÁ', // DB_OK
            DB_ERROR_NEED_MORE_DATA     => 'ÇáÈíÇäÇÊ ÇáãÒæÏÉ ÛíÑ ßÇÝíÉ',
Index: phpgwapi/inc/adodb/lang/adodb-en.inc.php
diff -u phpgwapi/inc/adodb/lang/adodb-en.inc.php:1.2 
phpgwapi/inc/adodb/lang/adodb-en.inc.php:1.3
--- phpgwapi/inc/adodb/lang/adodb-en.inc.php:1.2        Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/lang/adodb-en.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,34 +1,34 @@
-<?php
-
-$ADODB_LANG_ARRAY = array (
-                       'LANG'                      => 'en',
-            DB_ERROR                    => 'unknown error',
-            DB_ERROR_ALREADY_EXISTS     => 'already exists',
-            DB_ERROR_CANNOT_CREATE      => 'can not create',
-            DB_ERROR_CANNOT_DELETE      => 'can not delete',
-            DB_ERROR_CANNOT_DROP        => 'can not drop',
-            DB_ERROR_CONSTRAINT         => 'constraint violation',
-            DB_ERROR_DIVZERO            => 'division by zero',
-            DB_ERROR_INVALID            => 'invalid',
-            DB_ERROR_INVALID_DATE       => 'invalid date or time',
-            DB_ERROR_INVALID_NUMBER     => 'invalid number',
-            DB_ERROR_MISMATCH           => 'mismatch',
-            DB_ERROR_NODBSELECTED       => 'no database selected',
-            DB_ERROR_NOSUCHFIELD        => 'no such field',
-            DB_ERROR_NOSUCHTABLE        => 'no such table',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'not found',
-            DB_ERROR_NOT_LOCKED         => 'not locked',
-            DB_ERROR_SYNTAX             => 'syntax error',
-            DB_ERROR_UNSUPPORTED        => 'not supported',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
-            DB_ERROR_INVALID_DSN        => 'invalid DSN',
-            DB_ERROR_CONNECT_FAILED     => 'connect failed',
-            0                         => 'no error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
-            DB_ERROR_NOSUCHDB           => 'no such database',
-            DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions'
-);
-?>
+<?php
+
+$ADODB_LANG_ARRAY = array (
+                       'LANG'                      => 'en',
+            DB_ERROR                    => 'unknown error',
+            DB_ERROR_ALREADY_EXISTS     => 'already exists',
+            DB_ERROR_CANNOT_CREATE      => 'can not create',
+            DB_ERROR_CANNOT_DELETE      => 'can not delete',
+            DB_ERROR_CANNOT_DROP        => 'can not drop',
+            DB_ERROR_CONSTRAINT         => 'constraint violation',
+            DB_ERROR_DIVZERO            => 'division by zero',
+            DB_ERROR_INVALID            => 'invalid',
+            DB_ERROR_INVALID_DATE       => 'invalid date or time',
+            DB_ERROR_INVALID_NUMBER     => 'invalid number',
+            DB_ERROR_MISMATCH           => 'mismatch',
+            DB_ERROR_NODBSELECTED       => 'no database selected',
+            DB_ERROR_NOSUCHFIELD        => 'no such field',
+            DB_ERROR_NOSUCHTABLE        => 'no such table',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
+            DB_ERROR_NOT_FOUND          => 'not found',
+            DB_ERROR_NOT_LOCKED         => 'not locked',
+            DB_ERROR_SYNTAX             => 'syntax error',
+            DB_ERROR_UNSUPPORTED        => 'not supported',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
+            DB_ERROR_INVALID_DSN        => 'invalid DSN',
+            DB_ERROR_CONNECT_FAILED     => 'connect failed',
+            0                         => 'no error', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
+            DB_ERROR_NOSUCHDB           => 'no such database',
+            DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions'
+);
+?>
                
\ No newline at end of file
Index: phpgwapi/inc/adodb/lang/adodb-es.inc.php
diff -u phpgwapi/inc/adodb/lang/adodb-es.inc.php:1.2 
phpgwapi/inc/adodb/lang/adodb-es.inc.php:1.3
--- phpgwapi/inc/adodb/lang/adodb-es.inc.php:1.2        Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/lang/adodb-es.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,34 +1,33 @@
-<?php
-// contributed by "Horacio Degiorgi" <address@hidden>
-$ADODB_LANG_ARRAY = array (
-                       'LANG'                      => 'es',
-            DB_ERROR                    => 'error desconocido',
-            DB_ERROR_ALREADY_EXISTS     => 'ya existe',
-            DB_ERROR_CANNOT_CREATE      => 'imposible crear',
-            DB_ERROR_CANNOT_DELETE      => 'imposible borrar',
-            DB_ERROR_CANNOT_DROP        => 'imposible hacer drop',
-            DB_ERROR_CONSTRAINT         => 'violacion de constraint',
-            DB_ERROR_DIVZERO            => 'division por cero',
-            DB_ERROR_INVALID            => 'invalido',
-            DB_ERROR_INVALID_DATE       => 'fecha u hora invalida',
-            DB_ERROR_INVALID_NUMBER     => 'numero invalido',
-            DB_ERROR_MISMATCH           => 'error',
-            DB_ERROR_NODBSELECTED       => 'no hay base de datos seleccionada',
-            DB_ERROR_NOSUCHFIELD        => 'campo invalido',
-            DB_ERROR_NOSUCHTABLE        => 'tabla no existe',
-            DB_ERROR_NOT_CAPABLE        => 'capacidad invalida para esta DB',
-            DB_ERROR_NOT_FOUND          => 'no encontrado',
-            DB_ERROR_NOT_LOCKED         => 'no bloqueado',
-            DB_ERROR_SYNTAX             => 'error de sintaxis',
-            DB_ERROR_UNSUPPORTED        => 'no soportado',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'la cantidad de columnas no 
corresponden a la cantidad de valores',
-            DB_ERROR_INVALID_DSN
-        => 'DSN invalido',
-            DB_ERROR_CONNECT_FAILED     => 'fallo la conexion',
-            0                         => 'sin error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'insuficientes datos',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension no encontrada',
-            DB_ERROR_NOSUCHDB           => 'base de datos no encontrada',
-            DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficientes'
-);
+<?php
+// contributed by "Horacio Degiorgi" <address@hidden>
+$ADODB_LANG_ARRAY = array (
+                       'LANG'                      => 'es',
+            DB_ERROR                    => 'error desconocido',
+            DB_ERROR_ALREADY_EXISTS     => 'ya existe',
+            DB_ERROR_CANNOT_CREATE      => 'imposible crear',
+            DB_ERROR_CANNOT_DELETE      => 'imposible borrar',
+            DB_ERROR_CANNOT_DROP        => 'imposible hacer drop',
+            DB_ERROR_CONSTRAINT         => 'violacion de constraint',
+            DB_ERROR_DIVZERO            => 'division por cero',
+            DB_ERROR_INVALID            => 'invalido',
+            DB_ERROR_INVALID_DATE       => 'fecha u hora invalida',
+            DB_ERROR_INVALID_NUMBER     => 'numero invalido',
+            DB_ERROR_MISMATCH           => 'error',
+            DB_ERROR_NODBSELECTED       => 'no hay base de datos seleccionada',
+            DB_ERROR_NOSUCHFIELD        => 'campo invalido',
+            DB_ERROR_NOSUCHTABLE        => 'tabla no existe',
+            DB_ERROR_NOT_CAPABLE        => 'capacidad invalida para esta DB',
+            DB_ERROR_NOT_FOUND          => 'no encontrado',
+            DB_ERROR_NOT_LOCKED         => 'no bloqueado',
+            DB_ERROR_SYNTAX             => 'error de sintaxis',
+            DB_ERROR_UNSUPPORTED        => 'no soportado',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'la cantidad de columnas no 
corresponden a la cantidad de valores',
+            DB_ERROR_INVALID_DSN        => 'DSN invalido',
+            DB_ERROR_CONNECT_FAILED     => 'fallo la conexion',
+            0                         => 'sin error', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'insuficientes datos',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension no encontrada',
+            DB_ERROR_NOSUCHDB           => 'base de datos no encontrada',
+            DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficientes'
+);
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/lang/adodb-hu.inc.php
diff -u phpgwapi/inc/adodb/lang/adodb-hu.inc.php:1.2 
phpgwapi/inc/adodb/lang/adodb-hu.inc.php:1.3
--- phpgwapi/inc/adodb/lang/adodb-hu.inc.php:1.2        Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/lang/adodb-hu.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,34 +1,34 @@
-<?php
-# Hungarian language, encoding by ISO 8859-2 charset (Iso Latin-2)
-# Halászvári Gábor <g.halaszvari#portmax.hu>
-$ADODB_LANG_ARRAY = array (
-                       'LANG'                      => 'hu',
-            DB_ERROR                    => 'ismeretlen hiba',
-            DB_ERROR_ALREADY_EXISTS     => 'már létezik',
-            DB_ERROR_CANNOT_CREATE      => 'nem sikerült létrehozni',
-            DB_ERROR_CANNOT_DELETE      => 'nem sikerült törölni',
-            DB_ERROR_CANNOT_DROP        => 'nem sikerült eldobni',
-            DB_ERROR_CONSTRAINT         => 'szabályok megszegése',
-            DB_ERROR_DIVZERO            => 'osztás nullával',
-            DB_ERROR_INVALID            => 'érvénytelen',
-            DB_ERROR_INVALID_DATE       => 'érvénytelen dátum vagy idõ',
-            DB_ERROR_INVALID_NUMBER     => 'érvénytelen szám',
-            DB_ERROR_MISMATCH           => 'nem megfelelõ',
-            DB_ERROR_NODBSELECTED       => 'nincs kiválasztott adatbázis',
-            DB_ERROR_NOSUCHFIELD        => 'nincs ilyen mezõ',
-            DB_ERROR_NOSUCHTABLE        => 'nincs ilyen tábla',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend nem támogatja',
-            DB_ERROR_NOT_FOUND          => 'nem található',
-            DB_ERROR_NOT_LOCKED         => 'nincs lezárva',
-            DB_ERROR_SYNTAX             => 'szintaktikai hiba',
-            DB_ERROR_UNSUPPORTED        => 'nem támogatott',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'soron végzett érték számlálás',
-            DB_ERROR_INVALID_DSN        => 'hibás DSN',
-            DB_ERROR_CONNECT_FAILED     => 'sikertelen csatlakozás',
-            0                         => 'nincs hiba', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'túl kevés az adat',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'bõvítmény nem található',
-            DB_ERROR_NOSUCHDB           => 'nincs ilyen adatbázis',
-            DB_ERROR_ACCESS_VIOLATION   => 'nincs jogosultság'
-);
+<?php
+# Hungarian language, encoding by ISO 8859-2 charset (Iso Latin-2)
+# Halászvári Gábor <g.halaszvari#portmax.hu>
+$ADODB_LANG_ARRAY = array (
+                       'LANG'                      => 'hu',
+            DB_ERROR                    => 'ismeretlen hiba',
+            DB_ERROR_ALREADY_EXISTS     => 'már létezik',
+            DB_ERROR_CANNOT_CREATE      => 'nem sikerült létrehozni',
+            DB_ERROR_CANNOT_DELETE      => 'nem sikerült törölni',
+            DB_ERROR_CANNOT_DROP        => 'nem sikerült eldobni',
+            DB_ERROR_CONSTRAINT         => 'szabályok megszegése',
+            DB_ERROR_DIVZERO            => 'osztás nullával',
+            DB_ERROR_INVALID            => 'érvénytelen',
+            DB_ERROR_INVALID_DATE       => 'érvénytelen dátum vagy idõ',
+            DB_ERROR_INVALID_NUMBER     => 'érvénytelen szám',
+            DB_ERROR_MISMATCH           => 'nem megfelelõ',
+            DB_ERROR_NODBSELECTED       => 'nincs kiválasztott adatbázis',
+            DB_ERROR_NOSUCHFIELD        => 'nincs ilyen mezõ',
+            DB_ERROR_NOSUCHTABLE        => 'nincs ilyen tábla',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend nem támogatja',
+            DB_ERROR_NOT_FOUND          => 'nem található',
+            DB_ERROR_NOT_LOCKED         => 'nincs lezárva',
+            DB_ERROR_SYNTAX             => 'szintaktikai hiba',
+            DB_ERROR_UNSUPPORTED        => 'nem támogatott',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'soron végzett érték számlálás',
+            DB_ERROR_INVALID_DSN        => 'hibás DSN',
+            DB_ERROR_CONNECT_FAILED     => 'sikertelen csatlakozás',
+            0                         => 'nincs hiba', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'túl kevés az adat',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'bõvítmény nem található',
+            DB_ERROR_NOSUCHDB           => 'nincs ilyen adatbázis',
+            DB_ERROR_ACCESS_VIOLATION   => 'nincs jogosultság'
+);
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/lang/adodb-nl.inc.php
diff -u phpgwapi/inc/adodb/lang/adodb-nl.inc.php:1.2 
phpgwapi/inc/adodb/lang/adodb-nl.inc.php:1.3
--- phpgwapi/inc/adodb/lang/adodb-nl.inc.php:1.2        Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/lang/adodb-nl.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,33 +1,33 @@
-<?php
-// Translated by Pim Koeman (pim#wittenborg-university.com)
-$ADODB_LANG_ARRAY = array (
-                       'LANG'                      => 'nl',
-            DB_ERROR                    => 'onbekende fout',
-            DB_ERROR_ALREADY_EXISTS     => 'bestaat al',
-            DB_ERROR_CANNOT_CREATE      => 'kan niet aanmaken',
-            DB_ERROR_CANNOT_DELETE      => 'kan niet wissen',
-            DB_ERROR_CANNOT_DROP        => 'kan niet verwijderen',
-            DB_ERROR_CONSTRAINT         => 'constraint overtreding',
-            DB_ERROR_DIVZERO            => 'poging tot delen door nul',
-            DB_ERROR_INVALID            => 'ongeldig',
-            DB_ERROR_INVALID_DATE       => 'ongeldige datum of tijd',
-            DB_ERROR_INVALID_NUMBER     => 'ongeldig nummer',
-            DB_ERROR_MISMATCH           => 'is incorrect',
-            DB_ERROR_NODBSELECTED       => 'geen database geselecteerd',
-            DB_ERROR_NOSUCHFIELD        => 'onbekend veld',
-            DB_ERROR_NOSUCHTABLE        => 'onbekende tabel',
-            DB_ERROR_NOT_CAPABLE        => 'database systeem is niet tot 
uitvoer in staat',
-            DB_ERROR_NOT_FOUND          => 'niet gevonden',
-            DB_ERROR_NOT_LOCKED         => 'niet vergrendeld',
-            DB_ERROR_SYNTAX             => 'syntaxis fout',
-            DB_ERROR_UNSUPPORTED        => 'niet ondersteund',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'waarde telling op rij',
-            DB_ERROR_INVALID_DSN        => 'ongeldige DSN',
-            DB_ERROR_CONNECT_FAILED     => 'connectie mislukt',
-            0                         => 'geen fout', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'onvoldoende data gegeven',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensie niet gevonden',
-            DB_ERROR_NOSUCHDB           => 'onbekende database',
-            DB_ERROR_ACCESS_VIOLATION   => 'onvoldoende rechten'
-);
+<?php
+// Translated by Pim Koeman (pim#wittenborg-university.com)
+$ADODB_LANG_ARRAY = array (
+                       'LANG'                      => 'nl',
+            DB_ERROR                    => 'onbekende fout',
+            DB_ERROR_ALREADY_EXISTS     => 'bestaat al',
+            DB_ERROR_CANNOT_CREATE      => 'kan niet aanmaken',
+            DB_ERROR_CANNOT_DELETE      => 'kan niet wissen',
+            DB_ERROR_CANNOT_DROP        => 'kan niet verwijderen',
+            DB_ERROR_CONSTRAINT         => 'constraint overtreding',
+            DB_ERROR_DIVZERO            => 'poging tot delen door nul',
+            DB_ERROR_INVALID            => 'ongeldig',
+            DB_ERROR_INVALID_DATE       => 'ongeldige datum of tijd',
+            DB_ERROR_INVALID_NUMBER     => 'ongeldig nummer',
+            DB_ERROR_MISMATCH           => 'is incorrect',
+            DB_ERROR_NODBSELECTED       => 'geen database geselecteerd',
+            DB_ERROR_NOSUCHFIELD        => 'onbekend veld',
+            DB_ERROR_NOSUCHTABLE        => 'onbekende tabel',
+            DB_ERROR_NOT_CAPABLE        => 'database systeem is niet tot 
uitvoer in staat',
+            DB_ERROR_NOT_FOUND          => 'niet gevonden',
+            DB_ERROR_NOT_LOCKED         => 'niet vergrendeld',
+            DB_ERROR_SYNTAX             => 'syntaxis fout',
+            DB_ERROR_UNSUPPORTED        => 'niet ondersteund',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'waarde telling op rij',
+            DB_ERROR_INVALID_DSN        => 'ongeldige DSN',
+            DB_ERROR_CONNECT_FAILED     => 'connectie mislukt',
+            0                         => 'geen fout', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'onvoldoende data gegeven',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensie niet gevonden',
+            DB_ERROR_NOSUCHDB           => 'onbekende database',
+            DB_ERROR_ACCESS_VIOLATION   => 'onvoldoende rechten'
+);
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/lang/adodb-pl.inc.php
diff -u phpgwapi/inc/adodb/lang/adodb-pl.inc.php:1.2 
phpgwapi/inc/adodb/lang/adodb-pl.inc.php:1.3
--- phpgwapi/inc/adodb/lang/adodb-pl.inc.php:1.2        Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/lang/adodb-pl.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,36 +1,36 @@
-<?php
-
-// Contributed by Grzegorz Pacan <gp#dione.cc>
-
-$ADODB_LANG_ARRAY = array (
-                       'LANG'                      => 'pl',
-            DB_ERROR                    => 'niezidentyfikowany b³±d',
-            DB_ERROR_ALREADY_EXISTS     => 'ju¿ istniej±',
-            DB_ERROR_CANNOT_CREATE      => 'nie mo¿na stworzyæ',
-            DB_ERROR_CANNOT_DELETE      => 'nie mo¿na usun±æ',
-            DB_ERROR_CANNOT_DROP        => 'nie mo¿na porzuciæ',
-            DB_ERROR_CONSTRAINT         => 'pogwa³cenie uprawnieñ',
-            DB_ERROR_DIVZERO            => 'dzielenie przez zero',
-            DB_ERROR_INVALID            => 'b³êdny',
-            DB_ERROR_INVALID_DATE       => 'b³êdna godzina lub data',
-            DB_ERROR_INVALID_NUMBER     => 'b³êdny numer',
-            DB_ERROR_MISMATCH           => 'niedopasowanie',
-            DB_ERROR_NODBSELECTED       => 'baza danych nie zosta³a wybrana',
-            DB_ERROR_NOSUCHFIELD        => 'nie znaleziono pola',
-            DB_ERROR_NOSUCHTABLE        => 'nie znaleziono tabeli',
-            DB_ERROR_NOT_CAPABLE        => 'nie zdolny',
-            DB_ERROR_NOT_FOUND          => 'nie znaleziono',
-            DB_ERROR_NOT_LOCKED         => 'nie zakmniêty',
-            DB_ERROR_SYNTAX             => 'b³±d sk³adni',
-            DB_ERROR_UNSUPPORTED        => 'nie obs³uguje',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'warto¶æ liczona w szeregu',
-            DB_ERROR_INVALID_DSN        => 'b³êdny DSN',
-            DB_ERROR_CONNECT_FAILED     => 'po³±czenie nie zosta³o 
zrealizowane',
-            0                         => 'brak b³êdów', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'niedostateczna ilo¶æ informacji',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'nie znaleziono rozszerzenia',
-            DB_ERROR_NOSUCHDB           => 'nie znaleziono bazy',
-            DB_ERROR_ACCESS_VIOLATION   => 'niedostateczne uprawnienia'
-);
-?>
+<?php
+
+// Contributed by Grzegorz Pacan <gp#dione.cc>
+
+$ADODB_LANG_ARRAY = array (
+                       'LANG'                      => 'pl',
+            DB_ERROR                    => 'niezidentyfikowany b³±d',
+            DB_ERROR_ALREADY_EXISTS     => 'ju¿ istniej±',
+            DB_ERROR_CANNOT_CREATE      => 'nie mo¿na stworzyæ',
+            DB_ERROR_CANNOT_DELETE      => 'nie mo¿na usun±æ',
+            DB_ERROR_CANNOT_DROP        => 'nie mo¿na porzuciæ',
+            DB_ERROR_CONSTRAINT         => 'pogwa³cenie uprawnieñ',
+            DB_ERROR_DIVZERO            => 'dzielenie przez zero',
+            DB_ERROR_INVALID            => 'b³êdny',
+            DB_ERROR_INVALID_DATE       => 'b³êdna godzina lub data',
+            DB_ERROR_INVALID_NUMBER     => 'b³êdny numer',
+            DB_ERROR_MISMATCH           => 'niedopasowanie',
+            DB_ERROR_NODBSELECTED       => 'baza danych nie zosta³a wybrana',
+            DB_ERROR_NOSUCHFIELD        => 'nie znaleziono pola',
+            DB_ERROR_NOSUCHTABLE        => 'nie znaleziono tabeli',
+            DB_ERROR_NOT_CAPABLE        => 'nie zdolny',
+            DB_ERROR_NOT_FOUND          => 'nie znaleziono',
+            DB_ERROR_NOT_LOCKED         => 'nie zakmniêty',
+            DB_ERROR_SYNTAX             => 'b³±d sk³adni',
+            DB_ERROR_UNSUPPORTED        => 'nie obs³uguje',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'warto¶æ liczona w szeregu',
+            DB_ERROR_INVALID_DSN        => 'b³êdny DSN',
+            DB_ERROR_CONNECT_FAILED     => 'po³±czenie nie zosta³o 
zrealizowane',
+            0                         => 'brak b³êdów', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'niedostateczna ilo¶æ informacji',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'nie znaleziono rozszerzenia',
+            DB_ERROR_NOSUCHDB           => 'nie znaleziono bazy',
+            DB_ERROR_ACCESS_VIOLATION   => 'niedostateczne uprawnienia'
+);
+?>
                
\ No newline at end of file
Index: phpgwapi/inc/adodb/lang/adodb-ro.inc.php
diff -u phpgwapi/inc/adodb/lang/adodb-ro.inc.php:1.2 
phpgwapi/inc/adodb/lang/adodb-ro.inc.php:1.3
--- phpgwapi/inc/adodb/lang/adodb-ro.inc.php:1.2        Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/lang/adodb-ro.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,36 +1,36 @@
-<?php
-
-/* Romanian - by "bogdan stefan" <sbogdan#rsb.ro> */
-
-$ADODB_LANG_ARRAY = array (
-                       'LANG'                      => 'ro',
-            DB_ERROR                    => 'eroare necunoscuta',
-            DB_ERROR_ALREADY_EXISTS     => 'deja exista',
-            DB_ERROR_CANNOT_CREATE      => 'nu se poate creea',
-            DB_ERROR_CANNOT_DELETE      => 'nu se poate sterge',
-            DB_ERROR_CANNOT_DROP        => 'nu se poate executa drop',
-            DB_ERROR_CONSTRAINT         => 'violare de constrain',
-            DB_ERROR_DIVZERO            => 'se divide la zero',
-            DB_ERROR_INVALID            => 'invalid',
-            DB_ERROR_INVALID_DATE       => 'data sau timp invalide',
-            DB_ERROR_INVALID_NUMBER     => 'numar invalid',
-            DB_ERROR_MISMATCH           => 'nepotrivire-mismatch',
-            DB_ERROR_NODBSELECTED       => 'nu exista baza de date selectata',
-            DB_ERROR_NOSUCHFIELD        => 'camp inexistent',
-            DB_ERROR_NOSUCHTABLE        => 'tabela inexistenta',
-            DB_ERROR_NOT_CAPABLE        => 'functie optionala neinstalata',
-            DB_ERROR_NOT_FOUND          => 'negasit',
-            DB_ERROR_NOT_LOCKED         => 'neblocat',
-            DB_ERROR_SYNTAX             => 'eroare de sintaxa',
-            DB_ERROR_UNSUPPORTED        => 'nu e suportat',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'valoare prea mare pentru coloana',
-            DB_ERROR_INVALID_DSN        => 'DSN invalid',
-            DB_ERROR_CONNECT_FAILED     => 'conectare esuata',
-            0                         => 'fara eroare', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'data introduse insuficiente',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensie negasita',
-            DB_ERROR_NOSUCHDB           => 'nu exista baza de date',
-            DB_ERROR_ACCESS_VIOLATION   => 'permisiuni insuficiente'
-);
-?>
-
+<?php
+
+/* Romanian - by "bogdan stefan" <sbogdan#rsb.ro> */
+
+$ADODB_LANG_ARRAY = array (
+                       'LANG'                      => 'ro',
+            DB_ERROR                    => 'eroare necunoscuta',
+            DB_ERROR_ALREADY_EXISTS     => 'deja exista',
+            DB_ERROR_CANNOT_CREATE      => 'nu se poate creea',
+            DB_ERROR_CANNOT_DELETE      => 'nu se poate sterge',
+            DB_ERROR_CANNOT_DROP        => 'nu se poate executa drop',
+            DB_ERROR_CONSTRAINT         => 'violare de constrain',
+            DB_ERROR_DIVZERO            => 'se divide la zero',
+            DB_ERROR_INVALID            => 'invalid',
+            DB_ERROR_INVALID_DATE       => 'data sau timp invalide',
+            DB_ERROR_INVALID_NUMBER     => 'numar invalid',
+            DB_ERROR_MISMATCH           => 'nepotrivire-mismatch',
+            DB_ERROR_NODBSELECTED       => 'nu exista baza de date selectata',
+            DB_ERROR_NOSUCHFIELD        => 'camp inexistent',
+            DB_ERROR_NOSUCHTABLE        => 'tabela inexistenta',
+            DB_ERROR_NOT_CAPABLE        => 'functie optionala neinstalata',
+            DB_ERROR_NOT_FOUND          => 'negasit',
+            DB_ERROR_NOT_LOCKED         => 'neblocat',
+            DB_ERROR_SYNTAX             => 'eroare de sintaxa',
+            DB_ERROR_UNSUPPORTED        => 'nu e suportat',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'valoare prea mare pentru coloana',
+            DB_ERROR_INVALID_DSN        => 'DSN invalid',
+            DB_ERROR_CONNECT_FAILED     => 'conectare esuata',
+            0                         => 'fara eroare', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'data introduse insuficiente',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensie negasita',
+            DB_ERROR_NOSUCHDB           => 'nu exista baza de date',
+            DB_ERROR_ACCESS_VIOLATION   => 'permisiuni insuficiente'
+);
+?>
+
Index: phpgwapi/inc/adodb/perf/perf-db2.inc.php
diff -u phpgwapi/inc/adodb/perf/perf-db2.inc.php:1.2 
phpgwapi/inc/adodb/perf/perf-db2.inc.php:1.3
--- phpgwapi/inc/adodb/perf/perf-db2.inc.php:1.2        Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/perf/perf-db2.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,102 +1,102 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-// Simple guide to configuring db2: so-so 
http://www.devx.com/gethelpon/10MinuteSolution/16575
-
-// SELECT * FROM TABLE(SNAPSHOT_APPL('SAMPLE', -1)) as t
-class perf_db2 extends adodb_perf{
-       var $createTableSQL = "CREATE TABLE adodb_logsql (
-                 created TIMESTAMP NOT NULL,
-                 sql0 varchar(250) NOT NULL,
-                 sql1 varchar(4000) NOT NULL,
-                 params varchar(3000) NOT NULL,
-                 tracer varchar(500) NOT NULL,
-                 timer decimal(16,6) NOT NULL
-               )";
-               
-       var $settings = array(
-       'Ratios',
-               'data cache hit ratio' => array('RATIO',
-                       "SELECT 
-                               case when 
sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)=0 then 0 
-                               else 
100*(1-sum(POOL_DATA_P_READS+POOL_INDEX_P_READS)/sum(POOL_DATA_L_READS+POOL_INDEX_L_READS))
 end 
-                               FROM TABLE(SNAPSHOT_APPL('',-2)) as t",
-                       '=WarnCacheRatio'),
-                       
-       'Data Cache',
-               'data cache buffers' => array('DATAC',
-               'select sum(npages) from SYSCAT.BUFFERPOOLS',
-                       'See <a 
href=http://www7b.boulder.ibm.com/dmdd/library/techarticle/anshum/0107anshum.html#bufferpoolsize>tuning
 reference</a>.' ),
-               'cache blocksize' => array('DATAC',
-               'select avg(pagesize) from SYSCAT.BUFFERPOOLS',
-                       '' ),
-               'data cache size' => array('DATAC',
-               'select sum(npages*pagesize) from SYSCAT.BUFFERPOOLS',
-                       '' ),
-       'Connections',
-               'current connections' => array('SESS',
-                       "SELECT count(*) FROM TABLE(SNAPSHOT_APPL_INFO('',-2)) 
as t",
-                       ''),
-
-               false
-       );
-
-
-       function perf_db2(&$conn)
-       {
-               $this->conn =& $conn;
-       }
-       
-       function Explain($sql,$partial=false)
-       {
-               $save = $this->conn->LogSQL(false);
-               if ($partial) {
-                       $sqlq = $this->conn->qstr($sql.'%');
-                       $arr = $this->conn->GetArray("select distinct sql1 from 
adodb_logsql where sql1 like $sqlq");
-                       if ($arr) {
-                               foreach($arr as $row) {
-                                       $sql = reset($row);
-                                       if (crc32($sql) == $partial) break;
-                               }
-                       }
-               }
-               $qno = rand();
-               $ok = $this->conn->Execute("EXPLAIN PLAN SET QUERYNO=$qno FOR 
$sql");
-               ob_start();
-               if (!$ok) echo "<p>Have EXPLAIN tables been created?</p>";
-               else {
-                       $rs = $this->conn->Execute("select * from 
explain_statement where queryno=$qno");
-                       if ($rs) rs2html($rs);
-               }
-               $s = ob_get_contents();
-               ob_end_clean();
-               $this->conn->LogSQL($save);
-               
-               $s .= $this->Tracer($sql);
-               return $s;
-       }
-       
-       
-       function Tables()
-       {
-               $rs = $this->conn->Execute("select tabschema,tabname,card as 
rows,
-                       npages pages_used,fpages pages_allocated, tbspace 
tablespace  
-                       from syscat.tables where tabschema not in 
('SYSCAT','SYSIBM','SYSSTAT') order by 1,2");
-               return rs2html($rs,false,false,false,false);
-       }
-}
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Library for basic performance monitoring and tuning 
+  
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+// Simple guide to configuring db2: so-so 
http://www.devx.com/gethelpon/10MinuteSolution/16575
+
+// SELECT * FROM TABLE(SNAPSHOT_APPL('SAMPLE', -1)) as t
+class perf_db2 extends adodb_perf{
+       var $createTableSQL = "CREATE TABLE adodb_logsql (
+                 created TIMESTAMP NOT NULL,
+                 sql0 varchar(250) NOT NULL,
+                 sql1 varchar(4000) NOT NULL,
+                 params varchar(3000) NOT NULL,
+                 tracer varchar(500) NOT NULL,
+                 timer decimal(16,6) NOT NULL
+               )";
+               
+       var $settings = array(
+       'Ratios',
+               'data cache hit ratio' => array('RATIO',
+                       "SELECT 
+                               case when 
sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)=0 then 0 
+                               else 
100*(1-sum(POOL_DATA_P_READS+POOL_INDEX_P_READS)/sum(POOL_DATA_L_READS+POOL_INDEX_L_READS))
 end 
+                               FROM TABLE(SNAPSHOT_APPL('',-2)) as t",
+                       '=WarnCacheRatio'),
+                       
+       'Data Cache',
+               'data cache buffers' => array('DATAC',
+               'select sum(npages) from SYSCAT.BUFFERPOOLS',
+                       'See <a 
href=http://www7b.boulder.ibm.com/dmdd/library/techarticle/anshum/0107anshum.html#bufferpoolsize>tuning
 reference</a>.' ),
+               'cache blocksize' => array('DATAC',
+               'select avg(pagesize) from SYSCAT.BUFFERPOOLS',
+                       '' ),
+               'data cache size' => array('DATAC',
+               'select sum(npages*pagesize) from SYSCAT.BUFFERPOOLS',
+                       '' ),
+       'Connections',
+               'current connections' => array('SESS',
+                       "SELECT count(*) FROM TABLE(SNAPSHOT_APPL_INFO('',-2)) 
as t",
+                       ''),
+
+               false
+       );
+
+
+       function perf_db2(&$conn)
+       {
+               $this->conn =& $conn;
+       }
+       
+       function Explain($sql,$partial=false)
+       {
+               $save = $this->conn->LogSQL(false);
+               if ($partial) {
+                       $sqlq = $this->conn->qstr($sql.'%');
+                       $arr = $this->conn->GetArray("select distinct sql1 from 
adodb_logsql where sql1 like $sqlq");
+                       if ($arr) {
+                               foreach($arr as $row) {
+                                       $sql = reset($row);
+                                       if (crc32($sql) == $partial) break;
+                               }
+                       }
+               }
+               $qno = rand();
+               $ok = $this->conn->Execute("EXPLAIN PLAN SET QUERYNO=$qno FOR 
$sql");
+               ob_start();
+               if (!$ok) echo "<p>Have EXPLAIN tables been created?</p>";
+               else {
+                       $rs = $this->conn->Execute("select * from 
explain_statement where queryno=$qno");
+                       if ($rs) rs2html($rs);
+               }
+               $s = ob_get_contents();
+               ob_end_clean();
+               $this->conn->LogSQL($save);
+               
+               $s .= $this->Tracer($sql);
+               return $s;
+       }
+       
+       
+       function Tables()
+       {
+               $rs = $this->conn->Execute("select tabschema,tabname,card as 
rows,
+                       npages pages_used,fpages pages_allocated, tbspace 
tablespace  
+                       from syscat.tables where tabschema not in 
('SYSCAT','SYSIBM','SYSSTAT') order by 1,2");
+               return rs2html($rs,false,false,false,false);
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/perf/perf-informix.inc.php
diff -u phpgwapi/inc/adodb/perf/perf-informix.inc.php:1.2 
phpgwapi/inc/adodb/perf/perf-informix.inc.php:1.3
--- phpgwapi/inc/adodb/perf/perf-informix.inc.php:1.2   Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/perf/perf-informix.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,70 +1,70 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-//
-// Thx to  Fernando Ortiz, mailto:fortiz#lacorona.com.mx
-// With info taken from http://www.oninit.com/oninit/sysmaster/index.html
-//
-class perf_informix extends adodb_perf{
-
-       // Maximum size on varchar upto 9.30 255 chars
-       // better truncate varchar to 255 than char(4000) ?
-       var $createTableSQL = "CREATE TABLE adodb_logsql (
-               created datetime year to second NOT NULL,
-               sql0 varchar(250) NOT NULL,
-               sql1 varchar(255) NOT NULL,
-               params varchar(255) NOT NULL,
-               tracer varchar(255) NOT NULL,
-               timer decimal(16,6) NOT NULL
-       )";
-       
-       var $tablesSQL = "select a.tabname tablename, ti_nptotal*2 size_in_k, 
ti_nextns extents, ti_nrows records from systables c, sysmaster:systabnames a, 
sysmaster:systabinfo b where c.tabname not matches 'sys*' and c.partnum = 
a.partnum and c.partnum = b.ti_partnum";
-       
-       var $settings = array(
-       'Ratios',
-               'data cache hit ratio' => array('RATIOH',
-               "select round((1-(wt.value / (rd.value + wr.value)))*100,2)
-               from sysmaster:sysprofile wr, sysmaster:sysprofile rd, 
sysmaster:sysprofile wt
-               where rd.name = 'pagreads' and
-               wr.name = 'pagwrites' and
-               wt.name = 'buffwts'",
-               '=WarnCacheRatio'),
-       'IO',
-               'data reads' => array('IO',
-               "select value from sysmaster:sysprofile where name='pagreads'",
-               'Page reads'),
-               
-               'data writes' => array('IO',
-               "select value from sysmaster:sysprofile where name='pagwrites'",
-               'Page writes'),
-       
-       'Connections',
-               'current connections' => array('SESS',
-               'select count(*) from sysmaster:syssessions',
-               'Number of sessions'),
-       
-       false
-       
-       );
-       
-       function perf_informix(&$conn)
-       {
-               $this->conn =& $conn;
-       }
-
-}
-?>
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Library for basic performance monitoring and tuning 
+  
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+//
+// Thx to  Fernando Ortiz, mailto:fortiz#lacorona.com.mx
+// With info taken from http://www.oninit.com/oninit/sysmaster/index.html
+//
+class perf_informix extends adodb_perf{
+
+       // Maximum size on varchar upto 9.30 255 chars
+       // better truncate varchar to 255 than char(4000) ?
+       var $createTableSQL = "CREATE TABLE adodb_logsql (
+               created datetime year to second NOT NULL,
+               sql0 varchar(250) NOT NULL,
+               sql1 varchar(255) NOT NULL,
+               params varchar(255) NOT NULL,
+               tracer varchar(255) NOT NULL,
+               timer decimal(16,6) NOT NULL
+       )";
+       
+       var $tablesSQL = "select a.tabname tablename, ti_nptotal*2 size_in_k, 
ti_nextns extents, ti_nrows records from systables c, sysmaster:systabnames a, 
sysmaster:systabinfo b where c.tabname not matches 'sys*' and c.partnum = 
a.partnum and c.partnum = b.ti_partnum";
+       
+       var $settings = array(
+       'Ratios',
+               'data cache hit ratio' => array('RATIOH',
+               "select round((1-(wt.value / (rd.value + wr.value)))*100,2)
+               from sysmaster:sysprofile wr, sysmaster:sysprofile rd, 
sysmaster:sysprofile wt
+               where rd.name = 'pagreads' and
+               wr.name = 'pagwrites' and
+               wt.name = 'buffwts'",
+               '=WarnCacheRatio'),
+       'IO',
+               'data reads' => array('IO',
+               "select value from sysmaster:sysprofile where name='pagreads'",
+               'Page reads'),
+               
+               'data writes' => array('IO',
+               "select value from sysmaster:sysprofile where name='pagwrites'",
+               'Page writes'),
+       
+       'Connections',
+               'current connections' => array('SESS',
+               'select count(*) from sysmaster:syssessions',
+               'Number of sessions'),
+       
+       false
+       
+       );
+       
+       function perf_informix(&$conn)
+       {
+               $this->conn =& $conn;
+       }
+
+}
+?>
Index: phpgwapi/inc/adodb/perf/perf-mssql.inc.php
diff -u phpgwapi/inc/adodb/perf/perf-mssql.inc.php:1.2 
phpgwapi/inc/adodb/perf/perf-mssql.inc.php:1.3
--- phpgwapi/inc/adodb/perf/perf-mssql.inc.php:1.2      Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/perf/perf-mssql.inc.php  Tue Feb 21 13:47:42 2006
@@ -1,164 +1,164 @@
-<?php
-
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-       MSSQL has moved most performance info to Performance Monitor
-*/
-class perf_mssql extends adodb_perf{
-       var $sql1 = 'cast(sql1 as text)';
-       var $createTableSQL = "CREATE TABLE adodb_logsql (
-                 created datetime NOT NULL,
-                 sql0 varchar(250) NOT NULL,
-                 sql1 varchar(4000) NOT NULL,
-                 params varchar(3000) NOT NULL,
-                 tracer varchar(500) NOT NULL,
-                 timer decimal(16,6) NOT NULL
-               )";
-               
-       var $settings = array(
-       'Ratios',
-               'data cache hit ratio' => array('RATIO',
-                       "select round((a.cntr_value*100.0)/b.cntr_value,2) from 
master.dbo.sysperfinfo a, master.dbo.sysperfinfo b where a.counter_name = 
'Buffer cache hit ratio' and b.counter_name='Buffer cache hit ratio base'",
-                       '=WarnCacheRatio'),
-               'prepared sql hit ratio' => array('RATIO',
-                       array('dbcc cachestats','Prepared',1,100),
-                       ''),
-               'adhoc sql hit ratio' => array('RATIO',
-                       array('dbcc cachestats','Adhoc',1,100),
-                       ''),
-       'IO',
-               'data reads' => array('IO',
-               "select cntr_value from master.dbo.sysperfinfo where 
counter_name = 'Page reads/sec'"),
-               'data writes' => array('IO',
-               "select cntr_value from master.dbo.sysperfinfo where 
counter_name = 'Page writes/sec'"),
-                       
-       'Data Cache',
-               'data cache size' => array('DATAC',
-               "select cntr_value*8192 from master.dbo.sysperfinfo where 
counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
-                       '' ),
-               'data cache blocksize' => array('DATAC',
-                       "select 8192",'page size'),
-       'Connections',
-               'current connections' => array('SESS',
-                       '=sp_who',
-                       ''),
-               'max connections' => array('SESS',
-                       "SELECT @@MAX_CONNECTIONS",
-                       ''),
-
-               false
-       );
-       
-       
-       function perf_mssql(&$conn)
-       {
-               if ($conn->dataProvider == 'odbc') {
-                       $this->sql1 = 'sql1';
-                       //$this->explain = false;
-               }
-               $this->conn =& $conn;
-       }
-       
-       function Explain($sql,$partial=false)
-       {
-               
-               $save = $this->conn->LogSQL(false);
-               if ($partial) {
-                       $sqlq = $this->conn->qstr($sql.'%');
-                       $arr = $this->conn->GetArray("select distinct sql1 from 
adodb_logsql where sql1 like $sqlq");
-                       if ($arr) {
-                               foreach($arr as $row) {
-                                       $sql = reset($row);
-                                       if (crc32($sql) == $partial) break;
-                               }
-                       }
-               }
-               
-               $s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
-               $this->conn->Execute("SET SHOWPLAN_ALL ON;");
-               $sql = str_replace('?',"''",$sql);
-               global $ADODB_FETCH_MODE;
-               
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $rs =& $this->conn->Execute($sql);
-               //adodb_printr($rs);
-               $ADODB_FETCH_MODE = $save;
-               if ($rs) {
-                       $rs->MoveNext();
-                       $s .= '<table bgcolor=white border=0 cellpadding="1" 
callspacing=0><tr><td nowrap align=center> Rows<td nowrap align=center> IO<td 
nowrap align=center> CPU<td align=left> &nbsp; &nbsp; Plan</tr>';
-                       while (!$rs->EOF) {
-                               $s .= 
'<tr><td>'.round($rs->fields[8],1).'<td>'.round($rs->fields[9],3).'<td 
align=right>'.round($rs->fields[10],3).'<td 
nowrap><pre>'.htmlspecialchars($rs->fields[0])."</td></pre></tr>\n"; ## NOTE 
CORRUPT </td></pre> tag is intentional!!!!
-                               $rs->MoveNext();
-                       }
-                       $s .= '</table>';
-                       
-                       $rs->NextRecordSet();
-               }
-               
-               $this->conn->Execute("SET SHOWPLAN_ALL OFF;");
-               $this->conn->LogSQL($save);
-               $s .= $this->Tracer($sql);
-               return $s;
-       }
-       
-       function Tables()
-       {
-       global $ADODB_FETCH_MODE;
-       
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               //$this->conn->debug=1;
-               $s = '<table border=1 
bgcolor=white><tr><td><b>tablename</b></td><td><b>size_in_k</b></td><td><b>index
 size</b></td><td><b>reserved size</b></td></tr>';
-               $rs1 = $this->conn->Execute("select distinct name from 
sysobjects where xtype='U'");
-               if ($rs1) {
-                       while (!$rs1->EOF) {
-                               $tab = $rs1->fields[0];
-                               $tabq = $this->conn->qstr($tab);
-                               $rs2 = $this->conn->Execute("sp_spaceused 
$tabq");
-                               if ($rs2) {
-                                       $s .= '<tr><td>'.$tab.'</td><td 
align=right>'.$rs2->fields[3].'</td><td align=right>'.$rs2->fields[4].'</td><td 
align=right>'.$rs2->fields[2].'</td></tr>';
-                                       $rs2->Close();
-                               }
-                               $rs1->MoveNext();
-                       }
-                       $rs1->Close();
-               }
-               $ADODB_FETCH_MODE = $save;
-               return $s.'</table>';
-       }
-       
-       function sp_who()
-       {
-               $arr = $this->conn->GetArray('sp_who');
-               return sizeof($arr);
-       }
-       
-       function HealthCheck($cli=false)
-       {
-               
-               $this->conn->Execute('dbcc traceon(3604)');
-               $html =  adodb_perf::HealthCheck($cli);
-               $this->conn->Execute('dbcc traceoff(3604)');
-               return $html;
-       }
-       
-       
-}
-
+<?php
+
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Library for basic performance monitoring and tuning 
+  
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+/*
+       MSSQL has moved most performance info to Performance Monitor
+*/
+class perf_mssql extends adodb_perf{
+       var $sql1 = 'cast(sql1 as text)';
+       var $createTableSQL = "CREATE TABLE adodb_logsql (
+                 created datetime NOT NULL,
+                 sql0 varchar(250) NOT NULL,
+                 sql1 varchar(4000) NOT NULL,
+                 params varchar(3000) NOT NULL,
+                 tracer varchar(500) NOT NULL,
+                 timer decimal(16,6) NOT NULL
+               )";
+               
+       var $settings = array(
+       'Ratios',
+               'data cache hit ratio' => array('RATIO',
+                       "select round((a.cntr_value*100.0)/b.cntr_value,2) from 
master.dbo.sysperfinfo a, master.dbo.sysperfinfo b where a.counter_name = 
'Buffer cache hit ratio' and b.counter_name='Buffer cache hit ratio base'",
+                       '=WarnCacheRatio'),
+               'prepared sql hit ratio' => array('RATIO',
+                       array('dbcc cachestats','Prepared',1,100),
+                       ''),
+               'adhoc sql hit ratio' => array('RATIO',
+                       array('dbcc cachestats','Adhoc',1,100),
+                       ''),
+       'IO',
+               'data reads' => array('IO',
+               "select cntr_value from master.dbo.sysperfinfo where 
counter_name = 'Page reads/sec'"),
+               'data writes' => array('IO',
+               "select cntr_value from master.dbo.sysperfinfo where 
counter_name = 'Page writes/sec'"),
+                       
+       'Data Cache',
+               'data cache size' => array('DATAC',
+               "select cntr_value*8192 from master.dbo.sysperfinfo where 
counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
+                       '' ),
+               'data cache blocksize' => array('DATAC',
+                       "select 8192",'page size'),
+       'Connections',
+               'current connections' => array('SESS',
+                       '=sp_who',
+                       ''),
+               'max connections' => array('SESS',
+                       "SELECT @@MAX_CONNECTIONS",
+                       ''),
+
+               false
+       );
+       
+       
+       function perf_mssql(&$conn)
+       {
+               if ($conn->dataProvider == 'odbc') {
+                       $this->sql1 = 'sql1';
+                       //$this->explain = false;
+               }
+               $this->conn =& $conn;
+       }
+       
+       function Explain($sql,$partial=false)
+       {
+               
+               $save = $this->conn->LogSQL(false);
+               if ($partial) {
+                       $sqlq = $this->conn->qstr($sql.'%');
+                       $arr = $this->conn->GetArray("select distinct sql1 from 
adodb_logsql where sql1 like $sqlq");
+                       if ($arr) {
+                               foreach($arr as $row) {
+                                       $sql = reset($row);
+                                       if (crc32($sql) == $partial) break;
+                               }
+                       }
+               }
+               
+               $s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
+               $this->conn->Execute("SET SHOWPLAN_ALL ON;");
+               $sql = str_replace('?',"''",$sql);
+               global $ADODB_FETCH_MODE;
+               
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $rs =& $this->conn->Execute($sql);
+               //adodb_printr($rs);
+               $ADODB_FETCH_MODE = $save;
+               if ($rs) {
+                       $rs->MoveNext();
+                       $s .= '<table bgcolor=white border=0 cellpadding="1" 
callspacing=0><tr><td nowrap align=center> Rows<td nowrap align=center> IO<td 
nowrap align=center> CPU<td align=left> &nbsp; &nbsp; Plan</tr>';
+                       while (!$rs->EOF) {
+                               $s .= 
'<tr><td>'.round($rs->fields[8],1).'<td>'.round($rs->fields[9],3).'<td 
align=right>'.round($rs->fields[10],3).'<td 
nowrap><pre>'.htmlspecialchars($rs->fields[0])."</td></pre></tr>\n"; ## NOTE 
CORRUPT </td></pre> tag is intentional!!!!
+                               $rs->MoveNext();
+                       }
+                       $s .= '</table>';
+                       
+                       $rs->NextRecordSet();
+               }
+               
+               $this->conn->Execute("SET SHOWPLAN_ALL OFF;");
+               $this->conn->LogSQL($save);
+               $s .= $this->Tracer($sql);
+               return $s;
+       }
+       
+       function Tables()
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               //$this->conn->debug=1;
+               $s = '<table border=1 
bgcolor=white><tr><td><b>tablename</b></td><td><b>size_in_k</b></td><td><b>index
 size</b></td><td><b>reserved size</b></td></tr>';
+               $rs1 = $this->conn->Execute("select distinct name from 
sysobjects where xtype='U'");
+               if ($rs1) {
+                       while (!$rs1->EOF) {
+                               $tab = $rs1->fields[0];
+                               $tabq = $this->conn->qstr($tab);
+                               $rs2 = $this->conn->Execute("sp_spaceused 
$tabq");
+                               if ($rs2) {
+                                       $s .= '<tr><td>'.$tab.'</td><td 
align=right>'.$rs2->fields[3].'</td><td align=right>'.$rs2->fields[4].'</td><td 
align=right>'.$rs2->fields[2].'</td></tr>';
+                                       $rs2->Close();
+                               }
+                               $rs1->MoveNext();
+                       }
+                       $rs1->Close();
+               }
+               $ADODB_FETCH_MODE = $save;
+               return $s.'</table>';
+       }
+       
+       function sp_who()
+       {
+               $arr = $this->conn->GetArray('sp_who');
+               return sizeof($arr);
+       }
+       
+       function HealthCheck($cli=false)
+       {
+               
+               $this->conn->Execute('dbcc traceon(3604)');
+               $html =  adodb_perf::HealthCheck($cli);
+               $this->conn->Execute('dbcc traceoff(3604)');
+               return $html;
+       }
+       
+       
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/perf/perf-mysql.inc.php
diff -u phpgwapi/inc/adodb/perf/perf-mysql.inc.php:1.2 
phpgwapi/inc/adodb/perf/perf-mysql.inc.php:1.3
--- phpgwapi/inc/adodb/perf/perf-mysql.inc.php:1.2      Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/perf/perf-mysql.inc.php  Tue Feb 21 13:47:42 2006
@@ -1,259 +1,315 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class perf_mysql extends adodb_perf{
-       
-       var $tablesSQL = 'show table status';
-       
-       var $createTableSQL = "CREATE TABLE adodb_logsql (
-                 created datetime NOT NULL,
-                 sql0 varchar(250) NOT NULL,
-                 sql1 text NOT NULL,
-                 params text NOT NULL,
-                 tracer text NOT NULL,
-                 timer decimal(16,6) NOT NULL
-               )";
-               
-       var $settings = array(
-       'Ratios',
-               'MyISAM cache hit ratio' => array('RATIO',
-                       '=GetKeyHitRatio',
-                       '=WarnCacheRatio'),
-               'InnoDB cache hit ratio' => array('RATIO',
-                       '=GetInnoDBHitRatio',
-                       '=WarnCacheRatio'),
-               'data cache hit ratio' => array('HIDE', # only if called
-                       '=FindDBHitRatio',
-                       '=WarnCacheRatio'),
-               'sql cache hit ratio' => array('RATIO',
-                       '=GetQHitRatio',
-                       ''),
-       'IO',
-               'data reads' => array('IO',
-                       '=GetReads',
-                       'Number of selects (Key_reads is not accurate)'),
-               'data writes' => array('IO',
-                       '=GetWrites',
-                       'Number of inserts/updates/deletes * coef (Key_writes 
is not accurate)'),
-               
-       'Data Cache',
-               'MyISAM data cache size' => array('DATAC',
-                       array("show variables", 'key_buffer_size'),
-                       '' ),
-               'BDB data cache size' => array('DATAC',
-                       array("show variables", 'bdb_cache_size'),
-                       '' ),
-               'InnoDB data cache size' => array('DATAC',
-                       array("show variables", 'innodb_buffer_pool_size'),
-                       '' ),
-       'Memory Usage',
-               'read buffer size' => array('CACHE',
-                       array("show variables", 'read_buffer_size'),
-                       '(per session)'),
-               'sort buffer size' => array('CACHE',
-                       array("show variables", 'sort_buffer_size'),
-                       'Size of sort buffer (per session)' ),
-               'table cache' => array('CACHE',
-                       array("show variables", 'table_cache'),
-                       'Number of tables to keep open'),
-       'Connections',  
-               'current connections' => array('SESS',
-                       array('show status','Threads_connected'),
-                       ''),
-               'max connections' => array( 'SESS',
-                       array("show variables",'max_connections'),
-                       ''),
-       
-               false
-       );
-       
-       function perf_mysql(&$conn)
-       {
-               $this->conn =& $conn;
-       }
-       
-       function Explain($sql,$partial=false)
-       {
-               
-               if (strtoupper(substr(trim($sql),0,6)) !== 'SELECT') return 
'<p>Unable to EXPLAIN non-select statement</p>';
-               $save = $this->conn->LogSQL(false);
-               if ($partial) {
-                       $sqlq = $this->conn->qstr($sql.'%');
-                       $arr = $this->conn->GetArray("select distinct sql1 from 
adodb_logsql where sql1 like $sqlq");
-                       if ($arr) {
-                               foreach($arr as $row) {
-                                       $sql = reset($row);
-                                       if (crc32($sql) == $partial) break;
-                               }
-                       }
-               }
-               $sql = str_replace('?',"''",$sql);
-               
-               if ($partial) {
-                       $sqlq = $this->conn->qstr($sql.'%');
-                       $sql = $this->conn->GetOne("select sql1 from 
adodb_logsql where sql1 like $sqlq");
-               }
-               
-               $s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
-               $rs = $this->conn->Execute('EXPLAIN '.$sql);
-               $s .= rs2html($rs,false,false,false,false);
-               $this->conn->LogSQL($save);
-               $s .= $this->Tracer($sql);
-               return $s;
-       }
-       
-       function Tables()
-       {
-               if (!$this->tablesSQL) return false;
-               
-               $rs = $this->conn->Execute($this->tablesSQL);
-               if (!$rs) return false;
-               
-               $html = rs2html($rs,false,false,false,false);
-               return $html;
-       }
-       
-       function GetReads()
-       {
-       global $ADODB_FETCH_MODE;
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $rs = $this->conn->Execute('show status');
-               $ADODB_FETCH_MODE = $save;
-               
-               if (!$rs) return 0;
-               $val = 0;
-               while (!$rs->EOF) {
-                       switch($rs->fields[0]) {
-                       case 'Com_select': 
-                               $val = $rs->fields[1];
-                               $rs->Close();
-                               return $val;
-                       }
-                       $rs->MoveNext();
-               } 
-               
-               $rs->Close();
-               
-               return $val;
-       }
-       
-       function GetWrites()
-       {
-       global $ADODB_FETCH_MODE;
-               $save = $ADODB_FETCH_MODE;
-               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-               $rs = $this->conn->Execute('show status');
-               $ADODB_FETCH_MODE = $save;
-               
-               if (!$rs) return 0;
-               $val = 0.0;
-               while (!$rs->EOF) {
-                       switch($rs->fields[0]) {
-                       case 'Com_insert': 
-                               $val += $rs->fields[1]; break;
-                       case 'Com_delete': 
-                               $val += $rs->fields[1]; break;
-                       case 'Com_update': 
-                               $val += $rs->fields[1]/2;
-                               $rs->Close();
-                               return $val;
-                       }
-                       $rs->MoveNext();
-               } 
-               
-               $rs->Close();
-               
-               return $val;
-       }
-       
-       function FindDBHitRatio()
-       {
-               // first find out type of table
-               //$this->conn->debug=1;
-               $rs = $this->conn->Execute('show table status');
-               if (!$rs) return '';
-               $type = strtoupper($rs->fields[1]);
-               $rs->Close();
-               switch($type){
-               case 'MYISAM':
-               case 'ISAM':
-                       return $this->DBParameter('MyISAM cache hit ratio').' 
(MyISAM)';
-               case 'INNODB':
-                       return $this->DBParameter('InnoDB cache hit ratio').' 
(InnoDB)';
-               default:
-                       return $type.' not supported';
-               }
-               
-       }
-       
-       function GetQHitRatio()
-       {
-               //Total number of queries = Qcache_inserts + Qcache_hits + 
Qcache_not_cached
-               $hits = $this->_DBParameter(array("show status","Qcache_hits"));
-               $total = $this->_DBParameter(array("show 
status","Qcache_inserts"));
-               $total += $this->_DBParameter(array("show 
status","Qcache_not_cached"));
-               
-               $total += $hits;
-               if ($total) return ($hits*100)/$total;
-               return 0;
-       }
-       
-       /*
-               Use session variable to store Hit percentage, because MySQL
-               does not remember last value of SHOW INNODB STATUS hit ratio
-               
-               # 1st query to SHOW INNODB STATUS
-               0.00 reads/s, 0.00 creates/s, 0.00 writes/s
-               Buffer pool hit rate 1000 / 1000
-               
-               # 2nd query to SHOW INNODB STATUS
-               0.00 reads/s, 0.00 creates/s, 0.00 writes/s
-               No buffer pool activity since the last printout
-       */
-       function GetInnoDBHitRatio()
-       {
-       global $HTTP_SESSION_VARS;
-       
-               $rs = $this->conn->Execute('show innodb status');
-               if (!$rs || $rs->EOF) return 0;
-               $stat = $rs->fields[0];
-               $rs->Close();
-               $at = strpos($stat,'Buffer pool hit rate');
-               $stat = substr($stat,$at,200);
-               if (preg_match('!Buffer pool hit rate\s*([0-9]*) / 
([0-9]*)!',$stat,$arr)) {
-                       $val = 100*$arr[1]/$arr[2];
-                       $HTTP_SESSION_VARS['INNODB_HIT_PCT'] = $val;
-                       return $val;
-               } else {
-                       if (isset($HTTP_SESSION_VARS['INNODB_HIT_PCT'])) return 
$HTTP_SESSION_VARS['INNODB_HIT_PCT'];
-                       return 0;
-               }
-               return 0;
-       }
-       
-       function GetKeyHitRatio()
-       {
-               $hits = $this->_DBParameter(array("show 
status","Key_read_requests"));
-               $reqs = $this->_DBParameter(array("show status","Key_reads"));
-               if ($reqs == 0) return 0;
-               
-               return ($hits/($reqs+$hits))*100;
-       }
-       
-}
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Library for basic performance monitoring and tuning 
+  
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class perf_mysql extends adodb_perf{
+       
+       var $tablesSQL = 'show table status';
+       
+       var $createTableSQL = "CREATE TABLE adodb_logsql (
+                 created datetime NOT NULL,
+                 sql0 varchar(250) NOT NULL,
+                 sql1 text NOT NULL,
+                 params text NOT NULL,
+                 tracer text NOT NULL,
+                 timer decimal(16,6) NOT NULL
+               )";
+               
+       var $settings = array(
+       'Ratios',
+               'MyISAM cache hit ratio' => array('RATIO',
+                       '=GetKeyHitRatio',
+                       '=WarnCacheRatio'),
+               'InnoDB cache hit ratio' => array('RATIO',
+                       '=GetInnoDBHitRatio',
+                       '=WarnCacheRatio'),
+               'data cache hit ratio' => array('HIDE', # only if called
+                       '=FindDBHitRatio',
+                       '=WarnCacheRatio'),
+               'sql cache hit ratio' => array('RATIO',
+                       '=GetQHitRatio',
+                       ''),
+       'IO',
+               'data reads' => array('IO',
+                       '=GetReads',
+                       'Number of selects (Key_reads is not accurate)'),
+               'data writes' => array('IO',
+                       '=GetWrites',
+                       'Number of inserts/updates/deletes * coef (Key_writes 
is not accurate)'),
+               
+       'Data Cache',
+               'MyISAM data cache size' => array('DATAC',
+                       array("show variables", 'key_buffer_size'),
+                       '' ),
+               'BDB data cache size' => array('DATAC',
+                       array("show variables", 'bdb_cache_size'),
+                       '' ),
+               'InnoDB data cache size' => array('DATAC',
+                       array("show variables", 'innodb_buffer_pool_size'),
+                       '' ),
+       'Memory Usage',
+               'read buffer size' => array('CACHE',
+                       array("show variables", 'read_buffer_size'),
+                       '(per session)'),
+               'sort buffer size' => array('CACHE',
+                       array("show variables", 'sort_buffer_size'),
+                       'Size of sort buffer (per session)' ),
+               'table cache' => array('CACHE',
+                       array("show variables", 'table_cache'),
+                       'Number of tables to keep open'),
+       'Connections',  
+               'current connections' => array('SESS',
+                       array('show status','Threads_connected'),
+                       ''),
+               'max connections' => array( 'SESS',
+                       array("show variables",'max_connections'),
+                       ''),
+       
+               false
+       );
+       
+       function perf_mysql(&$conn)
+       {
+               $this->conn =& $conn;
+       }
+       
+       function Explain($sql,$partial=false)
+       {
+               
+               if (strtoupper(substr(trim($sql),0,6)) !== 'SELECT') return 
'<p>Unable to EXPLAIN non-select statement</p>';
+               $save = $this->conn->LogSQL(false);
+               if ($partial) {
+                       $sqlq = $this->conn->qstr($sql.'%');
+                       $arr = $this->conn->GetArray("select distinct sql1 from 
adodb_logsql where sql1 like $sqlq");
+                       if ($arr) {
+                               foreach($arr as $row) {
+                                       $sql = reset($row);
+                                       if (crc32($sql) == $partial) break;
+                               }
+                       }
+               }
+               $sql = str_replace('?',"''",$sql);
+               
+               if ($partial) {
+                       $sqlq = $this->conn->qstr($sql.'%');
+                       $sql = $this->conn->GetOne("select sql1 from 
adodb_logsql where sql1 like $sqlq");
+               }
+               
+               $s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
+               $rs = $this->conn->Execute('EXPLAIN '.$sql);
+               $s .= rs2html($rs,false,false,false,false);
+               $this->conn->LogSQL($save);
+               $s .= $this->Tracer($sql);
+               return $s;
+       }
+       
+       function Tables()
+       {
+               if (!$this->tablesSQL) return false;
+               
+               $rs = $this->conn->Execute($this->tablesSQL);
+               if (!$rs) return false;
+               
+               $html = rs2html($rs,false,false,false,false);
+               return $html;
+       }
+       
+       function GetReads()
+       {
+       global $ADODB_FETCH_MODE;
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->conn->fetchMode !== false) $savem = 
$this->conn->SetFetchMode(false);
+               
+               $rs = $this->conn->Execute('show status');
+               
+               if (isset($savem)) $this->conn->SetFetchMode($savem);
+               $ADODB_FETCH_MODE = $save;
+               
+               if (!$rs) return 0;
+               $val = 0;
+               while (!$rs->EOF) {
+                       switch($rs->fields[0]) {
+                       case 'Com_select': 
+                               $val = $rs->fields[1];
+                               $rs->Close();
+                               return $val;
+                       }
+                       $rs->MoveNext();
+               } 
+               
+               $rs->Close();
+               
+               return $val;
+       }
+       
+       function GetWrites()
+       {
+       global $ADODB_FETCH_MODE;
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->conn->fetchMode !== false) $savem = 
$this->conn->SetFetchMode(false);
+               
+               $rs = $this->conn->Execute('show status');
+               
+               if (isset($savem)) $this->conn->SetFetchMode($savem);
+               $ADODB_FETCH_MODE = $save;
+               
+               if (!$rs) return 0;
+               $val = 0.0;
+               while (!$rs->EOF) {
+                       switch($rs->fields[0]) {
+                       case 'Com_insert': 
+                               $val += $rs->fields[1]; break;
+                       case 'Com_delete': 
+                               $val += $rs->fields[1]; break;
+                       case 'Com_update': 
+                               $val += $rs->fields[1]/2;
+                               $rs->Close();
+                               return $val;
+                       }
+                       $rs->MoveNext();
+               } 
+               
+               $rs->Close();
+               
+               return $val;
+       }
+       
+       function FindDBHitRatio()
+       {
+               // first find out type of table
+               //$this->conn->debug=1;
+               
+               global $ADODB_FETCH_MODE;
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->conn->fetchMode !== false) $savem = 
$this->conn->SetFetchMode(false);
+               
+               $rs = $this->conn->Execute('show table status');
+               
+               if (isset($savem)) $this->conn->SetFetchMode($savem);
+               $ADODB_FETCH_MODE = $save;
+               
+               if (!$rs) return '';
+               $type = strtoupper($rs->fields[1]);
+               $rs->Close();
+               switch($type){
+               case 'MYISAM':
+               case 'ISAM':
+                       return $this->DBParameter('MyISAM cache hit ratio').' 
(MyISAM)';
+               case 'INNODB':
+                       return $this->DBParameter('InnoDB cache hit ratio').' 
(InnoDB)';
+               default:
+                       return $type.' not supported';
+               }
+               
+       }
+       
+       function GetQHitRatio()
+       {
+               //Total number of queries = Qcache_inserts + Qcache_hits + 
Qcache_not_cached
+               $hits = $this->_DBParameter(array("show status","Qcache_hits"));
+               $total = $this->_DBParameter(array("show 
status","Qcache_inserts"));
+               $total += $this->_DBParameter(array("show 
status","Qcache_not_cached"));
+               
+               $total += $hits;
+               if ($total) return round(($hits*100)/$total,2);
+               return 0;
+       }
+       
+       /*
+               Use session variable to store Hit percentage, because MySQL
+               does not remember last value of SHOW INNODB STATUS hit ratio
+               
+               # 1st query to SHOW INNODB STATUS
+               0.00 reads/s, 0.00 creates/s, 0.00 writes/s
+               Buffer pool hit rate 1000 / 1000
+               
+               # 2nd query to SHOW INNODB STATUS
+               0.00 reads/s, 0.00 creates/s, 0.00 writes/s
+               No buffer pool activity since the last printout
+       */
+       function GetInnoDBHitRatio()
+       {
+       global $ADODB_FETCH_MODE;
+       
+               $save = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               if ($this->conn->fetchMode !== false) $savem = 
$this->conn->SetFetchMode(false);
+               
+               $rs = $this->conn->Execute('show innodb status');
+               
+               if (isset($savem)) $this->conn->SetFetchMode($savem);
+               $ADODB_FETCH_MODE = $save;
+               
+               if (!$rs || $rs->EOF) return 0;
+               $stat = $rs->fields[0];
+               $rs->Close();
+               $at = strpos($stat,'Buffer pool hit rate');
+               $stat = substr($stat,$at,200);
+               if (preg_match('!Buffer pool hit rate\s*([0-9]*) / 
([0-9]*)!',$stat,$arr)) {
+                       $val = 100*$arr[1]/$arr[2];
+                       $_SESSION['INNODB_HIT_PCT'] = $val;
+                       return round($val,2);
+               } else {
+                       if (isset($_SESSION['INNODB_HIT_PCT'])) return 
$_SESSION['INNODB_HIT_PCT'];
+                       return 0;
+               }
+               return 0;
+       }
+       
+       function GetKeyHitRatio()
+       {
+               $hits = $this->_DBParameter(array("show 
status","Key_read_requests"));
+               $reqs = $this->_DBParameter(array("show status","Key_reads"));
+               if ($reqs == 0) return 0;
+               
+               return round(($hits/($reqs+$hits))*100,2);
+       }
+       
+    // start hack 
+    var $optimizeTableLow = 'CHECK TABLE %s FAST QUICK';
+    var $optimizeTableHigh = 'OPTIMIZE TABLE %s';
+    
+    /** 
+     * @see adodb_perf#optimizeTable
+     */
+     function optimizeTable( $table, $mode = ADODB_OPT_LOW) 
+     {
+        if ( !is_string( $table)) return false;
+        
+        $conn = $this->conn;
+        if ( !$conn) return false;
+        
+        $sql = '';
+        switch( $mode) {
+            case ADODB_OPT_LOW : $sql = $this->optimizeTableLow; break;
+            case ADODB_OPT_HIGH : $sql = $this->optimizeTableHigh; break;
+            default : 
+            {
+                // May dont use __FUNCTION__ constant for BC (__FUNCTION__ 
Added in PHP 4.3.0)
+                ADOConnection::outp( sprintf( "<p>%s: '%s' using of undefined 
mode '%s'</p>", __CLASS__, __FUNCTION__, $mode));
+                return false;
+            }
+        }
+        $sql = sprintf( $sql, $table);
+        
+        return $conn->Execute( $sql) !== false;
+     }
+    // end hack 
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/perf/perf-oci8.inc.php
diff -u phpgwapi/inc/adodb/perf/perf-oci8.inc.php:1.2 
phpgwapi/inc/adodb/perf/perf-oci8.inc.php:1.3
--- phpgwapi/inc/adodb/perf/perf-oci8.inc.php:1.2       Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/perf/perf-oci8.inc.php   Tue Feb 21 13:47:42 2006
@@ -1,499 +1,509 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class perf_oci8 extends ADODB_perf{
-       
-       var $tablesSQL = "select segment_name as \"tablename\", sum(bytes)/1024 
as \"size_in_k\",tablespace_name as \"tablespace\",count(*) \"extents\" from 
sys.user_extents 
-          group by segment_name,tablespace_name";
-        
-       var $version;
-       var $createTableSQL = "CREATE TABLE adodb_logsql (
-                 created date NOT NULL,
-                 sql0 varchar(250) NOT NULL,
-                 sql1 varchar(4000) NOT NULL,
-                 params varchar(4000),
-                 tracer varchar(4000),
-                 timer decimal(16,6) NOT NULL
-               )";
-       
-       var $settings = array(
-       'Ratios',
-               'data cache hit ratio' => array('RATIOH',
-                       "select round((1-(phy.value / (cur.value + 
con.value)))*100,2) 
-                       from v\$sysstat cur, v\$sysstat con, v\$sysstat phy
-                       where cur.name = 'db block gets' and
-                             con.name = 'consistent gets' and
-                             phy.name = 'physical reads'",
-                       '=WarnCacheRatio'),
-               
-               'sql cache hit ratio' => array( 'RATIOH',
-                       'select round(100*(sum(pins)-sum(reloads))/sum(pins),2) 
 from v$librarycache',
-                       'increase <i>shared_pool_size</i> if too ratio low'),
-                       
-               'datadict cache hit ratio' => array('RATIOH',
-               "select      
-           round((1 - (sum(getmisses) / (sum(gets) +          
-                sum(getmisses))))*100,2)
-               from  v\$rowcache",
-               'increase <i>shared_pool_size</i> if too ratio low'),
-               
-               'memory sort ratio' => array('RATIOH',
-               "SELECT ROUND((100 * b.VALUE) /DECODE ((a.VALUE + b.VALUE), 
-       0,1,(a.VALUE + b.VALUE)),2)
-FROM   v\$sysstat a, 
-       v\$sysstat b
-WHERE  a.name = 'sorts (disk)'
-AND    b.name = 'sorts (memory)'",
-       "% of memory sorts compared to disk sorts - should be over 95%"),
-
-       'IO',
-               'data reads' => array('IO',
-               "select value from v\$sysstat where name='physical reads'"),
-       
-       'data writes' => array('IO',
-               "select value from v\$sysstat where name='physical writes'"),
-       
-       'Data Cache',
-               'data cache buffers' => array( 'DATAC',
-               "select a.value/b.value  from v\$parameter a, v\$parameter b 
-                       where a.name = 'db_cache_size' and b.name= 
'db_block_size'",
-                       'Number of cache buffers. Tune <i>db_cache_size</i> if 
the <i>data cache hit ratio</i> is too low.'),
-               'data cache blocksize' => array('DATAC',
-                       "select value from v\$parameter where 
name='db_block_size'",
-                       '' ),                   
-       'Memory Pools',
-               'data cache size' => array('DATAC',
-                       "select value from v\$parameter where name = 
'db_cache_size'",
-                       'db_cache_size' ),
-               'shared pool size' => array('DATAC',
-                       "select value from v\$parameter where name = 
'shared_pool_size'",
-                       'shared_pool_size, which holds shared sql, stored 
procedures, dict cache and similar shared structs' ),
-               'java pool size' => array('DATAJ',
-                       "select value from v\$parameter where name = 
'java_pool_size'",
-                       'java_pool_size' ),
-               'large pool buffer size' => array('CACHE',
-                       "select value from v\$parameter where 
name='large_pool_size'",
-                       'this pool is for large mem allocations (not because it 
is larger than shared pool), for MTS sessions, parallel queries, io buffers 
(large_pool_size) ' ),
-
-               'pga buffer size' => array('CACHE',                     
-                       "select value from v\$parameter where 
name='pga_aggregate_target'",
-                       'program global area is private memory for sorting, and 
hash and bitmap merges - since oracle 9i (pga_aggregate_target)' ),
-
-               
-               'Connections',
-               'current connections' => array('SESS',
-                       'select count(*) from sys.v_$session where username is 
not null',
-                       ''),
-               'max connections' => array( 'SESS',
-                       "select value from v\$parameter where name='sessions'",
-                       ''),
-
-       'Memory Utilization',           
-               'data cache utilization ratio' => array('RATIOU',
-                       "select round((1-bytes/sgasize)*100, 2)
-                       from (select sum(bytes) sgasize from sys.v_\$sgastat) 
s, sys.v_\$sgastat f
-                       where name = 'free memory' and pool = 'shared pool'",
-               'Percentage of data cache actually in use - should be over 
85%'),
-               
-               'shared pool utilization ratio' => array('RATIOU',
-               'select round((sga.bytes/p.value)*100,2)
-               from v$sgastat sga, v$parameter p
-               where sga.name = \'free memory\' and sga.pool = \'shared pool\'
-               and p.name = \'shared_pool_size\'',
-               'Percentage of shared pool actually used - too low is bad, too 
high is worse'),
-               
-               'large pool utilization ratio' => array('RATIOU',
-                       "select round((1-bytes/sgasize)*100, 2)
-                       from (select sum(bytes) sgasize from sys.v_\$sgastat) 
s, sys.v_\$sgastat f
-                       where name = 'free memory' and pool = 'large pool'",
-               'Percentage of large_pool actually in use - too low is bad, too 
high is worse'),
-               'sort buffer size' => array('CACHE',
-                       "select value from v\$parameter where 
name='sort_area_size'",
-                       'max in-mem sort_area_size (per query), uses memory in 
pga' ),
-
-               'pga usage at peak' => array('RATIOU',
-               '=PGA','Mb utilization at peak transactions (requires Oracle 
9i+)'),
-       'Transactions',
-               'rollback segments' => array('ROLLBACK',
-                       "select count(*) from sys.v_\$rollstat",
-                       ''),
-       
-               'peak transactions' => array('ROLLBACK',
-                       "select max_utilization  tx_hwm
-               from sys.v_\$resource_limit
-               where resource_name = 'transactions'",
-                       'Taken from high-water-mark'),
-               'max transactions' => array('ROLLBACK',
-                       "select value from v\$parameter where name = 
'transactions'",
-                       'max transactions / rollback segments < 3.5 (or 
transactions_per_rollback_segment)'),
-       'Parameters',   
-               'cursor sharing' => array('CURSOR',
-                       "select value from v\$parameter where name = 
'cursor_sharing'",
-                       'Cursor reuse strategy. Recommended is FORCE (8i+) or 
SIMILAR (9i+). See <a 
href=http://www.praetoriate.com/oracle_tips_cursor_sharing.htm>cursor_sharing</a>.'),
-               /*
-               'cursor reuse' => array('CURSOR',
-                       "select count(*) from (select sql_text_wo_constants, 
count(*)
-  from t1
- group by sql_text_wo_constants
-having count(*) > 100)",'These are sql statements that should be using bind 
variables'),*/
-               'index cache cost' => array('COST',
-                       "select value from v\$parameter where name = 
'optimizer_index_caching'",
-                       '=WarnIndexCost'),
-               'random page cost' => array('COST',
-                       "select value from v\$parameter where name = 
'optimizer_index_cost_adj'",
-                       '=WarnPageCost'),
-               
-               false
-               
-       );
-       
-       
-       function perf_oci8(&$conn)
-       {
-               $savelog = $conn->LogSQL(false);        
-               $this->version = $conn->ServerInfo();
-               $conn->LogSQL($savelog);        
-               $this->conn =& $conn;
-       }
-       
-       function WarnPageCost($val)
-       {
-               if ($val == 100) $s = '<font color=red><b>Too High</b>. 
</font>';
-               else $s = '';
-               
-               return $s.'Recommended is 20-50 for TP, and 50 for data 
warehouses. Default is 100. See <a 
href=http://www.dba-oracle.com/oracle_tips_cost_adj.htm>optimizer_index_cost_adj</a>.
 ';
-       }
-       
-       function WarnIndexCost($val)
-       {
-               if ($val == 0) $s = '<font color=red><b>Too Low</b>. </font>';
-               else $s = '';
-               
-               return $s.'Percentage of indexed data blocks expected in the 
cache.
-                       Recommended is 20 (fast disk array) to 50 (slower hard 
disks). Default is 0.
-                        See <a 
href=http://www.dba-oracle.com/oracle_tips_cbo_part1.htm>optimizer_index_caching</a>.';
-               }
-       
-       function PGA()
-       {
-               if ($this->version['version'] < 9) return 'Oracle 9i or later 
required';
-               
-               $rs = $this->conn->Execute("select a.mb,a.targ as 
pga_size_pct,a.pct from 
-          (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
-                  pga_target_factor targ,estd_pga_cache_hit_percentage 
pct,rownum as r 
-                  from v\$pga_target_advice) a left join
-          (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
-                  pga_target_factor targ,estd_pga_cache_hit_percentage 
pct,rownum as r 
-                  from v\$pga_target_advice) b on 
-         a.r = b.r+1 where 
-               b.pct < 100");
-               if (!$rs) return "Only in 9i or later";
-               $rs->Close();
-               if ($rs->EOF) return "PGA could be too big";
-               
-               return reset($rs->fields);
-       }
-       
-       function Explain($sql,$partial=false) 
-       {
-               $savelog = $this->conn->LogSQL(false);
-               $rs =& $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
-               if (!$rs) {
-                       echo "<p><b>Missing PLAN_TABLE</b></p>
-<pre>
-CREATE TABLE PLAN_TABLE (
-  STATEMENT_ID                    VARCHAR2(30),
-  TIMESTAMP                       DATE,
-  REMARKS                         VARCHAR2(80),
-  OPERATION                       VARCHAR2(30),
-  OPTIONS                         VARCHAR2(30),
-  OBJECT_NODE                     VARCHAR2(128),
-  OBJECT_OWNER                    VARCHAR2(30),
-  OBJECT_NAME                     VARCHAR2(30),
-  OBJECT_INSTANCE                 NUMBER(38),
-  OBJECT_TYPE                     VARCHAR2(30),
-  OPTIMIZER                       VARCHAR2(255),
-  SEARCH_COLUMNS                  NUMBER,
-  ID                              NUMBER(38),
-  PARENT_ID                       NUMBER(38),
-  POSITION                        NUMBER(38),
-  COST                            NUMBER(38),
-  CARDINALITY                     NUMBER(38),
-  BYTES                           NUMBER(38),
-  OTHER_TAG                       VARCHAR2(255),
-  PARTITION_START                 VARCHAR2(255),
-  PARTITION_STOP                  VARCHAR2(255),
-  PARTITION_ID                    NUMBER(38),
-  OTHER                           LONG,
-  DISTRIBUTION                    VARCHAR2(30)
-);
-</pre>";
-                       return false;
-               }
-               
-               $rs->Close();
-       //      $this->conn->debug=1;
-       
-               if ($partial) {
-                       $sqlq = $this->conn->qstr($sql.'%');
-                       $arr = $this->conn->GetArray("select distinct distinct 
sql1 from adodb_logsql where sql1 like $sqlq");
-                       if ($arr) {
-                               foreach($arr as $row) {
-                                       $sql = reset($row);
-                                       if (crc32($sql) == $partial) break;
-                               }
-                       }
-               }
-               
-               $s = "<p><b>Explain</b>: ".htmlspecialchars($sql)."</p>";       
-               
-               $this->conn->BeginTrans();
-               $id = "ADODB ".microtime();
-               $rs =& $this->conn->Execute("EXPLAIN PLAN SET 
STATEMENT_ID='$id' FOR $sql");
-               $m = $this->conn->ErrorMsg();
-               if ($m) {
-                       $this->conn->RollbackTrans();
-                       $this->conn->LogSQL($savelog);
-                       $s .= "<p>$m</p>";
-                       return $s;
-               }
-               $rs = $this->conn->Execute("
-               select 
-  '<pre>'||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || 
trim(options)||'</pre>'  as Operation, 
-  object_name,COST,CARDINALITY,bytes
-               FROM plan_table 
-START WITH id = 0  and STATEMENT_ID='$id'  
-CONNECT BY prior id=parent_id and statement_id='$id'");
-               
-               $s .= rs2html($rs,false,false,false,false);
-               $this->conn->RollbackTrans();
-               $this->conn->LogSQL($savelog);
-               $s .= $this->Tracer($sql,$partial);
-               return $s;
-       }
-       
-       
-       function CheckMemory()
-       {
-               if ($this->version['version'] < 9) return 'Oracle 9i or later 
required';
-               
-                $rs =& $this->conn->Execute("
-select  a.size_for_estimate as cache_mb_estimate,
-       case when a.size_factor=1 then 
-               '&lt;&lt;= current'
-        when a.estd_physical_read_factor-b.estd_physical_read_factor > 0 and 
a.estd_physical_read_factor<1 then
-               '- BETTER - '
-       else ' ' end as currsize, 
-   a.estd_physical_read_factor-b.estd_physical_read_factor as best_when_0
-   from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum 
 r from v\$db_cache_advice) a , 
-   (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r 
from v\$db_cache_advice) b where a.r = b.r-1");
-               if (!$rs) return false;
-               
-               /*
-               The v$db_cache_advice utility show the marginal changes in 
physical data block reads for different sizes of db_cache_size
-               */
-               $s = "<h3>Data Cache Estimate</h3>";
-               if ($rs->EOF) {
-                       $s .= "<p>Cache that is 50% of current size is still 
too big</p>";
-               } else {
-                       $s .= "Ideal size of Data Cache is when \"best_when_0\" 
changes from a positive number and becomes zero.";
-                       $s .= rs2html($rs,false,false,false,false);
-               }
-               return $s;
-       }
-       
-       /*
-               Generate html for suspicious/expensive sql
-       */
-       function tohtml(&$rs,$type)
-       {
-               $o1 = $rs->FetchField(0);
-               $o2 = $rs->FetchField(1);
-               $o3 = $rs->FetchField(2);
-               if ($rs->EOF) return '<p>None found</p>';
-               $check = '';
-               $sql = '';
-               $s = "\n\n<table border=1 
bgcolor=white><tr><td><b>".$o1->name.'</b></td><td><b>'.$o2->name.'</b></td><td><b>'.$o3->name.'</b></td></tr>';
-               while (!$rs->EOF) {
-                       if ($check != $rs->fields[0].'::'.$rs->fields[1]) {
-                               if ($check) {
-                                       $carr = explode('::',$check);
-                                       $prefix = "<a 
href=\"?$type=1&sql=".rawurlencode($sql).'&x#explain">';
-                                       $suffix = '</a>';
-                                       if (strlen($prefix)>2000) {
-                                               $prefix = '';
-                                               $suffix = '';
-                                       }
-                                       
-                                       $s .=  "\n<tr><td 
align=right>".$carr[0].'</td><td 
align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
-                               }
-                               $sql = $rs->fields[2];
-                               $check = $rs->fields[0].'::'.$rs->fields[1];    
                
-                       } else
-                               $sql .= $rs->fields[2];
-                       
-                       $rs->MoveNext();
-               }
-               $rs->Close();
-               
-               $carr = explode('::',$check);
-               $prefix = "<a target=".rand()." 
href=\"?&hidem=1&$type=1&sql=".rawurlencode($sql).'&x#explain">';
-               $suffix = '</a>';
-               if (strlen($prefix)>2000) {
-                       $prefix = '';
-                       $suffix = '';
-               }
-               $s .=  "\n<tr><td align=right>".$carr[0].'</td><td 
align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
-                                       
-               return $s."</table>\n\n";
-       }
-       
-       // code thanks to Ixora. 
-       // http://www.ixora.com.au/scripts/query_opt.htm
-       // requires oracle 8.1.7 or later
-       function SuspiciousSQL($numsql=10)
-       {
-               $sql = "
-select
-  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
-  s.executions  executes,
-  p.sql_text
-from
-  ( 
-    select
-      address,
-      buffer_gets,
-      executions,
-      pct,
-      rank() over (order by buffer_gets desc)  ranking
-    from
-      ( 
-       select
-         address,
-         buffer_gets,
-         executions,
-         100 * ratio_to_report(buffer_gets) over ()  pct
-       from
-         sys.v_\$sql
-       where
-         command_type != 47 and module != 'T.O.A.D.'
-      )
-    where
-      buffer_gets > 50 * executions
-  )  s,
-  sys.v_\$sqltext  p
-where
-  s.ranking <= $numsql and
-  p.address = s.address
-order by
-  1 desc, s.address, p.piece";
-
-               global $ADODB_CACHE_MODE,$HTTP_GET_VARS;
-               if (isset($HTTP_GET_VARS['expsixora']) && 
isset($HTTP_GET_VARS['sql'])) {
-                               $partial = empty($HTTP_GET_VARS['part']);
-                               echo "<a 
name=explain></a>".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
-               }
-
-               if (isset($HTTP_GET_VARS['sql'])) return 
$this->_SuspiciousSQL();
-               
-               $save = $ADODB_CACHE_MODE;
-               $ADODB_CACHE_MODE = ADODB_FETCH_NUM;
-               $savelog = $this->conn->LogSQL(false);
-               $rs =& $this->conn->SelectLimit($sql);
-               $this->conn->LogSQL($savelog);
-               $ADODB_CACHE_MODE = $save;
-               if ($rs) {
-                       $s = "\n<h3>Ixora Suspicious SQL</h3>";
-                       $s .= $this->tohtml($rs,'expsixora');
-               } else 
-                       $s = '';
-               
-               if ($s) $s .= '<p>';
-               $s .= $this->_SuspiciousSQL();
-               return $s;
-       }
-       
-       // code thanks to Ixora. 
-       // http://www.ixora.com.au/scripts/query_opt.htm
-       // requires oracle 8.1.7 or later
-       function ExpensiveSQL($numsql = 10)
-       {
-               $sql = "
-select
-  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
-  s.executions  executes,
-  p.sql_text
-from
-  ( 
-    select
-      address,
-      disk_reads,
-      executions,
-      pct,
-      rank() over (order by disk_reads desc)  ranking
-    from
-      (
-       select
-         address,
-         disk_reads,
-         executions,
-         100 * ratio_to_report(disk_reads) over ()  pct
-       from
-         sys.v_\$sql
-       where
-         command_type != 47 and module != 'T.O.A.D.'
-      )
-    where
-      disk_reads > 50 * executions
-  )  s,
-  sys.v_\$sqltext  p
-where
-  s.ranking <= $numsql and
-  p.address = s.address
-order by
-  1 desc, s.address, p.piece
-";
-               global $ADODB_CACHE_MODE,$HTTP_GET_VARS;
-               if (isset($HTTP_GET_VARS['expeixora']) && 
isset($HTTP_GET_VARS['sql'])) {
-                       $partial = empty($HTTP_GET_VARS['part']);       
-                       echo "<a 
name=explain></a>".$this->Explain($HTTP_GET_VARS['sql'],$partial)."\n";
-               }
-               
-               if (isset($HTTP_GET_VARS['sql'])) {
-                        $var =& $this->_ExpensiveSQL();
-                        return $var;
-               }
-               $save = $ADODB_CACHE_MODE;
-               $ADODB_CACHE_MODE = ADODB_FETCH_NUM;
-               $savelog = $this->conn->LogSQL(false);
-               $rs =& $this->conn->Execute($sql);
-               $this->conn->LogSQL($savelog);
-               $ADODB_CACHE_MODE = $save;
-               if ($rs) {
-                       $s = "\n<h3>Ixora Expensive SQL</h3>";
-                       $s .= $this->tohtml($rs,'expeixora');
-               } else 
-                       $s = '';
-               
-               
-               if ($s) $s .= '<p>';
-               $s .= $this->_ExpensiveSQL();
-               return $s;
-       }
-       
-}
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Library for basic performance monitoring and tuning 
+  
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class perf_oci8 extends ADODB_perf{
+       
+       var $tablesSQL = "select segment_name as \"tablename\", sum(bytes)/1024 
as \"size_in_k\",tablespace_name as \"tablespace\",count(*) \"extents\" from 
sys.user_extents 
+          group by segment_name,tablespace_name";
+        
+       var $version;
+       var $createTableSQL = "CREATE TABLE adodb_logsql (
+                 created date NOT NULL,
+                 sql0 varchar(250) NOT NULL,
+                 sql1 varchar(4000) NOT NULL,
+                 params varchar(4000),
+                 tracer varchar(4000),
+                 timer decimal(16,6) NOT NULL
+               )";
+       
+       var $settings = array(
+       'Ratios',
+               'data cache hit ratio' => array('RATIOH',
+                       "select round((1-(phy.value / (cur.value + 
con.value)))*100,2) 
+                       from v\$sysstat cur, v\$sysstat con, v\$sysstat phy
+                       where cur.name = 'db block gets' and
+                             con.name = 'consistent gets' and
+                             phy.name = 'physical reads'",
+                       '=WarnCacheRatio'),
+               
+               'sql cache hit ratio' => array( 'RATIOH',
+                       'select round(100*(sum(pins)-sum(reloads))/sum(pins),2) 
 from v$librarycache',
+                       'increase <i>shared_pool_size</i> if too ratio low'),
+                       
+               'datadict cache hit ratio' => array('RATIOH',
+               "select      
+           round((1 - (sum(getmisses) / (sum(gets) +          
+                sum(getmisses))))*100,2)
+               from  v\$rowcache",
+               'increase <i>shared_pool_size</i> if too ratio low'),
+               
+               'memory sort ratio' => array('RATIOH',
+               "SELECT ROUND((100 * b.VALUE) /DECODE ((a.VALUE + b.VALUE), 
+       0,1,(a.VALUE + b.VALUE)),2)
+FROM   v\$sysstat a, 
+       v\$sysstat b
+WHERE  a.name = 'sorts (disk)'
+AND    b.name = 'sorts (memory)'",
+       "% of memory sorts compared to disk sorts - should be over 95%"),
+
+       'IO',
+               'data reads' => array('IO',
+               "select value from v\$sysstat where name='physical reads'"),
+       
+       'data writes' => array('IO',
+               "select value from v\$sysstat where name='physical writes'"),
+       
+       'Data Cache',
+               'data cache buffers' => array( 'DATAC',
+               "select a.value/b.value  from v\$parameter a, v\$parameter b 
+                       where a.name = 'db_cache_size' and b.name= 
'db_block_size'",
+                       'Number of cache buffers. Tune <i>db_cache_size</i> if 
the <i>data cache hit ratio</i> is too low.'),
+               'data cache blocksize' => array('DATAC',
+                       "select value from v\$parameter where 
name='db_block_size'",
+                       '' ),                   
+       'Memory Pools',
+               'data cache size' => array('DATAC',
+                       "select value from v\$parameter where name = 
'db_cache_size'",
+                       'db_cache_size' ),
+               'shared pool size' => array('DATAC',
+                       "select value from v\$parameter where name = 
'shared_pool_size'",
+                       'shared_pool_size, which holds shared sql, stored 
procedures, dict cache and similar shared structs' ),
+               'java pool size' => array('DATAJ',
+                       "select value from v\$parameter where name = 
'java_pool_size'",
+                       'java_pool_size' ),
+               'large pool buffer size' => array('CACHE',
+                       "select value from v\$parameter where 
name='large_pool_size'",
+                       'this pool is for large mem allocations (not because it 
is larger than shared pool), for MTS sessions, parallel queries, io buffers 
(large_pool_size) ' ),
+
+               'pga buffer size' => array('CACHE',                     
+                       "select value from v\$parameter where 
name='pga_aggregate_target'",
+                       'program global area is private memory for sorting, and 
hash and bitmap merges - since oracle 9i (pga_aggregate_target)' ),
+
+               
+               'Connections',
+               'current connections' => array('SESS',
+                       'select count(*) from sys.v_$session where username is 
not null',
+                       ''),
+               'max connections' => array( 'SESS',
+                       "select value from v\$parameter where name='sessions'",
+                       ''),
+
+       'Memory Utilization',           
+               'data cache utilization ratio' => array('RATIOU',
+                       "select round((1-bytes/sgasize)*100, 2)
+                       from (select sum(bytes) sgasize from sys.v_\$sgastat) 
s, sys.v_\$sgastat f
+                       where name = 'free memory' and pool = 'shared pool'",
+               'Percentage of data cache actually in use - should be over 
85%'),
+               
+               'shared pool utilization ratio' => array('RATIOU',
+               'select round((sga.bytes/p.value)*100,2)
+               from v$sgastat sga, v$parameter p
+               where sga.name = \'free memory\' and sga.pool = \'shared pool\'
+               and p.name = \'shared_pool_size\'',
+               'Percentage of shared pool actually used - too low is bad, too 
high is worse'),
+               
+               'large pool utilization ratio' => array('RATIOU',
+                       "select round((1-bytes/sgasize)*100, 2)
+                       from (select sum(bytes) sgasize from sys.v_\$sgastat) 
s, sys.v_\$sgastat f
+                       where name = 'free memory' and pool = 'large pool'",
+               'Percentage of large_pool actually in use - too low is bad, too 
high is worse'),
+               'sort buffer size' => array('CACHE',
+                       "select value from v\$parameter where 
name='sort_area_size'",
+                       'max in-mem sort_area_size (per query), uses memory in 
pga' ),
+
+               'pga usage at peak' => array('RATIOU',
+               '=PGA','Mb utilization at peak transactions (requires Oracle 
9i+)'),
+       'Transactions',
+               'rollback segments' => array('ROLLBACK',
+                       "select count(*) from sys.v_\$rollstat",
+                       ''),
+       
+               'peak transactions' => array('ROLLBACK',
+                       "select max_utilization  tx_hwm
+               from sys.v_\$resource_limit
+               where resource_name = 'transactions'",
+                       'Taken from high-water-mark'),
+               'max transactions' => array('ROLLBACK',
+                       "select value from v\$parameter where name = 
'transactions'",
+                       'max transactions / rollback segments < 3.5 (or 
transactions_per_rollback_segment)'),
+       'Parameters',   
+               'cursor sharing' => array('CURSOR',
+                       "select value from v\$parameter where name = 
'cursor_sharing'",
+                       'Cursor reuse strategy. Recommended is FORCE (8i+) or 
SIMILAR (9i+). See <a 
href=http://www.praetoriate.com/oracle_tips_cursor_sharing.htm>cursor_sharing</a>.'),
+               /*
+               'cursor reuse' => array('CURSOR',
+                       "select count(*) from (select sql_text_wo_constants, 
count(*)
+  from t1
+ group by sql_text_wo_constants
+having count(*) > 100)",'These are sql statements that should be using bind 
variables'),*/
+               'index cache cost' => array('COST',
+                       "select value from v\$parameter where name = 
'optimizer_index_caching'",
+                       '=WarnIndexCost'),
+               'random page cost' => array('COST',
+                       "select value from v\$parameter where name = 
'optimizer_index_cost_adj'",
+                       '=WarnPageCost'),
+               
+               false
+               
+       );
+       
+       
+       function perf_oci8(&$conn)
+       {
+               $savelog = $conn->LogSQL(false);        
+               $this->version = $conn->ServerInfo();
+               $conn->LogSQL($savelog);        
+               $this->conn =& $conn;
+       }
+       
+       function WarnPageCost($val)
+       {
+               if ($val == 100) $s = '<font color=red><b>Too High</b>. 
</font>';
+               else $s = '';
+               
+               return $s.'Recommended is 20-50 for TP, and 50 for data 
warehouses. Default is 100. See <a 
href=http://www.dba-oracle.com/oracle_tips_cost_adj.htm>optimizer_index_cost_adj</a>.
 ';
+       }
+       
+       function WarnIndexCost($val)
+       {
+               if ($val == 0) $s = '<font color=red><b>Too Low</b>. </font>';
+               else $s = '';
+               
+               return $s.'Percentage of indexed data blocks expected in the 
cache.
+                       Recommended is 20 (fast disk array) to 50 (slower hard 
disks). Default is 0.
+                        See <a 
href=http://www.dba-oracle.com/oracle_tips_cbo_part1.htm>optimizer_index_caching</a>.';
+               }
+       
+       function PGA()
+       {
+               if ($this->version['version'] < 9) return 'Oracle 9i or later 
required';
+               
+               $rs = $this->conn->Execute("select a.mb,a.targ as 
pga_size_pct,a.pct from 
+          (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
+                  pga_target_factor targ,estd_pga_cache_hit_percentage 
pct,rownum as r 
+                  from v\$pga_target_advice) a left join
+          (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
+                  pga_target_factor targ,estd_pga_cache_hit_percentage 
pct,rownum as r 
+                  from v\$pga_target_advice) b on 
+         a.r = b.r+1 where 
+               b.pct < 100");
+               if (!$rs) return "Only in 9i or later";
+               $rs->Close();
+               if ($rs->EOF) return "PGA could be too big";
+               
+               return reset($rs->fields);
+       }
+       
+       function Explain($sql,$partial=false) 
+       {
+               $savelog = $this->conn->LogSQL(false);
+               $rs =& $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
+               if (!$rs) {
+                       echo "<p><b>Missing PLAN_TABLE</b></p>
+<pre>
+CREATE TABLE PLAN_TABLE (
+  STATEMENT_ID                    VARCHAR2(30),
+  TIMESTAMP                       DATE,
+  REMARKS                         VARCHAR2(80),
+  OPERATION                       VARCHAR2(30),
+  OPTIONS                         VARCHAR2(30),
+  OBJECT_NODE                     VARCHAR2(128),
+  OBJECT_OWNER                    VARCHAR2(30),
+  OBJECT_NAME                     VARCHAR2(30),
+  OBJECT_INSTANCE                 NUMBER(38),
+  OBJECT_TYPE                     VARCHAR2(30),
+  OPTIMIZER                       VARCHAR2(255),
+  SEARCH_COLUMNS                  NUMBER,
+  ID                              NUMBER(38),
+  PARENT_ID                       NUMBER(38),
+  POSITION                        NUMBER(38),
+  COST                            NUMBER(38),
+  CARDINALITY                     NUMBER(38),
+  BYTES                           NUMBER(38),
+  OTHER_TAG                       VARCHAR2(255),
+  PARTITION_START                 VARCHAR2(255),
+  PARTITION_STOP                  VARCHAR2(255),
+  PARTITION_ID                    NUMBER(38),
+  OTHER                           LONG,
+  DISTRIBUTION                    VARCHAR2(30)
+);
+</pre>";
+                       return false;
+               }
+               
+               $rs->Close();
+       //      $this->conn->debug=1;
+       
+               if ($partial) {
+                       $sqlq = $this->conn->qstr($sql.'%');
+                       $arr = $this->conn->GetArray("select distinct distinct 
sql1 from adodb_logsql where sql1 like $sqlq");
+                       if ($arr) {
+                               foreach($arr as $row) {
+                                       $sql = reset($row);
+                                       if (crc32($sql) == $partial) break;
+                               }
+                       }
+               }
+               
+               $s = "<p><b>Explain</b>: ".htmlspecialchars($sql)."</p>";       
+               
+               $this->conn->BeginTrans();
+               $id = "ADODB ".microtime();
+
+               $rs =& $this->conn->Execute("EXPLAIN PLAN SET 
STATEMENT_ID='$id' FOR $sql");
+               $m = $this->conn->ErrorMsg();
+               if ($m) {
+                       $this->conn->RollbackTrans();
+                       $this->conn->LogSQL($savelog);
+                       $s .= "<p>$m</p>";
+                       return $s;
+               }
+               $rs =& $this->conn->Execute("
+               select 
+  '<pre>'||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || 
trim(options)||'</pre>'  as Operation, 
+  object_name,COST,CARDINALITY,bytes
+               FROM plan_table 
+START WITH id = 0  and STATEMENT_ID='$id'  
+CONNECT BY prior id=parent_id and statement_id='$id'");
+               
+               $s .= rs2html($rs,false,false,false,false);
+               $this->conn->RollbackTrans();
+               $this->conn->LogSQL($savelog);
+               $s .= $this->Tracer($sql,$partial);
+               return $s;
+       }
+       
+       
+       function CheckMemory()
+       {
+               if ($this->version['version'] < 9) return 'Oracle 9i or later 
required';
+               
+                $rs =& $this->conn->Execute("
+select  a.size_for_estimate as cache_mb_estimate,
+       case when a.size_factor=1 then 
+               '&lt;&lt;= current'
+        when a.estd_physical_read_factor-b.estd_physical_read_factor > 0 and 
a.estd_physical_read_factor<1 then
+               '- BETTER - '
+       else ' ' end as currsize, 
+   a.estd_physical_read_factor-b.estd_physical_read_factor as best_when_0
+   from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum 
 r from v\$db_cache_advice) a , 
+   (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r 
from v\$db_cache_advice) b where a.r = b.r-1");
+               if (!$rs) return false;
+               
+               /*
+               The v$db_cache_advice utility show the marginal changes in 
physical data block reads for different sizes of db_cache_size
+               */
+               $s = "<h3>Data Cache Estimate</h3>";
+               if ($rs->EOF) {
+                       $s .= "<p>Cache that is 50% of current size is still 
too big</p>";
+               } else {
+                       $s .= "Ideal size of Data Cache is when \"best_when_0\" 
changes from a positive number and becomes zero.";
+                       $s .= rs2html($rs,false,false,false,false);
+               }
+               return $s;
+       }
+       
+       /*
+               Generate html for suspicious/expensive sql
+       */
+       function tohtml(&$rs,$type)
+       {
+               $o1 = $rs->FetchField(0);
+               $o2 = $rs->FetchField(1);
+               $o3 = $rs->FetchField(2);
+               if ($rs->EOF) return '<p>None found</p>';
+               $check = '';
+               $sql = '';
+               $s = "\n\n<table border=1 
bgcolor=white><tr><td><b>".$o1->name.'</b></td><td><b>'.$o2->name.'</b></td><td><b>'.$o3->name.'</b></td></tr>';
+               while (!$rs->EOF) {
+                       if ($check != $rs->fields[0].'::'.$rs->fields[1]) {
+                               if ($check) {
+                                       $carr = explode('::',$check);
+                                       $prefix = "<a 
href=\"?$type=1&sql=".rawurlencode($sql).'&x#explain">';
+                                       $suffix = '</a>';
+                                       if (strlen($prefix)>2000) {
+                                               $prefix = '';
+                                               $suffix = '';
+                                       }
+                                       
+                                       $s .=  "\n<tr><td 
align=right>".$carr[0].'</td><td 
align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
+                               }
+                               $sql = $rs->fields[2];
+                               $check = $rs->fields[0].'::'.$rs->fields[1];    
                
+                       } else
+                               $sql .= $rs->fields[2];
+                       if (substr($sql,strlen($sql)-1) == "\0") $sql = 
substr($sql,0,strlen($sql)-1);
+                       $rs->MoveNext();
+               }
+               $rs->Close();
+               
+               $carr = explode('::',$check);
+               $prefix = "<a target=".rand()." 
href=\"?&hidem=1&$type=1&sql=".rawurlencode($sql).'&x#explain">';
+               $suffix = '</a>';
+               if (strlen($prefix)>2000) {
+                       $prefix = '';
+                       $suffix = '';
+               }
+               $s .=  "\n<tr><td align=right>".$carr[0].'</td><td 
align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
+                                       
+               return $s."</table>\n\n";
+       }
+       
+       // code thanks to Ixora. 
+       // http://www.ixora.com.au/scripts/query_opt.htm
+       // requires oracle 8.1.7 or later
+       function SuspiciousSQL($numsql=10)
+       {
+               $sql = "
+select
+  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
+  s.executions  executes,
+  p.sql_text
+from
+  ( 
+    select
+      address,
+      buffer_gets,
+      executions,
+      pct,
+      rank() over (order by buffer_gets desc)  ranking
+    from
+      ( 
+       select
+         address,
+         buffer_gets,
+         executions,
+         100 * ratio_to_report(buffer_gets) over ()  pct
+       from
+         sys.v_\$sql
+       where
+         command_type != 47 and module != 'T.O.A.D.'
+      )
+    where
+      buffer_gets > 50 * executions
+  )  s,
+  sys.v_\$sqltext  p
+where
+  s.ranking <= $numsql and
+  p.address = s.address
+order by
+  1 desc, s.address, p.piece";
+
+               global $ADODB_CACHE_MODE;
+               if (isset($_GET['expsixora']) && isset($_GET['sql'])) {
+                               $partial = empty($_GET['part']);
+                               echo "<a 
name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
+               }
+
+               if (isset($_GET['sql'])) return $this->_SuspiciousSQL($numsql);
+               
+               $s = '';
+               $s .= $this->_SuspiciousSQL($numsql);
+               $s .= '<p>';
+               
+               $save = $ADODB_CACHE_MODE;
+               $ADODB_CACHE_MODE = ADODB_FETCH_NUM;
+               if ($this->conn->fetchMode !== false) $savem = 
$this->conn->SetFetchMode(false);
+               
+               $savelog = $this->conn->LogSQL(false);
+               $rs =& $this->conn->SelectLimit($sql);
+               $this->conn->LogSQL($savelog);
+               
+               if (isset($savem)) $this->conn->SetFetchMode($savem);
+               $ADODB_CACHE_MODE = $save;
+               if ($rs) {
+                       $s .= "\n<h3>Ixora Suspicious SQL</h3>";
+                       $s .= $this->tohtml($rs,'expsixora');
+               }
+               
+               return $s;
+       }
+       
+       // code thanks to Ixora. 
+       // http://www.ixora.com.au/scripts/query_opt.htm
+       // requires oracle 8.1.7 or later
+       function ExpensiveSQL($numsql = 10)
+       {
+               $sql = "
+select
+  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
+  s.executions  executes,
+  p.sql_text
+from
+  ( 
+    select
+      address,
+      disk_reads,
+      executions,
+      pct,
+      rank() over (order by disk_reads desc)  ranking
+    from
+      (
+       select
+         address,
+         disk_reads,
+         executions,
+         100 * ratio_to_report(disk_reads) over ()  pct
+       from
+         sys.v_\$sql
+       where
+         command_type != 47 and module != 'T.O.A.D.'
+      )
+    where
+      disk_reads > 50 * executions
+  )  s,
+  sys.v_\$sqltext  p
+where
+  s.ranking <= $numsql and
+  p.address = s.address
+order by
+  1 desc, s.address, p.piece
+";
+               global $ADODB_CACHE_MODE;
+               if (isset($_GET['expeixora']) && isset($_GET['sql'])) {
+                       $partial = empty($_GET['part']);        
+                       echo "<a 
name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
+               }
+               if (isset($_GET['sql'])) {
+                        $var = $this->_ExpensiveSQL($numsql);
+                        return $var;
+               }
+               
+               $s = '';                
+               $s .= $this->_ExpensiveSQL($numsql);
+               $s .= '<p>';
+               $save = $ADODB_CACHE_MODE;
+               $ADODB_CACHE_MODE = ADODB_FETCH_NUM;
+               if ($this->conn->fetchMode !== false) $savem = 
$this->conn->SetFetchMode(false);
+               
+               $savelog = $this->conn->LogSQL(false);
+               $rs =& $this->conn->Execute($sql);
+               $this->conn->LogSQL($savelog);
+               
+               if (isset($savem)) $this->conn->SetFetchMode($savem);
+               $ADODB_CACHE_MODE = $save;
+               
+               if ($rs) {
+                       $s .= "\n<h3>Ixora Expensive SQL</h3>";
+                       $s .= $this->tohtml($rs,'expeixora');
+               }
+       
+               return $s;
+       }
+       
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/perf/perf-postgres.inc.php
diff -u phpgwapi/inc/adodb/perf/perf-postgres.inc.php:1.2 
phpgwapi/inc/adodb/perf/perf-postgres.inc.php:1.3
--- phpgwapi/inc/adodb/perf/perf-postgres.inc.php:1.2   Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/perf/perf-postgres.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,123 +1,124 @@
-<?php
-
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-       Notice that PostgreSQL has no sql query cache
-*/
-class perf_postgres extends adodb_perf{
-       
-       var $tablesSQL = 
-       "select a.relname as tablename,(a.relpages+CASE WHEN b.relpages is null 
THEN 0 ELSE b.relpages END+CASE WHEN c.relpages is null THEN 0 ELSE c.relpages 
END)*8 as size_in_K,a.relfilenode as \"OID\"  from pg_class a left join 
pg_class b
-               on b.relname = 'pg_toast_'||trim(a.relfilenode) 
-               left join pg_class c on c.relname = 
'pg_toast_'||trim(a.relfilenode)||'_index'
-               where a.relname in (select tablename from pg_tables where 
tablename not like 'pg_%')";
-       
-       var $createTableSQL = "CREATE TABLE adodb_logsql (
-                 created timestamp NOT NULL,
-                 sql0 varchar(250) NOT NULL,
-                 sql1 text NOT NULL,
-                 params text NOT NULL,
-                 tracer text NOT NULL,
-                 timer decimal(16,6) NOT NULL
-               )";     
-       
-       var $settings = array(
-       'Ratios',
-               'statistics collector' => array('RATIO',
-                       "select case when count(*)=3 then 'TRUE' else 'FALSE' 
end from pg_settings where (name='stats_block_level' or name='stats_row_level' 
or name='stats_start_collector') and setting='on' ",
-                       'Value must be TRUE to enable hit ratio statistics 
(<i>stats_start_collector</i>,<i>stats_row_level</i> and 
<i>stats_block_level</i> must be set to true in postgresql.conf)'),
-               'data cache hit ratio' => array('RATIO',
-                       "select case when blks_hit=0 then 0 else 
(1-blks_read::float/blks_hit)*100 end from pg_stat_database where 
datname='\$DATABASE'",
-                       '=WarnCacheRatio'),
-       'IO',
-               'data reads' => array('IO',
-               'select sum(heap_blks_read+toast_blks_read) from 
pg_statio_user_tables',
-               ),
-               'data writes' => array('IO',
-               'select sum(n_tup_ins/4.0+n_tup_upd/8.0+n_tup_del/4.0)/16 from 
pg_stat_user_tables',
-               'Count of inserts/updates/deletes * coef'),
-
-       'Data Cache',
-               'data cache buffers' => array('DATAC',
-                       "select setting from pg_settings where 
name='shared_buffers'",
-                       'Number of cache buffers. <a 
href=http://www.varlena.com/GeneralBits/Tidbits/perf.html#basic>Tuning</a>'),
-               'cache blocksize' => array('DATAC',
-                       'select 8192',
-                       '(estimate)' ),
-               'data cache size' => array( 'DATAC',
-               "select setting::integer*8192 from pg_settings where 
name='shared_buffers'",
-                       '' ),
-               'operating system cache size' => array( 'DATA',
-               "select setting::integer*8192 from pg_settings where 
name='effective_cache_size'",
-                       '(effective cache size)' ),
-       'Memory Usage',
-               'sort buffer size' => array('CACHE',
-                       "select setting::integer*1024 from pg_settings where 
name='sort_mem'",
-                       'Size of sort buffer (per query)' ),
-       'Connections',
-               'current connections' => array('SESS',
-                       'select count(*) from pg_stat_activity',
-                       ''),
-               'max connections' => array('SESS',
-                       "select setting from pg_settings where 
name='max_connections'",
-                       ''),
-       'Parameters',
-               'rollback buffers' => array('COST',
-                       "select setting from pg_settings where 
name='wal_buffers'",
-                       'WAL buffers'),
-               'random page cost' => array('COST',
-                       "select setting from pg_settings where 
name='random_page_cost'",
-                       'Cost of doing a seek (default=4). See <a 
href=http://www.varlena.com/GeneralBits/Tidbits/perf.html#less>random_page_cost</a>'),
-               false
-       );
-       
-       function perf_postgres(&$conn)
-       {
-               $this->conn =& $conn;
-       }
-       
-       function Explain($sql,$partial=false)
-       {
-               $save = $this->conn->LogSQL(false);
-               
-               if ($partial) {
-                       $sqlq = $this->conn->qstr($sql.'%');
-                       $arr = $this->conn->GetArray("select distinct distinct 
sql1 from adodb_logsql where sql1 like $sqlq");
-                       if ($arr) {
-                               foreach($arr as $row) {
-                                       $sql = reset($row);
-                                       if (crc32($sql) == $partial) break;
-                               }
-                       }
-               }
-               $sql = str_replace('?',"''",$sql);
-               $s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
-               $rs = $this->conn->Execute('EXPLAIN '.$sql);
-               $this->conn->LogSQL($save);
-               $s .= '<pre>';
-               if ($rs)
-                       while (!$rs->EOF) {
-                               $s .= reset($rs->fields)."\n";
-                               $rs->MoveNext();
-                       }
-               $s .= '</pre>';
-               $s .= $this->Tracer($sql,$partial);
-               return $s;
-       }
-}
+<?php
+
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. See License.txt. 
+  Set tabs to 4 for best viewing.
+  
+  Latest version is available at http://adodb.sourceforge.net
+  
+  Library for basic performance monitoring and tuning 
+  
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+/*
+       Notice that PostgreSQL has no sql query cache
+*/
+class perf_postgres extends adodb_perf{
+       
+       var $tablesSQL = 
+       "select a.relname as tablename,(a.relpages+CASE WHEN b.relpages is null 
THEN 0 ELSE b.relpages END+CASE WHEN c.relpages is null THEN 0 ELSE c.relpages 
END)*8 as size_in_K,a.relfilenode as \"OID\"  from pg_class a left join 
pg_class b
+               on b.relname = 'pg_toast_'||trim(a.relfilenode) 
+               left join pg_class c on c.relname = 
'pg_toast_'||trim(a.relfilenode)||'_index'
+               where a.relname in (select tablename from pg_tables where 
tablename not like 'pg_%')";
+       
+       var $createTableSQL = "CREATE TABLE adodb_logsql (
+                 created timestamp NOT NULL,
+                 sql0 varchar(250) NOT NULL,
+                 sql1 text NOT NULL,
+                 params text NOT NULL,
+                 tracer text NOT NULL,
+                 timer decimal(16,6) NOT NULL
+               )";     
+       
+       var $settings = array(
+       'Ratios',
+               'statistics collector' => array('RATIO',
+                       "select case when count(*)=3 then 'TRUE' else 'FALSE' 
end from pg_settings where (name='stats_block_level' or name='stats_row_level' 
or name='stats_start_collector') and setting='on' ",
+                       'Value must be TRUE to enable hit ratio statistics 
(<i>stats_start_collector</i>,<i>stats_row_level</i> and 
<i>stats_block_level</i> must be set to true in postgresql.conf)'),
+               'data cache hit ratio' => array('RATIO',
+                       "select case when blks_hit=0 then 0 else round( 
((1-blks_read::float/blks_hit)*100)::numeric, 2) end from pg_stat_database 
where datname='\$DATABASE'",
+                       '=WarnCacheRatio'),
+       'IO',
+               'data reads' => array('IO',
+               'select sum(heap_blks_read+toast_blks_read) from 
pg_statio_user_tables',
+               ),
+               'data writes' => array('IO',
+               'select 
round((sum(n_tup_ins/4.0+n_tup_upd/8.0+n_tup_del/4.0)/16)::numeric,2) from 
pg_stat_user_tables',
+               'Count of inserts/updates/deletes * coef'),
+
+       'Data Cache',
+               'data cache buffers' => array('DATAC',
+                       "select setting from pg_settings where 
name='shared_buffers'",
+                       'Number of cache buffers. <a 
href=http://www.varlena.com/GeneralBits/Tidbits/perf.html#basic>Tuning</a>'),
+               'cache blocksize' => array('DATAC',
+                       'select 8192',
+                       '(estimate)' ),
+               'data cache size' => array( 'DATAC',
+               "select setting::integer*8192 from pg_settings where 
name='shared_buffers'",
+                       '' ),
+               'operating system cache size' => array( 'DATA',
+               "select setting::integer*8192 from pg_settings where 
name='effective_cache_size'",
+                       '(effective cache size)' ),
+       'Memory Usage',
+       # Postgres 7.5 changelog: Rename server parameters SortMem and 
VacuumMem to work_mem and maintenance_work_mem;
+               'sort/work buffer size' => array('CACHE',
+                       "select setting::integer*1024 from pg_settings where 
name='sort_mem' or name = 'work_mem' order by name",
+                       'Size of sort buffer (per query)' ),
+       'Connections',
+               'current connections' => array('SESS',
+                       'select count(*) from pg_stat_activity',
+                       ''),
+               'max connections' => array('SESS',
+                       "select setting from pg_settings where 
name='max_connections'",
+                       ''),
+       'Parameters',
+               'rollback buffers' => array('COST',
+                       "select setting from pg_settings where 
name='wal_buffers'",
+                       'WAL buffers'),
+               'random page cost' => array('COST',
+                       "select setting from pg_settings where 
name='random_page_cost'",
+                       'Cost of doing a seek (default=4). See <a 
href=http://www.varlena.com/GeneralBits/Tidbits/perf.html#less>random_page_cost</a>'),
+               false
+       );
+       
+       function perf_postgres(&$conn)
+       {
+               $this->conn =& $conn;
+       }
+       
+       function Explain($sql,$partial=false)
+       {
+               $save = $this->conn->LogSQL(false);
+               
+               if ($partial) {
+                       $sqlq = $this->conn->qstr($sql.'%');
+                       $arr = $this->conn->GetArray("select distinct distinct 
sql1 from adodb_logsql where sql1 like $sqlq");
+                       if ($arr) {
+                               foreach($arr as $row) {
+                                       $sql = reset($row);
+                                       if (crc32($sql) == $partial) break;
+                               }
+                       }
+               }
+               $sql = str_replace('?',"''",$sql);
+               $s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
+               $rs = $this->conn->Execute('EXPLAIN '.$sql);
+               $this->conn->LogSQL($save);
+               $s .= '<pre>';
+               if ($rs)
+                       while (!$rs->EOF) {
+                               $s .= reset($rs->fields)."\n";
+                               $rs->MoveNext();
+                       }
+               $s .= '</pre>';
+               $s .= $this->Tracer($sql,$partial);
+               return $s;
+       }
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/pivottable.inc.php
diff -u phpgwapi/inc/adodb/pivottable.inc.php:1.2 
phpgwapi/inc/adodb/pivottable.inc.php:1.3
--- phpgwapi/inc/adodb/pivottable.inc.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/pivottable.inc.php       Tue Feb 21 13:47:42 2006
@@ -1,164 +1,185 @@
-<?php
-/** 
- * @version V4.50 6 July 2004 (c) 2000-2004 John Lim (address@hidden). 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 PHP4.01pl2 or later because it uses include_once
-*/
-
-/*
- * Concept from address@hidden 
- *
- * @param db           Adodb database connection
- * @param tables       List of tables to join
- * @rowfields          List of fields to display on each row
- * @colfield           Pivot field to slice and display in columns, if we want 
to calculate
- *                                             ranges, we pass in an array 
(see example2)
- * @where                      Where clause. Optional.
- * @aggfield           This is the field to sum. Optional. 
- *                                             Since 2.3.1, if you can use 
your own aggregate function 
- *                                             instead of SUM, eg. $sumfield = 
'AVG(fieldname)';
- * @sumlabel           Prefix to display in sum columns. Optional.
- * @aggfn                      Aggregate function to use (could be AVG, SUM, 
COUNT)
- * @showcount          Show count of records
- *
- * @returns                    Sql generated
- */
- 
- function PivotTableSQL($db,$tables,$rowfields,$colfield, $where=false,
-       $aggfield = false,$sumlabel='Sum ',$aggfn ='SUM', $showcount = true)
- {
-       if ($aggfield) $hidecnt = true;
-       else $hidecnt = false;
-       
-       
-       //$hidecnt = false;
-       
-       if ($where) $where = "\nWHERE $where";
-       if (!is_array($colfield)) $colarr = $db->GetCol("select distinct 
$colfield from $tables $where order by 1");
-       if (!$aggfield) $hidecnt = false;
-       
-       $sel = "$rowfields, ";
-       if (is_array($colfield)) {
-               foreach ($colfield as $k => $v) {
-                       if (!$hidecnt) $sel .= "\n\t$aggfn(CASE WHEN $v THEN 1 
ELSE 0 END) AS \"$k\", ";
-                       if ($aggfield)
-                               $sel .= "\n\t$aggfn(CASE WHEN $v THEN $aggfield 
ELSE 0 END) AS \"$sumlabel$k\", ";
-               } 
-       } else {
-               foreach ($colarr as $v) {
-                       if (!is_numeric($v)) $vq = $db->qstr($v);
-                       else $vq = $v;
-                       if (strlen($v) == 0     ) $v = 'null';
-                       if (!$hidecnt) $sel .= "\n\t$aggfn(CASE WHEN 
$colfield=$vq THEN 1 ELSE 0 END) AS \"$v\", ";
-                       if ($aggfield) {
-                               if ($hidecnt) $label = $v;
-                               else $label = "{$v}_$aggfield";
-                               $sel .= "\n\t$aggfn(CASE WHEN $colfield=$vq 
THEN $aggfield ELSE 0 END) AS \"$label\", ";
-                       }
-               }
-       }
-       if ($aggfield && $aggfield != '1'){
-               $agg = "$aggfn($aggfield)";
-               $sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";         
-       }
-       
-       if ($showcount)
-               $sel .= "\n\tSUM(1) as Total";
-       else
-               $sel = substr($sel,0,strlen($sel)-2);
-       
-       $sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
-       return $sql;
- }
-
-/* EXAMPLES USING MS NORTHWIND DATABASE */
-if (0) {
-
-# example1
-#
-# Query the main "product" table
-# Set the rows to CompanyName and QuantityPerUnit
-# and the columns to the Categories
-# and define the joins to link to lookup tables 
-# "categories" and "suppliers"
-#
-
- $sql = PivotTableSQL(
-       $gDB,                                                                   
                # adodb connection
-       'products p ,categories c ,suppliers s',                # tables
-       'CompanyName,QuantityPerUnit',                                  # row 
fields
-       'CategoryName',                                                         
        # column fields 
-       'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # 
joins/where
-);
- print "<pre>$sql";
- $rs = $gDB->Execute($sql);
- rs2html($rs);
- 
-/*
-Generated SQL:
-
-SELECT CompanyName,QuantityPerUnit, 
-       SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS 
"Beverages", 
-       SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS 
"Condiments", 
-       SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS 
"Confections", 
-       SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS 
"Dairy Products", 
-       SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS 
"Grains/Cereals", 
-       SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS 
"Meat/Poultry", 
-       SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
-       SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
-       SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID 
and s.SupplierID= p.SupplierID 
-GROUP BY CompanyName,QuantityPerUnit
-*/
-//=====================================================================
-
-# example2
-#
-# Query the main "product" table
-# Set the rows to CompanyName and QuantityPerUnit
-# and the columns to the UnitsInStock for different ranges
-# and define the joins to link to lookup tables 
-# "categories" and "suppliers"
-#
- $sql = PivotTableSQL(
-       $gDB,                                                                   
        # adodb connection
-       'products p ,categories c ,suppliers s',        # tables
-       'CompanyName,QuantityPerUnit',                          # row fields
-                                                                               
                # column ranges
-array(                                                                         
-' 0 ' => 'UnitsInStock <= 0',
-"1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
-"6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
-"11 to 15"  => '10 < UnitsInStock and UnitsInStock <= 15',
-"16+" =>'15 < UnitsInStock'
-),
-       ' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # 
joins/where
-       'UnitsInStock',                                                         
# sum this field
-       'Sum'                                                                   
        # sum label prefix
-);
- print "<pre>$sql";
- $rs = $gDB->Execute($sql);
- rs2html($rs);
- /*
- Generated SQL:
- 
-SELECT CompanyName,QuantityPerUnit, 
-       SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  
0 ", 
-       SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock 
ELSE 0 END) AS "Sum 1 to 5", 
-       SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock 
ELSE 0 END) AS "Sum 6 to 10", 
-       SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN 
UnitsInStock ELSE 0 END) AS "Sum 11 to 15", 
-       SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 
16+",
-       SUM(UnitsInStock) AS "Sum UnitsInStock", 
-       SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID 
and s.SupplierID= p.SupplierID 
-GROUP BY CompanyName,QuantityPerUnit
- */
-}
+<?php
+/** 
+ * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). 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 PHP4.01pl2 or later because it uses include_once
+*/
+
+/*
+ * Concept from address@hidden 
+ *
+ * @param db           Adodb database connection
+ * @param tables       List of tables to join
+ * @rowfields          List of fields to display on each row
+ * @colfield           Pivot field to slice and display in columns, if we want 
to calculate
+ *                                             ranges, we pass in an array 
(see example2)
+ * @where                      Where clause. Optional.
+ * @aggfield           This is the field to sum. Optional. 
+ *                                             Since 2.3.1, if you can use 
your own aggregate function 
+ *                                             instead of SUM, eg. $aggfield = 
'fieldname'; $aggfn = 'AVG';
+ * @sumlabel           Prefix to display in sum columns. Optional.
+ * @aggfn                      Aggregate function to use (could be AVG, SUM, 
COUNT)
+ * @showcount          Show count of records
+ *
+ * @returns                    Sql generated
+ */
+ 
+ function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
+       $aggfield = false,$sumlabel='Sum ',$aggfn ='SUM', $showcount = true)
+ {
+       if ($aggfield) $hidecnt = true;
+       else $hidecnt = false;
+       
+       $iif = strpos($db->databaseType,'access') !== false; 
+               // note - vfp still doesn' work even with IIF enabled || 
$db->databaseType == 'vfp';
+       
+       //$hidecnt = false;
+       
+       if ($where) $where = "\nWHERE $where";
+       if (!is_array($colfield)) $colarr = $db->GetCol("select distinct 
$colfield from $tables $where order by 1");
+       if (!$aggfield) $hidecnt = false;
+       
+       $sel = "$rowfields, ";
+       if (is_array($colfield)) {
+               foreach ($colfield as $k => $v) {
+                       $k = trim($k);
+                       if (!$hidecnt) {
+                               $sel .= $iif ? 
+                                       "\n\t$aggfn(IIF($v,1,0)) AS \"$k\", "
+                                       :
+                                       "\n\t$aggfn(CASE WHEN $v THEN 1 ELSE 0 
END) AS \"$k\", ";
+                       }
+                       if ($aggfield) {
+                               $sel .= $iif ?
+                                       "\n\t$aggfn(IIF($v,$aggfield,0)) AS 
\"$sumlabel$k\", "
+                                       :
+                                       "\n\t$aggfn(CASE WHEN $v THEN $aggfield 
ELSE 0 END) AS \"$sumlabel$k\", ";
+                       }
+               } 
+       } else {
+               foreach ($colarr as $v) {
+                       if (!is_numeric($v)) $vq = $db->qstr($v);
+                       else $vq = $v;
+                       $v = trim($v);
+                       if (strlen($v) == 0     ) $v = 'null';
+                       if (!$hidecnt) {
+                               $sel .= $iif ?
+                                       "\n\t$aggfn(IIF($colfield=$vq,1,0)) AS 
\"$v\", "
+                                       :
+                                       "\n\t$aggfn(CASE WHEN $colfield=$vq 
THEN 1 ELSE 0 END) AS \"$v\", ";
+                       }
+                       if ($aggfield) {
+                               if ($hidecnt) $label = $v;
+                               else $label = "{$v}_$aggfield";
+                               $sel .= $iif ?
+                                       
"\n\t$aggfn(IIF($colfield=$vq,$aggfield,0)) AS \"$label\", "
+                                       :
+                                       "\n\t$aggfn(CASE WHEN $colfield=$vq 
THEN $aggfield ELSE 0 END) AS \"$label\", ";
+                       }
+               }
+       }
+       if ($aggfield && $aggfield != '1'){
+               $agg = "$aggfn($aggfield)";
+               $sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";         
+       }
+       
+       if ($showcount)
+               $sel .= "\n\tSUM(1) as Total";
+       else
+               $sel = substr($sel,0,strlen($sel)-2);
+       
+       $sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
+       return $sql;
+ }
+
+/* EXAMPLES USING MS NORTHWIND DATABASE */
+if (0) {
+
+# example1
+#
+# Query the main "product" table
+# Set the rows to CompanyName and QuantityPerUnit
+# and the columns to the Categories
+# and define the joins to link to lookup tables 
+# "categories" and "suppliers"
+#
+
+ $sql = PivotTableSQL(
+       $gDB,                                                                   
                # adodb connection
+       'products p ,categories c ,suppliers s',                # tables
+       'CompanyName,QuantityPerUnit',                                  # row 
fields
+       'CategoryName',                                                         
        # column fields 
+       'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # 
joins/where
+);
+ print "<pre>$sql";
+ $rs = $gDB->Execute($sql);
+ rs2html($rs);
+ 
+/*
+Generated SQL:
+
+SELECT CompanyName,QuantityPerUnit, 
+       SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS 
"Beverages", 
+       SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS 
"Condiments", 
+       SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS 
"Confections", 
+       SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS 
"Dairy Products", 
+       SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS 
"Grains/Cereals", 
+       SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS 
"Meat/Poultry", 
+       SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
+       SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
+       SUM(1) as Total 
+FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID 
and s.SupplierID= p.SupplierID 
+GROUP BY CompanyName,QuantityPerUnit
+*/
+//=====================================================================
+
+# example2
+#
+# Query the main "product" table
+# Set the rows to CompanyName and QuantityPerUnit
+# and the columns to the UnitsInStock for diiferent ranges
+# and define the joins to link to lookup tables 
+# "categories" and "suppliers"
+#
+ $sql = PivotTableSQL(
+       $gDB,                                                                   
        # adodb connection
+       'products p ,categories c ,suppliers s',        # tables
+       'CompanyName,QuantityPerUnit',                          # row fields
+                                                                               
                # column ranges
+array(                                                                         
+' 0 ' => 'UnitsInStock <= 0',
+"1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
+"6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
+"11 to 15"  => '10 < UnitsInStock and UnitsInStock <= 15',
+"16+" =>'15 < UnitsInStock'
+),
+       ' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # 
joins/where
+       'UnitsInStock',                                                         
# sum this field
+       'Sum'                                                                   
        # sum label prefix
+);
+ print "<pre>$sql";
+ $rs = $gDB->Execute($sql);
+ rs2html($rs);
+ /*
+ Generated SQL:
+ 
+SELECT CompanyName,QuantityPerUnit, 
+       SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  
0 ", 
+       SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock 
ELSE 0 END) AS "Sum 1 to 5", 
+       SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock 
ELSE 0 END) AS "Sum 6 to 10", 
+       SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN 
UnitsInStock ELSE 0 END) AS "Sum 11 to 15", 
+       SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 
16+",
+       SUM(UnitsInStock) AS "Sum UnitsInStock", 
+       SUM(1) as Total 
+FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID 
and s.SupplierID= p.SupplierID 
+GROUP BY CompanyName,QuantityPerUnit
+ */
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/rsfilter.inc.php
diff -u phpgwapi/inc/adodb/rsfilter.inc.php:1.2 
phpgwapi/inc/adodb/rsfilter.inc.php:1.3
--- phpgwapi/inc/adodb/rsfilter.inc.php:1.2     Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/rsfilter.inc.php Tue Feb 21 13:47:42 2006
@@ -1,54 +1,61 @@
-<?php
-/** 
- * @version V4.50 6 July 2004 (c) 2000-2004 John Lim (address@hidden). 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 PHP4.01pl2 or later because it uses include_once
-*/
-
-/*
-       Filter all fields and all rows in a recordset and returns the 
-       processed recordset. We scroll to the beginning of the new recordset
-       after processing.
-       
-       We pass a recordset and function name to RSFilter($rs,'rowfunc');
-       and the function will be called multiple times, once
-       for each row in the recordset. The function will be passed
-       an array containing one row repeatedly.
-       
-       Example: 
-       
-       // ucwords() every element in the recordset
-       function do_ucwords(&$arr,$rs)
-       {
-               foreach($arr as $k => $v) {
-                       $arr[$k] = ucwords($v);
-               }
-       }
-       $rs = RSFilter($rs,'do_ucwords');
- */
-function &RSFilter($rs,$fn)
-{
-       if ($rs->databaseType != 'array') {
-               if (!$rs->connection) return false;
-               
-               $rs = &$rs->connection->_rs2rs($rs);
-       }
-       $rows = $rs->RecordCount();
-       for ($i=0; $i < $rows; $i++) {
-               $fn($rs->_array[$i],$rs);
-       }
-       if (!$rs->EOF) {
-               $rs->_currentRow = 0;
-               $rs->fields = $rs->_array[0];
-       }
-       
-       return $rs;
-}
+<?php
+/** 
+ * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). 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 PHP4.01pl2 or later because it uses include_once
+*/
+
+/*
+       Filter all fields and all rows in a recordset and returns the 
+       processed recordset. We scroll to the beginning of the new recordset
+       after processing.
+       
+       We pass a recordset and function name to RSFilter($rs,'rowfunc');
+       and the function will be called multiple times, once
+       for each row in the recordset. The function will be passed
+       an array containing one row repeatedly.
+       
+       Example: 
+       
+       // ucwords() every element in the recordset
+       function do_ucwords(&$arr,$rs)
+       {
+               foreach($arr as $k => $v) {
+                       $arr[$k] = ucwords($v);
+               }
+       }
+       $rs = RSFilter($rs,'do_ucwords');
+ */
+function &RSFilter($rs,$fn)
+{
+       if ($rs->databaseType != 'array') {
+               if (!$rs->connection) return false;
+               
+               $rs = &$rs->connection->_rs2rs($rs);
+       }
+       $rows = $rs->RecordCount();
+       for ($i=0; $i < $rows; $i++) {
+               if (is_array ($fn)) {
+               $obj = $fn[0];
+               $method = $fn[1];
+               $obj->$method ($rs->_array[$i],$rs);
+      } else {
+                       $fn($rs->_array[$i],$rs);
+      }
+         
+       }
+       if (!$rs->EOF) {
+               $rs->_currentRow = 0;
+               $rs->fields = $rs->_array[0];
+       }
+       
+       return $rs;
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/server.php
diff -u phpgwapi/inc/adodb/server.php:1.2 phpgwapi/inc/adodb/server.php:1.3
--- phpgwapi/inc/adodb/server.php:1.2   Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/server.php       Tue Feb 21 13:47:42 2006
@@ -1,98 +1,100 @@
-<?php
-
-/** 
- * @version V4.50 6 July 2004 (c) 2000-2004 John Lim (address@hidden). 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
- * fetch = $ADODB_FETCH_MODE
- * 
- * 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 = 'localhost'; // DSN for odbc
-$uid = 'root';
-$pwd = '';
-$database = 'test';
-
-/*============================ DO NOT MODIFY BELOW HERE 
=================================*/
-// $sep must match csv2rs() in adodb.inc.php
-$sep = ' :::: ';
-
-include('./adodb.inc.php');
-include_once(ADODB_DIR.'/adodb-csvlib.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
-
-
-$remote = $HTTP_SERVER_VARS["REMOTE_ADDR"]; 
- 
-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['fetch']))
-       $ADODB_FETCH_MODE = $HTTP_GET_VARS['fetch'];
-       
-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;
-       echo _rs2serialize($rs,$conn,$sql);
-       $rs->Close();
-} else
-       err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
-
+<?php
+
+/** 
+ * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). 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
+ * fetch = $ADODB_FETCH_MODE
+ * 
+ * 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 = '127.0.0.1';
+
+/*
+ * Connection parameters
+ */
+$driver = 'mysql';
+$host = 'localhost'; // DSN for odbc
+$uid = 'root';
+$pwd = 'garbase-it-is';
+$database = 'test';
+
+/*============================ DO NOT MODIFY BELOW HERE 
=================================*/
+// $sep must match csv2rs() in adodb.inc.php
+$sep = ' :::: ';
+
+include('./adodb.inc.php');
+include_once(ADODB_DIR.'/adodb-csvlib.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
+
+
+$remote = $_SERVER["REMOTE_ADDR"]; 
+ 
+
+if (!empty($ACCEPTIP))
+ if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
+       err("Unauthorised client: '$remote'");
+       
+       
+if (empty($_REQUEST['sql'])) err('No SQL');
+
+
+$conn = &ADONewConnection($driver);
+
+if (!$conn->Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . 
$conn->ErrorMsg());
+$sql = undomq($_REQUEST['sql']);
+
+if (isset($_REQUEST['fetch']))
+       $ADODB_FETCH_MODE = $_REQUEST['fetch'];
+       
+if (isset($_REQUEST['nrows'])) {
+       $nrows = $_REQUEST['nrows'];
+       $offset = isset($_REQUEST['offset']) ? $_REQUEST['offset'] : -1;
+       $rs = $conn->SelectLimit($sql,$nrows,$offset);
+} else 
+       $rs = $conn->Execute($sql);
+if ($rs){ 
+       //$rs->timeToLive = 1;
+       echo _rs2serialize($rs,$conn,$sql);
+       $rs->Close();
+} else
+       err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/session/adodb-compress-bzip2.php
diff -u phpgwapi/inc/adodb/session/adodb-compress-bzip2.php:1.2 
phpgwapi/inc/adodb/session/adodb-compress-bzip2.php:1.3
--- phpgwapi/inc/adodb/session/adodb-compress-bzip2.php:1.2     Thu Dec 30 
06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-compress-bzip2.php Tue Feb 21 13:47:42 2006
@@ -1,118 +1,118 @@
-<?php
-
-/*
-V4.01 23 Oct 2003  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-         Contributed by Ross Smith (address@hidden). 
-  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.
-
-*/
-
-if (!function_exists('bzcompress')) {
-       trigger_error('bzip2 functions are not available', E_USER_ERROR);
-       return 0;
-}
-
-/*
-*/
-class ADODB_Compress_Bzip2 {
-       /**
-        */
-       var $_block_size = null;
-
-       /**
-        */
-       var $_work_level = null;
-
-       /**
-        */
-       var $_min_length = 1;
-
-       /**
-        */
-       function getBlockSize() {
-               return $this->_block_size;
-       }
-
-       /**
-        */
-       function setBlockSize($block_size) {
-               assert('$block_size >= 1');
-               assert('$block_size <= 9');
-               $this->_block_size = (int) $block_size;
-       }
-
-       /**
-        */
-       function getWorkLevel() {
-               return $this->_work_level;
-       }
-
-       /**
-        */
-       function setWorkLevel($work_level) {
-               assert('$work_level >= 0');
-               assert('$work_level <= 250');
-               $this->_work_level = (int) $work_level;
-       }
-
-       /**
-        */
-       function getMinLength() {
-               return $this->_min_length;
-       }
-
-       /**
-        */
-       function setMinLength($min_length) {
-               assert('$min_length >= 0');
-               $this->_min_length = (int) $min_length;
-       }
-
-       /**
-        */
-       function ADODB_Compress_Bzip2($block_size = null, $work_level = null, 
$min_length = null) {
-               if (!is_null($block_size)) {
-                       $this->setBlockSize($block_size);
-               }
-
-               if (!is_null($work_level)) {
-                       $this->setWorkLevel($work_level);
-               }
-
-               if (!is_null($min_length)) {
-                       $this->setMinLength($min_length);
-               }
-       }
-
-       /**
-        */
-       function write($data, $key) {
-               if (strlen($data) < $this->_min_length) {
-                       return $data;
-               }
-
-               if (!is_null($this->_block_size)) {
-                       if (!is_null($this->_work_level)) {
-                               return bzcompress($data, $this->_block_size, 
$this->_work_level);
-                       } else {
-                               return bzcompress($data, $this->_block_size);
-                       }
-               }
-
-               return bzcompress($data);
-       }
-
-       /**
-        */
-       function read($data, $key) {
-               return $data ? bzdecompress($data) : $data;
-       }
-
-}
-
-return 1;
-
-?>
+<?php
+
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+         Contributed by Ross Smith (address@hidden). 
+  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.
+
+*/
+
+if (!function_exists('bzcompress')) {
+       trigger_error('bzip2 functions are not available', E_USER_ERROR);
+       return 0;
+}
+
+/*
+*/
+class ADODB_Compress_Bzip2 {
+       /**
+        */
+       var $_block_size = null;
+
+       /**
+        */
+       var $_work_level = null;
+
+       /**
+        */
+       var $_min_length = 1;
+
+       /**
+        */
+       function getBlockSize() {
+               return $this->_block_size;
+       }
+
+       /**
+        */
+       function setBlockSize($block_size) {
+               assert('$block_size >= 1');
+               assert('$block_size <= 9');
+               $this->_block_size = (int) $block_size;
+       }
+
+       /**
+        */
+       function getWorkLevel() {
+               return $this->_work_level;
+       }
+
+       /**
+        */
+       function setWorkLevel($work_level) {
+               assert('$work_level >= 0');
+               assert('$work_level <= 250');
+               $this->_work_level = (int) $work_level;
+       }
+
+       /**
+        */
+       function getMinLength() {
+               return $this->_min_length;
+       }
+
+       /**
+        */
+       function setMinLength($min_length) {
+               assert('$min_length >= 0');
+               $this->_min_length = (int) $min_length;
+       }
+
+       /**
+        */
+       function ADODB_Compress_Bzip2($block_size = null, $work_level = null, 
$min_length = null) {
+               if (!is_null($block_size)) {
+                       $this->setBlockSize($block_size);
+               }
+
+               if (!is_null($work_level)) {
+                       $this->setWorkLevel($work_level);
+               }
+
+               if (!is_null($min_length)) {
+                       $this->setMinLength($min_length);
+               }
+       }
+
+       /**
+        */
+       function write($data, $key) {
+               if (strlen($data) < $this->_min_length) {
+                       return $data;
+               }
+
+               if (!is_null($this->_block_size)) {
+                       if (!is_null($this->_work_level)) {
+                               return bzcompress($data, $this->_block_size, 
$this->_work_level);
+                       } else {
+                               return bzcompress($data, $this->_block_size);
+                       }
+               }
+
+               return bzcompress($data);
+       }
+
+       /**
+        */
+       function read($data, $key) {
+               return $data ? bzdecompress($data) : $data;
+       }
+
+}
+
+return 1;
+
+?>
Index: phpgwapi/inc/adodb/session/adodb-compress-gzip.php
diff -u phpgwapi/inc/adodb/session/adodb-compress-gzip.php:1.2 
phpgwapi/inc/adodb/session/adodb-compress-gzip.php:1.3
--- phpgwapi/inc/adodb/session/adodb-compress-gzip.php:1.2      Thu Dec 30 
06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-compress-gzip.php  Tue Feb 21 13:47:42 2006
@@ -1,93 +1,93 @@
-<?php
-
-
-/*
-V4.01 23 Oct 2003  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-         Contributed by Ross Smith (address@hidden). 
-  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.
-
-*/
-
-if (!function_exists('gzcompress')) {
-       trigger_error('gzip functions are not available', E_USER_ERROR);
-       return 0;
-}
-
-/*
-*/
-class ADODB_Compress_Gzip {
-       /**
-        */
-       var $_level = null;
-
-       /**
-        */
-       var $_min_length = 1;
-
-       /**
-        */
-       function getLevel() {
-               return $this->_level;
-       }
-
-       /**
-        */
-       function setLevel($level) {
-               assert('$level >= 0');
-               assert('$level <= 9');
-               $this->_level = (int) $level;
-       }
-
-       /**
-        */
-       function getMinLength() {
-               return $this->_min_length;
-       }
-
-       /**
-        */
-       function setMinLength($min_length) {
-               assert('$min_length >= 0');
-               $this->_min_length = (int) $min_length;
-       }
-
-       /**
-        */
-       function ADODB_Compress_Gzip($level = null, $min_length = null) {
-               if (!is_null($level)) {
-                       $this->setLevel($level);
-               }
-
-               if (!is_null($min_length)) {
-                       $this->setMinLength($min_length);
-               }
-       }
-
-       /**
-        */
-       function write($data, $key) {
-               if (strlen($data) < $this->_min_length) {
-                       return $data;
-               }
-
-               if (!is_null($this->_level)) {
-                       return gzcompress($data, $this->_level);
-               } else {
-                       return gzcompress($data);
-               }
-       }
-
-       /**
-        */
-       function read($data, $key) {
-               return $data ? gzuncompress($data) : $data;
-       }
-
-}
-
-return 1;
-
+<?php
+
+
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+         Contributed by Ross Smith (address@hidden). 
+  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.
+
+*/
+
+if (!function_exists('gzcompress')) {
+       trigger_error('gzip functions are not available', E_USER_ERROR);
+       return 0;
+}
+
+/*
+*/
+class ADODB_Compress_Gzip {
+       /**
+        */
+       var $_level = null;
+
+       /**
+        */
+       var $_min_length = 1;
+
+       /**
+        */
+       function getLevel() {
+               return $this->_level;
+       }
+
+       /**
+        */
+       function setLevel($level) {
+               assert('$level >= 0');
+               assert('$level <= 9');
+               $this->_level = (int) $level;
+       }
+
+       /**
+        */
+       function getMinLength() {
+               return $this->_min_length;
+       }
+
+       /**
+        */
+       function setMinLength($min_length) {
+               assert('$min_length >= 0');
+               $this->_min_length = (int) $min_length;
+       }
+
+       /**
+        */
+       function ADODB_Compress_Gzip($level = null, $min_length = null) {
+               if (!is_null($level)) {
+                       $this->setLevel($level);
+               }
+
+               if (!is_null($min_length)) {
+                       $this->setMinLength($min_length);
+               }
+       }
+
+       /**
+        */
+       function write($data, $key) {
+               if (strlen($data) < $this->_min_length) {
+                       return $data;
+               }
+
+               if (!is_null($this->_level)) {
+                       return gzcompress($data, $this->_level);
+               } else {
+                       return gzcompress($data);
+               }
+       }
+
+       /**
+        */
+       function read($data, $key) {
+               return $data ? gzuncompress($data) : $data;
+       }
+
+}
+
+return 1;
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/session/adodb-cryptsession.php
diff -u phpgwapi/inc/adodb/session/adodb-cryptsession.php:1.2 
phpgwapi/inc/adodb/session/adodb-cryptsession.php:1.3
--- phpgwapi/inc/adodb/session/adodb-cryptsession.php:1.2       Thu Dec 30 
06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-cryptsession.php   Tue Feb 21 13:47:42 2006
@@ -1,24 +1,24 @@
-<?php
-
-
-/*
-V4.01 23 Oct 2003  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-         Contributed by Ross Smith (address@hidden). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-         Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
-
-require_once dirname(__FILE__) . '/adodb-session.php';
-require_once  ADODB_SESSION . '/adodb-encrypt-md5.php';
-
-ADODB_Session::filter(new ADODB_Encrypt_MD5());
-
+<?php
+
+
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+         Contributed by Ross Smith (address@hidden). 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
+         Set tabs to 4 for best viewing.
+*/
+
+/*
+
+This file is provided for backwards compatibility purposes
+
+*/
+
+require_once dirname(__FILE__) . '/adodb-session.php';
+require_once  ADODB_SESSION . '/adodb-encrypt-md5.php';
+
+ADODB_Session::filter(new ADODB_Encrypt_MD5());
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php
diff -u phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php:1.2 
phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php:1.3
--- phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php:1.2     Thu Dec 30 
06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php Tue Feb 21 13:47:42 2006
@@ -1,109 +1,109 @@
-<?php
-
-
-/*
-V4.01 23 Oct 2003  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-         Contributed by Ross Smith (address@hidden). 
-  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.
-
-*/
-
-if (!function_exists('mcrypt_encrypt')) {
-       trigger_error('Mcrypt functions are not available', E_USER_ERROR);
-       return 0;
-}
-
-/**
- */
-class ADODB_Encrypt_MCrypt {
-       /**
-        */
-       var $_cipher;
-
-       /**
-        */
-       var $_mode;
-
-       /**
-        */
-       var $_source;
-
-       /**
-        */
-       function getCipher() {
-               return $this->_cipher;
-       }
-
-       /**
-        */
-       function setCipher($cipher) {
-               $this->_cipher = $cipher;
-       }
-
-       /**
-        */
-       function getMode() {
-               return $this->_mode;
-       }
-
-       /**
-        */
-       function setMode($mode) {
-               $this->_mode = $mode;
-       }
-
-       /**
-        */
-       function getSource() {
-               return $this->_source;
-       }
-
-       /**
-        */
-       function setSource($source) {
-               $this->_source = $source;
-       }
-
-       /**
-        */
-       function ADODB_Encrypt_MCrypt($cipher = null, $mode = null, $source = 
null) {
-               if (!$cipher) {
-                       $cipher = MCRYPT_RIJNDAEL_256;
-               }
-               if (!$mode) {
-                       $mode = MCRYPT_MODE_ECB;
-               }
-               if (!$source) {
-                       $source = MCRYPT_RAND;
-               }
-
-               $this->_cipher = $cipher;
-               $this->_mode = $mode;
-               $this->_source = $source;
-       }
-
-       /**
-        */
-       function write($data, $key) {
-               $iv_size = mcrypt_get_iv_size($this->_cipher, $this->_mode);
-               $iv = mcrypt_create_iv($iv_size, $this->_source);
-               return mcrypt_encrypt($this->_cipher, $key, $data, 
$this->_mode, $iv);
-       }
-
-       /**
-        */
-       function read($data, $key) {
-               $iv_size = mcrypt_get_iv_size($this->_cipher, $this->_mode);
-               $iv = mcrypt_create_iv($iv_size, $this->_source);
-               $rv = mcrypt_decrypt($this->_cipher, $key, $data, $this->_mode, 
$iv);
-               return rtrim($rv, "\0");
-       }
-
-}
-
-return 1;
-
-?>
+<?php
+
+
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+         Contributed by Ross Smith (address@hidden). 
+  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.
+
+*/
+
+if (!function_exists('mcrypt_encrypt')) {
+       trigger_error('Mcrypt functions are not available', E_USER_ERROR);
+       return 0;
+}
+
+/**
+ */
+class ADODB_Encrypt_MCrypt {
+       /**
+        */
+       var $_cipher;
+
+       /**
+        */
+       var $_mode;
+
+       /**
+        */
+       var $_source;
+
+       /**
+        */
+       function getCipher() {
+               return $this->_cipher;
+       }
+
+       /**
+        */
+       function setCipher($cipher) {
+               $this->_cipher = $cipher;
+       }
+
+       /**
+        */
+       function getMode() {
+               return $this->_mode;
+       }
+
+       /**
+        */
+       function setMode($mode) {
+               $this->_mode = $mode;
+       }
+
+       /**
+        */
+       function getSource() {
+               return $this->_source;
+       }
+
+       /**
+        */
+       function setSource($source) {
+               $this->_source = $source;
+       }
+
+       /**
+        */
+       function ADODB_Encrypt_MCrypt($cipher = null, $mode = null, $source = 
null) {
+               if (!$cipher) {
+                       $cipher = MCRYPT_RIJNDAEL_256;
+               }
+               if (!$mode) {
+                       $mode = MCRYPT_MODE_ECB;
+               }
+               if (!$source) {
+                       $source = MCRYPT_RAND;
+               }
+
+               $this->_cipher = $cipher;
+               $this->_mode = $mode;
+               $this->_source = $source;
+       }
+
+       /**
+        */
+       function write($data, $key) {
+               $iv_size = mcrypt_get_iv_size($this->_cipher, $this->_mode);
+               $iv = mcrypt_create_iv($iv_size, $this->_source);
+               return mcrypt_encrypt($this->_cipher, $key, $data, 
$this->_mode, $iv);
+       }
+
+       /**
+        */
+       function read($data, $key) {
+               $iv_size = mcrypt_get_iv_size($this->_cipher, $this->_mode);
+               $iv = mcrypt_create_iv($iv_size, $this->_source);
+               $rv = mcrypt_decrypt($this->_cipher, $key, $data, $this->_mode, 
$iv);
+               return rtrim($rv, "\0");
+       }
+
+}
+
+return 1;
+
+?>
Index: phpgwapi/inc/adodb/session/adodb-encrypt-md5.php
diff -u phpgwapi/inc/adodb/session/adodb-encrypt-md5.php:1.2 
phpgwapi/inc/adodb/session/adodb-encrypt-md5.php:1.3
--- phpgwapi/inc/adodb/session/adodb-encrypt-md5.php:1.2        Thu Dec 30 
06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-encrypt-md5.php    Tue Feb 21 13:47:42 2006
@@ -1,39 +1,39 @@
-<?php
-
-/*
-V4.01 23 Oct 2003  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-         Contributed by Ross Smith (address@hidden). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-         Set tabs to 4 for best viewing.
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_SESSION')) die();
-
-include_once ADODB_SESSION . '/crypt.inc.php';
-
-/**
- */
-class ADODB_Encrypt_MD5 {
-       /**
-        */
-       function write($data, $key) {
-               $md5crypt =& new MD5Crypt();
-               return $md5crypt->encrypt($data, $key);
-       }
-
-       /**
-        */
-       function read($data, $key) {
-               $md5crypt =& new MD5Crypt();
-               return $md5crypt->decrypt($data, $key);
-       }
-
-}
-
-return 1;
-
+<?php
+
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+         Contributed by Ross Smith (address@hidden). 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
+         Set tabs to 4 for best viewing.
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_SESSION')) die();
+
+include_once ADODB_SESSION . '/crypt.inc.php';
+
+/**
+ */
+class ADODB_Encrypt_MD5 {
+       /**
+        */
+       function write($data, $key) {
+               $md5crypt =& new MD5Crypt();
+               return $md5crypt->encrypt($data, $key);
+       }
+
+       /**
+        */
+       function read($data, $key) {
+               $md5crypt =& new MD5Crypt();
+               return $md5crypt->decrypt($data, $key);
+       }
+
+}
+
+return 1;
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/session/adodb-encrypt-secret.php
diff -u phpgwapi/inc/adodb/session/adodb-encrypt-secret.php:1.2 
phpgwapi/inc/adodb/session/adodb-encrypt-secret.php:1.3
--- phpgwapi/inc/adodb/session/adodb-encrypt-secret.php:1.2     Thu Dec 30 
06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-encrypt-secret.php Tue Feb 21 13:47:42 2006
@@ -1,48 +1,48 @@
-<?php
-
-/*
-V4.01 23 Oct 2003  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-         Contributed by Ross Smith (address@hidden). 
-  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.
-
-*/
-
address@hidden('HORDE_BASE', dirname(dirname(dirname(__FILE__))) . '/horde');
-
-if (!is_dir(HORDE_BASE)) {
-       trigger_error(sprintf('Directory not found: \'%s\'', HORDE_BASE), 
E_USER_ERROR);
-       return 0;
-}
-
-include_once HORDE_BASE . '/lib/Horde.php';
-include_once HORDE_BASE . '/lib/Secret.php';
-
-/**
-
-NOTE: On Windows 2000 SP4 with PHP 4.3.1, MCrypt 2.4.x, and Apache 1.3.28,
-the session didn't work properly.
-
-This may be resolved with 4.3.3.
-
- */
-class ADODB_Encrypt_Secret {
-       /**
-        */
-       function write($data, $key) {
-               return Secret::write($key, $data);
-       }
-
-       /**
-        */
-       function read($data, $key) {
-               return Secret::read($key, $data);
-       }
-
-}
-
-return 1;
-
-?>
+<?php
+
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+         Contributed by Ross Smith (address@hidden). 
+  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.
+
+*/
+
address@hidden('HORDE_BASE', dirname(dirname(dirname(__FILE__))) . '/horde');
+
+if (!is_dir(HORDE_BASE)) {
+       trigger_error(sprintf('Directory not found: \'%s\'', HORDE_BASE), 
E_USER_ERROR);
+       return 0;
+}
+
+include_once HORDE_BASE . '/lib/Horde.php';
+include_once HORDE_BASE . '/lib/Secret.php';
+
+/**
+
+NOTE: On Windows 2000 SP4 with PHP 4.3.1, MCrypt 2.4.x, and Apache 1.3.28,
+the session didn't work properly.
+
+This may be resolved with 4.3.3.
+
+ */
+class ADODB_Encrypt_Secret {
+       /**
+        */
+       function write($data, $key) {
+               return Secret::write($key, $data);
+       }
+
+       /**
+        */
+       function read($data, $key) {
+               return Secret::read($key, $data);
+       }
+
+}
+
+return 1;
+
+?>
Index: phpgwapi/inc/adodb/session/adodb-session-clob.php
diff -u phpgwapi/inc/adodb/session/adodb-session-clob.php:1.2 
phpgwapi/inc/adodb/session/adodb-session-clob.php:1.3
--- phpgwapi/inc/adodb/session/adodb-session-clob.php:1.2       Thu Dec 30 
06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-session-clob.php   Tue Feb 21 13:47:42 2006
@@ -1,23 +1,23 @@
-<?php
-
-
-/*
-V4.01 23 Oct 2003  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-         Contributed by Ross Smith (address@hidden). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-         Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
-
-require_once dirname(__FILE__) . '/adodb-session.php';
-
-ADODB_Session::clob('CLOB');
-
+<?php
+
+
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+         Contributed by Ross Smith (address@hidden). 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
+  the BSD license will take precedence.
+         Set tabs to 4 for best viewing.
+*/
+
+/*
+
+This file is provided for backwards compatibility purposes
+
+*/
+
+require_once dirname(__FILE__) . '/adodb-session.php';
+
+ADODB_Session::clob('CLOB');
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/session/adodb-session.php
diff -u phpgwapi/inc/adodb/session/adodb-session.php:1.2 
phpgwapi/inc/adodb/session/adodb-session.php:1.3
--- phpgwapi/inc/adodb/session/adodb-session.php:1.2    Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-session.php        Tue Feb 21 13:47:42 2006
@@ -1,822 +1,917 @@
-<?php
-
-
-/*
-V4.01 23 Oct 2003  (c) 2000-2004 John Lim (address@hidden). All rights 
reserved.
-         Contributed by Ross Smith (address@hidden). 
-  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.
-*/
-
-/*
-       You may want to rename the 'data' field to 'session_data' as
-       'data' appears to be a reserved word for one or more of the following:
-               ANSI SQL
-               IBM DB2
-               MS SQL Server
-               Postgres
-               SAP
-
-       If you do, then execute:
-
-               ADODB_Session::dataFieldName('session_data');
-
-*/
-
-if (!defined('_ADODB_LAYER')) {
-       require_once realpath(dirname(__FILE__) . '/../adodb.inc.php');
-}
-
-if (defined('ADODB_SESSION')) return 1;
-
-define('ADODB_SESSION', dirname(__FILE__));
-
-/*!
-       \static
-*/
-class ADODB_Session {
-       /////////////////////
-       // getter/setter methods
-       /////////////////////
-
-       /*!
-       */
-       function driver($driver = null) {
-               static $_driver = 'mysql';
-               static $set = false;
-
-               if (!is_null($driver)) {
-                       $_driver = trim($driver);
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (isset($GLOBALS['ADODB_SESSION_DRIVER'])) {
-                               return $GLOBALS['ADODB_SESSION_DRIVER'];
-                       }
-               }
-
-               return $_driver;
-       }
-
-       /*!
-       */
-       function host($host = null) {
-               static $_host = 'localhost';
-               static $set = false;
-
-               if (!is_null($host)) {
-                       $_host = trim($host);
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (isset($GLOBALS['ADODB_SESSION_CONNECT'])) {
-                               return $GLOBALS['ADODB_SESSION_CONNECT'];
-                       }
-               }
-
-               return $_host;
-       }
-
-       /*!
-       */
-       function user($user = null) {
-               static $_user = 'root';
-               static $set = false;
-
-               if (!is_null($user)) {
-                       $_user = trim($user);
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (isset($GLOBALS['ADODB_SESSION_USER'])) {
-                               return $GLOBALS['ADODB_SESSION_USER'];
-                       }
-               }
-
-               return $_user;
-       }
-
-       /*!
-       */
-       function password($password = null) {
-               static $_password = '';
-               static $set = false;
-
-               if (!is_null($password)) {
-                       $_password = $password;
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (isset($GLOBALS['ADODB_SESSION_PWD'])) {
-                               return $GLOBALS['ADODB_SESSION_PWD'];
-                       }
-               }
-
-               return $_password;
-       }
-
-       /*!
-       */
-       function database($database = null) {
-               static $_database = 'xphplens_2';
-               static $set = false;
-
-               if (!is_null($database)) {
-                       $_database = trim($database);
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (isset($GLOBALS['ADODB_SESSION_DB'])) {
-                               return $GLOBALS['ADODB_SESSION_DB'];
-                       }
-               }
-
-               return $_database;
-       }
-
-       /*!
-       */
-       function persist($persist = null) 
-       {
-               static $_persist = true;
-
-               if (!is_null($persist)) {
-                       $_persist = trim($persist);
-               }
-
-               return $_persist;
-       }
-
-       /*!
-       */
-       function lifetime($lifetime = null) {
-               static $_lifetime;
-               static $set = false;
-
-               if (!is_null($lifetime)) {
-                       $_lifetime = (int) $lifetime;
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (isset($GLOBALS['ADODB_SESS_LIFE'])) {
-                               return $GLOBALS['ADODB_SESS_LIFE'];
-                       }
-               }
-               if (!$_lifetime) {
-                       $_lifetime = ini_get('session.gc_maxlifetime');
-                       if ($_lifetime <= 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: $lifetime</h3>";
-                               $_lifetime = 1440;
-                       }
-               }
-
-               return $_lifetime;
-       }
-
-       /*!
-       */
-       function debug($debug = null) {
-               static $_debug = false;
-               static $set = false;
-
-               if (!is_null($debug)) {
-                       $_debug = (bool) $debug;
-
-                       $conn = ADODB_Session::_conn();
-                       if ($conn) {
-                               $conn->debug = $_debug;
-                       }
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (isset($GLOBALS['ADODB_SESS_DEBUG'])) {
-                               return $GLOBALS['ADODB_SESS_DEBUG'];
-                       }
-               }
-
-               return $_debug;
-       }
-
-       /*!
-       */
-       function expireNotify($expire_notify = null) {
-               static $_expire_notify;
-               static $set = false;
-
-               if (!is_null($expire_notify)) {
-                       $_expire_notify = $expire_notify;
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (isset($GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'])) {
-                               return $GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'];
-                       }
-               }
-
-               return $_expire_notify;
-       }
-
-       /*!
-       */
-       function table($table = null) {
-               static $_table = 'sessions';
-               static $set = false;
-
-               if (!is_null($table)) {
-                       $_table = trim($table);
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (isset($GLOBALS['ADODB_SESSION_TBL'])) {
-                               return $GLOBALS['ADODB_SESSION_TBL'];
-                       }
-               }
-
-               return $_table;
-       }
-
-       /*!
-       */
-       function optimize($optimize = null) {
-               static $_optimize = false;
-               static $set = false;
-
-               if (!is_null($optimize)) {
-                       $_optimize = (bool) $optimize;
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (defined('ADODB_SESSION_OPTIMIZE')) {
-                               return true;
-                       }
-               }
-
-               return $_optimize;
-       }
-
-       /*!
-       */
-       function syncSeconds($sync_seconds = null) {
-               static $_sync_seconds = 60;
-               static $set = false;
-
-               if (!is_null($sync_seconds)) {
-                       $_sync_seconds = (int) $sync_seconds;
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (defined('ADODB_SESSION_SYNCH_SECS')) {
-                               return ADODB_SESSION_SYNCH_SECS;
-                       }
-               }
-
-               return $_sync_seconds;
-       }
-
-       /*!
-       */
-       function clob($clob = null) {
-               static $_clob = false;
-               static $set = false;
-
-               if (!is_null($clob)) {
-                       $_clob = strtolower(trim($clob));
-                       $set = true;
-               } elseif (!$set) {
-                       // backwards compatibility
-                       if (isset($GLOBALS['ADODB_SESSION_USE_LOBS'])) {
-                               return $GLOBALS['ADODB_SESSION_USE_LOBS'];
-                       }
-               }
-
-               return $_clob;
-       }
-
-       /*!
-       */
-       function dataFieldName($data_field_name = null) {
-               static $_data_field_name = 'data';
-
-               if (!is_null($data_field_name)) {
-                       $_data_field_name = trim($data_field_name);
-               }
-
-               return $_data_field_name;
-       }
-
-       /*!
-       */
-       function filter($filter = null) {
-               static $_filter = array();
-
-               if (!is_null($filter)) {
-                       if (!is_array($filter)) {
-                               $filter = array($filter);
-                       }
-                       $_filter = $filter;
-               }
-
-               return $_filter;
-       }
-
-       /*!
-       */
-       function encryptionKey($encryption_key = null) {
-               static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
-
-               if (!is_null($encryption_key)) {
-                       $_encryption_key = $encryption_key;
-               }
-
-               return $_encryption_key;
-       }
-
-       /////////////////////
-       // private methods
-       /////////////////////
-
-       /*!
-       */
-       function &_conn($conn=null) {
-               return $GLOBALS['ADODB_SESS_CONN'];
-       }
-
-       /*!
-       */
-       function _crc($crc = null) {
-               static $_crc = false;
-
-               if (!is_null($crc)) {
-                       $_crc = $crc;
-               }
-
-               return $_crc;
-       }
-
-       /*!
-       */
-       function _init() {
-               session_module_name('user');
-               session_set_save_handler(
-                       array('ADODB_Session', 'open'),
-                       array('ADODB_Session', 'close'),
-                       array('ADODB_Session', 'read'),
-                       array('ADODB_Session', 'write'),
-                       array('ADODB_Session', 'destroy'),
-                       array('ADODB_Session', 'gc')
-               );
-       }
-
-
-       /*!
-       */
-       function _sessionKey() {
-               // use this function to create the encryption key for crypted 
sessions
-               // crypt the used key, ADODB_Session::encryptionKey() as key 
and session_id() as salt
-               return crypt(ADODB_Session::encryptionKey(), session_id());
-       }
-
-       /*!
-       */
-       function _dumprs($rs) {
-               $conn   =& ADODB_Session::_conn();
-               $debug  = ADODB_Session::debug();
-
-               if (!$conn) {
-                       return;
-               }
-
-               if (!$debug) {
-                       return;
-               }
-
-               if (!$rs) {
-                       echo "<br />\$rs is null or false<br />\n";
-                       return;
-               }
-
-               //echo "<br />\nAffected_Rows=",$conn->Affected_Rows(),"<br 
/>\n";
-
-               if (!is_object($rs)) {
-                       return;
-               }
-
-               require_once ADODB_SESSION.'/../tohtml.inc.php';
-               rs2html($rs);
-       }
-
-       /////////////////////
-       // public methods
-       /////////////////////
-
-       /*!
-               Create the connection to the database.
-
-               If $conn already exists, reuse that connection
-       */
-       function open($save_path, $session_name, $persist = null) {
-               $conn =& ADODB_Session::_conn();
-
-               if ($conn) {
-                       return true;
-               }
-
-               $database       = ADODB_Session::database();
-               $debug          = ADODB_Session::debug();
-               $driver         = ADODB_Session::driver();
-               $host           = ADODB_Session::host();
-               $password       = ADODB_Session::password();
-               $user           = ADODB_Session::user();
-
-               if (!is_null($persist)) {
-                       ADODB_Session::persist($persist);
-               } else {
-                       $persist = ADODB_Session::persist();
-               }
-
-# these can all be defaulted to in php.ini
-#              assert('$database');
-#              assert('$driver');
-#              assert('$host');
-
-               // cannot use =& below - do not know why...
-               $conn =& ADONewConnection($driver);
-
-               if ($debug) {
-                       $conn->debug = true;
-//                     ADOConnection::outp( " driver=$driver user=$user 
pwd=$password db=$database ");
-               }
-
-               if ($persist) {
-                       switch($persist) {
-                       default:
-                       case 'P': $ok = $conn->PConnect($host, $user, 
$password, $database); break;
-                       case 'C': $ok = $conn->Connect($host, $user, $password, 
$database); break;
-                       case 'N': $ok = $conn->NConnect($host, $user, 
$password, $database); break;
-                       }
-               } else {
-                       $ok = $conn->Connect($host, $user, $password, 
$database);
-               }
-
-               if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
-               else
-                       ADOConnection::outp('<p>Session: connection 
failed</p>', false);
-               
-
-               return $ok;
-       }
-
-       /*!
-               Close the connection
-       */
-       function close() {
-               $conn =& ADODB_Session::_conn();
-
-               if ($conn) {
-                       $conn->Close();
-               }
-
-               return true;
-       }
-
-       /*
-               Slurp in the session variables and return the serialized string
-       */
-       function read($key) {
-               $conn   =& ADODB_Session::_conn();
-               $data   = ADODB_Session::dataFieldName();
-               $filter = ADODB_Session::filter();
-               $table  = ADODB_Session::table();
-
-               if (!$conn) {
-                       return '';
-               }
-
-               assert('$table');
-
-               $qkey = $conn->quote($key);
-               $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : 
'';
-
-               $sql = "SELECT $data FROM $table WHERE $binary sesskey = $qkey 
AND expiry >= " . time();
-               $rs =& $conn->Execute($sql);
-               //ADODB_Session::_dumprs($rs);
-               if ($rs) {
-                       if ($rs->EOF) {
-                               $v = '';
-                       } else {
-                               $v = reset($rs->fields);
-                               $filter = array_reverse($filter);
-                               foreach ($filter as $f) {
-                                       if (is_object($f)) {
-                                               $v = $f->read($v, 
ADODB_Session::_sessionKey());
-                                       }
-                               }
-                               $v = rawurldecode($v);
-                       }
-
-                       $rs->Close();
-
-                       ADODB_Session::_crc(strlen($v) . crc32($v));
-                       return $v;
-               }
-
-               return '';
-       }
-
-       /*!
-               Write the serialized data to a database.
-
-               If the data has not been modified since the last read(), we do 
not write.
-       */
-       function write($key, $val) {
-               $clob                   = ADODB_Session::clob();
-               $conn                   =& ADODB_Session::_conn();
-               $crc                    = ADODB_Session::_crc();
-               $data                   = ADODB_Session::dataFieldName();
-               $debug                  = ADODB_Session::debug();
-               $driver                 = ADODB_Session::driver();
-               $expire_notify  = ADODB_Session::expireNotify();
-               $filter                 = ADODB_Session::filter();
-               $lifetime               = ADODB_Session::lifetime();
-               $table                  = ADODB_Session::table();
-
-               if (!$conn) {
-                       return false;
-               }
-
-               assert('$table');
-
-               $expiry = time() + $lifetime;
-
-               $qkey = $conn->quote($key);
-               $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : 
'';
-
-               // crc32 optimization since adodb 2.1
-               // now we only update expiry date, thx to sebastian thom in 
adodb 2.32
-               if ($crc !== false && $crc == (strlen($val) . crc32($val))) {
-                       if ($debug) {
-                               echo '<p>Session: Only updating date - crc32 
not changed</p>';
-                       }
-                       $sql = "UPDATE $table SET expiry = $expiry WHERE 
$binary sesskey = $qkey AND expiry >= " . time();
-                       $rs =& $conn->Execute($sql);
-                       ADODB_Session::_dumprs($rs);
-                       if ($rs) {
-                               $rs->Close();
-                       }
-                       return true;
-               }
-               $val = rawurlencode($val);
-               foreach ($filter as $f) {
-                       if (is_object($f)) {
-                               $val = $f->write($val, 
ADODB_Session::_sessionKey());
-                       }
-               }
-
-               $arr = array('sesskey' => $key, 'expiry' => $expiry, $data => 
$val, 'expireref' => '');
-               if ($expire_notify) {
-                       $var = reset($expire_notify);
-                       global $$var;
-                       if (isset($$var)) {
-                               $arr['expireref'] = $$var;
-                       }
-               }
-
-               if (!$clob) {   // no lobs, simply use replace()
-                       $arr[$data] = $conn->qstr($val);
-                       $rs = $conn->Replace($table, $arr, 'sesskey', 
$autoQuote = true);
-                       ADODB_Session::_dumprs($rs);
-               } else {
-                       // what value shall we insert/update for lob row?
-                       switch ($driver) {
-                               // empty_clob or empty_lob for oracle dbs
-                               case 'oracle':
-                               case 'oci8':
-                               case 'oci8po':
-                               case 'oci805':
-                                       $lob_value = sprintf('empty_%s()', 
strtolower($clob));
-                                       break;
-
-                               // null for all other
-                               default:
-                                       $lob_value = 'null';
-                                       break;
-                       }
-
-                       // do we insert or update? => as for sesskey
-                       $rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM 
$table WHERE $binary sesskey = $qkey");
-                       ADODB_Session::_dumprs($rs);
-                       if ($rs && reset($rs->fields) > 0) {
-                               $sql = "UPDATE $table SET expiry = $expiry, 
$data = $lob_value WHERE  sesskey = $qkey";
-                       } else {
-                               $sql = "INSERT INTO $table (expiry, $data, 
sesskey) VALUES ($expiry, $lob_value, $qkey)";
-                       }
-                       if ($rs) {
-                               $rs->Close();
-                       }
-
-                       $err = '';
-                       $rs1 =& $conn->Execute($sql);
-                       ADODB_Session::_dumprs($rs1);
-                       if (!$rs1) {
-                               $err = $conn->ErrorMsg()."\n";
-                       }
-                       $rs2 =& $conn->UpdateBlob($table, $data, $val, " 
sesskey=$qkey", strtoupper($clob));
-                       ADODB_Session::_dumprs($rs2);
-                       if (!$rs2) {
-                               $err .= $conn->ErrorMsg()."\n";
-                       }
-                       $rs = ($rs && $rs2) ? true : false;
-                       if ($rs1) {
-                               $rs1->Close();
-                       }
-                       if (is_object($rs2)) {
-                               $rs2->Close();
-                       }
-               }
-
-               if (!$rs) {
-                       ADOConnection::outp('<p>Session Replace: ' . 
$conn->ErrorMsg() . '</p>', false);
-                       return false;
-               }  else {
-                       // bug in access driver (could be odbc?) means that 
info is not committed
-                       // properly unless select statement executed in Win2000
-                       if ($conn->databaseType == 'access') {
-                               $sql = "SELECT sesskey FROM $table WHERE 
$binary sesskey = $qkey";
-                               $rs =& $conn->Execute($sql);
-                               ADODB_Session::_dumprs($rs);
-                               if ($rs) {
-                                       $rs->Close();
-                               }
-                       }
-               }
-               return $rs ? true : false;
-       }
-
-       /*!
-       */
-       function destroy($key) {
-               $conn                   =& ADODB_Session::_conn();
-               $table                  = ADODB_Session::table();
-               $expire_notify  = ADODB_Session::expireNotify();
-
-               if (!$conn) {
-                       return false;
-               }
-
-               assert('$table');
-
-               $qkey = $conn->quote($key);
-               $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : 
'';
-
-               if ($expire_notify) {
-                       reset($expire_notify);
-                       $fn = next($expire_notify);
-                       $savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
-                       $sql = "SELECT expireref, sesskey FROM $table WHERE 
$binary sesskey = $qkey";
-                       $rs =& $conn->Execute($sql);
-                       ADODB_Session::_dumprs($rs);
-                       $conn->SetFetchMode($savem);
-                       if (!$rs) {
-                               return false;
-                       }
-                       if (!$rs->EOF) {
-                               $ref = $rs->fields[0];
-                               $key = $rs->fields[1];
-                               //assert('$ref');
-                               //assert('$key');
-                               $fn($ref, $key);
-                       }
-                       $rs->Close();
-               }
-
-               $sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
-               $rs =& $conn->Execute($sql);
-               ADODB_Session::_dumprs($rs);
-               if ($rs) {
-                       $rs->Close();
-               }
-
-               return $rs ? true : false;
-       }
-
-       /*!
-       */
-       function gc($maxlifetime) {
-               $conn                   =& ADODB_Session::_conn();
-               $debug                  = ADODB_Session::debug();
-               $expire_notify  = ADODB_Session::expireNotify();
-               $optimize               = ADODB_Session::optimize();
-               $sync_seconds   = ADODB_Session::syncSeconds();
-               $table                  = ADODB_Session::table();
-
-               if (!$conn) {
-                       return false;
-               }
-
-               assert('$table');
-
-               $time                   = time();
-
-               $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : 
'';
-
-               if ($expire_notify) {
-                       reset($expire_notify);
-                       $fn = next($expire_notify);
-                       $savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
-                       $sql = "SELECT expireref, sesskey FROM $table WHERE 
expiry < $time";
-                       $rs =& $conn->Execute($sql);
-                       ADODB_Session::_dumprs($rs);
-                       $conn->SetFetchMode($savem);
-                       if ($rs) {
-                               $conn->BeginTrans();
-                               $keys = array();
-                               while (!$rs->EOF) {
-                                       $ref = $rs->fields[0];
-                                       $key = $rs->fields[1];
-                                       $fn($ref, $key);
-                                       $del = $conn->Execute("DELETE FROM 
$table WHERE sesskey='$key'");
-                                       $rs->MoveNext();
-                               }
-                               $rs->Close();
-                               
-                               $conn->CommitTrans();
-                       }
-               } else {
-                       $sql = "DELETE FROM $table WHERE expiry < $time";
-                       $rs =& $conn->Execute($sql);
-                       ADODB_Session::_dumprs($rs);
-                       if ($rs) {
-                               $rs->Close();
-                       }
-                       if ($debug) {
-                               ADOConnection::outp("<p><b>Garbage 
Collection</b>: $sql</p>");
-                       }
-               }
-
-               // suggested by Cameron, "GaM3R" <address@hidden>
-               if ($optimize) {
-                       $driver = ADODB_Session::driver();
-
-                       if (preg_match('/mysql/i', $driver)) {
-                               $sql = "OPTIMIZE TABLE $table";
-                       }
-                       if (preg_match('/postgres/i', $driver)) {
-                               $sql = "VACUUM $table";
-                       }
-                       if (!empty($sql)) {
-                               $conn->Execute($sql);
-                       }
-               }
-
-               if ($sync_seconds) {
-                       $sql = 'SELECT ';
-                       if ($conn->dataProvider === 'oci8') {
-                               $sql .= "TO_CHAR({$conn->sysTimeStamp}, 
'RRRR-MM-DD HH24:MI:SS')";
-                       } else {
-                               $sql .= $conn->sysTimeStamp;
-                       }
-                       $sql .= " FROM $table";
-
-                       $rs =& $conn->SelectLimit($sql, 1);
-                       if ($rs && !$rs->EOF) {
-                               $dbts = reset($rs->fields);
-                               $rs->Close();
-                               $dbt = $conn->UnixTimeStamp($dbts);
-                               $t = time();
-
-                               if (abs($dbt - $t) >= $sync_seconds) {
-                                       global $HTTP_SERVER_VARS;
-                                       $msg = __FILE__ .
-                                               ": Server time for webserver 
{$HTTP_SERVER_VARS['HTTP_HOST']} not in synch with database: " .
-                                               " database=$dbt ($dbts), 
webserver=$t (diff=". (abs($dbt - $t) / 3600) . ' hours)';
-                                       error_log($msg);
-                                       if ($debug) {
-                                               
ADOConnection::outp("<p>$msg</p>");
-                                       }
-                               }
-                       }
-               }
-
-               return true;
-       }
-
-}
-
-ADODB_Session::_init();
-
-
-// for backwards compatability only
-function adodb_sess_open($save_path, $session_name, $persist = true) {
-       return ADODB_Session::open($save_path, $session_name, $persist);
-}
-
-// for backwards compatability only
-function adodb_sess_gc($t)
-{      
-       return ADODB_Session::gc($t);
-}
-
-?>
+<?php
+
+
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+         Contributed by Ross Smith (address@hidden). 
+  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.
+*/
+
+/*
+       You may want to rename the 'data' field to 'session_data' as
+       'data' appears to be a reserved word for one or more of the following:
+               ANSI SQL
+               IBM DB2
+               MS SQL Server
+               Postgres
+               SAP
+
+       If you do, then execute:
+
+               ADODB_Session::dataFieldName('session_data');
+
+*/
+
+if (!defined('_ADODB_LAYER')) {
+       require_once realpath(dirname(__FILE__) . '/../adodb.inc.php');
+}
+
+if (defined('ADODB_SESSION')) return 1;
+
+define('ADODB_SESSION', dirname(__FILE__));
+
+
+/* 
+       Unserialize session data manually. See 
http://phplens.com/lens/lensforum/msgs.php?id=9821 
+       
+       From Kerr Schere, to unserialize session data stored via ADOdb. 
+       1. Pull the session data from the db and loop through it. 
+       2. Inside the loop, you will need to urldecode the data column. 
+       3. After urldecode, run the serialized string through this function:
+
+*/
+function adodb_unserialize( $serialized_string ) 
+{
+       $variables = array( );
+       $a = preg_split( "/(\w+)\|/", $serialized_string, -1, 
PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
+       for( $i = 0; $i < count( $a ); $i = $i+2 ) {
+               $variables[$a[$i]] = unserialize( $a[$i+1] );
+       }
+       return( $variables );
+}
+
+/*
+       Thanks Joe Li. See 
http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
+       Since adodb 4.61.
+*/
+function adodb_session_regenerate_id() 
+{
+       $conn =& ADODB_Session::_conn();
+       if (!$conn) return false;
+
+       $old_id = session_id();
+       if (function_exists('session_regenerate_id')) {
+               session_regenerate_id();
+       } else {
+               session_id(md5(uniqid(rand(), true)));
+               $ck = session_get_cookie_params();
+               setcookie(session_name(), session_id(), false, $ck['path'], 
$ck['domain'], $ck['secure']);
+               //@session_start();
+       }
+       $new_id = session_id();
+       $ok =& $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET 
sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
+       
+       /* it is possible that the update statement fails due to a collision */
+       if (!$ok) {
+               session_id($old_id);
+               if (empty($ck)) $ck = session_get_cookie_params();
+               setcookie(session_name(), session_id(), false, $ck['path'], 
$ck['domain'], $ck['secure']);
+               return false;
+       }
+       
+       return true;
+}
+
+/*
+    Generate database table for session data
+    @see http://phplens.com/lens/lensforum/msgs.php?id=12280
+    @return 0 if failure, 1 if errors, 2 if successful.
+       @author Markus Staab http://www.public-4u.de
+*/
+function adodb_session_create_table($schemaFile=null,$conn = null)
+{
+    // set default values
+    if ($schemaFile===null) $schemaFile = ADODB_SESSION . 
'/session_schema.xml';
+    if ($conn===null) $conn =& ADODB_Session::_conn();
+
+       if (!$conn) return 0;
+
+    $schema = new adoSchema($conn);
+    $schema->ParseSchema($schemaFile);
+    return $schema->ExecuteSchema();
+}
+
+/*!
+       \static
+*/
+class ADODB_Session {
+       /////////////////////
+       // getter/setter methods
+       /////////////////////
+       
+       /*
+       
+       function Lock($lock=null)
+       {
+       static $_lock = false;
+       
+               if (!is_null($lock)) $_lock = $lock;
+               return $lock;
+       }
+       */
+       /*!
+       */
+       function driver($driver = null) {
+               static $_driver = 'mysql';
+               static $set = false;
+
+               if (!is_null($driver)) {
+                       $_driver = trim($driver);
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (isset($GLOBALS['ADODB_SESSION_DRIVER'])) {
+                               return $GLOBALS['ADODB_SESSION_DRIVER'];
+                       }
+               }
+
+               return $_driver;
+       }
+
+       /*!
+       */
+       function host($host = null) {
+               static $_host = 'localhost';
+               static $set = false;
+
+               if (!is_null($host)) {
+                       $_host = trim($host);
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (isset($GLOBALS['ADODB_SESSION_CONNECT'])) {
+                               return $GLOBALS['ADODB_SESSION_CONNECT'];
+                       }
+               }
+
+               return $_host;
+       }
+
+       /*!
+       */
+       function user($user = null) {
+               static $_user = 'root';
+               static $set = false;
+
+               if (!is_null($user)) {
+                       $_user = trim($user);
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (isset($GLOBALS['ADODB_SESSION_USER'])) {
+                               return $GLOBALS['ADODB_SESSION_USER'];
+                       }
+               }
+
+               return $_user;
+       }
+
+       /*!
+       */
+       function password($password = null) {
+               static $_password = '';
+               static $set = false;
+
+               if (!is_null($password)) {
+                       $_password = $password;
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (isset($GLOBALS['ADODB_SESSION_PWD'])) {
+                               return $GLOBALS['ADODB_SESSION_PWD'];
+                       }
+               }
+
+               return $_password;
+       }
+
+       /*!
+       */
+       function database($database = null) {
+               static $_database = 'xphplens_2';
+               static $set = false;
+
+               if (!is_null($database)) {
+                       $_database = trim($database);
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (isset($GLOBALS['ADODB_SESSION_DB'])) {
+                               return $GLOBALS['ADODB_SESSION_DB'];
+                       }
+               }
+
+               return $_database;
+       }
+
+       /*!
+       */
+       function persist($persist = null) 
+       {
+               static $_persist = true;
+
+               if (!is_null($persist)) {
+                       $_persist = trim($persist);
+               }
+
+               return $_persist;
+       }
+
+       /*!
+       */
+       function lifetime($lifetime = null) {
+               static $_lifetime;
+               static $set = false;
+
+               if (!is_null($lifetime)) {
+                       $_lifetime = (int) $lifetime;
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (isset($GLOBALS['ADODB_SESS_LIFE'])) {
+                               return $GLOBALS['ADODB_SESS_LIFE'];
+                       }
+               }
+               if (!$_lifetime) {
+                       $_lifetime = ini_get('session.gc_maxlifetime');
+                       if ($_lifetime <= 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: $lifetime</h3>";
+                               $_lifetime = 1440;
+                       }
+               }
+
+               return $_lifetime;
+       }
+
+       /*!
+       */
+       function debug($debug = null) {
+               static $_debug = false;
+               static $set = false;
+
+               if (!is_null($debug)) {
+                       $_debug = (bool) $debug;
+
+                       $conn = ADODB_Session::_conn();
+                       if ($conn) {
+                               $conn->debug = $_debug;
+                       }
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (isset($GLOBALS['ADODB_SESS_DEBUG'])) {
+                               return $GLOBALS['ADODB_SESS_DEBUG'];
+                       }
+               }
+
+               return $_debug;
+       }
+
+       /*!
+       */
+       function expireNotify($expire_notify = null) {
+               static $_expire_notify;
+               static $set = false;
+
+               if (!is_null($expire_notify)) {
+                       $_expire_notify = $expire_notify;
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (isset($GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'])) {
+                               return $GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'];
+                       }
+               }
+
+               return $_expire_notify;
+       }
+
+       /*!
+       */
+       function table($table = null) {
+               static $_table = 'sessions';
+               static $set = false;
+
+               if (!is_null($table)) {
+                       $_table = trim($table);
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (isset($GLOBALS['ADODB_SESSION_TBL'])) {
+                               return $GLOBALS['ADODB_SESSION_TBL'];
+                       }
+               }
+
+               return $_table;
+       }
+
+       /*!
+       */
+       function optimize($optimize = null) {
+               static $_optimize = false;
+               static $set = false;
+
+               if (!is_null($optimize)) {
+                       $_optimize = (bool) $optimize;
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (defined('ADODB_SESSION_OPTIMIZE')) {
+                               return true;
+                       }
+               }
+
+               return $_optimize;
+       }
+
+       /*!
+       */
+       function syncSeconds($sync_seconds = null) {
+               static $_sync_seconds = 60;
+               static $set = false;
+
+               if (!is_null($sync_seconds)) {
+                       $_sync_seconds = (int) $sync_seconds;
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (defined('ADODB_SESSION_SYNCH_SECS')) {
+                               return ADODB_SESSION_SYNCH_SECS;
+                       }
+               }
+
+               return $_sync_seconds;
+       }
+
+       /*!
+       */
+       function clob($clob = null) {
+               static $_clob = false;
+               static $set = false;
+
+               if (!is_null($clob)) {
+                       $_clob = strtolower(trim($clob));
+                       $set = true;
+               } elseif (!$set) {
+                       // backwards compatibility
+                       if (isset($GLOBALS['ADODB_SESSION_USE_LOBS'])) {
+                               return $GLOBALS['ADODB_SESSION_USE_LOBS'];
+                       }
+               }
+
+               return $_clob;
+       }
+
+       /*!
+       */
+       function dataFieldName($data_field_name = null) {
+               static $_data_field_name = 'data';
+
+               if (!is_null($data_field_name)) {
+                       $_data_field_name = trim($data_field_name);
+               }
+
+               return $_data_field_name;
+       }
+
+       /*!
+       */
+       function filter($filter = null) {
+               static $_filter = array();
+
+               if (!is_null($filter)) {
+                       if (!is_array($filter)) {
+                               $filter = array($filter);
+                       }
+                       $_filter = $filter;
+               }
+
+               return $_filter;
+       }
+
+       /*!
+       */
+       function encryptionKey($encryption_key = null) {
+               static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
+
+               if (!is_null($encryption_key)) {
+                       $_encryption_key = $encryption_key;
+               }
+
+               return $_encryption_key;
+       }
+
+       /////////////////////
+       // private methods
+       /////////////////////
+
+       /*!
+       */
+       function &_conn($conn=null) {
+               return $GLOBALS['ADODB_SESS_CONN'];
+       }
+
+       /*!
+       */
+       function _crc($crc = null) {
+               static $_crc = false;
+
+               if (!is_null($crc)) {
+                       $_crc = $crc;
+               }
+
+               return $_crc;
+       }
+
+       /*!
+       */
+       function _init() {
+               session_module_name('user');
+               session_set_save_handler(
+                       array('ADODB_Session', 'open'),
+                       array('ADODB_Session', 'close'),
+                       array('ADODB_Session', 'read'),
+                       array('ADODB_Session', 'write'),
+                       array('ADODB_Session', 'destroy'),
+                       array('ADODB_Session', 'gc')
+               );
+       }
+
+
+       /*!
+       */
+       function _sessionKey() {
+               // use this function to create the encryption key for crypted 
sessions
+               // crypt the used key, ADODB_Session::encryptionKey() as key 
and session_id() as salt
+               return crypt(ADODB_Session::encryptionKey(), session_id());
+       }
+
+       /*!
+       */
+       function _dumprs($rs) {
+               $conn   =& ADODB_Session::_conn();
+               $debug  = ADODB_Session::debug();
+
+               if (!$conn) {
+                       return;
+               }
+
+               if (!$debug) {
+                       return;
+               }
+
+               if (!$rs) {
+                       echo "<br />\$rs is null or false<br />\n";
+                       return;
+               }
+
+               //echo "<br />\nAffected_Rows=",$conn->Affected_Rows(),"<br 
/>\n";
+
+               if (!is_object($rs)) {
+                       return;
+               }
+
+               require_once ADODB_SESSION.'/../tohtml.inc.php';
+               rs2html($rs);
+       }
+
+       /////////////////////
+       // public methods
+       /////////////////////
+
+       /*!
+               Create the connection to the database.
+
+               If $conn already exists, reuse that connection
+       */
+       function open($save_path, $session_name, $persist = null) {
+               $conn =& ADODB_Session::_conn();
+
+               if ($conn) {
+                       return true;
+               }
+
+               $database       = ADODB_Session::database();
+               $debug          = ADODB_Session::debug();
+               $driver         = ADODB_Session::driver();
+               $host           = ADODB_Session::host();
+               $password       = ADODB_Session::password();
+               $user           = ADODB_Session::user();
+
+               if (!is_null($persist)) {
+                       ADODB_Session::persist($persist);
+               } else {
+                       $persist = ADODB_Session::persist();
+               }
+
+# these can all be defaulted to in php.ini
+#              assert('$database');
+#              assert('$driver');
+#              assert('$host');
+
+               // cannot use =& below - do not know why...
+               $conn =& ADONewConnection($driver);
+
+               if ($debug) {
+                       $conn->debug = true;
+//                     ADOConnection::outp( " driver=$driver user=$user 
pwd=$password db=$database ");
+               }
+
+               if ($persist) {
+                       switch($persist) {
+                       default:
+                       case 'P': $ok = $conn->PConnect($host, $user, 
$password, $database); break;
+                       case 'C': $ok = $conn->Connect($host, $user, $password, 
$database); break;
+                       case 'N': $ok = $conn->NConnect($host, $user, 
$password, $database); break;
+                       }
+               } else {
+                       $ok = $conn->Connect($host, $user, $password, 
$database);
+               }
+
+               if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
+               else
+                       ADOConnection::outp('<p>Session: connection 
failed</p>', false);
+               
+
+               return $ok;
+       }
+
+       /*!
+               Close the connection
+       */
+       function close() {
+/*
+               $conn =& ADODB_Session::_conn();
+               if ($conn) $conn->Close();
+*/
+               return true;
+       }
+
+       /*
+               Slurp in the session variables and return the serialized string
+       */
+       function read($key) {
+               $conn   =& ADODB_Session::_conn();
+               $data   = ADODB_Session::dataFieldName();
+               $filter = ADODB_Session::filter();
+               $table  = ADODB_Session::table();
+
+               if (!$conn) {
+                       return '';
+               }
+
+               assert('$table');
+
+               $qkey = $conn->quote($key);
+               $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : 
'';
+       
+               $sql = "SELECT $data FROM $table WHERE sesskey = $binary $qkey 
AND expiry >= " . time();
+               /* Lock code does not work as it needs to hold transaction 
within whole page, and we don't know if 
+                 developer has commited elsewhere... :(
+                */
+               #if (ADODB_Session::Lock())
+               #       $rs =& $conn->RowLock($table, "$binary sesskey = $qkey 
AND expiry >= " . time(), $data);
+               #else
+               
+                       $rs =& $conn->Execute($sql);
+               //ADODB_Session::_dumprs($rs);
+               if ($rs) {
+                       if ($rs->EOF) {
+                               $v = '';
+                       } else {
+                               $v = reset($rs->fields);
+                               $filter = array_reverse($filter);
+                               foreach ($filter as $f) {
+                                       if (is_object($f)) {
+                                               $v = $f->read($v, 
ADODB_Session::_sessionKey());
+                                       }
+                               }
+                               $v = rawurldecode($v);
+                       }
+
+                       $rs->Close();
+
+                       ADODB_Session::_crc(strlen($v) . crc32($v));
+                       return $v;
+               }
+
+               return '';
+       }
+
+       /*!
+               Write the serialized data to a database.
+
+               If the data has not been modified since the last read(), we do 
not write.
+       */
+       function write($key, $val) {
+               $clob                   = ADODB_Session::clob();
+               $conn                   =& ADODB_Session::_conn();
+               $crc                    = ADODB_Session::_crc();
+               $data                   = ADODB_Session::dataFieldName();
+               $debug                  = ADODB_Session::debug();
+               $driver                 = ADODB_Session::driver();
+               $expire_notify  = ADODB_Session::expireNotify();
+               $filter                 = ADODB_Session::filter();
+               $lifetime               = ADODB_Session::lifetime();
+               $table                  = ADODB_Session::table();
+       
+               if (!$conn) {
+                       return false;
+               }
+               $qkey = $conn->qstr($key);
+       
+               assert('$table');
+
+               $expiry = time() + $lifetime;
+
+               $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : 
'';
+
+               // crc32 optimization since adodb 2.1
+               // now we only update expiry date, thx to sebastian thom in 
adodb 2.32
+               if ($crc !== false && $crc == (strlen($val) . crc32($val))) {
+                       if ($debug) {
+                               echo '<p>Session: Only updating date - crc32 
not changed</p>';
+                       }
+                       $sql = "UPDATE $table SET expiry = 
".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry 
>= ".$conn->Param('2');
+                       $rs =& $conn->Execute($sql,array($expiry,$key,time()));
+                       ADODB_Session::_dumprs($rs);
+                       if ($rs) {
+                               $rs->Close();
+                       }
+                       return true;
+               }
+               $val = rawurlencode($val);
+               foreach ($filter as $f) {
+                       if (is_object($f)) {
+                               $val = $f->write($val, 
ADODB_Session::_sessionKey());
+                       }
+               }
+
+               $arr = array('sesskey' => $key, 'expiry' => $expiry, $data => 
$val, 'expireref' => '');
+               if ($expire_notify) {
+                       $var = reset($expire_notify);
+                       global $$var;
+                       if (isset($$var)) {
+                               $arr['expireref'] = $$var;
+                       }
+               }
+
+               if (!$clob) {   // no lobs, simply use replace()
+                       $arr[$data] = $conn->qstr($val);
+                       $rs = $conn->Replace($table, $arr, 'sesskey', 
$autoQuote = true);
+                       ADODB_Session::_dumprs($rs);
+               } else {
+                       // what value shall we insert/update for lob row?
+                       switch ($driver) {
+                               // empty_clob or empty_lob for oracle dbs
+                               case 'oracle':
+                               case 'oci8':
+                               case 'oci8po':
+                               case 'oci805':
+                                       $lob_value = sprintf('empty_%s()', 
strtolower($clob));
+                                       break;
+
+                               // null for all other
+                               default:
+                                       $lob_value = 'null';
+                                       break;
+                       }
+                       
+                       // do we insert or update? => as for sesskey
+                       $rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM 
$table WHERE $binary sesskey = $qkey");
+                       ADODB_Session::_dumprs($rs);
+                       if ($rs && reset($rs->fields) > 0) {
+                               $sql = "UPDATE $table SET expiry = $expiry, 
$data = $lob_value WHERE  sesskey = $qkey";
+                       } else {
+                               $sql = "INSERT INTO $table (expiry, $data, 
sesskey) VALUES ($expiry, $lob_value, $qkey)";
+                       }
+                       if ($rs) {
+                               $rs->Close();
+                       }
+
+                       $err = '';
+                       $rs1 =& $conn->Execute($sql);
+                       ADODB_Session::_dumprs($rs1);
+                       if (!$rs1) {
+                               $err = $conn->ErrorMsg()."\n";
+                       }
+                       $rs2 =& $conn->UpdateBlob($table, $data, $val, " 
sesskey=$qkey", strtoupper($clob));
+                       ADODB_Session::_dumprs($rs2);
+                       if (!$rs2) {
+                               $err .= $conn->ErrorMsg()."\n";
+                       }
+                       $rs = ($rs && $rs2) ? true : false;
+                       if ($rs1) {
+                               $rs1->Close();
+                       }
+                       if (is_object($rs2)) {
+                               $rs2->Close();
+                       }
+               }
+
+               if (!$rs) {
+                       ADOConnection::outp('<p>Session Replace: ' . 
$conn->ErrorMsg() . '</p>', false);
+                       return false;
+               }  else {
+                       // bug in access driver (could be odbc?) means that 
info is not committed
+                       // properly unless select statement executed in Win2000
+                       if ($conn->databaseType == 'access') {
+                               $sql = "SELECT sesskey FROM $table WHERE 
$binary sesskey = $qkey";
+                               $rs =& $conn->Execute($sql);
+                               ADODB_Session::_dumprs($rs);
+                               if ($rs) {
+                                       $rs->Close();
+                               }
+                       }
+               }/*
+               if (ADODB_Session::Lock()) {
+                       $conn->CommitTrans();
+               }*/
+               return $rs ? true : false;
+       }
+
+       /*!
+       */
+       function destroy($key) {
+               $conn                   =& ADODB_Session::_conn();
+               $table                  = ADODB_Session::table();
+               $expire_notify  = ADODB_Session::expireNotify();
+
+               if (!$conn) {
+                       return false;
+               }
+
+               assert('$table');
+
+               $qkey = $conn->quote($key);
+               $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : 
'';
+
+               if ($expire_notify) {
+                       reset($expire_notify);
+                       $fn = next($expire_notify);
+                       $savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
+                       $sql = "SELECT expireref, sesskey FROM $table WHERE 
$binary sesskey = $qkey";
+                       $rs =& $conn->Execute($sql);
+                       ADODB_Session::_dumprs($rs);
+                       $conn->SetFetchMode($savem);
+                       if (!$rs) {
+                               return false;
+                       }
+                       if (!$rs->EOF) {
+                               $ref = $rs->fields[0];
+                               $key = $rs->fields[1];
+                               //assert('$ref');
+                               //assert('$key');
+                               $fn($ref, $key);
+                       }
+                       $rs->Close();
+               }
+
+               $sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
+               $rs =& $conn->Execute($sql);
+               ADODB_Session::_dumprs($rs);
+               if ($rs) {
+                       $rs->Close();
+               }
+
+               return $rs ? true : false;
+       }
+
+       /*!
+       */
+       function gc($maxlifetime) {
+               $conn                   =& ADODB_Session::_conn();
+               $debug                  = ADODB_Session::debug();
+               $expire_notify  = ADODB_Session::expireNotify();
+               $optimize               = ADODB_Session::optimize();
+               $sync_seconds   = ADODB_Session::syncSeconds();
+               $table                  = ADODB_Session::table();
+
+               if (!$conn) {
+                       return false;
+               }
+
+               assert('$table');
+
+               $time                   = time();
+
+               $binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : 
'';
+
+               if ($expire_notify) {
+                       reset($expire_notify);
+                       $fn = next($expire_notify);
+                       $savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
+                       $sql = "SELECT expireref, sesskey FROM $table WHERE 
expiry < $time";
+                       $rs =& $conn->Execute($sql);
+                       ADODB_Session::_dumprs($rs);
+                       $conn->SetFetchMode($savem);
+                       if ($rs) {
+                               $conn->BeginTrans();
+                               $keys = array();
+                               while (!$rs->EOF) {
+                                       $ref = $rs->fields[0];
+                                       $key = $rs->fields[1];
+                                       $fn($ref, $key);
+                                       $del = $conn->Execute("DELETE FROM 
$table WHERE sesskey='$key'");
+                                       $rs->MoveNext();
+                               }
+                               $rs->Close();
+                               
+                               $conn->CommitTrans();
+                       }
+               } else {
+               
+                       if (1) {
+                               $sql = "SELECT sesskey FROM $table WHERE expiry 
< $time";
+                               $arr =& $conn->GetAll($sql);
+                               foreach ($arr as $row) {
+                                       $sql2 = "DELETE FROM $table WHERE 
sesskey='$row[0]'";
+                                       $conn->Execute($sql2);
+                               }
+                       } else {
+                               $sql = "DELETE FROM $table WHERE expiry < 
$time";
+                               $rs =& $conn->Execute($sql);
+                               ADODB_Session::_dumprs($rs);
+                               if ($rs) $rs->Close();
+                       }
+                       if ($debug) {
+                               ADOConnection::outp("<p><b>Garbage 
Collection</b>: $sql</p>");
+                       }
+               }
+
+               // suggested by Cameron, "GaM3R" <address@hidden>
+               if ($optimize) {
+                       $driver = ADODB_Session::driver();
+
+                       if (preg_match('/mysql/i', $driver)) {
+                               $sql = "OPTIMIZE TABLE $table";
+                       }
+                       if (preg_match('/postgres/i', $driver)) {
+                               $sql = "VACUUM $table";
+                       }
+                       if (!empty($sql)) {
+                               $conn->Execute($sql);
+                       }
+               }
+
+               if ($sync_seconds) {
+                       $sql = 'SELECT ';
+                       if ($conn->dataProvider === 'oci8') {
+                               $sql .= "TO_CHAR({$conn->sysTimeStamp}, 
'RRRR-MM-DD HH24:MI:SS')";
+                       } else {
+                               $sql .= $conn->sysTimeStamp;
+                       }
+                       $sql .= " FROM $table";
+
+                       $rs =& $conn->SelectLimit($sql, 1);
+                       if ($rs && !$rs->EOF) {
+                               $dbts = reset($rs->fields);
+                               $rs->Close();
+                               $dbt = $conn->UnixTimeStamp($dbts);
+                               $t = time();
+
+                               if (abs($dbt - $t) >= $sync_seconds) {
+                                       $msg = __FILE__ .
+                                               ": Server time for webserver 
{$_SERVER['HTTP_HOST']} not in synch with database: " .
+                                               " database=$dbt ($dbts), 
webserver=$t (diff=". (abs($dbt - $t) / 60) . ' minutes)';
+                                       error_log($msg);
+                                       if ($debug) {
+                                               
ADOConnection::outp("<p>$msg</p>");
+                                       }
+                               }
+                       }
+               }
+
+               return true;
+       }
+}
+
+ADODB_Session::_init();
+register_shutdown_function('session_write_close');
+
+// for backwards compatability only
+function adodb_sess_open($save_path, $session_name, $persist = true) {
+       return ADODB_Session::open($save_path, $session_name, $persist);
+}
+
+// for backwards compatability only
+function adodb_sess_gc($t)
+{      
+       return ADODB_Session::gc($t);
+}
+
+?>
Index: phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql
diff -u phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql:1.2 
phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql:1.3
--- phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql:1.2     Thu Dec 30 
06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql Tue Feb 21 13:47:42 2006
@@ -1,4 +1,4 @@
--- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql,v 1.2 
2004/12/30 06:47:33 skwashd Exp $
+-- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.mysql.sql,v 1.3 
2006/02/21 13:47:42 skwashd Exp $
 
 CREATE DATABASE /*! IF NOT EXISTS */ adodb_sessions;
 
Index: phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql
diff -u phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql:1.2 
phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql:1.3
--- phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql:1.2       Thu Dec 
30 06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql   Tue Feb 21 
13:47:42 2006
@@ -1,4 +1,4 @@
--- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql,v 1.2 
2004/12/30 06:47:33 skwashd Exp $
+-- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.oracle.clob.sql,v 1.3 
2006/02/21 13:47:42 skwashd Exp $
 
 DROP TABLE adodb_sessions;
 
Index: phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql
diff -u phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql:1.2 
phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql:1.3
--- phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql:1.2    Thu Dec 30 
06:47:33 2004
+++ phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql        Tue Feb 21 
13:47:42 2006
@@ -1,4 +1,4 @@
--- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql,v 1.2 
2004/12/30 06:47:33 skwashd Exp $
+-- $CVSHeader: phpgwapi/inc/adodb/session/adodb-sessions.oracle.sql,v 1.3 
2006/02/21 13:47:42 skwashd Exp $
 
 DROP TABLE adodb_sessions;
 
Index: phpgwapi/inc/adodb/session/crypt.inc.php
diff -u phpgwapi/inc/adodb/session/crypt.inc.php:1.2 
phpgwapi/inc/adodb/session/crypt.inc.php:1.3
--- phpgwapi/inc/adodb/session/crypt.inc.php:1.2        Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/session/crypt.inc.php    Tue Feb 21 13:47:42 2006
@@ -1,64 +1,161 @@
-<?php
-//      Session Encryption by Ari Kuorikoski <address@hidden>
-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;
-               }
-
-}
+<?php
+//      Session Encryption by Ari Kuorikoski <address@hidden>
+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;
+               }
+
+}
+
+
+class SHA1Crypt{
+
+               function keyED($txt,$encrypt_key)
+               {
+
+                               $encrypt_key = sha1($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 = sha1(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++){
+
+                                               $sha1 = substr($txt,$i,1);
+
+                                               $i++;
+
+                                               $tmp.= (substr($txt,$i,1) ^ 
$sha1);
+
+                               }
+
+                               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;
+
+               }
+
+
+
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/benchmark.php
diff -u phpgwapi/inc/adodb/tests/benchmark.php:1.2 
phpgwapi/inc/adodb/tests/benchmark.php:1.3
--- phpgwapi/inc/adodb/tests/benchmark.php:1.2  Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/benchmark.php      Tue Feb 21 13:47:42 2006
@@ -1,84 +1,84 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <title>ADODB Benchmarks</title>
-</head> 
-
-<body>
-<?php 
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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 = true;
-$testado = true; 
-$testibase = true;
-$testaccess = true;
-$testmysql = true;
-$testsqlite = 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,$ADODB_FETCH_MODE;
-
-       adodb_backtrace();
-       
-       $max = 100;
-       $sql = 'select * from ADOXYZ';
-       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       
-       //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);
-       if (!$rs){
-               print "Error in recordset<p>";
-               return;
-       }       
-       $arr = $rs->GetArray();
-       //$db->debug = true;
-       global $ADODB_COUNTRECS;
-       $ADODB_COUNTRECS = false;
-       $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));
-       flush();
-
-
-               //$db->Close();
-}
-include("testdatabases.inc.php");
-
-?>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+       <title>ADODB Benchmarks</title>
+</head> 
+
+<body>
+<?php 
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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 = true;
+$testado = true; 
+$testibase = true;
+$testaccess = true;
+$testmysql = true;
+$testsqlite = 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,$ADODB_FETCH_MODE;
+
+       adodb_backtrace();
+       
+       $max = 100;
+       $sql = 'select * from ADOXYZ';
+       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       
+       //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);
+       if (!$rs){
+               print "Error in recordset<p>";
+               return;
+       }       
+       $arr = $rs->GetArray();
+       //$db->debug = true;
+       global $ADODB_COUNTRECS;
+       $ADODB_COUNTRECS = false;
+       $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));
+       flush();
+
+
+               //$db->Close();
+}
+include("testdatabases.inc.php");
+
+?>
+
+
+</body>
+</html>
Index: phpgwapi/inc/adodb/tests/client.php
diff -u phpgwapi/inc/adodb/tests/client.php:1.2 
phpgwapi/inc/adodb/tests/client.php:1.3
--- phpgwapi/inc/adodb/tests/client.php:1.2     Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/client.php Tue Feb 21 13:47:42 2006
@@ -1,194 +1,198 @@
-<html>
-<body bgcolor=white>
-<?php
-/** 
- * V4.50 6 July 2004  (c) 2001-2002 John Lim (address@hidden). 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/phplens/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]
- .
- . 
- .
-*/
-?>
+<html>
+<body bgcolor=white>
+<?php
+/** 
+ * V4.50 6 July 2004  (c) 2001-2002 John Lim (address@hidden). 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
+ 
+ echo PHP_VERSION,'<br>';
+ var_dump(parse_url('odbc_mssql://userserver/'));
+ die();
+ 
+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/phplens/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]
+ .
+ . 
+ .
+*/
+?>
Index: phpgwapi/inc/adodb/tests/pdo.php
diff -u phpgwapi/inc/adodb/tests/pdo.php:1.2 
phpgwapi/inc/adodb/tests/pdo.php:1.3
--- phpgwapi/inc/adodb/tests/pdo.php:1.2        Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/pdo.php    Tue Feb 21 13:47:42 2006
@@ -1,42 +1,94 @@
-<?php
-error_reporting(E_ALL);
-include('../adodb.inc.php');
-
-
-
-echo "New Connection\n";
-$DB = NewADOConnection('pdo');
-echo "Connect\n";
-$pdo_connection_string = 'odbc:nwind';
-$DB->Connect($pdo_connection_string,'','') || die("CONNECT FAILED");
-echo "Execute\n";
-
-
-
-//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-$rs = $DB->Execute("select * from products where productid<3");
-echo "e=".$DB->ErrorNo() . " ".($DB->ErrorMsg())."\n";
-
-
-//print_r(get_class_methods($DB->_stmt));
-
-if (!$rs) die("NO RS");
-echo "FETCH\n";
-$cnt = 0;
-while (!$rs->EOF) {
-       print_r($rs->fields);
-       $rs->MoveNext();
-       if ($cnt++ > 1000) break;
-}
-
-echo "<br>--------------------------------------------------------<br>\n\n\n";
-
-$stmt = $DB->PrepareStmt("select * from products");
-$rs = $stmt->Execute();
-echo "e=".$stmt->ErrorNo() . " ".($stmt->ErrorMsg())."\n";
-while ($arr = $rs->FetchRow()) {
-       print_r($arr);
-}
-die("DONE\n");
-
+<?php
+error_reporting(E_ALL);
+include('../adodb.inc.php');
+
+echo "<pre>";
+try {
+       echo "New Connection\n";
+       
+       
+       $dsn = 'pdo_mysql://root:@localhost/northwind?persist';
+       
+       if (!empty($dsn)) {
+               $DB =& NewADOConnection($dsn) || die("CONNECT FAILED");
+               $connstr = $dsn;
+       } else {
+       
+               $DB = NewADOConnection('pdo');
+               
+               echo "Connect\n";
+               
+               $u = ''; $p = '';
+               /*
+               $connstr = 'odbc:nwind';
+               
+               $connstr = 'oci:';
+               $u = 'scott';
+               $p = 'natsoft';
+               
+               
+               $connstr ="sqlite:d:\inetpub\adodb\sqlite.db";
+               */
+               
+               $connstr = "mysql:dbname=northwind";
+               $u = 'root';
+               
+               $connstr = "pgsql:dbname=test";
+               $u = 'tester';
+               $p = 'test';
+               
+               $DB->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+       
+       }
+       
+       echo "connection string=$connstr\n Execute\n";
+       
+       //$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       $rs = $DB->Execute("select * from ADOXYZ where id<3");
+       if  ($DB->ErrorNo()) echo "*** errno=".$DB->ErrorNo() . " 
".($DB->ErrorMsg())."\n";
+       
+       
+       //print_r(get_class_methods($DB->_stmt));
+       
+       if (!$rs) die("NO RS");
+       
+       echo "Meta\n";
+       for ($i=0; $i < $rs->NumCols(); $i++) {
+               var_dump($rs->FetchField($i));
+               echo "<br>";
+       }
+       
+       echo "FETCH\n";
+       $cnt = 0;
+       while (!$rs->EOF) {
+               adodb_pr($rs->fields); 
+               $rs->MoveNext();
+               if ($cnt++ > 1000) break;
+       }
+       
+       echo 
"<br>--------------------------------------------------------<br>\n\n\n";
+       
+       $stmt = $DB->PrepareStmt("select * from ADOXYZ");
+       
+       $rs = $stmt->Execute();
+       $cols = $stmt->NumCols(); // execute required
+       
+       echo "COLS = $cols";
+       for($i=1;$i<=$cols;$i++) {
+               $v = $stmt->_stmt->getColumnMeta($i);
+               var_dump($v);
+       }
+       
+       echo "e=".$stmt->ErrorNo() . " ".($stmt->ErrorMsg())."\n";
+       while ($arr = $rs->FetchRow()) {
+               adodb_pr($arr);
+       }
+       die("DONE\n");
+
+} catch (exception $e) {
+       echo "<pre>";
+       echo $e;
+       echo "</pre>";
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/test-datadict.php
diff -u phpgwapi/inc/adodb/tests/test-datadict.php:1.2 
phpgwapi/inc/adodb/tests/test-datadict.php:1.3
--- phpgwapi/inc/adodb/tests/test-datadict.php:1.2      Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/test-datadict.php  Tue Feb 21 13:47:42 2006
@@ -1,248 +1,248 @@
-<?php
-/*
-
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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.
-
-*/
-
-error_reporting(E_ALL);
-include_once('../adodb.inc.php');
-
-foreach(array('sapdb','sybase','mysqlt','access','oci8','postgres','odbc_mssql','odbc','db2','firebird','informix')
 as $dbType) {
-       echo "<h3>$dbType</h3><p>";
-       $db = NewADOConnection($dbType);
-       $dict = NewDataDictionary($db);
-
-       if (!$dict) continue;
-       $dict->debug = 1;
-       
-       $opts = array('REPLACE','mysql' => 'TYPE=INNODB', 'oci8' => 'TABLESPACE 
USERS');
-       
-/*     $flds = array(
-               array('id',     'I',                                            
                
-                                                       'AUTO','KEY'),
-                                                       
-               array('name' => 'firstname', 'type' => 'varchar','size' => 30,
-                                                       'DEFAULT'=>'Joan'),
-                                                       
-               array('lastname','varchar',28,
-                                                       
'DEFAULT'=>'Chen','key'),
-                                                       
-               array('averylonglongfieldname','X',1024,
-                                                       'NOTNULL','default' => 
'test'),
-                                                       
-               array('price','N','7.2',
-                                                       'NOTNULL','default' => 
'0.00'),
-                                                       
-               array('MYDATE', 'D', 
-                                                       'DEFDATE'),
-               array('TS','T',
-                                                       'DEFTIMESTAMP')
-       );*/
-       
-       $flds = "
-ID            I           AUTO KEY,
-FIRSTNAME     VARCHAR(30) DEFAULT 'Joan',
-LASTNAME      VARCHAR(28) DEFAULT 'Chen' key,
-averylonglongfieldname X(1024) DEFAULT 'test',
-price         N(7.2)  DEFAULT '0.00',
-MYDATE        D      DEFDATE,
-BIGFELLOW     X      NOTNULL,
-TS            T      DEFTIMESTAMP";
-
-
-       $sqla = 
$dict->CreateDatabase('KUTU',array('postgres'=>"LOCATION='/u01/postdata'"));
-       $dict->SetSchema('KUTU');
-       
-       $sqli = ($dict->CreateTableSQL('testtable',$flds, $opts));
-       $sqla =& array_merge($sqla,$sqli);
-       
-       $sqli = 
$dict->CreateIndexSQL('idx','testtable','firstname,lastname',array('BITMAP','FULLTEXT','CLUSTERED','HASH'));
-       $sqla =& array_merge($sqla,$sqli);
-       $sqli = 
$dict->CreateIndexSQL('idx2','testtable','price,lastname');//,array('BITMAP','FULLTEXT','CLUSTERED'));
-       $sqla =& array_merge($sqla,$sqli);
-       
-       $addflds = array(array('height', 'F'),array('weight','F'));
-       $sqli = $dict->AddColumnSQL('testtable',$addflds);
-       $sqla =& array_merge($sqla,$sqli);
-       $addflds = array(array('height', 
'F','NOTNULL'),array('weight','F','NOTNULL'));
-       $sqli = $dict->AlterColumnSQL('testtable',$addflds);
-       $sqla =& array_merge($sqla,$sqli);
-       
-       
-       printsqla($dbType,$sqla);
-       
-       if (file_exists('d:\inetpub\wwwroot\php\phplens\adodb\adodb.inc.php'))
-       if ($dbType == 'mysqlt') {
-               $db->Connect('localhost', "root", "", "test");
-               $dict->SetSchema('');
-               $sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
-               if ($sqla2) printsqla($dbType,$sqla2);
-       }
-       if ($dbType == 'postgres') {
-               if (@$db->Connect('localhost', "tester", "test", "test"));
-               $dict->SetSchema('');
-               $sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
-               if ($sqla2) printsqla($dbType,$sqla2);
-       }
-       
-       if ($dbType == 'odbc_mssql') {
-               $dsn = $dsn = "PROVIDER=MSDASQL;Driver={SQL 
Server};Server=localhost;Database=northwind;";
-               if (@$db->Connect($dsn, "sa", "natsoft", "test"));
-               $dict->SetSchema('');
-               $sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
-               if ($sqla2) printsqla($dbType,$sqla2);
-       }
-       
-       
-       
-       adodb_pr($dict->databaseType);
-       printsqla($dbType, $dict->DropColumnSQL('table',array('`col`','col2')));
-       printsqla($dbType, $dict->ChangeTableSQL('adoxyz','LASTNAME 
varchar(32)'));
-       
-}
-
-function printsqla($dbType,$sqla)
-{
-       print "<pre>";
-       //print_r($dict->MetaTables());
-       foreach($sqla as $s) {
-               $s = htmlspecialchars($s);
-               print "$s;\n";
-               if ($dbType == 'oci8') print "/\n";
-       }
-       print "</pre><hr>";
-}
-
-/***
-
-Generated SQL:
-
-mysql
-
-CREATE DATABASE KUTU;
-DROP TABLE KUTU.testtable;
-CREATE TABLE KUTU.testtable (
-id               INTEGER NOT NULL AUTO_INCREMENT,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) NOT NULL DEFAULT 'Chen',
-averylonglongfieldname LONGTEXT NOT NULL,
-price            NUMERIC(7,2) NOT NULL DEFAULT 0.00,
-MYDATE           DATE DEFAULT CURDATE(),
-                 PRIMARY KEY (id, lastname)
-)TYPE=ISAM;
-CREATE FULLTEXT INDEX idx ON KUTU.testtable (firstname,lastname);
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-ALTER TABLE KUTU.testtable  ADD height           DOUBLE;
-ALTER TABLE KUTU.testtable  ADD weight           DOUBLE;
-ALTER TABLE KUTU.testtable  MODIFY COLUMN height           DOUBLE NOT NULL;
-ALTER TABLE KUTU.testtable  MODIFY COLUMN weight           DOUBLE NOT NULL;
-
-
---------------------------------------------------------------------------------
-
-oci8
-
-CREATE USER KUTU IDENTIFIED BY tiger;
-/
-GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO 
KUTU;
-/
-DROP TABLE KUTU.testtable CASCADE CONSTRAINTS;
-/
-CREATE TABLE KUTU.testtable (
-id               NUMBER(16) NOT NULL,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
-averylonglongfieldname CLOB NOT NULL,
-price            NUMBER(7,2) DEFAULT 0.00 NOT NULL,
-MYDATE           DATE DEFAULT TRUNC(SYSDATE),
-                 PRIMARY KEY (id, lastname)
-)TABLESPACE USERS;
-/
-DROP SEQUENCE KUTU.SEQ_testtable;
-/
-CREATE SEQUENCE KUTU.SEQ_testtable;
-/
-CREATE OR REPLACE TRIGGER KUTU.TRIG_SEQ_testtable BEFORE insert ON 
KUTU.testtable 
-               FOR EACH ROW
-               BEGIN
-                 select KUTU.SEQ_testtable.nextval into :new.id from dual;
-               END;
-/
-CREATE BITMAP INDEX idx ON KUTU.testtable (firstname,lastname);
-/
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-/
-ALTER TABLE testtable ADD (
- height           NUMBER,
- weight           NUMBER);
-/
-ALTER TABLE testtable MODIFY(
- height           NUMBER NOT NULL,
- weight           NUMBER NOT NULL);
-/
-
-
---------------------------------------------------------------------------------
-
-postgres
-AlterColumnSQL not supported for PostgreSQL
-
-
-CREATE DATABASE KUTU LOCATION='/u01/postdata';
-DROP TABLE KUTU.testtable;
-CREATE TABLE KUTU.testtable (
-id               SERIAL,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
-averylonglongfieldname TEXT NOT NULL,
-price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
-MYDATE           DATE DEFAULT CURRENT_DATE,
-                 PRIMARY KEY (id, lastname)
-);
-CREATE INDEX idx ON KUTU.testtable USING HASH (firstname,lastname);
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-ALTER TABLE KUTU.testtable  ADD height           FLOAT8;
-ALTER TABLE KUTU.testtable  ADD weight           FLOAT8;
-
-
---------------------------------------------------------------------------------
-
-odbc_mssql
-
-CREATE DATABASE KUTU;
-DROP TABLE KUTU.testtable;
-CREATE TABLE KUTU.testtable (
-id               INT IDENTITY(1,1) NOT NULL,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
-averylonglongfieldname TEXT NOT NULL,
-price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
-MYDATE           DATETIME DEFAULT GetDate(),
-                 PRIMARY KEY (id, lastname)
-);
-CREATE CLUSTERED INDEX idx ON KUTU.testtable (firstname,lastname);
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-ALTER TABLE KUTU.testtable  ADD
- height           REAL,
- weight           REAL;
-ALTER TABLE KUTU.testtable  ALTER COLUMN height           REAL NOT NULL;
-ALTER TABLE KUTU.testtable  ALTER COLUMN weight           REAL NOT NULL;
-
-
---------------------------------------------------------------------------------
-*/
-
-
-echo "<h1>Test XML Schema</h1>";
-$ff = file('xmlschema.xml');
-echo "<pre>";
-foreach($ff as $xml) echo htmlspecialchars($xml);
-echo "</pre>";
-include_once('test-xmlschema.php');
+<?php
+/*
+
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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.
+
+*/
+
+error_reporting(E_ALL);
+include_once('../adodb.inc.php');
+
+foreach(array('sapdb','sybase','mysqlt','access','oci8po','postgres','odbc_mssql','odbc','db2','firebird','informix')
 as $dbType) {
+       echo "<h3>$dbType</h3><p>";
+       $db = NewADOConnection($dbType);
+       $dict = NewDataDictionary($db);
+
+       if (!$dict) continue;
+       $dict->debug = 1;
+       
+       $opts = array('REPLACE','mysql' => 'TYPE=INNODB', 'oci8' => 'TABLESPACE 
USERS');
+       
+/*     $flds = array(
+               array('id',     'I',                                            
                
+                                                       'AUTO','KEY'),
+                                                       
+               array('name' => 'firstname', 'type' => 'varchar','size' => 30,
+                                                       'DEFAULT'=>'Joan'),
+                                                       
+               array('lastname','varchar',28,
+                                                       
'DEFAULT'=>'Chen','key'),
+                                                       
+               array('averylonglongfieldname','X',1024,
+                                                       'NOTNULL','default' => 
'test'),
+                                                       
+               array('price','N','7.2',
+                                                       'NOTNULL','default' => 
'0.00'),
+                                                       
+               array('MYDATE', 'D', 
+                                                       'DEFDATE'),
+               array('TS','T',
+                                                       'DEFTIMESTAMP')
+       );*/
+       
+       $flds = "
+ID            I           AUTO KEY,
+FIRSTNAME     VARCHAR(30) DEFAULT 'Joan',
+LASTNAME      VARCHAR(28) DEFAULT 'Chen' key,
+averylonglongfieldname X(1024) DEFAULT 'test',
+price         N(7.2)  DEFAULT '0.00',
+MYDATE        D      DEFDATE,
+BIGFELLOW     X      NOTNULL,
+TS            T      DEFTIMESTAMP";
+
+
+       $sqla = 
$dict->CreateDatabase('KUTU',array('postgres'=>"LOCATION='/u01/postdata'"));
+       $dict->SetSchema('KUTU');
+       
+       $sqli = ($dict->CreateTableSQL('testtable',$flds, $opts));
+       $sqla = array_merge($sqla,$sqli);
+       
+       $sqli = 
$dict->CreateIndexSQL('idx','testtable','firstname,lastname',array('BITMAP','FULLTEXT','CLUSTERED','HASH'));
+       $sqla = array_merge($sqla,$sqli);
+       $sqli = 
$dict->CreateIndexSQL('idx2','testtable','price,lastname');//,array('BITMAP','FULLTEXT','CLUSTERED'));
+       $sqla = array_merge($sqla,$sqli);
+       
+       $addflds = array(array('height', 'F'),array('weight','F'));
+       $sqli = $dict->AddColumnSQL('testtable',$addflds);
+       $sqla = array_merge($sqla,$sqli);
+       $addflds = array(array('height', 
'F','NOTNULL'),array('weight','F','NOTNULL'));
+       $sqli = $dict->AlterColumnSQL('testtable',$addflds);
+       $sqla = array_merge($sqla,$sqli);
+       
+       
+       printsqla($dbType,$sqla);
+       
+       if (file_exists('d:\inetpub\wwwroot\php\phplens\adodb\adodb.inc.php'))
+       if ($dbType == 'mysqlt') {
+               $db->Connect('localhost', "root", "", "test");
+               $dict->SetSchema('');
+               $sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
+               if ($sqla2) printsqla($dbType,$sqla2);
+       }
+       if ($dbType == 'postgres') {
+               if (@$db->Connect('localhost', "tester", "test", "test"));
+               $dict->SetSchema('');
+               $sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
+               if ($sqla2) printsqla($dbType,$sqla2);
+       }
+       
+       if ($dbType == 'odbc_mssql') {
+               $dsn = $dsn = "PROVIDER=MSDASQL;Driver={SQL 
Server};Server=localhost;Database=northwind;";
+               if (@$db->Connect($dsn, "sa", "natsoft", "test"));
+               $dict->SetSchema('');
+               $sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
+               if ($sqla2) printsqla($dbType,$sqla2);
+       }
+       
+       
+       
+       adodb_pr($dict->databaseType);
+       printsqla($dbType, $dict->DropColumnSQL('table',array('my 
col','`col2_with_Quotes`','A_col3','col3(10)')));
+       printsqla($dbType, $dict->ChangeTableSQL('adoxyz','LASTNAME 
varchar(32)'));
+       
+}
+
+function printsqla($dbType,$sqla)
+{
+       print "<pre>";
+       //print_r($dict->MetaTables());
+       foreach($sqla as $s) {
+               $s = htmlspecialchars($s);
+               print "$s;\n";
+               if ($dbType == 'oci8') print "/\n";
+       }
+       print "</pre><hr />";
+}
+
+/***
+
+Generated SQL:
+
+mysql
+
+CREATE DATABASE KUTU;
+DROP TABLE KUTU.testtable;
+CREATE TABLE KUTU.testtable (
+id               INTEGER NOT NULL AUTO_INCREMENT,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) NOT NULL DEFAULT 'Chen',
+averylonglongfieldname LONGTEXT NOT NULL,
+price            NUMERIC(7,2) NOT NULL DEFAULT 0.00,
+MYDATE           DATE DEFAULT CURDATE(),
+                 PRIMARY KEY (id, lastname)
+)TYPE=ISAM;
+CREATE FULLTEXT INDEX idx ON KUTU.testtable (firstname,lastname);
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+ALTER TABLE KUTU.testtable  ADD height           DOUBLE;
+ALTER TABLE KUTU.testtable  ADD weight           DOUBLE;
+ALTER TABLE KUTU.testtable  MODIFY COLUMN height           DOUBLE NOT NULL;
+ALTER TABLE KUTU.testtable  MODIFY COLUMN weight           DOUBLE NOT NULL;
+
+
+--------------------------------------------------------------------------------
+
+oci8
+
+CREATE USER KUTU IDENTIFIED BY tiger;
+/
+GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO 
KUTU;
+/
+DROP TABLE KUTU.testtable CASCADE CONSTRAINTS;
+/
+CREATE TABLE KUTU.testtable (
+id               NUMBER(16) NOT NULL,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
+averylonglongfieldname CLOB NOT NULL,
+price            NUMBER(7,2) DEFAULT 0.00 NOT NULL,
+MYDATE           DATE DEFAULT TRUNC(SYSDATE),
+                 PRIMARY KEY (id, lastname)
+)TABLESPACE USERS;
+/
+DROP SEQUENCE KUTU.SEQ_testtable;
+/
+CREATE SEQUENCE KUTU.SEQ_testtable;
+/
+CREATE OR REPLACE TRIGGER KUTU.TRIG_SEQ_testtable BEFORE insert ON 
KUTU.testtable 
+               FOR EACH ROW
+               BEGIN
+                 select KUTU.SEQ_testtable.nextval into :new.id from dual;
+               END;
+/
+CREATE BITMAP INDEX idx ON KUTU.testtable (firstname,lastname);
+/
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+/
+ALTER TABLE testtable ADD (
+ height           NUMBER,
+ weight           NUMBER);
+/
+ALTER TABLE testtable MODIFY(
+ height           NUMBER NOT NULL,
+ weight           NUMBER NOT NULL);
+/
+
+
+--------------------------------------------------------------------------------
+
+postgres
+AlterColumnSQL not supported for PostgreSQL
+
+
+CREATE DATABASE KUTU LOCATION='/u01/postdata';
+DROP TABLE KUTU.testtable;
+CREATE TABLE KUTU.testtable (
+id               SERIAL,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
+averylonglongfieldname TEXT NOT NULL,
+price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
+MYDATE           DATE DEFAULT CURRENT_DATE,
+                 PRIMARY KEY (id, lastname)
+);
+CREATE INDEX idx ON KUTU.testtable USING HASH (firstname,lastname);
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+ALTER TABLE KUTU.testtable  ADD height           FLOAT8;
+ALTER TABLE KUTU.testtable  ADD weight           FLOAT8;
+
+
+--------------------------------------------------------------------------------
+
+odbc_mssql
+
+CREATE DATABASE KUTU;
+DROP TABLE KUTU.testtable;
+CREATE TABLE KUTU.testtable (
+id               INT IDENTITY(1,1) NOT NULL,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
+averylonglongfieldname TEXT NOT NULL,
+price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
+MYDATE           DATETIME DEFAULT GetDate(),
+                 PRIMARY KEY (id, lastname)
+);
+CREATE CLUSTERED INDEX idx ON KUTU.testtable (firstname,lastname);
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+ALTER TABLE KUTU.testtable  ADD
+ height           REAL,
+ weight           REAL;
+ALTER TABLE KUTU.testtable  ALTER COLUMN height           REAL NOT NULL;
+ALTER TABLE KUTU.testtable  ALTER COLUMN weight           REAL NOT NULL;
+
+
+--------------------------------------------------------------------------------
+*/
+
+
+echo "<h1>Test XML Schema</h1>";
+$ff = file('xmlschema.xml');
+echo "<pre>";
+foreach($ff as $xml) echo htmlspecialchars($xml);
+echo "</pre>";
+include_once('test-xmlschema.php');
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/test-pgblob.php
diff -u phpgwapi/inc/adodb/tests/test-pgblob.php:1.2 
phpgwapi/inc/adodb/tests/test-pgblob.php:1.3
--- phpgwapi/inc/adodb/tests/test-pgblob.php:1.2        Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/test-pgblob.php    Tue Feb 21 13:47:42 2006
@@ -1,88 +1,88 @@
-<?php
-
-function getmicrotime()
-{
-       $t = microtime();
-       $t = explode(' ',$t);
-       return (float)$t[1]+ (float)$t[0];
-}
-
-function doloop()
-{
-global $db,$MAX;
-       
-       $sql = "select id,firstname,lastname from adoxyz where 
-               firstname not like ? and lastname not like ? and id=?";
-       $offset = 0;
-       /*$sql = "select * from juris9.employee join juris9.emp_perf_plan on 
epp_empkey = emp_id 
-               where emp_name not like ? and emp_name not like ? and 
emp_id=28000+?";
-       $offset = 28000;*/
-       for ($i=1; $i <= $MAX; $i++) {
-               $db->Param(false);
-               $x = (rand() % 10) + 1;
-               $db->debug= ($i==1);
-               $id = $db->GetOne($sql,
-                       array('Z%','Z%',$x));
-               if($id != $offset+$x) {
-                       print "<p>Error at $x";
-                       break;
-               }
-       }
-}
-
-include_once('../adodb.inc.php');
-$db = NewADOConnection('postgres7');
-$db->PConnect('localhost','tester','test','test') || die("failed connection");
-
-$enc = 
"GIF89a%01%00%01%00%80%FF%00%C0%C0%C0%00%00%00%21%F9%04%01%00%00%00%00%2C%00%00%00%00%01%00%01%00%00%01%012%00%3Bt_clear.gif%0D";
-$val = rawurldecode($enc);
-
-$MAX = 1000;
-
-adodb_pr($db->ServerInfo());
-
-echo "<h4>Testing PREPARE/EXECUTE PLAN</h4>";
-
-
-$db->_bindInputArray = true; // requires postgresql 7.3+ and ability to modify 
database
-$t = getmicrotime();
-doloop();
-echo '<p>',$MAX,' times, with plan=',getmicrotime() - $t,'</p>';
-
-
-$db->_bindInputArray = false;
-$t = getmicrotime();
-doloop();
-echo '<p>',$MAX,' times, no plan=',getmicrotime() - $t,'</p>';
-
-
-
-echo "<h4>Testing UPDATEBLOB</h4>";
-$db->debug=1;
-
-### TEST BEGINS
-
-$db->Execute("insert into photos (id,name) values(9999,'dot.gif')");
-$db->UpdateBlob('photos','photo',$val,'id=9999');
-$v = $db->GetOne('select photo from photos where id=9999');
-
-
-### CLEANUP
-
-$db->Execute("delete from photos where id=9999");
-
-### VALIDATION
-
-if ($v !== $val) echo "<b>*** ERROR: Inserted value does not match downloaded 
val<b>";
-else echo "<b>*** OK: Passed</b>";
-
-echo "<pre>";
-echo "INSERTED: ", $enc;
-echo "<hr>";
-echo"RETURNED: ", rawurlencode($v);
-echo "<hr><p>";
-echo "INSERTED: ", $val;
-echo "<hr>";
-echo "RETURNED: ", $v;
-
+<?php
+
+function getmicrotime()
+{
+       $t = microtime();
+       $t = explode(' ',$t);
+       return (float)$t[1]+ (float)$t[0];
+}
+
+function doloop()
+{
+global $db,$MAX;
+       
+       $sql = "select id,firstname,lastname from adoxyz where 
+               firstname not like ? and lastname not like ? and id=?";
+       $offset = 0;
+       /*$sql = "select * from juris9.employee join juris9.emp_perf_plan on 
epp_empkey = emp_id 
+               where emp_name not like ? and emp_name not like ? and 
emp_id=28000+?";
+       $offset = 28000;*/
+       for ($i=1; $i <= $MAX; $i++) {
+               $db->Param(false);
+               $x = (rand() % 10) + 1;
+               $db->debug= ($i==1);
+               $id = $db->GetOne($sql,
+                       array('Z%','Z%',$x));
+               if($id != $offset+$x) {
+                       print "<p>Error at $x";
+                       break;
+               }
+       }
+}
+
+include_once('../adodb.inc.php');
+$db = NewADOConnection('postgres7');
+$db->PConnect('localhost','tester','test','test') || die("failed connection");
+
+$enc = 
"GIF89a%01%00%01%00%80%FF%00%C0%C0%C0%00%00%00%21%F9%04%01%00%00%00%00%2C%00%00%00%00%01%00%01%00%00%01%012%00%3Bt_clear.gif%0D";
+$val = rawurldecode($enc);
+
+$MAX = 1000;
+
+adodb_pr($db->ServerInfo());
+
+echo "<h4>Testing PREPARE/EXECUTE PLAN</h4>";
+
+
+$db->_bindInputArray = true; // requires postgresql 7.3+ and ability to modify 
database
+$t = getmicrotime();
+doloop();
+echo '<p>',$MAX,' times, with plan=',getmicrotime() - $t,'</p>';
+
+
+$db->_bindInputArray = false;
+$t = getmicrotime();
+doloop();
+echo '<p>',$MAX,' times, no plan=',getmicrotime() - $t,'</p>';
+
+
+
+echo "<h4>Testing UPDATEBLOB</h4>";
+$db->debug=1;
+
+### TEST BEGINS
+
+$db->Execute("insert into photos (id,name) values(9999,'dot.gif')");
+$db->UpdateBlob('photos','photo',$val,'id=9999');
+$v = $db->GetOne('select photo from photos where id=9999');
+
+
+### CLEANUP
+
+$db->Execute("delete from photos where id=9999");
+
+### VALIDATION
+
+if ($v !== $val) echo "<b>*** ERROR: Inserted value does not match downloaded 
val<b>";
+else echo "<b>*** OK: Passed</b>";
+
+echo "<pre>";
+echo "INSERTED: ", $enc;
+echo "<hr />";
+echo"RETURNED: ", rawurlencode($v);
+echo "<hr /><p>";
+echo "INSERTED: ", $val;
+echo "<hr />";
+echo "RETURNED: ", $v;
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/test-php5.php
diff -u phpgwapi/inc/adodb/tests/test-php5.php:1.2 
phpgwapi/inc/adodb/tests/test-php5.php:1.3
--- phpgwapi/inc/adodb/tests/test-php5.php:1.2  Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/test-php5.php      Tue Feb 21 13:47:42 2006
@@ -1,68 +1,78 @@
-<?php
-/*
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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.
- */
-
-
-error_reporting(E_ALL);
-
-$path = dirname(__FILE__);
-
-include("$path/../adodb-exceptions.inc.php");
-include("$path/../adodb.inc.php");     
-
-echo "<h3>PHP ".PHP_VERSION."</h3>\n";
-try {
-
-$dbt = 'oci8po';
-
-switch($dbt) {
-case 'oci8po':
-       $db = NewADOConnection("oci8po");
-       $db->Connect('','scott','natsoft');
-       break;
-default:
-case 'mysql':
-       $db = NewADOConnection("mysql");
-       $db->Connect('localhost','root','','test');
-       break;
-       
-case 'mysqli':
-       $db = NewADOConnection("mysqli://root:@localhost/test");
-       //$db->Connect('localhost','root','','test');
-       break;
-}
-
-$db->debug=1;
-
-$cnt = $db->GetOne("select count(*) from adoxyz where ?<id and 
id<?",array(10,20));
-$stmt = $db->Prepare("select * from adoxyz where ?<id and id<?");
-if (!$stmt) echo $db->ErrorMsg(),"\n";
-$rs = $db->Execute($stmt,array(10,20));
-
-$i = 0;
-foreach($rs as  $v) {
-       $i += 1;
-       echo "rec $i: "; adodb_pr($v); adodb_pr($rs->fields);
-       flush();
-}
-
-
-if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
-
-
-$rs = $db->Execute("select bad from badder");
-
-} catch (exception $e) {
-       adodb_pr($e);
-       echo "<h3>adodb_backtrace:</h3>\n";
-       $e = adodb_backtrace($e->gettrace());
-}
-
-$rs = $db->Execute("select distinct id, firstname,lastname from adoxyz order 
by id");
-echo "Result=\n",$rs;
+<?php
+/*
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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.
+ */
+
+
+error_reporting(E_ALL);
+
+$path = dirname(__FILE__);
+
+include("$path/../adodb-exceptions.inc.php");
+include("$path/../adodb.inc.php");     
+
+echo "<h3>PHP ".PHP_VERSION."</h3>\n";
+try {
+
+$dbt = 'mysql';
+
+try {
+switch($dbt) {
+case 'oci8po':
+       $db = NewADOConnection("oci8po");
+       
+       $db->Connect('','scott','natsoft');
+       break;
+default:
+case 'mysql':
+       $db = NewADOConnection("mysql");
+       $db->Connect('localhost','roots','','northwind');
+       break;
+       
+case 'mysqli':
+       $db = NewADOConnection("mysqli://root:@localhost/northwind");
+       //$db->Connect('localhost','root','','test');
+       break;
+}
+} catch (exception $e){
+       echo "Connect Failed";
+       adodb_pr($e);
+       die();
+}
+
+$db->debug=1;
+
+$cnt = $db->GetOne("select count(*) from adoxyz where ?<id and 
id<?",array(10,20));
+$stmt = $db->Prepare("select * from adoxyz where ?<id and id<?");
+if (!$stmt) echo $db->ErrorMsg(),"\n";
+$rs = $db->Execute($stmt,array(10,20));
+
+echo  "<hr /> Foreach Iterator Test (rand=".rand().")<hr />";
+$i = 0;
+foreach($rs as $v) {
+       $i += 1;
+       echo "rec $i: "; $s1 = adodb_pr($v,true); $s2 = 
adodb_pr($rs->fields,true);
+       if ($s1 != $s2 && !empty($v)) {adodb_pr($s1); adodb_pr($s2);}
+       else echo "passed<br>";
+       flush();
+}
+
+
+if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
+else echo "Count $i is correct<br>";
+
+$rs = $db->Execute("select bad from badder");
+
+} catch (exception $e) {
+       adodb_pr($e);
+       echo "<h3>adodb_backtrace:</h3>\n";
+       $e = adodb_backtrace($e->gettrace());
+}
+
+$rs = $db->Execute("select distinct id, firstname,lastname from adoxyz order 
by id");
+echo "Result=\n",$rs;
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/test-xmlschema.php
diff -u phpgwapi/inc/adodb/tests/test-xmlschema.php:1.2 
phpgwapi/inc/adodb/tests/test-xmlschema.php:1.3
--- phpgwapi/inc/adodb/tests/test-xmlschema.php:1.2     Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/test-xmlschema.php Tue Feb 21 13:47:42 2006
@@ -33,13 +33,13 @@
 //$schema->Destroy();
 
 
-$db2 = ADONewConnection('mssql');
-$db2->Connect('localhost','sa','natsoft','northwind') || die("Fail 2");
 
-$db2->Execute("drop table simple_table");
+print "<b>SQL to build xmlschema-mssql.xml</b>:\n<pre>";
 
+$db2 = ADONewConnection('mssql');
+$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
 
-print "<b>SQL to build xmlschema-mssql.xml</b>:\n<pre>";
+$db2->Execute("drop table simple_table");
 
 $schema = new adoSchema( $db2 );
 $sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
@@ -49,5 +49,6 @@
 
 $db2->debug=1;
 
-$db2->Execute($sql[0]);
+foreach ($sql as $s)
+$db2->Execute($s);
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/test.php
diff -u phpgwapi/inc/adodb/tests/test.php:1.2 
phpgwapi/inc/adodb/tests/test.php:1.3
--- phpgwapi/inc/adodb/tests/test.php:1.2       Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/test.php   Tue Feb 21 13:47:42 2006
@@ -1,1602 +1,1715 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-       
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-error_reporting(E_ALL);
-
-$ADODB_FLUSH = true;
-
-define('ADODB_ASSOC_CASE',0);
-
-if (PHP_VERSION < 5) include_once('../adodb-pear.inc.php');
-//--------------------------------------------------------------------------------------
-//define('ADODB_ASSOC_CASE',1);
-//
-function Err($msg)
-{
-       print "<b>$msg</b><br>";
-       flush();
-}
-
-function CheckWS($conn)
-{
-global $ADODB_EXTENSION;
-
-       include_once('../session/adodb-session.php');
-       if (defined('CHECKWSFAIL')){ echo " TESTING $conn ";flush();}
-       $saved = $ADODB_EXTENSION;
-       $db = ADONewConnection($conn);
-       $ADODB_EXTENSION = $saved;
-       if (headers_sent()) {
-               print "<p><b>White space detected in adodb-$conn.inc.php or 
include file...</b></p>";
-               //die();
-       }
-}
-
-function do_strtolower(&$arr)
-{
-       foreach($arr as $k => $v) {
-               if (is_object($v)) $arr[$k] = adodb_pr($v,true);
-               else $arr[$k] = strtolower($v);
-       }
-}
-
-
-function CountExecs($db, $sql, $inputarray)
-{
-global $EXECS;  $EXECS++;
-}
-
-function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
-{
-global $CACHED; $CACHED++;
-}
-
-// 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,$ADODB_FETCH_MODE, 
$HTTP_GET_VARS,$ADODB_COUNTRECS;
-
-?>     <form method=GET>
-       </p>
-       <table width=100% ><tr><td bgcolor=beige>&nbsp;</td></tr></table>
-       </p>
-<?php  
-       $create =false;
-       /*$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       
-       $rs = $db->Execute('select lastname,firstname,lastname,id from adoxyz');
-       $arr = $rs->GetAssoc();
-       echo "<pre>";print_r($arr);
-       die();*/
-       
-       GLOBAL $EXECS, $CACHED;
-       
-       $EXECS = 0;
-       $CACHED = 0;
-       //$db->Execute("drop table adodb_logsql");
-       if ((rand()%3) == 0) @$db->Execute("delete from adodb_logsql");
-       $db->debug=1;
-       
-       $db->fnExecute = 'CountExecs';
-       $db->fnCacheExecute = 'CountCachedExecs';
-       
-       if (empty($_GET['nolog'])) {
-               echo "<h3>SQL Logging enabled</h3>";
-               $db->LogSQL();/*
-               $sql =
-"SELECT t1.sid, t1.sid, t1.title, t1.hometext, t1.notes, t1.aid, t1.informant, 
-t2.url, t2.email, t1.catid, t3.title, t1.topic, t4.topicname, t4.topicimage, 
-t4.topictext, t1.score, t1.ratings, t1.counter, t1.comments, t1.acomm 
-FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, 
`nuke_topics` `t4` 
-       WHERE ((t2.aid=t1.aid) AND (t3.catid=t1.catid) AND 
(t4.topicid=t1.topic) 
-       AND ((t1.alanguage='german') OR (t1.alanguage='')) AND (t1.ihome='0')) 
-       ORDER BY t1.time DESC";
-               $db->SelectLimit($sql);
-               echo $db->ErrorMsg();*/
-       }
-       $ADODB_CACHE_DIR = dirname(TempNam('/tmp','testadodb'));
-       $db->debug = false;
-       //print $db->UnixTimeStamp('2003-7-22 23:00:00');
-       
-       $phpv = phpversion();
-       if (defined('ADODB_EXTENSION')) $ext = ' &nbsp; Extension 
'.ADODB_EXTENSION.' installed';
-       else $ext = '';
-       print "<h3>ADODB Version: $ADODB_vers Host: <i>$db->host</i> &nbsp; 
Database: <i>$db->database</i> &nbsp; PHP: $phpv $ext</h3>";
-       flush();
-
-       
-       $arr = $db->ServerInfo();
-       print_r($arr);
-       echo "<br>";
-       $e = error_reporting(E_ALL-E_WARNING);
-       flush();
-       
-       $tt  = $db->Time(); 
-       if ($tt == 0) echo '<br><b>$db->Time failed</b>';
-       else echo "<br>db->Time: ".date('d-m-Y H:i:s',$tt);
-       echo '<br>';
-       
-       echo "Date=",$db->UserDate('2002-04-07'),'<br>';
-       print "<i>date1</i> (1969-02-20) = ".$db->DBDate('1969-2-20');
-       print "<br><i>date1</i> (1999-02-20) = ".$db->DBDate('1999-2-20');
-       print "<br><i>date1.1</i> 1999 = ".$db->DBDate("'1999'");
-       print "<br><i>date2</i> (1970-1-2) = ".$db->DBDate(24*3600)."<p>";
-       print "<i>ts1</i> (1999-02-20 13:40:50) = ".$db->DBTimeStamp('1999-2-20 
1:40:50 pm');
-       print "<br><i>ts1.1</i> (1999-02-20 13:40:00) = 
".$db->DBTimeStamp('1999-2-20 13:40');
-       print "<br><i>ts2</i> (1999-02-20) = ".$db->DBTimeStamp('1999-2-20');
-       print "<br><i>ts3</i> (1970-1-2 +/- timezone) = 
".$db->DBTimeStamp(24*3600);
-       print "<br> Fractional TS (1999-2-20 13:40:50.91): 
".$db->DBTimeStamp($db->UnixTimeStamp('1999-2-20 13:40:50.91+1'));
-        $dd = $db->UnixDate('1999-02-20');
-       print "<br>unixdate</i> 1999-02-20 = ".date('Y-m-d',$dd)."<p>";
-       print "<br><i>ts4</i> =".($db->UnixTimeStamp("19700101000101")+8*3600);
-       print "<br><i>ts5</i> 
=".$db->DBTimeStamp($db->UnixTimeStamp("20040110092123"));
-       print "<br><i>ts6</i> =".$db->UserTimeStamp("20040110092123");
-       print "<br><i>ts7</i> =".$db->DBTimeStamp("20040110092123");
-       flush();
-       // mssql too slow in failing bad connection
-       if (false && $db->databaseType != 'mssql') {
-               print "<p>Testing bad connection. Ignore following error 
msgs:<br>";
-               $db2 = ADONewConnection();
-               $rez = $db2->Connect("bad connection");
-               $err = $db2->ErrorMsg();
-               print "<i>Error='$err'</i></p>";
-               if ($rez) print "<b>Cannot check if connection failed.</b> The 
Connect() function returned true.</p>";
-       }
-       error_reporting($e);
-       flush();
-
-       //$ADODB_COUNTRECS=false;
-       $rs=$db->Execute('select * from adoxyz order by id');
-       if($rs === false) $create = true;
-       else $rs->Close();
-               
-       //if ($db->databaseType !='vfp') $db->Execute("drop table ADOXYZ");
-       
-       if ($create) {
-               if (false && $db->databaseType == 'ibase') {
-                       print "<b>Please create the following table for 
testing:</b></p>$createtab</p>";
-                       return;
-               } else {
-                       $db->debug = 1;
-                       $e = error_reporting(E_ALL-E_WARNING);
-                       $db->Execute($createtab);
-                       error_reporting($e);
-               }
-       }
-       $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, FetchField when EOF, and 
GetInsertSQL</p>";
-       $rs = &$db->Execute("select id,firstname 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->EOF && ($o = $rs->FetchField(0) && !empty($o->name))) {
-               $record['id'] = 99;
-               $record['firstname'] = 'John';
-               $sql =  $db->GetInsertSQL($rs, $record);
-               if ($sql != "INSERT INTO ADOXYZ ( id, firstname ) VALUES ( 99, 
'John' )") Err("GetInsertSQL does not work on empty table");
-       } else {
-               Err("FetchField does not work on empty recordset, meaning 
GetInsertSQL will fail...");
-       }
-       if ($rs) $rs->Close();
-       flush();
-       //$db->debug=true;      
-       print "<p>Testing Commit: ";
-       $time = $db->DBDate(time());
-       if (!$db->BeginTrans()) {
-               print '<b>Transactions not supported</b></p>';
-               if ($db->hasTransactions) Err("hasTransactions should be 
false");
-       } else { /* COMMIT */
-               if (!$db->hasTransactions) Err("hasTransactions should be 
true");
-               if ($db->transCnt != 1) Err("Invalid transCnt = $db->transCnt 
(should be 1)");
-               $rs = $db->Execute("insert into ADOXYZ 
(id,firstname,lastname,created) 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 {
-                       if (!$rs) {
-                               print "<b>Insert failed</b></p>";
-                               $db->RollbackTrans();
-                       } else print "<b>Commit failed</b></p>";
-               }
-               if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt 
(should be 0)");
-               
-               /* ROLLBACK */  
-               if (!$db->BeginTrans()) print "<p><b>Error in 
BeginTrans</b>()</p>";
-               print "<p>Testing Rollback: ";
-               $db->Execute("insert into ADOXYZ 
(id,firstname,lastname,created) 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 ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt 
(should be 0)");
-       }
-       
-       if (1) {
-               print "<p>Testing MetaDatabases()</p>";
-               print_r( $db->MetaDatabases());
-
-               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 and views: "; 
-                       foreach($a as $v) print " ($v) ";
-                       print '</p>';
-               }
-               
-               $a = $db->MetaTables('VIEW');
-               if ($a===false) print "<b>MetaTables not supported 
(views)</b></p>";
-               else {
-                       print "Array of views: "; 
-                       foreach($a as $v) print " ($v) ";
-                       print '</p>';
-               }
-               
-               $a = $db->MetaTables(false,false,'aDo%');
-               if ($a===false) print "<b>MetaTables not supported 
(mask)</b></p>";
-               else {
-                       print "Array of ado%: "; 
-                       foreach($a as $v) print " ($v) ";
-                       print '</p>';
-               }
-               
-               $a = $db->MetaTables('TABLE');
-               if ($a===false) print "<b>MetaTables not supported</b></p>";
-               else {
-                       print "Array of tables: "; 
-                       foreach($a as $v) print " ($v) ";
-                       print '</p>';
-               }
-               
-               $db->debug=0;
-               $rez = $db->MetaColumns("NOSUCHTABLEHERE");
-               if ($rez !== false) {
-                       Err("MetaColumns error handling failed");
-                       var_dump($rez);
-               }
-               $db->debug=1;
-               $a = $db->MetaColumns('ADOXYZ');
-               if ($a===false) print "<b>MetaColumns not supported</b></p>";
-               else {
-                       print "<p>Columns of ADOXYZ: <font size=1><br>";
-                       foreach($a as $v) {print_r($v); echo "<br>";}
-                       echo "</font>";
-               }
-               
-               print "<p>Testing MetaIndexes</p>";
-               
-               $a = $db->MetaIndexes(('ADOXYZ'),true);
-               if ($a===false) print "<b>MetaIndexes not supported</b></p>";
-               else {
-                       print "<p>Indexes of ADOXYZ: <font size=1><br>";
-                       adodb_pr($a);
-                       echo "</font>";
-               }
-               print "<p>Testing MetaPrimaryKeys</p>";
-               $a = $db->MetaPrimaryKeys('ADOXYZ');
-               var_dump($a);
-       }
-       $rs = &$db->Execute('delete from ADOXYZ');
-       if ($rs) $rs->Close();
-       
-       $db->debug = false;
-       
-       
-       switch ($db->databaseType) {
-       case 'vfp':
-               
-               if (0) {
-                       // memo test
-                       $rs = $db->Execute("select data from memo");
-                       rs2html($rs);
-               }
-               break;
-
-       case 'postgres7':
-       case 'postgres64':
-       case 'postgres':
-       case 'ibase':
-               print "<p>Encode=".$db->BlobEncode("abc\0d\"'
-ef")."</p>";//'
-
-               print "<p>Testing Foreign Keys</p>";
-               $arr = $db->MetaForeignKeys('adoxyz',false,true);
-               print_r($arr);
-               if (!$arr) Err("Bad MetaForeignKeys");
-               break;
-       
-       case 'odbc_mssql':
-       case 'mssqlpo':
-               print "<p>Testing Foreign Keys</p>";
-               $arr = $db->MetaForeignKeys('Orders',false,true);
-               print_r($arr);
-               if (!$arr) Err("Bad MetaForeignKeys");
-               if ($db->databaseType == 'odbc_mssql') break;
-       
-       case 'mssql': 
-       
-               
-/*
-ASSUME Northwind available...
-
-CREATE PROCEDURE SalesByCategory
-       @CategoryName nvarchar(15), @OrdYear nvarchar(4) = '1998'
-AS
-IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998' 
-BEGIN
-       SELECT @OrdYear = '1998'
-END
-
-SELECT ProductName,
-       TotalPurchase=ROUND(SUM(CONVERT(decimal(14,2), OD.Quantity * 
(1-OD.Discount) * OD.UnitPrice)), 0)
-FROM [Order Details] OD, Orders O, Products P, Categories C
-WHERE OD.OrderID = O.OrderID 
-       AND OD.ProductID = P.ProductID 
-       AND P.CategoryID = C.CategoryID
-       AND C.CategoryName = @CategoryName
-       AND SUBSTRING(CONVERT(nvarchar(22), O.OrderDate, 111), 1, 4) = @OrdYear
-GROUP BY ProductName
-ORDER BY ProductName
-GO
-*/
-               print "<h4>Testing Stored Procedures for mssql</h4>";
-               $saved = $db->debug;
-               $db->debug=true;
-               
-               $cat = 'Dairy Products';
-               $yr = '1998';
-               
-               $stmt = $db->PrepareSP('SalesByCategory');
-               $db->InParameter($stmt,$cat,'CategoryName');
-               $db->InParameter($stmt,$yr,'OrdYear');
-               $rs = $db->Execute($stmt);
-               rs2html($rs);
-               
-               $cat = 'Grains/Cereals';
-               $yr = 1998;
-               
-               $stmt = $db->PrepareSP('SalesByCategory');
-               $db->InParameter($stmt,$cat,'CategoryName');
-               $db->InParameter($stmt,$yr,'OrdYear');
-               $rs = $db->Execute($stmt);
-               rs2html($rs);
-               
-               /*
-               Test out params - works in PHP 4.2.3 and 4.3.3 and 4.3.8 but 
not 4.3.0:
-               
-                       CREATE PROCEDURE at_date_interval 
-                               @days INTEGER, 
-                               @start VARCHAR(20) OUT, 
-                               @end VARCHAR(20) OUT    
-                       AS 
-                       BEGIN 
-                               set @start = CONVERT(VARCHAR(20), getdate(), 
101) 
-                               set @end =CONVERT(VARCHAR(20), dateadd(day, 
@days, getdate()), 101 ) 
-                       END
-                       GO
-               */
-               $db->debug=1;
-               $stmt = $db->PrepareSP('at_date_interval');
-               $days = 10;
-               $begin_date = '';
-               $end_date = '';
-               $db->InParameter($stmt,$days,'days', 4, SQLINT4); 
-               $db->OutParameter($stmt,$begin_date,'start', 20, SQLVARCHAR ); 
-               $db->OutParameter($stmt,$end_date,'end', 20, SQLVARCHAR ); 
-               $db->Execute($stmt);
-               if (empty($begin_date) or empty($end_date) or $begin_date == 
$end_date) {
-                       Err("MSSQL SP Test for OUT Failed");
-                       print "begin=$begin_date end=$end_date<p>";
-               } else print "(Today +10days) = (begin=$begin_date 
end=$end_date)<p>";
-       
-               $db->debug = $saved;
-               break;
-       case 'oci8': 
-       case 'oci8po':
-               $saved = $db->debug;
-               $db->debug=true;
-               
-
-               /*
-               CREATE TABLE PHOTOS
-               (
-                 ID           NUMBER(16),
-                 PHOTO        BLOB,
-                 DESCRIPTION  VARCHAR2(4000 BYTE),
-                 DESCCLOB     CLOB
-               );
-               
-               INSERT INTO PHOTOS (ID) VALUES(1);
-               */
-               $s = '';
-               for ($i = 0; $i <= 500; $i++) {
-                       $s .= '1234567890';
-               }
-               
-               
-               print "<h4>Testing Blob: size=".strlen($s)."</h4>";
-               $ok = $db->Updateblob('photos','photo',$s,'id=1');
-               if (!$ok) Err("Blob failed 1");
-               else {
-                       $s2= $db->GetOne("select photo from photos where id=1");
-                       if ($s !== $s2) Err("updateblob does not match");
-               }
-               
-               print "<h4>Testing Clob: size=".strlen($s)."</h4>";
-               $ok = $db->UpdateClob('photos','descclob',$s,'id=1');
-               if (!$ok) Err("Clob failed 1");
-               else {
-                       $s2= $db->GetOne("select descclob from photos where 
id=1");
-                       if ($s !== $s2) Err("updateclob does not match");
-               }
-               
-               
-               $s = '';
-               $s2 = '';
-               print "<h4>Testing Foreign Keys</h4>";
-               $arr = $db->MetaForeignKeys('emp');
-               print_r($arr);
-               if (!$arr) Err("Bad MetaForeignKeys");
-               print "<h4>Testing Cursor Variables</h4>";
-/*
--- TEST PACKAGE
--- "Set scan off" turns off substitution variables. 
-Set scan off; 
-
-CREATE OR REPLACE PACKAGE Adodb AS
-TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR);
-PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) ;
-PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR);
-PROCEDURE data_in(input IN VARCHAR);
-PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER);
-END Adodb;
-/
-
-
-CREATE OR REPLACE PACKAGE BODY Adodb AS
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
-       BEGIN
-               OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE 
tablenames;
-       END open_tab;
-
-       PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT 
VARCHAR) IS
-       BEGIN
-               OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE 
tablenames;
-               tablenames := 'TEST';
-       END open_tab2;
-
-PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
-       BEGIN
-               output := 'Cinta Hati '||input;
-       END;
-       
-PROCEDURE data_in(input IN VARCHAR) IS
-       ignore varchar(1000);
-       BEGIN
-               ignore := input;
-       END;
-
-PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER) AS
-BEGIN
-p2 := p1;
-END;
-END Adodb;
-/
-
-*/
-               $rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:zz,'A%'); 
END;",'zz');
-       
-               if ($rs && !$rs->EOF) {
-                       $v = $db->GetOne("SELECT count(*) FROM tab where tname 
like 'A%'");
-                       if ($v == $rs->RecordCount()) print "Test 1 RowCount: 
OK<p>";
-                       else Err("Test 1 RowCount ".$rs->RecordCount().", 
actual = $v");
-               } else {
-                       print "<b>Error in using Cursor Variables 1</b><p>";
-               }
-               
-               print "<h4>Testing Stored Procedures for oci8</h4>";
-               
-               $stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
-               $a1 = 'Malaysia';
-               //$a2 = ''; # a2 doesn't even need to be defined!
-               $db->InParameter($stmt,$a1,'a1');
-               $db->OutParameter($stmt,$a2,'a2');
-               $rs = $db->Execute($stmt);
-               if ($rs) {
-                       if ($a2 !== 'Cinta Hati Malaysia') print "<b>Stored 
Procedure Error: a2 = $a2</b><p>";
-                       else echo  "OK: a2=$a2<p>";
-               } else {
-                       print "<b>Error in using Stored Procedure IN/Out 
Variables</b><p>";
-               }
-               
-               $tname = 'A%';
-               
-               $stmt = $db->PrepareSP('select * from tab where tname like 
:tablename');
-               $db->Parameter($stmt,$tname,'tablename');
-               $rs = $db->Execute($stmt);
-               rs2html($rs);
-               
-               $stmt = $db->PrepareSP("begin adodb.data_in(:a1); end;");
-               $db->InParameter($stmt,$a1,'a1');
-               $db->Execute($stmt);
-               
-               $db->debug = $saved;
-               break;
-       
-       default:
-               break;
-       }
-       $arr = array(
-               array(1,'Caroline','Miranda'),
-               array(2,'John','Lim'),
-               array(3,'Wai Hun','See')
-       );
-       $db->debug=1;
-       print "<p>Testing Bulk Insert of 3 rows</p>";
-
-       $sql = "insert into ADOXYZ (id,firstname,lastname) values 
(".$db->Param('0').",".$db->Param('1').",".$db->Param('2').")";
-       $db->StartTrans();
-       $db->Execute($sql,$arr);
-       $db->CompleteTrans();
-       $rs = $db->Execute('select * from ADOXYZ order by id');
-       if ($rs->RecordCount() != 3) Err("Bad bulk insert");
-       
-       rs2html($rs);
-       
-       $db->Execute('delete from ADOXYZ');
-               
-       print "<p>Inserting 50 rows</p>";
-
-       for ($i = 0; $i < 5; $i++) {    
-
-       $time = $db->DBDate(time());
-       if (empty($HTTP_GET_VARS['hide'])) $db->debug = true;
-       switch($db->databaseType){
-       case 'mssqlpo':
-       case 'mssql':
-               $sqlt = "CREATE TABLE mytable (
-  row1 INT  IDENTITY(1,1) NOT NULL,
-  row2 varchar(16),
-  PRIMARY KEY  (row1))";
-               //$db->debug=1;
-               if (!$db->Execute("delete from mytable")) 
-                       $db->Execute($sqlt);
-                       
-               $ok = $db->Execute("insert into mytable (row2) values 
('test')");
-               $ins_id=$db->Insert_ID();
-               echo "Insert ID=";var_dump($ins_id);
-               if ($ins_id == 0) Err("Bad Insert_ID()");
-               $ins_id2 = $db->GetOne("select row1 from mytable");
-               if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
-               
-               $arr = array(0=>'Caroline',1=>'Miranda');
-               $sql = "insert into ADOXYZ (id,firstname,lastname,created) 
values ($i*10+0,?,?,$time)";
-               break;
-               
-       case 'mysql':
-               $sqlt = "CREATE TABLE `mytable` (
-  `row1` int(11) NOT NULL auto_increment,
-  `row2` varchar(16) NOT NULL default '',
-  PRIMARY KEY  (`row1`),
-  KEY `myindex` (`row1`,`row2`)
-) ";
-               if (!$db->Execute("delete from mytable")) 
-                       $db->Execute($sqlt);
-                       
-               $ok = $db->Execute("insert into mytable (row2) values 
('test')");
-               $ins_id=$db->Insert_ID();
-               echo "Insert ID=";var_dump($ins_id);
-               if ($ins_id == 0) Err("Bad Insert_ID()");
-               $ins_id2 = $db->GetOne("select row1 from mytable");
-               if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
-               
-       default:
-               $arr = array(0=>'Caroline',1=>'Miranda');
-               $sql = "insert into ADOXYZ (id,firstname,lastname,created) 
values ($i*10+0,?,?,$time)";
-               break;
-       
-       case 'oci8':
-       case 'oci805':
-               $arr = array('first'=>'Caroline','last'=>'Miranda');
-               $amt = rand() % 100;
-               $sql = "insert into ADOXYZ (id,firstname,lastname,created) 
values ($i*10+0,:first,:last,$time)";                
-               break;
-       }
-       if ($i & 1) {
-               $sql = $db->Prepare($sql);
-       }
-       $rs = $db->Execute($sql,$arr);
-               
-       if ($rs === false) Err( 'Error inserting with parameters');
-       else $rs->Close();
-       $db->debug = false;
-       $db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values 
($i*10+1,'John','Lim',$time)");
-       /*$ins_id=$db->Insert_ID();
-       echo "Insert ID=";var_dump($ins_id);*/
-       if ($db->databaseType == 'mysql') if ($ins_id == 0) Err('Bad 
Insert_ID');
-       $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',".$db->quote("Turing'ton").",$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 )");
-       } // for
-       if (1) {
-       $db->debug=1;
-       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-       $cnt = $db->GetOne("select count(*) from ADOXYZ");
-       $rs = $db->Execute('update ADOXYZ set id=id+1');        
-       if (!is_object($rs)) {
-               print_r($rs);
-               err("Update should return object");
-       } 
-       if (!$rs) err("Update generated error");
-       
-       $nrows = $db->Affected_Rows();   
-       if ($nrows === false) print "<p><b>Affected_Rows() not 
supported</b></p>";
-       else if ($nrows != $cnt)  print "<p><b>Affected_Rows() Error: $nrows 
returned (should be 50) </b></p>";
-       else print "<p>Affected_Rows() passed</p>";
-       }
-
-       $array = array('zid'=>1,'zdate'=>date('Y-m-d',time()));
-       $id = $db->GetOne("select id from ADOXYZ 
-               where id=".$db->Param('zid')." and 
created>=".$db->Param('ZDATE')."",
-               $array);
-       if ($id != 1) Err("Bad bind; id=$id");
-       else echo "<br>Bind date/integer passed";
-       
-       $db->debug = false;
-       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
- 
//////////////////////////////////////////////////////////////////////////////////////////
-       
-       $rs = $db->Execute("select * from ADOXYZ where firstname = 'not 
known'");
-       if (!$rs ||  !$rs->EOF) print "<p><b>Error on empty recordset</b></p>";
-       else if ($rs->RecordCount() != 0) {
-               print "<p><b>Error on RecordCount. Should be 0. Was 
".$rs->RecordCount()."</b></p>"; 
-               print_r($rs->fields);
-       }
-       if ($db->databaseType !== 'odbc') {
-               $rs = &$db->Execute("select 
id,firstname,lastname,created,".$db->random." from ADOXYZ order by id");
-               if ($rs) {
-                       if ($rs->RecordCount() != 50) {
-                               print "<p><b>RecordCount returns 
".$rs->RecordCount()."</b></p>";
-                               $poc = $rs->PO_RecordCount('ADOXYZ');
-                               if ($poc == 50) print "<p> &nbsp; &nbsp; 
PO_RecordCount passed</p>";
-                               else print "<p><b>PO_RecordCount returns wrong 
value: $poc</b></p>";
-                       } else print "<p>RecordCount() passed</p>";
-                       if (isset($rs->fields['firstname'])) print '<p>The 
fields columns can be indexed by column name.</p>';
-                       else {
-                               Err( '<p>The fields columns <i>cannot</i> be 
indexed by column name.</p>');
-                               print_r($rs->fields);
-                       }
-                       if (empty($HTTP_GET_VARS['hide'])) rs2html($rs);
-               }
-               else print "<p><b>Error in Execute of SELECT with 
random</b></p>";
-       }
-       $val = $db->GetOne("select count(*) from ADOXYZ");
-        if ($val == 50) print "<p>GetOne returns ok</p>";
-        else print "<p><b>Fail: GetOne returns $val</b></p>";
-
-       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       $val = $db->GetRow("select count(*) from ADOXYZ");
-        if ($val[0] == 50 and sizeof($val) == 1) print "<p>GetRow returns 
ok</p>";
-        else {
-               print_r($val);
-               print "<p><b>Fail: GetRow returns {$val[0]}</b></p>";
-       }
-
-       print "<p>FetchObject/FetchNextObject Test</p>";
-       $rs = &$db->Execute('select * from ADOXYZ');
-       
-       if (empty($rs->connection)) print "<b>Connection object missing from 
recordset</b></br>";
-       
-       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;
-               }
-       }
-       
-       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-       print "<p>FetchObject/FetchNextObject Test 2</p>";
-       
-       $rs = &$db->Execute('select * from ADOXYZ');
-       if (empty($rs->connection)) print "<b>Connection object missing from 
recordset</b></br>";
-       print_r($rs->fields);
-       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;
-               }
-       }
-       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       
-       $savefetch = $ADODB_FETCH_MODE;
-       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-       
-       print "<p>CacheSelectLimit  Test</p>";
-       $db->debug=1;
-       $rs = $db->CacheSelectLimit('  select  id, firstname from  ADOXYZ order 
by id',2);
-       if ($rs && !$rs->EOF) {
-               if (isset($rs->fields[0])) {
-                       Err("ASSOC has numeric fields");
-                       print_r($rs->fields);
-               }
-               if ($rs->fields['id'] != 1)  {Err("Error"); 
print_r($rs->fields);};
-               if (trim($rs->fields['firstname']) != 'Caroline')  {print 
Err("Error 2"); print_r($rs->fields);};
-               $rs->MoveNext();
-               if ($rs->fields['id'] != 2)  {Err("Error 3"); 
print_r($rs->fields);};
-               $rs->MoveNext();
-               if (!$rs->EOF) {
-                       Err("Error EOF");
-                       print_r($rs);
-               }
-       }
-       
-       print "<p>FETCH_MODE = ASSOC: Should get 1, Caroline</p>";
-       $rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by 
id',2);
-       if ($rs && !$rs->EOF) {
-               if (ADODB_ASSOC_CASE == 2) {
-                       $id = 'ID';
-                       $fname = 'FIRSTNAME';
-               }else {
-                       $id = 'id';
-                       $fname = 'firstname';
-               }
-               if ($rs->fields[$id] != 1)  {Err("Error 1"); 
print_r($rs->fields);};
-               if (trim($rs->fields[$fname]) != 'Caroline')  {Err("Error 2"); 
print_r($rs->fields);};
-               $rs->MoveNext();
-               if ($rs->fields[$id] != 2)  {Err("Error 3"); 
print_r($rs->fields);};
-               $rs->MoveNext();
-               if (!$rs->EOF) Err("Error EOF");
-               else if (is_array($rs->fields) || $rs->fields) {
-                       Err("Error: ## fields should be set to false on EOF");
-                       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 (isset($rs->fields['id'])) Err("FETCH_NUM has ASSOC fields");
-               if ($rs->fields[0] != 1)  {Err("Error 1"); 
print_r($rs->fields);};
-               if (trim($rs->fields[1]) != 'Caroline')  {Err("Error 
2");print_r($rs->fields);};
-               $rs->MoveNext();
-               if (!$rs->EOF) Err("Error EOF");
-
-       }
-       $ADODB_FETCH_MODE = $savefetch;
-       
-       $db->debug = false;
-       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) {Err("Error 1");print_r($arr);};
-               if (trim($arr['FIRSTNAME']) != 'Caroline') {Err("Error 2"); 
print_r($arr);};
-               $rs->MoveNext();
-               if (!$rs->EOF) Err("Error EOF");
-
-       }
-       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) {Err("Error 1"); print_r($arr);};
-               if (trim($arr['firstname']) != 'Caroline') {Err("Error 2"); 
print_r($arr);};
-
-       }
-       
-       print "<p>GetCol Test</p>";
-       $col = $db->GetCol('select distinct firstname from adoxyz order by 1');
-       if (!is_array($col)) Err("Col size is wrong");
-       if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col 
elements wrong");
-
-       $db->debug = true;
-       
-               
-       echo "<p>Date Update Test</p>";
-       $zdate = date('Y-m-d',time()+3600*24);
-       $zdate = $db->DBDate($zdate);
-       $db->Execute("update ADOXYZ set created=$zdate where id=1");
-       $row = $db->GetRow("select created,firstname from ADOXYZ where id=1");
-       print_r($row); echo "<br>";
-       
-       
-       
-       print "<p>SelectLimit Distinct 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') Err("Error 1 (exp 
Caroline), ".$rs->fields[1]);
-               $rs->MoveNext();
-               
-               if (trim($rs->fields[1]) != 'John') Err("Error 2 (exp John), 
".$rs->fields[1]);
-               $rs->MoveNext();
-               if (trim($rs->fields[1]) != 'Mary') Err("Error 3 (exp 
Mary),".$rs->fields[1]);
-               $rs->MoveNext();
-               if (! $rs->EOF) Err("Error EOF");
-               //rs2html($rs);
-       } else Err("Failed SelectLimit Test 1");
-       
-       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') Err("Error 1 - No Mary, 
instead: ".$rs->fields[1]);
-               $rs->MoveNext();
-               if (trim($rs->fields[1]) != 'George')Err("Error 2 - No George, 
instead: ".$rs->fields[1]);
-               $rs->MoveNext();
-               if (trim($rs->fields[1]) != 'Mr. Alan') Err("Error 3 - No Mr. 
Alan, instead: ".$rs->fields[1]);
-               $rs->MoveNext();
-               if (! $rs->EOF) Err("Error EOF");
-       //      rs2html($rs);
-       }
-        else Err("Failed SelectLimit Test 2 ". ($rs ? 'EOF':'no RS'));
-       
-       print "<p>SelectLimit Test 3: Should see Wai Hun and Steven</p>";
-       $db->debug=1;
-       global $A; $A=1;
-       $rs = &$db->SelectLimit('select * from ADOXYZ order by id',-1,48);
-       $A=0;
-       if ($rs && !$rs->EOF) {
-               if (empty($rs->connection)) print "<b>Connection object missing 
from recordset</b></br>";
-               if (trim($rs->fields[1]) != 'Wai Hun') Err("Error 1 
".$rs->fields[1]);
-               $rs->MoveNext();
-               if (trim($rs->fields[1]) != 'Steven') Err("Error 2 
".$rs->fields[1]);
-               $rs->MoveNext();
-               if (! $rs->EOF) {
-                       Err("Error EOF");
-               }
-               //rs2html($rs);
-       }
-        else Err("Failed SelectLimit Test 3");
-               $db->debug = false;
-       
-       
-       $rs = &$db->Execute("select * from ADOXYZ order by id");
-       print "<p>Testing Move()</p>";  
-       if (!$rs)Err( "Failed Move SELECT");
-       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>";
-                       } 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>";
-                       if ($rs->EOF) Err("Move(7) is EOF already");
-                       $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>";
-                       $rs->MoveNext();
-                       if (!$rs->EOF) err("Bad MoveNext");
-                       if ($rs->canSeek) {
-                               $rs->Move(3);
-                               if (trim($rs->Fields("firstname")) != 'George') 
{
-                                       print 
'<p>'.$rs->Fields("id")."<b>$db->databaseType: Move(3) after MoveLast 
failed</b></p>";
-                                       
-                               } else print "Move(3) after MoveLast() OK<BR>";
-                       }
-                       
-                       print "<p>Empty Move Test";
-                       $rs = $db->Execute("select * from ADOXYZ where id > 0 
and id < 0");
-                       $rs->MoveFirst();
-                       if (!$rs->EOF || $rs->fields) Err("Error in empty move 
first");
-               }
-       }
-       
-       $rs = $db->Execute('select * from ADOXYZ where id = 2');
-       if ($rs->EOF || !is_array($rs->fields)) Err("Error in select");
-       $rs->MoveNext();
-       if (!$rs->EOF) Err("Error in EOF (xx) ");
- //    $db->debug=true;
-       print "<p>Testing ADODB_FETCH_ASSOC and concat: concat firstname and 
lastname</p>";
-
-       $save = $ADODB_FETCH_MODE;
-       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-       if ($db->dataProvider == 'postgres') {
-               $sql = "select ".$db->Concat('cast(firstname as 
varchar)',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as 
d from ADOXYZ";
-               $rs = &$db->Execute($sql);
-       } else {
-               $sql = "select distinct ".$db->Concat('firstname',$db->qstr(' 
'),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
-               $rs = &$db->Execute($sql);
-       }
-       if ($rs) {
-               if (empty($HTTP_GET_VARS['hide'])) rs2html($rs);
-       } else {
-               Err( "Failed Concat:".$sql);
-       }
-       $ADODB_FETCH_MODE = $save;
-       print "<hr>Testing GetArray() ";
-       //$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-       
-       $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>";
-       }
-       
-       $arr = $db->GetArray("select x from ADOXYZ");
-       $e = $db->ErrorMsg(); $e2 = $db->ErrorNo();
-       echo "Testing error handling, should see illegal column 'x' error=<i>$e 
($e2) </i><br>";
-       if (!$e || !$e2) Err("Error handling did not work");
-       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>";
-       
-       $stmt = $db->Prepare("select * from ADOXYZ where id < 3");
-       $rs = $db->Execute($stmt);
-       if (!$rs) Err("Prepare failed");
-       else {
-               $arr = $rs->GetArray();
-               if (!$arr) Err("Prepare failed 2");
-               if (sizeof($arr) != 2) Err("Prepare failed 3");
-       }
-       print "Testing GetAssoc() ";
-       $savecrecs = $ADODB_COUNTRECS;
-       $ADODB_COUNTRECS = false;
-       //$arr = $db->GetArray("select  lastname,firstname from ADOXYZ");
-       //print_r($arr);
-       print "<hr>";
-       $rs =& $db->Execute("select distinct lastname,firstname,created from 
ADOXYZ");
-       
-       if ($rs) {
-               $arr = $rs->GetAssoc();
-               //print_r($arr);
-               if (empty($arr['See']) || trim(reset($arr['See'])) != 'Wai 
Hun') print $arr['See']." &nbsp; <b>ERROR</b><br>";
-               else print " OK 1";
-       }
-       
-       $arr = &$db->GetAssoc("select distinct lastname,firstname from ADOXYZ");
-       if ($arr) {
-               //print_r($arr);
-               if (empty($arr['See']) || trim($arr['See']) != 'Wai Hun') print 
$arr['See']." &nbsp; <b>ERROR</b><br>";
-               else print " OK 2<BR>";
-       }
-       // Comment this out to test countrecs = false
-       $ADODB_COUNTRECS = $savecrecs;
-       
-       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);
-               if (empty($rs->connection)) print "<b>Connection object missing 
from recordset</b></br>";
-       } 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(6,"select distinct firstname,lastname from 
ADOXYZ");
-       if ($rs) print ' No blanks, Steven selected: '. 
$rs->GetMenu2('menu',('Oey'),false).'<BR>';
-       else print " Fail<BR>";
-       }
-       echo "<h3>CacheEXecute</h3>";
-
-       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       $rs = &$db->CacheExecute(6,"select distinct firstname,lastname from 
ADOXYZ");
-       print_r($rs->fields); echo $rs->fetchMode;echo "<br>";
-       echo $rs->Fields('firstname');
-       
-       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-       $rs = &$db->CacheExecute(6,"select distinct firstname,lastname from 
ADOXYZ");
-       print_r($rs->fields);echo "<br>";
-       echo $rs->Fields('firstname');
-       $db->debug = false;
-       
-       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       // phplens
-       
-       $sql = 'select * from ADOXYZ where 0=1';
-       echo "<p>**Testing '$sql' (phplens compat 1)</p>";
-       $rs = &$db->Execute($sql);
-       if (!$rs) err( "<b>No recordset returned for '$sql'</b>");
-       if (!$rs->FieldCount()) err( "<b>No fields returned for $sql</b>");
-       if (!$rs->FetchField(1)) err( "<b>FetchField failed for $sql</b>");
-       
-       $sql = 'select * from ADOXYZ order by 1';
-       echo "<p>**Testing '$sql' (phplens compat 2)</p>";
-       $rs = &$db->Execute($sql);
-       if (!$rs) err( "<b>No recordset returned for 
'$sql'<br>".$db->ErrorMsg()."</b>");
-       
-       
-       $sql = 'select * from ADOXYZ order by 1,1';
-       echo "<p>**Testing '$sql' (phplens compat 3)</p>";
-       $rs = &$db->Execute($sql);
-       if (!$rs) err( "<b>No recordset returned for 
'$sql'<br>".$db->ErrorMsg()."</b>");
-       
-       
-       // Move
-       $rs1 = &$db->Execute("select id from ADOXYZ where id <= 2 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 OK</p>";
-               
-       
-       echo "<p> GenID test: ";
-       for ($i=1; $i <= 10; $i++) 
-               echo  "($i: ",$val = $db->GenID($db->databaseType.'abcseq6' 
,5), ") ";
-       if ($val == 0) Err("GenID not supported");
-       
-       if ($val) {
-               $db->DropSequence('abc_seq2');
-               $db->CreateSequence('abc_seq2');
-               $val = $db->GenID('abc_seq2');
-               $db->DropSequence('abc_seq2');
-               $db->CreateSequence('abc_seq2');
-               $val = $db->GenID('abc_seq2');
-               if ($val != 1) Err("Drop and Create Sequence not supported 
($val)");
-       }
-       echo "<p>";
-       
-       if (substr($db->dataProvider,0,3) != 'notused') { // used to crash ado
-               $sql = "select firstnames from adoxyz";
-               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>";
-       } else 
-               print "<p><b>ADO skipped error handling of bad select 
statement</b></p>";
-       
-       print "<p>ASSOC TEST 2<br>";
-       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-       $rs = $db->query('select * from adoxyz order by id');
-       if ($ee = $db->ErrorMsg()) {
-               Err("Error message=$ee");
-       }
-       if ($ee = $db->ErrorNo()) {
-               Err("Error No = $ee");
-       }
-       print_r($rs->fields);
-       for($i=0;$i<$rs->FieldCount();$i++) 
-       { 
-               $fld=$rs->FetchField($i); 
-               print "<br> Field name is ".$fld->name; 
-               print " ".$rs->Fields($fld->name); 
-       } 
-
-               
-       print "<p>BOTH TEST 2<br>";
-       if ($db->dataProvider == 'ado') {
-               print "<b>ADODB_FETCH_BOTH not supported</b> for 
dataProvider=".$db->dataProvider."<br>";
-       } else {
-               $ADODB_FETCH_MODE = ADODB_FETCH_BOTH;
-               $rs = $db->query('select * from adoxyz order by id');
-               for($i=0;$i<$rs->FieldCount();$i++) 
-               { 
-                       $fld=$rs->FetchField($i); 
-                       print "<br> Field name is ".$fld->name; 
-                       print " ".$rs->Fields($fld->name); 
-               } 
-       }
-       
-       print "<p>NUM TEST 2<br>";
-       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       $rs = $db->query('select * from adoxyz order by id');
-       for($i=0;$i<$rs->FieldCount();$i++) 
-       { 
-               $fld=$rs->FetchField($i); 
-               print "<br> Field name is ".$fld->name; 
-               print " ".$rs->Fields($fld->name); 
-       } 
-       
-       print "<p>ASSOC Test of SelectLimit<br>";
-       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-       $rs = $db->selectlimit('select * from adoxyz order by id',3,4);
-       $cnt = 0;
-       while ($rs && !$rs->EOF) {
-               $cnt += 1;
-               if (!isset($rs->fields['firstname'])) {
-                       print "<br><b>ASSOC returned numeric field</b></p>";
-                       break;
-               }
-               $rs->MoveNext();
-       }
-       if ($cnt != 3) print "<br><b>Count should be 3, instead it was 
$cnt</b></p>";
-       
-       
-       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       if ($db->sysDate) {
-               $saved = $db->debug;
-               $db->debug = 1;
-               $rs = $db->Execute("select {$db->sysDate} from adoxyz where 
id=1");
-               if (ADORecordSet::UnixDate(date('Y-m-d')) != 
$rs->UnixDate($rs->fields[0])) {
-                       print "<p><b>Invalid date {$rs->fields[0]}</b></p>";
-               } else
-                       print "<p>Passed \$sysDate test ({$rs->fields[0]})</p>";
-               
-               print_r($rs->FetchField(0));
-               print time();
-               $db->debug=$saved;
-       } else {
-               print "<p><b>\$db->sysDate not defined</b></p>";
-       }
-
-       print "<p>Test CSV</p>";
-       include_once('../toexport.inc.php');
-       //$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-       $rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\' 
he,\'"\' q  from adoxyz',10);   
-       
-       print "<pre>";
-       print rs2csv($rs);
-       print "</pre>";
-       
-       $rs = $db->SelectLimit('select id,firstname,lastname,created,\'The      
"young man", he said\' from adoxyz',10);        
-       
-       if (PHP_VERSION < 5) {
-               print "<pre>";
-               rs2tabout($rs);
-               print "</pre>";
-       }
-       //print " CacheFlush ";
-       //$db->CacheFlush();
-       
-       $date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A');
-       $sql = "SELECT $date from ADOXYZ";
-       print "<p>Test SQLDate: ".htmlspecialchars($sql)."</p>";
-       $rs = $db->SelectLimit($sql,1);
-       $d = date('d-m-M-Y-').'Q'.(ceil(date('m')/3.0)).date(' h:i:s A');
-       if (!$rs) Err("SQLDate query returned no recordset");
-       else if ($d != $rs->fields[0]) Err("SQLDate 1 failed expected: 
<br>act:$d <br>sql:".$rs->fields[0]);
-       
-       $date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
-       $sql = "SELECT $date from ADOXYZ";
-       print "<p>Test SQLDate: ".htmlspecialchars($sql)."</p>";
-       $rs = $db->SelectLimit($sql,1);
-       $ts = ADOConnection::UnixDate('1974-02-25');
-       $d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s 
A',$ts);
-       if (!$rs) Err("SQLDate query returned no recordset");
-       else if ($d != $rs->fields[0]) Err("SQLDate 2 failed expected: 
<br>act:$d <br>sql:".$rs->fields[0]);
-       
-       
-       print "<p>Test Filter</p>";
-       $db->debug = 1;
-       
-       $rs = $db->SelectLimit('select * from ADOXYZ where id < 3 order by id');
-       
-       $rs = RSFilter($rs,'do_strtolower');
-       if (trim($rs->fields[1]) != 'caroline'  && trim($rs->fields[2]) != 
'miranda') {
-               err('**** RSFilter failed');
-               print_r($rs->fields);
-       }
-       
-       rs2html($rs);
-               
-       $db->debug=1;
-       
-       
-       print "<p>Test Replace</p>";
-       
-       $ret = $db->Replace('adoxyz', 
-               array('id'=>1,'firstname'=>'Caroline','lastname'=>'Miranda'),
-               array('id'),
-               $autoq = true);
-       if (!$ret) echo "<p>Error in replacing existing record</p>";
-       else {
-               $saved = $db->debug;
-               $db->debug = 0;
-               $savec = $ADODB_COUNTRECS;
-               $ADODB_COUNTRECS = true;
-               $rs = $db->Execute('select * FROM ADOXYZ where id=1');
-               $db->debug = $saved;
-               if ($rs->RecordCount() != 1) {
-                       $cnt = $rs->RecordCount();
-                       rs2html($rs);
-                       print "<b>Error - Replace failed, count=$cnt</b><p>";
-               }
-               $ADODB_COUNTRECS = $savec;
-       }
-       $ret = $db->Replace('adoxyz', 
-               array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
-               array('id','firstname'),
-               $autoq = true);
-       if ($ret != 2) print "<b>Replace failed: </b>";
-       print "test A return value=$ret (2 expected) <p>";
-       
-       $ret = $db->Replace('adoxyz', 
-               
array('id'=>1000,'firstname'=>'Sherazade','lastname'=>'Al-Rashid'),
-               'id',
-               $autoq = true);
-       if ($ret != 1) 
-               if ($db->dataProvider == 'ibase' && $ret == 2);
-               else print "<b>Replace failed: </b>";
-       print "test B return value=$ret (1 or if ibase then 2 expected) <p>";
-       
-       print "<h3>rs2rs Test</h3>";
-       
-       $rs = $db->Execute('select * from adoxyz order by id');
-       $rs = $db->_rs2rs($rs);
-       $rs->valueX = 'X';
-       $rs->MoveNext();
-       $rs = $db->_rs2rs($rs);
-       if (!isset($rs->valueX)) err("rs2rs does not preserve array 
recordsets");
-       if (reset($rs->fields) != 1) err("rs2rs does not move to first row");
-
-       /////////////////////////////////////////////////////////////
-       include_once('../pivottable.inc.php');
-       print "<h3>Pivot Test</h3>";
-       $db->debug=true;
-       $sql = PivotTableSQL(
-               $db,                    # adodb connection
-               'adoxyz',               # tables
-               'firstname',    # row fields
-               'lastname',             # column fields 
-               false,                  # join
-               'ID',                   # sum
-               'Sum ',                 # label for sum
-               'sum',                  # aggregate function
-               true
-       );
-       $rs = $db->Execute($sql);
-       if ($rs) rs2html($rs);
-       else Err("Pivot sql error");
-       
-       $db->debug=false;
-       include_once "PEAR.php";
-       
-       // PEAR TESTS BELOW
-       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-       $pear = true;
-       $rs = $db->query('select * from adoxyz where id>0 and id<10 order by 
id');
-       
-       $i = 0;
-       if ($rs && !$rs->EOF) {
-               while ($arr = $rs->fetchRow()) {
-                       $i++;
-                       //print "$i ";
-                       if ($arr[0] != $i) {
-                               print_r($arr);
-                               print "<p><b>PEAR DB emulation error 
1.</b></p>";
-                               $pear = false;
-                               break;
-                       }
-               }
-               $rs->Close();
-       }
-       
-       
-       if ($i != $db->GetOne('select count(*) from adoxyz where id>0 and 
id<10')) {
-               print "<p><b>PEAR DB emulation error 1.1 EOF ($i)</b></p>";
-               $pear = false;
-       }
-       
-       $rs = $db->limitQuery('select * from adoxyz where id>0 order by 
id',$i=3,$top=3);
-       $i2 = $i;
-       if ($rs && !$rs->EOF) {
-
-               while (!is_object($rs->fetchInto($arr))) {
-                       $i2++;
-                       
-       //                      print_r($arr);
-       //              print "$i ";print_r($arr);
-                       if ($arr[0] != $i2) {
-                               print "<p><b>PEAR DB emulation error 
2.</b></p>";
-                               $pear = false;
-                               break;
-                       }
-               }
-               $rs->Close();
-       }
-       if ($i2 != $i+$top) {
-               print "<p><b>PEAR DB emulation error 2.1 EOF (correct=$i+$top, 
actual=$i2)</b></p>";
-               $pear = false;
-       }
-       
-       if ($pear) print "<p>PEAR DB emulation passed.</p>";
-       
-       $rs = $db->SelectLimit("select ".$db->sysDate." from adoxyz",1);
-       $date = $rs->fields[0];
-       if (!$date) Err("Bad sysDate");
-       else {
-               $ds = $db->UserDate($date,"d m Y");
-               if ($ds != date("d m Y")) Err("Bad UserDate: ".$ds.' 
expected='.date("d m Y"));
-               else echo "Passed UserDate: $ds<p>";
-       }
-       $db->debug=1;
-       if ($db->dataProvider == 'oci8') 
-               $rs = $db->SelectLimit("select 
to_char(".$db->sysTimeStamp.",'YYYY-MM-DD HH24:MI:SS') from adoxyz",1);
-       else 
-               $rs = $db->SelectLimit("select ".$db->sysTimeStamp." from 
adoxyz",1);
-       $date = $rs->fields[0];
-       if (!$date) Err("Bad sysTimeStamp");
-       else {
-               $ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
-               if ($ds != date("H \\h\\r\\s-d m Y")) Err("Bad UserTimeStamp: 
".$ds.", correct is ".date("H \\h\\r\\s-d m Y"));
-               else echo "Passed UserTimeStamp: $ds<p>";
-               
-               $date = 100;
-               $ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
-               $ds2 = date("H \\h\\r\\s-d m Y",$date);
-               if ($ds != $ds2) Err("Bad UserTimeStamp 2: $ds: $ds2");
-               else echo "Passed UserTimeStamp 2: $ds<p>";
-       }
-       if ($db->hasTransactions) {
-               //$db->debug=1;
-               echo "<p>Testing StartTrans CompleteTrans</p>";
-               $db->raiseErrorFn = false;
-               $db->StartTrans();
-               $rs = $db->Execute('select * from notable');
-                       $db->StartTrans();
-                               $db->BeginTrans();
-                       $db->Execute("update ADOXYZ set firstname='Carolx' 
where id=1");
-                               $db->CommitTrans();
-                       $db->CompleteTrans();
-               $rez = $db->CompleteTrans();
-               if ($rez !== false) {
-                       if (is_null($rez)) Err("Error: _transOK not modified");
-                       else Err("Error: CompleteTrans (1) should have failed");
-               } else {
-                       $name = $db->GetOne("Select firstname from ADOXYZ where 
id=1");
-                       if ($name == "Carolx") Err("Error: CompleteTrans (2) 
should have failed");
-                       else echo "<p> -- Passed StartTrans test1 - rolling 
back</p>";
-               }
-               
-               $db->StartTrans();
-                       $db->BeginTrans();
-               $db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
-                       $db->RollbackTrans();
-               $rez = $db->CompleteTrans();
-               if ($rez !== true) Err("Error: CompleteTrans (1) should have 
succeeded");
-               else {
-                       $name = $db->GetOne("Select firstname from ADOXYZ where 
id=1");
-                       if (trim($name) != "Carolx") Err("Error: CompleteTrans 
(2) should have succeeded, returned name=$name");
-                       else echo "<p> -- Passed StartTrans test2 - 
commiting</p>";
-               }
-       }
-       
-       $saved = $db->debug;
-       $db->debug=1;
-       $cnt = _adodb_getcount($db, 'select * from ADOXYZ where firstname in 
(select firstname from ADOXYZ)');
-       echo "<b>Count=</b> $cnt";
-       $db->debug=$saved;
-       
-       global $TESTERRS;
-       $debugerr = true;
-       
-       global $ADODB_LANG;$ADODB_LANG = 'fr';
-       $db->debug = false;
-       $TESTERRS = 0;
-       $db->raiseErrorFn = 'adodb_test_err';
-       global $ERRNO; // from adodb_test_err
-       $db->Execute('select * from nowhere');
-       $metae = $db->MetaError($ERRNO);
-       if ($metae !== DB_ERROR_NOSUCHTABLE) print "<p><b>MetaError=".$metae." 
wrong</b>, should be ".DB_ERROR_NOSUCHTABLE."</p>";
-       else print "<p>MetaError ok (".DB_ERROR_NOSUCHTABLE."): 
".$db->MetaErrorMsg($metae)."</p>";
-       if ($TESTERRS != 1) print "<b>raiseErrorFn select nowhere 
failed</b><br>";
-       $rs = $db->Execute('select * from adoxyz');
-       if ($debugerr) print " Move";
-       $rs->Move(100);
-       $rs->_queryID = false;
-       if ($debugerr) print " MoveNext";
-       $rs->MoveNext();
-       if ($debugerr) print " $rs=false";
-       $rs = false;
-
-       print "<p>SetFetchMode() tests</p>";
-       $db->SetFetchMode(ADODB_FETCH_ASSOC);
-       $rs = $db->SelectLimit('select firstname from adoxyz',1);
-       //      var_dump($rs->fields);
-       if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
-       
-       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;    
-       $rs = $db->SelectLimit('select firstname from adoxyz',1);
-       //var_dump($rs->fields);
-       if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
-       
-       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;  
-       $db->SetFetchMode(ADODB_FETCH_NUM);
-       $rs = $db->SelectLimit('select firstname from adoxyz',1);
-       if (!isset($rs->fields[0])) Err("BAD FETCH NUM");
-       
-       print "<p>Test MetaTables again with SetFetchMode()</p>";
-       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-       $db->SetFetchMode(ADODB_FETCH_ASSOC);
-       print_r($db->MetaTables());
-       print "<p>";
-       ////////////////////////////////////////////////////////////////////
-       
-       if ($db->dataProvider == 'odbtp') $db->databaseType = 'odbtp';
-       $conn = NewADOConnection($db->databaseType);
-       $conn->raiseErrorFn = 'adodb_test_err';
-       @$conn->PConnect('abc');
-       if ($TESTERRS == 2) print "raiseErrorFn tests passed<br>";
-       else print "<b>raiseErrorFn tests failed ($TESTERRS)</b><br>";
-       
-       
-       ////////////////////////////////////////////////////////////////////
-       
-       global $nocountrecs;
-       
-       if (isset($nocountrecs) && $ADODB_COUNTRECS) err("Error: 
\$ADODB_COUNTRECS is set");
-       if (empty($nocountrecs) && $ADODB_COUNTRECS==false) err("Error: 
\$ADODB_COUNTRECS is not set");
-
-       
-?>
-       </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();
-       
-       if ($db->transCnt != 0) Err("Error in transCnt=$db->transCnt (should be 
0)");
-       
-       
-       printf("<p>Total queries=%d; total cached=%d</p>",$EXECS+$CACHED, 
$CACHED);
-}
-
-function adodb_test_err($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
-{
-global $TESTERRS,$ERRNO;
-
-       $ERRNO = $errno;
-       $TESTERRS += 1;
-       print "<i>** $dbms ($fn): errno=$errno &nbsp; errmsg=$errmsg 
($p1,$p2)</i><br>";
-}
-
-//--------------------------------------------------------------------------------------
-
-
address@hidden(240); // increase timeout
-
-include("../tohtml.inc.php");
-include("../adodb.inc.php");
-include("../rsfilter.inc.php");
-
-/* White Space Check */
-
-if (isset($_SERVER['argv'][1])) {
-       //print_r($_SERVER['argv']);
-       $HTTP_GET_VARS[$_SERVER['argv'][1]] = 1;
-}
-
-if (@$HTTP_SERVER_VARS['COMPUTERNAME'] == 'TIGRESS') {
-       CheckWS('mysqlt');
-       CheckWS('postgres');
-       CheckWS('oci8po');
-       
-       CheckWS('firebird');
-       CheckWS('sybase');
-       if (!ini_get('safe_mode')) CheckWS('informix');
-
-       CheckWS('ado_mssql');
-       CheckWS('ado_access');
-       CheckWS('mssql');
-       
-       CheckWS('vfp');
-       CheckWS('sqlanywhere');
-       CheckWS('db2');
-       CheckWS('access');
-       CheckWS('odbc_mssql');
-       CheckWS('firebird15');
-       //
-       CheckWS('oracle');
-       CheckWS('proxy');
-       CheckWS('fbsql');
-       print "White Space Check complete<p>";
-}
-if (sizeof($HTTP_GET_VARS) == 0) $testmysql = true;
-
-
-foreach($HTTP_GET_VARS as $k=>$v)  {
-       //global $$k;
-       $$k = $v;
-}      
-if (strpos(PHP_VERSION,'5') === 0) {
-       //$testaccess=1;
-       //$testmssql = 1;
-       //$testsqlite=1;
-}
-?>
-<html>
-<title>ADODB Testing</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://adodb.sourceforge.net/>adodb.sourceforge.net</a>.</p>
-
-Test <a href=test4.php>GetInsertSQL/GetUpdateSQL</a> &nbsp; 
-       <a href=testsessions.php>Sessions</a> &nbsp;
-       <a href=testpaging.php>Paging</a> &nbsp;
-       <a href=test-perf.php>Perf Monitor</a><p>
-<?php
-include('./testdatabases.inc.php');
-
-echo "<br>vers=",ADOConnection::Version();
-
-
-include_once('../adodb-time.inc.php');
-if (isset($_GET['time'])) adodb_date_test();
-
-?>
-<p><i>ADODB Database Library  (c) 2000-2004 John Lim. All rights reserved. 
Released under BSD and LGPL.</i></p>
-</body>
-</html>
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+  Set tabs to 4 for best viewing.
+       
+  Latest version is available at http://adodb.sourceforge.net
+*/
+
+error_reporting(E_ALL);
+
+$ADODB_FLUSH = true;
+
+define('ADODB_ASSOC_CASE',0);
+
+
+function getmicrotime()
+{
+       $t = microtime();
+       $t = explode(' ',$t);
+       return (float)$t[1]+ (float)$t[0];
+}
+
+
+if (PHP_VERSION < 5) include_once('../adodb-pear.inc.php');
+//--------------------------------------------------------------------------------------
+//define('ADODB_ASSOC_CASE',1);
+//
+function Err($msg)
+{
+       print "<b>$msg</b><br>";
+       flush();
+}
+
+function CheckWS($conn)
+{
+global $ADODB_EXTENSION;
+
+       include_once('../session/adodb-session.php');
+       if (defined('CHECKWSFAIL')){ echo " TESTING $conn ";flush();}
+       $saved = $ADODB_EXTENSION;
+       $db = ADONewConnection($conn);
+       $ADODB_EXTENSION = $saved;
+       if (headers_sent()) {
+               print "<p><b>White space detected in adodb-$conn.inc.php or 
include file...</b></p>";
+               //die();
+       }
+}
+
+function do_strtolower(&$arr)
+{
+       foreach($arr as $k => $v) {
+               if (is_object($v)) $arr[$k] = adodb_pr($v,true);
+               else $arr[$k] = strtolower($v);
+       }
+}
+
+
+function CountExecs($db, $sql, $inputarray)
+{
+global $EXECS;  $EXECS++;
+}
+
+function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
+{
+global $CACHED; $CACHED++;
+}
+
+// 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,$ADODB_FETCH_MODE,$ADODB_COUNTRECS;
+
+?>     <form method=GET>
+       </p>
+       <table width=100% ><tr><td bgcolor=beige>&nbsp;</td></tr></table>
+       </p>
+<?php  
+       $create =false;
+       /*$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       
+       $rs = $db->Execute('select lastname,firstname,lastname,id from adoxyz');
+       $arr = $rs->GetAssoc();
+       echo "<pre>";print_r($arr);
+       die();*/
+       
+       if (!$db) die("testdb: database not inited");
+       GLOBAL $EXECS, $CACHED;
+       
+       $EXECS = 0;
+       $CACHED = 0;
+       //$db->Execute("drop table adodb_logsql");
+       if ((rand()%3) == 0) @$db->Execute("delete from adodb_logsql");
+       $db->debug=1;
+       
+       $db->fnExecute = 'CountExecs';
+       $db->fnCacheExecute = 'CountCachedExecs';
+       
+       if (empty($_GET['nolog'])) {
+               echo "<h3>SQL Logging enabled</h3>";
+               $db->LogSQL();/*
+               $sql =
+"SELECT t1.sid, t1.sid, t1.title, t1.hometext, t1.notes, t1.aid, t1.informant, 
+t2.url, t2.email, t1.catid, t3.title, t1.topic, t4.topicname, t4.topicimage, 
+t4.topictext, t1.score, t1.ratings, t1.counter, t1.comments, t1.acomm 
+FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, 
`nuke_topics` `t4` 
+       WHERE ((t2.aid=t1.aid) AND (t3.catid=t1.catid) AND 
(t4.topicid=t1.topic) 
+       AND ((t1.alanguage='german') OR (t1.alanguage='')) AND (t1.ihome='0')) 
+       ORDER BY t1.time DESC";
+               $db->SelectLimit($sql);
+               echo $db->ErrorMsg();*/
+       }
+       $ADODB_CACHE_DIR = dirname(TempNam('/tmp','testadodb'));
+       $db->debug = false;
+       //print $db->UnixTimeStamp('2003-7-22 23:00:00');
+       
+       $phpv = phpversion();
+       if (defined('ADODB_EXTENSION')) $ext = ' &nbsp; Extension 
'.ADODB_EXTENSION.' installed';
+       else $ext = '';
+       print "<h3>ADODB Version: $ADODB_vers Host: <i>$db->host</i> &nbsp; 
Database: <i>$db->database</i> &nbsp; PHP: $phpv $ext</h3>";
+       flush();
+
+       
+       $arr = $db->ServerInfo();
+       print_r($arr);
+       echo "<br>";
+       $e = error_reporting(E_ALL-E_WARNING);
+       flush();
+       #$db->debug=1;
+       $tt  = $db->Time(); 
+       if ($tt == 0) echo '<br><b>$db->Time failed</b>';
+       else echo "<br>db->Time: ".date('d-m-Y H:i:s',$tt);
+       echo '<br>';
+       
+       echo "Date=",$db->UserDate('2002-04-07'),'<br>';
+       print "<i>date1</i> (1969-02-20) = ".$db->DBDate('1969-2-20');
+       print "<br><i>date1</i> (1999-02-20) = ".$db->DBDate('1999-2-20');
+       print "<br><i>date1.1</i> 1999 = ".$db->DBDate("'1999'");
+       print "<br><i>date2</i> (1970-1-2) = ".$db->DBDate(24*3600)."<p>";
+       print "<i>ts1</i> (1999-02-20 13:40:50) = ".$db->DBTimeStamp('1999-2-20 
1:40:50 pm');
+       print "<br><i>ts1.1</i> (1999-02-20 13:40:00) = 
".$db->DBTimeStamp('1999-2-20 13:40');
+       print "<br><i>ts2</i> (1999-02-20) = ".$db->DBTimeStamp('1999-2-20');
+       print "<br><i>ts3</i> (1970-1-2 +/- timezone) = 
".$db->DBTimeStamp(24*3600);
+       print "<br> Fractional TS (1999-2-20 13:40:50.91): 
".$db->DBTimeStamp($db->UnixTimeStamp('1999-2-20 13:40:50.91+1'));
+        $dd = $db->UnixDate('1999-02-20');
+       print "<br>unixdate</i> 1999-02-20 = ".date('Y-m-d',$dd)."<p>";
+       print "<br><i>ts4</i> =".($db->UnixTimeStamp("19700101000101")+8*3600);
+       print "<br><i>ts5</i> 
=".$db->DBTimeStamp($db->UnixTimeStamp("20040110092123"));
+       print "<br><i>ts6</i> =".$db->UserTimeStamp("20040110092123");
+       print "<br><i>ts7</i> =".$db->DBTimeStamp("20040110092123");
+       flush();
+       // mssql too slow in failing bad connection
+       if (false && $db->databaseType != 'mssql') {
+               print "<p>Testing bad connection. Ignore following error 
msgs:<br>";
+               $db2 = ADONewConnection();
+               $rez = $db2->Connect("bad connection");
+               $err = $db2->ErrorMsg();
+               print "<i>Error='$err'</i></p>";
+               if ($rez) print "<b>Cannot check if connection failed.</b> The 
Connect() function returned true.</p>";
+       }
+       error_reporting($e);
+       flush();
+
+       //$ADODB_COUNTRECS=false;
+       $rs=$db->Execute('select * from adoxyz order by id');
+       if($rs === false) $create = true;
+       else $rs->Close();
+       
+       //if ($db->databaseType !='vfp') $db->Execute("drop table ADOXYZ");
+       
+       if ($create) {
+               if (false && $db->databaseType == 'ibase') {
+                       print "<b>Please create the following table for 
testing:</b></p>$createtab</p>";
+                       return;
+               } else {
+                       $db->debug = 99;
+                       $e = error_reporting(E_ALL-E_WARNING);
+                       $db->Execute($createtab);
+                       error_reporting($e);
+               }
+       }
+       error_reporting(E_ALL);
+       echo "<p>Testing Metatypes</p>";
+       $t = $db->MetaType('varchar');
+       if ($t != 'C') Err("Bad Metatype for varchar");
+       
+       $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, FetchField when EOF, and 
GetInsertSQL</p>";
+       $rs = &$db->Execute("select id,firstname 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->EOF && (($ox = $rs->FetchField(0)) && !empty($ox->name))) {
+               $record['id'] = 99;
+               $record['firstname'] = 'John';
+               $sql =  $db->GetInsertSQL($rs, $record);
+               if (strtoupper($sql) != strtoupper("INSERT INTO ADOXYZ ( id, 
firstname ) VALUES ( 99, 'John' )")) Err("GetInsertSQL does not work on empty 
table: $sql");
+       } else {
+               Err("FetchField does not work on empty recordset, meaning 
GetInsertSQL will fail...");
+       }
+       if ($rs) $rs->Close();
+       flush();
+       //$db->debug=true;      
+       print "<p>Testing Commit: ";
+       $time = $db->DBDate(time());
+       if (!$db->BeginTrans()) {
+               print '<b>Transactions not supported</b></p>';
+               if ($db->hasTransactions) Err("hasTransactions should be 
false");
+       } else { /* COMMIT */
+               if (!$db->hasTransactions) Err("hasTransactions should be 
true");
+               if ($db->transCnt != 1) Err("Invalid transCnt = $db->transCnt 
(should be 1)");
+               $rs = $db->Execute("insert into ADOXYZ 
(id,firstname,lastname,created) 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 {
+                       if (!$rs) {
+                               print "<b>Insert failed</b></p>";
+                               $db->RollbackTrans();
+                       } else print "<b>Commit failed</b></p>";
+               }
+               if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt 
(should be 0)");
+               
+               /* ROLLBACK */  
+               if (!$db->BeginTrans()) print "<p><b>Error in 
BeginTrans</b>()</p>";
+               print "<p>Testing Rollback: ";
+               $db->Execute("insert into ADOXYZ 
(id,firstname,lastname,created) 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 ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt 
(should be 0)");
+       }
+       
+       if (1) {
+               print "<p>Testing MetaDatabases()</p>";
+               print_r( $db->MetaDatabases());
+
+               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 and views: "; 
+                       foreach($a as $v) print " ($v) ";
+                       print '</p>';
+               }
+               
+               $a = $db->MetaTables('VIEW');
+               if ($a===false) print "<b>MetaTables not supported 
(views)</b></p>";
+               else {
+                       print "Array of views: "; 
+                       foreach($a as $v) print " ($v) ";
+                       print '</p>';
+               }
+               
+               $a = $db->MetaTables(false,false,'aDo%');
+               if ($a===false) print "<b>MetaTables not supported 
(mask)</b></p>";
+               else {
+                       print "Array of ado%: "; 
+                       foreach($a as $v) print " ($v) ";
+                       print '</p>';
+               }
+               
+               $a = $db->MetaTables('TABLE');
+               if ($a===false) print "<b>MetaTables not supported</b></p>";
+               else {
+                       print "Array of tables: "; 
+                       foreach($a as $v) print " ($v) ";
+                       print '</p>';
+               }
+               
+               $db->debug=0;
+               $rez = $db->MetaColumns("NOSUCHTABLEHERE");
+               if ($rez !== false) {
+                       Err("MetaColumns error handling failed");
+                       var_dump($rez);
+               }
+               $db->debug=1;
+               $a = $db->MetaColumns('ADOXYZ');
+               if ($a===false) print "<b>MetaColumns not supported</b></p>";
+               else {
+                       print "<p>Columns of ADOXYZ: <font size=1><br>";
+                       foreach($a as $v) {print_r($v); echo "<br>";}
+                       echo "</font>";
+               }
+               
+               print "<p>Testing MetaIndexes</p>";
+               
+               $a = $db->MetaIndexes(('ADOXYZ'),true);
+               if ($a===false) print "<b>MetaIndexes not supported</b></p>";
+               else {
+                       print "<p>Indexes of ADOXYZ: <font size=1><br>";
+                       adodb_pr($a);
+                       echo "</font>";
+               }
+               print "<p>Testing MetaPrimaryKeys</p>";
+               $a = $db->MetaPrimaryKeys('ADOXYZ');
+               var_dump($a);
+       }
+       $rs = &$db->Execute('delete from ADOXYZ');
+       if ($rs) $rs->Close();
+       
+       $db->debug = false;
+       
+       
+       switch ($db->databaseType) {
+       case 'vfp':
+               
+               if (0) {
+                       // memo test
+                       $rs = $db->Execute("select data from memo");
+                       rs2html($rs);
+               }
+               break;
+
+       case 'postgres7':
+       case 'postgres64':
+       case 'postgres':
+       case 'ibase':
+               print "<p>Encode=".$db->BlobEncode("abc\0d\"'
+ef")."</p>";//'
+
+               print "<p>Testing Foreign Keys</p>";
+               $arr = $db->MetaForeignKeys('adoxyz',false,true);
+               print_r($arr);
+               if (!$arr) Err("No MetaForeignKeys");
+               break;
+       
+       case 'odbc_mssql':
+       case 'mssqlpo':
+               print "<p>Testing Foreign Keys</p>";
+               $arr = $db->MetaForeignKeys('Orders',false,true);
+               print_r($arr);
+               if (!$arr) Err("Bad MetaForeignKeys");
+               if ($db->databaseType == 'odbc_mssql') break;
+       
+       case 'mssql': 
+       
+               
+/*
+ASSUME Northwind available...
+
+CREATE PROCEDURE SalesByCategory
+       @CategoryName nvarchar(15), @OrdYear nvarchar(4) = '1998'
+AS
+IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998' 
+BEGIN
+       SELECT @OrdYear = '1998'
+END
+
+SELECT ProductName,
+       TotalPurchase=ROUND(SUM(CONVERT(decimal(14,2), OD.Quantity * 
(1-OD.Discount) * OD.UnitPrice)), 0)
+FROM [Order Details] OD, Orders O, Products P, Categories C
+WHERE OD.OrderID = O.OrderID 
+       AND OD.ProductID = P.ProductID 
+       AND P.CategoryID = C.CategoryID
+       AND C.CategoryName = @CategoryName
+       AND SUBSTRING(CONVERT(nvarchar(22), O.OrderDate, 111), 1, 4) = @OrdYear
+GROUP BY ProductName
+ORDER BY ProductName
+GO
+
+
+CREATE PROCEDURE ADODBTestSP
address@hidden nvarchar(25)
+AS
+SELECT GETDATE() AS T, @a AS A
+GO
+*/
+               print "<h4>Testing Stored Procedures for mssql</h4>";
+               $saved = $db->debug;
+               $db->debug=true;
+               $assoc = $ADODB_FETCH_MODE;
+               $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+               $cmd = $db->PrepareSP('ADODBTestSP');
+               $ss = "You should see me in the output.";
+               $db->InParameter($cmd,$ss,'a');
+               $rs = $db->Execute($cmd);
+               #var_dump($rs->fields);
+               echo $rs->fields['T']." --- ".$rs->fields['A']."---<br>";
+
+               $cat = 'Dairy Products';
+               $yr = '1998';
+               
+               $stmt = $db->PrepareSP('SalesByCategory');
+               $db->InParameter($stmt,$cat,'CategoryName');
+               $db->InParameter($stmt,$yr,'OrdYear');
+               $rs = $db->Execute($stmt);
+               rs2html($rs);
+               
+               $cat = 'Grains/Cereals';
+               $yr = 1998;
+               
+               $stmt = $db->PrepareSP('SalesByCategory');
+               $db->InParameter($stmt,$cat,'CategoryName');
+               $db->InParameter($stmt,$yr,'OrdYear');
+               $rs = $db->Execute($stmt);
+               rs2html($rs);
+               
+               $ADODB_FETCH_MODE = $assoc;
+               
+               /*
+               Test out params - works in PHP 4.2.3 and 4.3.3 and 4.3.8 but 
not 4.3.0:
+               
+                       CREATE PROCEDURE at_date_interval 
+                               @days INTEGER, 
+                               @start VARCHAR(20) OUT, 
+                               @end VARCHAR(20) OUT    
+                       AS 
+                       BEGIN 
+                               set @start = CONVERT(VARCHAR(20), getdate(), 
101) 
+                               set @end =CONVERT(VARCHAR(20), dateadd(day, 
@days, getdate()), 101 ) 
+                       END
+                       GO
+               */
+               $db->debug=1;
+               $stmt = $db->PrepareSP('at_date_interval');
+               $days = 10;
+               $begin_date = '';
+               $end_date = '';
+               $db->InParameter($stmt,$days,'days', 4, SQLINT4); 
+               $db->OutParameter($stmt,$begin_date,'start', 20, SQLVARCHAR ); 
+               $db->OutParameter($stmt,$end_date,'end', 20, SQLVARCHAR ); 
+               $db->Execute($stmt);
+               if (empty($begin_date) or empty($end_date) or $begin_date == 
$end_date) {
+                       Err("MSSQL SP Test for OUT Failed");
+                       print "begin=$begin_date end=$end_date<p>";
+               } else print "(Today +10days) = (begin=$begin_date 
end=$end_date)<p>";
+       
+               $db->debug = $saved;
+               break;
+       case 'oci8': 
+       case 'oci8po':
+               
+               if (0) {
+               $t = getmicrotime();
+               $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+               $arr = $db->GetArray('select * from abalone_tree');
+               $arr = $db->GetArray('select * from abalone_tree');
+               $arr = $db->GetArray('select * from abalone_tree');
+               echo "<p>t = ",getmicrotime() - $t,"</p>";
+               die();
+               }
+               
+               # cleanup
+               $db->Execute("delete from photos where id=99 or id=1");
+               $db->Execute("insert into photos (id) values(1)");
+               $db->Execute("update photos set photo=null,descclob=null where 
id=1");
+               
+               $saved = $db->debug;
+               $db->debug=true;
+               
+               
+
+               /*
+               CREATE TABLE PHOTOS
+               (
+                 ID           NUMBER(16),
+                 PHOTO        BLOB,
+                 DESCRIPTION  VARCHAR2(4000 BYTE),
+                 DESCCLOB     CLOB
+               );
+               
+               INSERT INTO PHOTOS (ID) VALUES(1);
+               */
+               $s = '';
+               for ($i = 0; $i <= 500; $i++) {
+                       $s .= '1234567890';
+               }
+               
+               $sql = "INSERT INTO photos ( ID, photo) ".
+                       "VALUES ( :id, empty_blob() )".
+                       " RETURNING photo INTO :xx";
+
+               
+               $blob_data = $s;
+               $id = 99;
+               
+               $stmt = $db->PrepareSP($sql);
+               $db->InParameter($stmt, $id, 'id');
+               $blob = $db->InParameter($stmt, $s, 'xx',-1, OCI_B_BLOB);
+               $db->StartTrans();
+               $result = $db->Execute($stmt);
+               $db->CompleteTrans();
+               
+               $s2= $db->GetOne("select photo from photos where id=99");
+               echo "<br>---$s2";
+               if ($s !== $s2) Err("insert blob does not match");
+
+               print "<h4>Testing Blob: size=".strlen($s)."</h4>";
+               $ok = $db->Updateblob('photos','photo',$s,'id=1');
+               if (!$ok) Err("Blob failed 1");
+               else {
+                       $s2= $db->GetOne("select photo from photos where id=1");
+                       if ($s !== $s2) Err("updateblob does not match");
+               }
+               
+               print "<h4>Testing Clob: size=".strlen($s)."</h4>";
+               $ok = $db->UpdateClob('photos','descclob',$s,'id=1');
+               if (!$ok) Err("Clob failed 1");
+               else {
+                       $s2= $db->GetOne("select descclob from photos where 
id=1");
+                       if ($s !== $s2) Err("updateclob does not match");
+               }
+               
+               
+               $s = '';
+               $s2 = '';
+               print "<h4>Testing Foreign Keys</h4>";
+               $arr = $db->MetaForeignKeys('emp','scott');
+               print_r($arr);
+               if (!$arr) Err("Bad MetaForeignKeys");
+/*
+-- TEST PACKAGE
+-- "Set scan off" turns off substitution variables. 
+Set scan off; 
+
+CREATE OR REPLACE PACKAGE Adodb AS
+TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR);
+PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) ;
+PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR);
+PROCEDURE data_in(input IN VARCHAR);
+PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER);
+END Adodb;
+/
+
+
+CREATE OR REPLACE PACKAGE BODY Adodb AS
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
+       BEGIN
+               OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE 
tablenames;
+       END open_tab;
+
+       PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT 
VARCHAR) IS
+       BEGIN
+               OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE 
tablenames;
+               tablenames := 'TEST';
+       END open_tab2;
+
+PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
+       BEGIN
+               output := 'Cinta Hati '||input;
+       END;
+       
+PROCEDURE data_in(input IN VARCHAR) IS
+       ignore varchar(1000);
+       BEGIN
+               ignore := input;
+       END;
+
+PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER) AS
+BEGIN
+p2 := p1;
+END;
+END Adodb;
+/
+
+*/
+
+               print "<h4>Testing Cursor Variables</h4>";
+               $rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:zz,'A%'); 
END;",'zz');
+       
+               if ($rs && !$rs->EOF) {
+                       $v = $db->GetOne("SELECT count(*) FROM tab where tname 
like 'A%'");
+                       if ($v == $rs->RecordCount()) print "Test 1 RowCount: 
OK<p>";
+                       else Err("Test 1 RowCount ".$rs->RecordCount().", 
actual = $v");
+               } else {
+                       print "<b>Error in using Cursor Variables 1</b><p>";
+               }
+               $rs->Close();
+               
+               print "<h4>Testing Stored Procedures for oci8</h4>";
+               
+               $stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
+               $a1 = 'Malaysia';
+               //$a2 = ''; # a2 doesn't even need to be defined!
+               $db->InParameter($stmt,$a1,'a1');
+               $db->OutParameter($stmt,$a2,'a2');
+               $rs = $db->Execute($stmt);
+               if ($rs) {
+                       if ($a2 !== 'Cinta Hati Malaysia') print "<b>Stored 
Procedure Error: a2 = $a2</b><p>";
+                       else echo  "OK: a2=$a2<p>";
+               } else {
+                       print "<b>Error in using Stored Procedure IN/Out 
Variables</b><p>";
+               }
+               
+               $tname = 'A%';
+               
+               $stmt = $db->PrepareSP('select * from tab where tname like 
:tablename');
+               $db->Parameter($stmt,$tname,'tablename');
+               $rs = $db->Execute($stmt);
+               rs2html($rs);
+               
+               $stmt = $db->PrepareSP("begin adodb.data_in(:a1); end;");
+               $db->InParameter($stmt,$a1,'a1');
+               $db->Execute($stmt);
+               
+               $db->debug = $saved;
+               break;
+       
+       default:
+               break;
+       }
+       $arr = array(
+               array(1,'Caroline','Miranda'),
+               array(2,'John','Lim'),
+               array(3,'Wai Hun','See')
+       );
+       //$db->debug=1;
+       print "<p>Testing Bulk Insert of 3 rows</p>";
+
+       $sql = "insert into ADOXYZ (id,firstname,lastname) values 
(".$db->Param('0').",".$db->Param('1').",".$db->Param('2').")";
+       $db->StartTrans();
+       $db->Execute($sql,$arr);
+       $db->CompleteTrans();
+       $rs = $db->Execute('select * from ADOXYZ order by id');
+       if (!$rs || $rs->RecordCount() != 3) Err("Bad bulk insert");
+       
+       rs2html($rs);
+       
+       $db->Execute('delete from ADOXYZ');
+               
+       print "<p>Inserting 50 rows</p>";
+
+       for ($i = 0; $i < 5; $i++) {    
+
+       $time = $db->DBDate(time());
+       if (empty($_GET['hide'])) $db->debug = true;
+       switch($db->databaseType){
+       case 'mssqlpo':
+       case 'mssql':
+               $sqlt = "CREATE TABLE mytable (
+  row1 INT  IDENTITY(1,1) NOT NULL,
+  row2 varchar(16),
+  PRIMARY KEY  (row1))";
+               //$db->debug=1;
+               if (!$db->Execute("delete from mytable")) 
+                       $db->Execute($sqlt);
+                       
+               $ok = $db->Execute("insert into mytable (row2) values 
('test')");
+               $ins_id=$db->Insert_ID();
+               echo "Insert ID=";var_dump($ins_id);
+               if ($ins_id == 0) Err("Bad Insert_ID()");
+               $ins_id2 = $db->GetOne("select row1 from mytable");
+               if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
+               
+               $arr = array(0=>'Caroline',1=>'Miranda');
+               $sql = "insert into ADOXYZ (id,firstname,lastname,created) 
values ($i*10+0,?,?,$time)";
+               break;
+       case 'mysqli':
+       case 'mysqlt':
+       case 'mysql':
+               $sqlt = "CREATE TABLE `mytable` (
+  `row1` int(11) NOT NULL auto_increment,
+  `row2` varchar(16) NOT NULL default '',
+  PRIMARY KEY  (`row1`),
+  KEY `myindex` (`row1`,`row2`)
+) ";
+               if (!$db->Execute("delete from mytable")) 
+                       $db->Execute($sqlt);
+                       
+               $ok = $db->Execute("insert into mytable (row2) values 
('test')");
+               $ins_id=$db->Insert_ID();
+               echo "Insert ID=";var_dump($ins_id);
+               if ($ins_id == 0) Err("Bad Insert_ID()");
+               $ins_id2 = $db->GetOne("select row1 from mytable");
+               if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
+               
+       default:
+               $arr = array(0=>'Caroline',1=>'Miranda');
+               $sql = "insert into ADOXYZ (id,firstname,lastname,created) 
values ($i*10+0,?,?,$time)";
+               break;
+       
+       case 'oci8':
+       case 'oci805':
+               $arr = array('first'=>'Caroline','last'=>'Miranda');
+               $amt = rand() % 100;
+               $sql = "insert into ADOXYZ (id,firstname,lastname,created) 
values ($i*10+0,:first,:last,$time)";                
+               break;
+       }
+       if ($i & 1) {
+               $sql = $db->Prepare($sql);
+       }
+       $rs = $db->Execute($sql,$arr);
+               
+       if ($rs === false) Err( 'Error inserting with parameters');
+       else $rs->Close();
+       $db->debug = false;
+       $db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values 
($i*10+1,'John','Lim',$time)");
+       /*$ins_id=$db->Insert_ID();
+       echo "Insert ID=";var_dump($ins_id);*/
+       if ($db->databaseType == 'mysql') if ($ins_id == 0) Err('Bad 
Insert_ID');
+       $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',".$db->quote("Turing'ton").",$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 )");
+       } // for
+       if (1) {
+       $db->debug=1;
+       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       $cnt = $db->GetOne("select count(*) from ADOXYZ");
+       $rs = $db->Execute('update ADOXYZ set id=id+1');        
+       if (!is_object($rs)) {
+               print_r($rs);
+               err("Update should return object");
+       } 
+       if (!$rs) err("Update generated error");
+       
+       $nrows = $db->Affected_Rows();   
+       if ($nrows === false) print "<p><b>Affected_Rows() not 
supported</b></p>";
+       else if ($nrows != $cnt)  print "<p><b>Affected_Rows() Error: $nrows 
returned (should be 50) </b></p>";
+       else print "<p>Affected_Rows() passed</p>";
+       }
+       
+       if ($db->dataProvider == 'oci8')  $array = 
array('zid'=>1,'zdate'=>date('Y-m-d',time()));
+       else $array=array(1,date('Y-m-d',time()));
+       
+       
+       #$array = array(1,date('Y-m-d',time()));
+       $id = $db->GetOne("select id from ADOXYZ 
+               where id=".$db->Param('zid')." and 
created>=".$db->Param('ZDATE')."",
+               $array);
+       if ($id != 1) Err("Bad bind; id=$id");
+       else echo "<br>Bind date/integer passed";
+       
+       $db->debug = false;
+       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+ 
//////////////////////////////////////////////////////////////////////////////////////////
+       
+       $rs = $db->Execute("select * from ADOXYZ where firstname = 'not 
known'");
+       if (!$rs ||  !$rs->EOF) print "<p><b>Error on empty recordset</b></p>";
+       else if ($rs->RecordCount() != 0) {
+               print "<p><b>Error on RecordCount. Should be 0. Was 
".$rs->RecordCount()."</b></p>"; 
+               print_r($rs->fields);
+       }
+       if ($db->databaseType !== 'odbc') {
+               $rs = &$db->Execute("select 
id,firstname,lastname,created,".$db->random." from ADOXYZ order by id");
+               if ($rs) {
+                       if ($rs->RecordCount() != 50) {
+                               print "<p><b>RecordCount returns 
".$rs->RecordCount().", should be 50</b></p>";
+                               adodb_pr($rs->GetArray());
+                               $poc = $rs->PO_RecordCount('ADOXYZ');
+                               if ($poc == 50) print "<p> &nbsp; &nbsp; 
PO_RecordCount passed</p>";
+                               else print "<p><b>PO_RecordCount returns wrong 
value: $poc</b></p>";
+                       } else print "<p>RecordCount() passed</p>";
+                       if (isset($rs->fields['firstname'])) print '<p>The 
fields columns can be indexed by column name.</p>';
+                       else {
+                               Err( '<p>The fields columns <i>cannot</i> be 
indexed by column name.</p>');
+                               print_r($rs->fields);
+                       }
+                       if (empty($_GET['hide'])) rs2html($rs);
+               }
+               else print "<p><b>Error in Execute of SELECT with 
random</b></p>";
+       }
+       $val = $db->GetOne("select count(*) from ADOXYZ");
+        if ($val == 50) print "<p>GetOne returns ok</p>";
+        else print "<p><b>Fail: GetOne returns $val</b></p>";
+
+        echo "<b>GetRow Test</b>";
+       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       $val1 = $db->GetRow("select count(*) from ADOXYZ");
+       $val2 =& $db->GetRow("select count(*) from ADOXYZ");
+        if ($val1[0] == 50 and sizeof($val1) == 1 and $val2[0] == 50 and 
sizeof($val2) == 1) print "<p>GetRow returns ok</p>";
+        else {
+               print_r($val);
+               print "<p><b>Fail: GetRow returns {$val2[0]}</b></p>";
+       }
+
+       print "<p>FetchObject/FetchNextObject Test</p>";
+       $rs = $db->Execute('select * from ADOXYZ');
+       if ($rs) {
+               if (empty($rs->connection)) print "<b>Connection object missing 
from recordset</b></br>";
+               
+               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;
+                       }
+               }
+       } else {
+               print "<p><b>Failed rs</b></p>";
+               die("<p>ADOXYZ table cannot be read - die()");
+       }
+       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       print "<p>FetchObject/FetchNextObject Test 2</p>";
+       #$db->debug=99;
+       $rs = $db->Execute('select * from ADOXYZ');
+       if (empty($rs->connection)) print "<b>Connection object missing from 
recordset</b></br>";
+       print_r($rs->fields);
+       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;
+               }
+       }
+       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       
+       $savefetch = $ADODB_FETCH_MODE;
+       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       
+       print "<p>CacheSelectLimit  Test...</p>";
+       $db->debug=1;
+       $rs = $db->CacheSelectLimit('select  id, firstname from  ADOXYZ order 
by id',2);
+       
+       if ($rs && !$rs->EOF) {
+               if (isset($rs->fields[0])) {
+                       Err("ASSOC has numeric fields");
+                       print_r($rs->fields);
+               }
+               if ($rs->fields['id'] != 1)  {Err("Error"); 
print_r($rs->fields);};
+               if (trim($rs->fields['firstname']) != 'Caroline')  {print 
Err("Error 2"); print_r($rs->fields);};
+               
+               $rs->MoveNext();
+               if ($rs->fields['id'] != 2)  {Err("Error 3"); 
print_r($rs->fields);};
+               $rs->MoveNext();
+               if (!$rs->EOF) {
+                       Err("Error EOF");
+                       print_r($rs);
+               }
+       }
+       
+       print "<p>FETCH_MODE = ASSOC: Should get 1, Caroline</p>";
+       $rs = &$db->SelectLimit('select id,firstname from ADOXYZ order by 
id',2);
+       if ($rs && !$rs->EOF) {
+               if (ADODB_ASSOC_CASE == 2) {
+                       $id = 'ID';
+                       $fname = 'FIRSTNAME';
+               }else {
+                       $id = 'id';
+                       $fname = 'firstname';
+               }
+               if ($rs->fields[$id] != 1)  {Err("Error 1"); 
print_r($rs->fields);};
+               if (trim($rs->fields[$fname]) != 'Caroline')  {Err("Error 2"); 
print_r($rs->fields);};
+               $rs->MoveNext();
+               if ($rs->fields[$id] != 2)  {Err("Error 3"); 
print_r($rs->fields);};
+               $rs->MoveNext();
+               if (!$rs->EOF) Err("Error EOF");
+               else if (is_array($rs->fields) || $rs->fields) {
+                       Err("Error: ## fields should be set to false on EOF");
+                       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 (isset($rs->fields['id'])) Err("FETCH_NUM has ASSOC fields");
+               if ($rs->fields[0] != 1)  {Err("Error 1"); 
print_r($rs->fields);};
+               if (trim($rs->fields[1]) != 'Caroline')  {Err("Error 
2");print_r($rs->fields);};
+               $rs->MoveNext();
+               if (!$rs->EOF) Err("Error EOF");
+
+       }
+       $ADODB_FETCH_MODE = $savefetch;
+       
+       $db->debug = false;
+       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) {Err("Error 1");print_r($arr);};
+               if (trim($arr['FIRSTNAME']) != 'Caroline') {Err("Error 2"); 
print_r($arr);};
+               $rs->MoveNext();
+               if (!$rs->EOF) Err("Error EOF");
+
+       }
+       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) {Err("Error 1"); print_r($arr);};
+               if (trim($arr['firstname']) != 'Caroline') {Err("Error 2"); 
print_r($arr);};
+
+       }
+       
+       print "<p>GetCol Test</p>";
+       $col = $db->GetCol('select distinct firstname from adoxyz order by 1');
+       if (!is_array($col)) Err("Col size is wrong");
+       if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col 
elements wrong");
+
+       $db->debug = true;
+       
+               
+       echo "<p>Date Update Test</p>";
+       $zdate = date('Y-m-d',time()+3600*24);
+       $zdate = $db->DBDate($zdate);
+       $db->Execute("update ADOXYZ set created=$zdate where id=1");
+       $row = $db->GetRow("select created,firstname from ADOXYZ where id=1");
+       print_r($row); echo "<br>";
+       
+       
+       
+       print "<p>SelectLimit Distinct 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') Err("Error 1 (exp 
Caroline), ".$rs->fields[1]);
+               $rs->MoveNext();
+               
+               if (trim($rs->fields[1]) != 'John') Err("Error 2 (exp John), 
".$rs->fields[1]);
+               $rs->MoveNext();
+               if (trim($rs->fields[1]) != 'Mary') Err("Error 3 (exp 
Mary),".$rs->fields[1]);
+               $rs->MoveNext();
+               if (! $rs->EOF) Err("Error EOF");
+               //rs2html($rs);
+       } else Err("Failed SelectLimit Test 1");
+       
+       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') Err("Error 1 - No Mary, 
instead: ".$rs->fields[1]);
+               $rs->MoveNext();
+               if (trim($rs->fields[1]) != 'George')Err("Error 2 - No George, 
instead: ".$rs->fields[1]);
+               $rs->MoveNext();
+               if (trim($rs->fields[1]) != 'Mr. Alan') Err("Error 3 - No Mr. 
Alan, instead: ".$rs->fields[1]);
+               $rs->MoveNext();
+               if (! $rs->EOF) Err("Error EOF");
+       //      rs2html($rs);
+       }
+        else Err("Failed SelectLimit Test 2 ". ($rs ? 'EOF':'no RS'));
+       
+       print "<p>SelectLimit Test 3: Should see Wai Hun and Steven</p>";
+       $db->debug=1;
+       global $A; $A=1;
+       $rs = &$db->SelectLimit('select * from ADOXYZ order by id',-1,48);
+       $A=0;
+       if ($rs && !$rs->EOF) {
+               if (empty($rs->connection)) print "<b>Connection object missing 
from recordset</b></br>";
+               if (trim($rs->fields[1]) != 'Wai Hun') Err("Error 1 
".$rs->fields[1]);
+               $rs->MoveNext();
+               if (trim($rs->fields[1]) != 'Steven') Err("Error 2 
".$rs->fields[1]);
+               $rs->MoveNext();
+               if (! $rs->EOF) {
+                       Err("Error EOF");
+               }
+               //rs2html($rs);
+       }
+        else Err("Failed SelectLimit Test 3");
+               $db->debug = false;
+       
+       
+       $rs = &$db->Execute("select * from ADOXYZ order by id");
+       print "<p>Testing Move()</p>";  
+       if (!$rs)Err( "Failed Move SELECT");
+       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>";
+                       } 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>";
+                       if ($rs->EOF) Err("Move(7) is EOF already");
+                       $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>";
+                       $rs->MoveNext();
+                       if (!$rs->EOF) err("Bad MoveNext");
+                       if ($rs->canSeek) {
+                               $rs->Move(3);
+                               if (trim($rs->Fields("firstname")) != 'George') 
{
+                                       print 
'<p>'.$rs->Fields("id")."<b>$db->databaseType: Move(3) after MoveLast 
failed</b></p>";
+                                       
+                               } else print "Move(3) after MoveLast() OK<BR>";
+                       }
+                       
+                       print "<p>Empty Move Test";
+                       $rs = $db->Execute("select * from ADOXYZ where id > 0 
and id < 0");
+                       $rs->MoveFirst();
+                       if (!$rs->EOF || $rs->fields) Err("Error in empty move 
first");
+               }
+       }
+       
+       $rs = $db->Execute('select * from ADOXYZ where id = 2');
+       if ($rs->EOF || !is_array($rs->fields)) Err("Error in select");
+       $rs->MoveNext();
+       if (!$rs->EOF) Err("Error in EOF (xx) ");
+ //    $db->debug=true;
+       print "<p>Testing ADODB_FETCH_ASSOC and concat: concat firstname and 
lastname</p>";
+
+       $save = $ADODB_FETCH_MODE;
+       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       if ($db->dataProvider == 'postgres') {
+               $sql = "select ".$db->Concat('cast(firstname as 
varchar)',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as 
d from ADOXYZ";
+               $rs = &$db->Execute($sql);
+       } else {
+               $sql = "select distinct ".$db->Concat('firstname',$db->qstr(' 
'),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
+               $rs = &$db->Execute($sql);
+       }
+       if ($rs) {
+               if (empty($_GET['hide'])) rs2html($rs);
+       } else {
+               Err( "Failed Concat:".$sql);
+       }
+       $ADODB_FETCH_MODE = $save;
+       print "<hr />Testing GetArray() ";
+       //$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       
+       $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>";
+       }
+       
+       $arr = $db->GetArray("select x from ADOXYZ");
+       $e = $db->ErrorMsg(); $e2 = $db->ErrorNo();
+       echo "Testing error handling, should see illegal column 'x' error=<i>$e 
($e2) </i><br>";
+       if (!$e || !$e2) Err("Error handling did not work");
+       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>";
+       
+       $stmt = $db->Prepare("select * from ADOXYZ where id < 3");
+       $rs = $db->Execute($stmt);
+       if (!$rs) Err("Prepare failed");
+       else {
+               $arr = $rs->GetArray();
+               if (!$arr) Err("Prepare failed 2");
+               if (sizeof($arr) != 2) Err("Prepare failed 3");
+       }
+       print "Testing GetAssoc() ";
+       $savecrecs = $ADODB_COUNTRECS;
+       $ADODB_COUNTRECS = false;
+       //$arr = $db->GetArray("select  lastname,firstname from ADOXYZ");
+       //print_r($arr);
+       print "<hr />";
+       $rs =& $db->Execute("select distinct lastname,firstname,created from 
ADOXYZ");
+       
+       if ($rs) {
+               $arr = $rs->GetAssoc();
+               //print_r($arr);
+               if (empty($arr['See']) || trim(reset($arr['See'])) != 'Wai 
Hun') print $arr['See']." &nbsp; <b>ERROR</b><br>";
+               else print " OK 1";
+       }
+       
+       $arr = &$db->GetAssoc("select distinct lastname,firstname from ADOXYZ");
+       if ($arr) {
+               //print_r($arr);
+               if (empty($arr['See']) || trim($arr['See']) != 'Wai Hun') print 
$arr['See']." &nbsp; <b>ERROR</b><br>";
+               else print " OK 2<BR>";
+       }
+       // Comment this out to test countrecs = false
+       $ADODB_COUNTRECS = $savecrecs;
+       $db->debug=1;
+       $query = $db->Prepare("select count(*) from ADOXYZ");
+       $rs = $db->CacheExecute(10,$query);
+       if (reset($rs->fields) != 50) echo Err("$cnt wrong for 
Prepare/CacheGetOne");
+       
+       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);
+               if (empty($rs->connection)) print "<b>Connection object missing 
from recordset</b></br>";
+       } else print " Fail<BR>";
+       print '</p><hr />';
+       
+       print "Testing GetMenu3()<br>";
+       $rs = $db->Execute("select ".$db->Concat('firstname',"'-'",'id').",id, 
lastname from ADOXYZ order by lastname,id");
+       if ($rs) print "Grouped Menu: ".$rs->GetMenu3('name');
+       else Err('Grouped Menu GetMenu3()');
+       print "<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(6,"select distinct firstname,lastname from 
ADOXYZ");
+       if ($rs) print ' No blanks, Steven selected: '. 
$rs->GetMenu2('menu',('Oey'),false).'<BR>';
+       else print " Fail<BR>";
+       }
+       echo "<h3>CacheEXecute</h3>";
+
+       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       $rs = &$db->CacheExecute(6,"select distinct firstname,lastname from 
ADOXYZ");
+       print_r($rs->fields); echo $rs->fetchMode;echo "<br>";
+       echo $rs->Fields('firstname');
+       
+       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       $rs = &$db->CacheExecute(6,"select distinct firstname,lastname from 
ADOXYZ");
+       print_r($rs->fields);echo "<br>";
+       echo $rs->Fields('firstname');
+       $db->debug = false;
+       
+       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       // phplens
+       
+       $sql = 'select * from ADOXYZ where 0=1';
+       echo "<p>**Testing '$sql' (phplens compat 1)</p>";
+       $rs = &$db->Execute($sql);
+       if (!$rs) err( "<b>No recordset returned for '$sql'</b>");
+       if (!$rs->FieldCount()) err( "<b>No fields returned for $sql</b>");
+       if (!$rs->FetchField(1)) err( "<b>FetchField failed for $sql</b>");
+       
+       $sql = 'select * from ADOXYZ order by 1';
+       echo "<p>**Testing '$sql' (phplens compat 2)</p>";
+       $rs = &$db->Execute($sql);
+       if (!$rs) err( "<b>No recordset returned for 
'$sql'<br>".$db->ErrorMsg()."</b>");
+       
+       
+       $sql = 'select * from ADOXYZ order by 1,1';
+       echo "<p>**Testing '$sql' (phplens compat 3)</p>";
+       $rs = &$db->Execute($sql);
+       if (!$rs) err( "<b>No recordset returned for 
'$sql'<br>".$db->ErrorMsg()."</b>");
+       
+       
+       // Move
+       $rs1 = &$db->Execute("select id from ADOXYZ where id <= 2 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 OK</p>";
+               
+       
+       echo "<p> GenID test: ";
+       for ($i=1; $i <= 10; $i++) 
+               echo  "($i: ",$val = $db->GenID($db->databaseType.'abcseq6' 
,5), ") ";
+       if ($val == 0) Err("GenID not supported");
+       
+       if ($val) {
+               $db->DropSequence('abc_seq2');
+               $db->CreateSequence('abc_seq2');
+               $val = $db->GenID('abc_seq2');
+               $db->DropSequence('abc_seq2');
+               $db->CreateSequence('abc_seq2');
+               $val = $db->GenID('abc_seq2');
+               if ($val != 1) Err("Drop and Create Sequence not supported 
($val)");
+       }
+       echo "<p>";
+       
+       if (substr($db->dataProvider,0,3) != 'notused') { // used to crash ado
+               $sql = "select firstnames from adoxyz";
+               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>";
+       } else 
+               print "<p><b>ADO skipped error handling of bad select 
statement</b></p>";
+       
+       print "<p>ASSOC TEST 2<br>";
+       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       $rs = $db->query('select * from adoxyz order by id');
+       if ($ee = $db->ErrorMsg()) {
+               Err("Error message=$ee");
+       }
+       if ($ee = $db->ErrorNo()) {
+               Err("Error No = $ee");
+       }
+       print_r($rs->fields);
+       for($i=0;$i<$rs->FieldCount();$i++) 
+       { 
+               $fld=$rs->FetchField($i); 
+               print "<br> Field name is ".$fld->name; 
+               print " ".$rs->Fields($fld->name); 
+       } 
+
+               
+       print "<p>BOTH TEST 2<br>";
+       if ($db->dataProvider == 'ado') {
+               print "<b>ADODB_FETCH_BOTH not supported</b> for 
dataProvider=".$db->dataProvider."<br>";
+       } else {
+               $ADODB_FETCH_MODE = ADODB_FETCH_BOTH;
+               $rs = $db->query('select * from adoxyz order by id');
+               for($i=0;$i<$rs->FieldCount();$i++) 
+               { 
+                       $fld=$rs->FetchField($i); 
+                       print "<br> Field name is ".$fld->name; 
+                       print " ".$rs->Fields($fld->name); 
+               } 
+       }
+       
+       print "<p>NUM TEST 2<br>";
+       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       $rs = $db->query('select * from adoxyz order by id');
+       for($i=0;$i<$rs->FieldCount();$i++) 
+       { 
+               $fld=$rs->FetchField($i); 
+               print "<br> Field name is ".$fld->name; 
+               print " ".$rs->Fields($fld->name); 
+       } 
+       
+       print "<p>ASSOC Test of SelectLimit<br>";
+       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       $rs = $db->selectlimit('select * from adoxyz order by id',3,4);
+       $cnt = 0;
+       while ($rs && !$rs->EOF) {
+               $cnt += 1;
+               if (!isset($rs->fields['firstname'])) {
+                       print "<br><b>ASSOC returned numeric field</b></p>";
+                       break;
+               }
+               $rs->MoveNext();
+       }
+       if ($cnt != 3) print "<br><b>Count should be 3, instead it was 
$cnt</b></p>";
+       
+       
+       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       if ($db->sysDate) {
+               $saved = $db->debug;
+               $db->debug = 1;
+               $rs = $db->Execute("select {$db->sysDate} from adoxyz where 
id=1");
+               if (ADORecordSet::UnixDate(date('Y-m-d')) != 
$rs->UnixDate($rs->fields[0])) {
+                       print "<p><b>Invalid date {$rs->fields[0]}</b></p>";
+               } else
+                       print "<p>Passed \$sysDate test ({$rs->fields[0]})</p>";
+               
+               print_r($rs->FetchField(0));
+               print time();
+               $db->debug=$saved;
+       } else {
+               print "<p><b>\$db->sysDate not defined</b></p>";
+       }
+
+       print "<p>Test CSV</p>";
+       include_once('../toexport.inc.php');
+       //$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       $rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\' 
he,\'"\' q  from adoxyz',10);   
+       
+       print "<pre>";
+       print rs2csv($rs);
+       print "</pre>";
+       
+       $rs = $db->SelectLimit('select id,firstname,lastname,created,\'The      
"young man", he said\' from adoxyz',10);        
+       
+       if (PHP_VERSION < 5) {
+               print "<pre>";
+               rs2tabout($rs);
+               print "</pre>";
+       }
+       print " CacheFlush ";
+       $db->CacheFlush();
+       
+       $date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A');
+       $sql = "SELECT $date from ADOXYZ";
+       print "<p>Test SQLDate: ".htmlspecialchars($sql)."</p>";
+       $rs = $db->SelectLimit($sql,1);
+       $d = date('d-m-M-Y-').'Q'.(ceil(date('m')/3.0)).date(' h:i:s A');
+       if (!$rs) Err("SQLDate query returned no recordset");
+       else if ($d != $rs->fields[0]) Err("SQLDate 1 failed expected: 
<br>act:$d <br>sql:".$rs->fields[0]);
+       
+       $date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
+       $sql = "SELECT $date from ADOXYZ";
+       print "<p>Test SQLDate: ".htmlspecialchars($sql)."</p>";
+       $rs = $db->SelectLimit($sql,1);
+       $ts = ADOConnection::UnixDate('1974-02-25');
+       $d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s 
A',$ts);
+       if (!$rs) {
+               Err("SQLDate query returned no recordset");
+               echo $db->ErrorMsg(),'<br>';
+       } else if ($d != $rs->fields[0]) Err("SQLDate 2 failed expected: 
<br>act:$d <br>sql:".$rs->fields[0]);
+       
+       
+       print "<p>Test Filter</p>";
+       $db->debug = 1;
+       
+       $rs = $db->SelectLimit('select * from ADOXYZ where id < 3 order by id');
+       
+       $rs = RSFilter($rs,'do_strtolower');
+       if (trim($rs->fields[1]) != 'caroline'  && trim($rs->fields[2]) != 
'miranda') {
+               err('**** RSFilter failed');
+               print_r($rs->fields);
+       }
+       
+       rs2html($rs);
+               
+       $db->debug=1;
+       
+       
+       print "<p>Test Replace</p>";
+       
+       $ret = $db->Replace('adoxyz', 
+               array('id'=>1,'firstname'=>'Caroline','lastname'=>'Miranda'),
+               array('id'),
+               $autoq = true);
+       if (!$ret) echo "<p>Error in replacing existing record</p>";
+       else {
+               $saved = $db->debug;
+               $db->debug = 0;
+               $savec = $ADODB_COUNTRECS;
+               $ADODB_COUNTRECS = true;
+               $rs = $db->Execute('select * FROM ADOXYZ where id=1');
+               $db->debug = $saved;
+               if ($rs->RecordCount() != 1) {
+                       $cnt = $rs->RecordCount();
+                       rs2html($rs);
+                       print "<b>Error - Replace failed, count=$cnt</b><p>";
+               }
+               $ADODB_COUNTRECS = $savec;
+       }
+       $ret = $db->Replace('adoxyz', 
+               array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
+               array('id','firstname'),
+               $autoq = true);
+       if ($ret != 2) print "<b>Replace failed: </b>";
+       print "test A return value=$ret (2 expected) <p>";
+       
+       $ret = $db->Replace('adoxyz', 
+               
array('id'=>1000,'firstname'=>'Sherazade','lastname'=>'Al-Rashid'),
+               'id',
+               $autoq = true);
+       if ($ret != 1) 
+               if ($db->dataProvider == 'ibase' && $ret == 2);
+               else print "<b>Replace failed: </b>";
+       print "test B return value=$ret (1 or if ibase then 2 expected) <p>";
+       
+       print "<h3>rs2rs Test</h3>";
+       
+       $rs = $db->Execute('select * from adoxyz where id>= 1 order by id');
+       $rs = $db->_rs2rs($rs);
+       $rs->valueX = 'X';
+       $rs->MoveNext();
+       $rs = $db->_rs2rs($rs);
+       if (!isset($rs->valueX)) err("rs2rs does not preserve array 
recordsets");
+       if (reset($rs->fields) != 1) err("rs2rs does not move to first row: 
id=".reset($rs->fields));
+
+       /////////////////////////////////////////////////////////////
+       include_once('../pivottable.inc.php');
+       print "<h3>Pivot Test</h3>";
+       $db->debug=true;
+       $sql = PivotTableSQL(
+               $db,                    # adodb connection
+               'adoxyz',               # tables
+               'firstname',    # row fields
+               'lastname',             # column fields 
+               false,                  # join
+               'ID',                   # sum
+               'Sum ',                 # label for sum
+               'sum',                  # aggregate function
+               true
+       );
+       $rs = $db->Execute($sql);
+       if ($rs) rs2html($rs);
+       else Err("Pivot sql error");
+       
+       $pear = true; //true;
+       $db->debug=false;
+       
+       if ($pear) {
+       // PEAR TESTS BELOW
+       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+       
+       include_once "PEAR.php";
+       $rs = $db->query('select * from adoxyz where id>0 and id<10 order by 
id');
+       
+       $i = 0;
+       if ($rs && !$rs->EOF) {
+               while ($arr = $rs->fetchRow()) {
+                       $i++;
+                       //print "$i ";
+                       if ($arr[0] != $i) {
+                               print_r($arr);
+                               print "<p><b>PEAR DB emulation error 
1.</b></p>";
+                               $pear = false;
+                               break;
+                       }
+               }
+               $rs->Close();
+       }
+       
+       
+       if ($i != $db->GetOne('select count(*) from adoxyz where id>0 and 
id<10')) {
+               print "<p><b>PEAR DB emulation error 1.1 EOF ($i)</b></p>";
+               $pear = false;
+       }
+       
+       $rs = $db->limitQuery('select * from adoxyz where id>0 order by 
id',$i=3,$top=3);
+       $i2 = $i;
+       if ($rs && !$rs->EOF) {
+
+               while (!is_object($rs->fetchInto($arr))) {
+                       $i2++;
+                       
+       //                      print_r($arr);
+       //              print "$i ";print_r($arr);
+                       if ($arr[0] != $i2) {
+                               print "<p><b>PEAR DB emulation error 
2.</b></p>";
+                               $pear = false;
+                               break;
+                       }
+               }
+               $rs->Close();
+       }
+       if ($i2 != $i+$top) {
+               print "<p><b>PEAR DB emulation error 2.1 EOF (correct=$i+$top, 
actual=$i2)</b></p>";
+               $pear = false;
+       }
+       }
+       if ($pear) print "<p>PEAR DB emulation passed.</p>";
+       flush();
+
+       
+       $rs = $db->SelectLimit("select ".$db->sysDate." from adoxyz",1);
+       $date = $rs->fields[0];
+       if (!$date) Err("Bad sysDate");
+       else {
+               $ds = $db->UserDate($date,"d m Y");
+               if ($ds != date("d m Y")) Err("Bad UserDate: ".$ds.' 
expected='.date("d m Y"));
+               else echo "Passed UserDate: $ds<p>";
+       }
+       $db->debug=1;
+       if ($db->dataProvider == 'oci8') 
+               $rs = $db->SelectLimit("select 
to_char(".$db->sysTimeStamp.",'YYYY-MM-DD HH24:MI:SS') from adoxyz",1);
+       else 
+               $rs = $db->SelectLimit("select ".$db->sysTimeStamp." from 
adoxyz",1);
+       $date = $rs->fields[0];
+       if (!$date) Err("Bad sysTimeStamp");
+       else {
+               $ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
+               if ($ds != date("H \\h\\r\\s-d m Y")) Err("Bad UserTimeStamp: 
".$ds.", correct is ".date("H \\h\\r\\s-d m Y"));
+               else echo "Passed UserTimeStamp: $ds<p>";
+               
+               $date = 100;
+               $ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
+               $ds2 = date("H \\h\\r\\s-d m Y",$date);
+               if ($ds != $ds2) Err("Bad UserTimeStamp 2: $ds: $ds2");
+               else echo "Passed UserTimeStamp 2: $ds<p>";
+       }
+       flush();
+       
+       if ($db->hasTransactions) {
+               //$db->debug=1;
+               echo "<p>Testing StartTrans CompleteTrans</p>";
+               $db->raiseErrorFn = false;
+               $db->StartTrans();
+               $rs = $db->Execute('select * from notable');
+                       $db->StartTrans();
+                               $db->BeginTrans();
+                       $db->Execute("update ADOXYZ set firstname='Carolx' 
where id=1");
+                               $db->CommitTrans();
+                       $db->CompleteTrans();
+               $rez = $db->CompleteTrans();
+               if ($rez !== false) {
+                       if (is_null($rez)) Err("Error: _transOK not modified");
+                       else Err("Error: CompleteTrans (1) should have failed");
+               } else {
+                       $name = $db->GetOne("Select firstname from ADOXYZ where 
id=1");
+                       if ($name == "Carolx") Err("Error: CompleteTrans (2) 
should have failed");
+                       else echo "<p> -- Passed StartTrans test1 - rolling 
back</p>";
+               }
+               
+               $db->StartTrans();
+                       $db->BeginTrans();
+               $db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
+                       $db->RollbackTrans();
+               $rez = $db->CompleteTrans();
+               if ($rez !== true) Err("Error: CompleteTrans (1) should have 
succeeded");
+               else {
+                       $name = $db->GetOne("Select firstname from ADOXYZ where 
id=1");
+                       if (trim($name) != "Carolx") Err("Error: CompleteTrans 
(2) should have succeeded, returned name=$name");
+                       else echo "<p> -- Passed StartTrans test2 - 
commiting</p>";
+               }
+       }
+       flush();
+       $saved = $db->debug;
+       $db->debug=1;
+       $cnt = _adodb_getcount($db, 'select * from ADOXYZ where firstname in 
(select firstname from ADOXYZ)');
+       echo "<b>Count=</b> $cnt";
+       $db->debug=$saved;
+       
+       global $TESTERRS;
+       $debugerr = true;
+       
+       global $ADODB_LANG;$ADODB_LANG = 'fr';
+       $db->debug = false;
+       $TESTERRS = 0;
+       $db->raiseErrorFn = 'adodb_test_err';
+       global $ERRNO; // from adodb_test_err
+       $db->Execute('select * from nowhere');
+       $metae = $db->MetaError($ERRNO);
+       if ($metae !== DB_ERROR_NOSUCHTABLE) print "<p><b>MetaError=".$metae." 
wrong</b>, should be ".DB_ERROR_NOSUCHTABLE."</p>";
+       else print "<p>MetaError ok (".DB_ERROR_NOSUCHTABLE."): 
".$db->MetaErrorMsg($metae)."</p>";
+       if ($TESTERRS != 1) print "<b>raiseErrorFn select nowhere 
failed</b><br>";
+       $rs = $db->Execute('select * from adoxyz');
+       if ($debugerr) print " Move";
+       $rs->Move(100);
+       $rs->_queryID = false;
+       if ($debugerr) print " MoveNext";
+       $rs->MoveNext();
+       if ($debugerr) print " $rs=false";
+       $rs = false;
+
+       flush();
+       
+       print "<p>SetFetchMode() tests</p>";
+       $db->SetFetchMode(ADODB_FETCH_ASSOC);
+       $rs = $db->SelectLimit('select firstname from adoxyz',1);
+       if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
+       
+       $ADODB_FETCH_MODE = ADODB_FETCH_NUM;    
+       $rs = $db->SelectLimit('select firstname from adoxyz',1);
+       //var_dump($rs->fields);
+       if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
+       
+       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;  
+       $db->SetFetchMode(ADODB_FETCH_NUM);
+       $rs = $db->SelectLimit('select firstname from adoxyz',1);
+       if (!isset($rs->fields[0])) Err("BAD FETCH NUM");
+       
+       flush();
+       
+       print "<p>Test MetaTables again with SetFetchMode()</p>";
+       $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+       $db->SetFetchMode(ADODB_FETCH_ASSOC);
+       print_r($db->MetaTables());
+       print "<p>";
+       
+       ////////////////////////////////////////////////////////////////////
+       
+       print "<p>Testing Bad Connection</p>";
+       flush();
+       
+       if (true || PHP_VERSION < 5)  {
+               if ($db->dataProvider == 'odbtp') $db->databaseType = 'odbtp';
+               $conn = NewADOConnection($db->databaseType);
+               $conn->raiseErrorFn = 'adodb_test_err';
+               if (1) $conn->PConnect('abc','baduser','badpassword');
+               if ($TESTERRS == 2) print "raiseErrorFn tests passed<br>";
+               else print "<b>raiseErrorFn tests failed ($TESTERRS)</b><br>";
+               
+               flush();
+       }
+       ////////////////////////////////////////////////////////////////////
+       
+       global $nocountrecs;
+       
+       if (isset($nocountrecs) && $ADODB_COUNTRECS) err("Error: 
\$ADODB_COUNTRECS is set");
+       if (empty($nocountrecs) && $ADODB_COUNTRECS==false) err("Error: 
\$ADODB_COUNTRECS is not set");
+
+       flush();
+?>
+       </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();
+       
+       if ($db->transCnt != 0) Err("Error in transCnt=$db->transCnt (should be 
0)");
+       
+       
+       printf("<p>Total queries=%d; total cached=%d</p>",$EXECS+$CACHED, 
$CACHED);
+       flush();
+}
+
+function adodb_test_err($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
+{
+global $TESTERRS,$ERRNO;
+
+       $ERRNO = $errno;
+       $TESTERRS += 1;
+       print "<i>** $dbms ($fn): errno=$errno &nbsp; errmsg=$errmsg 
($p1,$p2)</i><br>";
+}
+
+//--------------------------------------------------------------------------------------
+
+
address@hidden(240); // increase timeout
+
+include("../tohtml.inc.php");
+include("../adodb.inc.php");
+include("../rsfilter.inc.php");
+
+/* White Space Check */
+
+if (isset($_SERVER['argv'][1])) {
+       //print_r($_SERVER['argv']);
+       $_GET[$_SERVER['argv'][1]] = 1;
+}
+
+if (@$_SERVER['COMPUTERNAME'] == 'TIGRESS') {
+       CheckWS('mysqlt');
+       CheckWS('postgres');
+       CheckWS('oci8po');
+       
+       CheckWS('firebird');
+       CheckWS('sybase');
+       if (!ini_get('safe_mode')) CheckWS('informix');
+
+       CheckWS('ado_mssql');
+       CheckWS('ado_access');
+       CheckWS('mssql');
+       
+       CheckWS('vfp');
+       CheckWS('sqlanywhere');
+       CheckWS('db2');
+       CheckWS('access');
+       CheckWS('odbc_mssql');
+       CheckWS('firebird15');
+       //
+       CheckWS('oracle');
+       CheckWS('proxy');
+       CheckWS('fbsql');
+       print "White Space Check complete<p>";
+}
+if (sizeof($_GET) == 0) $testmysql = true;
+
+
+foreach($_GET as $k=>$v)  {
+       //global $$k;
+       $$k = $v;
+}      
+if (strpos(PHP_VERSION,'5') === 0) {
+       //$testaccess=1;
+       //$testmssql = 1;
+       //$testsqlite=1;
+}
+?>
+<html>
+<title>ADODB Testing</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://adodb.sourceforge.net/>adodb.sourceforge.net</a>.</p>
+
+Test <a href=test4.php>GetInsertSQL/GetUpdateSQL</a> &nbsp; 
+       <a href=testsessions.php>Sessions</a> &nbsp;
+       <a href=testpaging.php>Paging</a> &nbsp;
+       <a href=test-perf.php>Perf Monitor</a><p>
+<?php
+include('./testdatabases.inc.php');
+
+echo "<br>vers=",ADOConnection::Version();
+
+
+include_once('../adodb-time.inc.php');
+if (isset($_GET['time'])) adodb_date_test();
+
+?>
+<p><i>ADODB Database Library  (c) 2000-2006 John Lim. All rights reserved. 
Released under BSD and LGPL, PHP <?php echo PHP_VERSION ?>.</i></p>
+</body>
+</html>
Index: phpgwapi/inc/adodb/tests/test3.php
diff -u phpgwapi/inc/adodb/tests/test3.php:1.2 
phpgwapi/inc/adodb/tests/test3.php:1.3
--- phpgwapi/inc/adodb/tests/test3.php:1.2      Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/test3.php  Tue Feb 21 13:47:42 2006
@@ -1,44 +1,44 @@
-<?php
-/*
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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.
- */
-
-
-error_reporting(E_ALL);
-
-$path = dirname(__FILE__);
-
-include("$path/../adodb-exceptions.inc.php");
-include("$path/../adodb.inc.php");     
-
-try {
-$db = NewADOConnection("oci8");
-$db->Connect('','scott','natsoft');
-$db->debug=1;
-
-$cnt = $db->GetOne("select count(*) from adoxyz");
-$rs = $db->Execute("select * from adoxyz order by id");
-
-$i = 0;
-foreach($rs as $k => $v) {
-       $i += 1;
-       echo $k; adodb_pr($v);
-       flush();
-}
-
-if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
-
-
-
-$rs = $db->Execute("select bad from badder");
-
-} catch (exception $e) {
-       adodb_pr($e);
-       $e = adodb_backtrace($e->trace);
-}
-
+<?php
+/*
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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.
+ */
+
+
+error_reporting(E_ALL);
+
+$path = dirname(__FILE__);
+
+include("$path/../adodb-exceptions.inc.php");
+include("$path/../adodb.inc.php");     
+
+try {
+$db = NewADOConnection("oci8");
+$db->Connect('','scott','natsoft');
+$db->debug=1;
+
+$cnt = $db->GetOne("select count(*) from adoxyz");
+$rs = $db->Execute("select * from adoxyz order by id");
+
+$i = 0;
+foreach($rs as $k => $v) {
+       $i += 1;
+       echo $k; adodb_pr($v);
+       flush();
+}
+
+if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
+
+
+
+$rs = $db->Execute("select bad from badder");
+
+} catch (exception $e) {
+       adodb_pr($e);
+       $e = adodb_backtrace($e->trace);
+}
+
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/test4.php
diff -u phpgwapi/inc/adodb/tests/test4.php:1.2 
phpgwapi/inc/adodb/tests/test4.php:1.3
--- phpgwapi/inc/adodb/tests/test4.php:1.2      Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/test4.php  Tue Feb 21 13:47:42 2006
@@ -1,124 +1,134 @@
-<?php
-
-/** 
- * @version V4.50 6 July 2004 (c) 2000-2004 John Lim (address@hidden). 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
- *
- * Test GetUpdateSQL and GetInsertSQL.
- */
- 
-error_reporting(E_ALL);
-function testsql()
-{
-
-
-include('../adodb.inc.php');
-include('../tohtml.inc.php');
-
-global $ADODB_FORCE_TYPE;
-
-
-//==========================
-// This code tests an insert
-
-$sql = "
-SELECT * 
-FROM ADOXYZ WHERE id = -1"; 
-// Select an empty record from the database 
-
-
-$conn = &ADONewConnection("mssql");  // create a connection
-$conn->PConnect("", "sa", "natsoft", "northwind"); // connect to MySQL, testdb
-
-//$conn = &ADONewConnection("mysql");  // create a connection
-//$conn->PConnect("localhost", "root", "", "test"); // connect to MySQL, testdb
-
-//$conn =& ADONewConnection('oci8');
-//$conn->Connect('','scott','natsoft');
-//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-
-$conn->debug=1;
-$conn->Execute("delete from adoxyz where lastname like 'Smi%'");
-
-$rs = $conn->Execute($sql); // Execute the query and get the empty recordset
-$record = array(); // Initialize an array to hold the record data to insert
-
-if (strpos($conn->databaseType,'mssql')!==false) $record['id'] = 751;
-$record["firstname"] = 'Jann';
-$record["lastname"] = "Smitts";
-$record["created"] = time();
-
-$insertSQL = $conn->GetInsertSQL($rs, $record);
-$conn->Execute($insertSQL); // Insert the record into the database
-
-if (strpos($conn->databaseType,'mssql')!==false) $record['id'] = 752;
-// Set the values for the fields in the record
-$record["firstname"] = 'null';
-$record["lastname"] = "Smith\$@//";
-$record["created"] = time();
-
-if (isset($_GET['f'])) $ADODB_FORCE_TYPE = $_GET['f'];
-
-//$record["id"] = -1;
-
-// 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
-
-
-
-$insertSQL2 = $conn->GetInsertSQL($table='ADOXYZ', $record);
-if ($insertSQL != $insertSQL2) echo "<p><b>Walt's new stuff failed</b>: 
$insertSQL2</p>";
-//==========================
-// This code tests an update
-
-$sql = "
-SELECT * 
-FROM ADOXYZ WHERE lastname=".$conn->Param('var'). " ORDER BY 1"; 
-// Select a record to update 
-
-$varr = array('var'=>$record['lastname'].'');
-$rs = $conn->Execute($sql,$varr); // Execute the query and get the existing 
record to update
-if (!$rs || $rs->EOF) print "<p><b>No record found!</b></p>";
-
-$record = array(); // Initialize an array to hold the record data to update
-
-
-// Set the values for the fields in the record
-$record["firstName"] = "Caroline".rand();
-//$record["lasTname"] = ""; // Update Caroline's lastname from Miranda to Smith
-$record["creAted"] = '2002-12-'.(rand()%30+1);
-$record['num'] = '';
-// 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,$varr); // Update the record in the database
-if ($conn->Affected_Rows() != 1)print "<p><b>Error1 </b>: Rows 
Affected=".$conn->Affected_Rows().", should be 1</p>";
-
-$record["firstName"] = "Caroline".rand();
-$record["lasTname"] = "Smithy Jones"; // Update Caroline's lastname from 
Miranda to Smith
-$record["creAted"] = '2002-12-'.(rand()%30+1);
-$record['num'] = 331;
-$updateSQL = $conn->GetUpdateSQL($rs, $record);
-$conn->Execute($updateSQL,$varr); // Update the record in the database
-if ($conn->Affected_Rows() != 1)print "<p><b>Error 2</b>: Rows 
Affected=".$conn->Affected_Rows().", should be 1</p>";
-
-$rs = $conn->Execute("select * from ADOXYZ where lastname like 'Sm%'");
-//adodb_pr($rs);
-rs2html($rs);
-}
-
-
-testsql();
+<?php
+
+/** 
+ * @version V4.50 6 July 2004 (c) 2000-2006 John Lim (address@hidden). 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
+ *
+ * Test GetUpdateSQL and GetInsertSQL.
+ */
+ 
+error_reporting(E_ALL);
+function testsql()
+{
+
+
+include('../adodb.inc.php');
+include('../tohtml.inc.php');
+
+global $ADODB_FORCE_TYPE;
+
+
+//==========================
+// This code tests an insert
+
+$sql = "
+SELECT * 
+FROM ADOXYZ WHERE id = -1"; 
+// Select an empty record from the database 
+
+
+#$conn = &ADONewConnection("mssql");  // create a connection
+#$conn->PConnect("", "sa", "natsoft", "northwind"); // connect to MySQL, testdb
+
+$conn = &ADONewConnection("mysql");  // create a connection
+$conn->PConnect("localhost", "root", "", "test"); // connect to MySQL, testdb
+
+$conn =& ADONewConnection('oci8po');
+$conn->Connect('','scott','natsoft');
+//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+
+$conn->debug=1;
+$conn->Execute("delete from adoxyz where lastname like 'Smi%'");
+
+$rs = $conn->Execute($sql); // Execute the query and get the empty recordset
+$record = array(); // Initialize an array to hold the record data to insert
+
+if (strpos($conn->databaseType,'mysql')===false) $record['id'] = 751;
+$record["firstname"] = 'Jann';
+$record["lastname"] = "Smitts";
+$record["created"] = time();
+
+$insertSQL = $conn->GetInsertSQL($rs, $record);
+$conn->Execute($insertSQL); // Insert the record into the database
+
+if (strpos($conn->databaseType,'mysql')===false) $record['id'] = 752;
+// Set the values for the fields in the record
+$record["firstname"] = 'anull';
+$record["lastname"] = "Smith\$@//";
+$record["created"] = time();
+
+if (isset($_GET['f'])) $ADODB_FORCE_TYPE = $_GET['f'];
+
+//$record["id"] = -1;
+
+// 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
+
+
+
+$insertSQL2 = $conn->GetInsertSQL($table='ADOXYZ', $record);
+if ($insertSQL != $insertSQL2) echo "<p><b>Walt's new stuff failed</b>: 
$insertSQL2</p>";
+//==========================
+// This code tests an update
+
+$sql = "
+SELECT * 
+FROM ADOXYZ WHERE lastname=".$conn->Param('var'). " ORDER BY 1"; 
+// Select a record to update 
+
+$varr = array('var'=>$record['lastname'].'');
+$rs = $conn->Execute($sql,$varr); // Execute the query and get the existing 
record to update
+if (!$rs || $rs->EOF) print "<p><b>No record found!</b></p>";
+
+$record = array(); // Initialize an array to hold the record data to update
+
+
+// Set the values for the fields in the record
+$record["firstName"] = "Caroline".rand();
+//$record["lasTname"] = ""; // Update Caroline's lastname from Miranda to Smith
+$record["creAted"] = '2002-12-'.(rand()%30+1);
+$record['num'] = '';
+// 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,$varr); // Update the record in the database
+if ($conn->Affected_Rows() != 1)print "<p><b>Error1 </b>: Rows 
Affected=".$conn->Affected_Rows().", should be 1</p>";
+
+$record["firstName"] = "Caroline".rand();
+$record["lasTname"] = "Smithy Jones"; // Update Caroline's lastname from 
Miranda to Smith
+$record["creAted"] = '2002-12-'.(rand()%30+1);
+$record['num'] = 331;
+$updateSQL = $conn->GetUpdateSQL($rs, $record);
+$conn->Execute($updateSQL,$varr); // Update the record in the database
+if ($conn->Affected_Rows() != 1)print "<p><b>Error 2</b>: Rows 
Affected=".$conn->Affected_Rows().", should be 1</p>";
+
+$rs = $conn->Execute("select * from ADOXYZ where lastname like 'Sm%'");
+//adodb_pr($rs);
+rs2html($rs);
+
+$record["firstName"] = "Carol-new-".rand();
+$record["lasTname"] = "Smithy"; // Update Caroline's lastname from Miranda to 
Smith
+$record["creAted"] = '2002-12-'.(rand()%30+1);
+$record['num'] = 331;
+
+$conn->AutoExecute('ADOXYZ',$record,'UPDATE', "lastname like 'Sm%'");
+$rs = $conn->Execute("select * from ADOXYZ where lastname like 'Sm%'");
+//adodb_pr($rs);
+rs2html($rs);
+}
+
+
+testsql();
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/test5.php
diff -u phpgwapi/inc/adodb/tests/test5.php:1.2 
phpgwapi/inc/adodb/tests/test5.php:1.3
--- phpgwapi/inc/adodb/tests/test5.php:1.2      Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/test5.php  Tue Feb 21 13:47:42 2006
@@ -1,47 +1,47 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-       
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-
-// Select an empty record from the database 
-
-include('../adodb.inc.php');
-include('../tohtml.inc.php');
-
-include('../adodb-errorpear.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>';
-}
-?>
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+  Set tabs to 4 for best viewing.
+       
+  Latest version is available at http://adodb.sourceforge.net
+*/
+
+
+// Select an empty record from the database 
+
+include('../adodb.inc.php');
+include('../tohtml.inc.php');
+
+include('../adodb-errorpear.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>';
+}
+?>
Index: phpgwapi/inc/adodb/tests/test_rs_array.php
diff -u phpgwapi/inc/adodb/tests/test_rs_array.php:1.2 
phpgwapi/inc/adodb/tests/test_rs_array.php:1.3
--- phpgwapi/inc/adodb/tests/test_rs_array.php:1.2      Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/test_rs_array.php  Tue Feb 21 13:47:42 2006
@@ -1,47 +1,47 @@
-<?php
-
-include_once('../adodb.inc.php');
-$rs = new ADORecordSet_array();
-
-$array = array(
-array ('Name', 'Age'),
-array ('John', '12'),
-array ('Jill', '8'),
-array ('Bill', '49')
-);
-
-$typearr = array('C','I');
-
-
-$rs->InitArray($array,$typearr);
-
-while (!$rs->EOF) {
-       print_r($rs->fields);echo "<br>";
-       $rs->MoveNext();
-}
-
-echo "<hr> 1 Seek<br>";
-$rs->Move(1);
-while (!$rs->EOF) {
-       print_r($rs->fields);echo "<br>";
-       $rs->MoveNext();
-}
-
-echo "<hr> 2 Seek<br>";
-$rs->Move(2);
-while (!$rs->EOF) {
-       print_r($rs->fields);echo "<br>";
-       $rs->MoveNext();
-}
-
-echo "<hr> 3 Seek<br>";
-$rs->Move(3);
-while (!$rs->EOF) {
-       print_r($rs->fields);echo "<br>";
-       $rs->MoveNext();
-}
-
-
-
-die();
+<?php
+
+include_once('../adodb.inc.php');
+$rs = new ADORecordSet_array();
+
+$array = array(
+array ('Name', 'Age'),
+array ('John', '12'),
+array ('Jill', '8'),
+array ('Bill', '49')
+);
+
+$typearr = array('C','I');
+
+
+$rs->InitArray($array,$typearr);
+
+while (!$rs->EOF) {
+       print_r($rs->fields);echo "<br>";
+       $rs->MoveNext();
+}
+
+echo "<hr /> 1 Seek<br>";
+$rs->Move(1);
+while (!$rs->EOF) {
+       print_r($rs->fields);echo "<br>";
+       $rs->MoveNext();
+}
+
+echo "<hr /> 2 Seek<br>";
+$rs->Move(2);
+while (!$rs->EOF) {
+       print_r($rs->fields);echo "<br>";
+       $rs->MoveNext();
+}
+
+echo "<hr /> 3 Seek<br>";
+$rs->Move(3);
+while (!$rs->EOF) {
+       print_r($rs->fields);echo "<br>";
+       $rs->MoveNext();
+}
+
+
+
+die();
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/testcache.php
diff -u phpgwapi/inc/adodb/tests/testcache.php:1.2 
phpgwapi/inc/adodb/tests/testcache.php:1.3
--- phpgwapi/inc/adodb/tests/testcache.php:1.2  Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/testcache.php      Tue Feb 21 13:47:42 2006
@@ -1,29 +1,29 @@
-<html>
-<body>
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-       
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-$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);
+<html>
+<body>
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+  Set tabs to 4 for best viewing.
+       
+  Latest version is available at http://adodb.sourceforge.net
+*/
+
+$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
Index: phpgwapi/inc/adodb/tests/testdatabases.inc.php
diff -u phpgwapi/inc/adodb/tests/testdatabases.inc.php:1.2 
phpgwapi/inc/adodb/tests/testdatabases.inc.php:1.3
--- phpgwapi/inc/adodb/tests/testdatabases.inc.php:1.2  Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/testdatabases.inc.php      Tue Feb 21 13:47:42 2006
@@ -1,342 +1,427 @@
-<?php
-  
-/*
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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 */
- ?>
-
-<table><tr valign=top><td>
-<form method=get>
-<input type=checkbox name="testaccess" value=1 <?php echo !empty($testaccess) 
? 'checked' : '' ?>> <b>Access</b><br>
-<input type=checkbox name="testibase" value=1 <?php echo !empty($testibase) ? 
'checked' : '' ?>> <b>Interbase</b><br>
-<input type=checkbox name="testmssql" value=1 <?php echo !empty($testmssql) ? 
'checked' : '' ?>> <b>MSSQL</b><br>
- <input type=checkbox name="testmysql" value=1 <?php echo !empty($testmysql) ? 
'checked' : '' ?>> <b>MySQL</b><br>
-<input type=checkbox name="testmysqlodbc" value=1 <?php echo 
!empty($testmysqlodbc) ? 'checked' : '' ?>> <b>MySQL ODBC</b><br>
-<input type=checkbox name="testmysqli" value=1 <?php echo !empty($testmysqli) 
? 'checked' : '' ?>> <b>MySQLi</b>
-<br>
-<td><input type=checkbox name="testsqlite" value=1 <?php echo 
!empty($testsqlite) ? 'checked' : '' ?>> <b>SQLite</b><br>
-<input type=checkbox name="testproxy" value=1 <?php echo !empty($testproxy) ? 
'checked' : '' ?>> <b>MySQL Proxy</b><br>
-<input type=checkbox name="testoracle" value=1 <?php echo !empty($testoracle) 
? 'checked' : '' ?>> <b>Oracle (oci8)</b> <br>
-<input type=checkbox name="testpostgres" value=1 <?php echo 
!empty($testpostgres) ? 'checked' : '' ?>> <b>PostgreSQL</b><br>
-<input type=checkbox name="testpgodbc" value=1 <?php echo !empty($testpgodbc) 
? 'checked' : '' ?>> <b>PostgreSQL ODBC</b><br>
-<td><input type=checkbox name="testdb2" value=1 <?php echo !empty($testdb2) ? 
'checked' : '' ?>> DB2<br>
-<input type=checkbox name="testvfp" value=1 <?php echo !empty($testvfp) ? 
'checked' : '' ?>> VFP+ODBTP<br>
-<input type=checkbox name="testado" value=1 <?php echo !empty($testado) ? 
'checked' : '' ?>> ADO (for mssql and access)<br>
-<input type=checkbox name="nocountrecs" value=1 <?php echo 
!empty($nocountrecs) ? 'checked' : '' ?>> $ADODB_COUNTRECS=false<br>
-<input type=checkbox name="nolog" value=1 <?php echo !empty($nolog) ? 
'checked' : '' ?>> No SQL Logging<br>
-<input type=checkbox name="time" value=1 <?php echo !empty($_GET['time']) ? 
'checked' : '' ?>> ADOdb time test
-</table>
-<input type=submit>
-</form>
-
-<?php
-
-if ($ADODB_FETCH_MODE != ADODB_FETCH_DEFAULT) print "<h3>FETCH MODE IS NOT 
ADODB_FETCH_DEFAULT</h3>";
-
-if (isset($nocountrecs)) $ADODB_COUNTRECS = false;
-
-// cannot test databases below, but we include them anyway to check
-// if they parse ok...
-
-if (!strpos(PHP_VERSION,'5') === 0) {
-       ADOLoadCode("sybase");
-       ADOLoadCode("postgres");
-       ADOLoadCode("postgres7");
-       ADOLoadCode("firebird");
-       ADOLoadCode("borland_ibase");
-       ADOLoadCode("informix");
-       ADOLoadCode("sqlanywhere");
-//     ADOLoadCode('mysqli');
-}
-
-
-flush();
-if (!empty($testpostgres)) {
-       //ADOLoadCode("postgres");
-
-       $db = &ADONewConnection('postgres');
-       print "<h1>Connecting $db->databaseType...</h1>";
-       if ($db->Connect("localhost","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, user tester, password test.<BR>".$db->ErrorMsg();
-}
-
-if (!empty($testpgodbc)) { 
-       
-       $db = &ADONewConnection('odbc');
-       $db->hasTransactions = false;
-       print "<h1>Connecting $db->databaseType...</h1>";
-       
-       if ($db->PConnect('Postgresql')) {
-               $db->hasTransactions = true;
-               testdb($db,
-               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date) type=innodb");
-       } else print "ERROR: PostgreSQL requires a database called test on 
server, user tester, password test.<BR>".$db->ErrorMsg();
-}
-
-if (!empty($testibase)) {
-       //$_GET['nolog'] = true;
-       $db = &ADONewConnection('firebird');
-       print "<h1>Connecting $db->databaseType...</h1>";
-       if 
($db->PConnect("localhost:d:\\firebird\\151\\examples\\EMPLOYEE.fdb", "sysdba", 
"masterkey", ""))
-               testdb($db,"create table ADOXYZ (id integer, firstname 
char(24), lastname char(24),price numeric(12,2),created date)");
-        else print "ERROR: Interbase test requires a database called 
employee.gdb".'<BR>'.$db->ErrorMsg();
-       
-}
-
-
-if (!empty($testsqlite)) {
-       $db = &ADONewConnection('sqlite');
-       print "<h1>Connecting $db->databaseType...</h1>";
-       
-       if ($db->PConnect("d:\\inetpub\\adodb\\sqlite.db", "", "", ""))
-               testdb($db,"create table ADOXYZ (id int, firstname char(24), 
lastname char(24),created datetime)");
-       else print "ERROR: SQLite";
-       
-}
-
-// REQUIRES ODBC DSN CALLED nwind
-if (!empty($testaccess)) {
-       $db = &ADONewConnection('access');
-       print "<h1>Connecting $db->databaseType...</h1>";
-       $access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
-       $dsn = "nwind";
-       $dsn = "Driver={Microsoft Access Driver 
(*.mdb)};Dbq=$access;Uid=Admin;Pwd=;";
-       
-       //$dsn =  'Provider=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=' . $access . 
';';
-       if ($db->PConnect($dsn, "", "", ""))
-               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=;';
-       $_GET['nolog'] = 1;
-       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>";flush();
-
-       if ( $db->PConnect("vfp-adoxyz")) {
-               testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, 
firstname char(24), lastname char(24),created date)");
-        } else print "ERROR: Visual FoxPro test requires a Windows ODBC 
DSN=vfp-adoxyz, VFP driver";
-       
-       echo "<hr>";
-       $db = &ADONewConnection('odbtp');
-       
-       if ( $db->PConnect('localhost','DRIVER={Microsoft Visual FoxPro 
Driver};SOURCETYPE=DBF;SOURCEDB=d:\inetpub\adodb;EXCLUSIVE=NO;')) {
-       print "<h1>Connecting $db->databaseType...</h1>";flush();
-       testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname 
char(24), lastname char(24),created date)");
-        } else print "ERROR: Visual FoxPro odbtp requires a Windows ODBC 
DSN=vfp-adoxyz, VFP driver";
-       
-}
-
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysql)) { // MYSQL
-
-
-       if (PHP_VERSION >= 5 || $HTTP_SERVER_VARS['HTTP_HOST'] == 'localhost') 
$server = 'localhost';
-       else $server = "mangrove";
-       $user = 'root'; $password = ''; $database = 'northwind';
-       $db = 
&ADONewConnection("mysql://$user:address@hidden/$database?persist");
-       print "<h1>Connecting $db->databaseType...</h1>";
-       
-       if (true || $db->PConnect($server, "root", "", "northwind")) {
-               //$db->debug=1;$db->Execute('drop table ADOXYZ');
-               testdb($db,
-               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date)");
-       } else print "ERROR: MySQL test requires a MySQL server on localhost, 
userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
-}
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysqli)) { // MYSQL
-
-       $db = &ADONewConnection('mysqli');
-       print "<h1>Connecting $db->databaseType...</h1>";
-       if (PHP_VERSION >= 5 || $HTTP_SERVER_VARS['HTTP_HOST'] == 'localhost') 
$server = 'localhost';
-       else $server = "mangrove";
-       if ($db->PConnect($server, "root", "", "northwind")) {
-               //$db->debug=1;$db->Execute('drop table ADOXYZ');
-               testdb($db,
-               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date)");
-       } else print "ERROR: MySQL test requires a MySQL server on localhost, 
userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
-}
-
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysqlodbc)) { // MYSQL
-       
-       $db = &ADONewConnection('odbc');
-       $db->hasTransactions = false;
-       print "<h1>Connecting $db->databaseType...</h1>";
-       if ($HTTP_SERVER_VARS['HTTP_HOST'] == 'localhost') $server = 
'localhost';
-       else $server = "mangrove";
-       if ($db->PConnect('mysql', "root", ""))
-               testdb($db,
-               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date) type=innodb");
-       else print "ERROR: MySQL test requires a MySQL server on localhost, 
userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
-}
-
-if (!empty($testproxy)){
-       $db = &ADONewConnection('proxy');
-       print "<h1>Connecting $db->databaseType...</h1>";
-       if ($HTTP_SERVER_VARS['HTTP_HOST'] == 'localhost') $server = 
'localhost';
-
-       if ($db->PConnect('http://localhost/php/phplens/adodb/server.php'))
-               testdb($db,
-               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date) type=innodb");
-       else print "ERROR: MySQL test requires a MySQL server on localhost, 
userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
-
-}
-
-ADOLoadCode('oci805');
-ADOLoadCode("oci8po");
-if (!empty($testoracle)) {
-       $dsn = "oci8po://scott:address@hidden";
-       $db = ADONewConnection($dsn);
-       print "<h1>Connecting $db->databaseType...</h1>";
-       if (true || $db->Connect('', "scott", "natsoft",''))
-               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/natsoft".'<BR>'.$db->ErrorMsg();
-
-}
-ADOLoadCode("oracle"); // no longer supported
-if (false && !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("db2"); // no longer supported
-if (!empty($testdb2)) { 
-       $db = ADONewConnection();
-       print "<h1>Connecting $db->databaseType...</h1>";
-       
-       $dsn = "db2_sample";
-       $dsn = "driver={IBM db2 odbc 
DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; 
pwd=natsoft";
-       if ($db->Connect($dsn)) {
-       //      testdb($db,"create table ADOXYZ (id int, firstname varchar(24), 
lastname varchar(24),created date)");
-       } else print "ERROR: DB2 test requires an server setup with odbc data 
source db2_sample".'<BR>'.$db->ErrorMsg();
-
-echo "<hr>";
-flush();
-       $dsn = "driver={IBM db2 odbc 
DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; 
pwd=natsoft";
-       
-       $db = ADONewConnection('odbtp');
-       if ($db->Connect('127.0.0.1',$dsn)) {
-               
-               $db->debug=1;
-                $arr = $db->GetArray( "||SQLProcedures" ); adodb_pr($arr);
-            $arr = $db->GetArray( "||SQLProcedureColumns|||GET_ROUTINE_SAR" 
);adodb_pr($arr);
-       
-               testdb($db,"create table ADOXYZ (id int, firstname varchar(24), 
lastname varchar(24),created date)");
-       } else echo ("ERROR Connection");
-       echo $db->ErrorMsg();
-}
-
-
-$server = 'sherkhan';
-if (extension_loaded('odbtp') && !empty($testmssql)) { // MS SQL Server via 
ODBC
-       $db = ADONewConnection('odbtp');
-       
-       $dsn = "PROVIDER=MSDASQL;Driver={SQL 
Server};Server=$server;Database=northwind;uid=adodb;pwd=natsoft";
-       
-       if ($db->PConnect('localhost',$dsn, "", ""))  {
-               print "<h1>Connecting $db->databaseType...</h1>";               
                
-               testdb($db,"create table ADOXYZ (id int, firstname char(24) 
null, lastname char(24) null,created datetime null)");
-       }
-       else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with 
DSN setup";
-
-}
-
-
-ADOLoadCode('odbc_mssql');
-if (!empty($testmssql)) { // MS SQL Server via ODBC
-       $db = ADONewConnection();
-       
-       print "<h1>Connecting $db->databaseType...</h1>";
-       
-       $dsn = "PROVIDER=MSDASQL;Driver={SQL 
Server};Server=$server;Database=northwind;";
-       
-       if ($db->PConnect($dsn, "adodb", "natsoft", ""))  {
-               testdb($db,"create table ADOXYZ (id int, firstname char(24) 
null, lastname char(24) null,created datetime null)");
-       }
-       else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with 
DSN setup";
-
-}
-
-ADOLoadCode("ado_mssql");
-if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru 
ODBC -- DSN-less
-       
-       $db = &ADONewConnection("ado_mssql");
-       //$db->debug=1;
-       print "<h1>Connecting DSN-less $db->databaseType...</h1>";
-       
-       $myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
-               . 
"SERVER=$server;DATABASE=NorthWind;UID=adodb;PWD=natsoft;Trusted_Connection=No" 
 ;
-
-               
-       if ($db->PConnect($myDSN, "", "", ""))
-               testdb($db,"create table ADOXYZ (id int, firstname char(24) 
null, lastname char(24) null,created datetime null)");
-       else print "ERROR: MSSQL test 2 requires MS SQL 7";
-       
-}
-
-
-ADOLoadCode("mssqlpo");
-if (!empty($testmssql)) { // MS SQL Server -- the extension is buggy -- 
probably better to use ODBC
-       $db = ADONewConnection("mssqlpo");
-       //$db->debug=1;
-       print "<h1>Connecting $db->databaseType...</h1>";
-       
-       $ok = $db->Connect('','adodb','natsoft','northwind');
-
-       if ($ok or $db->PConnect("mangrove", "sa", "natsoft", "ai")) {
-               AutoDetect_MSSQL_Date_Order($db);
-       //      $db->Execute('drop table adoxyz');
-               testdb($db,"create table ADOXYZ (id int, firstname char(24) 
null, lastname char(24) null,created datetime null)");
-       } else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a 
server='192.168.0.1', userid='adodb', password='natsoft', 
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>";
-       //$db->debug=1;
-       $myDSN="SERVER=localhost;DATABASE=northwind;Trusted_Connection=yes";
-       if ($db->PConnect($myDSN, "adodb", "natsoft", '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'";
-
-}
-
-
-print "<h3>Tests Completed</h3>";
-
-?>
+<?php
+  
+/*
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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 */
+ ?>
+
+<table><tr valign=top><td>
+<form method=get>
+<input type=checkbox name="testaccess" value=1 <?php echo !empty($testaccess) 
? 'checked' : '' ?>> <b>Access</b><br>
+<input type=checkbox name="testibase" value=1 <?php echo !empty($testibase) ? 
'checked' : '' ?>> <b>Interbase</b><br>
+<input type=checkbox name="testmssql" value=1 <?php echo !empty($testmssql) ? 
'checked' : '' ?>> <b>MSSQL</b><br>
+ <input type=checkbox name="testmysql" value=1 <?php echo !empty($testmysql) ? 
'checked' : '' ?>> <b>MySQL</b><br>
+<input type=checkbox name="testmysqlodbc" value=1 <?php echo 
!empty($testmysqlodbc) ? 'checked' : '' ?>> <b>MySQL ODBC</b><br>
+<input type=checkbox name="testmysqli" value=1 <?php echo !empty($testmysqli) 
? 'checked' : '' ?>> <b>MySQLi</b>
+<br>
+<td><input type=checkbox name="testsqlite" value=1 <?php echo 
!empty($testsqlite) ? 'checked' : '' ?>> <b>SQLite</b><br>
+<input type=checkbox name="testproxy" value=1 <?php echo !empty($testproxy) ? 
'checked' : '' ?>> <b>MySQL Proxy</b><br>
+<input type=checkbox name="testoracle" value=1 <?php echo !empty($testoracle) 
? 'checked' : '' ?>> <b>Oracle (oci8)</b> <br>
+<input type=checkbox name="testpostgres" value=1 <?php echo 
!empty($testpostgres) ? 'checked' : '' ?>> <b>PostgreSQL</b><br>
+<input type=checkbox name="testpgodbc" value=1 <?php echo !empty($testpgodbc) 
? 'checked' : '' ?>> <b>PostgreSQL ODBC</b><br>
+<td>
+<input type=checkbox name="testpdopgsql" value=1 <?php echo 
!empty($testpdopgsql) ? 'checked' : '' ?>> <b>PgSQL PDO</b><br>
+<input type=checkbox name="testpdomysql" value=1 <?php echo 
!empty($testpdomysql) ? 'checked' : '' ?>> <b>MySQL PDO</b><br>
+<input type=checkbox name="testpdosqlite" value=1 <?php echo 
!empty($testpdosqlite) ? 'checked' : '' ?>> <b>SQLite PDO</b><br>
+<input type=checkbox name="testpdoaccess" value=1 <?php echo 
!empty($testpdoaccess) ? 'checked' : '' ?>> <b>Access PDO</b><br>
+<input type=checkbox name="testpdomssql" value=1 <?php echo 
!empty($testpdomssql) ? 'checked' : '' ?>> <b>MSSQL PDO</b><br>
+
+<input type=checkbox name="testpdoora" value=1 <?php echo !empty($testpdoora) 
? 'checked' : '' ?>> <b>OCI PDO</b><br>
+
+<td><input type=checkbox name="testdb2" value=1 <?php echo !empty($testdb2) ? 
'checked' : '' ?>> DB2<br>
+<input type=checkbox name="testvfp" value=1 <?php echo !empty($testvfp) ? 
'checked' : '' ?>> VFP+ODBTP<br>
+<input type=checkbox name="testado" value=1 <?php echo !empty($testado) ? 
'checked' : '' ?>> ADO (for mssql and access)<br>
+<input type=checkbox name="nocountrecs" value=1 <?php echo 
!empty($nocountrecs) ? 'checked' : '' ?>> $ADODB_COUNTRECS=false<br>
+<input type=checkbox name="nolog" value=1 <?php echo !empty($nolog) ? 
'checked' : '' ?>> No SQL Logging<br>
+<input type=checkbox name="time" value=1 <?php echo !empty($_GET['time']) ? 
'checked' : '' ?>> ADOdb time test
+</table>
+<input type=submit>
+</form>
+
+<?php
+
+if ($ADODB_FETCH_MODE != ADODB_FETCH_DEFAULT) print "<h3>FETCH MODE IS NOT 
ADODB_FETCH_DEFAULT</h3>";
+
+if (isset($nocountrecs)) $ADODB_COUNTRECS = false;
+
+// cannot test databases below, but we include them anyway to check
+// if they parse ok...
+
+if (!strpos(PHP_VERSION,'5') === 0) {
+       ADOLoadCode("sybase");
+       //ADOLoadCode("postgres");
+       //ADOLoadCode("postgres7");
+       ADOLoadCode("firebird");
+       ADOLoadCode("borland_ibase");
+       ADOLoadCode("informix");
+       ADOLoadCode("sqlanywhere");
+//     ADOLoadCode('mysqli');
+}
+
+
+flush();
+if (!empty($testpostgres)) {
+       //ADOLoadCode("postgres");
+
+       $db = &ADONewConnection('postgres');
+       print "<h1>Connecting $db->databaseType...</h1>";
+       if ($db->Connect("localhost","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, user tester, password test.<BR>".$db->ErrorMsg();
+}
+
+if (!empty($testpgodbc)) { 
+       
+       $db = &ADONewConnection('odbc');
+       $db->hasTransactions = false;
+       print "<h1>Connecting $db->databaseType...</h1>";
+       
+       if ($db->PConnect('Postgresql')) {
+               $db->hasTransactions = true;
+               testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date) type=innodb");
+       } else print "ERROR: PostgreSQL requires a database called test on 
server, user tester, password test.<BR>".$db->ErrorMsg();
+}
+
+if (!empty($testibase)) {
+       //$_GET['nolog'] = true;
+       $db = &ADONewConnection('firebird');
+       print "<h1>Connecting $db->databaseType...</h1>";
+       if 
($db->PConnect("localhost:d:\\firebird\\151\\examples\\EMPLOYEE.fdb", "sysdba", 
"masterkey", ""))
+               testdb($db,"create table ADOXYZ (id integer, firstname 
char(24), lastname char(24),price numeric(12,2),created date)");
+        else print "ERROR: Interbase test requires a database called 
employee.gdb".'<BR>'.$db->ErrorMsg();
+       
+}
+
+
+if (!empty($testsqlite)) {
+       $path =urlencode('d:\inetpub\adodb\sqlite.db');
+       $dsn = "sqlite://$path/";
+       $db = ADONewConnection($dsn);
+       //echo $dsn;
+       
+       //$db = &ADONewConnection('sqlite');
+       
+
+       if ($db && $db->PConnect("d:\\inetpub\\adodb\\sqlite.db", "", "", "")) {
+               print "<h1>Connecting $db->databaseType...</h1>";
+               testdb($db,"create table ADOXYZ (id int, firstname char(24), 
lastname char(24),created datetime)");
+       } else 
+               print "ERROR: SQLite";
+       
+}
+
+if (!empty($testpdopgsql)) {
+       $connstr = "pgsql:dbname=test";
+       $u = 'tester';$p='test';
+       $db = &ADONewConnection('pdo');
+       print "<h1>Connecting $db->databaseType...</h1>";
+       $db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+       testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date)");
+}
+
+if (!empty($testpdomysql)) {
+       $connstr = "mysql:dbname=northwind";
+       $u = 'root';$p='';
+       $db = &ADONewConnection('pdo');
+       print "<h1>Connecting $db->databaseType...</h1>";
+       $db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+       
+       testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date)");
+}
+
+if (!empty($testpdomssql)) {
+       $connstr = "mssql:dbname=northwind";
+       $u = 'sa';$p='natsoft';
+       $db = &ADONewConnection('pdo');
+       print "<h1>Connecting $db->databaseType...</h1>";
+       $db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+       
+       testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date)");
+}
+
+if (!empty($testpdosqlite)) {
+       $connstr = "sqlite:d:/inetpub/adodb/sqlite-pdo.db3";
+       $u = '';$p='';
+       $db = &ADONewConnection('pdo');
+       $db->hasTransactions = false;
+       print "<h1>Connecting $db->databaseType...</h1>";
+       $db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+       testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date)");
+}
+
+if (!empty($testpdoaccess)) {
+       $connstr = 'odbc:nwind';
+       $u = '';$p='';
+       $db = &ADONewConnection('pdo');
+       $db->hasTransactions = false;
+       print "<h1>Connecting $db->databaseType...</h1>";
+       $db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+       testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date)");
+}
+
+if (!empty($testpdoora)) {
+       $connstr = 'oci:';
+       $u = 'scott';$p='natsoft';
+       $db = &ADONewConnection('pdo');
+       #$db->hasTransactions = false;
+       print "<h1>Connecting $db->databaseType...</h1>";
+       $db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+       testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date)");
+}
+
+// REQUIRES ODBC DSN CALLED nwind
+if (!empty($testaccess)) {
+       $db = &ADONewConnection('access');
+       print "<h1>Connecting $db->databaseType...</h1>";
+       $access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
+       $dsn = "nwind";
+       $dsn = "Driver={Microsoft Access Driver 
(*.mdb)};Dbq=$access;Uid=Admin;Pwd=;";
+       
+       //$dsn =  'Provider=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=' . $access . 
';';
+       if ($db->PConnect($dsn, "", "", ""))
+               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=;';
+       $_GET['nolog'] = 1;
+       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>";flush();
+
+       if ( $db->PConnect("vfp-adoxyz")) {
+               testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, 
firstname char(24), lastname char(24),created date)");
+        } else print "ERROR: Visual FoxPro test requires a Windows ODBC 
DSN=vfp-adoxyz, VFP driver";
+       
+       echo "<hr />";
+       $db = &ADONewConnection('odbtp');
+       
+       if ( $db->PConnect('localhost','DRIVER={Microsoft Visual FoxPro 
Driver};SOURCETYPE=DBF;SOURCEDB=d:\inetpub\adodb;EXCLUSIVE=NO;')) {
+       print "<h1>Connecting $db->databaseType...</h1>";flush();
+       testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname 
char(24), lastname char(24),created date)");
+        } else print "ERROR: Visual FoxPro odbtp requires a Windows ODBC 
DSN=vfp-adoxyz, VFP driver";
+       
+}
+
+
+// REQUIRES MySQL server at localhost with database 'test'
+if (!empty($testmysql)) { // MYSQL
+
+
+       if (PHP_VERSION >= 5 || $_SERVER['HTTP_HOST'] == 'localhost') $server = 
'localhost';
+       else $server = "mangrove";
+       $user = 'root'; $password = ''; $database = 'northwind';
+       $db = 
&ADONewConnection("mysqlt://$user:address@hidden/$database?persist");
+       print "<h1>Connecting $db->databaseType...</h1>";
+       
+       if (true || $db->PConnect($server, "root", "", "northwind")) {
+               //$db->Execute("DROP TABLE ADOXYZ") || die('fail drop');
+               //$db->debug=1;$db->Execute('drop table ADOXYZ');
+               testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date) Type=InnoDB");
+       } else print "ERROR: MySQL test requires a MySQL server on localhost, 
userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
+}
+
+// REQUIRES MySQL server at localhost with database 'test'
+if (!empty($testmysqli)) { // MYSQL
+
+       $db = &ADONewConnection('mysqli');
+       print "<h1>Connecting $db->databaseType...</h1>";
+       if (PHP_VERSION >= 5 || $_SERVER['HTTP_HOST'] == 'localhost') $server = 
'localhost';
+       else $server = "mangrove";
+       if ($db->PConnect($server, "root", "", "northwind")) {
+               //$db->debug=1;$db->Execute('drop table ADOXYZ');
+               testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date)");
+       } else print "ERROR: MySQL test requires a MySQL server on localhost, 
userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
+}
+
+
+// REQUIRES MySQL server at localhost with database 'test'
+if (!empty($testmysqlodbc)) { // MYSQL
+       
+       $db = &ADONewConnection('odbc');
+       $db->hasTransactions = false;
+       print "<h1>Connecting $db->databaseType...</h1>";
+       if ($_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
+       else $server = "mangrove";
+       if ($db->PConnect('mysql', "root", ""))
+               testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date) type=innodb");
+       else print "ERROR: MySQL test requires a MySQL server on localhost, 
userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
+}
+
+if (!empty($testproxy)){
+       $db = &ADONewConnection('proxy');
+       print "<h1>Connecting $db->databaseType...</h1>";
+       if ($_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
+
+       if ($db->PConnect('http://localhost/php/phplens/adodb/server.php'))
+               testdb($db,
+               "create table ADOXYZ (id int, firstname char(24), lastname 
char(24), created date) type=innodb");
+       else print "ERROR: MySQL test requires a MySQL server on localhost, 
userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
+
+}
+
+ADOLoadCode('oci805');
+ADOLoadCode("oci8po");
+if (!empty($testoracle)) {
+       $dsn = "oci8po://juris10:address@hidden";
+       $db = ADONewConnection($dsn);
+       print "<h1>Connecting $db->databaseType...</h1>";
+       if (true || $db->Connect('', "scott", "natsoft",''))
+               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/natsoft".'<BR>'.$db->ErrorMsg();
+
+}
+ADOLoadCode("oracle"); // no longer supported
+if (false && !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("db2"); // no longer supported
+if (!empty($testdb2)) { 
+       $db = ADONewConnection();
+       print "<h1>Connecting $db->databaseType...</h1>";
+       
+       $dsn = "db2_sample";
+       $dsn = "driver={IBM db2 odbc 
DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; 
pwd=natsoft";
+       if ($db->Connect($dsn)) {
+       //      testdb($db,"create table ADOXYZ (id int, firstname varchar(24), 
lastname varchar(24),created date)");
+       } else print "ERROR: DB2 test requires an server setup with odbc data 
source db2_sample".'<BR>'.$db->ErrorMsg();
+
+echo "<hr />";
+flush();
+       $dsn = "driver={IBM db2 odbc 
DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; 
pwd=natsoft";
+       
+       $db = ADONewConnection('odbtp');
+       if ($db->Connect('127.0.0.1',$dsn)) {
+               
+               $db->debug=1;
+                $arr = $db->GetArray( "||SQLProcedures" ); adodb_pr($arr);
+            $arr = $db->GetArray( "||SQLProcedureColumns|||GET_ROUTINE_SAR" 
);adodb_pr($arr);
+       
+               testdb($db,"create table ADOXYZ (id int, firstname varchar(24), 
lastname varchar(24),created date)");
+       } else echo ("ERROR Connection");
+       echo $db->ErrorMsg();
+}
+
+
+$server = 'sherkhan';
+
+
+
+ADOLoadCode("mssqlpo");
+if (!empty($testmssql)) { // MS SQL Server -- the extension is buggy -- 
probably better to use ODBC
+       $db = ADONewConnection("mssqlpo");
+       //$db->debug=1;
+       print "<h1>Connecting $db->databaseType...</h1>";
+       
+       $ok = $db->Connect('','adodb','natsoft','northwind');
+
+       if ($ok or $db->PConnect("mangrove", "sa", "natsoft", "ai")) {
+               AutoDetect_MSSQL_Date_Order($db);
+       //      $db->Execute('drop table adoxyz');
+               testdb($db,"create table ADOXYZ (id int, firstname char(24) 
null, lastname char(24) null,created datetime null)");
+       } else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a 
server='192.168.0.1', userid='adodb', password='natsoft', 
database='ai'".'<BR>'.$db->ErrorMsg();
+       
+}
+
+
+ADOLoadCode('odbc_mssql');
+if (!empty($testmssql)) { // MS SQL Server via ODBC
+       $db = ADONewConnection();
+       
+       print "<h1>Connecting $db->databaseType...</h1>";
+       
+       $dsn = "PROVIDER=MSDASQL;Driver={SQL 
Server};Server=$server;Database=northwind;";
+       
+       if ($db->PConnect($dsn, "adodb", "natsoft", ""))  {
+               testdb($db,"create table ADOXYZ (id int, firstname char(24) 
null, lastname char(24) null,created datetime null)");
+       }
+       else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with 
DSN setup";
+
+}
+
+ADOLoadCode("ado_mssql");
+if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru 
ODBC -- DSN-less
+       
+       $db = &ADONewConnection("ado_mssql");
+       //$db->debug=1;
+       print "<h1>Connecting DSN-less $db->databaseType...</h1>";
+       
+       $myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
+               . 
"SERVER=$server;DATABASE=NorthWind;UID=adodb;PWD=natsoft;Trusted_Connection=No";
+
+               
+       if ($db->PConnect($myDSN, "", "", ""))
+               testdb($db,"create table ADOXYZ (id int, firstname char(24) 
null, lastname char(24) null,created datetime null)");
+       else print "ERROR: MSSQL test 2 requires MS SQL 7";
+       
+}
+
+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>";
+       //$db->debug=1;
+       $myDSN="SERVER=localhost;DATABASE=northwind;Trusted_Connection=yes";
+       if ($db->PConnect($myDSN, "adodb", "natsoft", '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'";
+
+}
+
+
+if (extension_loaded('odbtp') && !empty($testmssql)) { // MS SQL Server via 
ODBC
+       $db = ADONewConnection('odbtp');
+       
+       $dsn = "PROVIDER=MSDASQL;Driver={SQL 
Server};Server=$server;Database=northwind;uid=adodb;pwd=natsoft";
+       
+       if ($db->PConnect('localhost',$dsn, "", ""))  {
+               print "<h1>Connecting $db->databaseType...</h1>";               
                
+               testdb($db,"create table ADOXYZ (id int, firstname char(24) 
null, lastname char(24) null,created datetime null)");
+       }
+       else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with 
DSN setup";
+
+}
+
+
+print "<h3>Tests Completed</h3>";
+
+?>
Index: phpgwapi/inc/adodb/tests/testmssql.php
diff -u phpgwapi/inc/adodb/tests/testmssql.php:1.2 
phpgwapi/inc/adodb/tests/testmssql.php:1.3
--- phpgwapi/inc/adodb/tests/testmssql.php:1.2  Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/testmssql.php      Tue Feb 21 13:47:42 2006
@@ -1,76 +1,76 @@
-<?php
-
-/** 
- * @version V4.50 6 July 2004 (c) 2000-2004 John Lim (address@hidden). 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
- *
- * Test GetUpdateSQL and GetInsertSQL.
- */
- 
-error_reporting(E_ALL);
-
-
-include('../adodb.inc.php');
-include('../tohtml.inc.php');
-
-//==========================
-// This code tests an insert
-
-
-
-$conn = &ADONewConnection("mssql");  // create a connection
-$conn->Connect('localhost','sa','natsoft','northwind') or die('Fail');
-
-$conn->debug =1;
-$query = 'select * from products';
-$conn->SetFetchMode(ADODB_FETCH_ASSOC);
-$rs = $conn->Execute($query);
-echo "<pre>";
-while( !$rs->EOF ) {
-       $output[] = $rs->fields;
-       var_dump($rs->fields);
-       $rs->MoveNext();
-       print "<p>";
-}
-die();
-
-
-$p = $conn->Prepare('insert into products (productname,unitprice,dcreated) 
values (?,?,?)');
-echo "<pre>";
-print_r($p);
-
-$conn->debug=1;
-$conn->Execute($p,array('John'.rand(),33.3,$conn->DBDate(time())));
-
-$p = $conn->Prepare('select * from products where productname like ?');
-$arr = $conn->getarray($p,array('V%'));
-print_r($arr);
-die();
-
-//$conn = &ADONewConnection("mssql");
-//$conn->Connect('mangrove','sa','natsoft','ai');
-
-//$conn->Connect('mangrove','sa','natsoft','ai');
-$conn->debug=1;
-$conn->Execute('delete from blobtest');
-
-$conn->Execute('insert into blobtest (id) values(1)');
-$conn->UpdateBlobFile('blobtest','b1','../cute_icons_for_site/adodb.gif','id=1');
-$rs = $conn->Execute('select b1 from blobtest where id=1');
-
-$output = "c:\\temp\\test_out-".date('H-i-s').".gif"; 
-print "Saving file <b>$output</b>, size=".strlen($rs->fields[0])."<p>";
-$fd = fopen($output, "wb"); 
-fwrite($fd, $rs->fields[0]); 
-fclose($fd); 
-
-print " <a href=file://$output>View Image</a>";
-//$rs = $conn->Execute('SELECT id,SUBSTRING(b1, 1, 10) FROM blobtest');
-//rs2html($rs);
+<?php
+
+/** 
+ * @version V4.50 6 July 2004 (c) 2000-2006 John Lim (address@hidden). 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
+ *
+ * Test GetUpdateSQL and GetInsertSQL.
+ */
+ 
+error_reporting(E_ALL);
+
+
+include('../adodb.inc.php');
+include('../tohtml.inc.php');
+
+//==========================
+// This code tests an insert
+
+
+
+$conn = &ADONewConnection("mssql");  // create a connection
+$conn->Connect('127.0.0.1','adodb','natsoft','northwind') or die('Fail');
+
+$conn->debug =1;
+$query = 'select * from products';
+$conn->SetFetchMode(ADODB_FETCH_ASSOC);
+$rs = $conn->Execute($query);
+echo "<pre>";
+while( !$rs->EOF ) {
+       $output[] = $rs->fields;
+       var_dump($rs->fields);
+       $rs->MoveNext();
+       print "<p>";
+}
+die();
+
+
+$p = $conn->Prepare('insert into products (productname,unitprice,dcreated) 
values (?,?,?)');
+echo "<pre>";
+print_r($p);
+
+$conn->debug=1;
+$conn->Execute($p,array('John'.rand(),33.3,$conn->DBDate(time())));
+
+$p = $conn->Prepare('select * from products where productname like ?');
+$arr = $conn->getarray($p,array('V%'));
+print_r($arr);
+die();
+
+//$conn = &ADONewConnection("mssql");
+//$conn->Connect('mangrove','sa','natsoft','ai');
+
+//$conn->Connect('mangrove','sa','natsoft','ai');
+$conn->debug=1;
+$conn->Execute('delete from blobtest');
+
+$conn->Execute('insert into blobtest (id) values(1)');
+$conn->UpdateBlobFile('blobtest','b1','../cute_icons_for_site/adodb.gif','id=1');
+$rs = $conn->Execute('select b1 from blobtest where id=1');
+
+$output = "c:\\temp\\test_out-".date('H-i-s').".gif"; 
+print "Saving file <b>$output</b>, size=".strlen($rs->fields[0])."<p>";
+$fd = fopen($output, "wb"); 
+fwrite($fd, $rs->fields[0]); 
+fclose($fd); 
+
+print " <a href=file://$output>View Image</a>";
+//$rs = $conn->Execute('SELECT id,SUBSTRING(b1, 1, 10) FROM blobtest');
+//rs2html($rs);
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/testoci8.php
diff -u phpgwapi/inc/adodb/tests/testoci8.php:1.2 
phpgwapi/inc/adodb/tests/testoci8.php:1.3
--- phpgwapi/inc/adodb/tests/testoci8.php:1.2   Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/testoci8.php       Tue Feb 21 13:47:42 2006
@@ -1,83 +1,83 @@
-<html>
-<body>
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-       
-  Latest version is available at http://adodb.sourceforge.net
-*/
-error_reporting(63);
-include("../adodb.inc.php");
-include("../tohtml.inc.php");
-
-if (0) {
-       $db = ADONewConnection('oci8po');
-       
-       $db->PConnect('','scott','natsoft');
-       if (!empty($testblob)) {
-               $varHoldingBlob = 'ABC DEF GEF John TEST';
-               $num = time()%10240;
-               // create table atable (id integer, ablob blob);
-               $db->Execute('insert into ATABLE (id,ablob) 
values('.$num.',empty_blob())');
-               $db->UpdateBlob('ATABLE', 'ablob', $varHoldingBlob, 'id='.$num, 
'BLOB');
-               
-               $rs = &$db->Execute('select * from atable');
-               
-               if (!$rs) die("Empty RS");
-               if ($rs->EOF) die("EOF RS");
-               rs2html($rs);
-       }
-       $stmt = $db->Prepare('select * from adoxyz where id=?');
-       for ($i = 1; $i <= 10; $i++) {
-       $rs = &$db->Execute(
-               $stmt,
-               array($i));
-                       
-               if (!$rs) die("Empty RS");
-               if ($rs->EOF) die("EOF RS");
-               rs2html($rs);
-       }
-}
-if (1) {
-       $db = ADONewConnection('oci8');
-       $db->PConnect('','scott','natsoft');
-       $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");
-       
-       $db->setfetchmode(ADODB_FETCH_NUM);
-       
-       $vv = 'A%';
-       $stmt = $db->PrepareSP("BEGIN adodb.open_tab2(:rs,:tt); END;",true);
-       $db->OutParameter($stmt, $cur, 'rs', -1, OCI_B_CURSOR);
-       $db->OutParameter($stmt, $vv, 'tt');
-       $rs = $db->Execute($stmt);
-       while (!$rs->EOF) {
-               adodb_pr($rs->fields);
-               $rs->MoveNext();
-       }
-       echo " val = $vv";
-
-}
-
-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);
-}
+<html>
+<body>
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+  Set tabs to 4 for best viewing.
+       
+  Latest version is available at http://adodb.sourceforge.net
+*/
+error_reporting(63);
+include("../adodb.inc.php");
+include("../tohtml.inc.php");
+
+if (0) {
+       $db = ADONewConnection('oci8po');
+       
+       $db->PConnect('','scott','natsoft');
+       if (!empty($testblob)) {
+               $varHoldingBlob = 'ABC DEF GEF John TEST';
+               $num = time()%10240;
+               // create table atable (id integer, ablob blob);
+               $db->Execute('insert into ATABLE (id,ablob) 
values('.$num.',empty_blob())');
+               $db->UpdateBlob('ATABLE', 'ablob', $varHoldingBlob, 'id='.$num, 
'BLOB');
+               
+               $rs = &$db->Execute('select * from atable');
+               
+               if (!$rs) die("Empty RS");
+               if ($rs->EOF) die("EOF RS");
+               rs2html($rs);
+       }
+       $stmt = $db->Prepare('select * from adoxyz where id=?');
+       for ($i = 1; $i <= 10; $i++) {
+       $rs = &$db->Execute(
+               $stmt,
+               array($i));
+                       
+               if (!$rs) die("Empty RS");
+               if ($rs->EOF) die("EOF RS");
+               rs2html($rs);
+       }
+}
+if (1) {
+       $db = ADONewConnection('oci8');
+       $db->PConnect('','scott','natsoft');
+       $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");
+       
+       $db->setfetchmode(ADODB_FETCH_NUM);
+       
+       $vv = 'A%';
+       $stmt = $db->PrepareSP("BEGIN adodb.open_tab2(:rs,:tt); END;",true);
+       $db->OutParameter($stmt, $cur, 'rs', -1, OCI_B_CURSOR);
+       $db->OutParameter($stmt, $vv, 'tt');
+       $rs = $db->Execute($stmt);
+       while (!$rs->EOF) {
+               adodb_pr($rs->fields);
+               $rs->MoveNext();
+       }
+       echo " val = $vv";
+
+}
+
+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
Index: phpgwapi/inc/adodb/tests/testoci8cursor.php
diff -u phpgwapi/inc/adodb/tests/testoci8cursor.php:1.2 
phpgwapi/inc/adodb/tests/testoci8cursor.php:1.3
--- phpgwapi/inc/adodb/tests/testoci8cursor.php:1.2     Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/testoci8cursor.php Tue Feb 21 13:47:42 2006
@@ -1,111 +1,111 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-       
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-/*
-       Test for Oracle Variable Cursors, which are treated as ADOdb recordsets.
-       
-       We have 2 examples. The first shows us using the Parameter statement. 
-       The second shows us using the new ExecuteCursor($sql, $cursorName)
-       function.
-       
-------------------------------------------------------------------
--- TEST PACKAGE YOU NEED TO INSTALL ON ORACLE - run from sql*plus
-------------------------------------------------------------------
-
-
--- TEST PACKAGE
-CREATE OR REPLACE PACKAGE adodb AS
-TYPE TabType IS REF CURSOR RETURN tab%ROWTYPE;
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar);
-PROCEDURE data_out(input IN varchar, output OUT varchar); 
-
-procedure myproc (p1 in number, p2 out number);
-END adodb;
-/
-
-CREATE OR REPLACE PACKAGE BODY adodb AS
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar) IS
-       BEGIN
-               OPEN tabcursor FOR SELECT * FROM tab where tname like 
tablenames;
-       END open_tab;
-       
-PROCEDURE data_out(input IN varchar, output OUT varchar) IS
-       BEGIN
-               output := 'Cinta Hati '||input;
-       END;
-       
-procedure myproc (p1 in number, p2 out number) as
-begin
-p2 := p1;
-end;
-END adodb;
-/
-
-------------------------------------------------------------------
--- END PACKAGE
-------------------------------------------------------------------
-
-*/
-
-include('../adodb.inc.php');
-include('../tohtml.inc.php');
-
-       error_reporting(E_ALL);
-       $db = ADONewConnection('oci8');
-       $db->PConnect('','scott','natsoft');
-       $db->debug = 99;
-
-
-/*
-*/
-
-       define('MYNUM',5);
-       
-
-       $rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS,'A%'); END;");
-       
-       if ($rs && !$rs->EOF) {
-               print "Test 1 RowCount: ".$rs->RecordCount()."<p>";
-       } else {
-               print "<b>Error in using Cursor Variables 1</b><p>";
-       }
-       
-       print "<h4>Testing Stored Procedures for oci8</h4>";
-       
-       $stid = $db->PrepareSP('BEGIN adodb.myproc('.MYNUM.', :myov); END;');
-       $db->OutParameter($stid, $myov, 'myov');
-       $db->Execute($stid);
-       if ($myov != MYNUM) print "<p><b>Error with myproc</b></p>";
-       
-       
-       $stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;",true);
-       $a1 = 'Malaysia';
-       //$a2 = ''; # a2 doesn't even need to be defined!
-       $db->InParameter($stmt,$a1,'a1');
-       $db->OutParameter($stmt,$a2,'a2');
-       $rs = $db->Execute($stmt);
-       if ($rs) {
-               if ($a2 !== 'Cinta Hati Malaysia') print "<b>Stored Procedure 
Error: a2 = $a2</b><p>";
-               else echo  "OK: a2=$a2<p>";
-       } else {
-               print "<b>Error in using Stored Procedure IN/Out 
Variables</b><p>";
-       }
-       
-       
-       $tname = 'A%';
-       
-       $stmt = $db->PrepareSP('select * from tab where tname like :tablename');
-       $db->Parameter($stmt,$tname,'tablename');
-       $rs = $db->Execute($stmt);
-       rs2html($rs);
-               
-               
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+  Set tabs to 4 for best viewing.
+       
+  Latest version is available at http://adodb.sourceforge.net
+*/
+
+/*
+       Test for Oracle Variable Cursors, which are treated as ADOdb recordsets.
+       
+       We have 2 examples. The first shows us using the Parameter statement. 
+       The second shows us using the new ExecuteCursor($sql, $cursorName)
+       function.
+       
+------------------------------------------------------------------
+-- TEST PACKAGE YOU NEED TO INSTALL ON ORACLE - run from sql*plus
+------------------------------------------------------------------
+
+
+-- TEST PACKAGE
+CREATE OR REPLACE PACKAGE adodb AS
+TYPE TabType IS REF CURSOR RETURN tab%ROWTYPE;
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar);
+PROCEDURE data_out(input IN varchar, output OUT varchar); 
+
+procedure myproc (p1 in number, p2 out number);
+END adodb;
+/
+
+CREATE OR REPLACE PACKAGE BODY adodb AS
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar) IS
+       BEGIN
+               OPEN tabcursor FOR SELECT * FROM tab where tname like 
tablenames;
+       END open_tab;
+       
+PROCEDURE data_out(input IN varchar, output OUT varchar) IS
+       BEGIN
+               output := 'Cinta Hati '||input;
+       END;
+       
+procedure myproc (p1 in number, p2 out number) as
+begin
+p2 := p1;
+end;
+END adodb;
+/
+
+------------------------------------------------------------------
+-- END PACKAGE
+------------------------------------------------------------------
+
+*/
+
+include('../adodb.inc.php');
+include('../tohtml.inc.php');
+
+       error_reporting(E_ALL);
+       $db = ADONewConnection('oci8');
+       $db->PConnect('','scott','natsoft');
+       $db->debug = 99;
+
+
+/*
+*/
+
+       define('MYNUM',5);
+       
+
+       $rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS,'A%'); END;");
+       
+       if ($rs && !$rs->EOF) {
+               print "Test 1 RowCount: ".$rs->RecordCount()."<p>";
+       } else {
+               print "<b>Error in using Cursor Variables 1</b><p>";
+       }
+       
+       print "<h4>Testing Stored Procedures for oci8</h4>";
+       
+       $stid = $db->PrepareSP('BEGIN adodb.myproc('.MYNUM.', :myov); END;');
+       $db->OutParameter($stid, $myov, 'myov');
+       $db->Execute($stid);
+       if ($myov != MYNUM) print "<p><b>Error with myproc</b></p>";
+       
+       
+       $stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;",true);
+       $a1 = 'Malaysia';
+       //$a2 = ''; # a2 doesn't even need to be defined!
+       $db->InParameter($stmt,$a1,'a1');
+       $db->OutParameter($stmt,$a2,'a2');
+       $rs = $db->Execute($stmt);
+       if ($rs) {
+               if ($a2 !== 'Cinta Hati Malaysia') print "<b>Stored Procedure 
Error: a2 = $a2</b><p>";
+               else echo  "OK: a2=$a2<p>";
+       } else {
+               print "<b>Error in using Stored Procedure IN/Out 
Variables</b><p>";
+       }
+       
+       
+       $tname = 'A%';
+       
+       $stmt = $db->PrepareSP('select * from tab where tname like :tablename');
+       $db->Parameter($stmt,$tname,'tablename');
+       $rs = $db->Execute($stmt);
+       rs2html($rs);
+               
+               
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/testpaging.php
diff -u phpgwapi/inc/adodb/tests/testpaging.php:1.2 
phpgwapi/inc/adodb/tests/testpaging.php:1.3
--- phpgwapi/inc/adodb/tests/testpaging.php:1.2 Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/testpaging.php     Tue Feb 21 13:47:42 2006
@@ -1,83 +1,86 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-       
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-error_reporting(E_ALL);
-
-
-include_once('../adodb.inc.php');
-include_once('../adodb-pager.inc.php');
-
-$driver = 'oci8';
-$sql = 'select  ID, firstname as "First Name", lastname as "Last Name" from 
adoxyz  order  by  id';
-//$sql = 'select count(*),firstname from adoxyz group by firstname order by 2 
';
-$sql = 'select distinct firstname, lastname from adoxyz  order  by  firstname';
-
-if ($driver == 'postgres') {
-       $db = NewADOConnection('postgres');
-       $db->PConnect('localhost','tester','test','test');
-}
-
-if ($driver == 'access') {
-       $db = NewADOConnection('access');
-       $db->PConnect("nwind", "", "", "");
-}
-
-if ($driver == 'ibase') {
-       $db = NewADOConnection('ibase');
-       $db->PConnect("localhost:e:\\firebird\\examples\\employee.gdb", 
"sysdba", "masterkey", "");
-       $sql = 'select distinct firstname, lastname  from adoxyz  order  by  
firstname';
-
-}
-if ($driver == 'mssql') {
-       $db = NewADOConnection('mssql');
-       $db->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-}
-if ($driver == 'oci8') {
-       $db = NewADOConnection('oci8');
-       $db->Connect('','scott','natsoft');
-}
-
-if ($driver == 'access') {
-       $db = NewADOConnection('access');
-       $db->Connect('nwind');
-}
-
-if (empty($driver) or $driver == 'mysql') {
-       $db = NewADOConnection('mysql');
-       $db->Connect('localhost','root','','xphplens');
-}
-
-//$db->pageExecuteCountRows = false;
-
-$db->debug = true;
-
-if (0) {
-$rs = &$db->Execute($sql);
-include_once('../toexport.inc.php');
-print "<pre>";
-print rs2csv($rs); # return a string
-
-print '<hr>';
-$rs->MoveFirst(); # note, some databases do not support MoveFirst
-print rs2tab($rs); # return a string
-
-print '<hr>';
-$rs->MoveFirst();
-rs2tabout($rs); # send to stdout directly
-print "</pre>";
-}
-
-$pager = new ADODB_Pager($db,$sql);
-$pager->showPageLinks = true;
-$pager->linksPerPage = 3;
-$pager->cache = 60;
-$pager->Render($rows=7);
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+  Set tabs to 4 for best viewing.
+       
+  Latest version is available at http://adodb.sourceforge.net
+*/
+
+error_reporting(E_ALL);
+
+
+include_once('../adodb.inc.php');
+include_once('../adodb-pager.inc.php');
+
+$driver = 'oci8';
+$sql = 'select  ID, firstname as "First Name", lastname as "Last Name" from 
adoxyz  order  by  id';
+//$sql = 'select count(*),firstname from adoxyz group by firstname order by 2 
';
+//$sql = 'select distinct firstname, lastname from adoxyz  order  by  
firstname';
+
+if ($driver == 'postgres') {
+       $db = NewADOConnection('postgres');
+       $db->PConnect('localhost','tester','test','test');
+}
+
+if ($driver == 'access') {
+       $db = NewADOConnection('access');
+       $db->PConnect("nwind", "", "", "");
+}
+
+if ($driver == 'ibase') {
+       $db = NewADOConnection('ibase');
+       $db->PConnect("localhost:e:\\firebird\\examples\\employee.gdb", 
"sysdba", "masterkey", "");
+       $sql = 'select distinct firstname, lastname  from adoxyz  order  by  
firstname';
+
+}
+if ($driver == 'mssql') {
+       $db = NewADOConnection('mssql');
+       $db->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
+}
+if ($driver == 'oci8') {
+       $db = NewADOConnection('oci8');
+       $db->Connect('','scott','natsoft');
+       
+$sql = "select * from (select  ID, firstname as \"First Name\", lastname as 
\"Last Name\" from adoxyz 
+        order  by  1)";
+}
+
+if ($driver == 'access') {
+       $db = NewADOConnection('access');
+       $db->Connect('nwind');
+}
+
+if (empty($driver) or $driver == 'mysql') {
+       $db = NewADOConnection('mysql');
+       $db->Connect('localhost','root','','test');
+}
+
+//$db->pageExecuteCountRows = false;
+
+$db->debug = true;
+
+if (0) {
+$rs = &$db->Execute($sql);
+include_once('../toexport.inc.php');
+print "<pre>";
+print rs2csv($rs); # return a string
+
+print '<hr />';
+$rs->MoveFirst(); # note, some databases do not support MoveFirst
+print rs2tab($rs); # return a string
+
+print '<hr />';
+$rs->MoveFirst();
+rs2tabout($rs); # send to stdout directly
+print "</pre>";
+}
+
+$pager = new ADODB_Pager($db,$sql);
+$pager->showPageLinks = true;
+$pager->linksPerPage = 10;
+$pager->cache = 60;
+$pager->Render($rows=7);
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/testpear.php
diff -u phpgwapi/inc/adodb/tests/testpear.php:1.2 
phpgwapi/inc/adodb/tests/testpear.php:1.3
--- phpgwapi/inc/adodb/tests/testpear.php:1.2   Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/testpear.php       Tue Feb 21 13:47:42 2006
@@ -1,34 +1,34 @@
-<?php
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-       
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-error_reporting(E_ALL);
-
-include_once('../adodb-pear.inc.php');
-$username = 'root';
-$password = '';
-$hostname = 'localhost';
-$databasename = 'xphplens';
-$driver = 'mysql';
-
-$dsn = "$driver://$username:address@hidden/$databasename";
-
-$db = DB::Connect($dsn);
-$db->setFetchMode(ADODB_FETCH_ASSOC);
-$rs = $db->Query('select firstname,lastname from adoxyz');
-$cnt = 0;
-while ($arr = $rs->FetchRow()) {
-       print_r($arr);
-       print "<br>";
-       $cnt += 1;
-}
-
-if ($cnt != 50) print "<b>Error in \$cnt = $cnt</b>";
+<?php
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+  Set tabs to 4 for best viewing.
+       
+  Latest version is available at http://adodb.sourceforge.net
+*/
+
+error_reporting(E_ALL);
+
+include_once('../adodb-pear.inc.php');
+$username = 'root';
+$password = '';
+$hostname = 'localhost';
+$databasename = 'xphplens';
+$driver = 'mysql';
+
+$dsn = "$driver://$username:address@hidden/$databasename";
+
+$db = DB::Connect($dsn);
+$db->setFetchMode(ADODB_FETCH_ASSOC);
+$rs = $db->Query('select firstname,lastname from adoxyz');
+$cnt = 0;
+while ($arr = $rs->FetchRow()) {
+       print_r($arr);
+       print "<br>";
+       $cnt += 1;
+}
+
+if ($cnt != 50) print "<b>Error in \$cnt = $cnt</b>";
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/testsessions.php
diff -u phpgwapi/inc/adodb/tests/testsessions.php:1.2 
phpgwapi/inc/adodb/tests/testsessions.php:1.3
--- phpgwapi/inc/adodb/tests/testsessions.php:1.2       Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/testsessions.php   Tue Feb 21 13:47:42 2006
@@ -1,73 +1,81 @@
-<?php
-
-/* 
-V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-       
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-function NotifyExpire($ref,$key)
-{
-       print "<p><b>Notify Expiring=$ref, sessionkey=$key</b></p>";
-}
-
-//-------------------------------------------------------------------
-       
-       
-#### CONNECTION
-if (1) {
-       $ADODB_SESSION_DRIVER='oci8';
-       $ADODB_SESSION_CONNECT='';
-       $ADODB_SESSION_USER ='scott';
-       $ADODB_SESSION_PWD ='natsoft';
-       $ADODB_SESSION_DB ='';
-} else {
-       $ADODB_SESSION_DRIVER='mysql';
-       $ADODB_SESSION_CONNECT='localhost';
-       $ADODB_SESSION_USER ='root';
-       $ADODB_SESSION_PWD ='';
-       $ADODB_SESSION_DB ='xphplens_2';
-}
-       
-### TURN DEBUGGING ON
-       $ADODB_SESS_DEBUG = true;
-
-       
-#### SETUP NOTIFICATION
-       $USER = 'JLIM'.rand();
-       $ADODB_SESSION_EXPIRE_NOTIFY = array('USER','NotifyExpire');
-
-       
-#### INIT
-       ob_start();
-       error_reporting(E_ALL);
-       include('../session/adodb-cryptsession.php');
-       session_start();
-
-
-### SETUP SESSION VARIABLES 
-       $HTTP_SESSION_VARS['MONKEY'] = array('1','abc',44.41);
-       if (!isset($HTTP_GET_VARS['nochange'])) @$HTTP_SESSION_VARS['AVAR'] += 
1;
-
-       
-### START DISPLAY
-       print "<h3>PHP ".PHP_VERSION."</h3>";
-       print 
"<p><b>\$HTTP_SESSION_VARS['AVAR']={$HTTP_SESSION_VARS['AVAR']}</b></p>";
-       
-       print "<hr> <b>Cookies</b>: ";
-       print_r($HTTP_COOKIE_VARS);
-       
-### RANDOMLY PERFORM Garbage Collection
-       if (rand() % 10 == 0) {
-       
-               print "<hr><p><b>Garbage Collection</b></p>";
-               adodb_sess_gc(10);
-               
-               print "<p>Random session destroy</p>";
-               session_destroy();
-       }
+<?php
+
+/* 
+V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). All rights 
reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence. 
+  Set tabs to 4 for best viewing.
+       
+  Latest version is available at http://adodb.sourceforge.net
+*/
+
+function NotifyExpire($ref,$key)
+{
+       print "<p><b>Notify Expiring=$ref, sessionkey=$key</b></p>";
+}
+
+//-------------------------------------------------------------------
+       
+error_reporting(E_ALL);
+
+#### CONNECTION
+if (0) {
+       $ADODB_SESSION_DRIVER='oci8';
+       $ADODB_SESSION_CONNECT='';
+       $ADODB_SESSION_USER ='scott';
+       $ADODB_SESSION_PWD ='natsoft';
+       $ADODB_SESSION_DB ='';
+} else {
+       $ADODB_SESSION_DRIVER='mysql';
+       $ADODB_SESSION_CONNECT='localhost';
+       $ADODB_SESSION_USER ='root';
+       $ADODB_SESSION_PWD ='';
+       $ADODB_SESSION_DB ='xphplens_2';
+}
+       
+### TURN DEBUGGING ON
+       $ADODB_SESS_DEBUG = 99;
+
+       
+#### SETUP NOTIFICATION
+       $USER = 'JLIM'.rand();
+       $ADODB_SESSION_EXPIRE_NOTIFY = array('USER','NotifyExpire');
+
+       
+#### INIT
+       ob_start();
+       include('../session/adodb-cryptsession.php');
+       session_start();
+
+       adodb_session_regenerate_id();
+       
+### SETUP SESSION VARIABLES 
+       $_SESSION['MONKEY'] = array('1','abc',44.41);
+       if (!isset($_GET['nochange'])) @$_SESSION['AVAR'] += 1;
+
+       
+### START DISPLAY
+       print "<h3>PHP ".PHP_VERSION."</h3>";
+       print "<p><b>\$_SESSION['AVAR']={$_SESSION['AVAR']}</b></p>";
+       
+       print "<hr /> <b>Cookies</b>: ";
+       print_r($_COOKIE);
+       
+### RANDOMLY PERFORM Garbage Collection
+### In real-production environment, this is done for you
+### by php's session extension, which calls adodb_sess_gc()
+### automatically for you. See php.ini's
+### session.cookie_lifetime and session.gc_probability
+
+       if (rand() % 5 == 0) {
+       
+               print "<hr /><p><b>Garbage Collection</b></p>";
+               adodb_sess_gc(10);
+               
+               if (rand() % 2 == 0) {
+                       print "<p>Random session destroy</p>";
+                       session_destroy();
+               }
+       }
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/tmssql.php
diff -u phpgwapi/inc/adodb/tests/tmssql.php:1.2 
phpgwapi/inc/adodb/tests/tmssql.php:1.3
--- phpgwapi/inc/adodb/tests/tmssql.php:1.2     Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/tmssql.php Tue Feb 21 13:47:42 2006
@@ -53,6 +53,16 @@
        $rs = $conn->Execute('delete from tester');
        print "date=".$conn->GetOne('select getdate()')."<br>";
 }
+
+
+$ACCEPTIP = '127.0.0.1';
+
+$remote = $_SERVER["REMOTE_ADDR"]; 
+
+if (!empty($ACCEPTIP))
+ if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
+       die("Unauthorised client: '$remote'");
+       
 ?>
 <a href=tmssql.php?do=tmssql>mssql</a>
 <a href=tmssql.php?do=tpear>pear</a>
@@ -60,6 +70,11 @@
 <?php
 if (!empty($_GET['do'])) {
        $do = $_GET['do'];
-       $do();
+       switch($do) {
+       case 'tpear':
+       case 'tadodb':
+       case 'tmssql':
+               $do();
+       }
 }
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tests/xmlschema.xml
diff -u phpgwapi/inc/adodb/tests/xmlschema.xml:1.2 
phpgwapi/inc/adodb/tests/xmlschema.xml:1.3
--- phpgwapi/inc/adodb/tests/xmlschema.xml:1.2  Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/tests/xmlschema.xml      Tue Feb 21 13:47:42 2006
@@ -23,6 +23,9 @@
     <query platform="mysql">
       insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
     </query>
+       <query platform="mssql">
+      insert into mytable ( row1, row2 ) values ( 12, 'Microsoft stuff' )
+    </query>
   </sql>
   <table name="obsoletetable">
     <DROP/>
Index: phpgwapi/inc/adodb/toexport.inc.php
diff -u phpgwapi/inc/adodb/toexport.inc.php:1.2 
phpgwapi/inc/adodb/toexport.inc.php:1.3
--- phpgwapi/inc/adodb/toexport.inc.php:1.2     Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/toexport.inc.php Tue Feb 21 13:47:42 2006
@@ -1,133 +1,133 @@
-<?php
-
-/** 
- * @version V4.54 5 Nov 2004 (c) 2000-2004 John Lim (address@hidden). All 
rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
- *
- * Code to export recordsets in several formats:
- *
- * AS VARIABLE
- * $s = rs2csv($rs); # comma-separated values
- * $s = rs2tab($rs); # tab delimited
- * 
- * TO A FILE
- * $f = fopen($path,'w');
- * rs2csvfile($rs,$f);
- * fclose($f);
- *
- * TO STDOUT
- * rs2csvout($rs);
- */
- 
-// returns a recordset as a csv string
-function rs2csv(&$rs,$addtitles=true)
-{
-       return _adodb_export($rs,',',',',false,$addtitles);
-}
-
-// writes recordset to csv file 
-function rs2csvfile(&$rs,$fp,$addtitles=true)
-{
-       _adodb_export($rs,',',',',$fp,$addtitles);
-}
-
-// write recordset as csv string to stdout
-function rs2csvout(&$rs,$addtitles=true)
-{
-       $fp = fopen('php://stdout','wb');
-       _adodb_export($rs,',',',',true,$addtitles);
-       fclose($fp);
-}
-
-function rs2tab(&$rs,$addtitles=true)
-{
-       return _adodb_export($rs,"\t",',',false,$addtitles);
-}
-
-// to file pointer
-function rs2tabfile(&$rs,$fp,$addtitles=true)
-{
-       _adodb_export($rs,"\t",',',$fp,$addtitles);
-}
-
-// to stdout
-function rs2tabout(&$rs,$addtitles=true)
-{
-       $fp = fopen('php://stdout','wb');
-       _adodb_export($rs,"\t",' ',true,$addtitles);
-       if ($fp) fclose($fp);
-}
-
-function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote 
= '"',$escquote = '"',$replaceNewLine = ' ')
-{
-       if (!$rs) return '';
-       //----------
-       // CONSTANTS
-       $NEWLINE = "\r\n";
-       $BUFLINES = 100;
-       $escquotequote = $escquote.$quote;
-       $s = '';
-       
-       if ($addtitles) {
-               $fieldTypes = $rs->FieldTypesArray();
-               reset($fieldTypes);
-               while(list(,$o) = each($fieldTypes)) {
-                       
-                       $v = $o->name;
-                       if ($escquote) $v = 
str_replace($quote,$escquotequote,$v);
-                       $v = 
strip_tags(str_replace("\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)));
-                       $elements[] = $v;
-                       
-               }
-               $s .= implode($sep, $elements).$NEWLINE;
-       }
-       $hasNumIndex = isset($rs->fields[0]);
-       
-       $line = 0;
-       $max = $rs->FieldCount();
-       
-       while (!$rs->EOF) {
-               $elements = array();
-               $i = 0;
-               
-               if ($hasNumIndex) {
-                       for ($j=0; $j < $max; $j++) {
-                               $v = $rs->fields[$j];
-                               if (!is_object($v)) $v = trim($v);
-                               else $v = 'Object';
-                               if ($escquote) $v = 
str_replace($quote,$escquotequote,$v);
-                               $v = 
strip_tags(str_replace("\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)));
-                               
-                               if (strpos($v,$sep) !== false || 
strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
-                               else $elements[] = $v;
-                       }
-               } else { // ASSOCIATIVE ARRAY
-                       foreach($rs->fields as $v) {
-                               if ($escquote) $v = 
str_replace($quote,$escquotequote,trim($v));
-                               $v = 
strip_tags(str_replace("\n",$replaceNewLine,str_replace($sep,$sepreplace,$v)));
-                               
-                               if (strpos($v,$sep) !== false || 
strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
-                               else $elements[] = $v;
-                       }
-               }
-               $s .= implode($sep, $elements).$NEWLINE;
-               $rs->MoveNext();
-               $line += 1;
-               if ($fp && ($line % $BUFLINES) == 0) {
-                       if ($fp === true) echo $s;
-                       else fwrite($fp,$s);
-                       $s = '';
-               }
-       }
-       
-       if ($fp) {
-               if ($fp === true) echo $s;
-               else fwrite($fp,$s);
-               $s = '';
-       }
-       
-       return $s;
-}
+<?php
+
+/** 
+ * @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (address@hidden). All 
rights reserved.
+ * Released under both BSD license and Lesser GPL library license. 
+ * Whenever there is any discrepancy between the two licenses, 
+ * the BSD license will take precedence. 
+ *
+ * Code to export recordsets in several formats:
+ *
+ * AS VARIABLE
+ * $s = rs2csv($rs); # comma-separated values
+ * $s = rs2tab($rs); # tab delimited
+ * 
+ * TO A FILE
+ * $f = fopen($path,'w');
+ * rs2csvfile($rs,$f);
+ * fclose($f);
+ *
+ * TO STDOUT
+ * rs2csvout($rs);
+ */
+ 
+// returns a recordset as a csv string
+function rs2csv(&$rs,$addtitles=true)
+{
+       return _adodb_export($rs,',',',',false,$addtitles);
+}
+
+// writes recordset to csv file 
+function rs2csvfile(&$rs,$fp,$addtitles=true)
+{
+       _adodb_export($rs,',',',',$fp,$addtitles);
+}
+
+// write recordset as csv string to stdout
+function rs2csvout(&$rs,$addtitles=true)
+{
+       $fp = fopen('php://stdout','wb');
+       _adodb_export($rs,',',',',true,$addtitles);
+       fclose($fp);
+}
+
+function rs2tab(&$rs,$addtitles=true)
+{
+       return _adodb_export($rs,"\t",',',false,$addtitles);
+}
+
+// to file pointer
+function rs2tabfile(&$rs,$fp,$addtitles=true)
+{
+       _adodb_export($rs,"\t",',',$fp,$addtitles);
+}
+
+// to stdout
+function rs2tabout(&$rs,$addtitles=true)
+{
+       $fp = fopen('php://stdout','wb');
+       _adodb_export($rs,"\t",' ',true,$addtitles);
+       if ($fp) fclose($fp);
+}
+
+function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote 
= '"',$escquote = '"',$replaceNewLine = ' ')
+{
+       if (!$rs) return '';
+       //----------
+       // CONSTANTS
+       $NEWLINE = "\r\n";
+       $BUFLINES = 100;
+       $escquotequote = $escquote.$quote;
+       $s = '';
+       
+       if ($addtitles) {
+               $fieldTypes = $rs->FieldTypesArray();
+               reset($fieldTypes);
+               while(list(,$o) = each($fieldTypes)) {
+                       
+                       $v = $o->name;
+                       if ($escquote) $v = 
str_replace($quote,$escquotequote,$v);
+                       $v = strip_tags(str_replace("\n", $replaceNewLine, 
str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+                       $elements[] = $v;
+                       
+               }
+               $s .= implode($sep, $elements).$NEWLINE;
+       }
+       $hasNumIndex = isset($rs->fields[0]);
+       
+       $line = 0;
+       $max = $rs->FieldCount();
+       
+       while (!$rs->EOF) {
+               $elements = array();
+               $i = 0;
+               
+               if ($hasNumIndex) {
+                       for ($j=0; $j < $max; $j++) {
+                               $v = $rs->fields[$j];
+                               if (!is_object($v)) $v = trim($v);
+                               else $v = 'Object';
+                               if ($escquote) $v = 
str_replace($quote,$escquotequote,$v);
+                               $v = strip_tags(str_replace("\n", 
$replaceNewLine, 
str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+                               
+                               if (strpos($v,$sep) !== false || 
strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
+                               else $elements[] = $v;
+                       }
+               } else { // ASSOCIATIVE ARRAY
+                       foreach($rs->fields as $v) {
+                               if ($escquote) $v = 
str_replace($quote,$escquotequote,trim($v));
+                               $v = strip_tags(str_replace("\n", 
$replaceNewLine, 
str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+                               
+                               if (strpos($v,$sep) !== false || 
strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
+                               else $elements[] = $v;
+                       }
+               }
+               $s .= implode($sep, $elements).$NEWLINE;
+               $rs->MoveNext();
+               $line += 1;
+               if ($fp && ($line % $BUFLINES) == 0) {
+                       if ($fp === true) echo $s;
+                       else fwrite($fp,$s);
+                       $s = '';
+               }
+       }
+       
+       if ($fp) {
+               if ($fp === true) echo $s;
+               else fwrite($fp,$s);
+               $s = '';
+       }
+       
+       return $s;
+}
 ?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/tohtml.inc.php
diff -u phpgwapi/inc/adodb/tohtml.inc.php:1.2 
phpgwapi/inc/adodb/tohtml.inc.php:1.3
--- phpgwapi/inc/adodb/tohtml.inc.php:1.2       Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/tohtml.inc.php   Tue Feb 21 13:47:42 2006
@@ -1,181 +1,195 @@
-<?php 
-/*
-  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (address@hidden). 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 <address@hidden>
-*/ 
-  
-// 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');
-//     $db = ADONewConnection('mysql');
-//     $db->Connect('mysql','userid','password','database');
-//     $rs = $db->Execute('select col1,col2,col3 from table');
-//     rs2html($rs, 'BORDER=2', array('Title1', 'Title2', 'Title3'));
-//     $rs->Close();
-//
-// RETURNS: number of rows displayed
-function 
rs2html(&$rs,$ztabhtml=false,$zheaderarray=false,$htmlspecialchars=true,$echo = 
true)
-{
-$s ='';$rows=0;$docnt = false;
-GLOBAL $gSQLMaxRows,$gSQLBlockRows;
-
-       if (!$rs) {
-               printf(ADODB_BAD_RS,'rs2html');
-               return false;
-       }
-       
-       if (! $ztabhtml) $ztabhtml = "BORDER='1' WIDTH='98%'";
-       //else $docnt = true;
-       $typearr = array();
-       $ncols = $rs->FieldCount();
-       $hdr = "<TABLE COLS=$ncols $ztabhtml><tr>\n\n";
-       for ($i=0; $i < $ncols; $i++) { 
-               $field = $rs->FetchField($i);
-               if ($zheaderarray) $fname = $zheaderarray[$i];
-               else $fname = htmlspecialchars($field->name);   
-               $typearr[$i] = $rs->MetaType($field->type,$field->max_length);
-               //print " $field->name $field->type $typearr[$i] ";
-                       
-               if (strlen($fname)==0) $fname = '&nbsp;';
-               $hdr .= "<TH>$fname</TH>";
-       }
-       $hdr .= "\n</tr>";
-       if ($echo) print $hdr."\n\n";
-       else $html = $hdr;
-       
-       // smart algorithm - handles ADODB_FETCH_MODE's correctly by probing...
-       $numoffset = isset($rs->fields[0]) ||isset($rs->fields[1]) || 
isset($rs->fields[2]);
-       while (!$rs->EOF) {
-               
-               $s .= "<TR valign=top>\n";
-               
-               for ($i=0; $i < $ncols; $i++) {
-                       if ($i===0) $v=($numoffset) ? $rs->fields[0] : 
reset($rs->fields);
-                       else $v = ($numoffset) ? $rs->fields[$i] : 
next($rs->fields);
-                       
-                       $type = $typearr[$i];
-                       switch($type) {
-                       case 'D':
-                               if (!strpos($v,':')) {
-                                       $s .= " <TD>".$rs->UserDate($v,"D d, M 
Y") ."&nbsp;</TD>\n";
-                                       break;
-                               }
-                       case 'T':
-                               $s .= " <TD>".$rs->UserTimeStamp($v,"D d, M Y, 
h:i:s") ."&nbsp;</TD>\n";
-                       break;
-                       case 'I':
-                       case 'N':
-                               $s .= " <TD 
align=right>".stripslashes((trim($v))) ."&nbsp;</TD>\n";
-                               
-                       break;
-                       /*
-                       case 'B':
-                               if (substr($v,8,2)=="BM" ) $v = substr($v,8);
-                               $mtime = substr(str_replace(' 
','_',microtime()),2);
-                               $tmpname = "tmp/".uniqid($mtime).getmypid();
-                               $fd = @fopen($tmpname,'a');
-                               @ftruncate($fd,0);
-                               @fwrite($fd,$v);
-                               @fclose($fd);
-                               if (!function_exists ("mime_content_type")) {
-                                 function mime_content_type ($file) {
-                                   return exec("file -bi 
".escapeshellarg($file));
-                                 }
-                               }
-                               $t = mime_content_type($tmpname);
-                               $s .= (substr($t,0,5)=="image") ? " <td><img 
src='$tmpname' alt='$t'></td>\\n" : " <td><a
-                               href='$tmpname'>$t</a></td>\\n";
-                               break;
-                       */
-
-                       default:
-                               if ($htmlspecialchars) $v = 
htmlspecialchars(trim($v));
-                               $v = trim($v);
-                               if (strlen($v) == 0) $v = '&nbsp;';
-                               $s .= " <TD>". 
str_replace("\n",'<br>',stripslashes($v)) ."</TD>\n";
-                         
-                       }
-               } // for
-               $s .= "</TR>\n\n";
-                         
-               $rows += 1;
-               if ($rows >= $gSQLMaxRows) {
-                       $rows = "<p>Truncated at $gSQLMaxRows</p>";
-                       break;
-               } // switch
-
-               $rs->MoveNext();
-       
-       // additional EOF check to prevent a widow header
-               if (!$rs->EOF && $rows % $gSQLBlockRows == 0) {
-       
-               //if (connection_aborted()) break;// not needed as PHP aborts 
script, unlike ASP
-                       if ($echo) print $s . "</TABLE>\n\n";
-                       else $html .= $s ."</TABLE>\n\n";
-                       $s = $hdr;
-               }
-       } // while
-
-       if ($echo) print $s."</TABLE>\n\n";
-       else $html .= $s."</TABLE>\n\n";
-       
-       if ($docnt) if ($echo) print "<H2>".$rows." Rows</H2>";
-       
-       return ($echo) ? $rows : $html;
- }
- 
-// pass in 2 dimensional array
-function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
-{
-       if (!$ztabhtml) $ztabhtml = 'BORDER=1';
-       
-       $s = "<TABLE $ztabhtml>";//';print_r($arr);
-
-       if ($zheaderarray) {
-               $s .= '<TR>';
-               for ($i=0; $i<sizeof($zheaderarray); $i++) {
-                       $s .= " <TH>{$zheaderarray[$i]}</TH>\n";
-               }
-               $s .= "\n</TR>";
-       }
-       
-       for ($i=0; $i<sizeof($arr); $i++) {
-               $s .= '<TR>';
-               $a = &$arr[$i];
-               if (is_array($a)) 
-                       for ($j=0; $j<sizeof($a); $j++) {
-                               $val = $a[$j];
-                               if (empty($val)) $val = '&nbsp;';
-                               $s .= " <TD>$val</TD>\n";
-                       }
-               else if ($a) {
-                       $s .=  '        <TD>'.$a."</TD>\n";
-               } else $s .= "  <TD>&nbsp;</TD>\n";
-               $s .= "\n</TR>\n";
-       }
-       $s .= '</TABLE>';
-       print $s;
-}
-
-?>
+<?php 
+/*
+  V4.72 21 Feb 2006  (c) 2000-2006 John Lim (address@hidden). 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 <address@hidden>
+*/ 
+  
+// specific code for tohtml
+GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
+
+$ADODB_ROUND=4; // rounding
+$gSQLMaxRows = 1000; // max no of rows to download
+$gSQLBlockRows=20; // max no of rows per table block
+
+// RecordSet to HTML Table
+//------------------------------------------------------------
+// Convert a recordset to a html table. Multiple tables are generated
+// if the number of rows is > $gSQLBlockRows. This is because
+// web browsers normally require the whole table to be downloaded
+// before it can be rendered, so we break the output into several
+// smaller faster rendering tables.
+//
+// $rs: the recordset
+// $ztabhtml: the table tag attributes (optional)
+// $zheaderarray: contains the replacement strings for the headers (optional)
+//
+//  USAGE:
+//     include('adodb.inc.php');
+//     $db = ADONewConnection('mysql');
+//     $db->Connect('mysql','userid','password','database');
+//     $rs = $db->Execute('select col1,col2,col3 from table');
+//     rs2html($rs, 'BORDER=2', array('Title1', 'Title2', 'Title3'));
+//     $rs->Close();
+//
+// RETURNS: number of rows displayed
+
+
+function 
rs2html(&$rs,$ztabhtml=false,$zheaderarray=false,$htmlspecialchars=true,$echo = 
true)
+{
+$s ='';$rows=0;$docnt = false;
+GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
+
+       if (!$rs) {
+               printf(ADODB_BAD_RS,'rs2html');
+               return false;
+       }
+       
+       if (! $ztabhtml) $ztabhtml = "BORDER='1' WIDTH='98%'";
+       //else $docnt = true;
+       $typearr = array();
+       $ncols = $rs->FieldCount();
+       $hdr = "<TABLE COLS=$ncols $ztabhtml><tr>\n\n";
+       for ($i=0; $i < $ncols; $i++) { 
+               $field = $rs->FetchField($i);
+               if ($field) {
+                       if ($zheaderarray) $fname = $zheaderarray[$i];
+                       else $fname = htmlspecialchars($field->name);   
+                       $typearr[$i] = 
$rs->MetaType($field->type,$field->max_length);
+                       //print " $field->name $field->type $typearr[$i] ";
+               } else {
+                       $fname = 'Field '.($i+1);
+                       $typearr[$i] = 'C';
+               }
+               if (strlen($fname)==0) $fname = '&nbsp;';
+               $hdr .= "<TH>$fname</TH>";
+       }
+       $hdr .= "\n</tr>";
+       if ($echo) print $hdr."\n\n";
+       else $html = $hdr;
+       
+       // smart algorithm - handles ADODB_FETCH_MODE's correctly by probing...
+       $numoffset = isset($rs->fields[0]) ||isset($rs->fields[1]) || 
isset($rs->fields[2]);
+       while (!$rs->EOF) {
+               
+               $s .= "<TR valign=top>\n";
+               
+               for ($i=0; $i < $ncols; $i++) {
+                       if ($i===0) $v=($numoffset) ? $rs->fields[0] : 
reset($rs->fields);
+                       else $v = ($numoffset) ? $rs->fields[$i] : 
next($rs->fields);
+                       
+                       $type = $typearr[$i];
+                       switch($type) {
+                       case 'D':
+                               if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
+                               else if (!strpos($v,':')) {
+                                       $s .= " <TD>".$rs->UserDate($v,"D d, M 
Y") ."&nbsp;</TD>\n";
+                               }
+                               break;
+                       case 'T':
+                               if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
+                               else $s .= "    <TD>".$rs->UserTimeStamp($v,"D 
d, M Y, h:i:s") ."&nbsp;</TD>\n";
+                       break;
+                       
+                       case 'N':
+                               if (abs($v) - round($v,0) < 0.00000001)
+                                       $v = round($v);
+                               else
+                                       $v = round($v,$ADODB_ROUND);
+                       case 'I':
+                               $s .= " <TD 
align=right>".stripslashes((trim($v))) ."&nbsp;</TD>\n";
+                               
+                       break;
+                       /*
+                       case 'B':
+                               if (substr($v,8,2)=="BM" ) $v = substr($v,8);
+                               $mtime = substr(str_replace(' 
','_',microtime()),2);
+                               $tmpname = "tmp/".uniqid($mtime).getmypid();
+                               $fd = @fopen($tmpname,'a');
+                               @ftruncate($fd,0);
+                               @fwrite($fd,$v);
+                               @fclose($fd);
+                               if (!function_exists ("mime_content_type")) {
+                                 function mime_content_type ($file) {
+                                   return exec("file -bi 
".escapeshellarg($file));
+                                 }
+                               }
+                               $t = mime_content_type($tmpname);
+                               $s .= (substr($t,0,5)=="image") ? " <td><img 
src='$tmpname' alt='$t'></td>\\n" : " <td><a
+                               href='$tmpname'>$t</a></td>\\n";
+                               break;
+                       */
+
+                       default:
+                               if ($htmlspecialchars) $v = 
htmlspecialchars(trim($v));
+                               $v = trim($v);
+                               if (strlen($v) == 0) $v = '&nbsp;';
+                               $s .= " <TD>". 
str_replace("\n",'<br>',stripslashes($v)) ."</TD>\n";
+                         
+                       }
+               } // for
+               $s .= "</TR>\n\n";
+                         
+               $rows += 1;
+               if ($rows >= $gSQLMaxRows) {
+                       $rows = "<p>Truncated at $gSQLMaxRows</p>";
+                       break;
+               } // switch
+
+               $rs->MoveNext();
+       
+       // additional EOF check to prevent a widow header
+               if (!$rs->EOF && $rows % $gSQLBlockRows == 0) {
+       
+               //if (connection_aborted()) break;// not needed as PHP aborts 
script, unlike ASP
+                       if ($echo) print $s . "</TABLE>\n\n";
+                       else $html .= $s ."</TABLE>\n\n";
+                       $s = $hdr;
+               }
+       } // while
+
+       if ($echo) print $s."</TABLE>\n\n";
+       else $html .= $s."</TABLE>\n\n";
+       
+       if ($docnt) if ($echo) print "<H2>".$rows." Rows</H2>";
+       
+       return ($echo) ? $rows : $html;
+ }
+ 
+// pass in 2 dimensional array
+function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
+{
+       if (!$ztabhtml) $ztabhtml = 'BORDER=1';
+       
+       $s = "<TABLE $ztabhtml>";//';print_r($arr);
+
+       if ($zheaderarray) {
+               $s .= '<TR>';
+               for ($i=0; $i<sizeof($zheaderarray); $i++) {
+                       $s .= " <TH>{$zheaderarray[$i]}</TH>\n";
+               }
+               $s .= "\n</TR>";
+       }
+       
+       for ($i=0; $i<sizeof($arr); $i++) {
+               $s .= '<TR>';
+               $a = &$arr[$i];
+               if (is_array($a)) 
+                       for ($j=0; $j<sizeof($a); $j++) {
+                               $val = $a[$j];
+                               if (empty($val)) $val = '&nbsp;';
+                               $s .= " <TD>$val</TD>\n";
+                       }
+               else if ($a) {
+                       $s .=  '        <TD>'.$a."</TD>\n";
+               } else $s .= "  <TD>&nbsp;</TD>\n";
+               $s .= "\n</TR>\n";
+       }
+       $s .= '</TABLE>';
+       print $s;
+}
+
+?>
\ No newline at end of file
Index: phpgwapi/inc/adodb/xmlschema.dtd
diff -u phpgwapi/inc/adodb/xmlschema.dtd:1.2 
phpgwapi/inc/adodb/xmlschema.dtd:1.3
--- phpgwapi/inc/adodb/xmlschema.dtd:1.2        Thu Dec 30 06:47:32 2004
+++ phpgwapi/inc/adodb/xmlschema.dtd    Tue Feb 21 13:47:42 2006
@@ -1,38 +1,39 @@
-<?xml version="1.0"?>
-<!DOCTYPE adodb_schema [
-<!ELEMENT schema (table*, sql*)>
-<!ATTLIST schema version CDATA #REQUIRED>
-<!ELEMENT table ((field+|DROP), constraint*, descr?, index*, data*)>
-<!ELEMENT field ((NOTNULL|KEY|PRIMARY)?, (AUTO|AUTOINCREMENT)?, 
(DEFAULT|DEFDATE|DEFTIMESTAMP)?, NOQUOTE, constraint, descr?)>
-<!ELEMENT data (row+)>
-<!ELEMENT row (f+)>
-<!ELEMENT f (#CDATA)>
-<!ELEMENT descr (#CDATA)>
-<!ELEMENT NOTNULL EMPTY>
-<!ELEMENT KEY EMPTY>
-<!ELEMENT PRIMARY EMPTY>
-<!ELEMENT AUTO EMPTY>
-<!ELEMENT AUTOINCREMENT EMPTY>
-<!ELEMENT DEFAULT EMPTY>
-<!ELEMENT DEFDATE EMPTY>
-<!ELEMENT DEFTIMESTAMP EMPTY>
-<!ELEMENT NOQUOTE EMPTY>
-<!ELEMENT DROP EMPTY>
-<!ELEMENT constraint (#CDATA)>
-<!ATTLIST table name CDATA #REQUIRED platform CDATA #IMPLIED version CDATA 
#IMPLIED>
-<!ATTLIST field name CDATA #REQUIRED type (C|C2|X|X2|B|D|T|L|I|F|N) #REQUIRED 
size CDATA #IMPLIED>
-<!ATTLIST data platform CDATA #IMPLIED>
-<!ATTLIST f name CDATA #IMPLIED>
-<!ATTLIST DEFAULT value CDATA #REQUIRED>
-<!ELEMENT index ((col+|DROP), CLUSTERED?, BITMAP?, UNIQUE?, FULLTEXT?, HASH?, 
descr?)>
-<!ELEMENT col (#CDATA)>
-<!ELEMENT CLUSTERED EMPTY>
-<!ELEMENT BITMAP EMPTY>
-<!ELEMENT UNIQUE EMPTY>
-<!ELEMENT FULLTEXT EMPTY>
-<!ELEMENT HASH EMPTY>
-<!ATTLIST index name CDATA #REQUIRED platform CDATA #IMPLIED>
-<!ELEMENT sql (query+, descr?)>
-<!ELEMENT query (#CDATA)>
-<!ATTLIST sql name CDATA #IMPLIED platform CDATA #IMPLIED, key CDATA, 
prefixmethod (AUTO|MANUAL|NONE) >
-] >
+<?xml version="1.0"?>
+<!DOCTYPE adodb_schema [
+<!ELEMENT schema (table*, sql*)>
+<!ATTLIST schema version CDATA #REQUIRED>
+<!ELEMENT table ((field+|DROP), CONSTRAINT*, descr?, index*, data*)>
+<!ELEMENT field ((NOTNULL|KEY|PRIMARY)?, (AUTO|AUTOINCREMENT)?, 
(DEFAULT|DEFDATE|DEFTIMESTAMP)?, 
+NOQUOTE?, CONSTRAINT*, descr?)>
+<!ELEMENT data (row+)>
+<!ELEMENT row (f+)>
+<!ELEMENT f (#CDATA)>
+<!ELEMENT descr (#CDATA)>
+<!ELEMENT NOTNULL EMPTY>
+<!ELEMENT KEY EMPTY>
+<!ELEMENT PRIMARY EMPTY>
+<!ELEMENT AUTO EMPTY>
+<!ELEMENT AUTOINCREMENT EMPTY>
+<!ELEMENT DEFAULT EMPTY>
+<!ELEMENT DEFDATE EMPTY>
+<!ELEMENT DEFTIMESTAMP EMPTY>
+<!ELEMENT NOQUOTE EMPTY>
+<!ELEMENT DROP EMPTY>
+<!ELEMENT CONSTRAINT (#CDATA)>
+<!ATTLIST table name CDATA #REQUIRED platform CDATA #IMPLIED version CDATA 
#IMPLIED>
+<!ATTLIST field name CDATA #REQUIRED type (C|C2|X|X2|B|D|T|L|I|F|N) #REQUIRED 
size CDATA #IMPLIED>
+<!ATTLIST data platform CDATA #IMPLIED>
+<!ATTLIST f name CDATA #IMPLIED>
+<!ATTLIST DEFAULT VALUE CDATA #REQUIRED>
+<!ELEMENT index ((col+|DROP), CLUSTERED?, BITMAP?, UNIQUE?, FULLTEXT?, HASH?, 
descr?)>
+<!ELEMENT col (#CDATA)>
+<!ELEMENT CLUSTERED EMPTY>
+<!ELEMENT BITMAP EMPTY>
+<!ELEMENT UNIQUE EMPTY>
+<!ELEMENT FULLTEXT EMPTY>
+<!ELEMENT HASH EMPTY>
+<!ATTLIST index name CDATA #REQUIRED platform CDATA #IMPLIED>
+<!ELEMENT sql (query+, descr?)>
+<!ELEMENT query (#CDATA)>
+<!ATTLIST sql name CDATA #IMPLIED platform CDATA #IMPLIED, key CDATA, 
prefixmethod (AUTO|MANUAL|NONE) >
+] >
\ No newline at end of file
Index: phpgwapi/inc/adodb/xsl/remove-0.2.xsl
diff -u phpgwapi/inc/adodb/xsl/remove-0.2.xsl:1.2 
phpgwapi/inc/adodb/xsl/remove-0.2.xsl:1.3
--- phpgwapi/inc/adodb/xsl/remove-0.2.xsl:1.2   Thu Dec 30 06:47:33 2004
+++ phpgwapi/inc/adodb/xsl/remove-0.2.xsl       Tue Feb 21 13:47:42 2006
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-       xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
->
-       <xsl:output method="xml" indent="yes" omit-xml-declaration="no" 
encoding="UTF-8"/>
-       
-       <!-- Schema -->
-       <xsl:template match="/">
-               <xsl:comment>
-ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
-</xsl:comment>
-               
-               <xsl:comment>
-Uninstallation Schema
-</xsl:comment>
-               
-               <xsl:element name="schema">
-                       <xsl:attribute name="version">0.2</xsl:attribute>
-                       
-                       <xsl:apply-templates select="schema/table">
-                               <xsl:sort select="position()" 
data-type="number" order="descending"/>
-                       </xsl:apply-templates>
-               </xsl:element>
-       </xsl:template>
-       
-       <!-- Table -->
-       <xsl:template match="table">
-               <xsl:if test="count(DROP) = 0">
-                       <xsl:element name="table">
-                               <xsl:attribute name="name"><xsl:value-of 
select="@name"/></xsl:attribute>
-                               
-                               <xsl:if test="string-length(@platform) > 0">
-                                       <xsl:attribute 
name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-                               </xsl:if>
-                               
-                               <xsl:if test="string-length(@version) > 0">
-                                       <xsl:attribute 
name="version"><xsl:value-of select="@version"/></xsl:attribute>
-                               </xsl:if>
-                               
-                               <xsl:apply-templates select="descr[1]"/>
-                               
-                               <xsl:element name="DROP"/>
-                       </xsl:element>
-               </xsl:if>
-       </xsl:template>
-       
-       <!-- Description -->
-       <xsl:template match="descr">
-               <xsl:element name="descr">
-                       <xsl:value-of select="normalize-space(text())"/>
-               </xsl:element>
-       </xsl:template>
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+       xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+>
+       <xsl:output method="xml" indent="yes" omit-xml-declaration="no" 
encoding="UTF-8"/>
+       
+       <!-- Schema -->
+       <xsl:template match="/">
+               <xsl:comment>
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+</xsl:comment>
+               
+               <xsl:comment>
+Uninstallation Schema
+</xsl:comment>
+               
+               <xsl:element name="schema">
+                       <xsl:attribute name="version">0.2</xsl:attribute>
+                       
+                       <xsl:apply-templates select="schema/table">
+                               <xsl:sort select="position()" 
data-type="number" order="descending"/>
+                       </xsl:apply-templates>
+               </xsl:element>
+       </xsl:template>
+       
+       <!-- Table -->
+       <xsl:template match="table">
+               <xsl:if test="count(DROP) = 0">
+                       <xsl:element name="table">
+                               <xsl:attribute name="name"><xsl:value-of 
select="@name"/></xsl:attribute>
+                               
+                               <xsl:if test="string-length(@platform) > 0">
+                                       <xsl:attribute 
name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
+                               </xsl:if>
+                               
+                               <xsl:if test="string-length(@version) > 0">
+                                       <xsl:attribute 
name="version"><xsl:value-of select="@version"/></xsl:attribute>
+                               </xsl:if>
+                               
+                               <xsl:apply-templates select="descr[1]"/>
+                               
+                               <xsl:element name="DROP"/>
+                       </xsl:element>
+               </xsl:if>
+       </xsl:template>
+       
+       <!-- Description -->
+       <xsl:template match="descr">
+               <xsl:element name="descr">
+                       <xsl:value-of select="normalize-space(text())"/>
+               </xsl:element>
+       </xsl:template>
 </xsl:stylesheet>
\ No newline at end of file




reply via email to

[Prev in Thread] Current Thread [Next in Thread]