Changeset 350

Timestamp:

2007-06-02 15:55:18 (20 months ago)

Author:

fredck

Message:

Fixed #295 and #510 : Corrected some path resolution issues with the File Browser connector for ColdFusion.

Location:

FCKeditor/trunk

Files:

• editor/filemanager/browser/default/connectors/cfm/connector.cfm (modified) (3 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/connector.cfm

@@ -48 +48 @@
         lDeniedExtensions = config.deniedExtensions[url.type];
 
+        if ( userFilesPath eq "" ) {
+                userFilesPath = "/userfiles/";
+        }
+
         // make sure the user files path is correctly formatted
         userFilesPath = replace(userFilesPath, "\", "/", "ALL");
@@ -75 +79 @@
         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"),"");
+                serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"") & replace(userFilesPath,"/",fs,"all");
         }
 
@@ -361 +369 @@
 <cfheader name="Cache-Control" value="no-cache, no-store, must-revalidate">
 <cfcontent reset="true" type="text/xml; charset=UTF-8">
-<cfoutput>#xmlHeader##xmlContent##xmlFooter#</cfoutput> 
+<cfoutput>#xmlHeader##xmlContent##xmlFooter#</cfoutput>

FCKeditor/trunk/_whatsnew.html

@@ -142 +142 @@
                         the target directory is now being automatically created if needed when "quick uploading".
                         Thanks to sirmeili.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/295">#295</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/510">#510</a>] Corrected some
+                        path resolution issues with the File Browser connector for ColdFusion.</li>
         </ul>
         <h3>