Merge branch 'hotfix/5.20' (v5.20.13)

# Conflicts: # adodb-time.inc.php # docs/changelog.md # drivers/adodb-mssql.inc.php # drivers/adodb-mssqlnative.inc.php # drivers/adodb-oci8po.inc.php
ADOdb · Aug 6, 2018 · ac34e71 · ac34e71
2 parents 980aa99 + 748c074
commit ac34e71
Show file tree

Hide file tree

Showing 76 changed files with 95 additions and 90 deletions.
diff --git a/adodb-active-record.inc.php b/adodb-active-record.inc.php
@@ -4,7 +4,7 @@
 @version   v5.21.0-dev  ??-???-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
+  Latest version is available at http://adodb.org/
 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

diff --git a/adodb-active-recordx.inc.php b/adodb-active-recordx.inc.php
@@ -4,7 +4,7 @@
 @version   v5.21.0-dev  ??-???-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
+  Latest version is available at http://adodb.org/
 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

diff --git a/adodb-csvlib.inc.php b/adodb-csvlib.inc.php
@@ -16,14 +16,10 @@
   the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Library for CSV serialization. This is used by the csv/proxy driver and is the
   CacheExecute() serialization format.
-
-  ==== NOTE ====
-  Format documented at http://php.weblogs.com/ADODB_CSV
-  ==============
 */
 
 	/**

diff --git a/adodb-errorhandler.inc.php b/adodb-errorhandler.inc.php
@@ -9,7 +9,7 @@
  *
  * Set tabs to 4 for best viewing.
  *
- * Latest version is available at http://php.weblogs.com
+ * Latest version is available at http://adodb.org/
  *
 */
 

diff --git a/adodb-errorpear.inc.php b/adodb-errorpear.inc.php
@@ -9,7 +9,7 @@
  *
  * Set tabs to 4 for best viewing.
  *
- * Latest version is available at http://php.weblogs.com
+ * Latest version is available at http://adodb.org/
  *
 */
 include_once('PEAR.php');

diff --git a/adodb-exceptions.inc.php b/adodb-exceptions.inc.php
@@ -10,7 +10,7 @@
  *
  * Set tabs to 4 for best viewing.
  *
- * Latest version is available at http://php.weblogs.com
+ * Latest version is available at http://adodb.org/
  *
  * Exception-handling code using PHP5 exceptions (try-catch-throw).
  */

diff --git a/adodb-lib.inc.php b/adodb-lib.inc.php
@@ -771,7 +771,7 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
 				if (preg_match('/\s(ORDER\s.*)/is', $whereClause[1], $discard));
 				else if (preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard));
 				else if (preg_match('/\s(FOR UPDATE.*)/is', $whereClause[1], $discard));
-				else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976
+				else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see https://sourceforge.net/p/adodb/bugs/37/
 			} else
 				$whereClause = array(false,false);
 

diff --git a/adodb-memcache.lib.inc.php b/adodb-memcache.lib.inc.php
@@ -19,7 +19,7 @@
   the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
 Usage:
 

diff --git a/adodb-perf.inc.php b/adodb-perf.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Library for basic performance monitoring and tuning.
 
@@ -226,7 +226,7 @@ class adodb_perf {
 	var $cliFormat = "%32s => %s \r\n";
 	var $sql1 = 'sql1';  // used for casting sql1 to text for mssql
 	var $explain = true;
-	var $helpurl = '<a href="http://adodb.sourceforge.net/docs-adodb.htm#logsql">LogSQL help</a>';
+	var $helpurl = '<a href="http://adodb.org/dokuwiki/doku.php?id=v5:performance:logsql">LogSQL help</a>';
 	var $createTableSQL = false;
 	var $maxLength = 2000;
 
@@ -721,7 +721,7 @@ function UI($pollsecs=5)
 
 	if  (empty($_GET['hidem']))
 	echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
-	<b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
+	<b><a href=http://adodb.org/dokuwiki/doku.php?id=v5:performance:performance_index>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
 	<a href=?do=stats><b>Performance Stats</b></a> &nbsp; <a href=?do=viewsql><b>View SQL</b></a>
 	 &nbsp; <a href=?do=tables><b>View Tables</b></a> &nbsp; <a href=?do=poll><b>Poll Stats</b></a>",
 	 $allowsql ? ' &nbsp; <a href=?do=dosql><b>Run SQL</b></a>' : '',

diff --git a/adodb-time.inc.php b/adodb-time.inc.php
@@ -1,7 +1,8 @@
 <?php
 /*
 ADOdb Date Library, part of the ADOdb abstraction library
-Download: http://adodb.sourceforge.net/#download
+
+Latest version is available at http://adodb.org/
 
 @version   v5.21.0-dev  ??-???-2016
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.

diff --git a/adodb.inc.php b/adodb.inc.php
@@ -2,7 +2,7 @@
 /*
  * Set tabs to 4 for best viewing.
  *
- * Latest version is available at http://adodb.sourceforge.net
+ * Latest version is available at http://adodb.org/
  *
  * This is the main include file for ADOdb.
  * Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
@@ -29,9 +29,6 @@ class library to hide the differences between the different database API's (enca
 	Informix, PostgreSQL, FrontBase, Interbase (Firebird and Borland variants), Foxpro, Access,
 	ADO, SAP DB, SQLite and ODBC. We have had successful reports of connecting to Progress and
 	other databases via ODBC.
-
-	Latest Download at http://adodb.sourceforge.net/
-
  */
 
 if (!defined('_ADODB_LAYER')) {

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -63,6 +63,17 @@ Older changelogs:
 - session: add 'httponly' flag to cookie. #190
 - xml: support table 'opt' attribute with mysqli. #267
 
+## 5.20.13 - 06-Aug-2018
+
+- core: Fix query execution failures with mismatched quotes. #420
+- ldap: Fix connections using URIs. #340
+- mssql: Fix Time field format, allowing autoExecute() to inserting time. #432
+- mssql: Fix Insert_ID returning null with table name in brackets. #313
+- mssql: Fix count wrapper. #423
+- oci8: Fix prepared statements failure. #318
+- oci8po: Fix incorrect query parameter replacements. #370
+- pdo: fix PHP notice due to uninitialized variable. #437
+
 ## 5.20.12 - 30-Mar-2018
 
 - adodb: PHP 7.2 compatibility
@@ -419,7 +430,7 @@ other database types as well; all drivers derived from the above are also impact
 - BeginTrans/CommitTrans/RollbackTrans return true/false correctly on success/failure now for mssql, odbc, oci8, mysqlt, mysqli, postgres, pdo.
 - Replace() now quotes all non-null values including numeric ones.
 - Postgresql qstr() now returns booleans as *true* and *false* without quotes.
-- MetaForeignKeys in mysql and mysqli drivers had this problem: A table can have two foreign keys pointing to the same column in the same table. The original code will incorrectly report only the last column. Fixed. https://sourceforge.net/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
+- MetaForeignKeys in mysql and mysqli drivers had this problem: A table can have two foreign keys pointing to the same column in the same table. The original code will incorrectly report only the last column. Fixed. https://sourceforge.net/p/adodb/bugs/100/
 - Passing in full ado connection string in $argHostname with ado drivers was failing in adodb5 due to bug. Fixed.
 - Fixed memcachelib flushcache and flushall bugs. Also fixed possible timeCreated = 0 problem in readcache. (Also in adodb 4.992). Thanks AlexB_UK (alexbarnes#hotmail.com).
 - Fixed a notice in adodb-sessions2.inc.php, in _conn(). Thx bober m.derlukiewicz#rocktech.remove_me.pl;

diff --git a/docs/changelog_v2.x.md b/docs/changelog_v2.x.md
@@ -377,7 +377,7 @@ $conn->Connect($dsn);
 ## 1.10 - 19 May 2001
 
 - Added caching. CacheExecute() and CacheSelectLimit().
-- Added csv driver. See [http://php.weblogs.com/ADODB_csv](http://php.weblogs.com/adodb_csv).
+- Added csv driver.
 - Fixed SelectLimit(), SELECT TOP not working under certain circumstances.
 - Added better Frontbase support of MetaTypes() by Frank M. Kromann.
 

diff --git a/docs/changelog_v4.x.md b/docs/changelog_v4.x.md
@@ -214,7 +214,7 @@ rs2html($rs2);
 - Removed `$off = $fieldOffset - 1` line in db2 driver, FetchField(). Tx Larry Menard.
 - Added support for PHP5 objects as Execute() bind parameters using `__toString` (eg. Simple-XML). Thx Carl-Christian Salvesen.
 - Rounding in tohtml.inc.php did not work properly. Fixed.
-- MetaIndexes in postgres fails when fields are deleted then added in again because the attnum has gaps in it. See http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976. Fixed.
+- MetaIndexes in postgres fails when fields are deleted then added in again because the attnum has gaps in it. See https://sourceforge.net/p/adodb/bugs/45/. Fixed.
 - MetaForeignkeys in mysql and mysqli did not work when fetchMode==ADODB_FETCH_ASSOC used. Fixed.
 - Reference error in AutoExecute() fixed.
 - Added macaddr postgres type to MetaType. Maps to 'C'.

diff --git a/drivers/adodb-access.inc.php b/drivers/adodb-access.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence. See License.txt.
   Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Microsoft Access data driver. Requires ODBC. Works only on MS Windows.
 */

diff --git a/drivers/adodb-ado.inc.php b/drivers/adodb-ado.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence.
 Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
 	Microsoft ADO data driver. Requires ADO. Works only on MS Windows.
 */

diff --git a/drivers/adodb-ado5.inc.php b/drivers/adodb-ado5.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence.
 Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
 	Microsoft ADO data driver. Requires ADO. Works only on MS Windows. PHP5 compat version.
 */

diff --git a/drivers/adodb-ado_access.inc.php b/drivers/adodb-ado_access.inc.php
@@ -8,7 +8,7 @@
 the BSD license will take precedence. See License.txt.
 Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
 	Microsoft Access ADO data driver. Requires ADO and ODBC. Works only on MS Windows.
 */

diff --git a/drivers/adodb-ado_mssql.inc.php b/drivers/adodb-ado_mssql.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence.
 Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client.
   Works only on MS Windows.

diff --git a/drivers/adodb-borland_ibase.inc.php b/drivers/adodb-borland_ibase.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence.
 Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Support Borland Interbase 6.5 and later
 

diff --git a/drivers/adodb-db2oci.inc.php b/drivers/adodb-db2oci.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence.
 Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
 */

diff --git a/drivers/adodb-db2ora.inc.php b/drivers/adodb-db2ora.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence.
 Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
 */

diff --git a/drivers/adodb-firebird.inc.php b/drivers/adodb-firebird.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence.
 Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   firebird data driver. Requires firebird client. Works on Windows and Unix.
 

diff --git a/drivers/adodb-ibase.inc.php b/drivers/adodb-ibase.inc.php
@@ -7,7 +7,7 @@
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Interbase data driver. Requires interbase client. Works on Windows and Unix.
 

diff --git a/drivers/adodb-informix.inc.php b/drivers/adodb-informix.inc.php
@@ -9,7 +9,7 @@
 *
 * Set tabs to 4 for best viewing.
 *
-* Latest version is available at http://php.weblogs.com
+* Latest version is available at http://adodb.org/
 *
 * Informix 9 driver that supports SELECT FIRST
 *

diff --git a/drivers/adodb-informix72.inc.php b/drivers/adodb-informix72.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence.
   Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Informix port by Mitchell T. Young (mitch@youngfamily.org)
 

diff --git a/drivers/adodb-mssql.inc.php b/drivers/adodb-mssql.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence.
 Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Native mssql driver. Requires mssql client. Works on Windows.
   To configure for Unix, see

diff --git a/drivers/adodb-mssql_n.inc.php b/drivers/adodb-mssql_n.inc.php
@@ -7,7 +7,8 @@
 // NOTICE OF COPYRIGHT                                                   //
 //                                                                       //
 // ADOdb  - Database Abstraction Library for PHP                         //
-//          http://adodb.sourceforge.net/                                //
+//                                                                       //
+// Latest version is available at http://adodb.org                       //
 //                                                                       //
 // Copyright (c) 2000-2014 John Lim (jlim\@natsoft.com.my)               //
 //          All rights reserved.                                         //

diff --git a/drivers/adodb-mssqlnative.inc.php b/drivers/adodb-mssqlnative.inc.php
@@ -8,7 +8,7 @@
   the BSD license will take precedence.
 Set tabs to 4 for best viewing.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Native mssql driver. Requires mssql client. Works on Windows.
     http://www.microsoft.com/sql/technologies/php/default.mspx
@@ -614,7 +614,6 @@ function _query($sql,$inputarr=false)
 		$insert = false;
 		// handle native driver flaw for retrieving the last insert ID
 		if(preg_match('/^\W*insert[\s\w()[\]",.]+values\s*\((?:[^;\']|\'\'|(?:(?:\'\')*\'[^\']+\'(?:\'\')*))*;?$/i', $sql)) {
-
 			$insert = true;
 			$sql .= '; '.$this->identitySQL; // select scope_identity()
 		}

diff --git a/drivers/adodb-mssqlpo.inc.php b/drivers/adodb-mssqlpo.inc.php
@@ -9,7 +9,7 @@
 *
 * Set tabs to 4 for best viewing.
 *
-* Latest version is available at http://php.weblogs.com
+* Latest version is available at http://adodb.org/
 *
 *  Portable MSSQL Driver that supports || instead of +
 *

diff --git a/drivers/adodb-mysql.inc.php b/drivers/adodb-mysql.inc.php
@@ -705,7 +705,7 @@ function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative =
 				$ref_table = strtoupper($ref_table);
 			}
 
-			// see https://sourceforge.net/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
+			// see https://sourceforge.net/p/adodb/bugs/100/
 			if (!isset($foreign_keys[$ref_table])) {
 				$foreign_keys[$ref_table] = array();
 			}

diff --git a/drivers/adodb-mysqli.inc.php b/drivers/adodb-mysqli.inc.php
@@ -643,7 +643,7 @@ function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative =
 				$ref_table = strtoupper($ref_table);
 			}
 
-			// see https://sourceforge.net/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
+			// see https://sourceforge.net/p/adodb/bugs/100/
 			if (!isset($foreign_keys[$ref_table])) {
 				$foreign_keys[$ref_table] = array();
 			}

diff --git a/drivers/adodb-oci8.inc.php b/drivers/adodb-oci8.inc.php
@@ -9,7 +9,7 @@
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Code contributed by George Fourlanos <fou@infomap.gr>
 

diff --git a/drivers/adodb-oci805.inc.php b/drivers/adodb-oci805.inc.php
@@ -9,7 +9,7 @@
  *
  * Set tabs to 4 for best viewing.
  *
- * Latest version is available at http://php.weblogs.com
+ * Latest version is available at http://adodb.org/
  *
  * Oracle 8.0.5 driver
 */

diff --git a/drivers/adodb-oci8po.inc.php b/drivers/adodb-oci8po.inc.php
@@ -7,7 +7,7 @@
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Portable version of oci8 driver, to make it more similar to other database drivers.
   The main differences are
@@ -94,7 +94,7 @@ function _query($sql,$inputarr=false)
 	* to numerous tweaks, as more extreme test cases have appeared. This
 	* is now done this like this to help maintainability and avoid the 
 	* need to rely on regexp experienced maintainers
-   	*
+	*
 	* @param	string		$sql		The sql statement
 	* @param	string[]	$inputarr	The bind array
 	*

diff --git a/drivers/adodb-oci8quercus.inc.php b/drivers/adodb-oci8quercus.inc.php
@@ -7,7 +7,7 @@
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
 
-  Latest version is available at http://adodb.sourceforge.net
+  Latest version is available at http://adodb.org/
 
   Portable version of oci8 driver, to make it more similar to other database drivers.
   The main differences are