Index: /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat (revision 7433) @@ -26,5 +26,5 @@ :: Update this variable for each new release. -SET RELEASER_VERSION=2.6.6 +SET RELEASER_VERSION=2.6.7 CLS Index: /FCKeditor/branches/versions/2.6.x/_whatsnew.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 7433) @@ -34,26 +34,9 @@ FCKeditor ChangeLog - What's New?

- Version 2.6.6

-

- New Features and Improvements:

- + Version 2.6.7

Fixed Bugs:

Index: /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 7433) @@ -33,4 +33,28 @@

FCKeditor ChangeLog - What's New?

+

+ Version 2.6.6

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+

Version 2.6.5

Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/io.asp =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/io.asp (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/io.asp (revision 7433) @@ -192,5 +192,5 @@ Set oRegex = New RegExp oRegex.Global = True - oRegex.Pattern = "(/\.)|(//)|([\\:\*\?\""\<\>\|]|[\u0000-\u001F]|\u007F)" + oRegex.Pattern = "(/\.)|(//)|([\\:\;\.\*\?\""\<\>\|]|[\u0000-\u001F]|\u007F)" if (oRegex.Test(sCurrentFolder)) Then @@ -208,5 +208,5 @@ ' remove . \ / | : ? * " < > and control characters - oRegex.Pattern = "(\.|\\|\/|\||:|\?|\*|""|\<|\>|[\u0000-\u001F]|\u007F)" + oRegex.Pattern = "(\.|\\|\/|\||:|\?|\;|\*|""|\<|\>|[\u0000-\u001F]|\u007F)" SanitizeFolderName = oRegex.Replace( sNewFolderName, "_" ) @@ -226,5 +226,5 @@ ' remove \ / | : ? * " < > and control characters - oRegex.Pattern = "(\\|\/|\||:|\?|\*|""|\<|\>|[\u0000-\u001F]|\u007F)" + oRegex.Pattern = "(\\|\/|\||:|\;|\?|\*|""|\<|\>|[\u0000-\u001F]|\u007F)" SanitizeFileName = oRegex.Replace( sNewFileName, "_" ) Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_connector.cfm =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_connector.cfm (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_connector.cfm (revision 7433) @@ -117,5 +117,5 @@ "> -])', url.currentFolder)> +])', url.currentFolder)> Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_upload.cfm =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_upload.cfm (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_upload.cfm (revision 7433) @@ -91,5 +91,5 @@ -])', url.currentFolder)> +])', url.currentFolder)> Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf_io.cfm =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf_io.cfm (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf_io.cfm (revision 7433) @@ -194,5 +194,5 @@ - ])', sCurrentFolder)> + ])', sCurrentFolder)> @@ -210,5 +210,5 @@ - +|[[:cntrl:]]+', "_", "all" )> + +|[[:cntrl:]]+', "_", "all" )> @@ -294,5 +294,5 @@ - +|[[:cntrl:]]+', "_", "all" )> + +|[[:cntrl:]]+', "_", "all" )> Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/lasso/connector.lasso =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/lasso/connector.lasso (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/lasso/connector.lasso (revision 7433) @@ -110,5 +110,5 @@ $commandData += '\n'; /if; - else if($CurrentFolder->(Find: '..') || (String_FindRegExp: $CurrentFolder, -Find='(/\\.)|(//)|[\\\\:\\*\\?\\""\\<\\>\\|]|\\000|[\u007F]|[\u0001-\u001F]')); + else if($CurrentFolder->(Find: '..') || (String_FindRegExp: $CurrentFolder, -Find='(/\\.)|(//)|[\\\\:\\*\\;\\.\\?\\""\\<\\>\\|]|\\000|[\u007F]|[\u0001-\u001F]')); if($Command == 'FileUpload'); $responseType = 'html'; @@ -173,5 +173,5 @@ */ case('CreateFolder'); - $NewFolderName = (String_ReplaceRegExp: $NewFolderName, -find='\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|\\000|[\u007F]|[\u0001-\u001F]', -replace='_'); + $NewFolderName = (String_ReplaceRegExp: $NewFolderName, -find='\\.|\\\\|\\/|\\||\\:|\\;|\\.|\\?|\\*|"|<|>|\\000|[\u007F]|[\u0001-\u001F]', -replace='_'); var('newFolder' = $currentFolderURL + $NewFolderName + '/'); file_create($newFolder); @@ -225,10 +225,10 @@ */ $NewFileName = $NewFile->find('OrigName'); - $NewFileName = (String_ReplaceRegExp: $NewFileName, -find='\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|\\000|[\u007F]|[\u0001-\u001F]', -replace='_'); + $NewFileName = (String_ReplaceRegExp: $NewFileName, -find='\\\\|\\/|\\||\\:|\\;|\\?|\\*|"|<|>|\\000|[\u007F]|[\u0001-\u001F]', -replace='_'); $NewFileName = (String_ReplaceRegExp: $NewFileName, -find='\\.(?![^.]*$)', -replace='_'); $OrigFilePath = $currentFolderURL + $NewFileName; $NewFilePath = $OrigFilePath; local('fileExtension') = '.' + $NewFile->find('OrigExtension'); - #fileExtension = (String_ReplaceRegExp: #fileExtension, -find='\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|\\000|[\u007F]|[\u0001-\u001F]', -replace='_'); + #fileExtension = (String_ReplaceRegExp: #fileExtension, -find='\\\\|\\/|\\||\\:|\\;|\\.|\\?|\\*|"|<|>|\\000|[\u007F]|[\u0001-\u001F]', -replace='_'); local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&; Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/lasso/upload.lasso =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/lasso/upload.lasso (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/lasso/upload.lasso (revision 7433) @@ -94,5 +94,5 @@ /define_tag; - if($CurrentFolder->(Find: '..') || (String_FindRegExp: $CurrentFolder, -Find='(/\\.)|(//)|[\\\\:\\*\\?\\""\\<\\>\\|]|\\000|[\u007F]|[\u0001-\u001F]')); + if($CurrentFolder->(Find: '..') || (String_FindRegExp: $CurrentFolder, -Find='(/\\.)|(//)|[\\\\:\\;\\.\\*\\?\\""\\<\\>\\|]|\\000|[\u007F]|[\u0001-\u001F]')); $errorNumber = 102; /if; @@ -117,5 +117,5 @@ */ $NewFileName = $NewFile->find('OrigName'); - $NewFileName = (String_ReplaceRegExp: $NewFileName, -find='\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|\\000|[\u007F]|[\u0001-\u001F]', -replace='_'); + $NewFileName = (String_ReplaceRegExp: $NewFileName, -find='\\\\|\\/|\\||\\:|\\;|\\?|\\*|"|<|>|\\000|[\u007F]|[\u0001-\u001F]', -replace='_'); $NewFileName = (String_ReplaceRegExp: $NewFileName, -find='\\.(?![^.]*$)', -replace='_'); $OrigFilePath = $currentFolderURL + $NewFileName; Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/perl/commands.pl =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/perl/commands.pl (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/perl/commands.pl (revision 7433) @@ -92,5 +92,5 @@ if($FORM{'NewFolderName'} ne "") { $sNewFolderName = $FORM{'NewFolderName'}; - $sNewFolderName =~ s/\.|\\|\/|\||\:|\?|\*|\"|<|>|[[:cntrl:]]/_/g; + $sNewFolderName =~ s/\.|\\|\/|\||\:|\;|\?|\*|\"|<|>|[[:cntrl:]]/_/g; # Map the virtual path to the local server path of the current folder. $sServerDir = &ServerMapFolder($resourceType, $currentFolder); @@ -131,5 +131,5 @@ # Get the uploaded file name. $sFileName = $new_fname; - $sFileName =~ s/\\|\/|\||\:|\?|\*|\"|<|>|[[:cntrl:]]/_/g; + $sFileName =~ s/\\|\/|\||\:|\;|\?|\*|\"|<|>|[[:cntrl:]]/_/g; $sFileName =~ s/\.(?![^.]*$)/_/g; Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/php/io.php =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/php/io.php (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/php/io.php (revision 7433) @@ -246,5 +246,5 @@ SendError( 102, '' ) ; - if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder)) + if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\.\;\:\*\?\"\<\>\|]),", $sCurrentFolder)) SendError( 102, '' ) ; @@ -257,6 +257,6 @@ $sNewFolderName = stripslashes( $sNewFolderName ) ; - // Remove . \ / | : ? * " < > - $sNewFolderName = preg_replace( '/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFolderName ) ; + // Remove . \ / | : ; . ? * " < > + $sNewFolderName = preg_replace( '/\\.|\\\\|\\;|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFolderName ) ; return $sNewFolderName ; @@ -275,5 +275,5 @@ // Remove \ / | : ? * " < > - $sNewFileName = preg_replace( '/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName ) ; + $sNewFileName = preg_replace( '/\\\\|\\/|\\||\\:|\\;|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName ) ; return $sNewFileName ; Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/py/fckutil.py =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/py/fckutil.py (revision 7432) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/py/fckutil.py (revision 7433) @@ -63,5 +63,5 @@ "Do a cleanup of the folder name to avoid possible problems" # Remove . \ / | : ? * " < > and control characters - return re.sub( '\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[\x00-\x1f\x7f-\x9f]', '_', newFolderName ) + return re.sub( '\\.|\\\\|\\/|\\;|\\||\\:|\\?|\\*|"|<|>|[\x00-\x1f\x7f-\x9f]', '_', newFolderName ) def sanitizeFileName( newFileName ): @@ -73,5 +73,5 @@ newFileName = os.path.basename (newFileName) # strip directories # Remove \ / | : ? * - return re.sub ( '\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[\x00-\x1f\x7f-\x9f]/', '_', newFileName ) + return re.sub ( '\\\\|\\/|\\||\\:|\\;|\\?|\\*|"|<|>|[\x00-\x1f\x7f-\x9f]/', '_', newFileName ) def getCurrentFolder(currentFolder): @@ -94,5 +94,5 @@ # Check for invalid folder paths (..) - if re.search( '(/\\.)|(//)|([\\\\:\\*\\?\\""\\<\\>\\|]|[\x00-\x1F]|[\x7f-\x9f])', currentFolder ): + if re.search( '(/\\.)|(//)|([\\\\:\\;\\*\\?\\""\\<\\>\\|]|[\x00-\x1F]|[\x7f-\x9f])', currentFolder ): return None