@@ -18,7 +18,7 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | public function register() |
| 20 | 20 | { |
| 21 | - $this->app->bind('choconux', function () { |
|
| 21 | + $this->app->bind('choconux', function() { |
|
| 22 | 22 | return Nux::getInstance(); |
| 23 | 23 | }); |
| 24 | 24 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | public function send(array $configuration, string $view = 'habbo-web-mail.confirm-mail') |
| 25 | 25 | { |
| 26 | 26 | if (Config::get('mail.enable')) |
| 27 | - Mail::send($view, $configuration, function ($message) use ($configuration) { |
|
| 27 | + Mail::send($view, $configuration, function($message) use ($configuration) { |
|
| 28 | 28 | $message->from(Config::get('mail.from.address'), Config::get('chocolatey.name')); |
| 29 | 29 | $message->to($configuration['mail'])->subject($configuration['subject']); |
| 30 | 30 | }); |
@@ -23,9 +23,10 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | public function send(array $configuration, string $view = 'habbo-web-mail.confirm-mail') |
| 25 | 25 | { |
| 26 | - if (Config::get('mail.enable')) |
|
| 27 | - Mail::send($view, $configuration, function ($message) use ($configuration) { |
|
| 26 | + if (Config::get('mail.enable')) { |
|
| 27 | + Mail::send($view, $configuration, function ($message) use ($configuration) { |
|
| 28 | 28 | $message->from(Config::get('mail.from.address'), Config::get('chocolatey.name')); |
| 29 | + } |
|
| 29 | 30 | $message->to($configuration['mail'])->subject($configuration['subject']); |
| 30 | 31 | }); |
| 31 | 32 | } |
@@ -54,8 +55,9 @@ discard block |
||
| 54 | 55 | { |
| 55 | 56 | $mailRequest = MailModel::where('token', $token)->where('used', '0')->first(); |
| 56 | 57 | |
| 57 | - if ($mailRequest !== null) |
|
| 58 | - $mailRequest->update(['used' => '1']); |
|
| 58 | + if ($mailRequest !== null) { |
|
| 59 | + $mailRequest->update(['used' => '1']); |
|
| 60 | + } |
|
| 59 | 61 | |
| 60 | 62 | return $mailRequest; |
| 61 | 63 | } |
@@ -28,11 +28,13 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function checkName(Request $request): JsonResponse |
| 30 | 30 | { |
| 31 | - if (User::where('username', $request->json()->get('name'))->count() > 0 && $request->json()->get('name') != $request->user()->name) |
|
| 32 | - return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]); |
|
| 31 | + if (User::where('username', $request->json()->get('name'))->count() > 0 && $request->json()->get('name') != $request->user()->name) { |
|
| 32 | + return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]); |
|
| 33 | + } |
|
| 33 | 34 | |
| 34 | - if (strlen($request->json()->get('name')) > 50 || !$this->filterName($request->json()->get('name'))) |
|
| 35 | - return response()->json(['code' => 'INVALID_NAME', 'validationResult' => ['resultType' => 'VALIDATION_ERROR_ILLEGAL_WORDS'], 'suggestions' => []]); |
|
| 35 | + if (strlen($request->json()->get('name')) > 50 || !$this->filterName($request->json()->get('name'))) { |
|
| 36 | + return response()->json(['code' => 'INVALID_NAME', 'validationResult' => ['resultType' => 'VALIDATION_ERROR_ILLEGAL_WORDS'], 'suggestions' => []]); |
|
| 37 | + } |
|
| 36 | 38 | |
| 37 | 39 | return response()->json(['code' => 'OK', 'validationResult' => null, 'suggestions' => []]); |
| 38 | 40 | } |
@@ -93,8 +95,9 @@ discard block |
||
| 93 | 95 | */ |
| 94 | 96 | public function selectRoom(Request $request): Response |
| 95 | 97 | { |
| 96 | - if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) |
|
| 97 | - return response('', 400); |
|
| 98 | + if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) { |
|
| 99 | + return response('', 400); |
|
| 100 | + } |
|
| 98 | 101 | |
| 99 | 102 | $nuxRoom = Nux::generateRoom($request); |
| 100 | 103 | |
@@ -126,8 +129,9 @@ discard block |
||
| 126 | 129 | { |
| 127 | 130 | $userPreferences = UserPreferences::find($request->user()->uniqueId); |
| 128 | 131 | |
| 129 | - foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) |
|
| 130 | - $userPreferences->{$attributeName} = $attributeValue == 1; |
|
| 132 | + foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) { |
|
| 133 | + $userPreferences->{$attributeName} = $attributeValue == 1; |
|
| 134 | + } |
|
| 131 | 135 | |
| 132 | 136 | return response()->json($userPreferences); |
| 133 | 137 | } |
@@ -145,8 +149,9 @@ discard block |
||
| 145 | 149 | 'block_friendrequests' => $request->json()->get('friendRequestEnabled') == false ? '1' : '0' |
| 146 | 150 | ]); |
| 147 | 151 | |
| 148 | - foreach ((array)$request->json()->all() as $setting => $value) |
|
| 149 | - UserPreferences::find($request->user()->uniqueId)->update([$setting => $value == true ? '1' : '0']); |
|
| 152 | + foreach ((array)$request->json()->all() as $setting => $value) { |
|
| 153 | + UserPreferences::find($request->user()->uniqueId)->update([$setting => $value == true ? '1' : '0']); |
|
| 154 | + } |
|
| 150 | 155 | |
| 151 | 156 | return response(''); |
| 152 | 157 | } |
@@ -173,8 +178,9 @@ discard block |
||
| 173 | 178 | */ |
| 174 | 179 | public function checkNewName(Request $request): JsonResponse |
| 175 | 180 | { |
| 176 | - if (User::where('username', $request->input('name'))->count() > 0 || !$this->filterName($request->input('name'))) |
|
| 177 | - return response()->json(['isAvailable' => false]); |
|
| 181 | + if (User::where('username', $request->input('name'))->count() > 0 || !$this->filterName($request->input('name'))) { |
|
| 182 | + return response()->json(['isAvailable' => false]); |
|
| 183 | + } |
|
| 178 | 184 | |
| 179 | 185 | return response()->json(['isAvailable' => true]); |
| 180 | 186 | } |
@@ -187,8 +193,9 @@ discard block |
||
| 187 | 193 | */ |
| 188 | 194 | public function createAvatar(Request $request): JsonResponse |
| 189 | 195 | { |
| 190 | - if (User::where('username', $request->json()->get('name'))->count() > 0 || !$this->filterName($request->json()->get('name'))) |
|
| 191 | - return response()->json(['isAvailable' => false]); |
|
| 196 | + if (User::where('username', $request->json()->get('name'))->count() > 0 || !$this->filterName($request->json()->get('name'))) { |
|
| 197 | + return response()->json(['isAvailable' => false]); |
|
| 198 | + } |
|
| 192 | 199 | |
| 193 | 200 | $request->user()->name = $request->json()->get('name'); |
| 194 | 201 | |
@@ -245,8 +252,9 @@ discard block |
||
| 245 | 252 | */ |
| 246 | 253 | public function confirmActivation(Request $request): JsonResponse |
| 247 | 254 | { |
| 248 | - if (($mail = (new MailController)->getMail($request->json()->get('token'))) == null) |
|
| 249 | - return response()->json(['error' => 'activation.invalid_token'], 400); |
|
| 255 | + if (($mail = (new MailController)->getMail($request->json()->get('token'))) == null) { |
|
| 256 | + return response()->json(['error' => 'activation.invalid_token'], 400); |
|
| 257 | + } |
|
| 250 | 258 | |
| 251 | 259 | if (strpos($mail->link, 'change-email') !== false): |
| 252 | 260 | $mail = str_replace('change-email/', '', $mail->link); |
@@ -269,8 +277,9 @@ discard block |
||
| 269 | 277 | */ |
| 270 | 278 | public function forgotPassword(Request $request): JsonResponse |
| 271 | 279 | { |
| 272 | - if (($user = User::where('mail', $request->json()->get('email'))->first()) == null) |
|
| 273 | - return response()->json(['email' => $request->json()->get('email')]); |
|
| 280 | + if (($user = User::where('mail', $request->json()->get('email'))->first()) == null) { |
|
| 281 | + return response()->json(['email' => $request->json()->get('email')]); |
|
| 282 | + } |
|
| 274 | 283 | |
| 275 | 284 | $mailController = new MailController; |
| 276 | 285 | |
@@ -24,8 +24,9 @@ discard block |
||
| 24 | 24 | public function login(Request $request): JsonResponse |
| 25 | 25 | { |
| 26 | 26 | if ($request->user()): |
| 27 | - if ($request->user()->isBanned) |
|
| 28 | - return $this->sendBanMessage($request); |
|
| 27 | + if ($request->user()->isBanned) { |
|
| 28 | + return $this->sendBanMessage($request); |
|
| 29 | + } |
|
| 29 | 30 | |
| 30 | 31 | $request->user()->update(['last_login' => time(), 'ip_current' => $request->ip()]); |
| 31 | 32 | |
@@ -69,18 +70,21 @@ discard block |
||
| 69 | 70 | */ |
| 70 | 71 | public function register(Request $request): JsonResponse |
| 71 | 72 | { |
| 72 | - if (strpos($request->json()->get('email'), '@') == false) |
|
| 73 | - return response()->json(['error' => 'registration_email'], 409); |
|
| 73 | + if (strpos($request->json()->get('email'), '@') == false) { |
|
| 74 | + return response()->json(['error' => 'registration_email'], 409); |
|
| 75 | + } |
|
| 74 | 76 | |
| 75 | - if (ChocolateyId::query()->where('mail', $request->json()->get('email'))->count() > 0) |
|
| 76 | - return response()->json(['error' => 'registration_email_in_use'], 409); |
|
| 77 | + if (ChocolateyId::query()->where('mail', $request->json()->get('email'))->count() > 0) { |
|
| 78 | + return response()->json(['error' => 'registration_email_in_use'], 409); |
|
| 79 | + } |
|
| 77 | 80 | |
| 78 | 81 | $userData = (new AccountController)->createUser($request, $request->json()->all(), true); |
| 79 | 82 | |
| 80 | 83 | $userData->update(['last_login' => time(), 'ip_register' => $request->ip(), 'ip_current' => $request->ip()]); |
| 81 | 84 | |
| 82 | - if (Config::get('chocolatey.vote.enabled')) |
|
| 83 | - Session::set('VotePolicy', true); |
|
| 85 | + if (Config::get('chocolatey.vote.enabled')) { |
|
| 86 | + Session::set('VotePolicy', true); |
|
| 87 | + } |
|
| 84 | 88 | |
| 85 | 89 | return response()->json($userData); |
| 86 | 90 | } |