@@ -17,21 +17,21 @@ discard block |
||
17 | 17 | { |
18 | 18 | public function user() |
19 | 19 | { |
20 | - if(!isset($_SESSION['user']) && json_decode($_COOKIE['user'],true) !== null){ |
|
21 | - $_SESSION['user'] = json_decode($_COOKIE['user'],true); |
|
20 | + if (!isset($_SESSION['user']) && json_decode($_COOKIE['user'], true) !== null) { |
|
21 | + $_SESSION['user'] = json_decode($_COOKIE['user'], true); |
|
22 | 22 | } |
23 | 23 | return UserDataAccess::getUserById(isset($_SESSION['user']['user_id']) ? $_SESSION['user']['user_id'] : 0); |
24 | 24 | } |
25 | 25 | |
26 | 26 | public function hasRole($roleName) |
27 | 27 | { |
28 | - if(!self::check()){ |
|
28 | + if (!self::check()) { |
|
29 | 29 | return false; |
30 | 30 | } |
31 | - $userRoles = UserDataAccess::getUserRoles(isset($_SESSION['user']['user_id']) ? $_SESSION['user']['user_id'] : 0); |
|
31 | + $userRoles = UserDataAccess::getUserRoles(isset($_SESSION['user']['user_id']) ? $_SESSION['user']['user_id'] : 0); |
|
32 | 32 | $hasAccess = false; |
33 | - foreach ($userRoles as $role){ |
|
34 | - if($role->name == $roleName){ |
|
33 | + foreach ($userRoles as $role) { |
|
34 | + if ($role->name == $roleName) { |
|
35 | 35 | $hasAccess = true; |
36 | 36 | break; |
37 | 37 | } |
@@ -42,13 +42,13 @@ discard block |
||
42 | 42 | |
43 | 43 | public function check() |
44 | 44 | { |
45 | - if(!isset($_SESSION['user']) && json_decode($_COOKIE['user'],true) !== null){ |
|
46 | - $_SESSION['user'] = json_decode($_COOKIE['user'],true); |
|
45 | + if (!isset($_SESSION['user']) && json_decode($_COOKIE['user'], true) !== null) { |
|
46 | + $_SESSION['user'] = json_decode($_COOKIE['user'], true); |
|
47 | 47 | } |
48 | 48 | return isset($_SESSION['user']['user_id']); |
49 | 49 | } |
50 | 50 | |
51 | - public function attempt(string $loginField,string $password) |
|
51 | + public function attempt(string $loginField, string $password) |
|
52 | 52 | { |
53 | 53 | $user = UserDataAccess::getUserLoginField($loginField); |
54 | 54 | if (!$user) { |
@@ -58,10 +58,10 @@ discard block |
||
58 | 58 | ]; |
59 | 59 | } |
60 | 60 | $setting = Config::get('settings.auth'); |
61 | - if(1 || $setting['2step']){ |
|
62 | - return $this->twoStepAuth($loginField,$password); |
|
63 | - }else{ |
|
64 | - if ($this->checkPass($password,$user->password)) { |
|
61 | + if (1 || $setting['2step']) { |
|
62 | + return $this->twoStepAuth($loginField, $password); |
|
63 | + }else { |
|
64 | + if ($this->checkPass($password, $user->password)) { |
|
65 | 65 | $_SESSION['user']['user_id'] = $user->id; |
66 | 66 | $_SESSION['user']['mobile'] = $user->mobile; |
67 | 67 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | 'type'=>'success', |
76 | 76 | 'message'=> 'Logined', |
77 | 77 | ]; |
78 | - }else{ |
|
78 | + }else { |
|
79 | 79 | return [ |
80 | 80 | 'type'=>'error', |
81 | 81 | 'message'=> 'password mismatch', |
@@ -90,9 +90,9 @@ discard block |
||
90 | 90 | |
91 | 91 | |
92 | 92 | |
93 | - public function checkPass($password,$database_pass) |
|
93 | + public function checkPass($password, $database_pass) |
|
94 | 94 | { |
95 | - if($database_pass == $password){ |
|
95 | + if ($database_pass == $password) { |
|
96 | 96 | return true; |
97 | 97 | } |
98 | 98 | return false; |
@@ -100,10 +100,10 @@ discard block |
||
100 | 100 | } |
101 | 101 | |
102 | 102 | |
103 | - public function twoStepAuth(string $loginField,string $password) |
|
103 | + public function twoStepAuth(string $loginField, string $password) |
|
104 | 104 | { |
105 | 105 | $user = UserDataAccess::getUserLoginField($loginField); |
106 | - if(UserDataAccess::checkToken($password,$loginField)){ |
|
106 | + if (UserDataAccess::checkToken($password, $loginField)) { |
|
107 | 107 | $_SESSION['user']['user_id'] = $user->id; |
108 | 108 | $_SESSION['user']['mobile'] = $user->mobile; |
109 | 109 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | 'type'=>'success', |
118 | 118 | 'message'=> 'Logined', |
119 | 119 | ]; |
120 | - }else{ |
|
120 | + }else { |
|
121 | 121 | return [ |
122 | 122 | 'type'=>'error', |
123 | 123 | 'message'=> 'problem!', |