SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Acl/Repositories/UserRepository.php

Braces +8 added lines, -16 removed lines

@@ -103,24 +103,19 @@ 
         if ( ! $user = $this->first(['email' => $credentials['email']])) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
+        } else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
+        } else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
+        } else if ($user->blocked)
         {
             \ErrorHandler::userIsBlocked();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
+        } else if ($token = \JWTAuth::attempt($credentials))
         {
             return ['token' => $token];
-        }
-        else
+        } else
         {
             \ErrorHandler::loginFailed();
         }
@@ -146,8 +141,7 @@ 
         {
             $data = ['email' => $user->email, 'password' => ''];
             return $this->register($data);
-        }
-        else
+        } else
         {
             if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
             {
@@ -193,12 +187,10 @@ 
         if ( ! $this->hasGroup('Admin'))
         {
             \ErrorHandler::noPermissions();
-        }
-        else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
+        } else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
         {
             \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+        } else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
         {
             \ErrorHandler::noPermissions();
         }

Indentation +353 added lines, -353 removed lines

@@ -4,364 +4,364 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Acl\AclUser';
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = [])
-    {
-        $permissions = [];
-        $user        = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id, $relations);
-        foreach ($user->groups()->get() as $group)
-        {
-            $group->permissions->each(function ($permission) use (&$permissions){
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
-        $user->permissions = $permissions;
-
-       return $user;
-    }
-
-    /**
-     * Check if the logged in user or the given user 
-     * has the given permissions on the given model.
-     * 
-     * @param  string  $nameOfPermission
-     * @param  string  $model            
-     * @param  boolean $user
-     * @return boolean
-     */
-    public function can($nameOfPermission, $model, $user = false )
-    {      
-        $user        = $user ?: \JWTAuth::parseToken()->authenticate();
-        $permissions = [];
-
-        if ( ! $user = $this->find($user->id, ['groups.permissions'])) 
-        {
-            \ErrorHandler::tokenExpired();
-        }
-
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
-            $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
-        });
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Acl\AclUser';
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = [])
+	{
+		$permissions = [];
+		$user        = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id, $relations);
+		foreach ($user->groups()->get() as $group)
+		{
+			$group->permissions->each(function ($permission) use (&$permissions){
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
+		$user->permissions = $permissions;
+
+	   return $user;
+	}
+
+	/**
+	 * Check if the logged in user or the given user 
+	 * has the given permissions on the given model.
+	 * 
+	 * @param  string  $nameOfPermission
+	 * @param  string  $model            
+	 * @param  boolean $user
+	 * @return boolean
+	 */
+	public function can($nameOfPermission, $model, $user = false )
+	{      
+		$user        = $user ?: \JWTAuth::parseToken()->authenticate();
+		$permissions = [];
+
+		if ( ! $user = $this->find($user->id, ['groups.permissions'])) 
+		{
+			\ErrorHandler::tokenExpired();
+		}
+
+		$user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
+			$permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
+		});
         
-        return in_array($nameOfPermission, $permissions);
-    }
-
-    /**
-     * Check if the logged in user has the given group.
-     * 
-     * @param  string  $groupName
-     * @param  integer $userId
-     * @return boolean
-     */
-    public function hasGroup($groupName, $userId = fa;se)
-    {
-        $userId = $userId ?: \JWTAuth::parseToken()->authenticate()->id;
-        $groups = $this->find($userId)->groups;
-        return $groups->pluck('name')->search($groupName, true) === false ? false : true;
-    }
-
-    /**
-     * Assign the given group ids to the given user.
-     * 
-     * @param  integer $user_id    
-     * @param  array   $group_ids
-     * @return object
-     */
-    public function assignGroups($user_id, $group_ids)
-    {
-        \DB::transaction(function () use ($user_id, $group_ids) {
-            $user = $this->find($user_id);
-            $user->groups()->detach();
-            $user->groups()->attach($group_ids);
-        });
-
-        return $this->find($user_id);
-    }
-
-    /**
-     * Handle a login request to the application.
-     * 
-     * @param  array   $credentials    
-     * @param  boolean $adminLogin
-     * @return array
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        if ( ! $user = $this->first(['email' => $credentials['email']])) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
-        {
-            \ErrorHandler::userIsBlocked();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
-        {
-            return ['token' => $token];
-        }
-        else
-        {
-            \ErrorHandler::loginFailed();
-        }
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     * 
-     * @param  array   $credentials
-     * @return array
-     */
-    public function loginSocial($credentials)
-    {
-        $access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token'];
-        $user         = \Socialite::driver($credentials['type'])->userFromToken($access_token);
-
-        if ( ! $user->email)
-        {
-            \ErrorHandler::noSocialEmail();
-        }
-
-        if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) 
-        {
-            $data = ['email' => $user->email, 'password' => ''];
-            return $this->register($data);
-        }
-        else
-        {
-            if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
-            {
-                \ErrorHandler::userAlreadyRegistered();
-            }
-            return $this->login(['email' => $registeredUser->email, 'password' => ''], false);
-        }
-    }
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given group.
+	 * 
+	 * @param  string  $groupName
+	 * @param  integer $userId
+	 * @return boolean
+	 */
+	public function hasGroup($groupName, $userId = fa;se)
+	{
+		$userId = $userId ?: \JWTAuth::parseToken()->authenticate()->id;
+		$groups = $this->find($userId)->groups;
+		return $groups->pluck('name')->search($groupName, true) === false ? false : true;
+	}
+
+	/**
+	 * Assign the given group ids to the given user.
+	 * 
+	 * @param  integer $user_id    
+	 * @param  array   $group_ids
+	 * @return object
+	 */
+	public function assignGroups($user_id, $group_ids)
+	{
+		\DB::transaction(function () use ($user_id, $group_ids) {
+			$user = $this->find($user_id);
+			$user->groups()->detach();
+			$user->groups()->attach($group_ids);
+		});
+
+		return $this->find($user_id);
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 * 
+	 * @param  array   $credentials    
+	 * @param  boolean $adminLogin
+	 * @return array
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		if ( ! $user = $this->first(['email' => $credentials['email']])) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($user->blocked)
+		{
+			\ErrorHandler::userIsBlocked();
+		}
+		else if ($token = \JWTAuth::attempt($credentials))
+		{
+			return ['token' => $token];
+		}
+		else
+		{
+			\ErrorHandler::loginFailed();
+		}
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 * 
+	 * @param  array   $credentials
+	 * @return array
+	 */
+	public function loginSocial($credentials)
+	{
+		$access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token'];
+		$user         = \Socialite::driver($credentials['type'])->userFromToken($access_token);
+
+		if ( ! $user->email)
+		{
+			\ErrorHandler::noSocialEmail();
+		}
+
+		if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) 
+		{
+			$data = ['email' => $user->email, 'password' => ''];
+			return $this->register($data);
+		}
+		else
+		{
+			if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
+			{
+				\ErrorHandler::userAlreadyRegistered();
+			}
+			return $this->login(['email' => $registeredUser->email, 'password' => ''], false);
+		}
+	}
     
-    /**
-     * Handle a registration request.
-     * 
-     * @param  array $credentials
-     * @return array
-     */
-    public function register($credentials)
-    {
-        return ['token' => \JWTAuth::fromUser($this->model->create($credentials))];
-    }
-
-    /**
-     * Logout the user.
-     * 
-     * @return boolean
-     */
-    public function logout()
-    {
-        return \JWTAuth::invalidate(\JWTAuth::getToken());
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function block($user_id)
-    {
-        if ( ! $user = $this->find($user_id)) 
-        {
-            \ErrorHandler::notFound('user');
-        }
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+	/**
+	 * Handle a registration request.
+	 * 
+	 * @param  array $credentials
+	 * @return array
+	 */
+	public function register($credentials)
+	{
+		return ['token' => \JWTAuth::fromUser($this->model->create($credentials))];
+	}
+
+	/**
+	 * Logout the user.
+	 * 
+	 * @return boolean
+	 */
+	public function logout()
+	{
+		return \JWTAuth::invalidate(\JWTAuth::getToken());
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function block($user_id)
+	{
+		if ( ! $user = $this->find($user_id)) 
+		{
+			\ErrorHandler::notFound('user');
+		}
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function unblock($user_id)
-    {
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = $this->find($user_id);
-        $user->blocked = 0;
-        $user->save();
-
-        return $user;
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if ( ! $user = $this->model->where('email', $email)->first())
-        {
-            \ErrorHandler::notFound('email');
-        }
-
-        $url   = $this->config['resetLink'];
-        $token = \Password::getRepository()->create($user);
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function unblock($user_id)
+	{
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = $this->find($user_id);
+		$user->blocked = 0;
+		$user->save();
+
+		return $user;
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if ( ! $user = $this->model->where('email', $email)->first())
+		{
+			\ErrorHandler::notFound('email');
+		}
+
+		$url   = $this->config['resetLink'];
+		$token = \Password::getRepository()->create($user);
         
-        \Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
-            $m->to($user->email, $user->name)->subject('Your Password Reset Link');
-        });
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return array
-     */
-    public function resetPassword($credentials)
-    {
-        $token    = false;
-        $response = \Password::reset($credentials, function ($user, $password) use (&$token) {
-            $user->password = $password;
-            $user->save();
-
-            $token = \JWTAuth::fromUser($user);
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return ['token' => $token];
+		\Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
+			$m->to($user->email, $user->name)->subject('Your Password Reset Link');
+		});
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return array
+	 */
+	public function resetPassword($credentials)
+	{
+		$token    = false;
+		$response = \Password::reset($credentials, function ($user, $password) use (&$token) {
+			$user->password = $password;
+			$user->save();
+
+			$token = \JWTAuth::fromUser($user);
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return ['token' => $token];
                 
-            case \Password::INVALID_TOKEN:
-                \ErrorHandler::invalidResetToken('token');
-
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
-
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
-
-            default:
-                \ErrorHandler::generalError();
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  array  $credentials
-     * @return void
-     */
-    public function changePassword($credentials)
-    {
-        $user = \JWTAuth::parseToken()->authenticate();
-        if ( ! \Hash::check($credentials['old_password'], $user->password)) 
-        {
-            \ErrorHandler::invalidOldPassword();
-        }
-
-        $user->password = $credentials['password'];
-        $user->save();
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @return array
-     */
-    public function refreshtoken()
-    {
-        $token = \JWTAuth::parseToken()->refresh();
-
-        return ['token' => $token];
-    }
-
-    /**
-     * Paginate all users in the given group based on the given conditions.
-     * 
-     * @param  string  $groupName
-     * @param  array   $relations
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
-    {   
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = call_user_func_array("{$this->getModel()}::with", array($relations));
-
-        $model->whereHas('groups', function($q) use ($groupName){
-            $q->where('name', $groupName);
-        });
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
+
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
+
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
+
+			default:
+				\ErrorHandler::generalError();
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  array  $credentials
+	 * @return void
+	 */
+	public function changePassword($credentials)
+	{
+		$user = \JWTAuth::parseToken()->authenticate();
+		if ( ! \Hash::check($credentials['old_password'], $user->password)) 
+		{
+			\ErrorHandler::invalidOldPassword();
+		}
+
+		$user->password = $credentials['password'];
+		$user->save();
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @return array
+	 */
+	public function refreshtoken()
+	{
+		$token = \JWTAuth::parseToken()->refresh();
+
+		return ['token' => $token];
+	}
+
+	/**
+	 * Paginate all users in the given group based on the given conditions.
+	 * 
+	 * @param  string  $groupName
+	 * @param  array   $relations
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
+	{   
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = call_user_func_array("{$this->getModel()}::with", array($relations));
+
+		$model->whereHas('groups', function($q) use ($groupName){
+			$q->where('name', $groupName);
+		});
 
         
-        if (count($conditions['conditionValues']))
-        {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        if ($perPage) 
-        {
-            return $model->orderBy($sortBy, $sort)->paginate($perPage);
-        }
-
-        return $model->orderBy($sortBy, $sort)->get();
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  array $credentials
-     * @return object
-     */
-    public function saveProfile($credentials) 
-    {
-        $user = \JWTAuth::parseToken()->authenticate();
-        $user->save($credentials);
-
-        return $user;
-    }
+		if (count($conditions['conditionValues']))
+		{
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		if ($perPage) 
+		{
+			return $model->orderBy($sortBy, $sort)->paginate($perPage);
+		}
+
+		return $model->orderBy($sortBy, $sort)->get();
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  array $credentials
+	 * @return object
+	 */
+	public function saveProfile($credentials) 
+	{
+		$user = \JWTAuth::parseToken()->authenticate();
+		$user->save($credentials);
+
+		return $user;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
         $user        = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id, $relations);
         foreach ($user->groups()->get() as $group)
         {
-            $group->permissions->each(function ($permission) use (&$permissions){
+            $group->permissions->each(function($permission) use (&$permissions){
                 $permissions[$permission->model][$permission->id] = $permission->name;
             });
         }
@@ -44,7 +44,7 @@ 
      * @param  boolean $user
      * @return boolean
      */
-    public function can($nameOfPermission, $model, $user = false )
+    public function can($nameOfPermission, $model, $user = false)
     {      
         $user        = $user ?: \JWTAuth::parseToken()->authenticate();
         $permissions = [];
@@ -54,7 +54,7 @@ 
             \ErrorHandler::tokenExpired();
         }
 
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
+        $user->groups->pluck('permissions')->each(function($permission) use (&$permissions, $model){
             $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
         });
         
@@ -68,7 +68,7 @@ 
      * @param  integer $userId
      * @return boolean
      */
-    public function hasGroup($groupName, $userId = fa;se)
+    public function hasGroup($groupName, $userId = fa; se)
     {
         $userId = $userId ?: \JWTAuth::parseToken()->authenticate()->id;
         $groups = $this->find($userId)->groups;
@@ -84,7 +84,7 @@ 
      */
     public function assignGroups($user_id, $group_ids)
     {
-        \DB::transaction(function () use ($user_id, $group_ids) {
+        \DB::transaction(function() use ($user_id, $group_ids) {
             $user = $this->find($user_id);
             $user->groups()->detach();
             $user->groups()->attach($group_ids);
@@ -247,7 +247,7 @@ 
         $url   = $this->config['resetLink'];
         $token = \Password::getRepository()->create($user);
         
-        \Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
+        \Mail::send('acl::resetpassword', ['user' => $user, 'url' => $url, 'token' => $token], function($m) use ($user) {
             $m->to($user->email, $user->name)->subject('Your Password Reset Link');
         });
     }
@@ -261,7 +261,7 @@ 
     public function resetPassword($credentials)
     {
         $token    = false;
-        $response = \Password::reset($credentials, function ($user, $password) use (&$token) {
+        $response = \Password::reset($credentials, function($user, $password) use (&$token) {
             $user->password = $password;
             $user->save();
 

src/Modules/V1/Notifications/Providers/RouteServiceProvider.php

Indentation +61 added lines, -61 removed lines

@@ -8,72 +8,72 @@
 class RouteServiceProvider extends ServiceProvider
 {
 	/**
-     * This namespace is applied to your controller routes.
-     *
-     * In addition, it is set as the URL generator's root namespace.
-     *
-     * @var string
-     */
-    protected $namespace = 'App\Modules\V1\Notifications\Http\Controllers';
+	 * This namespace is applied to your controller routes.
+	 *
+	 * In addition, it is set as the URL generator's root namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'App\Modules\V1\Notifications\Http\Controllers';
 
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
+	/**
+	 * Define your route model bindings, pattern filters, etc.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		//
 
-        parent::boot();
-    }
+		parent::boot();
+	}
 
-    /**
-     * Define the routes for the module.
-     *
-     * @return void
-     */
-    public function map()
-    {
-        $this->mapWebRoutes();
+	/**
+	 * Define the routes for the module.
+	 *
+	 * @return void
+	 */
+	public function map()
+	{
+		$this->mapWebRoutes();
 
-        $this->mapApiRoutes();
+		$this->mapApiRoutes();
 
-        //
-    }
+		//
+	}
 
-    /**
-     * Define the "web" routes for the module.
-     *
-     * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
-     */
-    protected function mapWebRoutes()
-    {
-        Route::group([
-            'middleware' => 'web',
-            'namespace'  => $this->namespace,
-        ], function ($router) {
-            require module_path('notifications', 'Routes/web.php');
-        });
-    }
+	/**
+	 * Define the "web" routes for the module.
+	 *
+	 * These routes all receive session state, CSRF protection, etc.
+	 *
+	 * @return void
+	 */
+	protected function mapWebRoutes()
+	{
+		Route::group([
+			'middleware' => 'web',
+			'namespace'  => $this->namespace,
+		], function ($router) {
+			require module_path('notifications', 'Routes/web.php');
+		});
+	}
 
-    /**
-     * Define the "api" routes for the module.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::group([
-            'middleware' => 'api',
-            'namespace'  => $this->namespace,
-            'prefix'     => 'api',
-        ], function ($router) {
-            require module_path('notifications', 'Routes/api.php');
-        });
-    }
+	/**
+	 * Define the "api" routes for the module.
+	 *
+	 * These routes are typically stateless.
+	 *
+	 * @return void
+	 */
+	protected function mapApiRoutes()
+	{
+		Route::group([
+			'middleware' => 'api',
+			'namespace'  => $this->namespace,
+			'prefix'     => 'api',
+		], function ($router) {
+			require module_path('notifications', 'Routes/api.php');
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         Route::group([
             'middleware' => 'web',
             'namespace'  => $this->namespace,
-        ], function ($router) {
+        ], function($router) {
             require module_path('notifications', 'Routes/web.php');
         });
     }
@@ -72,7 +72,7 @@ 
             'middleware' => 'api',
             'namespace'  => $this->namespace,
             'prefix'     => 'api',
-        ], function ($router) {
+        ], function($router) {
             require module_path('notifications', 'Routes/api.php');
         });
     }

src/Modules/V1/Core/Providers/RouteServiceProvider.php

Indentation +61 added lines, -61 removed lines

@@ -8,72 +8,72 @@
 class RouteServiceProvider extends ServiceProvider
 {
 	/**
-     * This namespace is applied to your controller routes.
-     *
-     * In addition, it is set as the URL generator's root namespace.
-     *
-     * @var string
-     */
-    protected $namespace = 'App\Modules\V1\Core\Http\Controllers';
+	 * This namespace is applied to your controller routes.
+	 *
+	 * In addition, it is set as the URL generator's root namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'App\Modules\V1\Core\Http\Controllers';
 
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
+	/**
+	 * Define your route model bindings, pattern filters, etc.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		//
 
-        parent::boot();
-    }
+		parent::boot();
+	}
 
-    /**
-     * Define the routes for the module.
-     *
-     * @return void
-     */
-    public function map()
-    {
-        $this->mapWebRoutes();
+	/**
+	 * Define the routes for the module.
+	 *
+	 * @return void
+	 */
+	public function map()
+	{
+		$this->mapWebRoutes();
 
-        $this->mapApiRoutes();
+		$this->mapApiRoutes();
 
-        //
-    }
+		//
+	}
 
-    /**
-     * Define the "web" routes for the module.
-     *
-     * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
-     */
-    protected function mapWebRoutes()
-    {
-        Route::group([
-            'middleware' => 'web',
-            'namespace'  => $this->namespace,
-        ], function ($router) {
-            require module_path('core', 'Routes/web.php');
-        });
-    }
+	/**
+	 * Define the "web" routes for the module.
+	 *
+	 * These routes all receive session state, CSRF protection, etc.
+	 *
+	 * @return void
+	 */
+	protected function mapWebRoutes()
+	{
+		Route::group([
+			'middleware' => 'web',
+			'namespace'  => $this->namespace,
+		], function ($router) {
+			require module_path('core', 'Routes/web.php');
+		});
+	}
 
-    /**
-     * Define the "api" routes for the module.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::group([
-            'middleware' => 'api',
-            'namespace'  => $this->namespace,
-            'prefix'     => 'api',
-        ], function ($router) {
-            require module_path('core', 'Routes/api.php');
-        });
-    }
+	/**
+	 * Define the "api" routes for the module.
+	 *
+	 * These routes are typically stateless.
+	 *
+	 * @return void
+	 */
+	protected function mapApiRoutes()
+	{
+		Route::group([
+			'middleware' => 'api',
+			'namespace'  => $this->namespace,
+			'prefix'     => 'api',
+		], function ($router) {
+			require module_path('core', 'Routes/api.php');
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         Route::group([
             'middleware' => 'web',
             'namespace'  => $this->namespace,
-        ], function ($router) {
+        ], function($router) {
             require module_path('core', 'Routes/web.php');
         });
     }
@@ -72,7 +72,7 @@ 
             'middleware' => 'api',
             'namespace'  => $this->namespace,
             'prefix'     => 'api',
-        ], function ($router) {
+        ], function($router) {
             require module_path('core', 'Routes/api.php');
         });
     }

src/Modules/V1/Reporting/Providers/RouteServiceProvider.php

Indentation +61 added lines, -61 removed lines

@@ -8,72 +8,72 @@
 class RouteServiceProvider extends ServiceProvider
 {
 	/**
-     * This namespace is applied to your controller routes.
-     *
-     * In addition, it is set as the URL generator's root namespace.
-     *
-     * @var string
-     */
-    protected $namespace = 'App\Modules\V1\Reporting\Http\Controllers';
+	 * This namespace is applied to your controller routes.
+	 *
+	 * In addition, it is set as the URL generator's root namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'App\Modules\V1\Reporting\Http\Controllers';
 
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
+	/**
+	 * Define your route model bindings, pattern filters, etc.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		//
 
-        parent::boot();
-    }
+		parent::boot();
+	}
 
-    /**
-     * Define the routes for the module.
-     *
-     * @return void
-     */
-    public function map()
-    {
-        $this->mapWebRoutes();
+	/**
+	 * Define the routes for the module.
+	 *
+	 * @return void
+	 */
+	public function map()
+	{
+		$this->mapWebRoutes();
 
-        $this->mapApiRoutes();
+		$this->mapApiRoutes();
 
-        //
-    }
+		//
+	}
 
-    /**
-     * Define the "web" routes for the module.
-     *
-     * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
-     */
-    protected function mapWebRoutes()
-    {
-        Route::group([
-            'middleware' => 'web',
-            'namespace'  => $this->namespace,
-        ], function ($router) {
-            require module_path('reporting', 'Routes/web.php');
-        });
-    }
+	/**
+	 * Define the "web" routes for the module.
+	 *
+	 * These routes all receive session state, CSRF protection, etc.
+	 *
+	 * @return void
+	 */
+	protected function mapWebRoutes()
+	{
+		Route::group([
+			'middleware' => 'web',
+			'namespace'  => $this->namespace,
+		], function ($router) {
+			require module_path('reporting', 'Routes/web.php');
+		});
+	}
 
-    /**
-     * Define the "api" routes for the module.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::group([
-            'middleware' => 'api',
-            'namespace'  => $this->namespace,
-            'prefix'     => 'api',
-        ], function ($router) {
-            require module_path('reporting', 'Routes/api.php');
-        });
-    }
+	/**
+	 * Define the "api" routes for the module.
+	 *
+	 * These routes are typically stateless.
+	 *
+	 * @return void
+	 */
+	protected function mapApiRoutes()
+	{
+		Route::group([
+			'middleware' => 'api',
+			'namespace'  => $this->namespace,
+			'prefix'     => 'api',
+		], function ($router) {
+			require module_path('reporting', 'Routes/api.php');
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         Route::group([
             'middleware' => 'web',
             'namespace'  => $this->namespace,
-        ], function ($router) {
+        ], function($router) {
             require module_path('reporting', 'Routes/web.php');
         });
     }
@@ -72,7 +72,7 @@ 
             'middleware' => 'api',
             'namespace'  => $this->namespace,
             'prefix'     => 'api',
-        ], function ($router) {
+        ], function($router) {
             require module_path('reporting', 'Routes/api.php');
         });
     }

src/Modules/V1/Acl/Providers/RouteServiceProvider.php

Indentation +61 added lines, -61 removed lines

@@ -8,72 +8,72 @@
 class RouteServiceProvider extends ServiceProvider
 {
 	/**
-     * This namespace is applied to your controller routes.
-     *
-     * In addition, it is set as the URL generator's root namespace.
-     *
-     * @var string
-     */
-    protected $namespace = 'App\Modules\V1\Acl\Http\Controllers';
+	 * This namespace is applied to your controller routes.
+	 *
+	 * In addition, it is set as the URL generator's root namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'App\Modules\V1\Acl\Http\Controllers';
 
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
+	/**
+	 * Define your route model bindings, pattern filters, etc.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		//
 
-        parent::boot();
-    }
+		parent::boot();
+	}
 
-    /**
-     * Define the routes for the module.
-     *
-     * @return void
-     */
-    public function map()
-    {
-        $this->mapWebRoutes();
+	/**
+	 * Define the routes for the module.
+	 *
+	 * @return void
+	 */
+	public function map()
+	{
+		$this->mapWebRoutes();
 
-        $this->mapApiRoutes();
+		$this->mapApiRoutes();
 
-        //
-    }
+		//
+	}
 
-    /**
-     * Define the "web" routes for the module.
-     *
-     * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
-     */
-    protected function mapWebRoutes()
-    {
-        Route::group([
-            'middleware' => 'web',
-            'namespace'  => $this->namespace,
-        ], function ($router) {
-            require module_path('acl', 'Routes/web.php');
-        });
-    }
+	/**
+	 * Define the "web" routes for the module.
+	 *
+	 * These routes all receive session state, CSRF protection, etc.
+	 *
+	 * @return void
+	 */
+	protected function mapWebRoutes()
+	{
+		Route::group([
+			'middleware' => 'web',
+			'namespace'  => $this->namespace,
+		], function ($router) {
+			require module_path('acl', 'Routes/web.php');
+		});
+	}
 
-    /**
-     * Define the "api" routes for the module.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::group([
-            'middleware' => 'api',
-            'namespace'  => $this->namespace,
-            'prefix'     => 'api',
-        ], function ($router) {
-            require module_path('acl', 'Routes/api.php');
-        });
-    }
+	/**
+	 * Define the "api" routes for the module.
+	 *
+	 * These routes are typically stateless.
+	 *
+	 * @return void
+	 */
+	protected function mapApiRoutes()
+	{
+		Route::group([
+			'middleware' => 'api',
+			'namespace'  => $this->namespace,
+			'prefix'     => 'api',
+		], function ($router) {
+			require module_path('acl', 'Routes/api.php');
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         Route::group([
             'middleware' => 'web',
             'namespace'  => $this->namespace,
-        ], function ($router) {
+        ], function($router) {
             require module_path('acl', 'Routes/web.php');
         });
     }
@@ -72,7 +72,7 @@ 
             'middleware' => 'api',
             'namespace'  => $this->namespace,
             'prefix'     => 'api',
-        ], function ($router) {
+        ], function($router) {
             require module_path('acl', 'Routes/api.php');
         });
     }

src/lang/ar/errors.php

Indentation +20 added lines, -20 removed lines

@@ -2,25 +2,25 @@
 
 return [
     
-    /**
-     * List of error messages used in core module.
-     */
-    'unAuthorized'           => 'من فضلك قم بتسجيل الدخول',
-    'tokenExpired'           => 'انتهت صلاحية الدخول',
-    'noPermissions'          => 'لا توجد صلاحية',
-    'loginFailed'            => 'خطأ في البريد لاكتروني او كلمة المرور',
-    'noSocialEmail'          => 'لا يمكن الحصول علي تابريد الاكتروني',
-    'userAlreadyRegistered'  => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر',
-    'connectionError'        => 'خطأ في الاتصال',
-    'redisNotRunning'        => 'سيرفير الاشعارات لايعمل',
-    'dbQueryError'           => 'خطا في البيانات',
-    'cannotCreateSetting'    => 'لا يمكن اضافة اعدادات',
-    'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات',
-    'userIsBlocked'          => 'لقد تم حظرك',
-    'invalidResetToken'      => 'رمز تعديل كلمة المرور خطا',
-    'invalidResetPassword'   => 'خطا في نعديل كلمة المرور',
-    'invalidOldPassword'     => 'كلمة السر القديمه خطا',
-    'notFound'               => 'ال :replace المطلوب غير موجود',
-    'generalError'           => 'حدث خطا ما',
+	/**
+	 * List of error messages used in core module.
+	 */
+	'unAuthorized'           => 'من فضلك قم بتسجيل الدخول',
+	'tokenExpired'           => 'انتهت صلاحية الدخول',
+	'noPermissions'          => 'لا توجد صلاحية',
+	'loginFailed'            => 'خطأ في البريد لاكتروني او كلمة المرور',
+	'noSocialEmail'          => 'لا يمكن الحصول علي تابريد الاكتروني',
+	'userAlreadyRegistered'  => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر',
+	'connectionError'        => 'خطأ في الاتصال',
+	'redisNotRunning'        => 'سيرفير الاشعارات لايعمل',
+	'dbQueryError'           => 'خطا في البيانات',
+	'cannotCreateSetting'    => 'لا يمكن اضافة اعدادات',
+	'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات',
+	'userIsBlocked'          => 'لقد تم حظرك',
+	'invalidResetToken'      => 'رمز تعديل كلمة المرور خطا',
+	'invalidResetPassword'   => 'خطا في نعديل كلمة المرور',
+	'invalidOldPassword'     => 'كلمة السر القديمه خطا',
+	'notFound'               => 'ال :replace المطلوب غير موجود',
+	'generalError'           => 'حدث خطا ما',
 
 ];
\ No newline at end of file

src/lang/en/errors.php

Indentation +20 added lines, -20 removed lines

@@ -2,25 +2,25 @@
 
 return [
     
-    /**
-     * List of error messages used in core module.
-     */
-    'unAuthorized'           => 'Please login before any action',
-    'tokenExpired'           => 'Login token expired',
-    'noPermissions'          => 'No permissions',
-    'loginFailed'            => 'Wrong mail or password',
-    'noSocialEmail'          => 'Couldn\'t retrieve email',
-    'userAlreadyRegistered'  => 'User already registered. Please login using email and password',
-    'connectionError'        => 'Connection error',
-    'redisNotRunning'        => 'Your redis notification server is\'t running',
-    'dbQueryError'           => 'Please check the given inputes',
-    'cannotCreateSetting'    => 'Can\'t create setting',
-    'cannotUpdateSettingKey' => 'Can\'t update setting key',
-    'userIsBlocked'          => 'You have been blocked',
-    'invalidResetToken'      => 'Reset password token is invalid',
-    'invalidResetPassword'   => 'Reset password is invalid',
-    'invalidOldPassword'     => 'Old password is invalid',
-    'notFound'               => 'The requested :replace not found',
-    'generalError'           => 'Something went wrong',
+	/**
+	 * List of error messages used in core module.
+	 */
+	'unAuthorized'           => 'Please login before any action',
+	'tokenExpired'           => 'Login token expired',
+	'noPermissions'          => 'No permissions',
+	'loginFailed'            => 'Wrong mail or password',
+	'noSocialEmail'          => 'Couldn\'t retrieve email',
+	'userAlreadyRegistered'  => 'User already registered. Please login using email and password',
+	'connectionError'        => 'Connection error',
+	'redisNotRunning'        => 'Your redis notification server is\'t running',
+	'dbQueryError'           => 'Please check the given inputes',
+	'cannotCreateSetting'    => 'Can\'t create setting',
+	'cannotUpdateSettingKey' => 'Can\'t update setting key',
+	'userIsBlocked'          => 'You have been blocked',
+	'invalidResetToken'      => 'Reset password token is invalid',
+	'invalidResetPassword'   => 'Reset password is invalid',
+	'invalidOldPassword'     => 'Old password is invalid',
+	'notFound'               => 'The requested :replace not found',
+	'generalError'           => 'Something went wrong',
 
 ];
\ No newline at end of file

src/Modules/V1/Acl/Database/Migrations/2015_12_20_124153_users.php

Indentation +9 added lines, -9 removed lines

@@ -13,16 +13,16 @@
 	public function up()
 	{
 		Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name', 100)->nullable();
-            $table->string('email')->unique();
-            $table->string('password', 60)->nullable();
-            $table->boolean('blocked')->default(0);
+			$table->increments('id');
+			$table->string('name', 100)->nullable();
+			$table->string('email')->unique();
+			$table->string('password', 60)->nullable();
+			$table->boolean('blocked')->default(0);
 			$table->date('last_change_password')->nullable();
-            $table->softDeletes();
-            $table->rememberToken();
-            $table->timestamps();
-        });
+			$table->softDeletes();
+			$table->rememberToken();
+			$table->timestamps();
+		});
 	}
 
 	/**

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 */
 	public function up()
 	{
-		Schema::create('users', function (Blueprint $table) {
+		Schema::create('users', function(Blueprint $table) {
             $table->increments('id');
             $table->string('name', 100)->nullable();
             $table->string('email')->unique();

src/Modules/V1/Acl/Http/Controllers/UsersController.php

Braces +1 added lines, -2 removed lines

@@ -170,8 +170,7 @@
             if ($request->has('id')) 
             {
                 $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
+            } else
             {
                 $rule = str_replace(',{id}', '', $rule);
             }

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model               = 'users';
+    protected $model = 'users';
 
     /**
      * List of all route actions that the base api controller
@@ -26,14 +26,14 @@ 
      * will skip login check for them.
      * @var array
      */
-    protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken'];
+    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken'];
 
     /**
      * The validations rules used by the base api controller
      * to check before add.
      * @var array
      */
-    protected $validationRules     = [
+    protected $validationRules = [
         'name'     => 'nullable|string|unique:users,name,{id},id,name,NOT_NULL', 
         'email'    => 'required|email|unique:users,email,{id},id,email,NOT_NULL', 
         'password' => 'nullable|min:6'

Indentation +219 added lines, -219 removed lines

@@ -7,250 +7,250 @@
 
 class UsersController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model               = 'users';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'users';
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout', 'changePassword'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'changePassword'];
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken'];
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules     = [
-        'name'     => 'nullable|string|unique:users,name,{id},id,name,NOT_NULL', 
-        'email'    => 'required|email|unique:users,email,{id},id,email,NOT_NULL', 
-        'password' => 'nullable|min:6'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules     = [
+		'name'     => 'nullable|string|unique:users,name,{id},id,name,NOT_NULL', 
+		'email'    => 'required|email|unique:users,email,{id},id,email,NOT_NULL', 
+		'password' => 'nullable|min:6'
+	];
 
-    /**
-     * Return the logged in user account.
-     * 
-     * @return \Illuminate\Http\Response
-     */
-    public function account()
-    {
-        return \Response::json(\Core::users()->account($this->relations), 200);
-    }
+	/**
+	 * Return the logged in user account.
+	 * 
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account()
+	{
+		return \Response::json(\Core::users()->account($this->relations), 200);
+	}
 
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return \Response::json(\Core::users()->block($id), 200);
-    }
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function block($id)
+	{
+		return \Response::json(\Core::users()->block($id), 200);
+	}
 
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function unblock($id)
-    {
-        return \Response::json(\Core::users()->unblock($id), 200);
-    }
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unblock($id)
+	{
+		return \Response::json(\Core::users()->unblock($id), 200);
+	}
 
-    /**
-     * Logout the user.
-     * 
-     * @return \Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        return \Response::json(\Core::users()->logout(), 200);
-    }
+	/**
+	 * Logout the user.
+	 * 
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return \Response::json(\Core::users()->logout(), 200);
+	}
 
-    /**
-     * Handle a registration request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Request $request)
-    {
-        $this->validate($request, [
-            'name'     => 'nullable|string|unique:users,name,{id},id,name,NOT_NULL', 
-            'email'    => 'required|email|unique:users,email,{id},id,email,NOT_NULL', 
-            'password' => 'required|min:6'
-            ]);
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Request $request)
+	{
+		$this->validate($request, [
+			'name'     => 'nullable|string|unique:users,name,{id},id,name,NOT_NULL', 
+			'email'    => 'required|email|unique:users,email,{id},id,email,NOT_NULL', 
+			'password' => 'required|min:6'
+			]);
 
-        return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
-    }
+		return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
+	}
 
-    /**
-     * Handle a login request of the none admin to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function login(Request $request)
-    {
-        $this->validate($request, [
-            'email'    => 'required|email', 
-            'password' => 'required|min:6',
-            'admin'    => 'boolean'
-            ]);
+	/**
+	 * Handle a login request of the none admin to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function login(Request $request)
+	{
+		$this->validate($request, [
+			'email'    => 'required|email', 
+			'password' => 'required|min:6',
+			'admin'    => 'boolean'
+			]);
 
-        return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200);
-    }
+		return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200);
+	}
 
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function loginSocial(Request $request)
-    {
-        $this->validate($request, [
-            'auth_code'    => 'required_without:access_token',
-            'access_token' => 'required_without:auth_code',
-            'type'         => 'required|in:facebook,google'
-            ]);
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function loginSocial(Request $request)
+	{
+		$this->validate($request, [
+			'auth_code'    => 'required_without:access_token',
+			'access_token' => 'required_without:auth_code',
+			'type'         => 'required|in:facebook,google'
+			]);
 
-        return \Response::json(\Core::users()->loginSocial($request->only('auth_code', 'access_token', 'type')), 200);
-    }
+		return \Response::json(\Core::users()->loginSocial($request->only('auth_code', 'access_token', 'type')), 200);
+	}
 
-    /**
-     * Assign the given groups to the given user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function assigngroups(Request $request)
-    {
-        $this->validate($request, [
-            'group_ids' => 'required|exists:groups,id', 
-            'user_id'   => 'required|exists:users,id'
-            ]);
+	/**
+	 * Assign the given groups to the given user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assigngroups(Request $request)
+	{
+		$this->validate($request, [
+			'group_ids' => 'required|exists:groups,id', 
+			'user_id'   => 'required|exists:users,id'
+			]);
 
-        return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
-    }
+		return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
+	}
 
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function sendreset(Request $request)
-    {
-        $this->validate($request, ['email' => 'required|email']);
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function sendreset(Request $request)
+	{
+		$this->validate($request, ['email' => 'required|email']);
 
-        return \Response::json(\Core::users()->sendReset($request->only('email')), 200);
-    }
+		return \Response::json(\Core::users()->sendReset($request->only('email')), 200);
+	}
 
-    /**
-     * Reset the given user's password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resetpassword(Request $request)
-    {
-        $this->validate($request, [
-            'token'                 => 'required',
-            'email'                 => 'required|email',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resetpassword(Request $request)
+	{
+		$this->validate($request, [
+			'token'                 => 'required',
+			'email'                 => 'required|email',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
 
-        return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
-    }
+		return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
+	}
 
-    /**
-     * Change the logged in user password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function changePassword(Request $request)
-    {
-        $this->validate($request, [
-            'old_password'          => 'required',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function changePassword(Request $request)
+	{
+		$this->validate($request, [
+			'old_password'          => 'required',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
 
-        return \Response::json(\Core::users()->changePassword($request->only('old_password', 'password', 'password_confirmation')), 200);
-    }
+		return \Response::json(\Core::users()->changePassword($request->only('old_password', 'password', 'password_confirmation')), 200);
+	}
 
-    /**
-     * Refresh the expired login token.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshtoken()
-    {
-        return \Response::json(\Core::users()->refreshtoken(), 200);
-    }
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshtoken()
+	{
+		return \Response::json(\Core::users()->refreshtoken(), 200);
+	}
 
-    /**
-     * Paginate all users with inthe given group.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string $groupName The name of the requested group.
-     * @param  integer $perPage  Number of rows per page default 15.
-     * @param  string  $sortBy   The name of the column to sort by.
-     * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
-    {
-        return \Response::json(\Core::users()->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc), 200);
-    }
+	/**
+	 * Paginate all users with inthe given group.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string $groupName The name of the requested group.
+	 * @param  integer $perPage  Number of rows per page default 15.
+	 * @param  string  $sortBy   The name of the column to sort by.
+	 * @param  boolean $desc     Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
+	{
+		return \Response::json(\Core::users()->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveProfile(Request $request) 
-    {
-        foreach ($this->validationRules as &$rule) 
-        {
-            if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
-            {
-                $rule .= ',deleted_at,NULL';
-            }
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveProfile(Request $request) 
+	{
+		foreach ($this->validationRules as &$rule) 
+		{
+			if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
+			{
+				$rule .= ',deleted_at,NULL';
+			}
 
-            if ($request->has('id')) 
-            {
-                $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
-            {
-                $rule = str_replace(',{id}', '', $rule);
-            }
-        }
+			if ($request->has('id')) 
+			{
+				$rule = str_replace('{id}', $request->get('id'), $rule);
+			}
+			else
+			{
+				$rule = str_replace(',{id}', '', $rule);
+			}
+		}
 
-        $this->validate($request, $this->validationRules);
+		$this->validate($request, $this->validationRules);
 
-        if ($this->model)
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->saveProfile($request->all()), 200);
-        }
-    }
+		if ($this->model)
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->saveProfile($request->all()), 200);
+		}
+	}
 }