From b0898fcab4b9a0de782e66ccad89ef15f3428aa9 Mon Sep 17 00:00:00 2001
From: HFO4 <912394456@qq.com>
Date: Fri, 16 Feb 2018 10:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87sendfile?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/controller/Admin.php        |  2 +-
 .../index/view/admin/mail_setting.html        |  4 +--
 .../index/view/admin/other_setting.html       | 31 +++++++++++++++++++
 mysql.sql                                     |  4 ++-
 static/js/admin/setting.js                    |  9 +++++-
 5 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/application/index/controller/Admin.php b/application/index/controller/Admin.php
index 15a13ea6..bebe45de 100644
--- a/application/index/controller/Admin.php
+++ b/application/index/controller/Admin.php
@@ -120,7 +120,7 @@ class Admin extends Controller{
 	public function SettingOther(){
 		return view('other_setting', [
 			'options'  => $this->siteOptions,
-			'optionsForSet'  =>  Option::getValues(["file_edit","share","avatar","admin","storage_policy"]),
+			'optionsForSet'  =>  Option::getValues(["file_edit","share","avatar","admin","storage_policy","download"]),
 		]);
 	}
 
diff --git a/application/index/view/admin/mail_setting.html b/application/index/view/admin/mail_setting.html
index 278d72ab..f98bb82f 100644
--- a/application/index/view/admin/mail_setting.html
+++ b/application/index/view/admin/mail_setting.html
@@ -103,7 +103,7 @@
               </div>
             </form>
           </div>
-
+        
           <div class="tab-pane fade" id="test" role="tabpanel" aria-labelledby="pills-profile-tab">
            <form id="testMail">
             <div class="row form-setting">
@@ -145,7 +145,7 @@
   <div class="tab-pane fade" id="template" role="tabpanel" aria-labelledby="pills-profile-tab">
            <form id="mailTemplate">
 
-              </div>
+             
 
               <div class="row form-setting">
                 <div class="col-md-1 form-label ">
diff --git a/application/index/view/admin/other_setting.html b/application/index/view/admin/other_setting.html
index db5bf6e5..33b6c62a 100644
--- a/application/index/view/admin/other_setting.html
+++ b/application/index/view/admin/other_setting.html
@@ -66,6 +66,37 @@
                 <div class="col-md-4 option-des"> 用于展示用户头像的Gravatar服务器地址</div>
               </div>
 
+               <div class="row form-setting">
+                <div class="col-md-1 form-label ">
+                  <label for="gravatar_server" class="col-form-label col-form-label-sm">文件数据发送模式</label>
+                </div>
+                <div class="col-md-4"> 
+                 <select class="form-control" name="sendfile">
+                <option value="0">传统</option>
+                <option value="1" {eq name="optionsForSet.sendfile" value="1"}selected{/eq}>X-Sendfile</option>
+                 
+                </select>
+
+                </div>
+                <div class="col-md-4 option-des"> 推荐使用X-Sendfile以获得高效的文件传输，启用前请确保服务器安装X-Sendfile模块并在站点配置文件中启用。</div>
+              </div>
+
+               <div class="row form-setting" style="{eq name="optionsForSet.sendfile" value="0"}display:none{/eq}" id="sendfile_header">
+                <div class="col-md-1 form-label ">
+                  <label for="gravatar_server" class="col-form-label col-form-label-sm">Sendfile Header</label>
+                </div>
+                <div class="col-md-4"> 
+                 <select class="form-control" name="header">
+                <option value="X-Sendfile" {eq name="optionsForSet.header" value="X-Sendfile"}selected{/eq}>X-Sendfile [Apache,Lighttpd v1.5,Cherokee]</option>
+                <option value="X-LIGHTTPD-send-file" {eq name="optionsForSet.header" value="X-LIGHTTPD-send-file"}selected{/eq}>X-LIGHTTPD-send-file [Lighttpd v1.4]</option>
+                <option value="X-Accel-Redirect" {eq name="optionsForSet.header" value="X-Accel-Redirect"}selected{/eq}>X-Accel-Redirect [Nginx,Cherokee]</option>
+                 
+                </select>
+
+                </div>
+                <div class="col-md-4 option-des"> 请根据你所使用的服务器软件选择合适的header</div>
+              </div>
+
   <div class="row form-setting">
  <div class="col-md-1 form-label ">
  </div>
diff --git a/mysql.sql b/mysql.sql
index 5ca2bb16..a9497d3c 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -192,7 +192,9 @@ INSERT INTO `sd_options` (`id`, `option_name`, `option_value`, `option_type`) VA
 (44, 'gravatar_server', 'https://v2ex.assets.uxengine.net/gravatar/', 'avatar'),
 (45, 'admin_color_body', 'fixed-nav sticky-footer bg-light', 'admin'),
 (46, 'admin_color_nav', 'navbar navbar-expand-lg fixed-top navbar-light bg-light', 'admin'),
-(47, 'js_code', '<script type=\"text/javascript\">\r\n\r\n</script>', 'basic');
+(47, 'js_code', '<script type=\"text/javascript\">\r\n\r\n</script>', 'basic'),
+(50, 'sendfile', '0', 'download'),
+(51, 'header', 'X-Sendfile', 'download');
 
 -- --------------------------------------------------------
 
diff --git a/static/js/admin/setting.js b/static/js/admin/setting.js
index 49ada9f4..58f219b0 100644
--- a/static/js/admin/setting.js
+++ b/static/js/admin/setting.js
@@ -127,4 +127,11 @@ $("#saveYz").click(function() {
 			$("#saveYz").removeAttr("disabled");
 		}
 	});
-})
\ No newline at end of file
+})
+$("[name='sendfile']").change(function(){
+  if($(this).val()=="1"){
+  	$("#sendfile_header").slideDown();
+  }else{
+  	$("#sendfile_header").slideUp();
+  }
+});
\ No newline at end of file