From 9d4bb8679bd2ef0934ac94ae3ccedc864c0078cc Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 02 Mar 2015 11:58:49 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/tools/resync.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
index 35279b1..6a85b18 100644
--- a/interface/web/tools/resync.php
+++ b/interface/web/tools/resync.php
@@ -389,7 +389,9 @@
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 @@
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>';
@@ -466,7 +468,7 @@
//* database
if(isset($this->dataRecord['resync_db']) && $this->dataRecord['resync_db'] == 1) {
- $msg .= $this->do_resync('web_database_user', 'database_user_id', 'db', $this->dataRecord['db_server_id'], 'database_user', $app->tform->wordbook['do_db_user_txt']);
+ $msg .= $this->do_resync('web_database_user', 'database_user_id', 'db', $this->dataRecord['db_server_id'], 'database_user', $app->tform->wordbook['do_db_user_txt'], false);
$msg .= $this->do_resync('web_database', 'database_id', 'db', $this->dataRecord['db_server_id'], 'database_name', $app->tform->wordbook['do_db_txt']);
}
--
Gitblit v1.9.1