From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/admin/server_edit.php | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/interface/web/admin/server_edit.php b/interface/web/admin/server_edit.php
index e718576..c2e746d 100644
--- a/interface/web/admin/server_edit.php
+++ b/interface/web/admin/server_edit.php
@@ -38,11 +38,12 @@
* End Form configuration
******************************************/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('admin');
+$app->auth->check_security_permissions('admin_allow_server_services');
// Loading classes
$app->uses('tpl,tform,tform_actions');
@@ -52,10 +53,10 @@
function onShowEnd() {
global $app, $conf;
-
- // Getting Servers
- $sql = "SELECT server_id,server_name FROM server WHERE server_id != $this->id ORDER BY server_name";
- $mirror_servers = $app->db->queryAllRecords($sql);
+
+ // Getting Servers
+ $sql = "SELECT server_id,server_name FROM server WHERE server_id != ? ORDER BY server_name";
+ $mirror_servers = $app->db->queryAllRecords($sql, $this->id);
$mirror_server_select = '<option value="0">'.$app->tform->lng('- None -').'</option>';
if(is_array($mirror_servers)) {
foreach( $mirror_servers as $mirror_server) {
@@ -63,19 +64,19 @@
$mirror_server_select .= "<option value='$mirror_server[server_id]' $selected>$mirror_server[server_name]</option>\r\n";
}
}
- $app->tpl->setVar("mirror_server_id",$mirror_server_select);
-
+ $app->tpl->setVar("mirror_server_id", $mirror_server_select);
+
parent::onShowEnd();
}
-
+
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;
-
+
parent::onSubmit();
-
+
}
}
@@ -83,4 +84,4 @@
$page = new page_action;
$page->onLoad();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1