Changeset 1651

Timestamp:

2008-02-28 11:46:54 (2 years ago)

Author:

wwalc

Message:

Fix for #1945 - sanitizing control characters in Python.

Files:

• FCKeditor/trunk/editor/filemanager/connectors/py/fckutil.py (modified) (2 diffs)

FCKeditor/trunk/editor/filemanager/connectors/py/fckutil.py

@@ -62 +62 @@
 def sanitizeFolderName( newFolderName ):
         "Do a cleanup of the folder name to avoid possible problems"
-        # Remove . \ / | : ? *
-        return re.sub( '\\.|\\\\|\\/|\\||\\:|\\?|\\*', '_', newFolderName )
+        # Remove . \ / | : ? * " < > and control characters
+        return re.sub( '(?u)\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[^\u0000-\u001f\u007f-\u009f]', '_', newFolderName )
 
 def sanitizeFileName( newFileName ):
@@ -73 +73 @@
         newFileName = os.path.basename (newFileName)    # strip directories
         # Remove \ / | : ? *
-        return re.sub ( '/\\\\|\\/|\\||\\:|\\?|\\*/', '_', newFileName )
+        return re.sub ( '(?u)/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[^\u0000-\u001f\u007f-\u009f]/', '_', newFileName )
 
 def getCurrentFolder(currentFolder):