- logout works now

- added debug info at the bottom of the page
- have nices status line now


git-svn-id: https://svn.spreadspace.org/mur.sat@91 7de4ea59-55d0-425e-a1af-a3118ea81d4c

1 files changed, 24 insertions, 20 deletions

diff --git a/tools/mmd/MmdCommands.py b/tools/mmd/MmdCommands.py
index 57401ad..7d69a43 100644
--- a/tools/mmd/MmdCommands.py
+++ b/tools/mmd/MmdCommands.py
@@ -10,7 +10,7 @@ def loginForm (session):
   """
   display the login form
   """
-  return indexWidget (dataWidget (), loginFormWidget (), statusWidget (session))
+  return indexWidget (dataWidget (), loginFormWidget (), statusWidget (session), session)
 
 def login (session):
   """
@@ -18,18 +18,23 @@ def login (session):
   """
   if not session.user.load (session.getQsEmail ()):
     error_message = {'error': 'Login', 'description': 'Login failed.'}
-    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session))
+    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session), session)
   if not session.user.checkPassword (session.getQsPassword ()):
     error_message = {'error': 'Login', 'description': 'Login failed.'}
-    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session))
+    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session), session)
   session.setStatus ('auth')
-  return indexWidget (dataWidget (), loginWidget (session.user), statusWidget (session))
+  return indexWidget (dataWidget (), loginWidget (session.user), statusWidget (session), session)
+
+def logout (session):
+  session.user.email = 'Anonymous'
+  session.setStatus ()
+  return indexWidget (dataWidget (), logoutWidget (), statusWidget (session), session)
 
 def registerForm (session):
   """
   display the register form
   """
-  return indexWidget (dataWidget (), registerFormWidget (), statusWidget (session))
+  return indexWidget (dataWidget (), registerFormWidget (), statusWidget (session), session)
 
 def register (session):
   """
@@ -46,7 +51,7 @@ def register (session):
 
   if password != confirm:
     error_message = {'error': 'Password', 'description': 'Passwords do not match.'}
-    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session))
+    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session), session)
 
   user = User ()
   code = user.create (session.session_id, firstname, lastname, email, callsign, longitude, latitude, password)
@@ -69,61 +74,60 @@ MURSAT1 team
 
   if not user.sendEmail (message):
     error_message = {'error': 'Email', 'description': 'Email could not be sent.'}
-    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session))
+    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session), session)
 
-  return indexWidget (dataWidget (), registerWidget (), statusWidget (session))
+  return indexWidget (dataWidget (), registerWidget (), statusWidget (session), session)
 
 def completeRegistration (session):
   user = User ()
   code = session.getQsCode ()
   if not user.findPending (code):
     error_message = {'error': 'Registration', 'description': 'Registration Failed.'}
-    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session))
-  return indexWidget (dataWidget (), completeRegistrationWidget (code), statusWidget (session))
+    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session), session)
+  return indexWidget (dataWidget (), completeRegistrationWidget (code), statusWidget (session), session)
 
-# TODO finish theses methods
 def confirmRegistration (session):
   user = User ()
   code = session.getQsCode ()
   if not user.findPending (code):
     error_message = {'error': 'Registration', 'description': 'Registration Failed.'}
-    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session))
+    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session), session)
   user.confirm (code)
-  session.authenticate (user)
-  return indexWidget (dataWidget (), confirmRegistrationWidget (user), statusWidget (session))
+  session.setStatus ('auth')
+  return indexWidget (dataWidget (), confirmRegistrationWidget (user), statusWidget (session), session)
 
 def cancelRegistration (session):
   user = User ()
   code = session.getQsCode ()
   if not user.findPending (code):
     error_message = {'error': 'Registration', 'description': 'Canceling failed.'}
-    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session))
+    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session), session)
   user.cancel (code)
-  return indexWidget (dataWidget (), cancelRegistrationWidget (), statusWidget (session))
+  return indexWidget (dataWidget (), cancelRegistrationWidget (), statusWidget (session), session)
 
 def submitForm (session):
   """
   display the form for data submission
   """
-  return indexWidget (dataWidget (), submitFormWidget (), statusWidget (session))
+  return indexWidget (dataWidget (), submitFormWidget (), statusWidget (session), session)
 
 def submit (session):
   """
   evaluate data from submitForm
   """
-  return indexWidget (dataWidget (), submitWidget (), statusWidget (session))
+  return indexWidget (dataWidget (), submitWidget (), statusWidget (session), session)
 
 def viewlog (session):
   """
   show latest log entries/submissions
   """
-  return indexWidget (dataWidget (), logWidget (), statusWidget (session))
+  return indexWidget (dataWidget (), logWidget (), statusWidget (session), session)
 
 def index (session):
   """
   display the index page
   """
-  return indexWidget (dataWidget (), osmWidget (), statusWidget (session))
+  return indexWidget (dataWidget (), osmWidget (), statusWidget (session), session)
 
 def mmdtest (env, cookie):
   body = ''