mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-52619 lib: Update of ADODB to 5.20.3

Browse Source
This commit is contained in:
Adrian Greeve 2016-03-14 16:01:09 +08:00
parent fed66ad9e2
commit dba57f8d6e
100 changed files with 150 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/adodb/adodb-active-record.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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

2
lib/adodb/adodb-active-recordx.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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

2
lib/adodb/adodb-csvlib.inc.php
View File

@ -8,7 +8,7 @@ $ADODB_INCLUDED_CSV = 1;
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-datadict.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-error.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-errorhandler.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-errorpear.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-exceptions.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-iterator.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-lib.inc.php
View File

@ -6,7 +6,7 @@ global $ADODB_INCLUDED_LIB;
$ADODB_INCLUDED_LIB = 1;
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-memcache.lib.inc.php
View File

@ -11,7 +11,7 @@ if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-pager.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-pear.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-perf.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-php4.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/adodb-time.inc.php
View File

@ -3,7 +3,7 @@
ADOdb Date Library, part of the ADOdb abstraction library
Download: http://adodb.sourceforge.net/#download
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community

4
lib/adodb/adodb.inc.php
View File

@ -14,7 +14,7 @@
/**
\mainpage
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
@ -218,7 +218,7 @@ if (!defined('_ADODB_LAYER')) {
/**
* ADODB version as a string.
*/
$ADODB_vers = 'v5.20.1 06-Dec-2015';
$ADODB_vers = 'v5.20.3 01-Jan-2016';
/**
* Determines whether recordset->RecordCount() is used.

2
lib/adodb/datadict/datadict-access.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-db2.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-firebird.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-generic.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-ibase.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-informix.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-mssql.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-mssqlnative.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-mysql.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-oci8.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-postgres.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-sapdb.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-sqlite.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/datadict/datadict-sybase.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-access.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-ado.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-ado5.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-ado_access.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-ado_mssql.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-borland_ibase.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-csv.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-db2.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community

2
lib/adodb/drivers/adodb-db2oci.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

21
lib/adodb/drivers/adodb-db2ora.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.
@ -22,15 +22,26 @@ if (!defined('ADODB_DB2OCI')){
define('ADODB_DB2OCI',1);
/**
* Callback function for preg_replace in _colonscope()
* @param array $p matched patterns
* return string '?' if parameter replaced, :N if not
*/
function _colontrack($p)
{
global $_COLONARR,$_COLONSZ;
$v = (integer) substr($p,1);
if ($v > $_COLONSZ) return $p;
global $_COLONARR, $_COLONSZ;
$v = (integer) substr($p[1], 1);
if ($v > $_COLONSZ) return $p[1];
$_COLONARR[] = $v;
return '?';
}
/**
* smart remapping of :0, :1 bind vars to ? ?
* @param string $sql SQL statement
* @param array $arr parameters
* @return array
*/
function _colonscope($sql,$arr)
{
global $_COLONARR,$_COLONSZ;
@ -38,7 +49,7 @@ global $_COLONARR,$_COLONSZ;
$_COLONARR = array();
$_COLONSZ = sizeof($arr);
$sql2 = preg_replace_callback('/(:[0-9]+)/', create_function('$m', 'return _colontrack($m[0]);'), $sql);
$sql2 = preg_replace_callback('/(:[0-9]+)/', '_colontrack', $sql);
if (empty($_COLONARR)) return array($sql,$arr);

2
lib/adodb/drivers/adodb-fbsql.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-firebird.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-ibase.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-informix.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

12
lib/adodb/drivers/adodb-informix72.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.
@ -378,7 +378,10 @@ class ADODB_informix72 extends ADOConnection {
function _close()
{
$this->lastQuery = false;
return ifx_close($this->_connectionID);
if($this->_connectionID) {
return ifx_close($this->_connectionID);
}
return true;
}
}
@ -490,7 +493,10 @@ class ADORecordset_informix72 extends ADORecordSet {
is running. All associated result memory for the specified result identifier will automatically be freed. */
function _close()
{
return ifx_free_result($this->_queryID);
if($this->_queryID) {
return ifx_free_result($this->_queryID);
}
return true;
}
}

2
lib/adodb/drivers/adodb-ldap.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

12
lib/adodb/drivers/adodb-mssql.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.
@ -1051,10 +1051,14 @@ class ADORecordset_mssql extends ADORecordSet {
function _close()
{
$rez = mssql_free_result($this->_queryID);
$this->_queryID = false;
return $rez;
if($this->_queryID) {
$rez = mssql_free_result($this->_queryID);
$this->_queryID = false;
return $rez;
}
return true;
}
// mssql uses a default date like Dec 30 2000 12:00AM
static function UnixDate($v)
{

5
lib/adodb/drivers/adodb-mssql_n.inc.php
View File

@ -53,11 +53,6 @@ include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php');
class ADODB_mssql_n extends ADODB_mssql {
var $databaseType = "mssql_n";
function ADODB_mssqlpo()
{
ADODB_mssql::ADODB_mssql();
}
function _query($sql,$inputarr=false)
{
$sql = $this->_appendN($sql);

11
lib/adodb/drivers/adodb-mssqlnative.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.
@ -1074,9 +1074,12 @@ class ADORecordset_mssqlnative extends ADORecordSet {
is running. All associated result memory for the specified result identifier will automatically be freed. */
function _close()
{
$rez = sqlsrv_free_stmt($this->_queryID);
$this->_queryID = false;
return $rez;
if($this->_queryID) {
$rez = sqlsrv_free_stmt($this->_queryID);
$this->_queryID = false;
return $rez;
}
return true;
}
// mssql uses a default date like Dec 30 2000 12:00AM

2
lib/adodb/drivers/adodb-mssqlpo.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

3
lib/adodb/drivers/adodb-mysql.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.
@ -797,6 +797,7 @@ class ADORecordSet_mysql extends ADORecordSet{
//return adodb_movenext($this);
//if (defined('ADODB_EXTENSION')) return adodb_movenext($this);
if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
$this->_updatefields();
$this->_currentRow += 1;
return true;
}

17
lib/adodb/drivers/adodb-mysqli.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.
@ -1033,7 +1033,10 @@ class ADORecordSet_mysqli extends ADORecordSet{
$this->_currentRow++;
$this->fields = @mysqli_fetch_array($this->_queryID,$this->fetchMode);
if (is_array($this->fields)) return true;
if (is_array($this->fields)) {
$this->_updatefields();
return true;
}
$this->EOF = true;
return false;
}
@ -1050,11 +1053,15 @@ class ADORecordSet_mysqli extends ADORecordSet{
//if results are attached to this pointer from Stored Proceedure calls, the next standard query will die 2014
//only a problem with persistant connections
while (@mysqli_more_results($this->connection->_connectionID)) {
@mysqli_next_result($this->connection->_connectionID);
if($this->connection->_connectionID) {
while(mysqli_more_results($this->connection->_connectionID)){
mysqli_next_result($this->connection->_connectionID);
}
}
@mysqli_free_result($this->_queryID);
if($this->_queryID) {
mysqli_free_result($this->_queryID);
}
$this->_queryID = false;
}

2
lib/adodb/drivers/adodb-mysqlpo.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

7
lib/adodb/drivers/adodb-mysqlt.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.
@ -130,11 +130,6 @@ class ADORecordSet_mysqlt extends ADORecordSet_mysql{
class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
function __construct($queryID,$mode=false)
{
parent::__construct($queryID,$mode);
}
function MoveNext()
{
return adodb_movenext($this);

2
lib/adodb/drivers/adodb-netezza.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community

2
lib/adodb/drivers/adodb-oci8.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-2016
@copyright (c) 2000-2013 John Lim. All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community

2
lib/adodb/drivers/adodb-oci805.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-oci8po.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-oci8quercus.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-odbc.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-odbc_db2.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-odbc_mssql.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-odbc_oracle.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-odbtp.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-odbtp_unicode.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-oracle.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-pdo.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community

2
lib/adodb/drivers/adodb-pdo_mssql.inc.php
View File

@ -2,7 +2,7 @@
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-pdo_mysql.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-pdo_oci.inc.php
View File

@ -2,7 +2,7 @@
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-pdo_pgsql.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-pdo_sqlite.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-postgres.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-postgres64.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-postgres7.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-postgres8.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-postgres9.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-proxy.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-sapdb.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-sqlanywhere.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-2016
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
reserved.

2
lib/adodb/drivers/adodb-sqlite.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-sqlite3.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-sqlitepo.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-sybase.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-sybase_ase.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/drivers/adodb-vfp.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/perf/perf-db2.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/perf/perf-informix.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/perf/perf-mssql.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/perf/perf-mssqlnative.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/perf/perf-mysql.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/perf/perf-oci8.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/perf/perf-postgres.inc.php
View File

@ -1,7 +1,7 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/adodb/pivottable.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

6
lib/adodb/readme_moodle.txt
View File

@ -8,6 +8,7 @@ Removed:
* contrib/
* cute_icons_for_site/
* docs/
* nbproject/
* pear/
* replicate/
* scripts/
@ -24,8 +25,7 @@ Added:
Our changes:
* Removed random seed initialization from lib/adodb/adodb.inc.php:216 (see 038f546 and MDL-41198).
* MDL-52286 fixed usage of /e in preg_replace, incorrect constructor in ADORecordSet_ext_mysqlt
and ADORecordSet_mysqli::_close(), added muting erros in ADORecordSet::__destruct().
* MDL-52286 Added muting erros in ADORecordSet::__destruct().
Check if fixed upstream during the next upgrade and remove this note.
skodak, iarenaza, moodler, stronk7
skodak, iarenaza, moodler, stronk7, abgreeve

2
lib/adodb/rsfilter.inc.php
View File

@ -1,6 +1,6 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

2
lib/adodb/toexport.inc.php
View File

@ -1,7 +1,7 @@
<?php
/**
* @version v5.20.1 06-Dec-2015
* @version v5.20.3 01-Jan-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.

2
lib/adodb/tohtml.inc.php
View File

@ -1,6 +1,6 @@
<?php
/*
@version v5.20.1 06-Dec-2015
@version v5.20.3 01-Jan-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.

2
lib/thirdpartylibs.xml
View File

@ -4,7 +4,7 @@
<location>adodb</location>
<name>AdoDB</name>
<license>BSD/GPL</license>
<version>5.20.1</version>
<version>5.20.3</version>
<licenseversion>2.1+</licenseversion>
</library>
<library>