[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16459] API: update adodb from upstream
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16459] API: update adodb from upstream |
|
Date: |
Mon, 20 Mar 2017 07:48:09 -0400 (EDT) |
Revision: 16459
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16459
Author: sigurdne
Date: 2017-03-20 07:48:08 -0400 (Mon, 20 Mar 2017)
Log Message:
-----------
API: update adodb from upstream
Modified Paths:
--------------
trunk/phpgwapi/inc/adodb/adodb-active-record.inc.php
trunk/phpgwapi/inc/adodb/adodb-active-recordx.inc.php
trunk/phpgwapi/inc/adodb/adodb-csvlib.inc.php
trunk/phpgwapi/inc/adodb/adodb-datadict.inc.php
trunk/phpgwapi/inc/adodb/adodb-error.inc.php
trunk/phpgwapi/inc/adodb/adodb-errorhandler.inc.php
trunk/phpgwapi/inc/adodb/adodb-errorpear.inc.php
trunk/phpgwapi/inc/adodb/adodb-exceptions.inc.php
trunk/phpgwapi/inc/adodb/adodb-iterator.inc.php
trunk/phpgwapi/inc/adodb/adodb-lib.inc.php
trunk/phpgwapi/inc/adodb/adodb-memcache.lib.inc.php
trunk/phpgwapi/inc/adodb/adodb-pager.inc.php
trunk/phpgwapi/inc/adodb/adodb-pear.inc.php
trunk/phpgwapi/inc/adodb/adodb-perf.inc.php
trunk/phpgwapi/inc/adodb/adodb-php4.inc.php
trunk/phpgwapi/inc/adodb/adodb-time.inc.php
trunk/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
trunk/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php
trunk/phpgwapi/inc/adodb/adodb.inc.php
trunk/phpgwapi/inc/adodb/composer.json
trunk/phpgwapi/inc/adodb/datadict/datadict-access.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-db2.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-generic.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-informix.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-mssqlnative.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-sqlite.inc.php
trunk/phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php
trunk/phpgwapi/inc/adodb/docs/changelog.md
trunk/phpgwapi/inc/adodb/drivers/adodb-access.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-ado.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-csv.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-db2.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-db2oci.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-db2ora.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-informix.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-mssqlnative.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-mysqlpo.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-oci8quercus.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_db2.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_mssql.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_mysql.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_oci.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_pgsql.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_sqlite.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-postgres8.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-postgres9.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-sqlite3.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php
trunk/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php
trunk/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php
trunk/phpgwapi/inc/adodb/perf/perf-db2.inc.php
trunk/phpgwapi/inc/adodb/perf/perf-informix.inc.php
trunk/phpgwapi/inc/adodb/perf/perf-mssql.inc.php
trunk/phpgwapi/inc/adodb/perf/perf-mssqlnative.inc.php
trunk/phpgwapi/inc/adodb/perf/perf-mysql.inc.php
trunk/phpgwapi/inc/adodb/perf/perf-oci8.inc.php
trunk/phpgwapi/inc/adodb/perf/perf-postgres.inc.php
trunk/phpgwapi/inc/adodb/pivottable.inc.php
trunk/phpgwapi/inc/adodb/rsfilter.inc.php
trunk/phpgwapi/inc/adodb/server.php
trunk/phpgwapi/inc/adodb/session/adodb-compress-bzip2.php
trunk/phpgwapi/inc/adodb/session/adodb-compress-gzip.php
trunk/phpgwapi/inc/adodb/session/adodb-cryptsession.php
trunk/phpgwapi/inc/adodb/session/adodb-cryptsession2.php
trunk/phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php
trunk/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php
trunk/phpgwapi/inc/adodb/session/adodb-encrypt-secret.php
trunk/phpgwapi/inc/adodb/session/adodb-session-clob.php
trunk/phpgwapi/inc/adodb/session/adodb-session-clob2.php
trunk/phpgwapi/inc/adodb/session/adodb-session.php
trunk/phpgwapi/inc/adodb/session/adodb-session2.php
trunk/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php
trunk/phpgwapi/inc/adodb/session/old/adodb-session-clob.php
trunk/phpgwapi/inc/adodb/session/old/adodb-session.php
trunk/phpgwapi/inc/adodb/toexport.inc.php
trunk/phpgwapi/inc/adodb/tohtml.inc.php
Removed Paths:
-------------
trunk/phpgwapi/inc/adodb/nbproject/
trunk/phpgwapi/inc/adodb/tests/
trunk/phpgwapi/inc/adodb/x.php
Modified: trunk/phpgwapi/inc/adodb/adodb-active-record.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-active-record.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-active-record.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Latest version is available at http://adodb.sourceforge.net
Modified: trunk/phpgwapi/inc/adodb/adodb-active-recordx.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-active-recordx.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-active-recordx.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Latest version is available at http://adodb.sourceforge.net
Modified: trunk/phpgwapi/inc/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-csvlib.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-csvlib.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -8,7 +8,7 @@
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-datadict.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-datadict.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-datadict.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-error.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-error.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-error.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.4 30-Mar-2016
+ * @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-errorhandler.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-errorhandler.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-errorhandler.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.4 30-Mar-2016
+ * @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-errorpear.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-errorpear.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-errorpear.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.4 30-Mar-2016
+ * @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-exceptions.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-exceptions.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- * @version v5.20.4 30-Mar-2016
+ * @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
@@ -33,16 +33,16 @@
case 'EXECUTE':
$this->sql = is_array($p1) ? $p1[0] : $p1;
$this->params = $p2;
- $s = "$dbms error: [$errno: $errmsg] in
$fn(\"$this->sql\")\n";
+ $s = "$dbms error: [$errno: $errmsg] in
$fn(\"$this->sql\")";
break;
case 'PCONNECT':
case 'CONNECT':
$user = $thisConnection->user;
- $s = "$dbms error: [$errno: $errmsg] in $fn($p1,
'$user', '****', $p2)\n";
+ $s = "$dbms error: [$errno: $errmsg] in $fn($p1,
'$user', '****', $p2)";
break;
default:
- $s = "$dbms error: [$errno: $errmsg] in $fn($p1,
$p2)\n";
+ $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
break;
}
Modified: trunk/phpgwapi/inc/adodb/adodb-iterator.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-iterator.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-iterator.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-lib.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-lib.inc.php 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/adodb-lib.inc.php 2017-03-20 11:48:08 UTC (rev
16459)
@@ -6,7 +6,7 @@
$ADODB_INCLUDED_LIB = 1;
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -426,7 +426,7 @@
if ( strpos($sql, '_ADODB_COUNT') !== FALSE ) {
$rewritesql =
preg_replace('/^\s*?SELECT\s+_ADODB_COUNT(.*)_ADODB_COUNT\s/is','SELECT
COUNT(*) ',$sql);
} else {
- $rewritesql =
preg_replace('/^\s*?SELECT\s.*?\s+(.*?)\s+FROM\s/is','SELECT COUNT(*) FROM
',$sql);
+ $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!
Modified: trunk/phpgwapi/inc/adodb/adodb-memcache.lib.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-memcache.lib.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-memcache.lib.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -11,7 +11,7 @@
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-pager.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-pager.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-pager.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights
reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb
community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-pear.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-pear.inc.php 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/adodb-pear.inc.php 2017-03-20 11:48:08 UTC (rev
16459)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.4 30-Mar-2016
+ * @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-perf.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-perf.inc.php 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/adodb-perf.inc.php 2017-03-20 11:48:08 UTC (rev
16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-php4.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-php4.inc.php 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/adodb-php4.inc.php 2017-03-20 11:48:08 UTC (rev
16459)
@@ -1,7 +1,7 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/adodb-time.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-time.inc.php 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/adodb-time.inc.php 2017-03-20 11:48:08 UTC (rev
16459)
@@ -3,7 +3,7 @@
ADOdb Date Library, part of the ADOdb abstraction library
Download: http://adodb.sourceforge.net/#download
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Modified: trunk/phpgwapi/inc/adodb/adodb-xmlschema.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-xmlschema.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-xmlschema.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -157,7 +157,6 @@
* Destroys the object
*/
function destroy() {
- unset( $this );
}
/**
@@ -265,12 +264,14 @@
switch( $this->currentElement ) {
case 'INDEX':
if( !isset( $attributes['PLATFORM'] ) OR
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
- xml_set_object( $parser,
$this->addIndex( $attributes ) );
+ $index = $this->addIndex( $attributes );
+ xml_set_object( $parser, $index );
}
break;
case 'DATA':
if( !isset( $attributes['PLATFORM'] ) OR
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
- xml_set_object( $parser,
$this->addData( $attributes ) );
+ $data = $this->addData( $attributes );
+ xml_set_object( $parser, $data );
}
break;
case 'DROP':
@@ -2196,7 +2197,6 @@
function Destroy() {
ini_set("magic_quotes_runtime", $this->mgq );
#set_magic_quotes_runtime( $this->mgq );
- unset( $this );
}
}
Modified: trunk/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/adodb-xmlschema03.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -175,7 +175,6 @@
* Destroys the object
*/
function destroy() {
- unset( $this );
}
/**
@@ -290,12 +289,14 @@
switch( $this->currentElement ) {
case 'INDEX':
if( !isset( $attributes['PLATFORM'] ) OR
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
- xml_set_object( $parser,
$this->addIndex( $attributes ) );
+ $index = $this->addIndex( $attributes );
+ xml_set_object( $parser, $index );
}
break;
case 'DATA':
if( !isset( $attributes['PLATFORM'] ) OR
$this->supportedPlatform( $attributes['PLATFORM'] ) ) {
- xml_set_object( $parser,
$this->addData( $attributes ) );
+ $data = $this->addData( $attributes );
+ xml_set_object( $parser, $data );
}
break;
case 'DROP':
@@ -2378,7 +2379,6 @@
function Destroy() {
ini_set("magic_quotes_runtime", $this->mgq );
#set_magic_quotes_runtime( $this->mgq );
- unset( $this );
}
}
Modified: trunk/phpgwapi/inc/adodb/adodb.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/adodb.inc.php 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/adodb.inc.php 2017-03-20 11:48:08 UTC (rev
16459)
@@ -14,7 +14,7 @@
/**
\mainpage
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights
reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb
community
@@ -37,6 +37,21 @@
if (!defined('_ADODB_LAYER')) {
define('_ADODB_LAYER',1);
+ // The ADOdb extension is no longer maintained and effectively
unsupported
+ // since v5.04. The library will not function properly if it is present.
+ if(defined('ADODB_EXTENSION')) {
+ $msg = "Unsupported ADOdb Extension (v" . ADODB_EXTENSION . ")
detected! "
+ . "Disable it to use ADOdb";
+
+ $errorfn = defined('ADODB_ERROR_HANDLER') ? ADODB_ERROR_HANDLER
: false;
+ if ($errorfn) {
+ $conn = false;
+ $errorfn('ADOdb', basename(__FILE__), -9999, $msg,
null, null, $conn);
+ } else {
+ die($msg . PHP_EOL);
+ }
+ }
+
//==============================================================================================
// CONSTANT DEFINITIONS
//==============================================================================================
@@ -217,7 +232,7 @@
/**
* ADODB version as a string.
*/
- $ADODB_vers = 'v5.20.4 30-Mar-2016';
+ $ADODB_vers = 'v5.20.9 21-Dec-2016';
/**
* Determines whether recordset->RecordCount() is used.
@@ -658,16 +673,16 @@
}
if (isset($rez)) {
$err = $this->ErrorMsg();
+ $errno = $this->ErrorNo();
if (empty($err)) {
$err = "Connection error to server
'$argHostname' with user '$argUsername'";
}
- $ret = false;
} else {
$err = "Missing extension for ".$this->dataProvider;
- $ret = 0;
+ $errno = 0;
}
if ($fn = $this->raiseErrorFn) {
-
$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
+ $fn($this->databaseType, 'CONNECT', $errno, $err,
$this->host, $this->database, $this);
}
$this->_connectionID = false;
@@ -674,7 +689,7 @@
if ($this->debug) {
ADOConnection::outp( $this->host.': '.$err);
}
- return $ret;
+ return false;
}
function _nconnect($argHostname, $argUsername, $argPassword,
$argDatabaseName) {
Modified: trunk/phpgwapi/inc/adodb/composer.json
===================================================================
--- trunk/phpgwapi/inc/adodb/composer.json 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/composer.json 2017-03-20 11:48:08 UTC (rev
16459)
@@ -20,7 +20,7 @@
"keywords" : [ "database", "abstraction", "layer", "library", "php" ],
- "homepage": "http://adodb.sourceforge.net/";,
+ "homepage": "http://adodb.org/";,
"support" : {
"issues" : "https://github.com/ADOdb/ADOdb/issues";,
"source" : "https://github.com/ADOdb/ADOdb";
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-access.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-access.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-access.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-db2.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-db2.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-db2.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-generic.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-generic.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-generic.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-ibase.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-informix.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-informix.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-informix.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-mssqlnative.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-mssqlnative.inc.php
2017-03-18 03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-mssqlnative.inc.php
2017-03-20 11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -146,19 +146,69 @@
return $sql;
}
- /*
- function AlterColumnSQL($tabname, $flds, $tableflds='',
$tableoptions='')
+ function DefaultConstraintname($tabname, $colname)
{
+ $constraintname = false;
+ $rs = $this->connection->Execute(
+ "SELECT name FROM sys.default_constraints
+ WHERE object_name(parent_object_id) = '$tabname'
+ AND col_name(parent_object_id, parent_column_id) =
'$colname'"
+ );
+ if ( is_object($rs) ) {
+ $row = $rs->FetchRow();
+ $constraintname = $row['name'];
+ }
+ return $constraintname;
+ }
+
+ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+ {
$tabname = $this->TableName ($tabname);
$sql = array();
- list($lines,$pkey) = $this->_GenFields($flds);
+
+ list($lines,$pkey,$idxs) = $this->_GenFields($flds);
+ $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
foreach($lines as $v) {
- $sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+ $not_null = false;
+ 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;
+ $v = preg_replace('/^' . preg_quote($colname) .
'\s/', '', $v);
+ $t = trim(str_replace('DEFAULT
'.$default,'',$v));
+ if ( $constraintname =
$this->DefaultConstraintname($tabname,$colname) ) {
+ $sql[] = 'ALTER TABLE '.$tabname.' DROP
CONSTRAINT '. $constraintname;
+ }
+ if ($not_null) {
+ $sql[] = $alter . $colname . ' ' . $t
. ' NOT NULL';
+ } else {
+ $sql[] = $alter . $colname . ' ' . $t ;
+ }
+ $sql[] = 'ALTER TABLE ' . $tabname
+ . ' ADD CONSTRAINT DF__' . $tabname .
'__' . $colname . '__' . dechex(rand())
+ . ' DEFAULT ' . $default . ' FOR ' .
$colname;
+ } else {
+ $colname = strtok($v," ");
+ if ( $constraintname =
$this->DefaultConstraintname($tabname,$colname) ) {
+ $sql[] = 'ALTER TABLE '.$tabname.' DROP
CONSTRAINT '. $constraintname;
+ }
+ if ($not_null) {
+ $sql[] = $alter . $v . ' NOT NULL';
+ } else {
+ $sql[] = $alter . $v;
+ }
+ }
}
-
+ if (is_array($idxs)) {
+ foreach($idxs as $idx => $idxdef) {
+ $sql_idxs = $this->CreateIndexSql($idx,
$tabname, $idxdef['cols'], $idxdef['opts']);
+ $sql = array_merge($sql, $sql_idxs);
+ }
+ }
return $sql;
}
- */
+
/**
* Drop a column, syntax is ALTER TABLE table DROP COLUMN column,column
@@ -176,10 +226,12 @@
if (!is_array($flds))
$flds = explode(',',$flds);
$f = array();
- $s = 'ALTER TABLE ' . $tabname . ' DROP COLUMN ';
+ $s = 'ALTER TABLE ' . $tabname;
foreach($flds as $v) {
- //$f[] = "\n$this->dropCol ".$this->NameQuote($v);
- $f[] = $this->NameQuote($v);
+ if ( $constraintname =
$this->DefaultConstraintname($tabname,$v) ) {
+ $sql[] = 'ALTER TABLE ' . $tabname . ' DROP
CONSTRAINT ' . $constraintname;
+ }
+ $f[] = ' DROP COLUMN ' . $this->NameQuote($v);
}
$s .= implode(', ',$f);
$sql[] = $s;
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-sqlite.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-sqlite.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-sqlite.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/docs/changelog.md
===================================================================
--- trunk/phpgwapi/inc/adodb/docs/changelog.md 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/docs/changelog.md 2017-03-20 11:48:08 UTC (rev
16459)
@@ -5,9 +5,46 @@
[v3.x](changelog_v3.x.md),
[v2.x](changelog_v2.x.md).
+## 5.20.9 - 21-Dec-2016
-## 5.20.4 - 30-Mar-2016
+- mssql: fix syntax error in version matching regex #305
+## 5.20.8 - 17-Dec-2016
+
+- mssql: support MSSQL Server 2016 and later #294
+- mssql: fix Find() returning no results. #298
+- mssql: fix Sequence name forced to 'adodbseq'. #295, #300
+- mssql: fix GenId() not returning next sequence value with SQL Server
2005/2008. #302
+- mssql: fix drop/alter column with existing default constraint. #290
+- mssql: fix PHP notice in MetaColumns(). #289
+- oci8po: fix inconsistent variable binding in SelectLimit() #288
+- oci8po: fix SelectLimit() with prepared statements #282
+
+## 5.20.7 - 20-Sep-2016
+
+- security: Fix SQL injection in PDO drivers qstr() method (CVE-2016-7405).
#226
+- oci8po: prevent segfault on PHP 7. #259
+- pdo/mysql: Fix MetaTables() method. #275
+
+## 5.20.6 - 31-Aug-2016
+
+- security: Fix XSS vulnerability in old test script (CVE-2016-4855). #274
+- adodb: Exit with error/exception when the ADOdb Extension is loaded. #269
+- adodb: Fix truncated exception messages. #273
+
+## 5.20.5 - 10-Aug-2016
+
+- adodb: Fix fatal error when connecting with missing extension. #254
+- adodb: Fix _adodb_getcount(). #236
+- mssql: Destructor fails if recordset already closed. #268
+- mssql: Use SQL server native data types if available. #234
+- mysqli: Fix PHP notice in _close() method. #240
+- pdo: Let driver handle SelectDB() and SQLDate() calls. #242
+- xml: Fix PHP strict warning. #260
+- xml: remove calls to 'unset($this)' (PHP 7.1 compatibility). #257
+
+## 5.20.4 - 31-Mar-2016
+
- adodb: Fix BulkBind() param count validation. #199
- mysqli: fix PHP warning in recordset destructor. #217
- mysqli: cast port number to int when connecting (PHP7 compatibility). #218
@@ -19,6 +56,7 @@
## 5.20.2 - 27-Dec-2015
- adodb: Remove a couple leftover PHP 4.x constructors (PHP7 compatibility).
#139
+- db2ora: Remove deprecated preg_replace '/e' flag (PHP7 compatibility). #168
- mysql: MoveNext() now respects ADODB_ASSOC_CASE. #167
- mssql, mysql, informix: Avoid PHP warning when closing recordset from
destructor. #170
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-access.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-access.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-access.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-ado.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-ado.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-ado_access.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-ado_mssql.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php
2017-03-18 03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php
2017-03-20 11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-csv.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-csv.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-csv.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-db2.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-db2.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-db2oci.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-db2oci.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-db2oci.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-db2ora.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-db2ora.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-db2ora.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-informix.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-informix.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-informix.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/**
-* @version v5.20.4 30-Mar-2016
+* @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim. All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-mssqlnative.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-mssqlnative.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -125,6 +125,7 @@
var $_bindInputArray = true;
var $_dropSeqSQL = "drop table %s";
var $connectionInfo = array();
+ var $cachedSchemaFlush = false;
var $sequences = false;
var $mssql_version = '';
@@ -143,27 +144,24 @@
sqlsrv_configure('WarningsReturnAsErrors', 0);
}
}
+
+ /**
+ * Initializes the SQL Server version.
+ * Dies if connected to a non-supported version (2000 and older)
+ */
function ServerVersion() {
$data = $this->ServerInfo();
- if (preg_match('/^09/',$data['version'])){
- /*
- * SQL Server 2005
- */
- $this->mssql_version = 9;
- } elseif (preg_match('/^10/',$data['version'])){
- /*
- * SQL Server 2008
- */
- $this->mssql_version = 10;
- } elseif (preg_match('/^11/',$data['version'])){
- /*
- * SQL Server 2012
- */
- $this->mssql_version = 11;
- } else
+ preg_match('/^\d{2}/', $data['version'], $matches);
+ $version = (int)reset($matches);
+
+ // We only support SQL Server 2005 and up
+ if($version < 9) {
die("SQL SERVER VERSION {$data['version']} NOT
SUPPORTED IN mssqlnative DRIVER");
}
+ $this->mssql_version = $version;
+ }
+
function ServerInfo() {
global $ADODB_FETCH_MODE;
static $arr = false;
@@ -211,10 +209,10 @@
switch($this->mssql_version){
case 9:
case 10:
- return $this->GenID2008();
+ return $this->GenID2008($seq, $start);
break;
- case 11:
- return $this->GenID2012();
+ default:
+ return $this->GenID2012($seq, $start);
break;
}
}
@@ -221,16 +219,16 @@
function CreateSequence($seq='adodbseq',$start=1)
{
- if (!$this->mssql_vesion)
+ if (!$this->mssql_version)
$this->ServerVersion();
switch($this->mssql_version){
case 9:
case 10:
- return $this->CreateSequence2008();
+ return $this->CreateSequence2008($seq, $start);
break;
- case 11:
- return $this->CreateSequence2012();
+ default:
+ return $this->CreateSequence2012($seq, $start);
break;
}
@@ -258,7 +256,7 @@
/**
* Proper Sequences Only available to Server 2012 and up
*/
- function CreateSequence2012($seq='adodb',$start=1){
+ function CreateSequence2012($seq='adodbseq',$start=1){
if (!$this->sequences){
$sql = "SELECT name FROM sys.sequences";
$this->sequences = $this->GetCol($sql);
@@ -289,7 +287,7 @@
}
$num = $this->GetOne("select id from $seq");
sqlsrv_commit($this->_connectionID);
- return true;
+ return $num;
}
/**
* Only available to Server 2012 and up
@@ -313,7 +311,7 @@
}
if (!is_array($this->sequences)
|| is_array($this->sequences) &&
!in_array($seq,$this->sequences)){
- $this->CreateSequence2012($seq='adodbseq',$start=1);
+ $this->CreateSequence2012($seq, $start);
}
$num = $this->GetOne("SELECT NEXT VALUE FOR $seq");
@@ -468,10 +466,9 @@
function ErrorNo()
{
- if ($this->_logsql && $this->_errorCode !== false) return
$this->_errorCode;
$err = sqlsrv_errors(SQLSRV_ERR_ALL);
if($err[0]) return $err[0]['code'];
- else return -1;
+ else return 0;
}
// returns true or false
@@ -569,7 +566,7 @@
$insert = false;
// handle native driver flaw for retrieving the last insert ID
-
if(preg_match('/^\W*insert\s(?:(?:(?:\'\')*\'[^\']+\'(?:\'\')*)|[^;\'])*;?$/i',
$sql)) {
+
if(preg_match('/^\W*insert[\s\w()",.]+values\s*\((?:[^;\']|\'\'|(?:(?:\'\')*\'[^\']+\'(?:\'\')*))*;?$/i',
$sql)) {
$insert = true;
$sql .= '; '.$this->identitySQL; // select
scope_identity()
}
@@ -1074,7 +1071,7 @@
is running. All associated result memory for the specified
result identifier will automatically be freed. */
function _close()
{
- if($this->_queryID) {
+ if(is_object($this->_queryID)) {
$rez = sqlsrv_free_stmt($this->_queryID);
$this->_queryID = false;
return $rez;
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-mssqlpo.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/**
-* @version v5.20.4 30-Mar-2016
+* @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -1054,7 +1054,7 @@
//if results are attached to this pointer from Stored Proceedure
calls, the next standard query will die 2014
//only a problem with persistant connections
- if($this->connection->_connectionID) {
+ if(isset($this->connection->_connectionID) &&
$this->connection->_connectionID) {
while(mysqli_more_results($this->connection->_connectionID)){
mysqli_next_result($this->connection->_connectionID);
}
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-mysqlpo.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-mysqlpo.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-mysqlpo.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-mysqlt.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-netezza.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim. All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
@@ -703,9 +703,19 @@
* 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.
+ *
+ * Note: FIRST_ROWS hinting is only used if $sql is a string; when
+ * processing a prepared statement's handle, no hinting is performed.
*/
function SelectLimit($sql,$nrows=-1,$offset=-1,
$inputarr=false,$secs2cache=0)
{
+ // Since the methods used to limit the number of returned rows
rely
+ // on modifying the provided SQL query, we can't work with
prepared
+ // statements so we just extract the SQL string.
+ if(is_array($sql)) {
+ $sql = $sql[0];
+ }
+
// seems that oracle only supports 1 hint comment in 8i
if ($this->firstrows) {
if ($nrows > 500 && $nrows < 1000) {
@@ -731,20 +741,13 @@
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;
-
+ return ADOConnection::SelectLimit($sql, $nrows,
$offset, $inputarr, $secs2cache);
} else {
// Algorithm by Tomas V V Cox, from PEAR DB oci8.php
@@ -758,13 +761,19 @@
if (is_array($inputarr)) {
foreach($inputarr as $k => $v) {
+ $i=0;
+ if ($this->databaseType == 'oci8po') {
+ $bv_name = ":".$i++;
+ } else {
+ $bv_name = ":".$k;
+ }
if (is_array($v)) {
// suggested by address@hidden
if (sizeof($v) == 2) {
-
oci_bind_by_name($stmt,":$k",$inputarr[$k][0],$v[1]);
+
oci_bind_by_name($stmt,$bv_name,$inputarr[$k][0],$v[1]);
}
else {
-
oci_bind_by_name($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+
oci_bind_by_name($stmt,$bv_name,$inputarr[$k][0],$v[1],$v[2]);
}
} else {
$len = -1;
@@ -774,7 +783,7 @@
if (isset($bindarr)) { // is
prepared sql, so no need to oci_bind_by_name again
$bindarr[$k] = $v;
} else {
// dynamic sql, so rebind every time
-
oci_bind_by_name($stmt,":$k",$inputarr[$k],$len);
+
oci_bind_by_name($stmt,$bv_name,$inputarr[$k],$len);
}
}
}
@@ -801,17 +810,10 @@
}
$offset += 1; // in Oracle rownum starts at 1
- if ($this->databaseType == 'oci8po') {
$sql = "SELECT $hint $fields FROM".
"(SELECT rownum as adodb_rownum,
$fields FROM".
- " ($sql) WHERE rownum <= ?".
- ") WHERE adodb_rownum >= ?";
- } else {
- $sql = "SELECT $hint $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;
@@ -818,7 +820,9 @@
if ($secs2cache > 0) {
$rs = $this->CacheExecute($secs2cache,
$sql,$inputarr);
}
- else $rs = $this->Execute($sql,$inputarr);
+ else {
+ $rs = $this->Execute($sql, $inputarr);
+ }
return $rs;
}
}
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-oci805.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.4 30-Mar-2016
+ * @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-oci8po.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim. All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -56,6 +56,21 @@
return ADOConnection::Execute($sql,$inputarr);
}
+ /**
+ * The optimizations performed by ADODB_oci8::SelectLimit() are not
+ * compatible with the oci8po driver, so we rely on the slower method
+ * from the base class.
+ * We can't properly handle prepared statements either due to
preprocessing
+ * of query parameters, so we treat them as regular SQL statements.
+ */
+ function SelectLimit($sql, $nrows=-1, $offset=-1, $inputarr=false,
$secs2cache=0)
+ {
+ if(is_array($sql)) {
+// $sql = $sql[0];
+ }
+ return ADOConnection::SelectLimit($sql, $nrows, $offset,
$inputarr, $secs2cache);
+ }
+
// emulate handling of parameters ? ?, replacing with :bind0 :bind1
function _query($sql,$inputarr=false)
{
@@ -74,12 +89,15 @@
$sql = str_replace($qmMatch,
$qmReplace, $sql);
}
+ // Replace parameters if any were found
$sqlarr = explode('?',$sql);
+ if(count($sqlarr) > 1) {
$sql = $sqlarr[0];
- foreach($inputarr as $k => $v) {
+ foreach ($inputarr as $k => $v) {
$sql .= ":$k" . $sqlarr[++$i];
}
+ }
$sql = str_replace('-QUESTIONMARK-', '?', $sql);
}
@@ -138,8 +156,10 @@
// 10% speedup to move MoveNext to child class
function MoveNext()
{
-
if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+ $ret = @oci_fetch_array($this->_queryID,$this->fetchMode);
+ if($ret !== false) {
global $ADODB_ANSI_PADDING_OFF;
+ $this->fields = $ret;
$this->_currentRow++;
$this->_updatefields();
@@ -169,10 +189,12 @@
$arr = array();
return $arr;
}
- if
(address@hidden($this->_queryID,$this->fields,$this->fetchMode)) {
+ $ret = @oci_fetch_array($this->_queryID,$this->fetchMode);
+ if ($ret === false) {
$arr = array();
return $arr;
}
+ $this->fields = $ret;
$this->_updatefields();
$results = array();
$cnt = 0;
@@ -188,8 +210,9 @@
{
global $ADODB_ANSI_PADDING_OFF;
- $ret =
@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
+ $ret = @oci_fetch_array($this->_queryID,$this->fetchMode);
if ($ret) {
+ $this->fields = $ret;
$this->_updatefields();
if (!empty($ADODB_ANSI_PADDING_OFF)) {
@@ -198,7 +221,7 @@
}
}
}
- return $ret;
+ return $ret !== false;
}
}
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-oci8quercus.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-oci8quercus.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-oci8quercus.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim. All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_db2.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_db2.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_db2.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_mssql.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-odbc_oracle.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-odbtp.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
2017-03-18 03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-odbtp_unicode.inc.php
2017-03-20 11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights
reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb
community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-pdo.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/**
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights
reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb
community
@@ -196,6 +196,7 @@
$this->_driver->_connectionID = $this->_connectionID;
$this->_UpdatePDO();
+ $this->_driver->database = $this->database;
return true;
}
$this->_driver = new ADODB_pdo_base();
@@ -266,6 +267,16 @@
return $this->_driver->OffsetDate($dayFraction,$date);
}
+ function SelectDB($dbName)
+ {
+ return $this->_driver->SelectDB($dbName);
+ }
+
+ function SQLDate($fmt, $col=false)
+ {
+ return $this->_driver->SQLDate($fmt, $col);
+ }
+
function ErrorMsg()
{
if ($this->_errormsg !== false) {
@@ -507,6 +518,30 @@
{
return ($this->_connectionID) ?
$this->_connectionID->lastInsertId() : 0;
}
+
+ /**
+ * Quotes a string to be sent to the database.
+ * If we have an active connection, delegates quoting to the underlying
+ * PDO object. Otherwise, replace "'" by the value of $replaceQuote
(same
+ * behavior as mysqli driver)
+ * @param string $s The string to quote
+ * @param boolean $magic_quotes If false, use PDO::quote().
+ * @return string Quoted string
+ */
+ function qstr($s, $magic_quotes = false)
+ {
+ if (!$magic_quotes) {
+ if ($this->_connectionID) {
+ return $this->_connectionID->quote($s);
+ }
+ return "'" . str_replace("'", $this->replaceQuote, $s)
. "'";
+ }
+
+ // undo magic quotes for "
+ $s = str_replace('\\"', '"', $s);
+ return "'$s'";
+ }
+
}
class ADODB_pdo_base extends ADODB_pdo {
@@ -699,12 +734,22 @@
}
//adodb_pr($arr);
$o->name = $arr['name'];
- if (isset($arr['native_type']) && $arr['native_type'] <>
"null") {
+ if (isset($arr['sqlsrv:decl_type']) && $arr['sqlsrv:decl_type']
<> "null")
+ {
+ /*
+ * If the database is SQL server, use the native built-ins
+ */
+ $o->type = $arr['sqlsrv:decl_type'];
+ }
+ elseif (isset($arr['native_type']) && $arr['native_type'] <>
"null")
+ {
$o->type = $arr['native_type'];
}
- else {
+ else
+ {
$o->type = adodb_pdo_type($arr['pdo_type']);
}
+
$o->max_length = $arr['len'];
$o->precision = $arr['precision'];
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_mssql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_mssql.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_mssql.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -2,7 +2,7 @@
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_mysql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_mysql.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_mysql.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
@@ -70,7 +70,9 @@
{
$save = $this->metaTablesSQL;
if ($showSchema && is_string($showSchema)) {
- $this->metaTablesSQL .= " from $showSchema";
+ $this->metaTablesSQL .= $this->qstr($showSchema);
+ } else {
+ $this->metaTablesSQL .= 'schema()';
}
if ($mask) {
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_oci.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_oci.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_oci.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -2,7 +2,7 @@
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_pgsql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_pgsql.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_pgsql.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_sqlite.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_sqlite.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-pdo_sqlite.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-postgres.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-postgres7.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-postgres8.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-postgres8.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-postgres8.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-postgres9.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-postgres9.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-postgres9.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-proxy.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-sapdb.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-sqlanywhere.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
reserved.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-sqlite3.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-sqlite3.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-sqlite3.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-sqlitepo.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim. All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/drivers/adodb-vfp.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php
===================================================================
--- trunk/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/perf/perf-db2.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/perf/perf-db2.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/perf/perf-db2.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/perf/perf-informix.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/perf/perf-informix.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/perf/perf-informix.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/perf/perf-mssql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/perf/perf-mssql.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/perf/perf-mssql.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/perf/perf-mssqlnative.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/perf/perf-mssqlnative.inc.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/perf/perf-mssqlnative.inc.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/perf/perf-mysql.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/perf/perf-mysql.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/perf/perf-mysql.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/perf/perf-oci8.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/perf/perf-oci8.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/perf/perf-oci8.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/perf/perf-postgres.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/perf/perf-postgres.inc.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/perf/perf-postgres.inc.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/pivottable.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/pivottable.inc.php 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/pivottable.inc.php 2017-03-20 11:48:08 UTC (rev
16459)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.4 30-Mar-2016
+ * @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/rsfilter.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/rsfilter.inc.php 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/rsfilter.inc.php 2017-03-20 11:48:08 UTC (rev
16459)
@@ -1,6 +1,6 @@
<?php
/**
- * @version v5.20.4 30-Mar-2016
+ * @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/server.php
===================================================================
--- trunk/phpgwapi/inc/adodb/server.php 2017-03-18 03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/server.php 2017-03-20 11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/**
- * @version v5.20.4 30-Mar-2016
+ * @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/session/adodb-compress-bzip2.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-compress-bzip2.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-compress-bzip2.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/adodb-compress-gzip.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-compress-gzip.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-compress-gzip.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -2,7 +2,7 @@
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/adodb-cryptsession.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-cryptsession.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-cryptsession.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -2,7 +2,7 @@
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/adodb-cryptsession2.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-cryptsession2.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-cryptsession2.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -2,7 +2,7 @@
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-encrypt-mcrypt.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -2,7 +2,7 @@
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-encrypt-md5.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/adodb-encrypt-secret.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-encrypt-secret.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-encrypt-secret.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,7 +1,7 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/adodb-session-clob.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-session-clob.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-session-clob.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -2,7 +2,7 @@
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/adodb-session-clob2.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-session-clob2.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-session-clob2.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -2,7 +2,7 @@
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/adodb-session.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-session.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-session.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -2,7 +2,7 @@
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/adodb-session2.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/adodb-session2.php 2017-03-18 03:59:42 UTC
(rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/adodb-session2.php 2017-03-20 11:48:08 UTC
(rev 16459)
@@ -2,7 +2,7 @@
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Contributed by Ross Smith (address@hidden).
Modified: trunk/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/session/old/adodb-session-clob.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/old/adodb-session-clob.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/old/adodb-session-clob.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/session/old/adodb-session.php
===================================================================
--- trunk/phpgwapi/inc/adodb/session/old/adodb-session.php 2017-03-18
03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/session/old/adodb-session.php 2017-03-20
11:48:08 UTC (rev 16459)
@@ -1,6 +1,6 @@
<?php
/*
address@hidden v5.20.4 30-Mar-2016
address@hidden v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/toexport.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/toexport.inc.php 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/toexport.inc.php 2017-03-20 11:48:08 UTC (rev
16459)
@@ -1,7 +1,7 @@
<?php
/**
- * @version v5.20.4 30-Mar-2016
+ * @version v5.20.9 21-Dec-2016
* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
* @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
* Released under both BSD license and Lesser GPL library license.
Modified: trunk/phpgwapi/inc/adodb/tohtml.inc.php
===================================================================
--- trunk/phpgwapi/inc/adodb/tohtml.inc.php 2017-03-18 03:59:42 UTC (rev
16458)
+++ trunk/phpgwapi/inc/adodb/tohtml.inc.php 2017-03-20 11:48:08 UTC (rev
16459)
@@ -1,6 +1,6 @@
<?php
/*
- @version v5.20.4 30-Mar-2016
+ @version v5.20.9 21-Dec-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Deleted: trunk/phpgwapi/inc/adodb/x.php
===================================================================
--- trunk/phpgwapi/inc/adodb/x.php 2017-03-18 03:59:42 UTC (rev 16458)
+++ trunk/phpgwapi/inc/adodb/x.php 2017-03-20 11:48:08 UTC (rev 16459)
@@ -1,9 +0,0 @@
-<?php
-include('adodb.inc.php');
-
-$db = adonewconnection('mysqli');
-$db->connect('localhost', 'root', 'C0yote71', 'mantis_13x');
-
-$t = 'mantis_user_table';
-$c = array('username' => 'test');
-print $db->getinsertsql($t, $c) . PHP_EOL;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16459] API: update adodb from upstream,
sigurdne <=