From 2d822e3b95c70f2640b2b079bcca3b1be2dc916e Mon Sep 17 00:00:00 2001
From: Morris Jobke <morris.jobke@gmail.com>
Date: Wed, 27 Nov 2013 00:05:48 +0100
Subject: [PATCH 1/2] add warning for HTTP connection

---
 settings/templates/admin.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 253a7ff5f50..5d170a62f2e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -15,6 +15,20 @@ $levelLabels = array(
 
 <?php
 
+// is ssl working ?
+if (!$_['isConnectedViaHTTPS']) {
+	?>
+<fieldset class="personalblock">
+	<h2><?php p($l->t('Security Warning'));?></h2>
+
+	<span class="securitywarning">
+		<?php p($l->t('You are accessing %s with HTTP. We strongly suggest to setup and use HTTPS.', $theme->getTitle())); ?>
+	</span>
+
+</fieldset>
+<?php
+}
+
 // is htaccess working ?
 if (!$_['htaccessworking']) {
 	?>

From 8506d2bf422611aeb222195c0ca88341aa9afb75 Mon Sep 17 00:00:00 2001
From: Morris Jobke <morris.jobke@gmail.com>
Date: Wed, 27 Nov 2013 00:38:56 +0100
Subject: [PATCH 2/2] fix wording

---
 settings/templates/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5d170a62f2e..523bbd66248 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -22,7 +22,7 @@ if (!$_['isConnectedViaHTTPS']) {
 	<h2><?php p($l->t('Security Warning'));?></h2>
 
 	<span class="securitywarning">
-		<?php p($l->t('You are accessing %s with HTTP. We strongly suggest to setup and use HTTPS.', $theme->getTitle())); ?>
+		<?php p($l->t('You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.', $theme->getTitle())); ?>
 	</span>
 
 </fieldset>