From 7c57f78468664a8a62b555798834b4cf5b5e9bef Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Fri, 12 Dec 2014 09:12:50 -0500
Subject: [PATCH] Merge branch 'feature/add_spdy_option' into 'master'
---
interface/web/sites/web_vhost_domain_edit.php | 6 ++++++
interface/web/sites/templates/web_vhost_domain_ssl.htm | 2 ++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/interface/web/sites/templates/web_vhost_domain_ssl.htm b/interface/web/sites/templates/web_vhost_domain_ssl.htm
index 75bf9e6..e910e22 100644
--- a/interface/web/sites/templates/web_vhost_domain_ssl.htm
+++ b/interface/web/sites/templates/web_vhost_domain_ssl.htm
@@ -64,12 +64,14 @@
{tmpl_var name='ssl_action'}
</select>
</div>
+ {tmpl_if name="is_spdy_enabled"}
<div class="ctrlHolder">
<p class="label">{tmpl_var name='enable_spdy_txt'}</p>
<div class="multiField">
{tmpl_var name="enable_spdy"}
</div>
</div>
+ {/tmpl_if}
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index 8935713..27ece43 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -699,6 +699,8 @@
$app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type);
+ $app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));
+
parent::onShowEnd();
}
@@ -1068,6 +1070,10 @@
}
}
+ if($web_config['enable_spdy'] === 'n') {
+ unset($app->tform->formDef["tabs"]['ssl']['fields']['enable_spdy']);
+ }
+
parent::onSubmit();
}
--
Gitblit v1.9.1