소스 검색

Update login() method

Visman 4 년 전
부모
커밋
b3a617b3b2
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      app/Models/Pages/Auth.php
  2. 2 2
      app/Models/Pages/Register.php

+ 2 - 2
app/Models/Pages/Auth.php

@@ -47,7 +47,7 @@ class Auth extends Page
     /**
      * Вход на форум
      */
-    public function login(array $args, string $method): Page
+    public function login(array $args, string $method, string $username = ''): Page
     {
         $this->c->Lang->load('validator');
         $this->c->Lang->load('auth');
@@ -98,7 +98,7 @@ class Auth extends Page
         $this->titles     = __('Login');
         $this->regLink    = '1' == $this->c->config->o_regs_allow ? $this->c->Router->link('Register') : null;
 
-        $username         = $v ? $v->username : ($args['_username'] ?? '');
+        $username         = $v ? $v->username : $username;
         $save             = $v ? $v->save : 1;
         $redirect         = $v ? $v->redirect : $this->c->Router->validate($ref, 'Index');
         $this->form       = $this->formLogin($username, $save, $redirect);

+ 2 - 2
app/Models/Pages/Register.php

@@ -272,7 +272,7 @@ class Register extends Page
             $auth         = $this->c->Auth;
             $auth->fIswev = ['s', __('Reg complete')];
 
-            return $auth->login(['_username' => $v->username], 'GET');
+            return $auth->login([], 'GET', $v->username);
         }
     }
 
@@ -309,6 +309,6 @@ class Register extends Page
         $auth         = $this->c->Auth;
         $auth->fIswev = ['s', __('Reg complete')];
 
-        return $auth->login(['_username' => $user->username], 'GET');
+        return $auth->login([], 'GET', $user->username);
     }
 }