Merge branch 'master' into 'master'

Master

See merge request !169

Author: Marius Cramer

interface/web/tools/resync.php

@@ -389,7 +389,9 @@ private function query_server($db_table, $server_id, $server_type, $active=true,
 		unset($temp);
 
 		if ( isset($temp_id) ) $server_id = rtrim($temp_id,',');
-		$sql = "SELECT * FROM $db_table WHERE server_id IN (".$server_id.") ".$opt; 
+		$sql = "SELECT * FROM $db_table";
+		if ($db_table != "mail_user_filter") $sql .= " WHERE server_id IN (".$server_id.") ";
+		$sql .= $opt;
 		if ($active) $sql .= " AND active = 'y'"; 
 		$records = $app->db->queryAllRecords($sql);
 
@@ -407,7 +409,7 @@ private function do_resync($db_table, $index_field, $server_type, $server_id, $m
 		if(!empty($records)) 
 			foreach($records as $rec) {
 				$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
-				$msg .= '['.$server_name[$rec['server_id']].'] '.$rec[$msg_field].'<br>';
+				if(!empty($rec[$msg_field])) $msg .= '['.$server_name[$rec['server_id']].'] '.$rec[$msg_field].'<br>';
 			}
 		else $msg .= $app->tform->wordbook['no_results_txt'].'<br>';