From 47f69ce0e9e24275ac74a861b0b794dcd1e73204 Mon Sep 17 00:00:00 2001 From: Jogi Hofmüller Date: Tue, 2 Aug 2011 08:32:47 +0000 Subject: - modified/improved session handling git-svn-id: https://svn.spreadspace.org/mur.sat@89 7de4ea59-55d0-425e-a1af-a3118ea81d4c --- tools/mmd/MmdCommands.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'tools/mmd/MmdCommands.py') diff --git a/tools/mmd/MmdCommands.py b/tools/mmd/MmdCommands.py index d33190b..41f1178 100644 --- a/tools/mmd/MmdCommands.py +++ b/tools/mmd/MmdCommands.py @@ -17,8 +17,6 @@ def login (session): evaluate data from loginForm """ email = escape (session.qs.get ('email', [''])[0]) - # check for account - # verify password return indexWidget (dataWidget (), loginWidget (email), statusWidget (session)) def registerForm (session): @@ -46,23 +44,22 @@ def register (session): user = User () code = user.create (session.session_id, firstname, lastname, email, callsign, longitude, latitude, password) - user.email = email message = '''From: noreply -To: {0} +To: "{0} {1}" <{2}> Subject: MMD registration confirmation request -Good day! +Dear {0} {1}, -Someone (probably you) has registered at the MURSAT1 Mission Dashbaord +someone (probably you) has registered at the MURSAT1 Mission Dashbaord (MMD) at http://sat.mur.at/dashboard. Please confirm the registration using the link below: - http://hofos.at/mmd/?cmd=completeRegistration&code={1} + http://hofos.at/mmd/?cmd=completeRegistration&code={3} Regards, MURSAT1 team -'''.format (user.email, code) +'''.format (user.firstname, user.lastname, user.email, code) if not user.sendEmail (message): error_message = {'error': 'Email', 'description': 'Email could not be sent.'} -- cgit v1.2.3