Changeset 1069 for ZMS/trunk/_accessmanager.py

Timestamp:

25.06.2010 23:25:14 (2 years ago)

Author:

zmsdev

Message:

Applied fix for removing deleted LDAP-users from ZMS Revised unauthorized.

File:

• ZMS/trunk/_accessmanager.py (modified) (2 diffs)

ZMS/trunk/_accessmanager.py

@@ -109 +109 @@
 # ------------------------------------------------------------------------------
 def deleteUser(self, id, REQUEST):
-  lang = REQUEST['lang']
   userFldr = self.getUserFolder()
   
-  userObj = userFldr.getUser(id)
-  if userObj is not None:
-    
-    # Delete local roles in node.
-    # ---------------------------
-    nodes = self.getUserAttr(userObj,'nodes',{})
-    for node in nodes.keys():
-      ob = self.getLinkObj(node,REQUEST)
-      if ob is not None:
-        ob.manage_delLocalRoles(userids=[getUserId(userObj)])
-    
-    # Delete user.
-    # ------------
-    self.delUserAttr(userObj)
-    if userFldr.meta_type != 'LDAPUserFolder':
+  # Delete local roles in node.
+  # ---------------------------
+  nodes = self.getUserAttr(id,'nodes',{})
+  for node in nodes.keys():
+    ob = self.getLinkObj(node,REQUEST)
+    if ob is not None:
+      ob.manage_delLocalRoles(userids=[id])
+  
+  # Delete user from ZMS dictionary.
+  # --------------------------------
+  self.delUserAttr(id)
+  
+  # Delete user from User-Folder.
+  # -----------------------------
+  if userFldr.meta_type != 'LDAPUserFolder':
+    userObj = userFldr.getUser(id)
+    if userObj is not None:
       userFldr.userFolderDelUsers([id])
-    id = ''
   
+  id = ''
   return id
 
@@ -254 +255 @@
 
     # --------------------------------------------------------------------------
-    #  AccessableObject.viewPermission:
-    #
-    #  Raises exception.
-    # --------------------------------------------------------------------------
-    viewPermission__roles__ = ['ZMSAdministrator','ZMSEditor','ZMSAuthor','ZMSSubscriber']
-    def viewPermission(self): pass
-
-    # --------------------------------------------------------------------------
     #  AccessableObject.hasRestrictedAccess:
     # --------------------------------------------------------------------------