From b57e618ee3a8e8a822cb5ffee1e3c95c7955204f Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 1 Jan 2020 23:50:23 +0800 Subject: [PATCH] 2019 to 2020 --- config/.config.example.php | 16 ++++++++-------- config/.i18n.example.php | 6 +++--- config/.malio_config.example.php | 4 ++-- resources/email/auth/verify.tpl | 2 +- resources/email/news/warn.tpl | 2 +- resources/email/ticket/new_ticket.tpl | 2 +- resources/email/ticket/ticket_replay_admin.tpl | 2 +- resources/email/ticket/ticket_reply.tpl | 2 +- resources/views/malio/403.tpl | 2 +- resources/views/malio/404.tpl | 2 +- resources/views/malio/500.tpl | 2 +- resources/views/malio/auth/login.tpl | 4 ++-- resources/views/malio/auth/register.tpl | 2 +- resources/views/malio/password/reset.tpl | 2 +- resources/views/malio/password/token.tpl | 2 +- resources/views/malio/tos.tpl | 2 +- resources/views/malio/user/footer.tpl | 2 +- resources/views/material/staff.tpl | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/config/.config.example.php b/config/.config.example.php index 9778de3d..1ed1b806 100644 --- a/config/.config.example.php +++ b/config/.config.example.php @@ -17,7 +17,7 @@ $_ENV['version']='1'; //仅当涉及【需要修改config以外的文件】时 //基本设置-------------------------------------------------------------------------------------------- $_ENV['key'] = '1145141919810'; //!!! 瞎 jb 修改此key为随机字符串确保网站安全 !!! $_ENV['debug'] = false; //正式环境请确保为 false -$_ENV['appName'] = 'sspanel'; //站点名称 +$_ENV['appName'] = 'Malio'; //站点名称 $_ENV['baseUrl'] = 'http://url.com'; //站点地址 $_ENV['subUrl'] = $_ENV['baseUrl'].'/link/'; //订阅地址,如需和站点名称相同,请不要修改 $_ENV['muKey'] = 'NimaQu'; //用于校验魔改后端请求,可以随意修改,但请保持前后端一致,否则节点不能工作! @@ -69,8 +69,8 @@ $_ENV['backup_notify']='true'; //备份通知到TG群中 $_ENV['register_mode'] = 'open'; //注册模式。close:关闭,open:开放,invite:仅限邀请码 $_ENV['defaultTraffic'] = '1'; //用户初始流量 单位GB $_ENV['user_expire_in_default']='3650'; //用户账户过期时间,在注册时设置。(天) -$_ENV['user_class_default']='0'; //用户注册等级,在注册时设置。 -$_ENV['user_class_expire_default']='24'; //用户等级过期时间,在注册时设置。(小时) +$_ENV['user_class_default']='-1'; //用户注册等级,在注册时设置。 +$_ENV['user_class_expire_default']='720'; //用户等级过期时间,在注册时设置。(小时) $_ENV['user_conn']='0'; //用户注册客户端数量限制,0为不限制 $_ENV['user_speedlimit']='0'; //用户注册速度默认限制,0为不限制 $_ENV['reg_auto_reset_day']='0'; //注册时的流量重置日,0为不重置 @@ -91,8 +91,8 @@ $_ENV['mu_regex']='%5m%id.%suffix'; //单端口多用户混淆参数表达式 #邀请链接 $_ENV['inviteNum'] = '10'; //注册后的邀请链接可用次数 $_ENV['invite_get_money']='1'; //新用户通过私人邀请链接注册时,获得奖励金额(作为初始资金) -$_ENV['invite_price']='-1'; //用户购买邀请码所需要的价格,价格小于0时视为不开放购买 -$_ENV['custom_invite_price']='-1'; //用户定制邀请码所需要的价格,价格小于0时视为不开放购买 +$_ENV['invite_price']='1'; //用户购买邀请码所需要的价格,价格小于0时视为不开放购买 +$_ENV['custom_invite_price']='1'; //用户定制邀请码所需要的价格,价格小于0时视为不开放购买 #邮箱验证 $_ENV['enable_email_verify']='false'; //是否启用注册邮箱验证码 @@ -111,8 +111,8 @@ $_ENV['code_payback']='20'; //充值返利百分比 $_ENV['invite_gift']='2'; //邀请新用户获得流量奖励,单位G $_ENV['enable_bought_reset']='true'; //购买时是否重置流量 $_ENV['enable_bought_extend']='true'; //购买时是否延长等级期限(同等级配套) -$_ENV['port_price']='-1'; //用户随机重置端口所需要的价格,价格小于0时视为不开放购买 -$_ENV['port_price_specify']='-1'; //用户指明钦定端口所需要的价格,价格小于0时视为不开放购买 +$_ENV['port_price']='1'; //用户随机重置端口所需要的价格,价格小于0时视为不开放购买 +$_ENV['port_price_specify']='1'; //用户指明钦定端口所需要的价格,价格小于0时视为不开放购买 #高级 $_ENV['class_expire_reset_traffic']='0'; //等级到期时重置为的流量值,单位GB,小于0时不重置 @@ -131,7 +131,7 @@ $_ENV['user_agreement_scheme'] = [ ['id'=>3,'name'=>'SS/SSR 兼容配置','method'=>'chacha20-ietf','protocol'=>'auth_aes128_sha1_compatible','obfs'=>'plain'] ]; -$_ENV['subscribeLog'] = 'false'; //是否记录用户订阅日志 +$_ENV['subscribeLog'] = 'true'; //是否记录用户订阅日志 $_ENV['subscribeLog_keep_days'] = '7'; //订阅记录保留天数 //Bot 设置-------------------------------------------------------------------------------------------- diff --git a/config/.i18n.example.php b/config/.i18n.example.php index 8ee7a963..ee8977ef 100644 --- a/config/.i18n.example.php +++ b/config/.i18n.example.php @@ -5,7 +5,7 @@ $I18N['appName'] = array( 'en' => 'Malio', 'zh-cn' => 'Malio' ); -$I18N['class-plan-name-map'] = array( +$I18N['class-plan-name-map'] = array( // 用户等级 => 等级名字 'en' => array( 1 => 'Basic', 2 => 'Plus', @@ -17,7 +17,7 @@ $I18N['class-plan-name-map'] = array( 3 => '专业版' ), ); -$I18N['node-class-name-map'] = array( +$I18N['node-class-name-map'] = array( // 节点等级 => 节点列表等级标题 'en' => array( 1 => 'Basic Servers', 2 => 'Plus Servers', @@ -96,7 +96,7 @@ $I18N['trial_plan'] = array( ] ), ); -$I18N['plans-info'] = array( +$I18N['plans-info'] = array( // 会员计划的信息, 可以复制array增加会员计划,比如增加第四个会员计划,使用 'plan_4' => array(...) 这样的格式 'en' => [ 'plan_1' => array( 'name' => 'Basic', diff --git a/config/.malio_config.example.php b/config/.malio_config.example.php index 4129ffd6..e99e920a 100644 --- a/config/.malio_config.example.php +++ b/config/.malio_config.example.php @@ -19,7 +19,7 @@ $Malio_Config['version'] = '1'; ####### 通用设置 ####### -$Malio_Config['theme_color'] = 'purple'; // 主题颜色,可选值为 purple, blue, darkblue, orange, pink TODO: +$Malio_Config['theme_color'] = 'purple'; // 主题颜色,可选值为 purple, blue, darkblue, orange, pink TODO:(此功能尚在开发中) $Malio_Config['google_analytics_code'] = 'UA-123456789-1'; // Google 统计代码,留空为不开启,code格式为 'UA-123456789-1' $Malio_Config['login_style'] = 'wallpaper'; // 登录页面的样式,可选 simple 和 wallpaper $Malio_Config['enable_landing_page'] = true; // 是否启用着陆页用于介绍本站 @@ -159,7 +159,7 @@ $Malio_Config['index_one_row_plans'] = '3'; // 首页里每行显示多少个 $Malio_Config['shop_one_row_plans'] = '3'; // 商店里每行显示多少个会员计划,可以写 3 或 4 // 每个会员计划不同时长所对应的商品ID(商品ID可以在管理面板的商品列表里找到),此项必须设置,不然商店购买功能无法正常工作 -// 可以复制 array 增加会员计划 +// 可以复制 array 增加会员计划,比如增加第四个会员计划,使用 'plan_4' => array(...) 这样的格式 $Malio_Config['plan_shop_id'] = array( 'plan_1' => array( '1month' => 1, diff --git a/resources/email/auth/verify.tpl b/resources/email/auth/verify.tpl index 9530c9db..4fbd8264 100644 --- a/resources/email/auth/verify.tpl +++ b/resources/email/auth/verify.tpl @@ -159,7 +159,7 @@
 
- 2019 © {$config['appName']}. All Rights Reserved. + 2020 © {$config['appName']}. All Rights Reserved.
 
diff --git a/resources/email/news/warn.tpl b/resources/email/news/warn.tpl index 12241737..bd457ef0 100644 --- a/resources/email/news/warn.tpl +++ b/resources/email/news/warn.tpl @@ -143,7 +143,7 @@
 
- 2019 © {$config['appName']}. All Rights Reserved. + 2020 © {$config['appName']}. All Rights Reserved.
 
diff --git a/resources/email/ticket/new_ticket.tpl b/resources/email/ticket/new_ticket.tpl index 0365f332..40a5dca6 100644 --- a/resources/email/ticket/new_ticket.tpl +++ b/resources/email/ticket/new_ticket.tpl @@ -195,7 +195,7 @@
 
- 2019 © {$config['appName']}. All Rights Reserved. + 2020 © {$config['appName']}. All Rights Reserved.
 
diff --git a/resources/email/ticket/ticket_replay_admin.tpl b/resources/email/ticket/ticket_replay_admin.tpl index 9df02a40..60766e72 100644 --- a/resources/email/ticket/ticket_replay_admin.tpl +++ b/resources/email/ticket/ticket_replay_admin.tpl @@ -195,7 +195,7 @@
 
- 2019 © {$config['appName']}. All Rights Reserved. + 2020 © {$config['appName']}. All Rights Reserved.
 
diff --git a/resources/email/ticket/ticket_reply.tpl b/resources/email/ticket/ticket_reply.tpl index 6ced9a53..eb2fe953 100644 --- a/resources/email/ticket/ticket_reply.tpl +++ b/resources/email/ticket/ticket_reply.tpl @@ -158,7 +158,7 @@
 
- 2019 © {$config['appName']}. All Rights Reserved. + 2020 © {$config['appName']}. All Rights Reserved.
 
diff --git a/resources/views/malio/403.tpl b/resources/views/malio/403.tpl index e61b87fc..1e6eb22d 100644 --- a/resources/views/malio/403.tpl +++ b/resources/views/malio/403.tpl @@ -35,7 +35,7 @@ diff --git a/resources/views/malio/404.tpl b/resources/views/malio/404.tpl index 3d57df08..87b4e331 100644 --- a/resources/views/malio/404.tpl +++ b/resources/views/malio/404.tpl @@ -35,7 +35,7 @@ diff --git a/resources/views/malio/500.tpl b/resources/views/malio/500.tpl index 82a35463..0d97d388 100644 --- a/resources/views/malio/500.tpl +++ b/resources/views/malio/500.tpl @@ -35,7 +35,7 @@ diff --git a/resources/views/malio/auth/login.tpl b/resources/views/malio/auth/login.tpl index fbbbf667..a2340aea 100644 --- a/resources/views/malio/auth/login.tpl +++ b/resources/views/malio/auth/login.tpl @@ -113,7 +113,7 @@ {$i18n->get('dont-have-an-account-question-mark')} @@ -210,7 +210,7 @@
- Copyright © 2019 {$config["appName"]} + Copyright © 2020 {$config["appName"]}
diff --git a/resources/views/malio/auth/register.tpl b/resources/views/malio/auth/register.tpl index 9fd9bf4d..00b385d0 100644 --- a/resources/views/malio/auth/register.tpl +++ b/resources/views/malio/auth/register.tpl @@ -257,7 +257,7 @@ {$i18n->get('already-got-an-account-question-mark')} diff --git a/resources/views/malio/password/reset.tpl b/resources/views/malio/password/reset.tpl index 4393295a..ff15645e 100644 --- a/resources/views/malio/password/reset.tpl +++ b/resources/views/malio/password/reset.tpl @@ -57,7 +57,7 @@ 返回登录 diff --git a/resources/views/malio/password/token.tpl b/resources/views/malio/password/token.tpl index 6911991c..7cdf768d 100644 --- a/resources/views/malio/password/token.tpl +++ b/resources/views/malio/password/token.tpl @@ -66,7 +66,7 @@ 返回登录 diff --git a/resources/views/malio/tos.tpl b/resources/views/malio/tos.tpl index 012641a4..8ab2b6b9 100644 --- a/resources/views/malio/tos.tpl +++ b/resources/views/malio/tos.tpl @@ -287,7 +287,7 @@ diff --git a/resources/views/malio/user/footer.tpl b/resources/views/malio/user/footer.tpl index 8ac11c7f..37576135 100644 --- a/resources/views/malio/user/footer.tpl +++ b/resources/views/malio/user/footer.tpl @@ -1,5 +1,5 @@
\ No newline at end of file diff --git a/resources/views/material/staff.tpl b/resources/views/material/staff.tpl index 161c5a41..86adbb86 100644 --- a/resources/views/material/staff.tpl +++ b/resources/views/material/staff.tpl @@ -32,7 +32,7 @@

MIT许可证(MIT)

- +

特此免费授予任何获得副本的人这个软件和相关的文档文件(“软件”)来处理在软件中没有限制, 包括但不限于权利使用,复制,修改,合并,发布,分发,再许可和/或销售该软件的副本,