Changeset 290

Timestamp:

2007-05-05 23:59:07 (3 years ago)

Author:

alfonsoml

Message:

Changes for the PHP connector as part of #454 as well as some other little adjustments in the asp part.

Location:

FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors

Files:

• asp/commands.asp (modified) (2 diffs)
• asp/connector.asp (modified) (1 diff)
• asp/io.asp (modified) (1 diff)
• asp/upload.asp (modified) (1 diff)
• php (added)
• php/basexml.php (added)
• php/commands.php (added)
• php/config.php (added)
• php/connector.php (added)
• php/io.php (added)
• php/upload.php (added)
• php/util.php (added)

FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/commands.asp

@@ -33 +33 @@
         Dim oFSO, oCurrentFolder, oFolders, oFolder
         Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" )
+        if not (oFSO.FolderExists( sServerDir ) ) then
+                Set oFSO = Nothing
+                SendError 102, currentFolder
+        end if
+
         Set oCurrentFolder = oFSO.GetFolder( sServerDir )
         Set oFolders = oCurrentFolder.SubFolders
@@ -53 +58 @@
         Dim oFSO, oCurrentFolder, oFolders, oFolder, oFiles, oFile
         Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" )
+        if not (oFSO.FolderExists( sServerDir ) ) then
+                Set oFSO = Nothing
+                SendError 102, currentFolder
+        end if
+
         Set oCurrentFolder = oFSO.GetFolder( sServerDir )
         Set oFolders    = oCurrentFolder.SubFolders

FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/connector.asp

@@ -45 +45 @@
         ' Get the main request information.
         sCommand = Request.QueryString("Command")
+
+        sResourceType = Request.QueryString("Type")
+        If ( sResourceType = "" ) Then sResourceType = "File"
+
+        sCurrentFolder = GetCurrentFolder()
+
+        ' Check if it is an allowed command 
         if ( Not IsAllowedCommand( sCommand ) ) then
                 SendError 1, "The """ & sCommand & """ command isn't allowed"
         end if
 
-        sResourceType = Request.QueryString("Type")
-        If ( sResourceType = "" ) Then sResourceType = "File"
-
-        sCurrentFolder = Request.QueryString("CurrentFolder")
-        If ( sCurrentFolder = "" ) Then sCurrentFolder = "/"
-
-        ' Check if it is an allower resource type.
+        ' Check if it is an allowed resource type.
         if ( Not IsAllowedType( sResourceType ) ) Then 
                 SendError 1, "The """ & sResourceType & """ resource type isn't allowed"
         end if
-
-        ' Check the current folder syntax (must begin and start with a slash).
-        If ( Right( sCurrentFolder, 1 ) <> "/" ) Then sCurrentFolder = sCurrentFolder & "/"
-        If ( Left( sCurrentFolder, 1 ) <> "/" ) Then sCurrentFolder = "/" & sCurrentFolder
-
-        ' Check for invalid folder paths (..)
-        If ( InStr( 1, sCurrentFolder, ".." ) <> 0 OR InStr( 1, sResourceType, ".." ) <> 0 ) Then
-                SendError 102, ""
-        End If
 
         ' File Upload doesn't have to Return XML, so it must be intercepted before anything.

FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/io.asp

@@ -140 +140 @@
 End Function
 
+function GetCurrentFolder()
+{
+        dim sCurrentFolder
+        sCurrentFolder = Request.QueryString("CurrentFolder")
+        If ( sCurrentFolder = "" ) Then sCurrentFolder = "/"
+
+        ' Check the current folder syntax (must begin and start with a slash).
+        If ( Right( sCurrentFolder, 1 ) <> "/" ) Then sCurrentFolder = sCurrentFolder & "/"
+        If ( Left( sCurrentFolder, 1 ) <> "/" ) Then sCurrentFolder = "/" & sCurrentFolder
+
+        ' Check for invalid folder paths (..)
+        If ( InStr( 1, sCurrentFolder, ".." ) <> 0 ) Then
+                SendError 102, ""
+        End If
+
+        GetCurrentFolder = sCurrentFolder
+end function
 
 ' This is the function that sends the results of the uploading process.

FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/upload.asp

@@ -41 +41 @@
 
         sCommand = "FileUpload"
-        if ( Not IsAllowedCommand( sCommand ) ) then
-                SendError 1, "The """ & sCommand & """ command isn't allowed"
-        end if
 
         sResourceType = Request.QueryString("Type")
         If ( sResourceType = "" ) Then sResourceType = "File"
 
-        sCurrentFolder = Request.QueryString("CurrentFolder")
-        If ( sCurrentFolder = "" ) Then sCurrentFolder = "/"
+        sCurrentFolder = GetCurrentFolder()
 
-        ' Check if it is an allower resource type.
+        ' Is Upload enabled?
+        if ( Not IsAllowedCommand( sCommand ) ) then
+                SendUploadResults "1", "", "", "The """ & sCommand & """ command isn't allowed"
+        end if
+
+        ' Check if it is an allowed resource type.
         if ( Not IsAllowedType( sResourceType ) ) Then
                 SendUploadResults "1", "", "", "The " & sResourceType & " resource type isn't allowed"
         end if
 
-        ' Check the current folder syntax (must begin and start with a slash).
-        If ( Right( sCurrentFolder, 1 ) <> "/" ) Then sCurrentFolder = sCurrentFolder & "/"
-        If ( Left( sCurrentFolder, 1 ) <> "/" ) Then sCurrentFolder = "/" & sCurrentFolder
-
-        ' Check for invalid folder paths (..)
-        If ( InStr( 1, sCurrentFolder, ".." ) <> 0 OR InStr( 1, sResourceType, ".." ) <> 0 ) Then
-                SendUploadResults "102", "", "", "Invalid path"
-        End If
-
         FileUpload sResourceType, sCurrentFolder