Redo Merge branch 'hotfix/5.21' Standardized file headers

Try to do it right this time...

# Conflicts:
#	adodb-memcache.lib.inc.php

Fixes #751

1 files changed, 22 insertions, 12 deletions

diff --git a/adodb-lib.inc.php b/adodb-lib.inc.php
index 35e9eca5..c1d935ab 100644
--- a/adodb-lib.inc.php
+++ b/adodb-lib.inc.php
@@ -1,22 +1,32 @@
 <?php
+/**
+ * Helper functions.
+ *
+ * Less commonly used functions are placed here to reduce size of adodb.inc.php.
+ *
+ * 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_DIR')) die();
 
 global $ADODB_INCLUDED_LIB;
 $ADODB_INCLUDED_LIB = 1;
 
-/*
-  @version   v5.21.1-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. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Less commonly used functions are placed here to reduce size of adodb.inc.php.
-*/
-
 function adodb_strip_order_by($sql)
 {
 	$rez = preg_match_all('/(\sORDER\s+BY\s(?:[^)](?!LIMIT))*)/is', $sql, $arr);