feat: redir user to the new shop

config/settings.json

@@ -772,11 +772,11 @@
     {
         "id": null,
         "item": "enable_reg_new_shop",
-        "value": "0",
+        "value": "1",
         "class": "register",
         "is_public": 0,
         "type": "bool",
-        "default": "0",
+        "default": "1",
         "mark": "新用户默认使用新商店系统"
     },
     {

resources/views/tabler/admin/product/edit.tpl

@@ -85,49 +85,49 @@
                                 <label class="form-label col-3 col-form-label">商品时长 (天)</label>
                                 <div class="col">
                                     <input id="time" type="text" class="form-control" 
-                                        value="{$content['time']}">
+                                        value="{$content->time}">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
                                 <label class="form-label col-3 col-form-label">等级</label>
                                 <div class="col">
                                     <input id="class" type="text" class="form-control" 
-                                        value="{$content['class']}">
+                                        value="{$content->class}">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
                                 <label class="form-label col-3 col-form-label">等级时长 (天)</label>
                                 <div class="col">
                                     <input id="class_time" type="text" class="form-control" 
-                                        value="{$content['class_time']}">
+                                        value="{$content->class_time}">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
                                 <label class="form-label col-3 col-form-label">可用流量 (GB)</label>
                                 <div class="col">
                                     <input id="bandwidth" type="text" class="form-control" 
-                                        value="{$content['bandwidth']}">
+                                        value="{$content->bandwidth}">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
                                 <label class="form-label col-3 col-form-label">用户分组</label>
                                 <div class="col">
                                     <input id="node_group" type="text" class="form-control" 
-                                        value="{$content['node_group']}">
+                                        value="{$content->node_group}">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
                                 <label class="form-label col-3 col-form-label">速率限制 (Mbps)</label>
                                 <div class="col">
                                     <input id="speed_limit" type="text" class="form-control"
-                                        value="{$content['speed_limit']}">
+                                        value="{$content->speed_limit}">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
                                 <label class="form-label col-3 col-form-label">同时连接IP限制</label>
                                 <div class="col">
                                     <input id="ip_limit" type="text" class="form-control"
-                                        value="{$content['ip_limit']}">
+                                        value="{$content->ip_limit}">
                                 </div>
                             </div>
                             <div class="hr-text">
@@ -136,15 +136,15 @@
                             <div class="form-group mb-3 row">
                                 <label class="form-label col-3 col-form-label">用户等级要求</label>
                                 <div class="col">
-                                    <input id="class_requried" type="text" class="form-control"
-                                        value="{$limit['class_required']}">
+                                    <input id="class_required" type="text" class="form-control"
+                                        value="{$limit->class_required}">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
                                 <label class="form-label col-3 col-form-label">用户所在的节点组</label>
                                 <div class="col">
-                                    <input id="node_group_requried" type="text" class="form-control"
-                                        value="{$limit['node_group_required']}">
+                                    <input id="node_group_required" type="text" class="form-control"
+                                        value="{$limit->node_group_required}">
                                 </div>
                             </div>
                             <div class="mb-3">
@@ -153,7 +153,7 @@
                                     <span class="col-auto">
                                         <label class="form-check form-check-single form-switch">
                                             <input id="new_user_requried" class="form-check-input" type="checkbox" 
-                                                {if $limit['new_user_required'] === 1}checked="" {/if}>
+                                                {if $limit->new_user_required === 1}checked="" {/if}>
                                         </label>
                                     </span>
                                 </label>

resources/views/tabler/user/edit.tpl

@@ -63,7 +63,7 @@
                                                         <input id="new-email" type="email" class="form-control"
                                                             placeholder="新邮箱" {if $config['enable_change_email'] == false}disabled=""{/if}>
                                                     </div>
-                                                    {if $config['enable_email_verify'] == true && $config['enable_change_email'] == true}
+                                                    {if $public_setting['reg_email_verify'] == true && $config['enable_change_email'] == true}
                                                     <div class="mb-3">
                                                         <input id="email-code" type="text" class="form-control"
                                                             placeholder="验证码">
@@ -72,7 +72,7 @@
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
-                                                        {if $config['enable_email_verify'] == true && $config['enable_change_email'] == true}
+                                                        {if $public_setting['reg_email_verify'] == true && $config['enable_change_email'] == true}
                                                         <a id="email-verify" class="btn btn-link">获取验证码</a>
                                                         <button id="modify-email"
                                                             class="btn btn-primary ms-auto">修改</button>
@@ -542,7 +542,7 @@
                 url: "/user/email",
                 dataType: "json",
                 data: {
-                    {if $config['enable_email_verify'] == true}
+                    {if $public_setting['reg_email_verify'] == true}
                         emailcode: $('#email-code').val(),
                     {/if}
                     newemail: $('#new-email').val()

resources/views/tabler/user/server.tpl

@@ -107,9 +107,15 @@
                                             <div class="card bg-primary-lt">
                                                 <div class="card-body">
                                                     <p class="text-muted">
+                                                        {if $user->use_new_shop}
+                                                        <i class="ti ti-info-circle icon text-blue"></i>
+                                                        你当前的账户等级小于节点等级，因此无法使用。可前往 <a
+                                                            href="/user/product">商品页面</a> 订购时间流量包
+                                                        {else}
                                                         <i class="ti ti-info-circle icon text-blue"></i>
                                                         你当前的账户等级小于节点等级，因此无法使用。可前往 <a
                                                             href="/user/shop">商店</a> 订购相应等级套餐
+                                                        {/if}
                                                     </p>
                                                 </div>
                                             </div>

src/Controllers/Admin/ProductController.php

@@ -80,8 +80,8 @@ final class ProductController extends BaseController
         $speed_limit = $request->getParam('speed_limit');
         $ip_limit = $request->getParam('ip_limit');
         // limit
-        $class_required = $request->getParam('class_required');
-        $node_group_required = $request->getParam('node_group_required');
+        $class_required = $request->getParam('class_required') ?? '';
+        $node_group_required = $request->getParam('node_group_required') ?? '';
         $new_user_required = $request->getParam('new_user_required') === 'true' ? 1 : 0;
 
         try {
@@ -203,8 +203,8 @@ final class ProductController extends BaseController
         $speed_limit = $request->getParam('speed_limit');
         $ip_limit = $request->getParam('ip_limit');
         // limit
-        $class_required = $request->getParam('class_required');
-        $node_group_required = $request->getParam('node_group_required');
+        $class_required = $request->getParam('class_required') ?? '';
+        $node_group_required = $request->getParam('node_group_required') ?? '';
         $new_user_required = $request->getParam('new_user_required') === 'true' ? 1 : 0;
 
         try {

src/Controllers/AuthController.php

@@ -127,7 +127,6 @@ final class AuthController extends BaseController
         return $response->write($this->view()
             ->assign('code', $code)
             ->assign('base_url', $_ENV['baseUrl'])
-            ->assign('enable_email_verify', Setting::obtain('reg_email_verify'))
             ->assign('captcha', $captcha)
             ->fetch('auth/register.tpl'));
     }
@@ -292,11 +291,11 @@ final class AuthController extends BaseController
         $user->ga_token = $secret;
         $user->ga_enable = 0;
 
-        $user->class_expire = date('Y-m-d H:i:s', time() + $configs['sign_up_for_class_time'] * 86400);
+        $user->class_expire = date('Y-m-d H:i:s', time() + (int) $configs['sign_up_for_class_time'] * 86400);
         $user->class = $configs['sign_up_for_class'];
         $user->node_connector = $configs['connection_device_limit'];
         $user->node_speedlimit = $configs['connection_rate_limit'];
-        $user->expire_in = date('Y-m-d H:i:s', time() + $configs['sign_up_for_free_time'] * 86400);
+        $user->expire_in = date('Y-m-d H:i:s', time() + (int) $configs['sign_up_for_free_time'] * 86400);
         $user->reg_date = date('Y-m-d H:i:s');
         $user->reg_ip = $_SERVER['REMOTE_ADDR'];
         $user->theme = $_ENV['theme'];