- added logging variable 'object_type'

[plcapi.git] / PLC / Methods / ResetPassword.py

diff --git a/PLC/Methods/ResetPassword.py b/PLC/Methods/ResetPassword.py
index dd76a03..43ee8ba 100644 (file)
--- a/PLC/Methods/ResetPassword.py
+++ b/PLC/Methods/ResetPassword.py
@@ -39,6 +39,8 @@ class ResetPassword(Method):
 
     returns = Parameter(int, '1 if verification_key is valid')
 
+    object_type = 'Person'
+
     def call(self, auth, person_id_or_email, verification_key = None, verification_expires = None):
        # Get account information
         persons = Persons(self.api, [person_id_or_email])
@@ -49,6 +51,9 @@ class ResetPassword(Method):
         if person['peer_id'] is not None:
             raise PLCInvalidArgument, "Not a local account"
 
+        if not person['enabled']:
+            raise PLCInvalidArgument, "Account must be enabled"
+
         # Be paranoid and deny password resets for admins
         if 'admin' in person['roles']:
             raise PLCInvalidArgument, "Cannot reset admin passwords"
@@ -104,11 +109,11 @@ class ResetPassword(Method):
                       'email': person['email']}
 
             sendmail(self.api,
-                     To = "%s %s <%s>" % (person['first_name'], person['last_name'], person['email']),
-                     Subject = message['subject'],
+                     To = ("%s %s" % (person['first_name'], person['last_name']), person['email']),
+                     Subject = message['subject'] % params,
                      Body = message['template'] % params)
         else:
-            print >> log, "Warning: No message template '%s'" % message-id
+            print >> log, "Warning: No message template '%s'" % message_id
 
        # Logging variables
         self.object_ids = [person['person_id']]