From a46f583cd7d2f24440eabf1bb7e7cd1e56fa6f22 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 5 Jan 2007 18:05:16 +0000 Subject: [PATCH] - moved email notification code to Person class. call send_initiate_password_reset_email method instead --- PLC/Methods/InitiateResetPassword.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/PLC/Methods/InitiateResetPassword.py b/PLC/Methods/InitiateResetPassword.py index 1048669..62769bc 100644 --- a/PLC/Methods/InitiateResetPassword.py +++ b/PLC/Methods/InitiateResetPassword.py @@ -59,25 +59,8 @@ class InitiateResetPassword(Method): time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time()+86400)) person.sync() - # email user next step instructions - to_addr = {} - to_addr[person['email']] = "%s %s" % \ - (person['first_name'], person['last_name']) - from_addr = {} - from_addr[self.api.config.PLC_MAIL_SUPPORT_ADDRESS] = \ - "%s %s" % ('Planetlab', 'Support') - messages = Messages(self.api, ['PASSWORD_RESET_INITIATE']) - if not messages: - raise PLCAPIError, "Email template not found" - message = messages[0] - subject = message['subject'] - template = message['template'] % \ - (self.api.config.PLC_WWW_HOST, - verification_key, person['person_id'], - self.api.config.PLC_MAIL_SUPPORT_ADDRESS, - self.api.config.PLC_WWW_HOST) - - self.api.mailer.mail(to_addr, None, from_addr, subject, template) + # send notification email + person.send_initiate_password_reset_email() # Logging variables self.object_ids = [person['person_id']] -- 2.43.0