Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add option of max size of uploaded file

Browse Source
This commit is contained in:
printempw 2016-10-16 20:18:40 +08:00
parent 7f0e9a4178
commit 86d82931bb
6 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/SkinlibController.php
View File

@ -242,7 +242,7 @@ class SkinlibController extends Controller
{ {
$this->validate($request, [ $this->validate($request, [
'name' => 'required|no_special_chars', 'name' => 'required|no_special_chars',
'file' => 'required|max:10240', 'file' => 'required|max:'.option('max_upload_file_size'),
'public' => 'required' 'public' => 'required'
]); ]);

5
config/options.php
View File

@ -3,7 +3,7 @@
* @Author: printempw * @Author: printempw
* @Date: 2016-07-29 11:53:11 * @Date: 2016-07-29 11:53:11
* @Last Modified by: printempw * @Last Modified by: printempw
* @Last Modified time: 2016-09-25 13:31:41 * @Last Modified time: 2016-10-16 20:09:27
*/ */
return [ return [
@ -35,5 +35,6 @@ return [
'copyright_text' => '<strong>Copyright &copy; 2016 <a href="{site_url}">{site_name}</a>.</strong> All rights reserved.', 'copyright_text' => '<strong>Copyright &copy; 2016 <a href="{site_url}">{site_name}</a>.</strong> All rights reserved.',
'auto_del_invalid_texture' => '0', 'auto_del_invalid_texture' => '0',
'return_200_when_notfound' => '0', 'return_200_when_notfound' => '0',
'cache_expire_time' => '31536000' 'cache_expire_time' => '31536000',
'max_upload_file_size' => '1024'
]; ];

6
resources/assets/src/js/skinlib.js
View File

@ -2,7 +2,7 @@
* @Author: printempw * @Author: printempw
* @Date: 2016-07-19 10:46:38 * @Date: 2016-07-19 10:46:38
* @Last Modified by: printempw * @Last Modified by: printempw
* @Last Modified time: 2016-10-04 13:40:10 * @Last Modified time: 2016-10-16 20:16:45
*/ */
'use strict'; 'use strict';
@ -236,12 +236,12 @@ function upload() {
type: 'warning', type: 'warning',
html: json.msg html: json.msg
}).then(function() { }).then(function() {
$('#upload-button').html(trans('skinlib.confirmUpload')).prop('disabled', ''); $('#upload-button').html(trans('skinlib.upload')).prop('disabled', '');
}); });
} }
}, },
error: function(json) { error: function(json) {
$('#upload-button').html(trans('skinlib.confirmUpload')).prop('disabled', ''); $('#upload-button').html(trans('skinlib.upload')).prop('disabled', '');
showAjaxError(json); showAjaxError(json);
} }
}); });

3
resources/lang/en/validation.yml
View File

@ -89,4 +89,7 @@ custom:
# of "email". This simply helps us make messages a little cleaner. # of "email". This simply helps us make messages a little cleaner.
# #
attributes: attributes:
file: File
name: Name
player_name: 'Player Name' player_name: 'Player Name'
identification: Email or player name

1
resources/lang/zh-CN/validation.yml
View File

@ -80,6 +80,7 @@ custom:
attributes: attributes:
name: 名称 name: 名称
file: 文件
username: 用户名 username: 用户名
identification: 邮箱或角色名 identification: 邮箱或角色名
nickname: 昵称 nickname: 昵称

12
resources/views/admin/options.tpl
View File

@ -95,6 +95,18 @@
</td> </td>
</tr> </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> <tr>
<td class="key">角色名</td> <td class="key">角色名</td>
<td class="value"> <td class="value">