Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html (revision 412)
+++ /FCKeditor/trunk/_whatsnew.html (revision 413)
@@ -45,4 +45,17 @@
file has been renamed to ".htaccess" as it doesn't bring security concerns, being
active out of the box.
+ [#454 ] The file browser and upload
+ connectors have been unified so they can reuse the same configuration settings.Attention: The location of all the connectors have been changed in
+ the fckconfig.js file. Please check your settings to match the current ones. Also review carefully the
+ config file for your server language.
+
+ [#688 ] Now the Perl quik upload is
+ available.
+ [#561 ] The asp connector provides an
+ AbsolutePath setting so it's possible to set the url to a full domain or a relative path and specify that
+ way the physical folder where the files are stored..
@@ -59,4 +72,12 @@
[#497 ] Fixed EMBED
attributes handling in IE.
+ [SF
+ Patch 1315722 ] Avoid getting a cached version of the folder contents after uploading a file
+ [SF
+ Patch 1386086 ] The php connector has been protected so mkdir doesn't fail if there are double slashes.
+ [#943 ] The PHP connector now specifies
+ that the included files are relative to the current path.
+ [#560 ] The PHP connector will work better if the
+ connector or the userfiles folder is a symlink.
Index: /FCKeditor/trunk/editor/filemanager/browser/default/browser.css
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/browser.css (revision 412)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/browser.css (revision 413)
@@ -47,4 +47,5 @@
background-color: #ffffff;
+ margin: 10px;
}
Index: /FCKeditor/trunk/editor/filemanager/browser/default/browser.html
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/browser.html (revision 412)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/browser.html (revision 413)
@@ -69,4 +69,7 @@
if ( params ) sUrl += '&' + params ;
+ // Add a random salt to avoid getting a cached version of the command execution
+ sUrl += '&uuid=' + new Date().getTime() ;
+
var oXML = new FCKXml() ;
@@ -135,4 +138,10 @@
return 'default.icon' ;
}
+
+function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
+{
+ window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;
+}
+
Index: /FCKeditor/trunk/editor/filemanager/browser/default/frmfolders.html
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/frmfolders.html (revision 412)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/frmfolders.html (revision 413)
@@ -167,5 +167,5 @@
{
var sFolderName = oNodes[i].attributes.getNamedItem('name').value ;
- oListManager.AddItem( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ;
+ oListManager.AddItem( sFolderName, sCurrentFolderPath + sFolderName + '/' ) ;
}
Index: /FCKeditor/trunk/editor/filemanager/browser/default/frmresourceslist.html
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/frmresourceslist.html (revision 412)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/frmresourceslist.html (revision 413)
@@ -35,18 +35,25 @@
}
+function ProtectPath(path)
+{
+ path = path.replace( /\\/g, '\\\\') ;
+ path = path.replace( /'/g, '\\\'') ;
+ return path ;
+}
+
oListManager.GetFolderRowHtml = function( folderName, folderPath )
{
// Build the link to view the folder.
- var sLink = '' ;
+ var sLink = ' ' ;
return '' +
'' +
sLink +
- ' ' +
+ ' ' +
sLink +
folderName +
- '' +
- ' ' ;
+ '<\/a>' +
+ '<\/td><\/tr>' ;
}
@@ -54,5 +61,5 @@
{
// Build the link to view the folder.
- var sLink = ' ' ;
+ var sLink = ' ' ;
// Get the file icon.
@@ -62,13 +69,13 @@
' ' +
sLink +
- ' ' +
+ ' ' +
sLink +
fileName +
- '' +
- ' ' +
+ '<\/a>' +
+ '<\/td> ' +
fileSize +
' KB' +
- ' ' ;
+ '<\/td><\/tr>' ;
}
@@ -156,5 +163,5 @@
-
+
Index: /FCKeditor/trunk/editor/filemanager/browser/default/frmupload.html
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/frmupload.html (revision 412)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/frmupload.html (revision 413)
@@ -24,4 +24,5 @@
+ File Upload
"
+
+ ' Add the current folder node.
+ Response.Write " "
+End Sub
+
+Sub SendError( number, text )
+ SetXmlHeaders
+
+ ' Create the XML document header.
+ Response.Write ""
+
+ Response.Write ""
+
+ 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
+
+ For Each oFolder in oFolders
+ Response.Write " "
+End Sub
+
+Sub GetFoldersAndFiles( resourceType, currentFolder )
+ ' Map the virtual path to the local server path.
+ Dim sServerDir
+ sServerDir = ServerMapFolder( resourceType, currentFolder, "GetFoldersAndFiles" )
+
+ 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
+ Set oFiles = oCurrentFolder.Files
+
+ ' Open the "Folders" node.
+ Response.Write ""
+
+ For Each oFolder in oFolders
+ Response.Write " "
+
+ ' Open the "Files" node.
+ Response.Write ""
+
+ For Each oFile in oFiles
+ Dim iFileSize
+ iFileSize = Round( oFile.size / 1024 )
+ If ( iFileSize < 1 AND oFile.size <> 0 ) Then iFileSize = 1
+
+ Response.Write " "
+End Sub
+
+Sub CreateFolder( resourceType, currentFolder )
+ Dim sErrorNumber
+
+ Dim sNewFolderName
+ sNewFolderName = Request.QueryString( "NewFolderName" )
+ sNewFolderName = SanitizeFolderName( sNewFolderName )
+
+ If ( sNewFolderName = "" OR InStr( 1, sNewFolderName, ".." ) > 0 ) Then
+ sErrorNumber = "102"
+ Else
+ ' Map the virtual path to the local server path of the current folder.
+ Dim sServerDir
+ sServerDir = ServerMapFolder( resourceType, CombinePaths(currentFolder, sNewFolderName), "CreateFolder" )
+
+ On Error Resume Next
+
+ CreateServerFolder sServerDir
+
+ Dim iErrNumber, sErrDescription
+ iErrNumber = err.number
+ sErrDescription = err.Description
+
+ On Error Goto 0
+
+ Select Case iErrNumber
+ Case 0
+ sErrorNumber = "0"
+ Case 52
+ sErrorNumber = "102" ' Invalid Folder Name.
+ Case 70
+ sErrorNumber = "103" ' Security Error.
+ Case 76
+ sErrorNumber = "102" ' Path too long.
+ Case Else
+ sErrorNumber = "110"
+ End Select
+ End If
+
+ ' Create the "Error" node.
+ Response.Write "
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ errorNumber = 0;
+ fileName = cffile.ClientFileName;
+ fileExt = cffile.ServerFileExt;
+
+ // munge filename for html download. Only a-z, 0-9, _, - and . are allowed
+ if( reFind("[^A-Za-z0-9_\-\.]", fileName) ) {
+ fileName = reReplace(fileName, "[^A-Za-z0-9\-\.]", "_", "ALL");
+ fileName = reReplace(fileName, "_{2,}", "_", "ALL");
+ fileName = reReplace(fileName, "([^_]+)_+$", "\1", "ALL");
+ fileName = reReplace(fileName, "$_([^_]+)$", "\1", "ALL");
+ }
+
+ // When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename.
+ if( compare( cffile.ServerFileName, fileName ) ) {
+ counter = 0;
+ tmpFileName = fileName;
+ while( fileExists("#currentFolderPath##fileName#.#fileExt#") ) {
+ counter = counter + 1;
+ fileName = tmpFileName & '(#counter#)';
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/config.cfm
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/cfm/config.cfm (revision 413)
+++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/config.cfm (revision 413)
@@ -0,0 +1,101 @@
+
+
+
+ config = StructNew();
+
+ // SECURITY: You must explicitly enable this "connector". (Set enabled to "true")
+ config.enabled = false;
+
+ // Path to uploaded files relative to the document root.
+ config.userFilesPath = "/userfiles/";
+
+ // Use this to force the server path if FCKeditor is not running directly off
+ // the root of the application or the FCKeditor directory in the URL is a virtual directory
+ // or a symbolic link / junction
+ // Example: C:\inetpub\wwwroot\myDocs\
+ config.serverPath = "";
+
+ config.allowedExtensions = StructNew();
+ config.deniedExtensions = StructNew();
+
+ config.allowedExtensions["File"] = "";
+ config.deniedExtensions["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";
+
+ config.allowedExtensions["Image"] = "png,gif,jpg,jpeg,bmp";
+ config.deniedExtensions["Image"] = "";
+
+ config.allowedExtensions["Flash"] = "swf,fla";
+ config.deniedExtensions["Flash"] = "";
+
+ config.allowedExtensions["Media"] = "swf,fla,jpg,gif,jpeg,png,avi,mpg,mpeg,mp3,mp4,m4a,wma,wmv,wav,mid,midi,rmi,rm,ram,rmvb,mov,qt";
+ config.deniedExtensions["Media"] = "";
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ function structCopyKeys(stFrom, stTo) {
+ for ( key in stFrom ) {
+ if ( isStruct(stFrom[key]) ) {
+ structCopyKeys(stFrom[key],stTo[key]);
+ } else {
+ stTo[key] = stFrom[key];
+ }
+ }
+ }
+ structCopyKeys(FCKeditor, config);
+
+
+
Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/connector.cfm
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/cfm/connector.cfm (revision 413)
+++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/connector.cfm (revision 413)
@@ -0,0 +1,279 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ userFilesPath = config.userFilesPath;
+
+ if ( userFilesPath eq "" ) {
+ userFilesPath = "/userfiles/";
+ }
+
+ // make sure the user files path is correctly formatted
+ userFilesPath = replace(userFilesPath, "\", "/", "ALL");
+ userFilesPath = replace(userFilesPath, '//', '/', 'ALL');
+ if ( right(userFilesPath,1) NEQ "/" ) {
+ userFilesPath = userFilesPath & "/";
+ }
+ if ( left(userFilesPath,1) NEQ "/" ) {
+ userFilesPath = "/" & userFilesPath;
+ }
+
+ // make sure the current folder is correctly formatted
+ url.currentFolder = replace(url.currentFolder, "\", "/", "ALL");
+ url.currentFolder = replace(url.currentFolder, '//', '/', 'ALL');
+ if ( right(url.currentFolder,1) neq "/" ) {
+ url.currentFolder = url.currentFolder & "/";
+ }
+ if ( left(url.currentFolder,1) neq "/" ) {
+ url.currentFolder = "/" & url.currentFolder;
+ }
+
+ if ( find("/",getBaseTemplatePath()) neq 0 ) {
+ fs = "/";
+ } else {
+ fs = "\";
+ }
+
+ // Get the base physical path to the web root for this application. The code to determine the path automatically assumes that
+ // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a
+ // virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary.
+ if ( len(config.serverPath) ) {
+ serverPath = config.serverPath;
+
+ if ( right(serverPath,1) neq fs ) {
+ serverPath = serverPath & fs;
+ }
+ } else {
+ serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"") & replace(userFilesPath,"/",fs,"all");
+ }
+
+ // map the user files path to a physical directory
+ userFilesServerPath = serverPath & url.type & replace(url.currentFolder,"/",fs,"all");
+
+ xmlContent = ""; // append to this string to build content
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ i=1;
+ folders = "";
+ while( i lte qDir.recordCount ) {
+ if( not compareNoCase( qDir.type[i], "FILE" ))
+ break;
+ if( not listFind(".,..", qDir.name[i]) )
+ folders = folders & '' & folders & ' ';
+
+
+
+
+
+
+
+
+
+
+
+ i=1;
+ folders = "";
+ files = "";
+ while( i lte qDir.recordCount ) {
+ if( not compareNoCase( qDir.type[i], "DIR" ) and not listFind(".,..", qDir.name[i]) ) {
+ folders = folders & '' & folders & ' ';
+ xmlContent = xmlContent & '' & files & ' ';
+
+
+
+
+
+
+
+
+
+
+ newFolderName = url.newFolderName;
+ if( reFind("[^A-Za-z0-9_\-\.]", newFolderName) ) {
+ // Munge folder name same way as we do the filename
+ // This means folder names are always US-ASCII so we don't have to worry about CF5 and UTF-8
+ newFolderName = reReplace(newFolderName, "[^A-Za-z0-9\-\.]", "_", "all");
+ newFolderName = reReplace(newFolderName, "_{2,}", "_", "all");
+ newFolderName = reReplace(newFolderName, "([^_]+)_+$", "\1", "all");
+ newFolderName = reReplace(newFolderName, "$_([^_]+)$", "\1", "all");
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlHeader = '';
+ xmlHeader = xmlHeader & ' ';
+
+
+
+
+
+
+#xmlHeader##xmlContent##xmlFooter#
Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/upload.cfm
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/cfm/upload.cfm (revision 413)
+++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/upload.cfm (revision 413)
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ userFilesPath = config.userFilesPath;
+
+ if ( userFilesPath eq "" ) {
+ userFilesPath = "/userfiles/";
+ }
+
+ // make sure the user files path is correctly formatted
+ userFilesPath = replace(userFilesPath, "\", "/", "ALL");
+ userFilesPath = replace(userFilesPath, '//', '/', 'ALL');
+ if ( right(userFilesPath,1) NEQ "/" ) {
+ userFilesPath = userFilesPath & "/";
+ }
+ if ( left(userFilesPath,1) NEQ "/" ) {
+ userFilesPath = "/" & userFilesPath;
+ }
+
+ // make sure the current folder is correctly formatted
+ url.currentFolder = replace(url.currentFolder, "\", "/", "ALL");
+ url.currentFolder = replace(url.currentFolder, '//', '/', 'ALL');
+ if ( right(url.currentFolder,1) neq "/" ) {
+ url.currentFolder = url.currentFolder & "/";
+ }
+ if ( left(url.currentFolder,1) neq "/" ) {
+ url.currentFolder = "/" & url.currentFolder;
+ }
+
+ if (find("/",getBaseTemplatePath())) {
+ fs = "/";
+ } else {
+ fs = "\";
+ }
+
+ // Get the base physical path to the web root for this application. The code to determine the path automatically assumes that
+ // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a
+ // virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary.
+ if ( len(config.serverPath) ) {
+ serverPath = config.serverPath;
+
+ if ( right(serverPath,1) neq fs ) {
+ serverPath = serverPath & fs;
+ }
+ } else {
+ serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"") & replace(userFilesPath,"/",fs,"all");
+ }
+
+ // map the user files path to a physical directory
+ userFilesServerPath = serverPath & url.type & replace(url.currentFolder,"/",fs,"all");
+
+
+
+
+
+
+
Index: /FCKeditor/trunk/editor/filemanager/connectors/lasso/config.lasso
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/lasso/config.lasso (revision 413)
+++ /FCKeditor/trunk/editor/filemanager/connectors/lasso/config.lasso (revision 413)
@@ -0,0 +1,65 @@
+[//lasso
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Configuration file for the File Manager Connector for Lasso.
+ */
+
+ /*.....................................................................
+ The connector uses the file tags, which require authentication. Enter a
+ valid username and password from Lasso admin for a group with file tags
+ permissions for uploads and the path you define in UserFilesPath below.
+ */
+
+ var('connection') = array(
+ -username='xxxxxxxx',
+ -password='xxxxxxxx'
+ );
+
+
+ /*.....................................................................
+ Set the base path for files that users can upload and browse (relative
+ to server root).
+
+ Set which file extensions are allowed and/or denied for each file type.
+ */
+ var('config') = map(
+ 'Enabled' = false,
+ 'UserFilesPath' = '/userfiles/',
+ 'Subdirectories' = map(
+ 'File' = 'File/',
+ 'Image' = 'Image/',
+ 'Flash' = 'Flash/',
+ 'Media' = 'Media/'
+ ),
+ 'AllowedExtensions' = map(
+ 'File' = array(),
+ 'Image' = array('jpg','gif','jpeg','png'),
+ 'Flash' = array('swf','fla'),
+ 'Media' = array('swf','fla','jpg','gif','jpeg','png','avi','mpg','mpeg')
+ ),
+ 'DeniedExtensions' = map(
+ 'File' = array('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','lasso','lassoapp','htaccess','asis','sh','shtml','shtm','phtm'),
+ 'Image' = array(),
+ 'Flash' = array(),
+ 'Media' = array()
+ )
+ );
+]
Index: /FCKeditor/trunk/editor/filemanager/connectors/lasso/connector.lasso
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/lasso/connector.lasso (revision 413)
+++ /FCKeditor/trunk/editor/filemanager/connectors/lasso/connector.lasso (revision 413)
@@ -0,0 +1,249 @@
+[//lasso
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the File Manager Connector for Lasso.
+ */
+
+ /*.....................................................................
+ Include global configuration. See config.lasso for details.
+ */
+ include('config.lasso');
+
+
+ /*.....................................................................
+ Translate current date/time to GMT for custom header.
+ */
+ var('headerDate') = date_localtogmt(date)->format('%a, %d %b %Y %T GMT');
+
+
+ /*.....................................................................
+ Convert query string parameters to variables and initialize output.
+ */
+ var(
+ 'Command' = action_param('Command'),
+ 'Type' = action_param('Type'),
+ 'CurrentFolder' = action_param('CurrentFolder'),
+ 'ServerPath' = action_param('ServerPath'),
+ 'NewFolderName' = action_param('NewFolderName'),
+ 'NewFile' = null,
+ 'NewFileName' = string,
+ 'OrigFilePath' = string,
+ 'NewFilePath' = string,
+ 'commandData' = string,
+ 'folders' = '\t\n',
+ 'files' = '\t\n',
+ 'errorNumber' = integer,
+ 'responseType' = 'xml',
+ 'uploadResult' = '0'
+ );
+
+
+ /*.....................................................................
+ Calculate the path to the current folder.
+ */
+ $ServerPath == '' ? $ServerPath = $config->find('UserFilesPath');
+
+ var('currentFolderURL' = $ServerPath
+ + $config->find('Subdirectories')->find(action_param('Type'))
+ + action_param('CurrentFolder')
+ );
+
+
+ /*.....................................................................
+ Build the appropriate response per the 'Command' parameter. Wrap the
+ entire process in an inline for file tag permissions.
+ */
+ inline($connection);
+ select($Command);
+ /*.............................................................
+ List all subdirectories in the 'Current Folder' directory.
+ */
+ case('GetFolders');
+ $commandData += '\t\n';
+
+ iterate(file_listdirectory($currentFolderURL), local('this'));
+ #this->endswith('/') ? $commandData += '\t\t \n';
+
+
+ /*.............................................................
+ List both files and folders in the 'Current Folder' directory.
+ Include the file sizes in kilobytes.
+ */
+ case('GetFoldersAndFiles');
+ iterate(file_listdirectory($currentFolderURL), local('this'));
+ if(#this->endswith('/'));
+ $folders += '\t\t \n';
+ $files += '\t\n';
+
+ $commandData += $folders + $files;
+
+
+ /*.............................................................
+ Create a directory 'NewFolderName' within the 'Current Folder.'
+ */
+ case('CreateFolder');
+ var('newFolder' = $currentFolderURL + $NewFolderName + '/');
+ file_create($newFolder);
+
+
+ /*.........................................................
+ Map Lasso's file error codes to FCKEditor's error codes.
+ */
+ select(file_currenterror( -errorcode));
+ case(0);
+ $errorNumber = 0;
+ case( -9983);
+ $errorNumber = 101;
+ case( -9976);
+ $errorNumber = 102;
+ case( -9977);
+ $errorNumber = 102;
+ case( -9961);
+ $errorNumber = 103;
+ case;
+ $errorNumber = 110;
+ /select;
+
+ $commandData += '
+
+ ';
+ /if;
+]
Index: /FCKeditor/trunk/editor/filemanager/connectors/lasso/upload.lasso
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/lasso/upload.lasso (revision 413)
+++ /FCKeditor/trunk/editor/filemanager/connectors/lasso/upload.lasso (revision 413)
@@ -0,0 +1,157 @@
+[//lasso
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the "File Uploader" for Lasso.
+ */
+
+ /*.....................................................................
+ Include global configuration. See config.lasso for details.
+ */
+ include('config.lasso');
+
+
+ /*.....................................................................
+ Convert query string parameters to variables and initialize output.
+ */
+ var(
+ 'Type' = action_param('Type'),
+ 'CurrentFolder' = action_param('CurrentFolder'),
+ 'ServerPath' = action_param('ServerPath'),
+ 'NewFile' = null,
+ 'NewFileName' = string,
+ 'OrigFilePath' = string,
+ 'NewFilePath' = string,
+ 'errorNumber' = 0,
+ 'customMsg' = ''
+ );
+
+ $Type == '' ? $Type = 'File';
+
+
+ /*.....................................................................
+ Calculate the path to the current folder.
+ */
+ $ServerPath == '' ? $ServerPath = $config->find('UserFilesPath');
+
+ var('currentFolderURL' = $ServerPath
+ + $config->find('Subdirectories')->find(action_param('Type'))
+ + action_param('CurrentFolder')
+ );
+
+
+ /*.....................................................................
+ Custom tag sets the HTML response.
+ */
+
+ define_tag(
+ 'sendresults',
+ -namespace='fck_',
+ -priority='replace',
+ -required='errorNumber',
+ -type='integer',
+ -optional='fileUrl',
+ -type='string',
+ -optional='fileName',
+ -type='string',
+ -optional='customMsg',
+ -type='string',
+ -description='Sets the HTML response for the FCKEditor Quick Upload feature.'
+ );
+ $__html_reply__ = '\
+
+ ';
+ /define_tag;
+
+
+ if($config->find('Enabled'));
+ /*.................................................................
+ Process an uploaded file.
+ */
+ inline($connection);
+ /*.............................................................
+ Was a file actually uploaded?
+ */
+ file_uploads->size ? $NewFile = file_uploads->get(1) | $errorNumber = 202;
+
+ if($errorNumber == 0);
+ /*.........................................................
+ Split the file's extension from the filename in order
+ to follow the API's naming convention for duplicate
+ files. (Test.txt, Test(1).txt, Test(2).txt, etc.)
+ */
+ $NewFileName = $NewFile->find('OrigName');
+ $OrigFilePath = $currentFolderURL + $NewFileName;
+ $NewFilePath = $OrigFilePath;
+ local('fileExtension') = '.' + $NewFile->find('OrigExtension');
+ local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&;
+
+
+ /*.........................................................
+ Make sure the file extension is allowed.
+ */
+
+ if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension'));
+ $errorNumber = 202;
+ else;
+ /*.....................................................
+ Rename the target path until it is unique.
+ */
+ while(file_exists($NewFilePath));
+ $NewFileName = #shortFileName + '(' + loop_count + ')' + #fileExtension;
+ $NewFilePath = $currentFolderURL + $NewFileName;
+ /while;
+
+
+ /*.....................................................
+ Copy the uploaded file to its final location.
+ */
+ file_copy($NewFile->find('path'), $NewFilePath);
+
+
+ /*.....................................................
+ Set the error code for the response.
+ */
+ select(file_currenterror( -errorcode));
+ case(0);
+ $OrigFilePath != $NewFilePath ? $errorNumber = 201;
+ case;
+ $errorNumber = 202;
+ /select;
+ /if;
+ /if;
+ /inline;
+ else;
+ $errorNumber = 1;
+ $customMsg = 'This file uploader is disabled. Please check the "editor/filemanager/upload/lasso/config.lasso" file.';
+ /if;
+
+ fck_sendresults(
+ -errorNumber=$errorNumber,
+ -fileUrl=$NewFilePath,
+ -fileName=$NewFileName,
+ -customMsg=$customMsg
+ );
+]
Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/basexml.pl
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/perl/basexml.pl (revision 413)
+++ /FCKeditor/trunk/editor/filemanager/connectors/perl/basexml.pl (revision 413)
@@ -0,0 +1,63 @@
+#####
+# FCKeditor - The text editor for Internet - http://www.fckeditor.net
+# Copyright (C) 2003-2007 Frederico Caldeira Knabben
+#
+# == BEGIN LICENSE ==
+#
+# Licensed under the terms of any of the following licenses at your
+# choice:
+#
+# - GNU General Public License Version 2 or later (the "GPL")
+# http://www.gnu.org/licenses/gpl.html
+#
+# - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+# http://www.gnu.org/licenses/lgpl.html
+#
+# - Mozilla Public License Version 1.1 or later (the "MPL")
+# http://www.mozilla.org/MPL/MPL-1.1.html
+#
+# == END LICENSE ==
+#
+# This is the File Manager Connector for Perl.
+#####
+
+sub CreateXmlHeader
+{
+ local($command,$resourceType,$currentFolder) = @_;
+
+ # Create the XML document header.
+ print '';
+
+ # Create the main "Connector" node.
+ print '';
+
+ # Add the current folder node.
+ print ' ';
+}
+
+sub SendError
+{
+ local( $number, $text ) = @_;
+
+ print << "_HTML_HEAD_";
+Content-Type:text/xml; charset=utf-8
+Pragma: no-cache
+Cache-Control: no-cache
+Expires: Thu, 01 Dec 1994 16:00:00 GMT
+
+_HTML_HEAD_
+
+ # Create the XML document header
+ print '' ;
+
+ print '"; # Open the "Folders" node.
+
+ opendir(DIR,"$sServerDir");
+ @files = grep(!/^\.\.?$/,readdir(DIR));
+ closedir(DIR);
+
+ foreach $sFile (@files) {
+ if($sFile != '.' && $sFile != '..' && (-d "$sServerDir$sFile")) {
+ $cnv_filename = &ConvertToXmlAttribute($sFile);
+ print ' "; # Close the "Folders" node.
+}
+
+sub GetFoldersAndFiles
+{
+
+ local($resourceType, $currentFolder) = @_;
+ # Map the virtual path to the local server path.
+ $sServerDir = &ServerMapFolder($resourceType,$currentFolder);
+
+ # Initialize the output buffers for "Folders" and "Files".
+ $sFolders = '';
+ $sFiles = '';
+
+ opendir(DIR,"$sServerDir");
+ @files = grep(!/^\.\.?$/,readdir(DIR));
+ closedir(DIR);
+
+ foreach $sFile (@files) {
+ if($sFile ne '.' && $sFile ne '..') {
+ if(-d "$sServerDir$sFile") {
+ $cnv_filename = &ConvertToXmlAttribute($sFile);
+ $sFolders .= ' '; # Close the "Folders" node.
+ print $sFiles ;
+ print ''; # Close the "Files" node.
+}
+
+sub CreateFolder
+{
+
+ local($resourceType, $currentFolder) = @_;
+ $sErrorNumber = '0' ;
+ $sErrorMsg = '' ;
+
+ if($FORM{'NewFolderName'} ne "") {
+ $sNewFolderName = $FORM{'NewFolderName'};
+ # Map the virtual path to the local server path of the current folder.
+ $sServerDir = &ServerMapFolder($resourceType, $currentFolder);
+ if(-w $sServerDir) {
+ $sServerDir .= $sNewFolderName;
+ $sErrorMsg = &CreateServerFolder($sServerDir);
+ if($sErrorMsg == 0) {
+ $sErrorNumber = '0';
+ } elsif($sErrorMsg eq 'Invalid argument' || $sErrorMsg eq 'No such file or directory') {
+ $sErrorNumber = '102'; #// Path too long.
+ } else {
+ $sErrorNumber = '110';
+ }
+ } else {
+ $sErrorNumber = '103';
+ }
+ } else {
+ $sErrorNumber = '102' ;
+ }
+ # Create the "Error" node.
+ $cnv_errmsg = &ConvertToXmlAttribute($sErrorMsg);
+ print '%d KB Now Size %d KB (%d bytes Over)",
+ $MAX_CONTENT_SIZE,
+ int($ENV{'CONTENT_LENGTH'} / 1024),
+ $ENV{'CONTENT_LENGTH'} - $MAX_CONTENT_SIZE * 1024
+ )
+ );
+ }
+
+ my $Buffer;
+ if($ENV{'CONTENT_TYPE'} =~ /multipart\/form-data/) {
+ # METHOD POST only
+ return unless($ENV{'CONTENT_LENGTH'});
+
+ binmode(STDIN);
+ # STDIN A pause character is detected.'(MacIE3.0 boundary of $ENV{'CONTENT_TYPE'} cannot be trusted.)
+ my $Boundary = ;
+ $Boundary =~ s/\x0D\x0A//;
+ $Boundary = quotemeta($Boundary);
+ while() {
+ if(/^\s*Content-Disposition:/i) {
+ my($name,$ContentType,$FileName);
+ # form data get
+ if(/\bname="([^"]+)"/i || /\bname=([^\s:;]+)/i) {
+ $name = $1;
+ $name =~ tr/+/ /;
+ $name =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+ &Encode(\$name);
+ }
+ if(/\bfilename="([^"]*)"/i || /\bfilename=([^\s:;]*)/i) {
+ $FileName = $1 || 'unknown';
+ }
+ # head read
+ while() {
+ last if(! /\w/);
+ if(/^\s*Content-Type:\s*"([^"]+)"/i || /^\s*Content-Type:\s*([^\s:;]+)/i) {
+ $ContentType = $1;
+ }
+ }
+ # body read
+ $value = "";
+ while() {
+ last if(/^$Boundary/o);
+ $value .= $_;
+ };
+ $lastline = $_;
+ $value =~s /\x0D\x0A$//;
+ if($value ne '') {
+ if($FileName || $ContentType) {
+ $img_data_exists = 1;
+ (
+ $FileName, #
+ $Ext, #
+ $Length, #
+ $ImageWidth, #
+ $ImageHeight, #
+ $ContentName #
+ ) = &CheckContentType(\$value,$FileName,$ContentType);
+
+ $FORM{$name} = $FileName;
+ $new_fname = $FileName;
+ push(@NEWFNAME_DATA,"$FileName\t$Ext\t$Length\t$ImageWidth\t$ImageHeight\t$ContentName");
+
+ # Multi-upload correspondence
+ push(@NEWFNAMES,$new_fname);
+ open(OUT,">$img_dir/$new_fname");
+ binmode(OUT);
+ eval "flock(OUT,2);" if($PM{'flock'} == 1);
+ print OUT $value;
+ eval "flock(OUT,8);" if($PM{'flock'} == 1);
+ close(OUT);
+
+ } elsif($name) {
+ $value =~ tr/+/ /;
+ $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+ &Encode(\$value,'trans');
+ $FORM{$name} .= "\0" if(defined($FORM{$name}));
+ $FORM{$name} .= $value;
+ }
+ }
+ };
+ last if($lastline =~ /^$Boundary\-\-/o);
+ }
+ } elsif($ENV{'CONTENT_LENGTH'}) {
+ read(STDIN,$Buffer,$ENV{'CONTENT_LENGTH'});
+ }
+ foreach(split(/&/,$Buffer),split(/&/,$ENV{'QUERY_STRING'})) {
+ my($name, $value) = split(/=/);
+ $name =~ tr/+/ /;
+ $name =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+ $value =~ tr/+/ /;
+ $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+
+ &Encode(\$name);
+ &Encode(\$value,'trans');
+ $FORM{$name} .= "\0" if(defined($FORM{$name}));
+ $FORM{$name} .= $value;
+
+ }
+
+}
+
+##############################################################################
+# Summary
+#
+# CheckContentType
+#
+# Parameters
+# Returns
+# Memo
+##############################################################################
+sub CheckContentType
+{
+
+ my($DATA,$FileName,$ContentType) = @_;
+ my($Ext,$ImageWidth,$ImageHeight,$ContentName,$Infomation);
+ my $DataLength = length($$DATA);
+
+ # An unknown file type
+
+ $_ = $ContentType;
+ my $UnknownType = (
+ !$_
+ || /^application\/(x-)?macbinary$/i
+ || /^application\/applefile$/i
+ || /^application\/octet-stream$/i
+ || /^text\/plane$/i
+ || /^x-unknown-content-type/i
+ );
+
+ # MacBinary(Mac Unnecessary data are deleted.)
+ if($UnknownType || $ENV{'HTTP_USER_AGENT'} =~ /Macintosh|Mac_/) {
+ if($DataLength > 128 && !unpack("C",substr($$DATA,0,1)) && !unpack("C",substr($$DATA,74,1)) && !unpack("C",substr($$DATA,82,1)) ) {
+ my $MacBinary_ForkLength = unpack("N", substr($$DATA, 83, 4)); # ForkLength Get
+ my $MacBinary_FileName = quotemeta(substr($$DATA, 2, unpack("C",substr($$DATA, 1, 1))));
+ if($MacBinary_FileName && $MacBinary_ForkLength && $DataLength >= $MacBinary_ForkLength + 128
+ && ($FileName =~ /$MacBinary_FileName/i || substr($$DATA,102,4) eq 'mBIN')) { # DATA TOP 128byte MacBinary!!
+ $$DATA = substr($$DATA,128,$MacBinary_ForkLength);
+ my $ResourceLength = $DataLength - $MacBinary_ForkLength - 128;
+ $DataLength = $MacBinary_ForkLength;
+ }
+ }
+ }
+
+ # A file name is changed into EUC.
+# &jcode::convert(\$FileName,'euc',$FormCodeDefault);
+# &jcode::h2z_euc(\$FileName);
+ $FileName =~ s/^.*\\//; # Windows, Mac
+ $FileName =~ s/^.*\///; # UNIX
+ $FileName =~ s/&/&/g;
+ $FileName =~ s/"/"/g;
+ $FileName =~ s//>/g;
+#
+# if($CHARCODE ne 'euc') {
+# &jcode::convert(\$FileName,$CHARCODE,'euc');
+# }
+
+ # An extension is extracted and it changes into a small letter.
+ my $FileExt;
+ if($FileName =~ /\.(\w+)$/) {
+ $FileExt = $1;
+ $FileExt =~ tr/A-Z/a-z/;
+ }
+
+ # Executable file detection (ban on upload)
+ if($$DATA =~ /^MZ/) {
+ $Ext = 'exe';
+ }
+ # text
+ if(!$Ext && ($UnknownType || $ContentType =~ /^text\//i || $ContentType =~ /^application\/(?:rtf|richtext)$/i || $ContentType =~ /^image\/x-xbitmap$/i)
+ && ! $$DATA =~ /[\000-\006\177\377]/) {
+# $$DATA =~ s/\x0D\x0A/\n/g;
+# $$DATA =~ tr/\x0D\x0A/\n\n/;
+#
+# if(
+# $$DATA =~ /<\s*SCRIPT(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*(?:.|\n)*?\bONLOAD\s*=(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*(?:.|\n)*?\bONCLICK\s*=(?:.|\n)*?>/i
+# ) {
+# $Infomation = '(JavaScript contains)';
+# }
+# if($$DATA =~ /<\s*TABLE(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*BLINK(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*MARQUEE(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*OBJECT(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*EMBED(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*FRAME(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*APPLET(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*FORM(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*(?:.|\n)*?\bSRC\s*=(?:.|\n)*?>/i
+# || $$DATA =~ /<\s*(?:.|\n)*?\bDYNSRC\s*=(?:.|\n)*?>/i
+# ) {
+# $Infomation = '(the HTML tag which is not safe is included)';
+# }
+
+ if($FileExt =~ /^txt$/i || $FileExt =~ /^cgi$/i || $FileExt =~ /^pl$/i) { # Text File
+ $Ext = 'txt';
+ } elsif($ContentType =~ /^text\/html$/i || $FileExt =~ /html?/i || $$DATA =~ /<\s*HTML(?:.|\n)*?>/i) { # HTML File
+ $Ext = 'html';
+ } elsif($ContentType =~ /^image\/x-xbitmap$/i || $FileExt =~ /^xbm$/i) { # XBM(x-BitMap) Image
+ my $XbmName = $1;
+ my ($XbmWidth, $XbmHeight);
+ if($$DATA =~ /\#define\s*$XbmName\_width\s*(\d+)/i) {
+ $XbmWidth = $1;
+ }
+ if($$DATA =~ /\#define\s*$XbmName\_height\s*(\d+)/i) {
+ $XbmHeight = $1;
+ }
+ if($XbmWidth && $XbmHeight) {
+ $Ext = 'xbm';
+ $ImageWidth = $XbmWidth;
+ $ImageHeight = $XbmHeight;
+ }
+ } else { #
+ $Ext = 'txt';
+ }
+ }
+
+ # image
+ if(!$Ext && ($UnknownType || $ContentType =~ /^image\//i)) {
+ # PNG
+ if($$DATA =~ /^\x89PNG\x0D\x0A\x1A\x0A/) {
+ if(substr($$DATA, 12, 4) eq 'IHDR') {
+ $Ext = 'png';
+ ($ImageWidth, $ImageHeight) = unpack("N2", substr($$DATA, 16, 8));
+ }
+ } elsif($$DATA =~ /^GIF8(?:9|7)a/) { # GIF89a(modified), GIF89a, GIF87a
+ $Ext = 'gif';
+ ($ImageWidth, $ImageHeight) = unpack("v2", substr($$DATA, 6, 4));
+ } elsif($$DATA =~ /^II\x2a\x00\x08\x00\x00\x00/ || $$DATA =~ /^MM\x00\x2a\x00\x00\x00\x08/) { # TIFF
+ $Ext = 'tif';
+ } elsif($$DATA =~ /^BM/) { # BMP
+ $Ext = 'bmp';
+ } elsif($$DATA =~ /^\xFF\xD8\xFF/ || $$DATA =~ /JFIF/) { # JPEG
+ my $HeaderPoint = index($$DATA, "\xFF\xD8\xFF", 0);
+ my $Point = $HeaderPoint + 2;
+ while($Point < $DataLength) {
+ my($Maker, $MakerType, $MakerLength) = unpack("C2n",substr($$DATA,$Point,4));
+ if($Maker != 0xFF || $MakerType == 0xd9 || $MakerType == 0xda) {
+ last;
+ } elsif($MakerType >= 0xC0 && $MakerType <= 0xC3) {
+ $Ext = 'jpg';
+ ($ImageHeight, $ImageWidth) = unpack("n2", substr($$DATA, $Point + 5, 4));
+ if($HeaderPoint > 0) {
+ $$DATA = substr($$DATA, $HeaderPoint);
+ $DataLength = length($$DATA);
+ }
+ last;
+ } else {
+ $Point += $MakerLength + 2;
+ }
+ }
+ }
+ }
+
+ # audio
+ if(!$Ext && ($UnknownType || $ContentType =~ /^audio\//i)) {
+ # MIDI Audio
+ if($$DATA =~ /^MThd/) {
+ $Ext = 'mid';
+ } elsif($$DATA =~ /^\x2esnd/) { # ULAW Audio
+ $Ext = 'au';
+ } elsif($$DATA =~ /^RIFF/ || $$DATA =~ /^ID3/ && $$DATA =~ /RIFF/) {
+ my $HeaderPoint = index($$DATA, "RIFF", 0);
+ $_ = substr($$DATA, $HeaderPoint + 8, 8);
+ if(/^WAVEfmt $/) {
+ # WAVE
+ if(unpack("V",substr($$DATA, $HeaderPoint + 16, 4)) == 16) {
+ $Ext = 'wav';
+ } else { # RIFF WAVE MP3
+ $Ext = 'mp3';
+ }
+ } elsif(/^RMIDdata$/) { # RIFF MIDI
+ $Ext = 'rmi';
+ } elsif(/^RMP3data$/) { # RIFF MP3
+ $Ext = 'rmp';
+ }
+ if($ContentType =~ /^audio\//i) {
+ $Infomation .= '(RIFF '. substr($$DATA, $HeaderPoint + 8, 4). ')';
+ }
+ }
+ }
+
+ # a binary file
+ unless ($Ext) {
+ # PDF image
+ if($$DATA =~ /^\%PDF/) {
+ # Picture size is not measured.
+ $Ext = 'pdf';
+ } elsif($$DATA =~ /^FWS/) { # Shockwave Flash
+ $Ext = 'swf';
+ } elsif($$DATA =~ /^RIFF/ || $$DATA =~ /^ID3/ && $$DATA =~ /RIFF/) {
+ my $HeaderPoint = index($$DATA, "RIFF", 0);
+ $_ = substr($$DATA,$HeaderPoint + 8, 8);
+ # AVI
+ if(/^AVI LIST$/) {
+ $Ext = 'avi';
+ }
+ if($ContentType =~ /^video\//i) {
+ $Infomation .= '(RIFF '. substr($$DATA, $HeaderPoint + 8, 4). ')';
+ }
+ } elsif($$DATA =~ /^PK/) { # ZIP Compress File
+ $Ext = 'zip';
+ } elsif($$DATA =~ /^MSCF/) { # CAB Compress File
+ $Ext = 'cab';
+ } elsif($$DATA =~ /^Rar\!/) { # RAR Compress File
+ $Ext = 'rar';
+ } elsif(substr($$DATA, 2, 5) =~ /^\-lh(\d+|d)\-$/) { # LHA Compress File
+ $Infomation .= "(lh$1)";
+ $Ext = 'lzh';
+ } elsif(substr($$DATA, 325, 25) eq "Apple Video Media Handler" || substr($$DATA, 325, 30) eq "Apple \x83\x72\x83\x66\x83\x49\x81\x45\x83\x81\x83\x66\x83\x42\x83\x41\x83\x6E\x83\x93\x83\x68\x83\x89") {
+ # QuickTime
+ $Ext = 'mov';
+ }
+ }
+
+ # Header analysis failure
+ unless ($Ext) {
+ # It will be followed if it applies for the MIME type from the browser.
+ foreach (keys %UPLOAD_CONTENT_TYPE_LIST) {
+ next unless ($_);
+ if($ContentType =~ /^$_$/i) {
+ $Ext = $UPLOAD_CONTENT_TYPE_LIST{$_};
+ $ContentName = &CheckContentExt($Ext);
+ if(
+ grep {$_ eq $Ext;} (
+ 'png',
+ 'gif',
+ 'jpg',
+ 'xbm',
+ 'tif',
+ 'bmp',
+ 'pdf',
+ 'swf',
+ 'mov',
+ 'zip',
+ 'cab',
+ 'lzh',
+ 'rar',
+ 'mid',
+ 'rmi',
+ 'au',
+ 'wav',
+ 'avi',
+ 'exe'
+ )
+ ) {
+ $Infomation .= ' / Header analysis failure';
+ }
+ if($Ext ne $FileExt && &CheckContentExt($FileExt) eq $ContentName) {
+ $Ext = $FileExt;
+ }
+ last;
+ }
+ }
+ # a MIME type is unknown--It judges from an extension.
+ unless ($Ext) {
+ $ContentName = &CheckContentExt($FileExt);
+ if($ContentName) {
+ $Ext = $FileExt;
+ $Infomation .= ' / MIME type is unknown('. $ContentType. ')';
+ last;
+ }
+ }
+ }
+
+# $ContentName = &CheckContentExt($Ext) unless($ContentName);
+# if($Ext && $ContentName) {
+# $ContentName .= $Infomation;
+# } else {
+# &upload_error(
+# 'Extension Error',
+# "$FileName A not corresponding extension ($Ext)
+
+Error Message
+
+
+
+ $error_message
+$error_message2
+
+
+EOF
+ &rm_tmp_uploaded_files; # Image Temporary deletion
+ exit;
+}
+
+##############################################################################
+# Summary
+#
+# Image Temporary deletion
+#
+# Parameters
+# Returns
+# Memo
+##############################################################################
+
+sub rm_tmp_uploaded_files
+{
+ if($img_data_exists == 1){
+ sleep 1;
+ foreach $fname_list(@NEWFNAMES) {
+ if(-e "$img_dir/$fname_list") {
+ unlink("$img_dir/$fname_list");
+ }
+ }
+ }
+
+}
+1;
Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/util.pl
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/perl/util.pl (revision 413)
+++ /FCKeditor/trunk/editor/filemanager/connectors/perl/util.pl (revision 413)
@@ -0,0 +1,68 @@
+#####
+# FCKeditor - The text editor for Internet - http://www.fckeditor.net
+# Copyright (C) 2003-2007 Frederico Caldeira Knabben
+#
+# == BEGIN LICENSE ==
+#
+# Licensed under the terms of any of the following licenses at your
+# choice:
+#
+# - GNU General Public License Version 2 or later (the "GPL")
+# http://www.gnu.org/licenses/gpl.html
+#
+# - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+# http://www.gnu.org/licenses/lgpl.html
+#
+# - Mozilla Public License Version 1.1 or later (the "MPL")
+# http://www.mozilla.org/MPL/MPL-1.1.html
+#
+# == END LICENSE ==
+#
+# This is the File Manager Connector for Perl.
+#####
+
+sub RemoveFromStart
+{
+ local($sourceString, $charToRemove) = @_;
+ $sPattern = '^' . $charToRemove . '+' ;
+ $sourceString =~ s/^$charToRemove+//g;
+ return $sourceString;
+}
+
+sub RemoveFromEnd
+{
+ local($sourceString, $charToRemove) = @_;
+ $sPattern = $charToRemove . '+$' ;
+ $sourceString =~ s/$charToRemove+$//g;
+ return $sourceString;
+}
+
+sub ConvertToXmlAttribute
+{
+ local($value) = @_;
+ return $value;
+# return utf8_encode(htmlspecialchars($value));
+
+}
+
+sub specialchar_cnv
+{
+ local($ch) = @_;
+
+ $ch =~ s/&/&/g; # &
+ $ch =~ s/\"/"/g; #"
+ $ch =~ s/\'/'/g; # '
+ $ch =~ s//>/g; # >
+ return($ch);
+}
+
+sub JS_cnv
+{
+ local($ch) = @_;
+
+ $ch =~ s/\"/\\\"/g; #"
+ return($ch);
+}
+
+1;
Index: /FCKeditor/trunk/editor/filemanager/connectors/php/basexml.php
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/php/basexml.php (revision 413)
+++ /FCKeditor/trunk/editor/filemanager/connectors/php/basexml.php (revision 413)
@@ -0,0 +1,93 @@
+' ;
+
+ // Create the main "Connector" node.
+ echo '' ;
+
+ // Add the current folder node.
+ echo ' ' ;
+}
+
+function SendError( $number, $text )
+{
+ if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
+ {
+ SendErrorNode( $number, $text ) ;
+ CreateXmlFooter() ;
+ }
+ else
+ {
+ SetXmlHeaders() ;
+
+ // Create the XML document header
+ echo '' ;
+
+ echo '' ;
+
+ SendErrorNode( $number, $text ) ;
+
+ echo ' ' ;
+ }
+ exit ;
+}
+
+function SendErrorNode( $number, $text )
+{
+ echo '" ;
+
+ natcasesort( $aFolders ) ;
+ foreach ( $aFolders as $sFolder )
+ echo $sFolder ;
+
+ // Close the "Folders" node.
+ echo " " ;
+}
+
+function GetFoldersAndFiles( $resourceType, $currentFolder )
+{
+ // Map the virtual path to the local server path.
+ $sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'GetFoldersAndFiles' ) ;
+
+ // Arrays that will hold the folders and files names.
+ $aFolders = array() ;
+ $aFiles = array() ;
+
+ $oCurrentFolder = opendir( $sServerDir ) ;
+
+ while ( $sFile = readdir( $oCurrentFolder ) )
+ {
+ if ( $sFile != '.' && $sFile != '..' )
+ {
+ if ( is_dir( $sServerDir . $sFile ) )
+ $aFolders[] = '' ;
+
+ foreach ( $aFolders as $sFolder )
+ echo $sFolder ;
+
+ echo ' ' ;
+
+ // Send the files
+ natcasesort( $aFiles ) ;
+ echo '' ;
+
+ foreach ( $aFiles as $sFiles )
+ echo $sFiles ;
+
+ echo ' ' ;
+}
+
+function CreateFolder( $resourceType, $currentFolder )
+{
+ $sErrorNumber = '0' ;
+ $sErrorMsg = '' ;
+
+ if ( isset( $_GET['NewFolderName'] ) )
+ {
+ $sNewFolderName = $_GET['NewFolderName'] ;
+ $sNewFolderName = SanitizeFolderName( $sNewFolderName ) ;
+
+ if ( strpos( $sNewFolderName, '..' ) !== FALSE )
+ $sErrorNumber = '102' ; // Invalid folder name.
+ else
+ {
+ // Map the virtual path to the local server path of the current folder.
+ $sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'CreateFolder' ) ;
+
+ if ( is_writable( $sServerDir ) )
+ {
+ $sServerDir .= $sNewFolderName ;
+
+ $sErrorMsg = CreateServerFolder( $sServerDir ) ;
+
+ switch ( $sErrorMsg )
+ {
+ case '' :
+ $sErrorNumber = '0' ;
+ break ;
+ case 'Invalid argument' :
+ case 'No such file or directory' :
+ $sErrorNumber = '102' ; // Path too long.
+ break ;
+ default :
+ $sErrorNumber = '110' ;
+ break ;
+ }
+ }
+ else
+ $sErrorNumber = '103' ;
+ }
+ }
+ else
+ $sErrorNumber = '102' ;
+
+ // Create the "Error" node.
+ echo '""" % (
+ command,
+ resourceType
+ )
+ # Add the current folder node
+ s += """ """
+ return s
+
+ """
+ sendError
+
+ Purpose: in the event of an error, return an xml based error
+ """
+ def sendError(self, number, text):
+ self.setXmlHeaders()
+ s = ""
+ # Create the XML document header
+ s += """"""
+ s += """"""
+ s += """ """
+ return s
+
+ """
+ getFolders
+
+ Purpose: command to recieve a list of folders
+ """
+ def getFolders(self, resourceType, currentFolder):
+ if (self.isZope()):
+ return self.getZopeFolders(resourceType, currentFolder)
+ else:
+ return self.getNonZopeFolders(resourceType, currentFolder)
+
+ def getZopeFolders(self, resourceType, currentFolder):
+ # Open the folders node
+ s = ""
+ s += """"""
+ zopeFolder = self.findZopeFolder(resourceType, currentFolder)
+ for (name, o) in zopeFolder.objectItems(["Folder"]):
+ s += """ """
+ return s
+
+ def getNonZopeFolders(self, resourceType, currentFolder):
+ # Map the virtual path to our local server
+ serverPath = self.serverMapFolder(resourceType, currentFolder)
+ # Open the folders node
+ s = ""
+ s += """"""
+ for someObject in os.listdir(serverPath):
+ someObjectPath = os.path.join(serverPath, someObject)
+ if os.path.isdir(someObjectPath):
+ s += """ """
+ return s
+
+ """
+ getFoldersAndFiles
+
+ Purpose: command to recieve a list of folders and files
+ """
+ def getFoldersAndFiles(self, resourceType, currentFolder):
+ if (self.isZope()):
+ return self.getZopeFoldersAndFiles(resourceType, currentFolder)
+ else:
+ return self.getNonZopeFoldersAndFiles(resourceType, currentFolder)
+
+ def getNonZopeFoldersAndFiles(self, resourceType, currentFolder):
+ # Map the virtual path to our local server
+ serverPath = self.serverMapFolder(resourceType, currentFolder)
+ # Open the folders / files node
+ folders = """"""
+ files = """"""
+ for someObject in os.listdir(serverPath):
+ someObjectPath = os.path.join(serverPath, someObject)
+ if os.path.isdir(someObjectPath):
+ folders += """ """
+ files += """"""
+ # Return it
+ s = folders + files
+ return s
+
+ def getZopeFoldersAndFiles(self, resourceType, currentFolder):
+ folders = self.getZopeFolders(resourceType, currentFolder)
+ files = self.getZopeFiles(resourceType, currentFolder)
+ s = folders + files
+ return s
+
+ def getZopeFiles(self, resourceType, currentFolder):
+ # Open the files node
+ s = ""
+ s += """"""
+ zopeFolder = self.findZopeFolder(resourceType, currentFolder)
+ for (name, o) in zopeFolder.objectItems(["File","Image"]):
+ s += """ """
+ return s
+
+ def findZopeFolder(self, resourceType, folderName):
+ # returns the context of the resource / folder
+ zopeFolder = self.getZopeUploadContext()
+ folderName = self.removeFromStart(folderName, "/")
+ folderName = self.removeFromEnd(folderName, "/")
+ if (resourceType <> ""):
+ try:
+ zopeFolder = zopeFolder[resourceType]
+ except:
+ zopeFolder.manage_addProduct["OFSP"].manage_addFolder(id=resourceType, title=resourceType)
+ zopeFolder = zopeFolder[resourceType]
+ if (folderName <> ""):
+ folderNames = folderName.split("/")
+ for folderName in folderNames:
+ zopeFolder = zopeFolder[folderName]
+ return zopeFolder
+
+ """
+ createFolder
+
+ Purpose: command to create a new folder
+ """
+ def createFolder(self, resourceType, currentFolder):
+ if (self.isZope()):
+ return self.createZopeFolder(resourceType, currentFolder)
+ else:
+ return self.createNonZopeFolder(resourceType, currentFolder)
+
+ def createZopeFolder(self, resourceType, currentFolder):
+ # Find out where we are
+ zopeFolder = self.findZopeFolder(resourceType, currentFolder)
+ errorNo = 0
+ errorMsg = ""
+ if self.request.has_key("NewFolderName"):
+ newFolder = self.request.get("NewFolderName", None)
+ zopeFolder.manage_addProduct["OFSP"].manage_addFolder(id=newFolder, title=newFolder)
+ else:
+ errorNo = 102
+ error = """FCKeditor - Connectors Tests
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /FCKeditor/trunk/editor/filemanager/connectors/uploadtest.html
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/uploadtest.html (revision 413)
+++ /FCKeditor/trunk/editor/filemanager/connectors/uploadtest.html (revision 413)
@@ -0,0 +1,134 @@
+
+
+
+ FCKeditor - Uploaders Tests
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /FCKeditor/trunk/fckconfig.js
===================================================================
--- /FCKeditor/trunk/fckconfig.js (revision 412)
+++ /FCKeditor/trunk/fckconfig.js (revision 413)
@@ -188,5 +188,5 @@
// Custom implementations should just ignore it.
var _FileBrowserLanguage = 'asp' ; // asp | aspx | cfm | lasso | perl | php | py
-var _QuickUploadLanguage = 'asp' ; // asp | aspx | cfm | lasso | php
+var _QuickUploadLanguage = 'asp' ; // asp | aspx | cfm | lasso | perl | php
// @Packager.Remove.Start
@@ -201,30 +201,30 @@
FCKConfig.LinkBrowser = true ;
-FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
+FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70%
FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70%
FCKConfig.ImageBrowser = true ;
-FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
+FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ;
FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ;
FCKConfig.FlashBrowser = true ;
-FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
+FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ;
FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ;
FCKConfig.LinkUpload = true ;
-FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ;
+FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ;
FCKConfig.LinkUploadAllowedExtensions = "" ; // empty for all
FCKConfig.LinkUploadDeniedExtensions = ".(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)$" ; // empty for no one
FCKConfig.ImageUpload = true ;
-FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ;
+FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ;
FCKConfig.ImageUploadAllowedExtensions = ".(jpg|gif|jpeg|png|bmp)$" ; // empty for all
FCKConfig.ImageUploadDeniedExtensions = "" ; // empty for no one
FCKConfig.FlashUpload = true ;
-FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ;
+FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ;
FCKConfig.FlashUploadAllowedExtensions = ".(swf|fla)$" ; // empty for all
FCKConfig.FlashUploadDeniedExtensions = "" ; // empty for no one
' +
- '
' +
- '