From 9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 03 Feb 2015 04:10:04 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/sites/web_vhost_domain_edit.php | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index e868ece..6e7d434 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -142,6 +142,8 @@
$read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
if($this->_vhostdomain_type != 'domain') $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
+
+ $is_admin = false;
//* Client: If the logged in user is not admin and has no sub clients (no reseller)
if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
@@ -191,7 +193,7 @@
if($app->functions->intval($this->dataRecord["server_id"]) > 0) {
// check if server is in client's servers or add it.
$chk_sid = explode(',', $client['web_servers']);
- if(in_array($this->dataRecord["server_id"], $client['web_servers']) == false) {
+ if(in_array($this->dataRecord["server_id"], explode(',', $client['web_servers'])) == false) {
if($client['web_servers'] != '') $client['web_servers'] .= ',';
$client['web_servers'] .= $app->functions->intval($this->dataRecord["server_id"]);
}
@@ -451,6 +453,8 @@
//* Admin: If the logged in user is admin
} else {
+
+ $is_admin = true;
if($this->_vhostdomain_type == 'domain') {
// The user is admin, so we fill in all IP addresses of the server
@@ -698,6 +702,16 @@
}
$app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type);
+
+ $app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));
+ $app->tpl->setVar("is_admin", $is_admin);
+
+ if($this->id > 0) {
+ $tmp_web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", intval($this->id));
+ $tmp_sys_group = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE groupid = ?", intval($tmp_web['sys_groupid']));
+ if(intval($tmp_sys_group['client_id']) > 0) $tmp_client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", intval($tmp_sys_group['client_id']));
+ if(is_array($tmp_client) && !empty($tmp_client) && trim($this->dataRecord['ssl_organisation']) == '' && trim($this->dataRecord['ssl_locality']) == '' && trim($this->dataRecord['ssl_state']) == '' && trim($this->dataRecord['ssl_organisation_unit']) == '') $app->tpl->setVar("show_helper_links", true);
+ }
parent::onShowEnd();
}
@@ -1068,6 +1082,10 @@
}
}
+ if($web_config['enable_spdy'] === 'n') {
+ unset($app->tform->formDef["tabs"]['ssl']['fields']['enable_spdy']);
+ }
+
parent::onSubmit();
}
--
Gitblit v1.9.1