Changeset 1652

Timestamp:

2008-02-28 12:40:45 (2 years ago)

Author:

wwalc

Message:

Fix for #1945 - sanitizing control characters in ColdFusion.

Files:

• FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_io.cfm (modified) (2 diffs)

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

@@ -205 +205 @@
 
         <!--- Do a cleanup of the folder name to avoid possible problems --->
-        <!--- Remove . \ / | : ? * " < > --->
-        <cfset sNewFolderName = rereplace( sNewFolderName, '\.+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+', "_", "all" )>
+        <!--- Remove . \ / | : ? * " < > and control characters --->
+        <cfset sNewFolderName = rereplace( sNewFolderName, '\.+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+|[[:cntrl:]]+', "_", "all" )>
 
         <cfreturn sNewFolderName>
@@ -282 +282 @@
 
         <!--- Do a cleanup of the file name to avoid possible problems --->
-        <!--- Remove \ / | : ? * " < > --->
-        <cfset sNewFileName = rereplace( sNewFileName, '\\[.]+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+', "_", "all" )>
+        <!--- Remove \ / | : ? * " < > and control characters --->
+        <cfset sNewFileName = rereplace( sNewFileName, '\\[.]+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+|[[:cntrl:]]+', "_", "all" )>
 
         <cfreturn sNewFileName>