diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 68d83f974..f7adf802b 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -69,9 +69,9 @@ class AttachmentsController < ApplicationController if candown || User.current.admin? || User.current.id == @attachment.author_id @attachment.increment_download if stale?(:etag => @attachment.digest) - if %w[doc docx pdf].any?{|word| @attachment.diskfile.downcase.end_with? word} - req = RestClient.post 'http://192.168.80.107/Any2HtmlHandler.ashx', :txtDes => File.new(@attachment.diskfile, 'rb') - render :text => req.body + convered_file = File.join(Rails.root, "files", "convered_office", a.disk_filename + ".html") + if File.exist?(convered_file) + render :text => File.open(convered_file).read else send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename), :type => detect_content_type(@attachment),