sant0ro / chocolatey

app/Models/Voucher.php

Switch Indentation +10 added lines, -10 removed lines

@@ -1,30 +1,30 @@
-<?php
+ <?php
 
-namespace App\Models;
+ namespace App\Models;
 
 /**
  * Class Voucher.
  */
-class Voucher extends ChocolateyModel
-{
-    /**
+ class Voucher extends ChocolateyModel
+ {
+     /**
      * Disable Timestamps.
      *
      * @var bool
      */
-    public $timestamps = false;
+     public $timestamps = false;
 
-    /**
+     /**
      * The table associated with the model.
      *
      * @var string
      */
-    protected $table = 'vouchers';
+     protected $table = 'vouchers';
 
-    /**
+     /**
      * Primary Key of the Table.
      *
      * @var string
      */
-    protected $primaryKey = 'id';
+     protected $primaryKey = 'id';
 }

app/Models/PurchaseParam.php

Switch Indentation +17 added lines, -17 removed lines

@@ -1,44 +1,44 @@
-<?php
+ <?php
 
-namespace App\Models;
+ namespace App\Models;
 
 /**
  * Class PurchaseParam.
  */
-class PurchaseParam
-{
-    /**
+ class PurchaseParam
+ {
+     /**
      * Country Id.
      *
      * @var int
      */
-    public $countryId;
+     public $countryId;
 
-    /**
+     /**
      * Price Point Id.
      *
      * @var int
      */
-    public $pricePointId;
+     public $pricePointId;
 
-    /**
+     /**
      * Payment Method Id.
      *
      * @var int
      */
-    public $paymentMethodId;
+     public $paymentMethodId;
 
-    /**
+     /**
      * Create a new Purchase Param.
      *
      * @param int $countryId
      * @param int $pricePointId
      * @param int $paymentMethodId
      */
-    public function __construct(int $countryId, int $pricePointId, int $paymentMethodId)
-    {
-        $this->countryId = $countryId;
-        $this->pricePointId = $pricePointId;
-        $this->paymentMethodId = $paymentMethodId;
-    }
+     public function __construct(int $countryId, int $pricePointId, int $paymentMethodId)
+     {
+         $this->countryId = $countryId;
+         $this->pricePointId = $pricePointId;
+         $this->paymentMethodId = $paymentMethodId;
+     }
 }

app/Models/UserGroup.php

Switch Indentation +29 added lines, -29 removed lines

@@ -1,80 +1,80 @@
-<?php
+ <?php
 
-namespace App\Models;
+ namespace App\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Mappable;
+ use Sofa\Eloquence\Eloquence;
+ use Sofa\Eloquence\Mappable;
 
 /**
  * Class UserGroup.
  */
-class UserGroup extends ChocolateyModel
-{
-    use Eloquence, Mappable;
+ class UserGroup extends ChocolateyModel
+ {
+     use Eloquence, Mappable;
 
-    /**
+     /**
      * Disable Timestamps.
      *
      * @var bool
      */
-    public $timestamps = false;
+     public $timestamps = false;
 
-    /**
+     /**
      * The table associated with the model.
      *
      * @var string
      */
-    protected $table = 'guilds';
+     protected $table = 'guilds';
 
-    /**
+     /**
      * Primary Key of the Table.
      *
      * @var string
      */
-    protected $primaryKey = 'id';
+     protected $primaryKey = 'id';
 
-    /**
+     /**
      * The attributes that will be mapped.
      *
      * @var array
      */
-    protected $maps = ['badgeCode' => 'badge', 'roomId' => 'room_id', 'primaryColour' => 'color_one', 'secondaryColour' => 'color_two'];
+     protected $maps = ['badgeCode' => 'badge', 'roomId' => 'room_id', 'primaryColour' => 'color_one', 'secondaryColour' => 'color_two'];
 
-    /**
+     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['user_id', 'badge', 'slot_id', 'id', 'user_id', 'room_id', 'state', 'rights', 'forum', 'date_created', 'read_forum', 'post_messages', 'post_threads', 'mod_forum'];
+     protected $hidden = ['user_id', 'badge', 'slot_id', 'id', 'user_id', 'room_id', 'state', 'rights', 'forum', 'date_created', 'read_forum', 'post_messages', 'post_threads', 'mod_forum'];
 
-    /**
+     /**
      * The Appender(s) of the Model.
      *
      * @var array
      */
-    protected $appends = ['badgeCode', 'roomId', 'primaryColour', 'secondaryColour', 'type', 'isAdmin'];
+     protected $appends = ['badgeCode', 'roomId', 'primaryColour', 'secondaryColour', 'type', 'isAdmin'];
 
-    /**
+     /**
      * Return if is Admin.
      *
      * @TODO: Link with User Data
      *
      * @return bool
      */
-    public function getIsAdminAttribute(): bool
-    {
-        return false;
-    }
+     public function getIsAdminAttribute(): bool
+     {
+         return false;
+     }
 
-    /**
+     /**
      * Get the Group Type.
      *
      * @TODO: What NORMAL means?
      *
      * @return string
      */
-    public function getTypeAttribute(): string
-    {
-        return 'NORMAL';
-    }
+     public function getTypeAttribute(): string
+     {
+         return 'NORMAL';
+     }
 }

app/Http/Controllers/PhotosController.php

Switch Indentation +51 added lines, -51 removed lines

@@ -1,34 +1,34 @@ 
-<?php
+ <?php
 
-namespace App\Http\Controllers;
+ namespace App\Http\Controllers;
 
-use App\Facades\User as UserFacade;
-use App\Models\Photo;
-use App\Models\PhotoLike;
-use App\Models\PhotoReport;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ use App\Facades\User as UserFacade;
+ use App\Models\Photo;
+ use App\Models\PhotoLike;
+ use App\Models\PhotoReport;
+ use Illuminate\Http\JsonResponse;
+ use Illuminate\Http\Request;
+ use Illuminate\Http\Response;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class PhotosController.
  */
-class PhotosController extends BaseController
-{
-    /**
+ class PhotosController extends BaseController
+ {
+     /**
      * Render a set of Public HabboWEB Photos.
      *
      * @TODO: Exclude Approved Reported Photos from the List
      *
      * @return JsonResponse
      */
-    public function show(): JsonResponse
-    {
-        return response()->json(Photo::all(), 200, [], JSON_UNESCAPED_SLASHES);
-    }
+     public function show(): JsonResponse
+     {
+         return response()->json(Photo::all(), 200, [], JSON_UNESCAPED_SLASHES);
+     }
 
-    /**
+     /**
      * Register a Report of a Photo
      * Observation.: We will not create a limit of max reports.
      * Since it's a retro we don't really care about reports.
@@ -40,66 +40,66 @@ 
      *
      * @return Response
      */
-    public function report(Request $request, int $photoId): Response
-    {
-        (new PhotoReport())->store($photoId, $request->json()->get('reason'), UserFacade::getUser()->uniqueId);
+     public function report(Request $request, int $photoId): Response
+     {
+         (new PhotoReport())->store($photoId, $request->json()->get('reason'), UserFacade::getUser()->uniqueId);
 
-        return response(null);
-    }
+         return response(null);
+     }
 
-    /**
+     /**
      * Like a Photo.
      *
      * @param int $photoId
      *
      * @return Response
      */
-    public function likePhoto(int $photoId): Response
-    {
-        if (PhotoLike::where('username', UserFacade::getUser()->name)->where('photo_id', $photoId)->count() > 0) {
-            return response(null);
-        }
+     public function likePhoto(int $photoId): Response
+     {
+         if (PhotoLike::where('username', UserFacade::getUser()->name)->where('photo_id', $photoId)->count() > 0) {
+             return response(null);
+         }
 
-        (new PhotoLike())->store($photoId, UserFacade::getUser()->name);
+         (new PhotoLike())->store($photoId, UserFacade::getUser()->name);
 
-        return response(null);
-    }
+         return response(null);
+     }
 
-    /**
+     /**
      * Unlike a Photo.
      *
      * @param int $photoId
      *
      * @return Response
      */
-    public function unlikePhoto(int $photoId): Response
-    {
-        if (PhotoLike::where('username', UserFacade::getUser()->name)->where('photo_id', $photoId)->count() == 0) {
-            return response(null);
-        }
+     public function unlikePhoto(int $photoId): Response
+     {
+         if (PhotoLike::where('username', UserFacade::getUser()->name)->where('photo_id', $photoId)->count() == 0) {
+             return response(null);
+         }
 
-        PhotoLike::where('username', UserFacade::getUser()->name)->where('photo_id', $photoId)->delete();
+         PhotoLike::where('username', UserFacade::getUser()->name)->where('photo_id', $photoId)->delete();
 
-        return response(null);
-    }
+         return response(null);
+     }
 
-    /**
+     /**
      * Delete a Photo.
      *
      * @param int $photoId
      *
      * @return Response
      */
-    public function delete(int $photoId): Response
-    {
-        $photo = Photo::find($photoId);
+     public function delete(int $photoId): Response
+     {
+         $photo = Photo::find($photoId);
 
-        if ($photo == null || $photo->creator_id != UserFacade::getUser()->uniqueId) {
-            return response(null, 401);
-        }
+         if ($photo == null || $photo->creator_id != UserFacade::getUser()->uniqueId) {
+             return response(null, 401);
+         }
 
-        $photo->delete();
+         $photo->delete();
 
-        return response(null);
-    }
+         return response(null);
+     }
 }

app/Http/Controllers/ShopController.php

Switch Indentation +82 added lines, -82 removed lines

@@ -1,65 +1,65 @@ 
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Facades\Mail;
-use App\Facades\User as UserFacade;
-use App\Models\Country;
-use App\Models\PaymentCheckout;
-use App\Models\Purse;
-use App\Models\ShopHistory;
-use App\Models\ShopInventory;
-use App\Models\ShopItem;
-use App\Models\Voucher;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Laravel\Lumen\Http\Redirector;
-use Laravel\Lumen\Http\ResponseFactory;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ <?php
+
+ namespace App\Http\Controllers;
+
+ use App\Facades\Mail;
+ use App\Facades\User as UserFacade;
+ use App\Models\Country;
+ use App\Models\PaymentCheckout;
+ use App\Models\Purse;
+ use App\Models\ShopHistory;
+ use App\Models\ShopInventory;
+ use App\Models\ShopItem;
+ use App\Models\Voucher;
+ use Illuminate\Http\JsonResponse;
+ use Illuminate\Http\RedirectResponse;
+ use Illuminate\Http\Request;
+ use Illuminate\Http\Response;
+ use Laravel\Lumen\Http\Redirector;
+ use Laravel\Lumen\Http\ResponseFactory;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class ShopController.
  */
-class ShopController extends BaseController
-{
-    /**
+ class ShopController extends BaseController
+ {
+     /**
      * List all Shop Countries.
      *
      * @return JsonResponse
      */
-    public function listCountries(): JsonResponse
-    {
-        return response()->json(Country::all());
-    }
+     public function listCountries(): JsonResponse
+     {
+         return response()->json(Country::all());
+     }
 
-    /**
+     /**
      * Get the Shop Inventory of a Country.
      *
      * @param string $countryCode
      *
      * @return JsonResponse
      */
-    public function getInventory(string $countryCode): JsonResponse
-    {
-        return response()->json(new ShopInventory(Country::where('countryCode', $countryCode)->first()),
-            200, [], JSON_UNESCAPED_SLASHES);
-    }
+     public function getInventory(string $countryCode): JsonResponse
+     {
+         return response()->json(new ShopInventory(Country::where('countryCode', $countryCode)->first()),
+             200, [], JSON_UNESCAPED_SLASHES);
+     }
 
-    /**
+     /**
      * Get User Purse.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function getPurse(Request $request): JsonResponse
-    {
-        return response()->json(new Purse(UserFacade::getUser()->uniqueId));
-    }
+     public function getPurse(Request $request): JsonResponse
+     {
+         return response()->json(new Purse(UserFacade::getUser()->uniqueId));
+     }
 
-    /**
+     /**
      * Proceed Payment Checkout.
      *
      * @param string $paymentCategory
@@ -69,23 +69,23 @@ 
      *
      * @return RedirectResponse|Response|Redirector|ResponseFactory
      */
-    public function proceed(string $paymentCategory, int $countryCode, int $shopItem, int $paymentMethod)
-    {
-        $paymentCheckout = PaymentCheckout::where('category', $paymentCategory)->where('country', $countryCode)
-            ->where('item', $shopItem)->where('method', $paymentMethod)->first();
+     public function proceed(string $paymentCategory, int $countryCode, int $shopItem, int $paymentMethod)
+     {
+         $paymentCheckout = PaymentCheckout::where('category', $paymentCategory)->where('country', $countryCode)
+             ->where('item', $shopItem)->where('method', $paymentMethod)->first();
 
-        if ($paymentCheckout == null) {
-            return response(view('habbo-web-payments.failed-payment'), 400);
-        }
+         if ($paymentCheckout == null) {
+             return response(view('habbo-web-payments.failed-payment'), 400);
+         }
 
-        if ((strtotime($paymentCheckout->generated_at) + 172800) < time()) {
-            return response(view('habbo-web-payments.canceled-payment'), 400);
-        }
+         if ((strtotime($paymentCheckout->generated_at) + 172800) < time()) {
+             return response(view('habbo-web-payments.canceled-payment'), 400);
+         }
 
-        return response(view('habbo-web-payments.proceed', ['payment' => $paymentCheckout]));
-    }
+         return response(view('habbo-web-payments.proceed', ['payment' => $paymentCheckout]));
+     }
 
-    /**
+     /**
      * Success Payment Checkout.
      *
      * @TODO: Code Business Logic
@@ -98,27 +98,27 @@ 
      *
      * @return RedirectResponse|Response|Redirector|ResponseFactory
      */
-    public function success(Request $request, string $paymentCategory, int $countryCode, int $shopItem, int $paymentMethod)
-    {
-        $paymentCheckout = PaymentCheckout::where('category', $paymentCategory)->where('country', $countryCode)
-            ->where('item', $shopItem)->where('method', $paymentMethod)->first();
+     public function success(Request $request, string $paymentCategory, int $countryCode, int $shopItem, int $paymentMethod)
+     {
+         $paymentCheckout = PaymentCheckout::where('category', $paymentCategory)->where('country', $countryCode)
+             ->where('item', $shopItem)->where('method', $paymentMethod)->first();
 
-        if ($paymentCheckout == null) {
-            return response(view('habbo-web-payments.canceled-payment'), 500);
-        }
+         if ($paymentCheckout == null) {
+             return response(view('habbo-web-payments.canceled-payment'), 500);
+         }
 
-        $purchaseItem = (new ShopHistory())->store($paymentMethod, UserFacade::getUser()->uniqueId, $shopItem);
+         $purchaseItem = (new ShopHistory())->store($paymentMethod, UserFacade::getUser()->uniqueId, $shopItem);
 
-        Mail::send(['email' => UserFacade::getUser()->email, 'purchaseId' => $purchaseItem->transactionId,
-            'product'       => ShopItem::find($shopItem), 'subject' => 'Purchase completed',
-        ], 'habbo-web-mail.purchase-confirmation');
+         Mail::send(['email' => UserFacade::getUser()->email, 'purchaseId' => $purchaseItem->transactionId,
+             'product'       => ShopItem::find($shopItem), 'subject' => 'Purchase completed',
+         ], 'habbo-web-mail.purchase-confirmation');
 
-        $paymentCheckout->delete();
+         $paymentCheckout->delete();
 
-        return response(view('habbo-web-payments.success-payment', ['checkoutId' => $purchaseItem->transactionId]), 200);
-    }
+         return response(view('habbo-web-payments.success-payment', ['checkoutId' => $purchaseItem->transactionId]), 200);
+     }
 
-    /**
+     /**
      * Get User Purchase History.
      *
      * @TODO: User Purchase History will be coded on the Future
@@ -127,12 +127,12 @@ 
      *
      * @return JsonResponse
      */
-    public function getHistory(): JsonResponse
-    {
-        return response()->json(ShopHistory::where('user_id', UserFacade::getUser()->uniqueId)->get());
-    }
+     public function getHistory(): JsonResponse
+     {
+         return response()->json(ShopHistory::where('user_id', UserFacade::getUser()->uniqueId)->get());
+     }
 
-    /**
+     /**
      * Redeem Voucher.
      *
      * @TODO: Need to Test if really works
@@ -141,17 +141,17 @@ 
      *
      * @return JsonResponse
      */
-    public function redeem(Request $request): JsonResponse
-    {
-        if (($voucher = Voucher::where('code', $request->json()->get('voucherCode'))->first()) == null) {
-            return response()->json(null, 404);
-        }
+     public function redeem(Request $request): JsonResponse
+     {
+         if (($voucher = Voucher::where('code', $request->json()->get('voucherCode'))->first()) == null) {
+             return response()->json(null, 404);
+         }
 
-        UserFacade::getUser()->increment('credits', $voucher->credits);
-        UserFacade::getUser()->increment('pixels', $voucher->points);
+         UserFacade::getUser()->increment('credits', $voucher->credits);
+         UserFacade::getUser()->increment('pixels', $voucher->points);
 
-        $voucher->delete();
+         $voucher->delete();
 
-        return response()->json(null, 204);
-    }
+         return response()->json(null, 204);
+     }
 }

app/Http/Controllers/ProfileController.php

Switch Indentation +57 added lines, -57 removed lines

@@ -1,106 +1,106 @@
-<?php
+ <?php
 
-namespace App\Http\Controllers;
+ namespace App\Http\Controllers;
 
-use App\Facades\User as UserFacade;
-use App\Models\Photo;
-use App\Models\User;
-use App\Models\UserBadge;
-use App\Models\UserPreferences;
-use App\Models\UserProfile;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ use App\Facades\User as UserFacade;
+ use App\Models\Photo;
+ use App\Models\User;
+ use App\Models\UserBadge;
+ use App\Models\UserPreferences;
+ use App\Models\UserProfile;
+ use Illuminate\Http\JsonResponse;
+ use Illuminate\Http\Request;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class ProfileController.
  */
-class ProfileController extends BaseController
-{
-    /**
+ class ProfileController extends BaseController
+ {
+     /**
      * Get Public User Data.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function getPublicData(Request $request): JsonResponse
-    {
-        $userData = User::where('username', $request->input('name'))->first();
+     public function getPublicData(Request $request): JsonResponse
+     {
+         $userData = User::where('username', $request->input('name'))->first();
 
-        if ($userData == null || $userData->isBanned) {
-            return response()->json(null, 404);
-        }
+         if ($userData == null || $userData->isBanned) {
+             return response()->json(null, 404);
+         }
 
-        $userPreferences = UserPreferences::find($userData->uniqueId);
+         $userPreferences = UserPreferences::find($userData->uniqueId);
 
-        $userData->selectedBadges = UserBadge::where('user_id', $userData->uniqueId)->where('slot_id', '>', 0)->orderBy('slot_id', 'ASC')->get() ?? [];
-        $userData->profileVisible = $userPreferences == null ? true : $userPreferences->profileVisible == '1';
+         $userData->selectedBadges = UserBadge::where('user_id', $userData->uniqueId)->where('slot_id', '>', 0)->orderBy('slot_id', 'ASC')->get() ?? [];
+         $userData->profileVisible = $userPreferences == null ? true : $userPreferences->profileVisible == '1';
 
-        return response()->json($userData);
-    }
+         return response()->json($userData);
+     }
 
-    /**
+     /**
      * Get Public User Profile.
      *
      * @param int $userId
      *
      * @return JsonResponse
      */
-    public function getPublicProfile($userId): JsonResponse
-    {
-        $userData = User::find($userId);
+     public function getPublicProfile($userId): JsonResponse
+     {
+         $userData = User::find($userId);
 
-        if ($userData == null || $userData->isBanned) {
-            return response()->json(null, 404);
-        }
+         if ($userData == null || $userData->isBanned) {
+             return response()->json(null, 404);
+         }
 
-        $userPreferences = UserPreferences::find($userData->uniqueId);
+         $userPreferences = UserPreferences::find($userData->uniqueId);
 
-        if ($userPreferences != null && $userPreferences->profileVisible == '0') {
-            return response()->json(null, 404);
-        }
+         if ($userPreferences != null && $userPreferences->profileVisible == '0') {
+             return response()->json(null, 404);
+         }
 
-        return response()->json(new UserProfile($userData));
-    }
+         return response()->json(new UserProfile($userData));
+     }
 
-    /**
+     /**
      * Get Private User Profile.
      *
      * @return JsonResponse
      */
-    public function getProfile(): JsonResponse
-    {
-        return response()->json(new UserProfile(UserFacade::getUser()));
-    }
+     public function getProfile(): JsonResponse
+     {
+         return response()->json(new UserProfile(UserFacade::getUser()));
+     }
 
-    /**
+     /**
      * Get User Stories.
      *
      * @TODO: Implement Habbo Stories
      *
      * @return JsonResponse
      */
-    public function getStories(): JsonResponse
-    {
-        return response()->json([]);
-    }
+     public function getStories(): JsonResponse
+     {
+         return response()->json([]);
+     }
 
-    /**
+     /**
      * Get User Photos.
      *
      * @param int $userId
      *
      * @return JsonResponse
      */
-    public function getPhotos(int $userId): JsonResponse
-    {
-        if (Photo::where('creator_id', $userId)->count() == 0) {
-            return response()->json([]);
-        }
+     public function getPhotos(int $userId): JsonResponse
+     {
+         if (Photo::where('creator_id', $userId)->count() == 0) {
+             return response()->json([]);
+         }
 
-        $userPhotos = Photo::where('creator_id', $userId)->get();
+         $userPhotos = Photo::where('creator_id', $userId)->get();
 
-        return response()->json($userPhotos);
-    }
+         return response()->json($userPhotos);
+     }
 }

app/Http/Controllers/NuxController.php

Switch Indentation +40 added lines, -40 removed lines

@@ -1,73 +1,73 @@
-<?php
+ <?php
 
-namespace App\Http\Controllers;
+ namespace App\Http\Controllers;
 
-use App\Facades\Nux;
-use App\Facades\User as UserFacade;
-use App\Facades\Validation;
-use App\Models\NuxValidation;
-use App\Models\User;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ use App\Facades\Nux;
+ use App\Facades\User as UserFacade;
+ use App\Facades\Validation;
+ use App\Models\NuxValidation;
+ use App\Models\User;
+ use Illuminate\Http\JsonResponse;
+ use Illuminate\Http\Request;
+ use Illuminate\Http\Response;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class NuxController.
  */
-class NuxController extends BaseController
-{
-    /**
+ class NuxController extends BaseController
+ {
+     /**
      * Check an User Name.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function checkName(Request $request): JsonResponse
-    {
-        if (User::where('username', $request->json()->get('name'))->where('id', '<>', UserFacade::getUser()->uniqueId)->count() > 0) {
-            return response()->json(new NuxValidation('NAME_IN_USE'));
-        }
+     public function checkName(Request $request): JsonResponse
+     {
+         if (User::where('username', $request->json()->get('name'))->where('id', '<>', UserFacade::getUser()->uniqueId)->count() > 0) {
+             return response()->json(new NuxValidation('NAME_IN_USE'));
+         }
 
-        if (!Validation::filterUserName($request->json()->get('name'))) {
-            return response()->json(new NuxValidation('INVALID_NAME', ['resultType' => 'VALIDATION_ERROR_ILLEGAL_WORDS']));
-        }
+         if (!Validation::filterUserName($request->json()->get('name'))) {
+             return response()->json(new NuxValidation('INVALID_NAME', ['resultType' => 'VALIDATION_ERROR_ILLEGAL_WORDS']));
+         }
 
-        return response()->json(new NuxValidation());
-    }
+         return response()->json(new NuxValidation());
+     }
 
-    /**
+     /**
      * Select an User Name.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function selectName(Request $request): JsonResponse
-    {
-        UserFacade::updateSession(['username' => $request->json()->get('name')]);
+     public function selectName(Request $request): JsonResponse
+     {
+         UserFacade::updateSession(['username' => $request->json()->get('name')]);
 
-        return response()->json(new NuxValidation());
-    }
+         return response()->json(new NuxValidation());
+     }
 
-    /**
+     /**
      * Select a Room.
      *
      * @param Request $request
      *
      * @return Response
      */
-    public function selectRoom(Request $request): Response
-    {
-        if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) {
-            return response('', 400);
-        }
+     public function selectRoom(Request $request): Response
+     {
+         if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) {
+             return response('', 400);
+         }
 
-        Nux::generateRoom($request);
+         Nux::generateRoom($request);
 
-        UserFacade::getUser()->traits = ['USER'];
+         UserFacade::getUser()->traits = ['USER'];
 
-        return response(null, 200);
-    }
+         return response(null, 200);
+     }
 }

app/Http/Controllers/PageController.php

Switch Indentation +17 added lines, -17 removed lines

@@ -1,16 +1,16 @@ 
-<?php
+ <?php
 
-namespace App\Http\Controllers;
+ namespace App\Http\Controllers;
 
-use Illuminate\Http\Response;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ use Illuminate\Http\Response;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class PageController.
  */
-class PageController extends BaseController
-{
-    /**
+ class PageController extends BaseController
+ {
+     /**
      * Render a HabboWEB Page.
      *
      * @param string $pageCategory
@@ -18,14 +18,14 @@ 
      *
      * @return Response
      */
-    public function show(string $pageCategory, string $pageFile): Response
-    {
-        $pageArray = explode('.', $pageFile);
+     public function show(string $pageCategory, string $pageFile): Response
+     {
+         $pageArray = explode('.', $pageFile);
 
-        return response(view("habbo-web-pages.{$pageCategory}.{$pageArray[0]}"));
-    }
+         return response(view("habbo-web-pages.{$pageCategory}.{$pageArray[0]}"));
+     }
 
-    /**
+     /**
      * Render a HabboPage.
      *
      * @WARNING: Categories can still be pages
@@ -35,8 +35,8 @@ 
      *
      * @return Response
      */
-    public function habboPage(string $category, string $page = '')
-    {
-        return response(view(empty($page) ? "habbo-pages.{$category}" : "habbo-pages.{$category}.{$page}"));
-    }
+     public function habboPage(string $category, string $page = '')
+     {
+         return response(view(empty($page) ? "habbo-pages.{$category}" : "habbo-pages.{$category}.{$page}"));
+     }
 }

app/Http/Controllers/AccountSecurityController.php

Switch Indentation +139 added lines, -139 removed lines

@@ -1,89 +1,89 @@ 
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Facades\Mail;
-use App\Facades\User as UserFacade;
-use App\Models\ChocolateyId;
-use App\Models\Question;
-use App\Models\TrustedDevice;
-use App\Models\User;
-use App\Models\UserSecurity;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Config;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ <?php
+
+ namespace App\Http\Controllers;
+
+ use App\Facades\Mail;
+ use App\Facades\User as UserFacade;
+ use App\Models\ChocolateyId;
+ use App\Models\Question;
+ use App\Models\TrustedDevice;
+ use App\Models\User;
+ use App\Models\UserSecurity;
+ use Illuminate\Http\JsonResponse;
+ use Illuminate\Http\Request;
+ use Illuminate\Http\Response;
+ use Illuminate\Support\Facades\Config;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class AccountSecurityController.
  */
-class AccountSecurityController extends BaseController
-{
-    /**
+ class AccountSecurityController extends BaseController
+ {
+     /**
      * Check if Feature Status is Enabled.
      *
      * @return Response
      */
-    public function featureStatus(): Response
-    {
-        if (UserFacade::getUser()->emailVerified == false) {
-            return response('identity_verification_required', 200);
-        }
+     public function featureStatus(): Response
+     {
+         if (UserFacade::getUser()->emailVerified == false) {
+             return response('identity_verification_required', 200);
+         }
 
-        $featureEnabled = UserSecurity::find(UserFacade::getUser()->uniqueId);
+         $featureEnabled = UserSecurity::find(UserFacade::getUser()->uniqueId);
 
-        return response($featureEnabled !== null ? 'enabled' : 'disabled', 200);
-    }
+         return response($featureEnabled !== null ? 'enabled' : 'disabled', 200);
+     }
 
-    /**
+     /**
      * Save Security Questions.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function saveQuestions(Request $request): JsonResponse
-    {
-        if (UserFacade::getUser()->getChocolateyId()->password != hash(Config::get('chocolatey.security.hash'), $request->json()->get('password'))) {
-            return response()->json(['error' => 'invalid_password'], 400);
-        }
-
-        UserSecurity::updateOrCreate([
-            'user_id'        => UserFacade::getUser()->uniqueId,
-            'firstQuestion'  => $request->json()->get('questionId1'),
-            'secondQuestion' => $request->json()->get('questionId2'),
-            'firstAnswer'    => $request->json()->get('answer1'),
-            'secondAnswer'   => $request->json()->get('answer2'), ]);
-
-        return response()->json(null, 204);
-    }
-
-    /**
+     public function saveQuestions(Request $request): JsonResponse
+     {
+         if (UserFacade::getUser()->getChocolateyId()->password != hash(Config::get('chocolatey.security.hash'), $request->json()->get('password'))) {
+             return response()->json(['error' => 'invalid_password'], 400);
+         }
+
+         UserSecurity::updateOrCreate([
+             'user_id'        => UserFacade::getUser()->uniqueId,
+             'firstQuestion'  => $request->json()->get('questionId1'),
+             'secondQuestion' => $request->json()->get('questionId2'),
+             'firstAnswer'    => $request->json()->get('answer1'),
+             'secondAnswer'   => $request->json()->get('answer2'), ]);
+
+         return response()->json(null, 204);
+     }
+
+     /**
      * Disable Safety Lock.
      *
      * @return JsonResponse
      */
-    public function disable(): JsonResponse
-    {
-        UserSecurity::find(UserFacade::getUser()->uniqueId)->delete();
+     public function disable(): JsonResponse
+     {
+         UserSecurity::find(UserFacade::getUser()->uniqueId)->delete();
 
-        return response()->json(null, 204);
-    }
+         return response()->json(null, 204);
+     }
 
-    /**
+     /**
      * Reset Trusted Devices.
      *
      * @return JsonResponse
      */
-    public function reset(): JsonResponse
-    {
-        TrustedDevice::find(UserFacade::getUser()->uniqueId)->delete();
+     public function reset(): JsonResponse
+     {
+         TrustedDevice::find(UserFacade::getUser()->uniqueId)->delete();
 
-        return response()->json(null, 204);
-    }
+         return response()->json(null, 204);
+     }
 
-    /**
+     /**
      * Change User Password.
      *
      * @TODO: Implement Notification E-mail of Password change
@@ -92,139 +92,139 @@ 
      *
      * @return JsonResponse
      */
-    public function changePassword(Request $request): JsonResponse
-    {
-        UserFacade::getUser()->getChocolateyId()->update(['password' => hash(Config::get('chocolatey.security.hash'),
-            $request->json()->get('password'))]);
+     public function changePassword(Request $request): JsonResponse
+     {
+         UserFacade::getUser()->getChocolateyId()->update(['password' => hash(Config::get('chocolatey.security.hash'),
+             $request->json()->get('password'))]);
 
-        return response()->json(null, 204);
-    }
+         return response()->json(null, 204);
+     }
 
-    /**
+     /**
      * Confirm E-Mail Activation.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function confirmActivation(Request $request): JsonResponse
-    {
-        if (Mail::get($request->json()->get('token')) == null) {
-            return response()->json(['error' => 'activation.invalid_token'], 400);
-        }
+     public function confirmActivation(Request $request): JsonResponse
+     {
+         if (Mail::get($request->json()->get('token')) == null) {
+             return response()->json(['error' => 'activation.invalid_token'], 400);
+         }
 
-        ChocolateyId::find(Mail::get()->mail)->update(['mail_verified' => '1']);
+         ChocolateyId::find(Mail::get()->mail)->update(['mail_verified' => '1']);
 
-        if (strpos(Mail::get()->link, 'change-email') !== false) {
-            $email = str_replace('change-email/', '', Mail::get()->link);
+         if (strpos(Mail::get()->link, 'change-email') !== false) {
+             $email = str_replace('change-email/', '', Mail::get()->link);
 
-            User::where('mail', Mail::get()->mail)->update(['mail' => $email]);
+             User::where('mail', Mail::get()->mail)->update(['mail' => $email]);
 
-            ChocolateyId::find(Mail::get()->mail)->update(['mail' => $email]);
-        }
+             ChocolateyId::find(Mail::get()->mail)->update(['mail' => $email]);
+         }
 
-        return response()->json(['email' => Mail::get()->mail, 'emailVerified' => true, 'identityVerified' => true]);
-    }
+         return response()->json(['email' => Mail::get()->mail, 'emailVerified' => true, 'identityVerified' => true]);
+     }
 
-    /**
+     /**
      * Change User E-mail.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function changeMail(Request $request): JsonResponse
-    {
-        if (User::where('password', hash(Config::get('chocolatey.security.hash'), $request->json()->get('currentPassword')))->count() == 0) {
-            return response()->json(['error' => 'changeEmail.invalid_password'], 400);
-        }
+     public function changeMail(Request $request): JsonResponse
+     {
+         if (User::where('password', hash(Config::get('chocolatey.security.hash'), $request->json()->get('currentPassword')))->count() == 0) {
+             return response()->json(['error' => 'changeEmail.invalid_password'], 400);
+         }
 
-        if (ChocolateyId::where('mail', $request->json()->get('newEmail'))->count() > 0) {
-            return response()->json(['error' => 'changeEmail.email_already_in_use'], 400);
-        }
+         if (ChocolateyId::where('mail', $request->json()->get('newEmail'))->count() > 0) {
+             return response()->json(['error' => 'changeEmail.email_already_in_use'], 400);
+         }
 
-        $this->sendChangeMailConfirmation($request);
+         $this->sendChangeMailConfirmation($request);
 
-        return response()->json(['email' => $request->json()->get('newEmail')], 200);
-    }
+         return response()->json(['email' => $request->json()->get('newEmail')], 200);
+     }
 
-    /**
+     /**
      * Send the E-Mail confirmation.
      *
      * @param Request $request
      */
-    protected function sendChangeMailConfirmation(Request $request)
-    {
-        Mail::send(['email' => UserFacade::getUser()->email,
-            'name'          => UserFacade::getUser()->name, 'subject' => 'Email change alert',
-        ], 'habbo-web-mail.mail-change-alert');
+     protected function sendChangeMailConfirmation(Request $request)
+     {
+         Mail::send(['email' => UserFacade::getUser()->email,
+             'name'          => UserFacade::getUser()->name, 'subject' => 'Email change alert',
+         ], 'habbo-web-mail.mail-change-alert');
 
-        $generatedToken = Mail::store(UserFacade::getUser()->email,
-            "change-email/{$request->json()->get('newEmail')}");
+         $generatedToken = Mail::store(UserFacade::getUser()->email,
+             "change-email/{$request->json()->get('newEmail')}");
 
-        Mail::send(['email' => $request->json()->get('newEmail'), 'name' => UserFacade::getUser()->name,
-            'subject'       => 'Email change confirmation', 'url' => "/activate/{$generatedToken}",
-        ], 'habbo-web-mail.confirm-mail-change');
-    }
+         Mail::send(['email' => $request->json()->get('newEmail'), 'name' => UserFacade::getUser()->name,
+             'subject'       => 'Email change confirmation', 'url' => "/activate/{$generatedToken}",
+         ], 'habbo-web-mail.confirm-mail-change');
+     }
 
-    /**
+     /**
      * Get User Security Questions.
      *
      * @return JsonResponse
      */
-    public function getQuestions(): JsonResponse
-    {
-        if (UserSecurity::find(UserFacade::getUser()->uniqueId) == null) {
-            return response()->json('');
-        }
-
-        $userSecurity = UserSecurity::find(UserFacade::getUser()->uniqueId);
-
-        return response()->json([
-            new Question($userSecurity->firstQuestion,
-                "IDENTITY_SAFETYQUESTION_{$userSecurity->firstQuestion}"),
-            new Question($userSecurity->secondQuestion,
-                "IDENTITY_SAFETYQUESTION_{$userSecurity->secondQuestion}"),
-        ]);
-    }
-
-    /**
+     public function getQuestions(): JsonResponse
+     {
+         if (UserSecurity::find(UserFacade::getUser()->uniqueId) == null) {
+             return response()->json('');
+         }
+
+         $userSecurity = UserSecurity::find(UserFacade::getUser()->uniqueId);
+
+         return response()->json([
+             new Question($userSecurity->firstQuestion,
+                 "IDENTITY_SAFETYQUESTION_{$userSecurity->firstQuestion}"),
+             new Question($userSecurity->secondQuestion,
+                 "IDENTITY_SAFETYQUESTION_{$userSecurity->secondQuestion}"),
+         ]);
+     }
+
+     /**
      * Verify User Security Questions.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function verifyQuestions(Request $request): JsonResponse
-    {
-        $questions = UserSecurity::find(UserFacade::getUser()->uniqueId);
+     public function verifyQuestions(Request $request): JsonResponse
+     {
+         $questions = UserSecurity::find(UserFacade::getUser()->uniqueId);
 
-        if ($questions->firstAnswer == $request->json()->get('answer1') && $questions->secondAnswer == $request->json()->get('answer2')) {
-            if ($request->json()->get('trust') == true) {
-                (new TrustedDevice())->store(UserFacade::getUser()->uniqueId, $request->ip());
-            }
+         if ($questions->firstAnswer == $request->json()->get('answer1') && $questions->secondAnswer == $request->json()->get('answer2')) {
+             if ($request->json()->get('trust') == true) {
+                 (new TrustedDevice())->store(UserFacade::getUser()->uniqueId, $request->ip());
+             }
 
-            return response()->json(null, 204);
-        }
+             return response()->json(null, 204);
+         }
 
-        return response()->json(null, 409);
-    }
+         return response()->json(null, 409);
+     }
 
-    /**
+     /**
      * Confirm User Change Password.
      *
      * @param Request $request
      *
      * @return mixed
      */
-    public function confirmChangePassword(Request $request): JsonResponse
-    {
-        if (Mail::get($request->json()->get('token')) == null) {
-            return response()->json(null, 404);
-        }
+     public function confirmChangePassword(Request $request): JsonResponse
+     {
+         if (Mail::get($request->json()->get('token')) == null) {
+             return response()->json(null, 404);
+         }
 
-        ChocolateyId::find(Mail::get()->mail)->update(['password' => hash(Config::get('chocolatey.security.hash'), $request->json()->get('password'))]);
+         ChocolateyId::find(Mail::get()->mail)->update(['password' => hash(Config::get('chocolatey.security.hash'), $request->json()->get('password'))]);
 
-        return response()->json(null);
-    }
+         return response()->json(null);
+     }
 }