X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb_pager.inc;h=2806d2f6a1382f00e73f04885dc8b04c2042ffc9;hb=3df0648d1513215ea28378e679d4291d3e609ba6;hp=f3f0050db32da69dffc2296200f52a039b428ee6;hpb=e8a396f9731dda3f3febdcc3ec258add1dbe972b;p=fa-stable.git

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index f3f0050d..2806d2f6 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,12 +73,8 @@ 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)
 	{
 		if ($sql != $this->sql) {
@@ -88,29 +89,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 ($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
@@ -143,7 +154,16 @@ class db_pager {
 	//
 	function sort_table($col) 
 	{
+
+			$max_priority = 0;
+			foreach($this->columns as $id => $_col) {
+			if(!isset($_col['ord_priority'])) continue;
+				$max_priority = max($max_priority, $_col['ord_priority']);
+			};
+
+
 	    $ord = $this->columns[$col]['ord'];
+  		$this->columns[$col]['ord_priority']  = $max_priority+1; // set priority , higher than anything else
 	    $ord = ($ord == '') ? 'asc' : (($ord == 'asc') ? 'desc' : '');
 	    $this->columns[$col]['ord'] = $ord;
 	    $this->set_page(1);
@@ -188,7 +208,7 @@ class db_pager {
 		} else 
 		  return false;
 		return true;
-	}	    
+	}
 	//
 	//	Calculates page numbers for html controls.
 	//
@@ -288,7 +308,16 @@ class db_pager {
 		if ($group) $sql.= " GROUP BY $group";
 	    $ord = array();
 
+			// sort order column by priority instead of table order.
+			$columns = array();
 	    foreach ($this->columns as $col) {
+					if(isset($col['ord_priority'])) {
+						$columns[$col['ord_priority']] = $col;
+					}
+			}
+			krsort($columns);
+
+	    foreach ($columns as $col) {
 	       	if (isset($col['ord'])) {
 	        	if ( $col['ord'] != '' && isset($col['name'])) {
 		    	    $ord[] = $col['name'] .' '. $col['ord'];
@@ -297,8 +326,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)
@@ -337,7 +365,7 @@ class db_pager {
 		    	   	if (isset($col['ord']) && $col['ord'] != '' 
 						&&  !isset($col['name'])) {
 							display_warning("Result field names must be set
-								for all intially ordered db_pager columns.");
+								for all initially ordered db_pager columns.");
 			    	}
 				}
 	    	}
@@ -486,4 +514,4 @@ function refresh_pager($name)
 	if (isset($_SESSION[$name]))
 		$_SESSION[$name]->ready = false;
 }
-?>
\ No newline at end of file
+?>