Ticket #1871: 1871_2.patch

editor/filemanager/connectors/php/commands.php

@@ -219 +219 @@
 
                                         if ( is_file( $sFilePath ) )
                                         {
+                                                if ( isset( $Config['ChmodOnUpload'] ) && !$Config['ChmodOnUpload'] )
+                                                {
+                                                        break ;
+                                                }
+                                                
+                                                $permissions = 0777;
+                                                
+                                                if ( isset( $Config['ChmodOnUpload'] ) && $Config['ChmodOnUpload'] )
+                                                {
+                                                        $permissions = $Config['ChmodOnUpload'] ;
+                                                }
+                                                
                                                 $oldumask = umask(0) ;
-                                                chmod( $sFilePath, 0777 ) ;
+                                                chmod( $sFilePath, $permissions ) ;
                                                 umask( $oldumask ) ;
                                         }
 

editor/filemanager/connectors/php/config.php

@@ -47 +47 @@
 // following setting enabled.
 $Config['ForceSingleExtension'] = true ;
 
-// Perform additional checks for image files
-// if set to true, validate image size (using getimagesize)
+// Perform additional checks for image files.
+// If set to true, validate image size (using getimagesize).
 $Config['SecureImageUploads'] = true;
 
-// What the user can do with this connector
+// What the user can do with this connector.
 $Config['ConfigAllowedCommands'] = array('QuickUpload', 'FileUpload', 'GetFolders', 'GetFoldersAndFiles', 'CreateFolder') ;
 
-// Allowed Resource Types
+// Allowed Resource Types.
 $Config['ConfigAllowedTypes'] = array('File', 'Image', 'Flash', 'Media') ;
 
 // For security, HTML is allowed in the first Kb of data for files having the
 // following extensions only.
 $Config['HtmlExtensions'] = array("html", "htm", "xml", "xsd", "txt", "js") ;
 
+// 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.
+$Config['ChmodOnUpload'] = 0777 ;
+
+// See comments above.
+// Used when creating folders that does not exist.
+$Config['ChmodOnFolderCreate'] = 0777 ;
+
 /*
         Configuration settings for each Resource Type
 

editor/filemanager/connectors/php/io.php

@@ -88 +88 @@
 
 function CreateServerFolder( $folderPath, $lastFolder = null )
 {
+        global $Config ;
         $sParent = GetParentFolder( $folderPath ) ;
 
         // Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
@@ -118 +119 @@
                 // Enable error tracking to catch the error.
                 ini_set( 'track_errors', '1' ) ;
 
+                $permissions = 0777 ;
+                if ( isset( $Config['ChmodOnFolderCreate'] ) && $Config['ChmodOnFolderCreate'] )
+                {
+                        $permissions = $Config['ChmodOnFolderCreate'] ;
+                }
+                
                 // To create the folder with 0777 permissions, we need to set umask to zero.
                 $oldumask = umask(0) ;
-                mkdir( $folderPath, 0777 ) ;
+                mkdir( $folderPath, $permissions ) ;
                 umask( $oldumask ) ;
 
                 $sErrorMsg = $php_errormsg ;