- new module MmdUser.py

- registration works basically


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

1 files changed, 26 insertions, 8 deletions

diff --git a/tools/mmd/MmdCommands.py b/tools/mmd/MmdCommands.py
index 5bf870d..19a5968 100644
--- a/tools/mmd/MmdCommands.py
+++ b/tools/mmd/MmdCommands.py
@@ -4,12 +4,13 @@ command methods for MURSAT1 Mission Dashboard
 
 from cgi import parse_qs, escape
 from mmd.MmdWidgets import *
+from mmd.MmdUser import User
 
 def loginForm (session):
   """
   display the login form
   """
-  return indexWidget (dataWidget (), loginFormWidget (), statusWidget (session.session_id, session.user))
+  return indexWidget (dataWidget (), loginFormWidget (), statusWidget (session.session_id, session.email))
 
 def login (session):
   """
@@ -18,43 +19,60 @@ def login (session):
   email = escape (session.qs.get ('email', [''])[0])
   # check for account
   # verify password
-  return indexWidget (dataWidget (), loginWidget (email), statusWidget (session.session_id, session.user))
+  return indexWidget (dataWidget (), loginWidget (email), statusWidget (session.session_id, email))
 
 def registerForm (session):
   """
   display the register form
   """
-  return indexWidget (dataWidget (), registerFormWidget (), statusWidget (session.session_id, session.user))
+  return indexWidget (dataWidget (), registerFormWidget (), statusWidget (session.session_id, session.email))
 
 def register (session):
   """
   evaluate data from registerForm
   """
-  return indexWidget (dataWidget (), registerWidget (), statusWidget (session.session_id, session.user))
+  firstname = session.getQsFirstname ()
+  lastname = session.getQsLastname ()
+  email = session.getQsEmail ()
+  callsign = session.getQsCallsign ()
+  longitude = session.getQsLongitude ()
+  latitude = session.getQsLatitude ()
+  password = session.getQsPassword ()
+  confirm = session.getQsConfirm ()
+
+  if password != confirm:
+    error_message = {'error': 'Password', 'description': 'Passwords do not match'}
+    return indexWidget (dataWidget (), errorWidget (error_message), statusWidget (session.session_id, session.email))
+
+  user = User ()
+  user.create (session.session_id, firstname, lastname, email, callsign, longitude, latitude, password)
+
+
+  return indexWidget (dataWidget (), registerWidget (), statusWidget (session.session_id, session.email))
 
 def submitForm (session):
   """
   display the form for data submission
   """
-  return indexWidget (dataWidget (), submitFormWidget (), statusWidget (session.session_id, session.user))
+  return indexWidget (dataWidget (), submitFormWidget (), statusWidget (session.session_id, session.email))
 
 def submit (session):
   """
   evaluate data from submitForm
   """
-  return indexWidget (dataWidget (), submitWidget (), statusWidget (session.session_id, session.user))
+  return indexWidget (dataWidget (), submitWidget (), statusWidget (session.session_id, session.email))
 
 def viewlog (session):
   """
   show latest log entries/submissions
   """
-  return indexWidget (dataWidget (), logWidget (), statusWidget (session.session_id, session.user))
+  return indexWidget (dataWidget (), logWidget (), statusWidget (session.session_id, session.email))
 
 def index (session):
   """
   display the index page
   """
-  return indexWidget (dataWidget (), osmWidget (), statusWidget (session.session_id, session.user))
+  return indexWidget (dataWidget (), osmWidget (), statusWidget (session.session_id, session.email))
 
 def mmdtest (env, cookie):
   body = ''