[zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrgMembership.py:1.15

[Jens Vagelpohl]

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv7589/Extensions

Modified Files:
	setupZopeOrgMembership.py 
Log Message:
ugly, but it works.



=== Products/ZopeOrg-NV/Extensions/setupZopeOrgMembership.py 1.14 => 1.15 ===
 
 import string, os
+from Products.LDAPUserFolder.LDAPUserFolder import manage_addLDAPUserFolder
 from Products.ZopeOrg import zopeorg_globals
 from Products.CMFCore.DirectoryView import addDirectoryViews
 from Products.CMFCore.utils import getToolByName
@@ -131,7 +132,43 @@
 
 def modifyLDAPTools(portal_obj):
     """ Modify the LDAP tools to know about our specific schema """
-    LLA = getattr(portal_obj, 'acl_users', None)
+    if 'acl_users' in portal_obj.objectIds():
+        LLA = getattr(portal_obj, 'acl_users')
+        if getattr( LLA, 'meta_type' ) != 'LDAPUserFolder':
+            portal_obj._delObject('acl_users')
+            portal_obj.__allow_groups__ = None
+            manage_addLDAPUserFolder( portal_obj
+                                    , title=''
+                                    , LDAP_server = LDAP_SERVER
+                                    , login_attr = LDAP_SETTINGS['login_attr']
+                                    , users_base = LDAP_SETTINGS['users_base']
+                                    , users_scope = LDAP_SETTINGS['users_scope']
+                                    , roles = LDAP_SETTINGS['default_roles']
+                                    , groups_base = LDAP_SETTINGS['groups_base']
+                                    , groups_scope = LDAP_SETTINGS['groups_scope']
+                                    , binduid = LDAP_SETTINGS['bind_uid']
+                                    , bindpwd = LDAP_SETTINGS['bind_pwd']
+                                    , use_cookies = LDAP_SETTINGS['use_cookies']
+                                    , rdn_attr = LDAP_SETTINGS['rdn_attr']
+                                    )
+            LLA = getattr(portal_obj, 'acl_users')
+    else:
+        manage_addLDAPUserFolder( portal_obj
+                                , title=''
+                                , LDAP_server = LDAP_SERVER
+                                , login_attr = LDAP_SETTINGS['login_attr']
+                                , users_base = LDAP_SETTINGS['users_base']
+                                , users_scope = LDAP_SETTINGS['users_scope']
+                                , roles = LDAP_SETTINGS['default_roles']
+                                , groups_base = LDAP_SETTINGS['groups_base']
+                                , groups_scope = LDAP_SETTINGS['groups_scope']
+                                , binduid = LDAP_SETTINGS['bind_uid']
+                                , bindpwd = LDAP_SETTINGS['bind_pwd']
+                                , use_cookies = LDAP_SETTINGS['use_cookies']
+                                , rdn_attr = LDAP_SETTINGS['rdn_attr']  
+                                )
+        LLA = getattr(portal_obj, 'acl_users')
+                                                
 
     for ldap_name, friendly_name in LDAP_SCHEMA:
         public_name = LDAP_NAME_MAPPINGS.get(ldap_name, '')