sant0ro / chocolatey

app/Providers/AppServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     public function register()
     {
         // Register Mailing Services
-        $this->app->singleton('mailer', function ($app) {
+        $this->app->singleton('mailer', function($app) {
             return $app->loadComponent('mail', 'Illuminate\Mail\MailServiceProvider', 'mailer');
         });
     }

app/Providers/SessionServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function register()
     {
-        $this->app->bind('chocosession', function () {
+        $this->app->bind('chocosession', function() {
             return Session::getInstance();
         });
 

app/Providers/NuxServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function register()
     {
-        $this->app->bind('choconux', function () {
+        $this->app->bind('choconux', function() {
             return Nux::getInstance();
         });
     }

app/Http/Middleware/Maintenance.php

Spacing +1 added lines, -2 removed lines

@@ -21,7 +21,6 @@
      */
     public function handle($request, Closure $next)
     {
-        return Config::get('maintenance.enforce') ? response()->json(['error' => 'maintenance'], 503) :
-            $next($request);
+        return Config::get('maintenance.enforce') ? response()->json(['error' => 'maintenance'], 503) : $next($request);
     }
 }

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/Models/Room.php

Spacing +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
      */
     public function getTagsAttribute(): array
     {
-        return array_filter(explode(';', $this->attributes['tags']), function ($element) {
+        return array_filter(explode(';', $this->attributes['tags']), function($element) {
             return !empty($element);
         });
     }

app/Providers/UserServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function register()
     {
-        $this->app->bind('chocouser', function () {
+        $this->app->bind('chocouser', function() {
             return User::getInstance();
         });
     }

app/Providers/MailServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function register()
     {
-        $this->app->bind('chocomail', function () {
+        $this->app->bind('chocomail', function() {
             return Mail::getInstance();
         });
     }

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/Models/User.php

Spacing +3 added lines, -3 removed lines

@@ -345,7 +345,7 @@ 
     {
         $accountCreated = $this->attributes['account_created'] ?? time();
 
-        return date('Y-m-d', $accountCreated).'T'.date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
+        return date('Y-m-d', $accountCreated) . 'T' . date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
     }
 
     /**
@@ -357,7 +357,7 @@ 
     {
         $accountCreated = $this->attributes['account_created'] ?? time();
 
-        return date('Y-m-d', $accountCreated).'T'.date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
+        return date('Y-m-d', $accountCreated) . 'T' . date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
     }
 
     /**
@@ -379,7 +379,7 @@ 
     {
         $lastLogin = $this->attributes['last_login'] ?? time();
 
-        return date('Y-m-d', $lastLogin).'T'.date('H:i:s.ZZZZ+ZZZZ', $lastLogin);
+        return date('Y-m-d', $lastLogin) . 'T' . date('H:i:s.ZZZZ+ZZZZ', $lastLogin);
     }
 
     /**