From e4e79294712d1d3cee4e2bf9b71e24e7130f86af Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Sat, 1 Sep 2012 19:11:29 +0200 Subject: [PATCH] Fix sunstone login when requesting / instead of /login (cherry picked from commit 29bc3232d6d4601513301b2d4c7fae0724876fc8) --- src/sunstone/sunstone-server.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index a6646f2b26..9999b27713 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -219,13 +219,7 @@ end ############################################################################## get '/' do if !authorized? - if settings.config[:auth] == "x509" - templ = "login_x509.html" - else - templ = "login.html" - end - - return File.read(File.dirname(__FILE__)+'/templates/'+templ) + return erb :login end time = Time.now + 60*10 response.set_cookie("one-user",