Patch #903 ยป attachment_model_cleanup.diff
| app/models/attachment.rb (working copy) | ||
|---|---|---|
|
errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
|
||
|
end
|
||
|
def file=(incomming_file)
|
||
|
unless incomming_file.nil?
|
||
|
@temp_file = incomming_file
|
||
|
def file=(incoming_file)
|
||
|
unless incoming_file.nil?
|
||
|
@temp_file = incoming_file
|
||
|
if @temp_file.size > 0
|
||
|
self.filename = sanitize_filename(@temp_file.original_filename)
|
||
|
self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
|
||
| ... | ... | |
|
end
|
||
|
|
||
|
def file
|
||
|
nil
|
||
|
nil
|
||
|
end
|
||
|
|
||
|
# Copy temp file to its final location
|
||
| ... | ... | |
|
end
|
||
|
|
||
|
def image?
|
||
|
self.filename =~ /\.(jpeg|jpg|gif|png)$/i
|
||
|
self.filename =~ /\.(jpe?g|gif|png)$/i
|
||
|
end
|
||
|
|
||
|
private
|
||
|
def sanitize_filename(value)
|
||
|
# get only the filename, not the whole path
|
||
|
just_filename = value.gsub(/^.*(\\|\/)/, '')
|
||
|
# NOTE: File.basename doesn't work right with Windows paths on Unix
|
||
|
# INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/'))
|
||
|
# get only the filename, not the whole path
|
||
|
just_filename = value.gsub(/^.*(\\|\/)/, '')
|
||
|
# NOTE: File.basename doesn't work right with Windows paths on Unix
|
||
|
# INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/'))
|
||
|
# Finally, replace all non alphanumeric, underscore or periods with underscore
|
||
|
@filename = just_filename.gsub(/[^\w\.\-]/,'_')
|
||
|
# Finally, replace all non alphanumeric, hyphens or periods with underscore
|
||
|
@filename = just_filename.gsub(/[^\w\.\-]/,'_')
|
||
|
end
|
||
|
|
||
|
end
|
||