Commit 3535b932 authored by Jim Fulton's avatar Jim Fulton

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.
parent 1b557276
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
############################################################################## ##############################################################################
__doc__="""Object Manager __doc__="""Object Manager
$Id: ObjectManager.py,v 1.165 2003/11/18 13:17:03 tseaver Exp $""" $Id: ObjectManager.py,v 1.166 2003/11/28 16:45:35 jim Exp $"""
__version__='$Revision: 1.165 $'[11:-2] __version__='$Revision: 1.166 $'[11:-2]
import App.Management, Acquisition, Globals, CopySupport, Products import App.Management, Acquisition, Globals, CopySupport, Products
import os, App.FactoryDispatcher, re, Products import os, App.FactoryDispatcher, re, Products
...@@ -35,6 +35,7 @@ import marshal ...@@ -35,6 +35,7 @@ import marshal
import App.Common import App.Common
from App.config import getConfiguration from App.config import getConfiguration
from AccessControl import getSecurityManager from AccessControl import getSecurityManager
from AccessControl.ZopeSecurityPolicy import getRoles
from zLOG import LOG, ERROR from zLOG import LOG, ERROR
from zExceptions import BadRequest from zExceptions import BadRequest
import sys,fnmatch,copy import sys,fnmatch,copy
...@@ -111,7 +112,7 @@ class ObjectManager( ...@@ -111,7 +112,7 @@ class ObjectManager(
""" """
__ac_permissions__=( __ac_permissions__=(
('View management screens', ('manage_main','manage_menu')), ('View management screens', ('manage_main',)),
('Access contents information', ('Access contents information',
('objectIds', 'objectValues', 'objectItems',''), ('objectIds', 'objectValues', 'objectItems',''),
('Anonymous', 'Manager'), ('Anonymous', 'Manager'),
...@@ -636,12 +637,15 @@ class ObjectManager( ...@@ -636,12 +637,15 @@ class ObjectManager(
if not (len(REQUEST.PARENTS) > 1 and if not (len(REQUEST.PARENTS) > 1 and
self.objectValues() == REQUEST.PARENTS[1].objectValues()): self.objectValues() == REQUEST.PARENTS[1].objectValues()):
try: try:
if getSecurityManager().validateValue(self.manage_FTPlist): if getSecurityManager().validate(
None, self, 'manage_FTPlist', self.manage_FTPlist
):
mode=mode | 0770 mode=mode | 0770
except: pass except: pass
if nobody.allowed( if nobody.allowed(
self.manage_FTPlist, self.manage_FTPlist,
self.manage_FTPlist.__roles__): getRoles(self, 'manage_FTPlist', self.manage_FTPlist, ()),
self.manage_FTPlist.__roles__):
mode=mode | 0007 mode=mode | 0007
mtime=self.bobobase_modification_time().timeTime() mtime=self.bobobase_modification_time().timeTime()
# get owner and group # get owner and group
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment