From c93956a2d58ec3d797d5f0dcea49afa7dc4a61da Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 1 Mar 2015 08:38:34 +0100
Subject: [PATCH] resync: fixed mail_user_filter and cosmetical corrections
during mail-resync
---
interface/web/tools/resync.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
index 517d048b9e..6a85b186a1 100644
--- a/interface/web/tools/resync.php
+++ b/interface/web/tools/resync.php
@@ -389,7 +389,9 @@ class page_action extends tform_actions {
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 @@ class page_action extends tform_actions {
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>';
--
GitLab