sant0ro / chocolatey

app/Http/Controllers/ClientController.php

Switch Indentation +26 added lines, -26 removed lines

@@ -1,53 +1,53 @@
-<?php
+ <?php
 
-namespace App\Http\Controllers;
+ namespace App\Http\Controllers;
 
-use App\Facades\User;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Config;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ use App\Facades\User;
+ use Illuminate\Http\Request;
+ use Illuminate\Http\Response;
+ use Illuminate\Support\Facades\Config;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class ClientController.
  */
-class ClientController extends BaseController
-{
-    /**
+ class ClientController extends BaseController
+ {
+     /**
      * Returns the Client URL.
      *
      * @param Request $request
      *
      * @return Response
      */
-    public function getUrl(Request $request)
-    {
-        $hotelUrl = Config::get('chocolatey.hotelUrl');
+     public function getUrl(Request $request)
+     {
+         $hotelUrl = Config::get('chocolatey.hotelUrl');
 
-        return response()->json(['clienturl' => "{$hotelUrl}/client/habbo-client"], 200, [], JSON_UNESCAPED_SLASHES);
-    }
+         return response()->json(['clienturl' => "{$hotelUrl}/client/habbo-client"], 200, [], JSON_UNESCAPED_SLASHES);
+     }
 
-    /**
+     /**
      * Get Client View.
      *
      * @return Response
      */
-    public function showClient(): Response
-    {
-        User::updateSession(['auth_ticket' => ($userToken = uniqid('HabboWEB', true))]);
+     public function showClient(): Response
+     {
+         User::updateSession(['auth_ticket' => ($userToken = uniqid('HabboWEB', true))]);
 
-        return response(view('habbo-web-pages.habbo-client', ['token' => $userToken, 'newUser' => in_array('NEW_USER', User::getUser()->traits)]));
-    }
+         return response(view('habbo-web-pages.habbo-client', ['token' => $userToken, 'newUser' => in_array('NEW_USER', User::getUser()->traits)]));
+     }
 
-    /**
+     /**
      * Get HabboWEB Ads Interstitial.
      *
      * @param string $interstitialType
      *
      * @return Response
      */
-    public function getInterstitial(string $interstitialType): Response
-    {
-        return response(view('habbo-web-ads.interstitial'));
-    }
+     public function getInterstitial(string $interstitialType): Response
+     {
+         return response(view('habbo-web-ads.interstitial'));
+     }
 }

app/Http/Controllers/ArticleController.php

Switch Indentation +50 added lines, -50 removed lines

@@ -1,18 +1,18 @@ 
-<?php
+ <?php
 
-namespace App\Http\Controllers;
+ namespace App\Http\Controllers;
 
-use App\Models\Article;
-use App\Models\ArticleCategory;
-use Illuminate\Http\Response;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ use App\Models\Article;
+ use App\Models\ArticleCategory;
+ use Illuminate\Http\Response;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class ArticleController.
  */
-class ArticleController extends BaseController
-{
-    /**
+ class ArticleController extends BaseController
+ {
+     /**
      * Render a specific view of Article set.
      *
      * @param string $countryId
@@ -20,28 +20,28 @@ 
      *
      * @return Response
      */
-    public function many(string $countryId, string $articleCategory): Response
-    {
-        $category = ArticleCategory::find(strstr(($articleCategory =
-            str_replace('.html', '', $articleCategory)), '_', true));
+     public function many(string $countryId, string $articleCategory): Response
+     {
+         $category = ArticleCategory::find(strstr(($articleCategory =
+             str_replace('.html', '', $articleCategory)), '_', true));
 
-        $categoryPage = strstr(strrev($articleCategory), '_', true);
+         $categoryPage = strstr(strrev($articleCategory), '_', true);
 
-        return $articleCategory == 'front' ? $this->front() : $this->category($countryId, $category, $categoryPage,
-            $categoryPage == 1 ? 0 : (10 * ($categoryPage - 1)));
-    }
+         return $articleCategory == 'front' ? $this->front() : $this->category($countryId, $category, $categoryPage,
+             $categoryPage == 1 ? 0 : (10 * ($categoryPage - 1)));
+     }
 
-    /**
+     /**
      * Render the Front Page of the Articles Page.
      *
      * @return Response
      */
-    protected function front(): Response
-    {
-        return response(view('habbo-web-news.articles-front', ['set' => Article::orderBy('id', 'DESC')->limit(10)->get()]));
-    }
+     protected function front(): Response
+     {
+         return response(view('habbo-web-news.articles-front', ['set' => Article::orderBy('id', 'DESC')->limit(10)->get()]));
+     }
 
-    /**
+     /**
      * Render a specific Category Articles Page.
      *
      * @TODO: Proper Way to use Country ID
@@ -53,18 +53,18 @@ 
      *
      * @return Response
      */
-    protected function category(string $countryId, ArticleCategory $category, int $categoryPage, int $start): Response
-    {
-        $articles = Article::where('id', '>=', $start)->limit(10)->orderBy('id', 'DESC')->get()->filter(function ($item) use ($category) {
-            return $category->name == 'all' || in_array($category, $item->categories);
-        });
+     protected function category(string $countryId, ArticleCategory $category, int $categoryPage, int $start): Response
+     {
+         $articles = Article::where('id', '>=', $start)->limit(10)->orderBy('id', 'DESC')->get()->filter(function ($item) use ($category) {
+             return $category->name == 'all' || in_array($category, $item->categories);
+         });
 
-        return response(view('habbo-web-news.articles-category', [
-            'category' => $category, 'page' => $categoryPage, 'categories' => ArticleCategory::all(), 'articles' => $articles,
-        ]));
-    }
+         return response(view('habbo-web-news.articles-category', [
+             'category' => $category, 'page' => $categoryPage, 'categories' => ArticleCategory::all(), 'articles' => $articles,
+         ]));
+     }
 
-    /**
+     /**
      * Render a specific view of a specific Article.
      *
      * @TODO: Proper Way to use Country ID
@@ -74,28 +74,28 @@ 
      *
      * @return Response
      */
-    public function one(string $countryId, string $articleName): Response
-    {
-        if (($article = Article::find(strstr($articleName, '_', true))) == null) {
-            return response()->json(null, 404);
-        }
+     public function one(string $countryId, string $articleName): Response
+     {
+         if (($article = Article::find(strstr($articleName, '_', true))) == null) {
+             return response()->json(null, 404);
+         }
 
-        $related = ($latest = Article::all())->filter(function ($item) use ($article) {
-            return in_array($article->categories[0], $item->categories);
-        });
+         $related = ($latest = Article::all())->filter(function ($item) use ($article) {
+             return in_array($article->categories[0], $item->categories);
+         });
 
-        return response(view('habbo-web-news.articles-view',
-            ['article' => $article, 'latest' => $latest->slice(0, 5), 'related' => $related->slice(0, 5)]
-        ));
-    }
+         return response(view('habbo-web-news.articles-view',
+             ['article' => $article, 'latest' => $latest->slice(0, 5), 'related' => $related->slice(0, 5)]
+         ));
+     }
 
-    /**
+     /**
      * Get All Habbo Articles as XML/RSS.
      *
      * @return Response
      */
-    public function getRss()
-    {
-        return response(view('habbo-web-pages.habbo-rss', ['articles' => Article::limit(20)->get()]))->header('Content-Type', 'text/xml');
-    }
+     public function getRss()
+     {
+         return response(view('habbo-web-pages.habbo-rss', ['articles' => Article::limit(20)->get()]))->header('Content-Type', 'text/xml');
+     }
 }

app/Exceptions/Handler.php

Switch Indentation +31 added lines, -31 removed lines

@@ -1,33 +1,33 @@ 
-<?php
+ <?php
 
-namespace App\Exceptions;
+ namespace App\Exceptions;
 
-use Exception;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Validation\ValidationException;
-use Laravel\Lumen\Exceptions\Handler as ExceptionHandler;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+ use Exception;
+ use Illuminate\Auth\Access\AuthorizationException;
+ use Illuminate\Database\Eloquent\ModelNotFoundException;
+ use Illuminate\Validation\ValidationException;
+ use Laravel\Lumen\Exceptions\Handler as ExceptionHandler;
+ use Symfony\Component\HttpKernel\Exception\HttpException;
+ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class Handler.
  */
-class Handler extends ExceptionHandler
-{
-    /**
+ class Handler extends ExceptionHandler
+ {
+     /**
      * A list of the exception types that should not be reported.
      *
      * @var array
      */
-    protected $dontReport = [
-        AuthorizationException::class,
-        HttpException::class,
-        ModelNotFoundException::class,
-        ValidationException::class,
-    ];
+     protected $dontReport = [
+         AuthorizationException::class,
+         HttpException::class,
+         ModelNotFoundException::class,
+         ValidationException::class,
+     ];
 
-    /**
+     /**
      * Report or log an exception.
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
@@ -36,12 +36,12 @@ 
      *
      * @return void
      */
-    public function report(Exception $e)
-    {
-        parent::report($e);
-    }
+     public function report(Exception $e)
+     {
+         parent::report($e);
+     }
 
-    /**
+     /**
      * Render an exception into an HTTP response.
      *
      * @param \Illuminate\Http\Request $request
@@ -49,12 +49,12 @@ 
      *
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $e)
-    {
-        if ($e instanceof NotFoundHttpException) {
-            return response(view('habbo-web-pages.habbo-web'));
-        }
+     public function render($request, Exception $e)
+     {
+         if ($e instanceof NotFoundHttpException) {
+             return response(view('habbo-web-pages.habbo-web'));
+         }
 
-        return parent::render($request, $e);
-    }
+         return parent::render($request, $e);
+     }
 }

app/Http/Controllers/RoomsController.php

Switch Indentation +21 added lines, -21 removed lines

@@ -1,17 +1,17 @@ 
-<?php
+ <?php
 
-namespace App\Http\Controllers;
+ namespace App\Http\Controllers;
 
-use App\Models\Room;
-use Illuminate\Http\JsonResponse;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ use App\Models\Room;
+ use Illuminate\Http\JsonResponse;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class RoomsController.
  */
-class RoomsController extends BaseController
-{
-    /**
+ class RoomsController extends BaseController
+ {
+     /**
      * Get LeaderBoard Data.
      *
      * @TODO: Make Possible Filter with all the Possible Criteria
@@ -22,26 +22,26 @@ 
      *
      * @return JsonResponse
      */
-    public function getLeader($countryId, $roomRange, $roomInterval): JsonResponse
-    {
-        $leaderRank = 1;
+     public function getLeader($countryId, $roomRange, $roomInterval): JsonResponse
+     {
+         $leaderRank = 1;
 
-        foreach (($leaderBoard = Room::where('state', '!=', 'invisible')->orderBy('score', 'DESC')->orderBy('users', 'DESC')->limit(50)->get()) as $room) {
-            $room->leaderboardRank = $leaderRank++;
-        }
+         foreach (($leaderBoard = Room::where('state', '!=', 'invisible')->orderBy('score', 'DESC')->orderBy('users', 'DESC')->limit(50)->get()) as $room) {
+             $room->leaderboardRank = $leaderRank++;
+         }
 
-        return response()->json($leaderBoard, 200, [], JSON_UNESCAPED_SLASHES);
-    }
+         return response()->json($leaderBoard, 200, [], JSON_UNESCAPED_SLASHES);
+     }
 
-    /**
+     /**
      * Get a specific Room Data.
      *
      * @param int $roomId
      *
      * @return JsonResponse
      */
-    public function getRoom($roomId): JsonResponse
-    {
-        return response()->json(Room::find($roomId) ?? ['error' => 'not-found'], 200, [], JSON_UNESCAPED_SLASHES);
-    }
+     public function getRoom($roomId): JsonResponse
+     {
+         return response()->json(Room::find($roomId) ?? ['error' => 'not-found'], 200, [], JSON_UNESCAPED_SLASHES);
+     }
 }

app/Helpers/Session.php

Switch Indentation +42 added lines, -42 removed lines

@@ -1,41 +1,41 @@ 
-<?php
+ <?php
 
-namespace App\Helpers;
+ namespace App\Helpers;
 
-use App\Singleton;
+ use App\Singleton;
 
 /**
  * Class Session.
  */
-final class Session extends Singleton
-{
-    /**
+ final class Session extends Singleton
+ {
+     /**
      * Rename the Session ID.
      *
      * @param string $name
      */
-    public function rename($name)
-    {
-        session_name($name);
-    }
+     public function rename($name)
+     {
+         session_name($name);
+     }
 
-    /**
+     /**
      * Start Session Handler.
      */
-    public function start()
-    {
-        @session_start();
-    }
+     public function start()
+     {
+         @session_start();
+     }
 
-    /**
+     /**
      * Stop Session Handler.
      */
-    public function destroy()
-    {
-        @session_destroy();
-    }
+     public function destroy()
+     {
+         @session_destroy();
+     }
 
-    /**
+     /**
      * Store a Variable in the Session.
      *
      * @param string $key
@@ -43,46 +43,46 @@ 
      *
      * @return mixed
      */
-    public function set($key, $value)
-    {
-        $_SESSION[$key] = $value;
+     public function set($key, $value)
+     {
+         $_SESSION[$key] = $value;
 
-        return $value;
-    }
+         return $value;
+     }
 
-    /**
+     /**
      * Get a Attribute Value from Session.
      *
      * @param string $key
      *
      * @return mixed
      */
-    public function get($key)
-    {
-        return $this->has($key) ? $_SESSION[$key] : null;
-    }
+     public function get($key)
+     {
+         return $this->has($key) ? $_SESSION[$key] : null;
+     }
 
-    /**
+     /**
      * Check if a Key exists in the Session.
      *
      * @param mixed $key
      *
      * @return bool
      */
-    public function has($key)
-    {
-        return array_key_exists($key, $_SESSION);
-    }
+     public function has($key)
+     {
+         return array_key_exists($key, $_SESSION);
+     }
 
-    /**
+     /**
      * Erase a Attribute from Session.
      *
      * @param string $key
      */
-    public function erase($key)
-    {
-        $_SESSION[$key] = null;
+     public function erase($key)
+     {
+         $_SESSION[$key] = null;
 
-        unset($_SESSION[$key]);
-    }
+         unset($_SESSION[$key]);
+     }
 }

app/Http/Controllers/LoginController.php

Switch Indentation +69 added lines, -69 removed lines

@@ -1,68 +1,68 @@ 
-<?php
+ <?php
 
-namespace App\Http\Controllers;
+ namespace App\Http\Controllers;
 
-use App\Facades\User as UserFacade;
-use App\Models\ChocolateyId;
-use App\Models\User;
-use Facebook\Facebook;
-use Facebook\GraphNodes\GraphUser;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ use App\Facades\User as UserFacade;
+ use App\Models\ChocolateyId;
+ use App\Models\User;
+ use Facebook\Facebook;
+ use Facebook\GraphNodes\GraphUser;
+ use Illuminate\Http\JsonResponse;
+ use Illuminate\Http\Request;
+ use Illuminate\Support\Facades\Config;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class LoginController.
  */
-class LoginController extends BaseController
-{
-    /**
+ class LoginController extends BaseController
+ {
+     /**
      * Handles the Response of the Login Attempt.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function login(Request $request): JsonResponse
-    {
-        if (UserFacade::loginUser($request) !== null) {
-            if (UserFacade::getUser()->isBanned) {
-                return $this->sendBanMessage($request);
-            }
+     public function login(Request $request): JsonResponse
+     {
+         if (UserFacade::loginUser($request) !== null) {
+             if (UserFacade::getUser()->isBanned) {
+                 return $this->sendBanMessage($request);
+             }
 
-            return response()->json(UserFacade::updateSession(['last_login' => time(), 'ip_current' => $request->ip()]));
-        }
+             return response()->json(UserFacade::updateSession(['last_login' => time(), 'ip_current' => $request->ip()]));
+         }
 
-        //return response()->json(['message' => 'login.staff_login_not_allowed', 'captcha' => false], 401); // Example for Non Allowance of Staffs
-        return response()->json(['message' => 'login.invalid_password', 'captcha' => false], 401);
-    }
+         //return response()->json(['message' => 'login.staff_login_not_allowed', 'captcha' => false], 401); // Example for Non Allowance of Staffs
+         return response()->json(['message' => 'login.invalid_password', 'captcha' => false], 401);
+     }
 
-    /**
+     /**
      * Return the Ban Message.
      *
      * @return JsonResponse
      */
-    protected function sendBanMessage(): JsonResponse
-    {
-        return response()->json(['message' => 'login.user_banned',
-            'expiryTime'                   => UserFacade::getUser()->banDetails->ban_expire,
-            'reason'                       => UserFacade::getUser()->banDetails->ban_reason, ], 401);
-    }
-
-    /**
+     protected function sendBanMessage(): JsonResponse
+     {
+         return response()->json(['message' => 'login.user_banned',
+             'expiryTime'                   => UserFacade::getUser()->banDetails->ban_expire,
+             'reason'                       => UserFacade::getUser()->banDetails->ban_reason, ], 401);
+     }
+
+     /**
      * Destroys the User Session.
      *
      * @return JsonResponse
      */
-    public function logout(): JsonResponse
-    {
-        UserFacade::eraseSession();
+     public function logout(): JsonResponse
+     {
+         UserFacade::eraseSession();
 
-        return response()->json(null);
-    }
+         return response()->json(null);
+     }
 
-    /**
+     /**
      * Register an User on the Database
      * and do the Login of the User.
      *
@@ -70,58 +70,58 @@ 
      *
      * @return JsonResponse
      */
-    public function register(Request $request): JsonResponse
-    {
-        if (ChocolateyId::where('mail', $request->json()->get('email'))->count() > 0) {
-            return response()->json(['error' => 'registration_email_in_use'], 409);
-        }
+     public function register(Request $request): JsonResponse
+     {
+         if (ChocolateyId::where('mail', $request->json()->get('email'))->count() > 0) {
+             return response()->json(['error' => 'registration_email_in_use'], 409);
+         }
 
-        $dateOfBirth = strtotime("{$request->json()->get('birthdate')['day']}/{$request->json()->get('birthdate')['month']}/{$request->json()->get('birthdate')['year']}");
+         $dateOfBirth = strtotime("{$request->json()->get('birthdate')['day']}/{$request->json()->get('birthdate')['month']}/{$request->json()->get('birthdate')['year']}");
 
-        (new AccountController())->createUser($request, $request->json()->all(), true);
+         (new AccountController())->createUser($request, $request->json()->all(), true);
 
-        (new ChocolateyId())->store($request->json()->get('email'), $request->json()->get('password'));
+         (new ChocolateyId())->store($request->json()->get('email'), $request->json()->get('password'));
 
-        UserFacade::updateSession(['last_login' => time(), 'ip_register' => $request->ip(), 'ip_current' => $request->ip(), 'account_day_of_birth' => $dateOfBirth]);
+         UserFacade::updateSession(['last_login' => time(), 'ip_register' => $request->ip(), 'ip_current' => $request->ip(), 'account_day_of_birth' => $dateOfBirth]);
 
-        return response()->json(UserFacade::getUser());
-    }
+         return response()->json(UserFacade::getUser());
+     }
 
-    /**
+     /**
      * Create or Login a Facebook User.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function facebook(Request $request): JsonResponse
-    {
-        $fbUser = $this->fbAuth($request);
+     public function facebook(Request $request): JsonResponse
+     {
+         $fbUser = $this->fbAuth($request);
 
-        if (User::query()->where('real_name', $fbUser->getId())->count() > 0) {
-            return response()->json(UserFacade::setSession(User::where('real_name', $fbUser->getId())->first()));
-        }
+         if (User::query()->where('real_name', $fbUser->getId())->count() > 0) {
+             return response()->json(UserFacade::setSession(User::where('real_name', $fbUser->getId())->first()));
+         }
 
-        (new AccountController())->createUser($request, ['email' => $fbUser->getEmail()], true);
+         (new AccountController())->createUser($request, ['email' => $fbUser->getEmail()], true);
 
-        UserFacade::updateSession(['last_login' => time(), 'ip_register' => $request->ip(), 'ip_current' => $request->ip(), 'real_name' => $fbUser->getId()]);
+         UserFacade::updateSession(['last_login' => time(), 'ip_register' => $request->ip(), 'ip_current' => $request->ip(), 'real_name' => $fbUser->getId()]);
 
-        return response()->json(UserFacade::getUser());
-    }
+         return response()->json(UserFacade::getUser());
+     }
 
-    /**
+     /**
      * Do Facebook Authentication.
      *
      * @param Request $request
      *
      * @return GraphUser
      */
-    protected function fbAuth(Request $request): GraphUser
-    {
-        $facebook = new Facebook(['app_id' => Config::get('chocolatey.facebook.app.key'), 'app_secret' => Config::get('chocolatey.facebook.app.secret')]);
+     protected function fbAuth(Request $request): GraphUser
+     {
+         $facebook = new Facebook(['app_id' => Config::get('chocolatey.facebook.app.key'), 'app_secret' => Config::get('chocolatey.facebook.app.secret')]);
 
-        $facebook->setDefaultAccessToken($request->json()->get('accessToken'));
+         $facebook->setDefaultAccessToken($request->json()->get('accessToken'));
 
-        return $facebook->get('/me?fields=id,name,email')->getGraphUser();
-    }
+         return $facebook->get('/me?fields=id,name,email')->getGraphUser();
+     }
 }

app/Helpers/User.php

Switch Indentation +80 added lines, -80 removed lines

@@ -1,44 +1,44 @@ 
-<?php
+ <?php
 
-namespace App\Helpers;
+ namespace App\Helpers;
 
-use App\Facades\Session;
-use App\Models\ChocolateyId;
-use App\Models\User as UserModel;
-use App\Singleton;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
+ use App\Facades\Session;
+ use App\Models\ChocolateyId;
+ use App\Models\User as UserModel;
+ use App\Singleton;
+ use Illuminate\Http\Request;
+ use Illuminate\Support\Facades\Config;
 
 /**
  * Class User.
  */
-final class User extends Singleton
-{
-    /**
+ final class User extends Singleton
+ {
+     /**
      * Update User Data without overwriting Session.
      *
      * @param array $parameters
      *
      * @return UserModel
      */
-    public function updateSession(array $parameters)
-    {
-        return $this->setSession($this->updateUser($this->getUser(), $parameters));
-    }
+     public function updateSession(array $parameters)
+     {
+         return $this->setSession($this->updateUser($this->getUser(), $parameters));
+     }
 
-    /**
+     /**
      * Set User Data on Session.
      *
      * @param UserModel $user
      *
      * @return UserModel
      */
-    public function setSession(UserModel $user)
-    {
-        return Session::set(Config::get('chocolatey.security.session'), $user);
-    }
+     public function setSession(UserModel $user)
+     {
+         return Session::set(Config::get('chocolatey.security.session'), $user);
+     }
 
-    /**
+     /**
      * Update User Data by User Model.
      *
      * @param UserModel $user
@@ -46,25 +46,25 @@ 
      *
      * @return UserModel
      */
-    public function updateUser($user, array $parameters)
-    {
-        $user->update($parameters);
+     public function updateUser($user, array $parameters)
+     {
+         $user->update($parameters);
 
-        return $user;
-    }
+         return $user;
+     }
 
-    /**
+     /**
      * Get User Data from Session
      * If User Session doesn't exists, return null.
      *
      * @return UserModel|null
      */
-    public function getUser()
-    {
-        return Session::get(Config::get('chocolatey.security.session')) ?? null;
-    }
+     public function getUser()
+     {
+         return Session::get(Config::get('chocolatey.security.session')) ?? null;
+     }
 
-    /**
+     /**
      * Retrieve Non Banned Users (If all Users are Banned, return the Banned user Also).
      *
      * @param Request      $request
@@ -72,20 +72,20 @@ 
      *
      * @return UserModel
      */
-    private function checkForBanAlternative(Request $request, ChocolateyId $chocolateyId)
-    {
-        $temporaryUsers = UserModel::where('mail', $request->json()->get('email'))->get();
+     private function checkForBanAlternative(Request $request, ChocolateyId $chocolateyId)
+     {
+         $temporaryUsers = UserModel::where('mail', $request->json()->get('email'))->get();
 
-        foreach ($temporaryUsers as $forUser) {
-            if (!$forUser->isBanned) {
-                return $forUser;
-            }
-        }
+         foreach ($temporaryUsers as $forUser) {
+             if (!$forUser->isBanned) {
+                 return $forUser;
+             }
+         }
 
-        return $temporaryUsers->get(0);
-    }
+         return $temporaryUsers->get(0);
+     }
 
-    /**
+     /**
      * Get Users.
      *
      * @param Request      $request
@@ -93,65 +93,65 @@ 
      *
      * @return UserModel
      */
-    private function retrieveUser(Request $request, ChocolateyId $chocolateyId)
-    {
-        if ($chocolateyId->last_logged_id != 0) {
-            $temporaryUser = UserModel::find($chocolateyId->last_logged_id);
+     private function retrieveUser(Request $request, ChocolateyId $chocolateyId)
+     {
+         if ($chocolateyId->last_logged_id != 0) {
+             $temporaryUser = UserModel::find($chocolateyId->last_logged_id);
 
-            if ($temporaryUser->isBanned) {
-                return $this->checkForBanAlternative($request, $chocolateyId);
-            }
+             if ($temporaryUser->isBanned) {
+                 return $this->checkForBanAlternative($request, $chocolateyId);
+             }
 
-            return $temporaryUser;
-        }
+             return $temporaryUser;
+         }
 
-        $temporaryUser = UserModel::where('mail', $request->json()->get('email'))->first();
+         $temporaryUser = UserModel::where('mail', $request->json()->get('email'))->first();
 
-        if ($temporaryUser->isBanned) {
-            return $this->checkForBanAlternative($request, $chocolateyId);
-        }
+         if ($temporaryUser->isBanned) {
+             return $this->checkForBanAlternative($request, $chocolateyId);
+         }
 
-        return $temporaryUser;
-    }
+         return $temporaryUser;
+     }
 
-    /**
+     /**
      * Set Session From Login Credentials.
      *
      * @param Request $request
      *
      * @return UserModel
      */
-    public function loginUser(Request $request)
-    {
-        $chocolateyId = ChocolateyId::find($request->json()->get('email'));
+     public function loginUser(Request $request)
+     {
+         $chocolateyId = ChocolateyId::find($request->json()->get('email'));
 
-        if ($chocolateyId == null) {
-            return;
-        }
+         if ($chocolateyId == null) {
+             return;
+         }
 
-        $user = $this->retrieveUser($request, $chocolateyId);
+         $user = $this->retrieveUser($request, $chocolateyId);
 
-        $chocolateyId->last_logged_id = $user->uniqueId;
+         $chocolateyId->last_logged_id = $user->uniqueId;
 
-        return $chocolateyId->password == hash(Config::get('chocolatey.security.hash'), $request->json()->get('password'))
-            ? $this->setSession($user) : null;
-    }
+         return $chocolateyId->password == hash(Config::get('chocolatey.security.hash'), $request->json()->get('password'))
+             ? $this->setSession($user) : null;
+     }
 
-    /**
+     /**
      * Return if USer Session Exists.
      *
      * @return bool
      */
-    public function hasSession()
-    {
-        return (bool) Session::get(Config::get('chocolatey.security.session'));
-    }
+     public function hasSession()
+     {
+         return (bool) Session::get(Config::get('chocolatey.security.session'));
+     }
 
-    /**
+     /**
      * Erase User Session.
      */
-    public function eraseSession()
-    {
-        Session::erase(Config::get('chocolatey.security.session'));
-    }
+     public function eraseSession()
+     {
+         Session::erase(Config::get('chocolatey.security.session'));
+     }
 }

app/Http/Controllers/AccountController.php

Switch Indentation +113 added lines, -113 removed lines

@@ -1,41 +1,41 @@ 
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Facades\Mail;
-use App\Facades\User as UserFacade;
-use App\Facades\Validation;
-use App\Models\ChocolateyId;
-use App\Models\User;
-use App\Models\UserPreferences;
-use App\Models\UserSettings;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Config;
-use Laravel\Lumen\Routing\Controller as BaseController;
-use Nubs\RandomNameGenerator\Alliteration;
+ <?php
+
+ namespace App\Http\Controllers;
+
+ use App\Facades\Mail;
+ use App\Facades\User as UserFacade;
+ use App\Facades\Validation;
+ use App\Models\ChocolateyId;
+ use App\Models\User;
+ use App\Models\UserPreferences;
+ use App\Models\UserSettings;
+ use Illuminate\Http\JsonResponse;
+ use Illuminate\Http\Request;
+ use Illuminate\Http\Response;
+ use Illuminate\Support\Facades\Config;
+ use Laravel\Lumen\Routing\Controller as BaseController;
+ use Nubs\RandomNameGenerator\Alliteration;
 
 /**
  * Class AccountController.
  */
-class AccountController extends BaseController
-{
-    /**
+ class AccountController extends BaseController
+ {
+     /**
      * Save User Look.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function saveLook(Request $request): JsonResponse
-    {
-        UserFacade::updateSession(['look' => $request->json()->get('figure'), 'gender' => $request->json()->get('gender')]);
+     public function saveLook(Request $request): JsonResponse
+     {
+         UserFacade::updateSession(['look' => $request->json()->get('figure'), 'gender' => $request->json()->get('gender')]);
 
-        return response()->json(UserFacade::getUser());
-    }
+         return response()->json(UserFacade::getUser());
+     }
 
-    /**
+     /**
      * Get User Non Read Messenger Discussions.
      *
      * @TODO: Code Integration with HabboMessenger
@@ -43,59 +43,59 @@ 
      *
      * @return JsonResponse
      */
-    public function getDiscussions(): JsonResponse
-    {
-        return response()->json([]);
-    }
+     public function getDiscussions(): JsonResponse
+     {
+         return response()->json([]);
+     }
 
-    /**
+     /**
      * Get User Preferences.
      *
      * @return JsonResponse
      */
-    public function getPreferences(): JsonResponse
-    {
-        $userPreferences = UserPreferences::firstOrCreate(['user_id' => UserFacade::getUser()->uniqueId]);
+     public function getPreferences(): JsonResponse
+     {
+         $userPreferences = UserPreferences::firstOrCreate(['user_id' => UserFacade::getUser()->uniqueId]);
 
-        foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) {
-            $userPreferences->{$attributeName} = $attributeValue == 1;
-        }
+         foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) {
+             $userPreferences->{$attributeName} = $attributeValue == 1;
+         }
 
-        return response()->json($userPreferences);
-    }
+         return response()->json($userPreferences);
+     }
 
-    /**
+     /**
      * Save New User Preferences.
      *
      * @param Request $request
      *
      * @return Response
      */
-    public function savePreferences(Request $request): Response
-    {
-        UserSettings::updateOrCreate(['user_id' => UserFacade::getUser()->uniqueId], [
-            'block_following'      => $request->json()->get('friendCanFollow') == false ? '1' : '0',
-            'block_friendrequests' => $request->json()->get('friendRequestEnabled') == false ? '1' : '0',
-        ]);
+     public function savePreferences(Request $request): Response
+     {
+         UserSettings::updateOrCreate(['user_id' => UserFacade::getUser()->uniqueId], [
+             'block_following'      => $request->json()->get('friendCanFollow') == false ? '1' : '0',
+             'block_friendrequests' => $request->json()->get('friendRequestEnabled') == false ? '1' : '0',
+         ]);
 
-        foreach ((array) $request->json()->all() as $setting => $value) {
-            UserPreferences::find(UserFacade::getUser()->uniqueId)->update([$setting => $value == true ? '1' : '0']);
-        }
+         foreach ((array) $request->json()->all() as $setting => $value) {
+             UserPreferences::find(UserFacade::getUser()->uniqueId)->update([$setting => $value == true ? '1' : '0']);
+         }
 
-        return response(null);
-    }
+         return response(null);
+     }
 
-    /**
+     /**
      * Get All E-Mail Accounts.
      *
      * @return JsonResponse
      */
-    public function getAvatars(): JsonResponse
-    {
-        return response()->json(UserFacade::getUser()->getChocolateyId()->relatedAccounts);
-    }
+     public function getAvatars(): JsonResponse
+     {
+         return response()->json(UserFacade::getUser()->getChocolateyId()->relatedAccounts);
+     }
 
-    /**
+     /**
      * Check if an Username is available
      * for a new Avatar Account.
      *
@@ -103,33 +103,33 @@ 
      *
      * @return JsonResponse
      */
-    public function checkName(Request $request): JsonResponse
-    {
-        return response()->json(['isAvailable' => (User::where('username', $request->input('name'))->count() == 0
-            && Validation::filterUserName($request->input('name')) && !UserFacade::getUser()->isStaff)]);
-    }
+     public function checkName(Request $request): JsonResponse
+     {
+         return response()->json(['isAvailable' => (User::where('username', $request->input('name'))->count() == 0
+             && Validation::filterUserName($request->input('name')) && !UserFacade::getUser()->isStaff)]);
+     }
 
-    /**
+     /**
      * Create a New User Avatar.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function createAvatar(Request $request): JsonResponse
-    {
-        if (User::where('username', $request->json()->get('name'))->count() == 0 && Validation::filterUserName($request->json()->get('name'))) {
-            $user = $this->createUser($request, ['username' => $request->json()->get('name'), 'email' => UserFacade::getUser()->email]);
+     public function createAvatar(Request $request): JsonResponse
+     {
+         if (User::where('username', $request->json()->get('name'))->count() == 0 && Validation::filterUserName($request->json()->get('name'))) {
+             $user = $this->createUser($request, ['username' => $request->json()->get('name'), 'email' => UserFacade::getUser()->email]);
 
-            ChocolateyId::find(UserFacade::getUser()->email)->update(['last_logged_id' => $user->uniqueId]);
+             ChocolateyId::find(UserFacade::getUser()->email)->update(['last_logged_id' => $user->uniqueId]);
 
-            return response()->json('');
-        }
+             return response()->json('');
+         }
 
-        return response()->json('');
-    }
+         return response()->json('');
+     }
 
-    /**
+     /**
      * Create a New User.
      *
      * @param Request $request
@@ -138,18 +138,18 @@ 
      *
      * @return User
      */
-    public function createUser(Request $request, array $userInfo, bool $newUser = false): User
-    {
-        $userName = $newUser ? $this->uniqueName($userInfo['email']) : $userInfo['username'];
+     public function createUser(Request $request, array $userInfo, bool $newUser = false): User
+     {
+         $userName = $newUser ? $this->uniqueName($userInfo['email']) : $userInfo['username'];
 
-        $token = Mail::store($userInfo['email'], 'public/registration/activate');
+         $token = Mail::store($userInfo['email'], 'public/registration/activate');
 
-        Mail::send(['email' => $userInfo['email'], 'name' => $userName, 'url' => "/activate/{$token}", 'subject' => 'Welcome to '.Config::get('chocolatey.hotelName')]);
+         Mail::send(['email' => $userInfo['email'], 'name' => $userName, 'url' => "/activate/{$token}", 'subject' => 'Welcome to '.Config::get('chocolatey.hotelName')]);
 
-        return UserFacade::setSession((new User())->store($userName, $userInfo['email'], $request->ip(), $newUser));
-    }
+         return UserFacade::setSession((new User())->store($userName, $userInfo['email'], $request->ip(), $newUser));
+     }
 
-    /**
+     /**
      * Create Random Unique Username.
      *
      * @WARNING: Doesn't create Like Habbo Way
@@ -158,62 +158,62 @@ 
      *
      * @return string
      */
-    protected function uniqueName(string $userMail): string
-    {
-        $partialName = explode(' ', (new Alliteration())->getName());
+     protected function uniqueName(string $userMail): string
+     {
+         $partialName = explode(' ', (new Alliteration())->getName());
 
-        return strtolower($partialName[0].strstr($userMail, '@', true).$partialName[1]);
-    }
+         return strtolower($partialName[0].strstr($userMail, '@', true).$partialName[1]);
+     }
 
-    /**
+     /**
      * Change Logged In User.
      *
      * @param Request $request
      */
-    public function selectAvatar(Request $request)
-    {
-        UserFacade::getUser()->getChocolateyId()->update(['last_logged_id' => $request->json()->get('uniqueId')]);
+     public function selectAvatar(Request $request)
+     {
+         UserFacade::getUser()->getChocolateyId()->update(['last_logged_id' => $request->json()->get('uniqueId')]);
 
-        UserFacade::setSession(User::find($request->json()->get('uniqueId')));
-    }
+         UserFacade::setSession(User::find($request->json()->get('uniqueId')));
+     }
 
-    /**
+     /**
      * Send User Forgot E-Mail.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function forgotPassword(Request $request): JsonResponse
-    {
-        if (($user = User::where('mail', $request->json()->get('email'))->first()) == null) {
-            return response()->json(['email' => $request->json()->get('email')]);
-        }
+     public function forgotPassword(Request $request): JsonResponse
+     {
+         if (($user = User::where('mail', $request->json()->get('email'))->first()) == null) {
+             return response()->json(['email' => $request->json()->get('email')]);
+         }
 
-        $token = Mail::store($user->email, 'public/forgotPassword');
+         $token = Mail::store($user->email, 'public/forgotPassword');
 
-        Mail::send(['name' => $user->name, 'email' => $user->email, 'subject' => 'Password reset confirmation',
-            'url'          => "/reset-password/{$token}",
-        ], 'habbo-web-mail.password-reset');
+         Mail::send(['name' => $user->name, 'email' => $user->email, 'subject' => 'Password reset confirmation',
+             'url'          => "/reset-password/{$token}",
+         ], 'habbo-web-mail.password-reset');
 
-        return response()->json(['email' => $user->email]);
-    }
+         return response()->json(['email' => $user->email]);
+     }
 
-    /**
+     /**
      * Send an Account Confirmation E-Mail.
      *
      * @param Request $request
      *
      * @return Response
      */
-    public function verifyAccount(Request $request): Response
-    {
-        $token = Mail::store(UserFacade::getUser()->email, 'public/registration/activate');
+     public function verifyAccount(Request $request): Response
+     {
+         $token = Mail::store(UserFacade::getUser()->email, 'public/registration/activate');
 
-        Mail::send(['name' => UserFacade::getUser()->name, 'email' => $request->user()->email,
-            'url'          => "/activate/{$token}", 'subject' => 'Welcome to '.Config::get('chocolatey.hotelName'),
-        ]);
+         Mail::send(['name' => UserFacade::getUser()->name, 'email' => $request->user()->email,
+             'url'          => "/activate/{$token}", 'subject' => 'Welcome to '.Config::get('chocolatey.hotelName'),
+         ]);
 
-        return response(null);
-    }
+         return response(null);
+     }
 }

app/Helpers/Mail.php

Switch Indentation +56 added lines, -56 removed lines

@@ -1,41 +1,41 @@ 
-<?php
+ <?php
 
-namespace App\Helpers;
+ namespace App\Helpers;
 
-use App\Models\Mail as MailModel;
-use App\Singleton;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Mail as MailFacade;
+ use App\Models\Mail as MailModel;
+ use App\Singleton;
+ use Illuminate\Support\Facades\Config;
+ use Illuminate\Support\Facades\Mail as MailFacade;
 
 /**
  * Class Mail.
  */
-final class Mail extends Singleton
-{
-    /**
+ final class Mail extends Singleton
+ {
+     /**
      * Stored Mail Model.
      *
      * @var MailModel
      */
-    protected $mailModel;
+     protected $mailModel;
 
-    /**
+     /**
      * Send an Email.
      *
      * @param array  $configuration
      * @param string $view
      */
-    public function send(array $configuration, string $view = 'habbo-web-mail.confirm-mail')
-    {
-        if (Config::get('mail.enable')) {
-            MailFacade::send($view, $configuration, function ($message) use ($configuration) {
-                $message->from(Config::get('mail.from.address'), Config::get('mail.from.name'));
-                $message->to($configuration['email'])->subject($configuration['subject']);
-            });
-        }
-    }
+     public function send(array $configuration, string $view = 'habbo-web-mail.confirm-mail')
+     {
+         if (Config::get('mail.enable')) {
+             MailFacade::send($view, $configuration, function ($message) use ($configuration) {
+                 $message->from(Config::get('mail.from.address'), Config::get('mail.from.name'));
+                 $message->to($configuration['email'])->subject($configuration['subject']);
+             });
+         }
+     }
 
-    /**
+     /**
      * Store an E-mail.
      *
      * @param string $email
@@ -43,72 +43,72 @@ 
      *
      * @return string
      */
-    public function store(string $email, string $url): string
-    {
-        (new MailModel())->store($token = uniqid('HabboMail', true), $url, $email);
+     public function store(string $email, string $url): string
+     {
+         (new MailModel())->store($token = uniqid('HabboMail', true), $url, $email);
 
-        return $token;
-    }
+         return $token;
+     }
 
-    /**
+     /**
      * Return if Exists E-Mail with that Token.
      *
      * @param string $token
      *
      * @return bool
      */
-    public function has(string $token)
-    {
-        return $this->get($token) !== null;
-    }
+     public function has(string $token)
+     {
+         return $this->get($token) !== null;
+     }
 
-    /**
+     /**
      * Get an E-mail by Token.
      *
      * @param string $token
      *
      * @return MailModel
      */
-    public function get(string $token = '')
-    {
-        if ($this->mailModel == null && !empty($token)) {
-            $mailModel = MailModel::where('token', $token)->where('used', '0')->first();
+     public function get(string $token = '')
+     {
+         if ($this->mailModel == null && !empty($token)) {
+             $mailModel = MailModel::where('token', $token)->where('used', '0')->first();
 
-            if ($mailModel !== null) {
-                if (strtotime($mailModel->created_at) + (Config::get('mail.expire') * 24 * 60 * 60) >= time()) {
-                    $this->set($mailModel);
+             if ($mailModel !== null) {
+                 if (strtotime($mailModel->created_at) + (Config::get('mail.expire') * 24 * 60 * 60) >= time()) {
+                     $this->set($mailModel);
 
-                    $this->update(['used' => '1']);
-                }
-            }
-        }
+                     $this->update(['used' => '1']);
+                 }
+             }
+         }
 
-        return $this->mailModel;
-    }
+         return $this->mailModel;
+     }
 
-    /**
+     /**
      * Set Mail Model in Cache.
      *
      * @param MailModel $model
      *
      * @return MailModel
      */
-    public function set(MailModel $model)
-    {
-        return $this->mailModel = $model;
-    }
+     public function set(MailModel $model)
+     {
+         return $this->mailModel = $model;
+     }
 
-    /**
+     /**
      * Update Mail Model Data.
      *
      * @param array $parameters
      *
      * @return MailModel
      */
-    public function update(array $parameters)
-    {
-        $this->mailModel->update($parameters);
+     public function update(array $parameters)
+     {
+         $this->mailModel->update($parameters);
 
-        return $this->mailModel;
-    }
+         return $this->mailModel;
+     }
 }