@@ -45,7 +45,7 @@ module Gluttonberg ensure_type('Unknown Binary', 'binary application', AssetCategory.binary_category) ensure_type('Unknown File', 'multi-part model message unknown', AssetCategory.uncategorised_category) - ensure_type('Jpeg Image', 'image/jpeg', AssetCategory.image_category) + ensure_type('Jpeg Image', 'image/jpeg image/pjpeg', AssetCategory.image_category) ensure_type('Gif Image', 'image/gif', AssetCategory.image_category) ensure_type('Png Image', 'image/png', AssetCategory.image_category) ensure_type('Tiff Image', 'image/tiff', AssetCategory.image_category) gluttonberg/lib/gluttonberg/library.rb @@ -64,8 +64,11 @@ module Gluttonberg module InstanceMethods def file=(new_file) unless new_file.blank? + Merb.logger.info("\nFILENAME: #{new_file[:filename]} \n\n") + # Forgive me this naive sanitisation, I'm still a regex n00b - clean_filename = new_file[:filename].gsub(" ", "_").gsub(/[^A-Za-z0-9\-_.]/, "").downcase + clean_filename = new_file[:filename].split(%r{[\\|/]}).last + clean_filename = clean_filename.gsub(" ", "_").gsub(/[^A-Za-z0-9\-_.]/, "").downcase # _thumb.jpg is a reserved name for the thumbnailing system, so if the user # has a file with that name rename it. gluttonberg/lib/gluttonberg/library/attachment_mixin.rb b2a1ebb1951dc5cd9cfaaf16d31c16ac349f9b8d Luke Sutton luke@freerangefuture.com http://github.com/lukesutton/gluttonberg/commit/d800645ddc898ab0d663b22d10576ebbdbc39e85 d800645ddc898ab0d663b22d10576ebbdbc39e85 2009-05-04T22:38:16-07:00 2009-05-04T22:38:16-07:00 Tweak the list of mime-types and sanatise names for files uploaded by IE. 0a23bfcb4788a44a10a02901b32eb839f2ed3b78 Luke Sutton luke@freerangefuture.com