diff options
Diffstat (limited to 'pivottable.inc.php')
| -rw-r--r-- | pivottable.inc.php | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/pivottable.inc.php b/pivottable.inc.php index ebb7a02d..14d8eebe 100644 --- a/pivottable.inc.php +++ b/pivottable.inc.php @@ -1,15 +1,23 @@ <?php /** - * @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. + * PivotTable. * - * Set tabs to 4 for best viewing. + * 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 + */ /* * Concept from daniel.lucazeau@ajornet.com. @@ -29,8 +37,7 @@ * * @returns Sql generated */ - - function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false, +function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false, $aggfield = false,$sumlabel='Sum ',$aggfn ='SUM', $showcount = true) { if ($aggfield) $hidecnt = true; |