bugfixes with sorting and pagination

Author: Samnan

Docs/changelog.txt

@@ -4,12 +4,13 @@ version 3.7
 Updates:
 
 Bufixes:
-- fixes issues starting up MyWebSQL when running php as FCGi in nginx server
+- problems with php running as FCGi in nginx server
 - corrupt output on some php configuration, mainly due to incompatible settings
-- list of table was not displayed for PostgreSQL databases when import a single table data from csv files
+- list of table not displayed for PostgreSQL databases when importing a single table data from csv files
 - on some php configurations, database selection did not work due to cookies and request variables being merged
 - insert queries generated for some Pgsql databases failed to execute due to syntax errors
 - fixed data table import bug with pgsql databases, generating incorrect queries with table namespaces
+- fixed sorting and pagination issues with query data (thanks to Peng Xiao for valuable feedback)
 General:
 - added compatibility to PHP 5.2 after user requests
 

js/query.js

@@ -498,7 +498,11 @@ function setupResults() {
 }
 
 function goPage(num) {
-	wrkfrmSubmit("query", "table", num, editTableName);
+	if(queryType == "table") {
+		wrkfrmSubmit("query", "table", num, editTableName);
+	} else {
+		wrkfrmSubmit("query", "query", num, "");
+	}
 }
 
 function goSort(field) {

lib/util.php

@@ -263,11 +263,11 @@ function createResultGrid(&$db)
 		$js .= "parent.totalRecords = $total_records;\n";
 		$js .= "parent.totalPages = $total_pages;\n";
 		$js .= "parent.currentPage = $current_page;\n";
+		$js .= "parent.queryType = \"".(Session::get('select', 'table') ? 'table' : 'query')."\";\n";
 		$js .= "parent.transferResultGrid(".$numRows.", '$tm', \"$message\");\n";
 		$js .= "parent.addCmdHistory(\"".preg_replace("/[\n\r]+/", "<br/>", htmlspecialchars(Session::get('select', 'query')))."\", 1);\n";
 		$js .= "parent.resetFrame();\n";
 		$js .= "</script>\n";
-
 		print $js;
 	}
 

modules/query.php

@@ -171,7 +171,7 @@ function simpleQuery(&$db) {
 				if ($count > $record_limit) {
 					Session::set('select', 'count', $count);
 					Session::set('select', 'page', 1);
-					Session::set('select', 'limit', true);
+					Session::set('select', 'limit', 1);
 					$limit = $db->getLimit( $record_limit );
 					$query .= $limit;
 				}