@@ -50,8 +50,9 @@ |
||
| 50 | 50 | */ |
| 51 | 51 | public function render($request, Exception $e) |
| 52 | 52 | { |
| 53 | - if ($e instanceof NotFoundHttpException) |
|
| 54 | - return redirect('/'); |
|
| 53 | + if ($e instanceof NotFoundHttpException) { |
|
| 54 | + return redirect('/'); |
|
| 55 | + } |
|
| 55 | 56 | |
| 56 | 57 | return parent::render($request, $e); |
| 57 | 58 | } |
@@ -233,8 +233,9 @@ |
||
| 233 | 233 | */ |
| 234 | 234 | public function getTrustedAttribute(): bool |
| 235 | 235 | { |
| 236 | - if (UserSecurity::find($this->attributes['id']) == null) |
|
| 237 | - return true; |
|
| 236 | + if (UserSecurity::find($this->attributes['id']) == null) { |
|
| 237 | + return true; |
|
| 238 | + } |
|
| 238 | 239 | |
| 239 | 240 | return in_array($this->trusted, UserSecurity::find($this->attributes['id'])->trustedDevices); |
| 240 | 241 | } |
@@ -98,8 +98,9 @@ |
||
| 98 | 98 | { |
| 99 | 99 | $categories = []; |
| 100 | 100 | |
| 101 | - foreach (explode(',', $this->attributes['categories']) as $articleCategory) |
|
| 102 | - $categories[] = ArticleCategory::query()->where('link', $articleCategory)->first(); |
|
| 101 | + foreach (explode(',', $this->attributes['categories']) as $articleCategory) { |
|
| 102 | + $categories[] = ArticleCategory::query()->where('link', $articleCategory)->first(); |
|
| 103 | + } |
|
| 103 | 104 | |
| 104 | 105 | return $categories; |
| 105 | 106 | } |
@@ -25,8 +25,9 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function checkName(Request $request): JsonResponse |
| 27 | 27 | { |
| 28 | - if (User::where('username', $request->json()->get('name'))->count() > 0) |
|
| 29 | - return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]); |
|
| 28 | + if (User::where('username', $request->json()->get('name'))->count() > 0) { |
|
| 29 | + return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]); |
|
| 30 | + } |
|
| 30 | 31 | |
| 31 | 32 | return response()->json(['code' => 'OK', 'validationResult' => null, 'suggestions' => []]); |
| 32 | 33 | } |
@@ -74,8 +75,9 @@ discard block |
||
| 74 | 75 | */ |
| 75 | 76 | public function selectRoom(Request $request): JsonResponse |
| 76 | 77 | { |
| 77 | - if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) |
|
| 78 | - return response('', 400); |
|
| 78 | + if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) { |
|
| 79 | + return response('', 400); |
|
| 80 | + } |
|
| 79 | 81 | |
| 80 | 82 | return response()->json(); |
| 81 | 83 | } |
@@ -103,8 +105,9 @@ discard block |
||
| 103 | 105 | { |
| 104 | 106 | $userPreferences = UserPreferences::find($request->user()->uniqueId); |
| 105 | 107 | |
| 106 | - foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) |
|
| 107 | - $userPreferences->{$attributeName} = $attributeValue == 1; |
|
| 108 | + foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) { |
|
| 109 | + $userPreferences->{$attributeName} = $attributeValue == 1; |
|
| 110 | + } |
|
| 108 | 111 | |
| 109 | 112 | return response()->json($userPreferences); |
| 110 | 113 | } |
@@ -150,8 +153,9 @@ discard block |
||
| 150 | 153 | */ |
| 151 | 154 | public function checkNewName(Request $request): JsonResponse |
| 152 | 155 | { |
| 153 | - if (User::where('username', $request->input('name'))->count() > 0) |
|
| 154 | - return response()->json(['isAvailable' => false]); |
|
| 156 | + if (User::where('username', $request->input('name'))->count() > 0) { |
|
| 157 | + return response()->json(['isAvailable' => false]); |
|
| 158 | + } |
|
| 155 | 159 | |
| 156 | 160 | return response()->json(['isAvailable' => true]); |
| 157 | 161 | } |
@@ -164,8 +168,9 @@ discard block |
||
| 164 | 168 | */ |
| 165 | 169 | public function createAvatar(Request $request): JsonResponse |
| 166 | 170 | { |
| 167 | - if (User::where('username', $request->json()->get('name'))->count() > 0) |
|
| 168 | - return response()->json(['isAvailable' => false]); |
|
| 171 | + if (User::where('username', $request->json()->get('name'))->count() > 0) { |
|
| 172 | + return response()->json(['isAvailable' => false]); |
|
| 173 | + } |
|
| 169 | 174 | |
| 170 | 175 | $request->user()->name = $request->json()->get('name'); |
| 171 | 176 | |
@@ -52,11 +52,13 @@ |
||
| 52 | 52 | */ |
| 53 | 53 | public function register(Request $request): JsonResponse |
| 54 | 54 | { |
| 55 | - if (strpos($request->json()->get('email'), '@') == false) |
|
| 56 | - return response()->json(['error' => 'registration_email'], 409); |
|
| 55 | + if (strpos($request->json()->get('email'), '@') == false) { |
|
| 56 | + return response()->json(['error' => 'registration_email'], 409); |
|
| 57 | + } |
|
| 57 | 58 | |
| 58 | - if (ChocolateyId::query()->where('mail', $request->json()->get('email'))->count() > 0) |
|
| 59 | - return response()->json(['error' => 'registration_email_in_use'], 409); |
|
| 59 | + if (ChocolateyId::query()->where('mail', $request->json()->get('email'))->count() > 0) { |
|
| 60 | + return response()->json(['error' => 'registration_email_in_use'], 409); |
|
| 61 | + } |
|
| 60 | 62 | |
| 61 | 63 | $userData = (new AccountController) |
| 62 | 64 | ->createUser($request, $request->json()->all(), true); |
@@ -74,8 +74,9 @@ |
||
| 74 | 74 | { |
| 75 | 75 | $articleContent = Article::find(substr($articleName, 0, strpos($articleName, '_'))); |
| 76 | 76 | |
| 77 | - if ($articleContent == null) |
|
| 78 | - return response()->json('', 404); |
|
| 77 | + if ($articleContent == null) { |
|
| 78 | + return response()->json('', 404); |
|
| 79 | + } |
|
| 79 | 80 | |
| 80 | 81 | return response(view('habbo-web-news.articles-view', [ |
| 81 | 82 | 'article' => $articleContent, |
@@ -27,8 +27,9 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | public function featureStatus(Request $request): Response |
| 29 | 29 | { |
| 30 | - if (ChocolateyId::find($request->user()->uniqueId)->emailVerified == 0) |
|
| 31 | - return response('identity_verification_required', 200); |
|
| 30 | + if (ChocolateyId::find($request->user()->uniqueId)->emailVerified == 0) { |
|
| 31 | + return response('identity_verification_required', 200); |
|
| 32 | + } |
|
| 32 | 33 | |
| 33 | 34 | $featureEnabled = UserSecurity::find($request->user()->uniqueId); |
| 34 | 35 | |
@@ -43,8 +44,9 @@ discard block |
||
| 43 | 44 | */ |
| 44 | 45 | public function saveQuestions(Request $request): JsonResponse |
| 45 | 46 | { |
| 46 | - if (User::where('password', hash('sha256', $request->json()->get('password')))->count() == 0) |
|
| 47 | - return response()->json(['error' => 'invalid_password'], 400); |
|
| 47 | + if (User::where('password', hash('sha256', $request->json()->get('password')))->count() == 0) { |
|
| 48 | + return response()->json(['error' => 'invalid_password'], 400); |
|
| 49 | + } |
|
| 48 | 50 | |
| 49 | 51 | UserSecurity::updateOrCreate([ |
| 50 | 52 | 'user_id' => $request->user()->uniqueId, |
@@ -92,11 +94,13 @@ discard block |
||
| 92 | 94 | */ |
| 93 | 95 | public function changePassword(Request $request): JsonResponse |
| 94 | 96 | { |
| 95 | - if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() == 0) |
|
| 96 | - return response()->json(['error' => 'password.current_password.invalid'], 409); |
|
| 97 | + if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() == 0) { |
|
| 98 | + return response()->json(['error' => 'password.current_password.invalid'], 409); |
|
| 99 | + } |
|
| 97 | 100 | |
| 98 | - if (User::where('password', hash('sha256', $request->json()->get('password')))->count() == 1) |
|
| 99 | - return response()->json(['error' => 'password.used_earlier'], 409); |
|
| 101 | + if (User::where('password', hash('sha256', $request->json()->get('password')))->count() == 1) { |
|
| 102 | + return response()->json(['error' => 'password.used_earlier'], 409); |
|
| 103 | + } |
|
| 100 | 104 | |
| 101 | 105 | User::find($request->user()->uniqueId)->update(['password' => hash('sha256', $request->json()->get('password'))]); |
| 102 | 106 | |
@@ -114,14 +118,17 @@ discard block |
||
| 114 | 118 | */ |
| 115 | 119 | public function changeMail(Request $request): JsonResponse |
| 116 | 120 | { |
| 117 | - if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() == 0) |
|
| 118 | - return response()->json(['error' => 'changeEmail.invalid_password'], 400); |
|
| 121 | + if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() == 0) { |
|
| 122 | + return response()->json(['error' => 'changeEmail.invalid_password'], 400); |
|
| 123 | + } |
|
| 119 | 124 | |
| 120 | - if (strpos($request->json()->get('newEmail'), '@') == false) |
|
| 121 | - return response()->json(['error' => 'registration_email'], 400); |
|
| 125 | + if (strpos($request->json()->get('newEmail'), '@') == false) { |
|
| 126 | + return response()->json(['error' => 'registration_email'], 400); |
|
| 127 | + } |
|
| 122 | 128 | |
| 123 | - if (ChocolateyId::where('mail', $request->json()->get('newEmail'))->count() > 0) |
|
| 124 | - return response()->json(['error' => 'changeEmail.email_already_in_use'], 400); |
|
| 129 | + if (ChocolateyId::where('mail', $request->json()->get('newEmail'))->count() > 0) { |
|
| 130 | + return response()->json(['error' => 'changeEmail.email_already_in_use'], 400); |
|
| 131 | + } |
|
| 125 | 132 | |
| 126 | 133 | // @TODO: In the future the e-mail only will be changed after e-mail confirmation |
| 127 | 134 | $request->user()->update(['mail' => $request->json()->get('newEmail')]); |
@@ -139,8 +146,9 @@ discard block |
||
| 139 | 146 | */ |
| 140 | 147 | public function getQuestions(Request $request): JsonResponse |
| 141 | 148 | { |
| 142 | - if (UserSecurity::find($request->user()->uniqueId) == null) |
|
| 143 | - return response()->json(); |
|
| 149 | + if (UserSecurity::find($request->user()->uniqueId) == null) { |
|
| 150 | + return response()->json(); |
|
| 151 | + } |
|
| 144 | 152 | |
| 145 | 153 | $userSecurity = UserSecurity::find($request->user()->uniqueId); |
| 146 | 154 | |
@@ -167,8 +175,9 @@ discard block |
||
| 167 | 175 | ->where('firstAnswer', $request->json()->get('answer1')) |
| 168 | 176 | ->where('secondAnswer', $request->json()->get('answer2'))->count() > 0 |
| 169 | 177 | ): |
| 170 | - if ($request->json()->get('trust') == true) |
|
| 171 | - (new TrustedDevice)->store($request->user()->uniqueId, $request->ip())->save(); |
|
| 178 | + if ($request->json()->get('trust') == true) { |
|
| 179 | + (new TrustedDevice)->store($request->user()->uniqueId, $request->ip())->save(); |
|
| 180 | + } |
|
| 172 | 181 | |
| 173 | 182 | return response()->json('', 204); |
| 174 | 183 | endif; |
@@ -27,8 +27,9 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | $userData = User::where('username', $request->input('name'))->first(); |
| 29 | 29 | |
| 30 | - if ($userData == null) |
|
| 31 | - return response()->json('', 404); |
|
| 30 | + if ($userData == null) { |
|
| 31 | + return response()->json('', 404); |
|
| 32 | + } |
|
| 32 | 33 | |
| 33 | 34 | $userPreferences = UserPreferences::find($userData->uniqueId); |
| 34 | 35 | |
@@ -48,13 +49,15 @@ discard block |
||
| 48 | 49 | { |
| 49 | 50 | $userData = User::find($userId); |
| 50 | 51 | |
| 51 | - if ($userData == null) |
|
| 52 | - return response()->json('', 404); |
|
| 52 | + if ($userData == null) { |
|
| 53 | + return response()->json('', 404); |
|
| 54 | + } |
|
| 53 | 55 | |
| 54 | 56 | $userPreferences = UserPreferences::find($userData->uniqueId); |
| 55 | 57 | |
| 56 | - if ($userPreferences != null && $userPreferences->profileVisible == '0') |
|
| 57 | - return response()->json('', 404); |
|
| 58 | + if ($userPreferences != null && $userPreferences->profileVisible == '0') { |
|
| 59 | + return response()->json('', 404); |
|
| 60 | + } |
|
| 58 | 61 | |
| 59 | 62 | return response()->json(new UserProfile($userData)); |
| 60 | 63 | } |
@@ -90,8 +93,9 @@ discard block |
||
| 90 | 93 | */ |
| 91 | 94 | public function getPhotos(Request $request): JsonResponse |
| 92 | 95 | { |
| 93 | - if (Photo::where('creator_id', $request->user()->uniqueId)->count() == 0) |
|
| 94 | - return response()->json([]); |
|
| 96 | + if (Photo::where('creator_id', $request->user()->uniqueId)->count() == 0) { |
|
| 97 | + return response()->json([]); |
|
| 98 | + } |
|
| 95 | 99 | |
| 96 | 100 | $userPhotos = Photo::where('creator_id', $request->user()->uniqueId)->get(); |
| 97 | 101 | |
@@ -28,8 +28,9 @@ |
||
| 28 | 28 | { |
| 29 | 29 | $leaderRank = 1; |
| 30 | 30 | |
| 31 | - foreach (($leaderBoard = Room::orderBy('score', 'DESC')->limit(50)->get()) as $room) |
|
| 32 | - $room->leaderboardRank = $leaderRank++; |
|
| 31 | + foreach (($leaderBoard = Room::orderBy('score', 'DESC')->limit(50)->get()) as $room) { |
|
| 32 | + $room->leaderboardRank = $leaderRank++; |
|
| 33 | + } |
|
| 33 | 34 | |
| 34 | 35 | return response()->json($leaderBoard, 200, array(), JSON_UNESCAPED_SLASHES); |
| 35 | 36 | } |