From 35c5c332a0c99f6e3ba8f685f4e6a717841cbe95 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 25 Jun 2012 14:40:19 -0500
Subject: [PATCH] disabled login form in admin is not secure, issue 859, thanks
 Tim

---
 VERSION                                     | 2 +-
 applications/admin/views/default/index.html | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 5124d553..db185464 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-25 14:35:08) dev
+Version 2.00.0 (2012-06-25 14:40:17) dev
diff --git a/applications/admin/views/default/index.html b/applications/admin/views/default/index.html
index 3f5eb94a..c7e0c2bc 100644
--- a/applications/admin/views/default/index.html
+++ b/applications/admin/views/default/index.html
@@ -9,7 +9,7 @@
 
 <h2>web2py&trade; {{=T('Web Framework')}}</h2>
 <h3>{{=T('Login to the Administrative Interface')}}</h3>
-<p class="help">{{=T('ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.')}}</p>
+{{if request.is_https or request.is_local:}}
 <div class="form">
   <form action="{{=URL(r=request)}}" method="post">
     <div><input type="hidden" name="send" value="{{=send}}"/></div>
@@ -19,4 +19,8 @@
     </table>
   </form>
 </div>
+{{else:}}
+<p class="help">{{=T('ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.')}}</p>
+{{pass}}
+