From b58d051c9af46c2e3ddb831d67dfca9eed2c38b1 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 30 Sep 2015 11:52:37 +0200 Subject: [Webinterface/HTTPS] Only show "disable https" if it is enabled --- modules/webinterface.inc.php | 2 +- templates/webinterface/https.html | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/webinterface.inc.php b/modules/webinterface.inc.php index f3780277..cecccacd 100644 --- a/modules/webinterface.inc.php +++ b/modules/webinterface.inc.php @@ -52,7 +52,7 @@ class Page_WebInterface extends Page if (Request::get('show') === 'httpsupdate') { Render::addTemplate('webinterface/httpd-restart', array('taskid' => Session::get('https-id'))); } - Render::addTemplate('webinterface/https'); + Render::addTemplate('webinterface/https', array('httpsEnabled' => file_exists('/etc/lighttpd/server.pem'))); $data = array(); if (Property::getPasswordFieldType() === 'text') $data['selected_show'] = 'checked'; diff --git a/templates/webinterface/https.html b/templates/webinterface/https.html index d2b4c69a..c6161cd6 100644 --- a/templates/webinterface/https.html +++ b/templates/webinterface/https.html @@ -5,6 +5,10 @@
{{lang_httpsSettings}}

{{lang_description}}

+ {{^httpsEnabled}} +

{{lang_HttpsIsDisabled}}

+ {{/httpsEnabled}} + {{#httpsEnabled}}
@@ -12,6 +16,7 @@ {{lang_noHttps}}
+ {{/httpsEnabled}}
-- cgit v1.2.3-55-g7522