Ticket #1692: 1692.patch

editor/filemanager/connectors/cfm/cf_commands.cfm

@@ -32 +32 @@
         <cfset var sFilePart = "">
         <cfset var sFileExt = "">
         <cfset var sFileUrl = "">
+        <cfset var sTempDir = "">
         <cfset var sTempFilePath = "">
         <cfset var errorNumber = 0>
         <cfset var customMsg = 0>
         <cfset var counter = 0>
         <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>
 
                 <!--- Map the virtual path to the local server path. --->
@@ -92 +102 @@
                 </cfscript>
 
                 <cfset destination = sServerDir & sFileName>
-<!---
-                <cfdump var="#sTempFilePath#">
-                <cfoutput ><br /></cfoutput>
-                <cfdump var="#destination#">
-                <cfabort>
- --->
+
                 <cflock name="#destination#" timeout="30" type="Exclusive">
                 <cftry>
                         <cffile action="move" source="#sTempFilePath#" destination="#destination#" mode="755">
@@ -120 +125 @@
                         <cfset customMsg = CFCATCH.Message >
                 </cfcatch>
 
-    </cftry>
+        </cftry>
 
         <cfset SendUploadResults( errorNumber, sFileUrl, sFileName, customMsg ) >
 </cffunction>

editor/filemanager/connectors/cfm/config.cfm

@@ -61 +61 @@
         // (This feature works in MX 6.0 and above))
         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
 //