From 56f522f56361b664f5460f1d8cee5937fb5c1c06 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 10 Jun 2015 15:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3IE=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=E4=B8=AD--=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E4=B8=8B=E8=BD=BD=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/test_controller.rb    | 2 +-
 app/controllers/zipdown_controller.rb | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/test_controller.rb b/app/controllers/test_controller.rb
index 12fead4f2..71c445dc4 100644
--- a/app/controllers/test_controller.rb
+++ b/app/controllers/test_controller.rb
@@ -24,7 +24,7 @@ class TestController < ApplicationController
     end
     @paths = homeworks_attach_path
     zipfile = ziping homeworks_attach_path
-    send_file zipfile, :filename => bid.name,
+    send_file zipfile, :filename => filename_for_content_disposition(bid.name),
                         :type => detect_content_type(zipfile)
     rescue Errno::ENOENT => e
       logger.error "[Errno::ENOENT] ===> #{e}"
diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index 7eb06d270..53b40942a 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -11,7 +11,7 @@ class ZipdownController < ApplicationController
   def download
     if User.current.logged?
       begin
-        send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => params[:filename], :type => detect_content_type(params[:file])
+        send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file])
       rescue => e
         render file: 'public/no_file_found.html'
       end
@@ -59,9 +59,10 @@ class ZipdownController < ApplicationController
       if homework != nil
         unless homework.attachments.empty?
           zipfile = zip_homework_by_user homework
-          send_file zipfile.file_path, :filename =>  ((homework.user.user_extensions.nil? || homework.user.user_extensions.student_id.nil?) ? "" : homework.user.user_extensions.student_id) +
-              "_" + homework.user.show_name +
-              "_" + homework.name + ".zip", :type => detect_content_type(zipfile.file_path) if(zipfile)
+          filename = ((homework.user.user_extensions.nil? || homework.user.user_extensions.student_id.nil?) ? "" : homework.user.user_extensions.student_id) +
+            "_" + homework.user.show_name +
+            "_" + homework.name + ".zip"
+          send_file zipfile.file_path, :filename => filename_for_content_disposition(filename), :type => detect_content_type(zipfile.file_path) if(zipfile)
         else
           render file: 'public/no_file_found.html'
         end