[Zope-CVS] SVN: PluggableAuthService/trunk/ - Fix manage_zmi_logout which stopped working correctly as soon as the

[Jens Vagelpohl]

Log message for revision 65457:
  - Fix manage_zmi_logout which stopped working correctly as soon as the
    PluggableAuthService product code was installed by correcting the
    monkeypatch for it in __init__.py.
    (http://www.zope.org/Members/urbanape/PluggableAuthService/Collector/12)
  

Changed:
  U   PluggableAuthService/trunk/__init__.py
  U   PluggableAuthService/trunk/doc/CHANGES.txt

-=-
Modified: PluggableAuthService/trunk/__init__.py
===================================================================
--- PluggableAuthService/trunk/__init__.py	2006-02-25 18:51:23 UTC (rev 65456)
+++ PluggableAuthService/trunk/__init__.py	2006-02-25 19:05:27 UTC (rev 65457)
@@ -75,6 +75,7 @@
 # monkey patch Zope to cause zmi logout to be PAS-aware
 from App.Management import Navigation
 from interfaces.authservice import IPluggableAuthService
+from zExceptions import Unauthorized
 
 def manage_zmi_logout(self, REQUEST, RESPONSE):
     """Logout current user"""
@@ -86,8 +87,8 @@
         acl_users.resetCredentials(REQUEST, RESPONSE)
     else:
         realm=RESPONSE.realm
-        RESPONSE.setStatus(401)
         RESPONSE.setHeader('WWW-Authenticate', 'basic realm="%s"' % realm, 1)    
+        raise Unauthorized, '<p>You have been logged out.</p>'
     referrer = REQUEST.get('HTTP_REFERER') # HTTP_REFERER is optional header
     if referrer:
         REQUEST['RESPONSE'].redirect(referrer)

Modified: PluggableAuthService/trunk/doc/CHANGES.txt
===================================================================
--- PluggableAuthService/trunk/doc/CHANGES.txt	2006-02-25 18:51:23 UTC (rev 65456)
+++ PluggableAuthService/trunk/doc/CHANGES.txt	2006-02-25 19:05:27 UTC (rev 65457)
@@ -2,6 +2,13 @@
 
   After PluggableAuthService 1.2-beta
 
+    Bugs Fixed
+
+      - Fix manage_zmi_logout which stopped working correctly as soon as the
+        PluggableAuthService product code was installed by correcting the
+        monkeypatch for it in __init__.py.
+        (http://www.zope.org/Members/urbanape/PluggableAuthService/Collector/12)
+
     Other
 
       - Removed STX links from README.txt which do nothing but return