[Zope-Checkins] CVS: Zope/lib/python/OFS - ObjectManager.py:1.166

[Jim Fulton]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv4917/lib/python/OFS

Modified Files:
	ObjectManager.py 
Log Message:
Removed permission requirements for non-existent method.

Changed call to no-longer-supported validateValue methos to use the
validate method instead.

Use new getRoles function to get object roles, rather than using
__roles__ attribute.


=== Zope/lib/python/OFS/ObjectManager.py 1.165 => 1.166 ===
--- Zope/lib/python/OFS/ObjectManager.py:1.165	Tue Nov 18 08:17:03 2003
+++ Zope/lib/python/OFS/ObjectManager.py	Fri Nov 28 11:45:35 2003
@@ -35,6 +35,7 @@
 import App.Common
 from App.config import getConfiguration
 from AccessControl import getSecurityManager
+from AccessControl.ZopeSecurityPolicy import getRoles
 from zLOG import LOG, ERROR
 from zExceptions import BadRequest
 import sys,fnmatch,copy
@@ -111,7 +112,7 @@
     """
 
     __ac_permissions__=(
-        ('View management screens', ('manage_main','manage_menu')),
+        ('View management screens', ('manage_main',)),
         ('Access contents information',
          ('objectIds', 'objectValues', 'objectItems',''),
          ('Anonymous', 'Manager'),
@@ -636,12 +637,15 @@
         if not (len(REQUEST.PARENTS) > 1 and
                 self.objectValues() == REQUEST.PARENTS[1].objectValues()):
             try:
-                if getSecurityManager().validateValue(self.manage_FTPlist):
+                if getSecurityManager().validate(
+                    None, self, 'manage_FTPlist', self.manage_FTPlist
+                    ):
                     mode=mode | 0770
             except: pass
             if nobody.allowed(
-                        self.manage_FTPlist,
-                        self.manage_FTPlist.__roles__):
+                self.manage_FTPlist,
+                getRoles(self, 'manage_FTPlist', self.manage_FTPlist, ()),
+                self.manage_FTPlist.__roles__):
                 mode=mode | 0007
         mtime=self.bobobase_modification_time().timeTime()
         # get owner and group