Changeset 9303

Timestamp:

6 Oct 2012, 12:09:01 (12 years ago)

Author:

Henrik Bettermann

Message:

Catch traceback if student password is None.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/pages.py (modified) (1 diff)
• permissions.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -206 +206 @@
             login = self.request.form['form.login']
             if len(login) == 8 and grok.getSite()['students'].has_key(login):
-                student = grok.getSite()['students'][
-                    self.request.form['form.login']]
+                student = grok.getSite()['students'][login]
                 password = self.request.form['form.password']
                 passwordmanager = getUtility(IPasswordManager, 'SSHA')
-                if passwordmanager.checkPassword(student.password, password):
+                if student.password is not None and \
+                    passwordmanager.checkPassword(student.password, password):
                     self.flash(_('Your account has been deactivated.'))
                     return

main/waeup.kofa/trunk/src/waeup/kofa/permissions.py

@@ -228 +228 @@
 
 class CCOfficer(grok.Role):
-    """This is basically a copy of the the PortalManager. We exclude some
+    """This is basically a copy of the the PortalManager class. We exclude some
     'dangerous' permissions by commenting them out.
     """