fix: setting name & code clean up

resources/views/material/auth/register.tpl

@@ -104,9 +104,6 @@
                                             class="btn-reg btn btn-block btn-brand-accent waves-attach waves-light">
                                         获取验证码
                                     </button>
-                                    <a href="" onclick="return false;" data-toggle='modal'
-                                       data-target='#email_nrcy_modal'
-                                       class="auth-help-reg">收不到验证码？</a>
                                 </div>
                             </div>
                         </div>
@@ -166,28 +163,6 @@
     </div>
 </div>
 
-<div aria-hidden="true" class="modal modal-va-middle fade" id="email_nrcy_modal" role="dialog" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-heading">
-                <h2 class="modal-title">收不到验证码？</h2>
-            </div>
-            <div class="modal-inner">
-                {include file='email_nrcy.tpl'}
-            </div>
-            <div class="modal-footer">
-                <p class="text-right">
-                    <button class="btn btn-flat btn-brand-accent waves-attach waves-effect" data-dismiss="modal"
-                            type="button">我知道了
-                    </button>
-                </p>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="tiphidden"></div>
-
 {include file='dialog.tpl'}
 
 {include file='footer.tpl'}

resources/views/material/email_nrcy.tpl

@@ -1,19 +0,0 @@
-{if $config['enable_admin_contact'] == true}
-<p>建议检查邮箱垃圾箱，或更换其他邮箱重试。您也可以通过下方展示的联系方式联系管理员</p>
-{else}
-<p>建议检查邮箱垃圾箱，或更换其他邮箱重试</p>
-{/if}
-
-<ul>
-    {if $config['enable_admin_contact'] == true}
-        {if $config['admin_contact1'] != ''}
-            <li>{$config['admin_contact1']}</li>
-        {/if}
-        {if $config['admin_contact2'] != ''}
-            <li>{$config['admin_contact2']}</li>
-        {/if}
-        {if $config['admin_contact3'] != ''}
-            <li>{$config['admin_contact3']}</li>
-        {/if}
-    {/if}
-</ul>

resources/views/material/password/reset.tpl

@@ -3,7 +3,6 @@
 <!-- 新的 -->
 <div class="authpage">
     <div class="container">
-
         <div class="auth-main auth-row auth-col-one">
             <div class="auth-top auth-row">
                 <a class="boardtop-left" href="/">
@@ -32,19 +31,7 @@
             <div class="btn-auth auth-row">
                 <button id="reset" type="submit" class="btn btn-block btn-brand waves-attach waves-light">重置密码</button>
             </div>
-            <div class="auth-help auth-row">
-                <div class="auth-help-table auth-row auth-reset">
-                    <a href="" onclick="return false;" data-toggle='modal'
-                       data-target='#email_nrcy_modal'>收不到验证码？点击这里</a>
-                </div>
-            </div>
-            <div class="auth-bottom auth-row auth-reset">
-                <div class="tgauth">
-                    <p>请妥善保管好自己的登录密码</p>
-                </div>
-            </div>
         </div>
-
         <div class="card auth-tg">
             <div class="card-main"></div>
         </div>
@@ -53,27 +40,6 @@
 
 {include file='dialog.tpl'}
 
-<div aria-hidden="true" class="modal modal-va-middle fade" id="email_nrcy_modal" role="dialog" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-heading">
-                <h2 class="modal-title">收不到验证码？</h2>
-            </div>
-            <div class="modal-inner">
-                {include file='email_nrcy.tpl'}
-            </div>
-            <div class="modal-footer">
-                <p class="text-right">
-                    <button class="btn btn-flat btn-brand-accent waves-attach waves-effect" data-dismiss="modal"
-                            type="button">
-                        我知道了
-                    </button>
-                </p>
-            </div>
-        </div>
-    </div>
-</div>
-
 {include file='footer.tpl'}
 
 <script>

resources/views/tabler/email_nrcy.tpl

@@ -1,19 +0,0 @@
-{if $config['enable_admin_contact'] == true}
-<p>建议检查邮箱垃圾箱，或更换其他邮箱重试。您也可以通过下方展示的联系方式联系管理员</p>
-{else}
-<p>建议检查邮箱垃圾箱，或更换其他邮箱重试</p>
-{/if}
-
-<ul>
-    {if $config['enable_admin_contact'] == true}
-        {if $config['admin_contact1'] != ''}
-            <li>{$config['admin_contact1']}</li>
-        {/if}
-        {if $config['admin_contact2'] != ''}
-            <li>{$config['admin_contact2']}</li>
-        {/if}
-        {if $config['admin_contact3'] != ''}
-            <li>{$config['admin_contact3']}</li>
-        {/if}
-    {/if}
-</ul>

src/Controllers/AuthController.php

@@ -63,11 +63,6 @@ final class AuthController extends BaseController
      */
     public function loginHandle(Request $request, Response $response, array $args)
     {
-        $code = $request->getParam('code');
-        $passwd = $request->getParam('passwd');
-        $rememberMe = $request->getParam('remember_me');
-        $email = strtolower(trim($request->getParam('email')));
-
         if (Setting::obtain('enable_login_captcha') === true) {
             $ret = Captcha::verify($request->getParams());
             if (! $ret) {
@@ -78,6 +73,11 @@ final class AuthController extends BaseController
             }
         }
 
+        $code = $request->getParam('code');
+        $passwd = $request->getParam('passwd');
+        $rememberMe = $request->getParam('remember_me');
+        $email = strtolower(trim($request->getParam('email')));
+
         $user = User::where('email', $email)->first();
         if ($user === null) {
             return $response->withJson([
@@ -361,6 +361,13 @@ final class AuthController extends BaseController
             return ResponseHelper::error($response, '未开放注册。');
         }
 
+        if (Setting::obtain('enable_reg_captcha') === true) {
+            $ret = Captcha::verify($request->getParams());
+            if (! $ret) {
+                return ResponseHelper::error($response, '系统无法接受您的验证结果，请刷新页面后重试。');
+            }
+        }
+
         $name = $request->getParam('name');
         $email = $request->getParam('email');
         $email = trim($email);
@@ -384,13 +391,6 @@ final class AuthController extends BaseController
             $imvalue = '';
         }
 
-        if (Setting::obtain('enable_reg_captcha') === true) {
-            $ret = Captcha::verify($request->getParams());
-            if (! $ret) {
-                return ResponseHelper::error($response, '系统无法接受您的验证结果，请刷新页面后重试。');
-            }
-        }
-
         // check email format
         $check_res = Check::isEmailLegal($email);
         if ($check_res['ret'] === 0) {

src/Controllers/PasswordController.php

@@ -29,7 +29,7 @@ final class PasswordController extends BaseController
     {
         $captcha = [];
 
-        if (Setting::obtain('enable_login_captcha') === true) {
+        if (Setting::obtain('enable_reset_password_captcha') === true) {
             $captcha = Captcha::generate();
         }