Revert changes since Standardized file headers merge

The conflicts resolution applied when merging the Standardized file
headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously
messed up, actually overwriting a number of changes in the master
branch.

Rather than trying to go and fix things one by one which has a high risk
of messing things further, it's easier to redo the merge from a clean
slate, so this commit reverts the following:

- "Merge branch 'hotfix/5.21' Standardized file headers",
  e9dcce3df24912ad869d0193f0b419f2309101fc
- "Merge tag 'v5.21.1'",
  5f437df3104159d5d659f60e31bef8d33c34995f
- "Reset version to 5.22.0-dev"
  af9234a525c3255af051a330164486d73be4c63a
- "Fix incorrect resolution of merge conflicts"
  a6733f61b0165b366c8d2c70d9af82edc3881951.
- "Fix syntax error in toexport.inc.php"
  20b01e83cb61b6b2460f64c7d1277c5f4cc28574.

Fixes #751

2 files changed, 27 insertions, 48 deletions

diff --git a/pear/Auth/Container/ADOdb.php b/pear/Auth/Container/ADOdb.php
index 807da9d7..75515b6d 100644
--- a/pear/Auth/Container/ADOdb.php
+++ b/pear/Auth/Container/ADOdb.php
@@ -1,36 +1,36 @@
 <?php
-/**
- * Storage driver for fetching login data from a database using ADOdb-PHP.
- *
- * This storage driver can use all databases which are supported by the ADBdb
- * abstraction layer to fetch login data.
- * NOTE: The ADOdb directory MUST be in your PHP include_path!
- *
- * 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 Martin Jansen <mj@php.net>
- * @author Richard Tango-Lowy <richtl@arscognita.com>
- */
+/*
+@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. See License.txt.
+  Set tabs to 4 for best viewing.
+
+  Latest version is available at https://adodb.org/
+
+	Original Authors: Martin Jansen <mj#php.net>
+	Richard Tango-Lowy <richtl#arscognita.com>
+*/
 
 require_once 'Auth/Container.php';
 require_once 'adodb.inc.php';
 require_once 'adodb-pear.inc.php';
 require_once 'adodb-errorpear.inc.php';
 
-
+/**
+ * Storage driver for fetching login data from a database using ADOdb-PHP.
+ *
+ * This storage driver can use all databases which are supported
+ * by the ADBdb DB abstraction layer to fetch login data.
+ * See https://adodb.org/ for information on ADOdb.
+ * NOTE: The ADOdb directory MUST be in your PHP include_path!
+ *
+ * @author   Richard Tango-Lowy <richtl@arscognita.com>
+ * @package  Auth
+ * @version  $Revision: 1.3 $
+ */
 class Auth_Container_ADOdb extends Auth_Container
 {
 
diff --git a/pear/auth_adodb_example.php b/pear/auth_adodb_example.php
index 77af9395..3b7cf5e8 100644
--- a/pear/auth_adodb_example.php
+++ b/pear/auth_adodb_example.php
@@ -1,26 +1,5 @@
 <?php
-/**
- * PEAR Auth example
- *
- * NOTE: The ADOdb and PEAR directories MUST be in your PHP include_path!
- *
- * 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
- */
-//
+// NOTE: The ADOdb and PEAR directories MUST be in your PHP include_path!
 require_once "Auth/Auth.php";
 
 function loginFunction() {