[CMF-checkins] SVN: CMF/branches/1.5/CMF - Fix broken security assertions, surfaced via Florent's r00ling new warning.

[Tres Seaver]

Log message for revision 40634:
   - Fix broken security assertions, surfaced via Florent's r00ling new warning.

Changed:
  U   CMF/branches/1.5/CMFCore/PortalContent.py
  U   CMF/branches/1.5/CMFSetup/tool.py
  U   CMF/branches/1.5/CMFSetup/workflow.py

-=-
Modified: CMF/branches/1.5/CMFCore/PortalContent.py
===================================================================
--- CMF/branches/1.5/CMFCore/PortalContent.py	2005-12-07 20:57:03 UTC (rev 40633)
+++ CMF/branches/1.5/CMFCore/PortalContent.py	2005-12-07 21:04:44 UTC (rev 40634)
@@ -72,7 +72,6 @@
     # The security for FTP methods aren't set up by default in our
     # superclasses...  :(
     security.declareProtected(FTPAccess, 'manage_FTPstat')
-    security.declareProtected(FTPAccess, 'manage_FTPget')
     security.declareProtected(FTPAccess, 'manage_FTPlist')
 
     def failIfLocked(self):

Modified: CMF/branches/1.5/CMFSetup/tool.py
===================================================================
--- CMF/branches/1.5/CMFSetup/tool.py	2005-12-07 20:57:03 UTC (rev 40633)
+++ CMF/branches/1.5/CMFSetup/tool.py	2005-12-07 21:04:44 UTC (rev 40634)
@@ -157,7 +157,7 @@
         """
         return 'ascii'
 
-    security.declareProtected( ManagePortal, 'getImportContextId' )
+    security.declareProtected( ManagePortal, 'getImportContextID' )
     def getImportContextID( self ):
 
         """ See ISetupTool.
@@ -196,7 +196,7 @@
         """
         return self._toolset_registry
 
-    security.declareProtected( ManagePortal, 'executeStep' )
+    security.declareProtected( ManagePortal, 'runImportStep' )
     def runImportStep( self, step_id, run_dependencies=True, purge_old=None ):
 
         """ See ISetupTool.
@@ -226,7 +226,7 @@
 
         return { 'steps' : steps, 'messages' : messages }
 
-    security.declareProtected( ManagePortal, 'runAllSetupSteps')
+    security.declareProtected( ManagePortal, 'runAllImportSteps')
     def runAllImportSteps( self, purge_old=None ):
 
         """ See ISetupTool.

Modified: CMF/branches/1.5/CMFSetup/workflow.py
===================================================================
--- CMF/branches/1.5/CMFSetup/workflow.py	2005-12-07 20:57:03 UTC (rev 40633)
+++ CMF/branches/1.5/CMFSetup/workflow.py	2005-12-07 21:04:44 UTC (rev 40634)
@@ -364,7 +364,7 @@
 
         return self._workflowConfig( workflow_id=workflow_id )
 
-    security.declareProtected( ManagePortal, 'generateWorkflowScripts' )
+    security.declareProtected( ManagePortal, 'getWorkflowScripts' )
     def getWorkflowScripts( self, workflow_id ):
         """ Get workflow scripts information
         """