From 86d82931bb85323412e2e8a174f3157e80438ce6 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Sun, 16 Oct 2016 20:18:40 +0800
Subject: [PATCH] add option of max size of uploaded file

---
 app/Http/Controllers/SkinlibController.php |  2 +-
 config/options.php                         |  5 +++--
 resources/assets/src/js/skinlib.js         |  6 +++---
 resources/lang/en/validation.yml           |  3 +++
 resources/lang/zh-CN/validation.yml        |  1 +
 resources/views/admin/options.tpl          | 12 ++++++++++++
 6 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php
index 161d8a0f..b4c152b8 100644
--- a/app/Http/Controllers/SkinlibController.php
+++ b/app/Http/Controllers/SkinlibController.php
@@ -242,7 +242,7 @@ class SkinlibController extends Controller
     {
         $this->validate($request, [
             'name'   => 'required|no_special_chars',
-            'file'   => 'required|max:10240',
+            'file'   => 'required|max:'.option('max_upload_file_size'),
             'public' => 'required'
         ]);
 
diff --git a/config/options.php b/config/options.php
index 3c7c800f..dcd200c5 100644
--- a/config/options.php
+++ b/config/options.php
@@ -3,7 +3,7 @@
  * @Author: printempw
  * @Date:   2016-07-29 11:53:11
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-09-25 13:31:41
+ * @Last Modified time: 2016-10-16 20:09:27
  */
 
 return [
@@ -35,5 +35,6 @@ return [
     'copyright_text'            => '<strong>Copyright &copy; 2016 <a href="{site_url}">{site_name}</a>.</strong> All rights reserved.',
     'auto_del_invalid_texture'  => '0',
     'return_200_when_notfound'  => '0',
-    'cache_expire_time'         => '31536000'
+    'cache_expire_time'         => '31536000',
+    'max_upload_file_size'      => '1024'
 ];
diff --git a/resources/assets/src/js/skinlib.js b/resources/assets/src/js/skinlib.js
index a50db1e9..e3c49fd7 100644
--- a/resources/assets/src/js/skinlib.js
+++ b/resources/assets/src/js/skinlib.js
@@ -2,7 +2,7 @@
  * @Author: printempw
  * @Date:   2016-07-19 10:46:38
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-10-04 13:40:10
+ * @Last Modified time: 2016-10-16 20:16:45
  */
 
 'use strict';
@@ -236,12 +236,12 @@ function upload() {
                         type: 'warning',
                         html: json.msg
                     }).then(function() {
-                        $('#upload-button').html(trans('skinlib.confirmUpload')).prop('disabled', '');
+                        $('#upload-button').html(trans('skinlib.upload')).prop('disabled', '');
                     });
                 }
             },
             error: function(json) {
-                $('#upload-button').html(trans('skinlib.confirmUpload')).prop('disabled', '');
+                $('#upload-button').html(trans('skinlib.upload')).prop('disabled', '');
                 showAjaxError(json);
             }
         });
diff --git a/resources/lang/en/validation.yml b/resources/lang/en/validation.yml
index 63a99aa8..09a1d391 100644
--- a/resources/lang/en/validation.yml
+++ b/resources/lang/en/validation.yml
@@ -89,4 +89,7 @@ custom:
 #  of "email". This simply helps us make messages a little cleaner.
 #
 attributes:
+    file: File
+    name: Name
     player_name: 'Player Name'
+    identification: Email or player name
diff --git a/resources/lang/zh-CN/validation.yml b/resources/lang/zh-CN/validation.yml
index e59ab0ba..cf207a51 100644
--- a/resources/lang/zh-CN/validation.yml
+++ b/resources/lang/zh-CN/validation.yml
@@ -80,6 +80,7 @@ custom:
 
 attributes:
     name: 名称
+    file: 文件
     username: 用户名
     identification: 邮箱或角色名
     nickname: 昵称
diff --git a/resources/views/admin/options.tpl b/resources/views/admin/options.tpl
index bb466b9d..74752b8f 100644
--- a/resources/views/admin/options.tpl
+++ b/resources/views/admin/options.tpl
@@ -95,6 +95,18 @@
                                         </td>
                                     </tr>
 
+                                    <tr>
+                                        <td class="key">最大允许上传大小
+                                            <i class="fa fa-question-circle" title="PHP 限制：<?php echo ini_get('post_max_size'); ?>，定义在 php.ini 中。" data-toggle="tooltip" data-placement="top"></i>
+                                        </td>
+                                        <td class="value">
+                                            <div class="input-group">
+                                               <input type="text" class="form-control" name="max_upload_file_size" value="{{ option('max_upload_file_size') }}">
+                                               <span class="input-group-addon">KB</span>
+                                           </div>
+                                        </td>
+                                    </tr>
+
                                     <tr>
                                         <td class="key">角色名</td>
                                         <td class="value">