[Checkins] SVN: PluggableAuthService/ Backport 72192 from trunk

[Wichert Akkerman]

Log message for revision 72211:
  Backport 72192 from trunk

Changed:
  U   PluggableAuthService/branches/1.4/plugins/CookieAuthHelper.py
  U   PluggableAuthService/branches/z3-events/interfaces/events.py
  U   PluggableAuthService/trunk/plugins/CookieAuthHelper.py

-=-
Modified: PluggableAuthService/branches/1.4/plugins/CookieAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/CookieAuthHelper.py	2007-01-24 11:31:53 UTC (rev 72210)
+++ PluggableAuthService/branches/1.4/plugins/CookieAuthHelper.py	2007-01-24 12:41:44 UTC (rev 72211)
@@ -110,7 +110,7 @@
         cookie = request.get(self.cookie_name, '')
         login = request.get('__ac_name', '')
 
-        if login:
+        if login and request.form.has_key('__ac_password'):
             # Look in the request for the names coming from the login form
             login = request.get('__ac_name', '')
             password = request.get('__ac_password', '')

Modified: PluggableAuthService/branches/z3-events/interfaces/events.py
===================================================================
--- PluggableAuthService/branches/z3-events/interfaces/events.py	2007-01-24 11:31:53 UTC (rev 72210)
+++ PluggableAuthService/branches/z3-events/interfaces/events.py	2007-01-24 12:41:44 UTC (rev 72211)
@@ -25,6 +25,16 @@
     login = Attribute('Login name')
 
 
+class IUserLoggedIn(IPASUserEvent):
+    """ A user logged in.
+    """
+
+
+class IUserLoggedOut(IPASUserEvent):
+    """ A user logged in.
+    """
+
+
 class IUserDeleted(IPASUserEvent):
     """A user has been removed.
     """

Modified: PluggableAuthService/trunk/plugins/CookieAuthHelper.py
===================================================================
--- PluggableAuthService/trunk/plugins/CookieAuthHelper.py	2007-01-24 11:31:53 UTC (rev 72210)
+++ PluggableAuthService/trunk/plugins/CookieAuthHelper.py	2007-01-24 12:41:44 UTC (rev 72211)
@@ -113,7 +113,7 @@
         # Look in the request.form for the names coming from the login form
         login = request.form.get('__ac_name', '')
 
-	if login and request.form.has_key('__ac_password'):
+        if login and request.form.has_key('__ac_password'):
             creds['login'] = login
             creds['password'] = request.form.get('__ac_password', '')