Changeset 1580

Timestamp:

2008-02-21 11:56:37 (2 years ago)

Author:

wwalc

Message:

Fix for #1692: resolved issues in ColdFusion with GetTempDirectory() calls, added changelog entry for #1379

Location:

FCKeditor/trunk

Files:

• editor/filemanager/connectors/cfm/cf_commands.cfm (modified) (4 diffs)
• editor/filemanager/connectors/cfm/config.cfm (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_commands.cfm

@@ -33 +33 @@
         <cfset var sFileExt = "">
         <cfset var sFileUrl = "">
+        <cfset var sTempDir = "">
         <cfset var sTempFilePath = "">
         <cfset var errorNumber = 0>
@@ -39 +40 @@
         <cfset var destination = "">
 
-    <cftry>
-        <cffile action="UPLOAD" filefield="NewFile" destination="#GetTempDirectory()#" nameconflict="makeunique" mode="0755" />
+        <cftry>
+                <cfif isDefined( "REQUEST.Config.TempDirectory" )>
+                        <cfset sTempDir = REQUEST.Config.TempDirectory>
+                <cfelse>
+                        <cfset sTempDir = GetTempDirectory()>
+                </cfif>
+                <cfif NOT DirectoryExists (sTempDir)>
+                        <cfthrow message="Invalid temporary directory: #sTempDir#">
+                </cfif>
+
+                <cffile action="UPLOAD" filefield="NewFile" destination="#sTempDir#" nameconflict="makeunique" mode="0755" />
                 <cfset sTempFilePath = CFFILE.ServerDirectory & REQUEST.fs & CFFILE.ServerFile>
 
@@ -93 +103 @@
 
                 <cfset destination = sServerDir & sFileName>
-<!---
-                <cfdump var="#sTempFilePath#">
-                <cfoutput ><br /></cfoutput>
-                <cfdump var="#destination#">
-                <cfabort>
- --->
+
                 <cflock name="#destination#" timeout="30" type="Exclusive">
                 <cftry>
@@ -121 +126 @@
                 </cfcatch>
 
-    </cftry>
+        </cftry>
 
         <cfset SendUploadResults( errorNumber, sFileUrl, sFileName, customMsg ) >

FCKeditor/trunk/editor/filemanager/connectors/cfm/config.cfm

@@ -62 +62 @@
         Config.HtmlExtensions                                   = "html,htm,xml,xsd,txt,js" ;
 
+        //Due to known issues with GetTempDirectory function, it is
+        //recommended to set this vairiable to a valid directory
+        //instead of using the GetTempDirectory function
+        //(used by MX 6.0 and above)
+        Config.TempDirectory = GetTempDirectory();
 
 //      Configuration settings for each Resource Type

FCKeditor/trunk/_whatsnew.html

@@ -120 +120 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1815">#1815</a>] PHP integration: removed 
                         closing tag: "?>", so no additional whitespace added when files are included.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1692">#1692</a>] ColdFusion file browser: 
+                        it is possible now to define TempDirectory to avoid issues with GetTempdirectory() returning 
+                        an empty string.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1379">#1379</a>] ColdFusion file browser: 
+                        resolved issues with OnRequestEnd.cfm breaking the file browser.</li>
         </ul>
         <p>