Index: /FCKeditor/trunk/_samples/cfm/sample01.cfm
===================================================================
--- /FCKeditor/trunk/_samples/cfm/sample01.cfm	(revision 135)
+++ /FCKeditor/trunk/_samples/cfm/sample01.cfm	(revision 136)
@@ -59,4 +59,5 @@
 <cfif isDefined( 'FORM.fieldnames' )>
 	<cfoutput>
+	<hr />
 	<style>
 	<!--
Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 135)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 136)
@@ -30,4 +30,21 @@
 </head>
 <body>
+	<h3>
+		Version 2.4.1 (SVN)</h3>
+	<p>
+		New Features and Improvements:</p>
+	<ul>
+		<li>&lt;none&gt;</li></ul>
+	<p>
+		Fixed Bugs:</p>
+	<ul>
+		<li>Various fixes to the ColdFusion File Browser connector.</li>
+		<li>We are now pointing the download of ieSpell to their pages, instead to a direct
+			file download from one of their mirrors. This disables the ability of "click and
+			go" (which can still be achieved by pointing the download to a file in your server),
+			but removes any troubles with mirros link changes (and they change it frequently).</li>
+		<li>The Word cleanup has been changed to remove "display:none" tags that may come from
+			Word.</li>
+	</ul>
 	<h3>
 		Version 2.4</h3>
@@ -104,7 +121,7 @@
 			default to the "/userfiles/" folder instead of "/UserFiles/" (case change). Also,
 			the inner folders for each type (file, image, flash and media) are all lower-cased
-			too.</li><li><span style="color: #ff0000">Attention:</span> The UseBROnCarriageReturn configuration
-			is not anymore valid. The EnterMode setting can now be used to precisely set the
-			enter key behavior.</li>
+			too.</li><li><span style="color: #ff0000">Attention:</span> The UseBROnCarriageReturn
+				configuration is not anymore valid. The EnterMode setting can now be used to precisely
+				set the enter key behavior.</li>
 	</ul>
 	<p>
@@ -225,9 +242,8 @@
 		<li><font color="#ff0000">Attention:</font> The default directory in the distribution
 			package is now named "fckeditor" (in lowercase) instead of "FCKeditor".&nbsp; This
-			change may impact installations on case sensitive OSs, like Linux.
-		</li>
-		<li><font color="#ff0000">Attention:</font> The "Universal Keyboard"
-			has been removed from the package. The license of those files was unclear so they
-			can't be included alongside the rest of FCKeditor.</li></ul>
+			change may impact installations on case sensitive OSs, like Linux. </li>
+		<li><font color="#ff0000">Attention:</font> The "Universal Keyboard" has been removed
+			from the package. The license of those files was unclear so they can't be included
+			alongside the rest of FCKeditor.</li></ul>
 	<h3>
 		Version 2.3.2</h3>
Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/connector.cfm
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/connector.cfm	(revision 135)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/connector.cfm	(revision 136)
@@ -1,3 +1,3 @@
-<cfsetting enablecfoutputonly="yes" showdebugoutput="no">
+﻿<cfsetting enablecfoutputonly="yes" showdebugoutput="no">
 <!---
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
@@ -50,10 +50,6 @@
 	// 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;
 	}
 
@@ -84,5 +80,5 @@
 
 	// map the user files path to a physical directory
-	userFilesServerPath = serverPath & replace(userFilesPath,"/",fs,"all");
+	userFilesServerPath = serverPath & url.type & replace(url.currentFolder,"/",fs,"all");
 
 	xmlContent = ""; // append to this string to build content
@@ -102,8 +98,7 @@
 
 <!--- create directories in physical path if they don't already exist --->
-<cfset currentPath = serverPath>
+<cfset currentPath = "">
 <cftry>
-
-	<cfloop list="#userFilesPath#" index="name" delimiters="/">
+	<cfloop list="#userFilesServerPath#" index="name" delimiters="/">
 
 		<cfif not directoryExists(currentPath & fs & name)>
@@ -116,8 +111,9 @@
 
 	<!--- create sub-directory for file type if it doesn't already exist --->
+	<!---
 		<cfif not directoryExists(userFilesServerPath & url.type)>
 		<cfdirectory action="create" directory="#userFilesServerPath##url.type#" mode="755">
 	</cfif>
-
+	--->
 <cfcatch>
 
@@ -135,5 +131,5 @@
 
 	<!--- we need to know the physical path to the current folder for all commands --->
-	<cfset currentFolderPath = userFilesServerPath & url.type & replace(url.currentFolder,"/",fs,"all")>
+	<cfset currentFolderPath = userFilesServerPath>
 
 	<cfswitch expression="#url.command#">
@@ -258,5 +254,5 @@
 						break;
 					if( not listFind(".,..", qDir.name[i]) )
-						folders = folders & '<Folder name="#qDir.name[i]#" />';
+						folders = folders & '<Folder name="#HTMLEditFormat( qDir.name[i] )#" />';
 					i=i+1;
 				}
@@ -283,8 +279,8 @@
 				while( i lte qDir.recordCount ) {
 					if( not compareNoCase( qDir.type[i], "DIR" ) and not listFind(".,..", qDir.name[i]) ) {
-						folders = folders & '<Folder name="#qDir.name[i]#" />';
+						folders = folders & '<Folder name="#HTMLEditFormat(qDir.name[i])#" />';
 					} else if( not compareNoCase( qDir.type[i], "FILE" ) ) {
 						fileSizeKB = round(qDir.size[i] / 1024);
-						files = files & '<File name="#qDir.name[i]#" size="#IIf( fileSizeKB GT 0, DE( fileSizeKB ), 1)#" />';
+						files = files & '<File name="#HTMLEditFormat(qDir.name[i])#" size="#IIf( fileSizeKB GT 0, DE( fileSizeKB ), 1)#" />';
 					}
 					i=i+1;
