From f5655fde90c49925aaa19c01c8adfdd2f1a9cd84 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 23 Nov 2017 13:27:03 +0100
Subject: [PATCH] extend last commit
---
interface/web/admin/server_edit.php | 4 ++--
.../web/admin/templates/server_edit_services.htm | 16 +++++++++-------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/interface/web/admin/server_edit.php b/interface/web/admin/server_edit.php
index c400483780..5b446c0494 100644
--- a/interface/web/admin/server_edit.php
+++ b/interface/web/admin/server_edit.php
@@ -72,8 +72,8 @@ class page_action extends tform_actions {
function onSubmit() {
global $app;
- //* We do not want to mirror the the server itself
- if($this->id == $this->dataRecord['mirror_server_id']) $this->dataRecord['mirror_server_id'] = 0;
+ //* We do not want to mirror the the server itself and the master can not be a mirror
+ if($this->id == $this->dataRecord['mirror_server_id'] || $this->id == 1) $this->dataRecord['mirror_server_id'] = 0;
parent::onSubmit();
diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm
index 4a648f4591..2775e029d3 100644
--- a/interface/web/admin/templates/server_edit_services.htm
+++ b/interface/web/admin/templates/server_edit_services.htm
@@ -50,12 +50,14 @@
{tmpl_var name='xmpp_server'}
</div>
</div>
- <div class="form-group">
- <label for="mirror_server_id" class="col-sm-3 control-label">{tmpl_var name='mirror_server_id_txt'}</label>
- <div class="col-sm-9"><select name="mirror_server_id" id="server_id" class="form-control">
- {tmpl_var name='mirror_server_id'}
- </select></div>
- </div>
+ <tmpl_if name="id" op="!=" value="1">
+ <div class="form-group">
+ <label for="mirror_server_id" class="col-sm-3 control-label">{tmpl_var name='mirror_server_id_txt'}</label>
+ <div class="col-sm-9"><select name="mirror_server_id" id="server_id" class="form-control">
+ {tmpl_var name='mirror_server_id'}
+ </select></div>
+ </div>
+ </tmpl_if>
<div class="form-group">
<label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
<div class="col-sm-9"><select name="active" id="active" class="form-control">
@@ -69,4 +71,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
\ No newline at end of file
+ </div></div>
--
GitLab