X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb_pager.inc;h=36afb923543c739e7c5b159f070c29ae45093b65;hb=063c5f22068dbbd6adccacaf5bd0f66b2eda8e4f;hp=cf67659a004203b8407815eac60760c47acb2b79;hpb=8fede7cc2170d17d71eb587477996add5ccadfc6;p=fa-stable.git

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index cf67659a..36afb923 100644
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -61,7 +61,6 @@ class db_pager {
 	//	$name is base name for pager controls
 	function db_pager($sql, $name, $table = null, $page_len=0) 
 	{
-		global $table_style;
 		$this->width = "95%";
 		if ($page_len == 0) $page_len = user_query_size();
 		$this->name = $name;
@@ -160,11 +159,11 @@ class db_pager {
 			$c = 0;
 		  // add result field names to column defs for 
 		  // col value retrieve and sort purposes 
-		   $cnt = min(mysql_num_fields($result), count($this->columns));
+		   $cnt = min(db_num_fields($result), count($this->columns));
 			for ($c = $i = 0; $c < $cnt; $c++) {
 				if (!(isset($this->columns[$c]['insert']) && $this->columns[$c]['insert'])) {
 //					if (!@($this->columns[$c]['type']=='skip'))
-			 			$this->columns[$c]['name']= mysql_field_name($result, $i);
+			 			$this->columns[$c]['name']= db_field_name($result, $i);
 					if (!@($this->columns[$c]['type']=='insert'))
 			 		$i++;
 			 		}
@@ -261,7 +260,7 @@ class db_pager {
 
 		if(count($this->extra_where)) {
 		    $where .= ($where=='' ? '' : ' AND ')
-				.implode( $this->extra_where, ' AND ');
+				.implode(' AND ', $this->extra_where);
 		}
 		if ($where) $where = " WHERE ($where)";
 
@@ -284,7 +283,9 @@ class db_pager {
 	    }
 				
 	    if (count($ord)) {
-			$sql .= " ORDER BY " . implode($ord, ',');
+			$ord = array_map(function_exists('mysql_real_escape_string') ? 
+				'mysql_real_escape_string': 'mysql_escape_string', $ord);
+			$sql .= " ORDER BY " . implode(',', $ord);
 		} else {
 			if($order)
 				$sql .= " ORDER BY $order"; // original base query order