Merge branch 'master' into 'master'

Marius Cramer · Marius Cramer · commit 3299ad410a58 · 2015-04-17T19:34:01.000+02:00
fixed sql-query

See merge request !175
diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
@@ -182,7 +182,7 @@ private function server_has_data($type, $server) {
 		//* firewall
 		$array_out = array();
 		foreach($server_data as $db_table => $data) {
-			$sql = @(isset($data['server_id']))?"SELECT * FROM ?? WHERE server_id = ":"SELECT * FROM ??";
+			$sql = @(isset($data['server_id']))?"SELECT * FROM ?? WHERE server_id = ?":"SELECT * FROM ??";
 			$records = $app->db->queryAllRecords($sql, $db_table, $server_id);
 			if (!empty($records)) array_push($array_out, $db_table);
 		}

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private function server_has_data($type, $server) {`
`182`	`182`	`//* firewall`
`183`	`183`	`$array_out = array();`
`184`	`184`	`foreach($server_data as $db_table => $data) {`
`185`		`- $sql = @(isset($data['server_id']))?"SELECT * FROM ?? WHERE server_id = ":"SELECT * FROM ??";`
	`185`	`+ $sql = @(isset($data['server_id']))?"SELECT * FROM ?? WHERE server_id = ?":"SELECT * FROM ??";`
`186`	`186`	`$records = $app->db->queryAllRecords($sql, $db_table, $server_id);`
`187`	`187`	`if (!empty($records)) array_push($array_out, $db_table);`
`188`	`188`	`}`