From cbd3cd11d56d2704daac8e1df442dbc66cf49229 Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Fri, 6 Jul 2018 08:40:48 +0200
Subject: [PATCH] typo in resync-tool and fixed server-list for mailfilter
---
interface/web/tools/resync.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
index 7e3e9b4da2..e5958c064e 100644
--- a/interface/web/tools/resync.php
+++ b/interface/web/tools/resync.php
@@ -74,8 +74,8 @@ class page_action extends tform_actions {
//* check the database for existing records
$server_data = $this->server_has_data($server_type, $server['server_id']);
foreach ($search as $needle)
-// if (in_array($needle, $server_data) && strpos($options_servers, $server['server_name']) === false) {
- if (in_array($needle, $server_data)) {
+ if (in_array($needle, $server_data) && strpos($options_servers, $server['server_name']) === false) {
+// if (in_array($needle, $server_data)) {
$options_servers .= "<option value='$server[server_id]'>$server[server_name]</option>";
$server_count++;
}
@@ -525,7 +525,7 @@ class page_action extends tform_actions {
$this->dataRecord['db_server_id'] = $this->dataRecord['all_server_id'];
$this->dataRecord['mail_server_id'] = $this->dataRecord['all_server_id'];
$this->dataRecord['mailbox_server_id'] = $this->dataRecord['all_server_id'];
- $this->dataRecord['verserver_server_id'] = $this->dataRecord['all_server_id'];
+ $this->dataRecord['vserver_server_id'] = $this->dataRecord['all_server_id'];
$this->dataRecord['dns_server_id'] = $this->dataRecord['all_server_id'];
}
@@ -596,7 +596,7 @@ class page_action extends tform_actions {
//* vserver
if($this->dataRecord['resync_vserver'] == 1)
- $msg .= $this->do_resync('openvz_vm', 'vm_id', 'vserver', $this->dataRecord['verserver_server_id'], 'hostname', $app->tform->wordbook['do_vserver_txt']);
+ $msg .= $this->do_resync('openvz_vm', 'vm_id', 'vserver', $this->dataRecord['vserver_server_id'], 'hostname', $app->tform->wordbook['do_vserver_txt']);
//* dns
if($this->dataRecord['resync_dns'] == 1) {
--
GitLab