Changeset 2037

Timestamp:

2008-06-03 22:09:40 (22 months ago)

Author:

alfonsoml

Message:

Fix the support for network paths in the asp connector. #2063

Location:

FCKeditor/trunk

Files:

• editor/filemanager/connectors/asp/commands.asp (modified) (2 diffs)
• editor/filemanager/connectors/asp/io.asp (modified) (3 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/filemanager/connectors/asp/commands.asp

@@ -104 +104 @@
                 ' 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
@@ -172 +172 @@
                         Do While ( True )
                                 Dim sFilePath
-                                sFilePath = sServerDir & sFileName
+                                sFilePath = CombineLocalPaths(sServerDir, sFileName)
 
                                 If ( oFSO.FileExists( sFilePath ) ) Then

FCKeditor/trunk/editor/filemanager/connectors/asp/io.asp

@@ -24 +24 @@
 function CombinePaths( sBasePath, sFolder)
         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
 
@@ -70 +76 @@
 
         ' Return the resource type directory combined with the required path.
-        ServerMapFolder = CombinePaths( sResourceTypePath, folderPath )
+        ServerMapFolder = CombineLocalPaths( sResourceTypePath, folderPath )
 End Function
 
@@ -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.

FCKeditor/trunk/_whatsnew.html

@@ -107 +107 @@
                 <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>