X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb_pager.inc;h=819b4757f5c7e3381b749f9bc3d7073b8ea187ec;hb=0917891be384286611592f13872cc9437826ce09;hp=613d2921e3477d8f1024a65e382421741d25533e;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 613d2921..819b4757 100644
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 //
 //	Controler part of database table pager with column sort.
@@ -263,10 +263,10 @@ class db_pager {
 		}
 
 		$sql = "$select FROM $from $where";
-		if($group) $sql.= " GROUP BY $group";
+		if ($group) $sql.= " GROUP BY $group";
 	    $ord = array();
 
-	    foreach( $this->columns as $col) {
+	    foreach ($this->columns as $col) {
 	       	if (isset($col['ord'])) {
 	        	if ( $col['ord'] != '' && isset($col['name'])) {
 		    	    $ord[] = $col['name'] .' '. $col['ord'];
@@ -294,6 +294,8 @@ class db_pager {
 	//
 	function _init() 
 	{
+		global $go_debug;
+		
 	    if ($this->ready == false ) {
 			$sql = $this->_sql_gen(true);
 			$result = db_query($sql, 'Error reading record set');
@@ -301,7 +303,20 @@ class db_pager {
 				return false;
 			$row = db_fetch_row($result);
 			$this->rec_count = $row[0];
-	  		$this->max_page = ceil($this->rec_count/$this->page_len);
+	  		$this->max_page = $this->page_len ?
+				ceil($this->rec_count/$this->page_len) : 0;
+		
+			if ($go_debug) { // FIX - need column name parsing, but for now:
+				// check if field names are set explicite in col def
+				// for all initially ordered columns
+			    foreach ($this->columns as $col) {
+		    	   	if (isset($col['ord']) && $col['ord'] != '' 
+						&&  !isset($col['name'])) {
+							display_warning("Result field names must be set
+								for all intially ordered db_pager columns.");
+			    	}
+				}
+	    	}
 	  		$this->set_page(1);
 	  		$this->ready = true;
 	    }