Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/basexml.asp
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/basexml.asp (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/basexml.asp (revision 318)
@@ -35,5 +35,5 @@
End Sub
-Sub CreateXmlHeader( command, resourceType, currentFolder )
+Sub CreateXmlHeader( command, resourceType, currentFolder, url )
' Create the XML document header.
Response.Write ""
@@ -43,5 +43,5 @@
' Add the current folder node.
- Response.Write ""
+ Response.Write ""
End Sub
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/commands.asp
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/commands.asp (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/commands.asp (revision 318)
@@ -26,5 +26,5 @@
' Map the virtual path to the local server path.
Dim sServerDir
- sServerDir = ServerMapFolder( resourceType, currentFolder )
+ sServerDir = ServerMapFolder( resourceType, currentFolder, "GetFolders" )
' Open the "Folders" node.
@@ -54,5 +54,5 @@
' Map the virtual path to the local server path.
Dim sServerDir
- sServerDir = ServerMapFolder( resourceType, currentFolder )
+ sServerDir = ServerMapFolder( resourceType, currentFolder, "GetFoldersAndFiles" )
Dim oFSO, oCurrentFolder, oFolders, oFolder, oFiles, oFile
@@ -104,5 +104,5 @@
' Map the virtual path to the local server path of the current folder.
Dim sServerDir
- sServerDir = ServerMapFolder( resourceType, CombinePaths(currentFolder, sNewFolderName) )
+ sServerDir = ServerMapFolder( resourceType, CombinePaths(currentFolder, sNewFolderName), "CreateFolder" )
On Error Resume Next
@@ -134,5 +134,5 @@
End Sub
-Sub FileUpload( resourceType, currentFolder )
+Sub FileUpload( resourceType, currentFolder, sCommand )
Dim oUploader
Set oUploader = New NetRube_Upload
@@ -153,5 +153,5 @@
' Map the virtual path to the local server path.
Dim sServerDir
- sServerDir = ServerMapFolder( resourceType, currentFolder )
+ sServerDir = ServerMapFolder( resourceType, currentFolder, sCommand )
Dim oFSO
@@ -189,5 +189,5 @@
dim sFileUrl
- sFileUrl = CombinePaths( GetResourceTypePath( resourceType ) , sFileName )
+ sFileUrl = CombinePaths( GetResourceTypePath( resourceType, sCommand ) , sFileName )
SendUploadResults sErrorNumber, sFileUrl, sFileName, ""
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/config.asp
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/config.asp (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/config.asp (revision 318)
@@ -42,5 +42,5 @@
' What the user can do with this connector
Dim ConfigAllowedCommands
-ConfigAllowedCommands = "FileUpload|GetFolders|GetFoldersAndFiles|CreateFolder"
+ConfigAllowedCommands = "QuickUpload|FileUpload|GetFolders|GetFoldersAndFiles|CreateFolder"
' Allowed Resource Types
@@ -53,4 +53,5 @@
' - AllowedExtensions: the possible extensions that can be allowed.
' If it is empty then any file type can be uploaded.
+'
' - DeniedExtensions: The extensions that won't be allowed.
' If it is empty then no restrictions are done here.
@@ -63,26 +64,35 @@
' Attention: It must start and end with a slash: '/'
'
+' - QuickUploadPath: the virtual folder relative to the document root where
+' these resources will be uploaded using the Upload tab in the resources
+' dialogs.
+' Attention: It must start and end with a slash: '/'
'
-Dim ConfigAllowedExtensions, ConfigDeniedExtensions, ConfigFileTypesPath
+Dim ConfigAllowedExtensions, ConfigDeniedExtensions, ConfigFileTypesPath, ConfigQuickUploadPath
Set ConfigAllowedExtensions = CreateObject( "Scripting.Dictionary" )
Set ConfigDeniedExtensions = CreateObject( "Scripting.Dictionary" )
Set ConfigFileTypesPath = CreateObject( "Scripting.Dictionary" )
+Set ConfigQuickUploadPath = CreateObject( "Scripting.Dictionary" )
ConfigAllowedExtensions.Add "File", ""
ConfigDeniedExtensions.Add "File", "html|htm|php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess|asis|sh|shtml|shtm|phtm"
ConfigFileTypesPath.Add "File", ConfigUserFilesPath & "file/"
+ConfigQuickUploadPath.Add "File", ConfigUserFilesPath
ConfigAllowedExtensions.Add "Image", "jpg|gif|jpeg|png|bmp"
ConfigDeniedExtensions.Add "Image", ""
ConfigFileTypesPath.Add "Image", ConfigUserFilesPath & "image/"
+ConfigQuickUploadPath.Add "Image", ConfigUserFilesPath
ConfigAllowedExtensions.Add "Flash", "swf|fla"
ConfigDeniedExtensions.Add "Flash", ""
ConfigFileTypesPath.Add "Flash", ConfigUserFilesPath & "flash/"
+ConfigQuickUploadPath.Add "Flash", ConfigUserFilesPath
ConfigAllowedExtensions.Add "Media", "swf|fla|jpg|gif|jpeg|png|avi|mpg|mpeg|mp(1-4)|wma|wmv|wav|mid|midi|rmi|rm|ram|rmvb|mov|qt"
ConfigDeniedExtensions.Add "Media", ""
ConfigFileTypesPath.Add "Media", ConfigUserFilesPath & "media/"
+ConfigQuickUploadPath.Add "Media", ConfigUserFilesPath
%>
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/connector.asp
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/connector.asp (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/connector.asp (revision 318)
@@ -63,5 +63,5 @@
' File Upload doesn't have to Return XML, so it must be intercepted before anything.
If ( sCommand = "FileUpload" ) Then
- FileUpload sResourceType, sCurrentFolder
+ FileUpload sResourceType, sCurrentFolder, sCommand
Exit Sub
End If
@@ -69,5 +69,5 @@
SetXmlHeaders
- CreateXmlHeader sCommand, sResourceType, sCurrentFolder
+ CreateXmlHeader sCommand, sResourceType, sCurrentFolder, GetUrlFromPath( sResourceType, sCurrentFolder, sCommand)
' Execute the required command.
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/io.asp
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/io.asp (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/io.asp (revision 318)
@@ -26,10 +26,14 @@
end function
-Function GetResourceTypePath( resourceType )
- GetResourceTypePath = ConfigFileTypesPath.Item( resourceType )
+Function GetResourceTypePath( resourceType, sCommand )
+ if ( sCommand = "QuickUpload") then
+ GetResourceTypePath = ConfigQuickUploadPath.Item( resourceType )
+ else
+ GetResourceTypePath = ConfigFileTypesPath.Item( resourceType )
+ end if
end Function
-Function GetUrlFromPath( resourceType, folderPath )
- GetUrlFromPath = CombinePaths( GetResourceTypePath( resourceType ), folderPath )
+Function GetUrlFromPath( resourceType, folderPath, sCommand )
+ GetUrlFromPath = CombinePaths( GetResourceTypePath( resourceType, sCommand ), folderPath )
End Function
@@ -38,8 +42,8 @@
End Function
-Function ServerMapFolder( resourceType, folderPath )
+Function ServerMapFolder( resourceType, folderPath, sCommand )
' Map the "UserFiles" path to a local directory.
Dim sResourceTypePath
- sResourceTypePath = Server.MapPath( GetResourceTypePath( resourceType ) )
+ sResourceTypePath = Server.MapPath( GetResourceTypePath( resourceType, sCommand ) )
' Ensure that the directory exists.
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/upload.asp
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/upload.asp (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/asp/upload.asp (revision 318)
@@ -40,5 +40,5 @@
Dim sCommand, sResourceType, sCurrentFolder
- sCommand = "FileUpload"
+ sCommand = "QuickUpload"
sResourceType = Request.QueryString("Type")
@@ -57,5 +57,5 @@
end if
- FileUpload sResourceType, sCurrentFolder
+ FileUpload sResourceType, sCurrentFolder, sCommand
%>
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/basexml.php
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/basexml.php (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/basexml.php (revision 318)
@@ -43,5 +43,5 @@
}
-function CreateXmlHeader( $command, $resourceType, $currentFolder )
+function CreateXmlHeader( $command, $resourceType, $currentFolder, $url )
{
SetXmlHeaders() ;
@@ -54,5 +54,5 @@
// Add the current folder node.
- echo '' ;
+ echo '' ;
}
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/commands.php
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/commands.php (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/commands.php (revision 318)
@@ -26,5 +26,5 @@
{
// Map the virtual path to the local server path.
- $sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
+ $sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'GetFolders' ) ;
// Array that will hold the folders names.
@@ -55,5 +55,5 @@
{
// Map the virtual path to the local server path.
- $sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
+ $sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'GetFoldersAndFiles' ) ;
// Arrays that will hold the folders and files names.
@@ -117,5 +117,5 @@
{
// Map the virtual path to the local server path of the current folder.
- $sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
+ $sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'CreateFolder' ) ;
if ( is_writable( $sServerDir ) )
@@ -150,5 +150,5 @@
}
-function FileUpload( $resourceType, $currentFolder )
+function FileUpload( $resourceType, $currentFolder, $sCommand )
{
$sErrorNumber = '0' ;
@@ -162,5 +162,5 @@
// Map the virtual path to the local server path.
- $sServerDir = ServerMapFolder( $resourceType, $currentFolder ) ;
+ $sServerDir = ServerMapFolder( $resourceType, $currentFolder, $sCommand ) ;
// Get the uploaded file name.
@@ -211,5 +211,5 @@
- $sFileUrl = CombinePaths( GetResourceTypePath( $resourceType ) , $sFileName ) ;
+ $sFileUrl = CombinePaths( GetResourceTypePath( $resourceType, $sCommand ) , $sFileName ) ;
SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName ) ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/config.php
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/config.php (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/config.php (revision 318)
@@ -49,5 +49,5 @@
// What the user can do with this connector
-$Config['ConfigAllowedCommands'] = array('FileUpload', 'GetFolders', 'GetFoldersAndFiles', 'CreateFolder') ;
+$Config['ConfigAllowedCommands'] = array('QuickUpload', 'FileUpload', 'GetFolders', 'GetFoldersAndFiles', 'CreateFolder') ;
// Allowed Resource Types
@@ -77,4 +77,18 @@
Attention: It must end with a slash: '/'
+
+ - QuickUploadPath: the virtual folder relative to the document root where
+ these resources will be uploaded using the Upload tab in the resources
+ dialogs.
+ Attention: It must start and end with a slash: '/'
+
+ - QuickUploadAbsolutePath: the physical path to the above folder. It must be
+ an absolute path.
+ If it's an empty string then it will be autocalculated.
+ Usefull if you are using a virtual directory, symbolic link or alias.
+ Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
+ Attention: The above 'QuickUploadPath' must point to the same directory.
+ Attention: It must end with a slash: '/'
+
*/
@@ -83,4 +97,6 @@
$Config['FileTypesPath']['File'] = $Config['UserFilesPath'] . 'file/' ;
$Config['FileTypesAbsolutePath']['File']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/' ;
+$Config['QuickUploadPath']['File'] = $Config['UserFilesPath'] ;
+$Config['QuickUploadAbsolutePath']['File']= $Config['UserFilesAbsolutePath'] ;
$Config['AllowedExtensions']['Image'] = array('jpg','gif','jpeg','png') ;
@@ -88,4 +104,6 @@
$Config['FileTypesPath']['Image'] = $Config['UserFilesPath'] . 'image/' ;
$Config['FileTypesAbsolutePath']['Image']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/' ;
+$Config['QuickUploadPath']['Image'] = $Config['UserFilesPath'] ;
+$Config['QuickUploadAbsolutePath']['Image']= $Config['UserFilesAbsolutePath'] ;
$Config['AllowedExtensions']['Flash'] = array('swf','fla') ;
@@ -93,4 +111,6 @@
$Config['FileTypesPath']['Flash'] = $Config['UserFilesPath'] . 'flash/' ;
$Config['FileTypesAbsolutePath']['Flash']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'flash/' ;
+$Config['QuickUploadPath']['Flash'] = $Config['UserFilesPath'] ;
+$Config['QuickUploadAbsolutePath']['Flash']= $Config['UserFilesAbsolutePath'] ;
$Config['AllowedExtensions']['Media'] = array('swf','fla','jpg','gif','jpeg','png','avi','mpg','mpeg') ;
@@ -98,3 +118,6 @@
$Config['FileTypesPath']['Media'] = $Config['UserFilesPath'] . 'media/' ;
$Config['FileTypesAbsolutePath']['Media']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'media/' ;
+$Config['QuickUploadPath']['Media'] = $Config['UserFilesPath'] ;
+$Config['QuickUploadAbsolutePath']['Media']= $Config['UserFilesAbsolutePath'] ;
+
?>
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/connector.php
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/connector.php (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/connector.php (revision 318)
@@ -57,9 +57,9 @@
if ( $sCommand == 'FileUpload' )
{
- FileUpload( $sResourceType, $sCurrentFolder ) ;
+ FileUpload( $sResourceType, $sCurrentFolder, $sCommand ) ;
return ;
}
- CreateXmlHeader( $sCommand, $sResourceType, $sCurrentFolder ) ;
+ CreateXmlHeader( $sCommand, $sResourceType, $sCurrentFolder, GetUrlFromPath( $sResourceType, $sCurrentFolder, $sCommand ) ) ;
// Execute the required command.
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/io.php
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/io.php (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/io.php (revision 318)
@@ -26,24 +26,38 @@
return RemoveFromEnd( $sBasePath, '/' ) . '/' . RemoveFromStart( $sFolder, '/' ) ;
}
-function GetResourceTypePath( $resourceType )
-{
- global $Config ;
-
- return $Config['FileTypesPath'][$resourceType] ;
-}
-
-function GetResourceTypeDirectory( $resourceType )
-{
- global $Config ;
- if ( strlen( $Config['FileTypesAbsolutePath'][$resourceType] ) > 0 )
- return $Config['FileTypesAbsolutePath'][$resourceType] ;
-
- // Map the "UserFiles" path to a local directory.
- return GetRootPath() . $Config['FileTypesPath'][$resourceType] ;
-}
-
-function GetUrlFromPath( $resourceType, $folderPath )
-{
- return CombinePaths( GetResourceTypePath( $resourceType ), $folderPath ) ;
+function GetResourceTypePath( $resourceType, $sCommand )
+{
+ global $Config ;
+
+ if ( $sCommand == "QuickUpload")
+ return $Config['QuickUploadPath'][$resourceType] ;
+ else
+ return $Config['FileTypesPath'][$resourceType] ;
+}
+
+function GetResourceTypeDirectory( $resourceType, $sCommand )
+{
+ global $Config ;
+ if ( $sCommand == "QuickUpload")
+ {
+ if ( strlen( $Config['FileTypesAbsolutePath'][$resourceType] ) > 0 )
+ return $Config['FileTypesAbsolutePath'][$resourceType] ;
+
+ // Map the "UserFiles" path to a local directory.
+ return GetRootPath() . $Config['FileTypesPath'][$resourceType] ;
+ }
+ else
+ {
+ if ( strlen( $Config['QuickUploadAbsolutePath'][$resourceType] ) > 0 )
+ return $Config['QuickUploadAbsolutePath'][$resourceType] ;
+
+ // Map the "UserFiles" path to a local directory.
+ return GetRootPath() . $Config['QuickUploadPath'][$resourceType] ;
+ }
+}
+
+function GetUrlFromPath( $resourceType, $folderPath, $sCommand )
+{
+ return CombinePaths( GetResourceTypePath( $resourceType, $sCommand ), $folderPath ) ;
}
@@ -53,8 +67,8 @@
}
-function ServerMapFolder( $resourceType, $folderPath )
+function ServerMapFolder( $resourceType, $folderPath, $sCommand )
{
// Get the resource type directory.
- $sResourceTypePath = GetResourceTypeDirectory( $resourceType ) ;
+ $sResourceTypePath = GetResourceTypeDirectory( $resourceType, $sCommand ) ;
// Ensure that the directory exists.
Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/upload.php
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/upload.php (revision 317)
+++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/connectors/php/upload.php (revision 318)
@@ -32,5 +32,5 @@
SendUploadResults( '1', '', '', 'This file uploader is disabled. Please check the "editor/filemanager/connectors/php/config.php" file' ) ;
-$sCommand = 'FileUpload' ;
+$sCommand = 'QuickUpload' ;
// The file type (from the QueryString, by default 'File').
@@ -48,5 +48,5 @@
-FileUpload( $sType, $sCurrentFolder )
+FileUpload( $sType, $sCurrentFolder, $sCommand )
?>