Ticket #2063: 2063.patch

_whatsnew.html

@@ -106 +106 @@
                         are applied in the image preview dialog.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2056">#2056</a>] Fixed several validation 
                         errors in the dialogs.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2063">#2063</a>] Fixed some problems in asp
+                        related to the use of network paths for the location of the uploaded files.</li>
         </ul>
         <h3>
                 Version 2.6</h3>

editor/filemanager/connectors/asp/commands.asp

@@ -103 +103 @@
         Else
                 ' Map the virtual path to the local server path of the current folder.
                 Dim sServerDir
-                sServerDir = ServerMapFolder( resourceType, CombinePaths(currentFolder, sNewFolderName), "CreateFolder" )
+                sServerDir = ServerMapFolder( resourceType, CombineLocalPaths(currentFolder, sNewFolderName), "CreateFolder" )
 
                 On Error Resume Next
 
@@ -171 +171 @@
 
                         Do While ( True )
                                 Dim sFilePath
-                                sFilePath = sServerDir & sFileName
+                                sFilePath = CombineLocalPaths(sServerDir, sFileName)
 
                                 If ( oFSO.FileExists( sFilePath ) ) Then
                                         iCounter = iCounter + 1

editor/filemanager/connectors/asp/io.asp

@@ -25 +25 @@
         CombinePaths =  RemoveFromEnd( sBasePath, "/" ) & "/" & RemoveFromStart( sFolder, "/" )
 end function
 
+function CombineLocalPaths( sBasePath, sFolder)
+        sFolder = replace(sFolder, "/", "\")
+        ' The RemoveFrom* functions use RegExp, so we must escape the \
+        CombineLocalPaths =  RemoveFromEnd( sBasePath, "\\" ) & "\" & RemoveFromStart( sFolder, "\\" )
+end function
+
 Function GetResourceTypePath( resourceType, sCommand )
         if ( sCommand = "QuickUpload") then
                 GetResourceTypePath = ConfigQuickUploadPath.Item( resourceType )
@@ -69 +75 @@
         CreateServerFolder sResourceTypePath
 
         ' Return the resource type directory combined with the required path.
-        ServerMapFolder = CombinePaths( sResourceTypePath, folderPath )
+        ServerMapFolder = CombineLocalPaths( sResourceTypePath, folderPath )
 End Function
 
 Sub CreateServerFolder( folderPath )
@@ -79 +85 @@
         Dim sParent
         sParent = oFSO.GetParentFolderName( folderPath )
 
+        ' If folderPath is a network path (\\server\folder\) then sParent is an empty string.
+        ' Get out.
+        if (sParent = "") then exit sub
+
         ' Check if the parent exists, or create it.
         If ( NOT oFSO.FolderExists( sParent ) ) Then CreateServerFolder( sParent )