Ticket #2622: commands.patch

.php

@@ -169 +169 @@
 
                 $oFile = $_FILES['NewFile'] ;
 
-                // Map the virtual path to the local server path.
-                $sServerDir = ServerMapFolder( $resourceType, $currentFolder, $sCommand ) ;
-
                 // Get the uploaded file name.
                 $sFileName = $oFile['name'] ;
                 $sFileName = SanitizeFileName( $sFileName ) ;
@@ -182 +179 @@
                 $sExtension = substr( $sFileName, ( strrpos($sFileName, '.') + 1 ) ) ;
                 $sExtension = strtolower( $sExtension ) ;
 
+                if ( $Config['QuickUploadFileDispatching'] ) {   // #PATCH: automatically dispatch uploaded files
+                        foreach ( $Config['ConfigAllowedTypes'] as $type ) {
+                                if ( $type != 'File' && in_array ( $sExtension, $Config['AllowedExtensions'][$type] ) ) {
+                                        $resourceType = $type;
+                                }
+                        }
+                }
+
+                // Map the virtual path to the local server path.
+                $sServerDir = ServerMapFolder( $resourceType, $currentFolder, $sCommand ) ; // #PATCH: original line moved down
+
                 if ( isset( $Config['SecureImageUploads'] ) )
                 {
                         if ( ( $isImageValid = IsImageValid( $oFile['tmp_name'], $sExtension ) ) === false )