sant0ro / chocolatey

app/Http/Controllers/AccountSecurityController.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
      *
      * @param Request $request
      *
-     * @return mixed
+     * @return JsonResponse
      */
     public function confirmChangePassword(Request $request): JsonResponse
     {

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);
+     }
 }

app/Console/Kernel.php

Switch Indentation +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@
-<?php
+ <?php
 
-namespace App\Console;
+ namespace App\Console;
 
-use Laravel\Lumen\Console\Kernel as ConsoleKernel;
+ use Laravel\Lumen\Console\Kernel as ConsoleKernel;
 
-class Kernel extends ConsoleKernel
-{
+ class Kernel extends ConsoleKernel
+ {
 }

app/Http/Controllers/LanguageController.php

Switch Indentation +12 added lines, -12 removed lines

@@ -1,26 +1,26 @@
-<?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 LanguageController.
  */
-class LanguageController extends BaseController
-{
-    /**
+ class LanguageController extends BaseController
+ {
+     /**
      * Render Language View (jSON).
      *
      * @param $languageFile
      *
      * @return Response
      */
-    public function render($languageFile): Response
-    {
-        $languageName = strstr($languageFile, '.json', true);
+     public function render($languageFile): Response
+     {
+         $languageName = strstr($languageFile, '.json', true);
 
-        return response(view("habbo-web-l10n.{$languageName}"))->header('Content-Type', 'application/json');
-    }
+         return response(view("habbo-web-l10n.{$languageName}"))->header('Content-Type', 'application/json');
+     }
 }

app/Http/Controllers/ImagingController.php

Switch Indentation +34 added lines, -34 removed lines

@@ -1,21 +1,21 @@ 
-<?php
+ <?php
 
-namespace App\Http\Controllers;
+ namespace App\Http\Controllers;
 
-use App\Models\EmulatorSettings;
-use App\Models\User;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
-use Intervention\Image\Facades\Image;
-use Laravel\Lumen\Http\Redirector;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ use App\Models\EmulatorSettings;
+ use App\Models\User;
+ use Illuminate\Http\Request;
+ use Illuminate\Support\Facades\Config;
+ use Intervention\Image\Facades\Image;
+ use Laravel\Lumen\Http\Redirector;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class ImagingController.
  */
-class ImagingController extends BaseController
-{
-    /**
+ class ImagingController extends BaseController
+ {
+     /**
      * Get User Figure for Big Header
      * based on User Name or Figure.
      *
@@ -23,13 +23,13 @@ 
      *
      * @return Redirector
      */
-    public function getUserHead(Request $request)
-    {
-        return redirect(Config::get('chocolatey.imaging').'avatarimage?figure='.($request->has('figure') ? $request->input('figure') :
-                User::where('username', $request->input('user'))->first()->figureString).'&size=l&headonly=1');
-    }
+     public function getUserHead(Request $request)
+     {
+         return redirect(Config::get('chocolatey.imaging').'avatarimage?figure='.($request->has('figure') ? $request->input('figure') :
+                 User::where('username', $request->input('user'))->first()->figureString).'&size=l&headonly=1');
+     }
 
-    /**
+     /**
      * Get User Figure for Body
      * based on User Figure.
      *
@@ -37,36 +37,36 @@ 
      *
      * @return Redirector
      */
-    public function getUserBody(string $figure)
-    {
-        return redirect(Config::get('chocolatey.imaging')."avatar/{$figure}");
-    }
+     public function getUserBody(string $figure)
+     {
+         return redirect(Config::get('chocolatey.imaging')."avatar/{$figure}");
+     }
 
-    /**
+     /**
      * Get Youtube Thumbnail.
      *
      * @param Request $request
      *
      * @return string
      */
-    public function getYoutubeThumbnail(Request $request)
-    {
-        return Image::make($request->input('url'))->response('jpg');
-    }
+     public function getYoutubeThumbnail(Request $request)
+     {
+         return Image::make($request->input('url'))->response('jpg');
+     }
 
-    /**
+     /**
      * Return Group Badge.
      *
      * @param string $badgeCode
      *
      * @return mixed
      */
-    public function getGroupBadge(string $badgeCode)
-    {
-        $imagePath = EmulatorSettings::where('key', 'imager.location.output.badges')->first();
+     public function getGroupBadge(string $badgeCode)
+     {
+         $imagePath = EmulatorSettings::where('key', 'imager.location.output.badges')->first();
 
-        $badgeCode = str_replace('.gif', '', $badgeCode);
+         $badgeCode = str_replace('.gif', '', $badgeCode);
 
-        return Image::make("{$imagePath->value}/{$badgeCode}.png")->response('gif');
-    }
+         return Image::make("{$imagePath->value}/{$badgeCode}.png")->response('gif');
+     }
 }

app/Http/Middleware/Maintenance.php

Switch Indentation +13 added lines, -13 removed lines

@@ -1,17 +1,17 @@ 
-<?php
+ <?php
 
-namespace App\Http\Middleware;
+ namespace App\Http\Middleware;
 
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
+ use Closure;
+ use Illuminate\Http\Request;
+ use Illuminate\Support\Facades\Config;
 
 /**
  * Class Maintenance.
  */
-class Maintenance
-{
-    /**
+ class Maintenance
+ {
+     /**
      * Handle an incoming request.
      *
      * @param Request $request
@@ -19,9 +19,9 @@ 
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
-    {
-        return Config::get('maintenance.enforce') ? response()->json(['error' => 'maintenance'], 503) :
-            $next($request);
-    }
+     public function handle($request, Closure $next)
+     {
+         return Config::get('maintenance.enforce') ? response()->json(['error' => 'maintenance'], 503) :
+             $next($request);
+     }
 }

app/Http/Middleware/Authenticate.php

Switch Indentation +25 added lines, -25 removed lines

@@ -1,34 +1,34 @@ 
-<?php
+ <?php
 
-namespace App\Http\Middleware;
+ namespace App\Http\Middleware;
 
-use Closure;
-use Illuminate\Contracts\Auth\Factory as Auth;
-use Illuminate\Http\Request;
+ use Closure;
+ use Illuminate\Contracts\Auth\Factory as Auth;
+ use Illuminate\Http\Request;
 
 /**
  * Class Authenticate.
  */
-class Authenticate
-{
-    /**
+ class Authenticate
+ {
+     /**
      * The authentication guard factory instance.
      *
      * @var Auth
      */
-    protected $auth;
+     protected $auth;
 
-    /**
+     /**
      * Create a new middleware instance.
      *
      * @param Auth $auth
      */
-    public function __construct(Auth $auth)
-    {
-        $this->auth = $auth;
-    }
+     public function __construct(Auth $auth)
+     {
+         $this->auth = $auth;
+     }
 
-    /**
+     /**
      * Handle an incoming request.
      *
      * @param Request     $request
@@ -37,16 +37,16 @@ 
      *
      * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
-    {
-        if ($this->auth->guard($guard)->guest()) {
-            return response()->json(['message' => 'authentication-needed'], 401);
-        }
+     public function handle($request, Closure $next, $guard = null)
+     {
+         if ($this->auth->guard($guard)->guest()) {
+             return response()->json(['message' => 'authentication-needed'], 401);
+         }
 
-        if ($request->user()->isBanned == true) {
-            return response('Unauthorized.', 401);
-        }
+         if ($request->user()->isBanned == true) {
+             return response('Unauthorized.', 401);
+         }
 
-        return $next($request);
-    }
+         return $next($request);
+     }
 }

app/Http/Middleware/Cors.php

Switch Indentation +14 added lines, -14 removed lines

@@ -1,17 +1,17 @@ 
-<?php
+ <?php
 
-namespace App\Http\Middleware;
+ namespace App\Http\Middleware;
 
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
+ use Closure;
+ use Illuminate\Http\Request;
+ use Illuminate\Support\Facades\Config;
 
 /**
  * Class Cors.
  */
-class Cors
-{
-    /**
+ class Cors
+ {
+     /**
      * Handle an incoming request.
      *
      * @param Request $request
@@ -19,10 +19,10 @@ 
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
-    {
-        return $next($request)
-            ->header('Access-Control-Allow-Origin', implode(',', Config::get('chocolatey.cors')))
-            ->header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
-    }
+     public function handle($request, Closure $next)
+     {
+         return $next($request)
+             ->header('Access-Control-Allow-Origin', implode(',', Config::get('chocolatey.cors')))
+             ->header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
+     }
 }

app/Facades/User.php

Switch Indentation +10 added lines, -10 removed lines

@@ -1,21 +1,21 @@
-<?php
+ <?php
 
-namespace App\Facades;
+ namespace App\Facades;
 
-use Illuminate\Support\Facades\Facade;
+ use Illuminate\Support\Facades\Facade;
 
 /**
  * Class User.
  */
-class User extends Facade
-{
-    /**
+ class User extends Facade
+ {
+     /**
      * Get the registered name of the component.
      *
      * @return string
      */
-    protected static function getFacadeAccessor()
-    {
-        return 'chocouser';
-    }
+     protected static function getFacadeAccessor()
+     {
+         return 'chocouser';
+     }
 }

app/Facades/Mail.php

Switch Indentation +10 added lines, -10 removed lines

@@ -1,21 +1,21 @@
-<?php
+ <?php
 
-namespace App\Facades;
+ namespace App\Facades;
 
-use Illuminate\Support\Facades\Facade;
+ use Illuminate\Support\Facades\Facade;
 
 /**
  * Class Mail.
  */
-class Mail extends Facade
-{
-    /**
+ class Mail extends Facade
+ {
+     /**
      * Get the registered name of the component.
      *
      * @return string
      */
-    protected static function getFacadeAccessor()
-    {
-        return 'chocomail';
-    }
+     protected static function getFacadeAccessor()
+     {
+         return 'chocomail';
+     }
 }