sant0ro / chocolatey

app/Helpers/User.php

Spacing +6 added lines, -6 removed lines

@@ -75,8 +75,8 @@ 
     private function checkForBanAlternative(Request $request, ChocolateyId $chocolateyId) {
         $temporaryUsers = UserModel::where('mail', $request->json()->get('email'))->get();
                 
-        foreach($temporaryUsers as $forUser) {
-            if(!$forUser->isBanned()) {
+        foreach ($temporaryUsers as $forUser) {
+            if (!$forUser->isBanned()) {
                 return $forUser;
             }
         }
@@ -93,10 +93,10 @@ 
      * @return UserModel
      */
     private function retrieveUser(Request $request, ChocolateyId $chocolateyId) {
-        if($chocolateyId->last_logged_id != 0) {
+        if ($chocolateyId->last_logged_id != 0) {
             $temporaryUser = UserModel::find($chocolateyId->last_logged_id);
             
-            if($temporaryUser->isBanned()) {
+            if ($temporaryUser->isBanned()) {
                 return $this->checkForBanAlternative($request, $chocolateyId);
             }
             
@@ -105,7 +105,7 @@ 
         
         $temporaryUser = UserModel::where('mail', $request->json()->get('email'))->first();
         
-        if($temporaryUser->isBanned()) {
+        if ($temporaryUser->isBanned()) {
             return $this->checkForBanAlternative($request, $chocolateyId);
         }
         
@@ -142,7 +142,7 @@ 
      */
     public function hasSession()
     {
-        return (bool) Session::get(Config::get('chocolatey.security.session'));
+        return (bool)Session::get(Config::get('chocolatey.security.session'));
     }
 
     /**

Switch Indentation +78 added lines, -78 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,19 +72,19 @@ 
      *
      * @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
@@ -92,64 +92,64 @@ 
      *
      * @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 null;
-        }
+         if ($chocolateyId == null) {
+             return null;
+         }
         
-        $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/Models/User.php

Spacing +4 added lines, -4 removed lines

@@ -139,7 +139,7 @@ 
     {
         $ban = Ban::where('user_id', $this->attributes['id'])->first();
         
-        if($ban == null) {
+        if ($ban == null) {
             return false;
         }
         
@@ -292,7 +292,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);
     }
 
     /**
@@ -304,7 +304,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);
     }
 
     /**
@@ -326,7 +326,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);
     }
 
     /**