From 9ca1e3b8acc34e15ff4bdbdd4b61402da06b4227 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 05 Jan 2015 01:40:07 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

---
 interface/web/sites/web_vhost_domain_edit.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

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