@@ -47,6 +47,6 @@ |
||
| 47 | 47 | ->subject('Reset passowrd') |
| 48 | 48 | ->line('Reset passowrd') |
| 49 | 49 | ->line('To reset your password click on the button below') |
| 50 | - ->action('Reset password', config('skeleton.reset_password_url') . '/' . $this->token); |
|
| 50 | + ->action('Reset password', config('skeleton.reset_password_url').'/'.$this->token); |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | \ No newline at end of file |
@@ -45,6 +45,6 @@ |
||
| 45 | 45 | ->subject('Email verification') |
| 46 | 46 | ->line('Email verification') |
| 47 | 47 | ->line('To validate your email click on the button below') |
| 48 | - ->action('Verify your email', config('skeleton.confrim_email_url') . '/' . $notifiable->confirmation_code); |
|
| 48 | + ->action('Verify your email', config('skeleton.confrim_email_url').'/'.$notifiable->confirmation_code); |
|
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | \ No newline at end of file |
@@ -102,20 +102,16 @@ discard block |
||
| 102 | 102 | if ( ! $user = $this->first(['email' => $credentials['email']])) |
| 103 | 103 | { |
| 104 | 104 | \ErrorHandler::loginFailed(); |
| 105 | - } |
|
| 106 | - else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) |
|
| 105 | + } else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) |
|
| 107 | 106 | { |
| 108 | 107 | \ErrorHandler::loginFailed(); |
| 109 | - } |
|
| 110 | - else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) |
|
| 108 | + } else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) |
|
| 111 | 109 | { |
| 112 | 110 | \ErrorHandler::loginFailed(); |
| 113 | - } |
|
| 114 | - else if ($user->blocked) |
|
| 111 | + } else if ($user->blocked) |
|
| 115 | 112 | { |
| 116 | 113 | \ErrorHandler::userIsBlocked(); |
| 117 | - } |
|
| 118 | - else if ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed) |
|
| 114 | + } else if ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed) |
|
| 119 | 115 | { |
| 120 | 116 | \ErrorHandler::emailNotConfirmed(); |
| 121 | 117 | } |
@@ -143,8 +139,7 @@ discard block |
||
| 143 | 139 | { |
| 144 | 140 | $data = ['email' => $user->email, 'password' => '']; |
| 145 | 141 | return $this->register($data); |
| 146 | - } |
|
| 147 | - else |
|
| 142 | + } else |
|
| 148 | 143 | { |
| 149 | 144 | if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => ''])) |
| 150 | 145 | { |
@@ -187,12 +182,10 @@ discard block |
||
| 187 | 182 | if ( ! $this->hasGroup(['Admin'])) |
| 188 | 183 | { |
| 189 | 184 | \ErrorHandler::noPermissions(); |
| 190 | - } |
|
| 191 | - else if (\Auth::id() == $user_id) |
|
| 185 | + } else if (\Auth::id() == $user_id) |
|
| 192 | 186 | { |
| 193 | 187 | \ErrorHandler::noPermissions(); |
| 194 | - } |
|
| 195 | - else if ($user->groups->pluck('name')->search('Admin', true) !== false) |
|
| 188 | + } else if ($user->groups->pluck('name')->search('Admin', true) !== false) |
|
| 196 | 189 | { |
| 197 | 190 | \ErrorHandler::noPermissions(); |
| 198 | 191 | } |