[Mpuls-commits] r1305 - wasko/branches/2.0/mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-08 12:29:36 +0100 (Mon, 08 Feb 2010)
New Revision: 1305

Modified:
   wasko/branches/2.0/mpulsweb/controllers/auth.py
Log:
* mpulsweb/controllers/auth.py (AuthController.logout),
  (AuthController.login): Call templates from new location.


Modified: wasko/branches/2.0/mpulsweb/controllers/auth.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/auth.py	2010-02-08 11:28:00 UTC (rev 1304)
+++ wasko/branches/2.0/mpulsweb/controllers/auth.py	2010-02-08 11:29:36 UTC (rev 1305)
@@ -20,10 +20,10 @@
         session.save()
         session.invalidate()
         response.delete_cookie('mpuls_auth')
-        return render('/logout.mako')
+        return render('/auth/logout.mako')
 
     def login(self):
-        return render('/login.mako')
+        return render('/auth/login.mako')
 
     def loginAction(self):
         try:
@@ -36,9 +36,13 @@
                 session['USER_AUTHORIZED'] = user
                 session['AUTH'] = md5.new(shared + userIdentity()).digest()
                 session.save()
-                #response.set_cookie('waska_auth', shared, secure=True)
+
+                # Does only work work with enabled ssl. secure means that the
+                # cookie will only be sent over a secure connection.
+                #response.set_cookie('mpuls_auth', shared, secure=True)
                 response.set_cookie('mpuls_auth', shared)
-                redirect_to(controller="/waska", action="start")
+
+                redirect_to("/")
             else:
                 c.login_failed = True
                 return self.login()