Merge branch 'hotfix/5.21' Standardized file headers

# Conflicts:
#	adodb-active-record.inc.php
#	adodb-active-recordx.inc.php
#	adodb-csvlib.inc.php
#	adodb-datadict.inc.php
#	adodb-error.inc.php
#	adodb-errorhandler.inc.php
#	adodb-errorpear.inc.php
#	adodb-exceptions.inc.php
#	adodb-iterator.inc.php
#	adodb-loadbalancer.inc.php
#	adodb-memcache.lib.inc.php
#	adodb-pager.inc.php
#	adodb-pear.inc.php
#	adodb-perf.inc.php
#	adodb-php4.inc.php
#	adodb-time.inc.php
#	adodb.inc.php
#	datadict/datadict-access.inc.php
#	datadict/datadict-db2.inc.php
#	datadict/datadict-firebird.inc.php
#	datadict/datadict-generic.inc.php
#	datadict/datadict-ibase.inc.php
#	datadict/datadict-informix.inc.php
#	datadict/datadict-mssql.inc.php
#	datadict/datadict-mssqlnative.inc.php
#	datadict/datadict-mysql.inc.php
#	datadict/datadict-oci8.inc.php
#	datadict/datadict-postgres.inc.php
#	datadict/datadict-sapdb.inc.php
#	datadict/datadict-sqlite.inc.php
#	datadict/datadict-sybase.inc.php
#	drivers/adodb-access.inc.php
#	drivers/adodb-ado.inc.php
#	drivers/adodb-ado5.inc.php
#	drivers/adodb-ado_access.inc.php
#	drivers/adodb-ado_mssql.inc.php
#	drivers/adodb-borland_ibase.inc.php
#	drivers/adodb-csv.inc.php
#	drivers/adodb-db2.inc.php
#	drivers/adodb-db2oci.inc.php
#	drivers/adodb-db2ora.inc.php
#	drivers/adodb-fbsql.inc.php
#	drivers/adodb-firebird.inc.php
#	drivers/adodb-ibase.inc.php
#	drivers/adodb-informix.inc.php
#	drivers/adodb-informix72.inc.php
#	drivers/adodb-ldap.inc.php
#	drivers/adodb-mssql.inc.php
#	drivers/adodb-mssqlnative.inc.php
#	drivers/adodb-mssqlpo.inc.php
#	drivers/adodb-mysql.inc.php
#	drivers/adodb-mysqli.inc.php
#	drivers/adodb-mysqlpo.inc.php
#	drivers/adodb-mysqlt.inc.php
#	drivers/adodb-netezza.inc.php
#	drivers/adodb-oci8.inc.php
#	drivers/adodb-oci805.inc.php
#	drivers/adodb-oci8po.inc.php
#	drivers/adodb-oci8quercus.inc.php
#	drivers/adodb-odbc.inc.php
#	drivers/adodb-odbc_db2.inc.php
#	drivers/adodb-odbc_mssql.inc.php
#	drivers/adodb-odbc_oracle.inc.php
#	drivers/adodb-odbtp.inc.php
#	drivers/adodb-odbtp_unicode.inc.php
#	drivers/adodb-oracle.inc.php
#	drivers/adodb-pdo.inc.php
#	drivers/adodb-pdo_dblib.inc.php
#	drivers/adodb-pdo_firebird.inc.php
#	drivers/adodb-pdo_mssql.inc.php
#	drivers/adodb-pdo_mysql.inc.php
#	drivers/adodb-pdo_oci.inc.php
#	drivers/adodb-pdo_pgsql.inc.php
#	drivers/adodb-pdo_sqlite.inc.php
#	drivers/adodb-postgres.inc.php
#	drivers/adodb-postgres64.inc.php
#	drivers/adodb-postgres7.inc.php
#	drivers/adodb-postgres8.inc.php
#	drivers/adodb-postgres9.inc.php
#	drivers/adodb-proxy.inc.php
#	drivers/adodb-sapdb.inc.php
#	drivers/adodb-sqlanywhere.inc.php
#	drivers/adodb-sqlite3.inc.php
#	drivers/adodb-sqlitepo.inc.php
#	drivers/adodb-sybase.inc.php
#	drivers/adodb-sybase_ase.inc.php
#	drivers/adodb-text.inc.php
#	drivers/adodb-vfp.inc.php
#	pear/Auth/Container/ADOdb.php
#	perf/perf-db2.inc.php
#	perf/perf-informix.inc.php
#	perf/perf-mssql.inc.php
#	perf/perf-mssqlnative.inc.php
#	perf/perf-mysql.inc.php
#	perf/perf-oci8.inc.php
#	perf/perf-postgres.inc.php
#	pivottable.inc.php
#	rsfilter.inc.php
#	server.php
#	session/adodb-compress-bzip2.php
#	session/adodb-compress-gzip.php
#	session/adodb-cryptsession.php
#	session/adodb-cryptsession2.php
#	session/adodb-encrypt-mcrypt.php
#	session/adodb-encrypt-md5.php
#	session/adodb-encrypt-secret.php
#	session/adodb-session-clob.php
#	session/adodb-session-clob2.php
#	session/adodb-session.php
#	session/adodb-session2.php
#	session/old/adodb-cryptsession.php
#	session/old/adodb-session-clob.php
#	session/old/adodb-session.php
#	tests/benchmark.php
#	tests/client.php
#	tests/test-datadict.php
#	tests/test-php5.php
#	tests/test.php
#	tests/test3.php
#	tests/test4.php
#	tests/test5.php
#	tests/testcache.php
#	tests/testdatabases.inc.php
#	tests/testmssql.php
#	tests/testoci8.php
#	tests/testoci8cursor.php
#	tests/testpaging.php
#	tests/testpear.php
#	toexport.inc.php
#	tohtml.inc.php

17 files changed, 358 insertions, 265 deletions

diff --git a/session/adodb-compress-bzip2.php b/session/adodb-compress-bzip2.php
index 269fd16c..17ad99fb 100644
--- a/session/adodb-compress-bzip2.php
+++ b/session/adodb-compress-bzip2.php
@@ -1,24 +1,32 @@
 <?php
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ross Smith <adodb@netebb.com>
+ */
 
 if (!function_exists('bzcompress')) {
 	trigger_error('bzip2 functions are not available', E_USER_ERROR);
 	return 0;
 }
 
-/*
-*/
+/**
+ */
 class ADODB_Compress_Bzip2 {
 	/**
 	 */
diff --git a/session/adodb-compress-gzip.php b/session/adodb-compress-gzip.php
index a5673031..bbaf6c63 100644
--- a/session/adodb-compress-gzip.php
+++ b/session/adodb-compress-gzip.php
@@ -1,17 +1,23 @@
 <?php
-
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!function_exists('gzcompress')) {
 	trigger_error('gzip functions are not available', E_USER_ERROR);
diff --git a/session/adodb-cryptsession.php b/session/adodb-cryptsession.php
index 47919578..08805321 100644
--- a/session/adodb-cryptsession.php
+++ b/session/adodb-cryptsession.php
@@ -1,22 +1,25 @@
 <?php
-
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated This file is provided for backwards compatibility purposes
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session.php';
diff --git a/session/adodb-cryptsession2.php b/session/adodb-cryptsession2.php
index 14fcda29..f3e95a13 100644
--- a/session/adodb-cryptsession2.php
+++ b/session/adodb-cryptsession2.php
@@ -1,22 +1,25 @@
 <?php
-
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated This file is provided for backwards compatibility purposes
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session2.php';
diff --git a/session/adodb-encrypt-mcrypt.php b/session/adodb-encrypt-mcrypt.php
index a7e3b7eb..bec9ff2c 100644
--- a/session/adodb-encrypt-mcrypt.php
+++ b/session/adodb-encrypt-mcrypt.php
@@ -1,17 +1,23 @@
 <?php
-
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!function_exists('mcrypt_encrypt')) {
 	trigger_error('Mcrypt functions are not available', E_USER_ERROR);
diff --git a/session/adodb-encrypt-md5.php b/session/adodb-encrypt-md5.php
index 1f9885a9..7ae9b56e 100644
--- a/session/adodb-encrypt-md5.php
+++ b/session/adodb-encrypt-md5.php
@@ -1,16 +1,23 @@
 <?php
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_SESSION')) die();
diff --git a/session/adodb-encrypt-secret.php b/session/adodb-encrypt-secret.php
index e49ff434..2c29f7a0 100644
--- a/session/adodb-encrypt-secret.php
+++ b/session/adodb-encrypt-secret.php
@@ -1,16 +1,23 @@
 <?php
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 @define('HORDE_BASE', dirname(dirname(dirname(__FILE__))) . '/horde');
 
@@ -22,14 +29,6 @@ if (!is_dir(HORDE_BASE)) {
 include_once HORDE_BASE . '/lib/Horde.php';
 include_once HORDE_BASE . '/lib/Secret.php';
 
-/**
-
-NOTE: On Windows 2000 SP4 with PHP 4.3.1, MCrypt 2.4.x, and Apache 1.3.28,
-the session didn't work properly.
-
-This may be resolved with 4.3.3.
-
- */
 class ADODB_Encrypt_Secret {
 	/**
 	 */
diff --git a/session/adodb-encrypt-sha1.php b/session/adodb-encrypt-sha1.php
index 70655153..0aa38c83 100644
--- a/session/adodb-encrypt-sha1.php
+++ b/session/adodb-encrypt-sha1.php
@@ -1,13 +1,27 @@
 <?php
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 if (!defined('ADODB_SESSION')) die();
 
 include_once ADODB_SESSION . '/crypt.inc.php';
 
-
-/**
-
- */
-
 class ADODB_Encrypt_SHA1 {
 
 	function write($data, $key)
diff --git a/session/adodb-session-clob.php b/session/adodb-session-clob.php
index 67ce4449..8c5e9fb3 100644
--- a/session/adodb-session-clob.php
+++ b/session/adodb-session-clob.php
@@ -1,22 +1,25 @@
 <?php
-
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated This file is provided for backwards compatibility purposes
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session.php';
diff --git a/session/adodb-session-clob2.php b/session/adodb-session-clob2.php
index 1893f92b..babfa420 100644
--- a/session/adodb-session-clob2.php
+++ b/session/adodb-session-clob2.php
@@ -1,22 +1,26 @@
 <?php
-
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated This file is provided for backwards compatibility purposes
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ross Smith <adodb@netebb.com>
+ */
 
 if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session2.php';
diff --git a/session/adodb-session.php b/session/adodb-session.php
index 10b006cc..9e716232 100644
--- a/session/adodb-session.php
+++ b/session/adodb-session.php
@@ -1,16 +1,24 @@
 <?php
-
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ross Smith <adodb@netebb.com>
+ */
 
 /*
 	You may want to rename the 'data' field to 'session_data' as
diff --git a/session/adodb-session2.php b/session/adodb-session2.php
index 1ddc474e..bf64b416 100644
--- a/session/adodb-session2.php
+++ b/session/adodb-session2.php
@@ -1,61 +1,23 @@
 <?php
-
-
-/*
-@version   v5.22.0-dev  Unreleased
-@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 (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-
-*/
-
-/*
-
-CREATE Table SCripts
-
-Oracle
-======
-
-CREATE TABLE SESSIONS2
-(
-  SESSKEY    VARCHAR2(48 BYTE)                  NOT NULL,
-  EXPIRY     DATE                               NOT NULL,
-  EXPIREREF  VARCHAR2(200 BYTE),
-  CREATED    DATE                               NOT NULL,
-  MODIFIED   DATE                               NOT NULL,
-  SESSDATA   CLOB,
-  PRIMARY KEY(SESSKEY)
-);
-
-
-CREATE INDEX SESS2_EXPIRY ON SESSIONS2(EXPIRY);
-CREATE UNIQUE INDEX SESS2_PK ON SESSIONS2(SESSKEY);
-CREATE INDEX SESS2_EXP_REF ON SESSIONS2(EXPIREREF);
-
-
-
- MySQL
- =====
-
-CREATE TABLE sessions2(
-	sesskey VARCHAR( 64 ) NOT NULL DEFAULT '',
-	expiry TIMESTAMP NOT NULL ,
-	expireref VARCHAR( 250 ) DEFAULT '',
-	created TIMESTAMP NOT NULL ,
-	modified TIMESTAMP NOT NULL ,
-	sessdata LONGTEXT DEFAULT '',
-	PRIMARY KEY ( sesskey ) ,
-	INDEX sess2_expiry( expiry ),
-	INDEX sess2_expireref( expireref )
-)
-
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!defined('_ADODB_LAYER')) {
 	require realpath(dirname(__FILE__) . '/../adodb.inc.php');
diff --git a/session/crypt.inc.php b/session/crypt.inc.php
index 94aa2831..82121e39 100644
--- a/session/crypt.inc.php
+++ b/session/crypt.inc.php
@@ -1,5 +1,25 @@
 <?php
-//	 Session Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ari Kuorikoski <ari.kuorikoski@finebyte.com>
+ */
+
 class MD5Crypt{
 		function keyED($txt,$encrypt_key)
 		{
diff --git a/session/old/adodb-cryptsession.php b/session/old/adodb-cryptsession.php
index 33305580..6616de3d 100644
--- a/session/old/adodb-cryptsession.php
+++ b/session/old/adodb-cryptsession.php
@@ -1,22 +1,29 @@
 <?php
+/**
+ * ADOdb Session Management
+ *
+ * This file provides PHP4 session management using the ADODB database
+ * wrapper library.
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 /*
-@version   v5.22.0-dev  Unreleased
-@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.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	Made table name configurable - by David Johnson djohnson@inpro.net
-	Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
-
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-  ======================================================================
-
- This file provides PHP4 session management using the ADODB database
-wrapper library.
-
  Example
  =======
 
diff --git a/session/old/adodb-session-clob.php b/session/old/adodb-session-clob.php
index ef90205e..864fdfd7 100644
--- a/session/old/adodb-session-clob.php
+++ b/session/old/adodb-session-clob.php
@@ -1,19 +1,29 @@
 <?php
+/**
+ * ADOdb Session Management
+ *
+ * This file provides PHP4 session management using the ADODB database
+ * wrapper library.
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 /*
-  @version   v5.22.0-dev  Unreleased
-  @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.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-  ======================================================================
-
- This file provides PHP4 session management using the ADODB database
- wrapper library, using Oracle CLOB's to store data. Contributed by achim.gosse@ddd.de.
-
  Example
  =======
 
diff --git a/session/old/adodb-session.php b/session/old/adodb-session.php
index 5c63f818..5fd43abc 100644
--- a/session/old/adodb-session.php
+++ b/session/old/adodb-session.php
@@ -1,19 +1,30 @@
 <?php
-/*
-@version   v5.22.0-dev  Unreleased
-@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.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-  ======================================================================
-
- This file provides PHP4 session management using the ADODB database
-wrapper library.
+/**
+ * ADOdb Session Management
+ *
+ * This file provides PHP4 session management using the ADODB database
+ * wrapper library.
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
+/*
  Example
  =======
 
diff --git a/session/old/crypt.inc.php b/session/old/crypt.inc.php
index 1ce75feb..089e24a0 100644
--- a/session/old/crypt.inc.php
+++ b/session/old/crypt.inc.php
@@ -1,5 +1,27 @@
 <?php
-//	 Session Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ari Kuorikoski <ari.kuorikoski@finebyte.com>
+ */
+
 class MD5Crypt{
 		function keyED($txt,$encrypt_key)
 		{