Fixes jdorn#81: Pivot report type is not formatting the SQL correctly

hellifiknow · Sep 5, 2013 · 7c12347 · 7c12347
1 parent fa73568
commit 7c12347
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/lib/adodb/pivottable.inc.php b/lib/adodb/pivottable.inc.php
@@ -24,10 +24,8 @@
  *
  * @returns			Sql generated
  */
-
- function PivotTableSQL(&$db, $tables, $rowfields, $colfield, $where = false,
-                        $aggfield = false, $sumlabel = "Sum {}", $aggfn = "SUM", $includeaggfield = true, $showcount = true)
- {
+function PivotTableSQL(&$db, $tables, $rowfields, $colfield, $where = false,
+                        $aggfield = false, $sumlabel = "Sum {}", $aggfn = "SUM", $includeaggfield = true, $showcount = true) {
 	if ($aggfield) {
         $hidecnt = true;
     } else {
@@ -42,7 +40,7 @@ function PivotTableSQL(&$db, $tables, $rowfields, $colfield, $where = false,
 
  	if ($where) $where = "\nWHERE $where";
 	if (!is_array($colfield)) $colarr = $db->GetCol("select distinct $colfield from $tables $where order by 1");
-	if (!$aggfield) $hidecnt = false;
+	$hidecnt = $aggfield ? true : false;
 
 	$sel = "$rowfields, ";
 	if (is_array($colfield)) {
@@ -86,7 +84,7 @@ function PivotTableSQL(&$db, $tables, $rowfields, $colfield, $where = false,
 	if ($includeaggfield && ($aggfield && $aggfield != '1')) {
 		$agg = "$aggfn($aggfield)";
         if (strstr($sumlabel, '{}')) {
-            $sumlabel = trim(strstr($sumlabel, '{}', true)).' '.trim($aggfield).'", ';
+            $sumlabel = trim($sumlabel, ' \t\n\r\0\x0B{}').' '.trim($aggfield);
         }
         $sel .= "\n\t$agg AS \"$sumlabel\", ";
 	}
@@ -103,4 +101,4 @@ function PivotTableSQL(&$db, $tables, $rowfields, $colfield, $where = false,
 	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
 
 	return $sql;
- }
+}