@@ -7,12 +7,43 @@ class FckeditorController < ApplicationController UPLOADED = "/uploads" UPLOADED_ROOT = RAILS_ROOT + "/public" + UPLOADED MIME_TYPES = [ - "image/jpg", - "image/jpeg", - "image/pjpeg", - "image/gif", - "image/png", - "application/x-shockwave-flash" + "image/jpg", + "image/jpeg", + "image/pjpeg", + "image/gif", + "image/png", + "application/x-shockwave-flash", + "application/msword", + "application/msaccess", + "application/vnd.ms-excel", + "application/vnd.ms-powerpoint", + "application/vnd.oasis.opendocument.graphics", + "application/vnd.oasis.opendocument.text", + "application/vnd.oasis.opendocument.spreadsheet", + "application/vnd.oasis.opendocument.presentation", + "application/vnd.oasis.opendocument.database", + "application/vnd.sun.xml.calc", + "application/vnd.sun.xml.impress", + "application/vnd.sun.xml.writer", + "application/x-xcf", + "text/plain", + "text/html", + "application/pdf", + "application/ogg", + "audio/mpeg", + "audio/mpegurl", + "audio/x-mpegurl", + "image/tiff", + "video/mpeg", + "video/mp4", + "video/qt", + "video/quicktime", + "video/x-flv", + "video/x-ms-wmv", + "video/x-msvideo", + "application/zip", + "application/xml", + "application/xhtml+xml" ] RXML = <<-EOL app/controllers/fckeditor_controller.rb @@ -6,9 +6,20 @@ FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/bro FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + FCKRelativePath + '/fckeditor/command'; FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + FCKRelativePath + '/fckeditor/command'; -FCKConfig.LinkUploadURL = FCKRelativePath + '/fckeditor/upload'; -FCKConfig.ImageUploadURL = FCKRelativePath + '/fckeditor/upload?Type=Image'; -FCKConfig.FlashUploadURL = FCKRelativePath + '/fckeditor/upload?Type=Flash'; +// FCKConfig.LinkBrowser = false; +FCKConfig.LinkUpload = false; +FCKConfig.ImageUpload = false; +FCKConfig.FlashUpload = false; + +// FCKConfig.LinkUploadURL = FCKRelativePath + '/fckeditor/upload'; +// FCKConfig.ImageUploadURL = FCKRelativePath + '/fckeditor/command?Command=FileUpload&Type=Image&CurrentFolder=/'; +// FCKConfig.FlashUploadURL = FCKRelativePath + '/fckeditor/upload?Type=Flash'; + +FCKConfig.ImageUploadAllowedExtensions = "\.(jpg|gif|jpeg|png)$" ; +FCKConfig.LinkUploadAllowedExtensions = "\.(asf|avi|doc|flv|gif|htm|html|xhtml|jpeg|jpg|mov|mp3|mp4|mpeg|mpg|ods|odg|odt|odb|pdf|png|ppt|qt|sxw|sxc|sxi|swf|tar|tgz|tif|tiff|txt|text|wav|wma|wmv|xls|xml|zip)$" ; + +FCKConfig.FlashUploadAllowedExtensions = "\.(swf|flv)$" ; + FCKConfig.SpellerPagesServerScript = FCKRelativePath + '/fckeditor/check_spelling'; FCKConfig.AllowQueryStringDebug = false; FCKConfig.SpellChecker = 'SpellerPages'; @@ -16,7 +27,6 @@ FCKConfig.SpellChecker = 'SpellerPages'; FCKConfig.ProtectedSource.Add(/<\/?r:*?>/gi); FCKConfig.ProtectedTags = '<%= @fck_tag_list %>' ; -// ONLY CHANGE BELOW HERE //FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/silver/'; FCKConfig.ToolbarSets["Simple"] = [ @@ -33,4 +43,6 @@ FCKConfig.ToolbarSets["Simple"] = [ ['FontName','FontSize'], ['TextColor','BGColor'], ['-','About'] -] ; +]; + + app/views/fckeditor/config.js.erb 6f601b0b1089eec5ef6cca06c7a9728f79511760 Daniel Collis-Puro dan@collispuro.net http://github.com/djcp/radiant-fckeditor/commit/ecda2547e1c1db62397bd64f7d6503c64f0fd676 ecda2547e1c1db62397bd64f7d6503c64f0fd676 2008-06-12T19:38:50-07:00 2008-06-12T19:38:50-07:00 Add more allowed file types and remove the "upload" tabs from image / link dialogs. Make some more config changes to ensure the editor and the upload system works more reliably. 3b4d2d0d81e7c4610dbf004bb9989b18d28a4edf Daniel Collis-Puro dan@collispuro.net