[Zope-Checkins] CVS: Zope/lib/python/OFS - Folder.py:1.101.66.1

[Yvo Schubbe]

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

Modified Files:
      Tag: yuppie-ordersupport-branch
	Folder.py 
Log Message:
permissions cleanup


=== Zope/lib/python/OFS/Folder.py 1.101 => 1.101.66.1 ===
--- Zope/lib/python/OFS/Folder.py:1.101	Wed Aug 14 17:42:56 2002
+++ Zope/lib/python/OFS/Folder.py	Fri Apr 25 05:38:57 2003
@@ -22,10 +22,12 @@
 import Globals, SimpleItem, ObjectManager, PropertyManager
 import AccessControl.Role, webdav.Collection, FindSupport
 from webdav.WriteLockInterface import WriteLockInterface
+from AccessControl import getSecurityManager
 from AccessControl import Unauthorized
+from AccessControl.Permissions import add_page_templates
+from AccessControl.Permissions import add_user_folders
 
 from Globals import DTMLFile
-from AccessControl import getSecurityManager
 
 
 manage_addFolderForm=DTMLFile('dtml/folderAdd', globals())
@@ -49,14 +51,14 @@
     checkPermission=getSecurityManager().checkPermission
 
     if createUserF:
-        if not checkPermission('Add User Folders', ob):
+        if not checkPermission(add_user_folders, ob):
             raise Unauthorized, (
                   'You are not authorized to add User Folders.'
                   )
         ob.manage_addUserFolder()
 
     if createPublic:
-        if not checkPermission('Add Page Templates', ob):
+        if not checkPermission(add_page_templates, ob):
             raise Unauthorized, (
                   'You are not authorized to add Page Templates.'
                   )