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

use true/false instead of 1/0 in options

Browse Source
This commit is contained in:
printempw 2016-12-31 23:36:44 +08:00
parent 91d528d311
commit 4ae6d868bb
5 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ class ClosetController extends Controller
'name' => 'required|no_special_chars' 'name' => 'required|no_special_chars'
]); ]);
if (app('user.current')->getScore() < option('score_per_closet_item', null, false)) { if (app('user.current')->getScore() < option('score_per_closet_item')) {
return json(trans('user.closet.add.lack-score'), 7); return json(trans('user.closet.add.lack-score'), 7);
} }

4
app/Services/OptionForm.php
View File

@ -250,7 +250,7 @@ class OptionForm
continue; continue;
} }
if (($data = Arr::get($_POST, $item->id)) != option($item->id, null, false)) { if (($data = Arr::get($_POST, $item->id)) != option($item->id)) {
Option::set($item->id, $data); Option::set($item->id, $data);
} }
} }
@ -547,7 +547,7 @@ class OptionFormGroup extends OptionFormItem
foreach ($this->items as $item) { foreach ($this->items as $item) {
if ($item['id'] && is_null($item['value'])) { if ($item['id'] && is_null($item['value'])) {
$item['value'] = option($item['id'], null, false); $item['value'] = option($item['id']);
} }
$rendered[] = view('vendor.option-form.'.$item['type'])->with([ $rendered[] = view('vendor.option-form.'.$item['type'])->with([

8
app/Services/Repositories/OptionRepository.php
View File

@ -35,7 +35,7 @@ class OptionRepository extends Repository
* @param bool $bool convert '0', '1' to bool value * @param bool $bool convert '0', '1' to bool value
* @return mixed * @return mixed
*/ */
public function get($key, $default = null, $bool = true) public function get($key, $default = null)
{ {
if (!$this->has($key) && Arr::has(config('options'), $key)) { if (!$this->has($key) && Arr::has(config('options'), $key)) {
$this->set($key, config("options.$key")); $this->set($key, config("options.$key"));
@ -43,15 +43,13 @@ class OptionRepository extends Repository
$value = Arr::get($this->items, $key, $default); $value = Arr::get($this->items, $key, $default);
if (!$bool) return $value;
switch (strtolower($value)) { switch (strtolower($value)) {
case 'true': case 'true':
case '1': case '(true)':
return true; return true;
case 'false': case 'false':
case '0': case '(false)':
return false; return false;
case 'null': case 'null':

6
app/helpers.php
View File

@ -252,7 +252,7 @@ if (! function_exists('option')) {
* @param mixed $default * @param mixed $default
* @return mixed * @return mixed
*/ */
function option($key = null, $default = null, $bool = true) function option($key = null, $default = null)
{ {
$options = app('options'); $options = app('options');
@ -264,10 +264,10 @@ if (! function_exists('option')) {
foreach ($key as $innerKey => $innerValue) { foreach ($key as $innerKey => $innerValue) {
$options->set($innerKey, $innerValue); $options->set($innerKey, $innerValue);
} }
return $options->save(); return;
} }
return $options->get($key, $default, $bool); return $options->get($key, $default);
} }
} }

24
config/options.php
View File

@ -3,41 +3,41 @@
* @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-12-31 23:14:51 * @Last Modified time: 2016-12-31 23:34:17
*/ */
return [ return [
'site_url' => '', 'site_url' => '',
'site_name' => 'Blessing Skin Server', 'site_name' => 'Blessing Skin Server',
'site_description' => 'Open-source PHP Minecraft Skin Hosting Service', 'site_description' => 'Open-source PHP Minecraft Skin Hosting Service',
'user_can_register' => '1', 'user_can_register' => 'true',
'regs_per_ip' => '3', 'regs_per_ip' => '3',
'api_type' => '0', 'api_type' => 'false',
'announcement' => 'Welcome to Blessing Skin Server {version}!', 'announcement' => 'Welcome to Blessing Skin Server {version}!',
'color_scheme' => 'skin-blue', 'color_scheme' => 'skin-blue',
'home_pic_url' => './resources/assets/images/bg.jpg', 'home_pic_url' => './resources/assets/images/bg.jpg',
'custom_css' => '', 'custom_css' => '',
'custom_js' => '', 'custom_js' => '',
'allow_chinese_playername' => '1', 'allow_chinese_playername' => 'true',
'comment_script' => '', 'comment_script' => '',
'user_initial_score' => '1000', 'user_initial_score' => '1000',
'sign_gap_time' => '24', 'sign_gap_time' => '24',
'sign_score' => '10,100', 'sign_score' => '10,100',
'score_per_storage' => '1', 'score_per_storage' => 'true',
'private_score_per_storage' => '10', 'private_score_per_storage' => '10',
'return_score' => '1', 'return_score' => 'true',
'score_per_player' => '100', 'score_per_player' => '100',
'sign_after_zero' => '0', 'sign_after_zero' => 'false',
'version' => '', 'version' => '',
'check_update' => '1', 'check_update' => 'true',
'update_source' => 'https://work.prinzeugen.net/update.json', 'update_source' => 'https://work.prinzeugen.net/update.json',
'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' => 'false',
'return_200_when_notfound' => '0', 'return_200_when_notfound' => 'false',
'cache_expire_time' => '31536000', 'cache_expire_time' => '31536000',
'max_upload_file_size' => '1024', 'max_upload_file_size' => '1024',
'force_ssl' => '0', 'force_ssl' => 'false',
'auto_detect_asset_url' => '1', 'auto_detect_asset_url' => 'true',
'plugins_enabled' => '', 'plugins_enabled' => '',
'copyright_prefer' => '0', 'copyright_prefer' => '0',
'score_per_closet_item' => '0', 'score_per_closet_item' => '0',