Ticket #1873: 1873_3.patch

editor/filemanager/connectors/py/config.py

@@ -65 +65 @@
 # Allowed Resource Types
 ConfigAllowedTypes = ['File', 'Image', 'Flash', 'Media']
 
+# After file is uploaded, sometimes it is required to change its permissions
+# so that it was possible to access it at the later time.
+# If possible, it is recommended to set more restrictive permissions, like 0755.
+# Set to 0 to disable this feature.
+# Note: not needed on Windows-based servers.
+ChmodOnUpload = 0755
+
+# See comments above.
+# Used when creating folders that does not exist.
+ChmodOnFolderCreate = 0755
+
 # Do not touch this 3 lines, see "Configuration settings for each Resource Type"
 AllowedExtensions = {}; DeniedExtensions = {};
 FileTypesPath = {}; FileTypesAbsolutePath = {};

editor/filemanager/connectors/py/fckcommands.py

@@ -110 +110 @@
         def createServerFolder(self, folderPath):
                 "Purpose: physically creates a folder on the server"
                 # No need to check if the parent exists, just create all hierachy
-                oldumask = os.umask(0)
-                os.makedirs(folderPath,mode=0755)
-                os.umask( oldumask )
+                
+                try:
+                        permissions = Config.ChmodOnFolderCreate
+                        if not permissions:
+                                os.makedirs(folderPath)                         
+                except AttributeError: #ChmodOnFolderCreate undefined
+                        permissions = 0755
+                
+                if permissions:
+                        oldumask = os.umask(0)
+                        os.makedirs(folderPath,mode=0755)
+                        os.umask( oldumask )                    
 
 class UploadFileCommandMixin (object):
         def uploadFile(self, resourceType, currentFolder):
@@ -168 +177 @@
                                                 fout.close()
 
                                                 if os.path.exists ( newFilePath ):
-                                                        oldumask = os.umask(0)
-                                                        os.chmod( newFilePath, 0755 )
-                                                        os.umask( oldumask )
+                                                        doChmod = False
+                                                        try:
+                                                                doChmod = Config.ChmodOnUpload
+                                                                permissions = Config.ChmodOnUpload
+                                                        except AttributeError: #ChmodOnUpload undefined
+                                                                doChmod = True
+                                                                permissions = 0755
+                                                        if ( doChmod ):
+                                                                oldumask = os.umask(0)
+                                                                os.chmod( newFilePath, permissions )
+                                                                os.umask( oldumask )
 
                                                 newFileUrl = self.webUserFilesFolder + currentFolder + newFileName