X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb_pager.inc;h=f9089e9ee5a0f2ba89f152762f0645f5dab020ad;hb=7e8df3a179c05c51085349e139aac9ce88b9378d;hp=48359f3cf510cb66b65ceffa5078c80e57a6414f;hpb=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 48359f3c..f9089e9e 100644
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -57,7 +57,12 @@ class db_pager {
 	var $key;	// key field name
 	
 	//  db_pager constructor
-	//  accepts $sql like 'SELECT ...[FROM ...][WHERE ...][GROUP ...][ORDER ...]'
+	//  accepts $sql query either as:
+	//  a. string in form 'SELECT field_list FROM table_joins [WHERE conditions [GROUP group_list [ORDER order_list]]]'
+	//		- if WHERE keyword is used in table_joins, WHERE conditions is obligatory
+	//  b. associative array using select, where, group and order keys ex :
+	//  	array('select' => 'SUM(quantity)', 'from' => TB_PREF."stock_moves", 'group' => 'location')
+	//
 	//	$name is base name for pager controls
 	function db_pager($sql, $name, $table = null, $page_len=0) 
 	{
@@ -68,14 +73,12 @@ class db_pager {
 	 	$this->set_sql($sql);
 	}
 	//
-	//	Parse base sql select query.
-	//	or use an associative array.
-	//  Usefull is the query can't be split correctly (using subquery for example).
-	//  The associative array shouldn't contain the keyword itself.
-	//  ex :
-	//  array('select' => 'SUM(quantity)', 'from' => TB_PREF."stock_moves", 'group' => 'location')
+	//	Parse base sql select query	or use an associative array.
+	//
 	function set_sql($sql)
 	{
+		global $SysPrefs;
+
 		if ($sql != $this->sql) {
 		    $this->sql = $sql;
 		    $this->ready = false;
@@ -88,29 +91,39 @@ class db_pager {
 				}
 				else {
 					// parse the query
-						$parts = preg_split('/\sORDER\s*BY\s/si', $sql, 2);
-					if(count($parts) == 2) {
-						$sql = $parts[0];
-						$this->order = $parts[1];
-					}
-						$parts = preg_split('/\sGROUP\s*BY\s/si', $sql, 2);
-					if(count($parts) == 2) {
-						$sql = $parts[0];
-						$this->group = $parts[1];
+					$parts = preg_split('/\sFROM\s/si', $sql, 2);
+					if (count($parts) == 2) {
+						$this->select = $parts[0];
+						$sql = $parts[1];
+					} else {
+						if ($SysPrefs->go_debug)
+							display_error("Invalid sql input for db_pager");
 					}
-						$parts = preg_split('/\sWHERE\s/si', $sql, 2);
-					if(count($parts) == 2) {
-						$sql = $parts[0];
-						$this->where = $parts[1];
-					}
-						$parts = preg_split('/\sFROM\s/si', $sql, 2);
+
+					$parts = preg_split('/\sWHERE(?!.*WHERE.*)\s/si', $sql, 2); // last occurence
 					if(count($parts) == 2) {
-						$sql = $parts[0];
-						$this->from = $parts[1];
+						$this->from = $parts[0];
+						$sql = $parts[1];
+
+						$parts = preg_split('/\sORDER\s*BY\s/si', $sql, 2);
+						if(count($parts) == 2) {
+							$sql = $parts[0];
+							$this->order = $parts[1];
+						}
+						$parts = preg_split('/\sGROUP\s*BY\s/si', $sql, 2);
+						if(count($parts) == 2) {
+							$sql = $parts[0];
+							$this->group = $parts[1];
+						}
+						$this->where = $sql;
 					}
-					$this->select = $sql;
 			}
 		}
+		//_vd($this->select);
+		//_vd($this->from);
+		//_vd($this->where);
+		//_vd($this->group);
+		//_vd($this->order);
 	}
 	//
 	//	Set additional constraint on record set
@@ -197,7 +210,7 @@ class db_pager {
 		} else 
 		  return false;
 		return true;
-	}	    
+	}
 	//
 	//	Calculates page numbers for html controls.
 	//
@@ -315,8 +328,7 @@ class db_pager {
 	    }
 				
 	    if (count($ord)) {
-			$ord = array_map(function_exists('mysql_real_escape_string') ? 
-				'mysql_real_escape_string': 'mysql_escape_string', $ord);
+			$ord = array_map('db_escape_function', $ord);
 			$sql .= " ORDER BY " . implode(',', $ord);
 		} else {
 			if($order)
@@ -336,7 +348,7 @@ class db_pager {
 	//
 	function _init() 
 	{
-		global $go_debug;
+		global $SysPrefs;
 		
 	    if ($this->ready == false ) {
 			$sql = $this->_sql_gen(true);
@@ -348,7 +360,7 @@ class db_pager {
 	  		$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:
+			if ($SysPrefs->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) {
@@ -504,4 +516,3 @@ function refresh_pager($name)
 	if (isset($_SESSION[$name]))
 		$_SESSION[$name]->ready = false;
 }
-?>