Changeset 391 for FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/commands.php

Timestamp:

2007-06-26 00:10:59 (17 months ago)

Author:

fredck

Message:

Fix for SA25719.

Files:

• FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/commands.php (modified) (2 diffs)

FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/commands.php

@@ -160 +160 @@
                 $oFile = $_FILES['NewFile'] ;
 
-                // Map the virtual path to the local server path.
-                $sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
-
                 // Get the uploaded file name.
                 $sFileName = $oFile['name'] ;
@@ -170 +167 @@
                         $sFileName = preg_replace( '/\\.(?![^.]*$)/', '_', $sFileName ) ;
 
-                $sOriginalFileName = $sFileName ;
-
-                // Get the extension.
-                $sExtension = substr( $sFileName, ( strrpos($sFileName, '.') + 1 ) ) ;
-                $sExtension = strtolower( $sExtension ) ;
-
-                $arAllowed      = $Config['AllowedExtensions'][$resourceType] ;
-                $arDenied       = $Config['DeniedExtensions'][$resourceType] ;
-
-                if ( ( count($arAllowed) == 0 || in_array( $sExtension, $arAllowed ) ) && ( count($arDenied) == 0 || !in_array( $sExtension, $arDenied ) ) )
+                if ( CheckFileName( $sFileName, $resourceType ) )
                 {
+                        // Map the virtual path to the local server path.
+                        $sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
+                        
+                        $sOriginalFileName = $sFileName ;
+
+                        // Get the extension.
+                        $sExtension = substr( $sFileName, ( strrpos($sFileName, '.') + 1 ) ) ;
+                        $sExtension = strtolower( $sExtension ) ;
+
                         $iCounter = 0 ;