php 5.2 and nginx related compatibility updates

Author: Samnan

Docs/changelog.txt

@@ -4,6 +4,8 @@ version 3.7
 Updates:
 
 Bufixes:
+- fixes issues starting up MyWebSQL when running php 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
 - 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

config/constants.php

@@ -19,7 +19,8 @@
 
 	// below is required to adjust for serverside php configuration changes
 	ini_set("display_errors", "off");
-	ini_set('zlib.output_compression', 'On');
+	if ( !isset($_SERVER['FCGI_ROLE'])) // for running as fcgi pass through, compression needs to be off
+		ini_set('zlib.output_compression', 'On');
 	ini_set('output_buffering', 'Off');
 
 	if (!function_exists('v'))

js/tables.js

@@ -465,7 +465,7 @@ $.fn.setSearchFilter = function(text) {
 
         // Trigger `beforetablesort` event that calling scripts can hook into;
         // pass parameters for sorted column index and sorting direction
-        $table.trigger("beforetablesort", {column: th_index, direction: sort_dir});
+        //$table.trigger("beforetablesort", {column: th_index, direction: sort_dir});
         // More reliable method of forcing a redraw
         $table.css("display");
 
@@ -505,8 +505,10 @@ $.fn.setSearchFilter = function(text) {
 			 $table.find("thead th:eq("+th_index+") div").append( sort_dir == dir.ASC ? "<span>&nbsp;&#x25B4;<span>" : "<span>&nbsp;&#x25BE;<span>");
 			 resizeTableHeader('info');
 
+			 // reset first index numbering
+			 $("tbody tr", $table).each(function(i) { $("td:eq(0)", this).html(i+1); });
           // Trigger `aftertablesort` event. Similar to `beforetablesort`
-          $table.trigger("aftertablesort", {column: th_index, direction: sort_dir});
+          //$table.trigger("aftertablesort", {column: th_index, direction: sort_dir});
           // More reliable method of forcing a redraw
           $table.css("display");
         }, 10);

lib/db/manager.php

@@ -52,4 +52,8 @@ function getError() {
 	}
 }
 
+function replace_single_quotes($s) {
+	return str_replace("''", "'", $s);
+}
+
 ?>

lib/db/mysql4.php

@@ -442,7 +442,7 @@ function getFieldValues($table, $name) {
 			if (phpCheck(5.3)) {
 				$regex = "/\('(.*)'\)/";
 				preg_match_all($regex, $row['Type'], $list);
-				return array_map(function($s) { return str_replace("''", "'", $s); }, explode("','", $list[1][0]));
+				return array_map('replace_single_quotes', explode("','", $list[1][0]));
 			} else {
 				$list = explode(',', $matches[1]);
 				foreach($list as $k => $v)

lib/db/mysql5.php

@@ -523,7 +523,7 @@ function getFieldValues($table, $name) {
 			if (phpCheck(5.3)) {
 				$regex = "/\('(.*)'\)/";
 				preg_match_all($regex, $row['Type'], $list);
-				return array_map(function($s) { return str_replace("''", "'", $s); }, explode("','", $list[1][0]));
+				return array_map('replace_single_quotes', explode("','", $list[1][0]));
 			} else {
 				$list = explode(',', $matches[1]);
 				foreach($list as $k => $v)

lib/db/mysqli.php

@@ -541,7 +541,7 @@ function getFieldValues($table, $name) {
 			if (phpCheck(5.3)) {
 				$regex = "/\('(.*)'\)/";
 				preg_match_all($regex, $row['Type'], $list);
-				return array_map(function($s) { return str_replace("''", "'", $s); }, explode("','", $list[1][0]));
+				return array_map('replace_single_quotes', explode("','", $list[1][0]));
 			} else {
 				$list = explode(',', $matches[1]);
 				foreach($list as $k => $v)

lib/db/pgsql.php

@@ -515,7 +515,7 @@ function getFieldValues($table, $name) {
 			if (phpCheck(5.3)) {
 				$regex = "/\('(.*)'\)/";
 				preg_match_all($regex, $row['Type'], $list);
-				return array_map(function($s) { return str_replace("''", "'", $s); }, explode("','", $list[1][0]));
+				return array_map('replace_single_quotes', explode("','", $list[1][0]));
 			} else {
 				$list = explode(',', $matches[1]);
 				foreach($list as $k => $v)

lib/db/sqlite.php

@@ -491,7 +491,7 @@ function getFieldValues($table, $name) {
 			if (phpCheck(5.3)) {
 				$regex = "/\('(.*)'\)/";
 				preg_match_all($regex, $row['Type'], $list);
-				return array_map(function($s) { return str_replace("''", "'", $s); }, explode("','", $list[1][0]));
+				return array_map('replace_single_quotes', explode("','", $list[1][0]));
 			} else {
 				$list = explode(',', $matches[1]);
 				foreach($list as $k => $v)

lib/util.php

@@ -282,7 +282,7 @@ function createSimpleGrid(&$db, $message) {
 		$ed = false;
 		// ------------ print header -----------
 		print "<tr id=\"fhead\">";
-		print "<th class=\"th\" data-sort=\"numeric\"><div>#</div></th>";
+		print "<th class=\"th index\"><div>#</div></th>";
 
 		$v = "";