Saluki / Barmate

app/Console/Commands/DatabaseFaker.php

Indentation +17 added lines, -17 removed lines

@@ -15,20 +15,20 @@ 
     const NB_USERS = 20;
     const MAX_NB_PRODUCTS = 9;
 
-	protected $name = 'db:faker';
-	protected $description = 'Seed the database with fake data for testing purposes';
+    protected $name = 'db:faker';
+    protected $description = 'Seed the database with fake data for testing purposes';
 
     private $faker;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 
         $this->faker = Factory::create();
-	}
+    }
 
-	public function fire()
-	{
+    public function fire()
+    {
         $this->error("\nWatch out!");
         $this->info('This command will truncate all your Barmate data.');
         $this->info("Use this command only for testing purposes.\n");
@@ -48,17 +48,17 @@ 
         $this->seedCategories($groupId);
 
         $this->info("\nFake data successfully created. Happy testing!");
-	}
+    }
 
-	protected function getArguments()
-	{
-		return [];
-	}
+    protected function getArguments()
+    {
+        return [];
+    }
 
-	protected function getOptions()
-	{
-		return [];
-	}
+    protected function getOptions()
+    {
+        return [];
+    }
 
     private function seedUsers($groupId)
     {

app/Console/Commands/Inspire.php

Indentation +21 added lines, -21 removed lines

@@ -5,28 +5,28 @@
 
 class Inspire extends Command {
 
-	/**
-	 * The console command name.
-	 *
-	 * @var string
-	 */
-	protected $name = 'inspire';
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'inspire';
 
-	/**
-	 * The console command description.
-	 *
-	 * @var string
-	 */
-	protected $description = 'Display an inspiring quote';
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Display an inspiring quote';
 
-	/**
-	 * Execute the console command.
-	 *
-	 * @return mixed
-	 */
-	public function handle()
-	{
-		$this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
-	}
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
+    }
 
 }

app/Console/Kernel.php

Indentation +19 added lines, -19 removed lines

@@ -5,26 +5,26 @@
 
 class Kernel extends ConsoleKernel {
 
-	/**
-	 * The Artisan commands provided by your application.
-	 *
-	 * @var array
-	 */
-	protected $commands = [
-		'App\Console\Commands\Inspire',
+    /**
+     * The Artisan commands provided by your application.
+     *
+     * @var array
+     */
+    protected $commands = [
+        'App\Console\Commands\Inspire',
         'App\Console\Commands\DatabaseFaker'
-	];
+    ];
 
-	/**
-	 * Define the application's command schedule.
-	 *
-	 * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-	 * @return void
-	 */
-	protected function schedule(Schedule $schedule)
-	{
-		$schedule->command('inspire')
-				 ->hourly();
-	}
+    /**
+     * Define the application's command schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @return void
+     */
+    protected function schedule(Schedule $schedule)
+    {
+        $schedule->command('inspire')
+                    ->hourly();
+    }
 
 }

app/Http/Controllers/CategoryController.php

Indentation +128 added lines, -128 removed lines

@@ -9,139 +9,139 @@
 
 class CategoryController extends Controller {
 
-	/**
-	 * Display a listing of the resource.
-	 *
-	 * @return Response
-	 */
-	public function index()
-	{
-		$categoriesFromGroup = Categories::allAPI();
-
-		return Response::json( $categoriesFromGroup, 200);
-	}
-
-	/**
-	 * Store a newly created resource in storage.
-	 *
-	 * @return Response
-	 */
-	public function store()
-	{		
-    	$validator = Validator::make(Input::all(), [
-    		'title'        => 'required|alpha|between:1,50',
-    		'description'  => ''
-    	]);
-
-    	if( $validator->fails() ) {
-    		return Response::json( ['code'=>1, 'error'=>'Validation failed'], 400);
-    	}
-
-		$category = new Categories();
-		$category->group_id  = Session::get('groupID');
-		$category->category_title = Input::get('title');
-		$category->description = Input::get('description');
-		$category->is_active = true;
-
-		if( !$category->save() ) {
-
-			return Response::json( ['code'=>2, 'error'=>'Database error'], 400);
-		}
-
-    	return Response::json( ['id' => DB::getPdo()->lastInsertId() ], 200);
-	}
-
-
-	/**
-	 * Display the specified resource.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function show($id)
-	{
-		if( !$this->isID($id) )
-			return Response::json( ['code'=>1, 'error'=>'Parameter must be an integer'], 400);
-
-		$category = Categories::fromGroup()->find($id);
-
-		if( $category == null )
-			return Response::json();
-
-		return Response::json($category, 200);
-	}
-
-
-	/**
-	 * Update the specified resource in storage.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function update($id)
-	{
-		$validator = Validator::make(Input::all(), [
-    		'title'        => 'required|alpha|between:1,50',
-    		'description'  => ''
-    	]);
-
-    	if( $validator->fails() ) {
-    		return Response::json( ['code'=>3, 'error'=>'Validation failed'], 400);
-    	}
-
-		if( !$this->isID($id) )
-			return Response::json(['code'=>1, 'error'=>'Parameter must be numeric'], 400);
-
-		$category = Categories::fromGroup()->find($id);
-
-		if( $category == null )
-			return Response::json( ['code'=>2, 'error'=>'Category not found'] , 400);
-
-		$category->category_title = Input::get('title');
-		$category->description = Input::get('description');
-
-		if( !$category->save() ) {
-
-			return Response::json( ['code'=>2, 'error'=>'Database error'], 400);
-		}
-
-    	return Response::json( [], 200);
-	}
-
-
-	/**
-	 * Remove the specified resource from storage.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function destroy($id)
-	{
-		if( !$this->isID($id) )
-			return Response::json(['code'=>1, 'error'=>'Parameter must be numeric'], 400);
-
-		$category = Categories::fromGroup()->find($id);
+    /**
+     * Display a listing of the resource.
+     *
+     * @return Response
+     */
+    public function index()
+    {
+        $categoriesFromGroup = Categories::allAPI();
+
+        return Response::json( $categoriesFromGroup, 200);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @return Response
+     */
+    public function store()
+    {		
+        $validator = Validator::make(Input::all(), [
+            'title'        => 'required|alpha|between:1,50',
+            'description'  => ''
+        ]);
+
+        if( $validator->fails() ) {
+            return Response::json( ['code'=>1, 'error'=>'Validation failed'], 400);
+        }
+
+        $category = new Categories();
+        $category->group_id  = Session::get('groupID');
+        $category->category_title = Input::get('title');
+        $category->description = Input::get('description');
+        $category->is_active = true;
+
+        if( !$category->save() ) {
+
+            return Response::json( ['code'=>2, 'error'=>'Database error'], 400);
+        }
+
+        return Response::json( ['id' => DB::getPdo()->lastInsertId() ], 200);
+    }
+
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function show($id)
+    {
+        if( !$this->isID($id) )
+            return Response::json( ['code'=>1, 'error'=>'Parameter must be an integer'], 400);
+
+        $category = Categories::fromGroup()->find($id);
+
+        if( $category == null )
+            return Response::json();
+
+        return Response::json($category, 200);
+    }
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function update($id)
+    {
+        $validator = Validator::make(Input::all(), [
+            'title'        => 'required|alpha|between:1,50',
+            'description'  => ''
+        ]);
+
+        if( $validator->fails() ) {
+            return Response::json( ['code'=>3, 'error'=>'Validation failed'], 400);
+        }
+
+        if( !$this->isID($id) )
+            return Response::json(['code'=>1, 'error'=>'Parameter must be numeric'], 400);
+
+        $category = Categories::fromGroup()->find($id);
+
+        if( $category == null )
+            return Response::json( ['code'=>2, 'error'=>'Category not found'] , 400);
+
+        $category->category_title = Input::get('title');
+        $category->description = Input::get('description');
+
+        if( !$category->save() ) {
+
+            return Response::json( ['code'=>2, 'error'=>'Database error'], 400);
+        }
+
+        return Response::json( [], 200);
+    }
+
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function destroy($id)
+    {
+        if( !$this->isID($id) )
+            return Response::json(['code'=>1, 'error'=>'Parameter must be numeric'], 400);
+
+        $category = Categories::fromGroup()->find($id);
 		
-		if( $category == null )
-			return Response::json( ['code'=>2, 'error'=>'Category not found'], 400);
+        if( $category == null )
+            return Response::json( ['code'=>2, 'error'=>'Category not found'], 400);
 
-		$products = Categories::find($id)->products()->get();
+        $products = Categories::find($id)->products()->get();
 
-		if( count($products) != 0 )
-			return Response::json( ['code'=>3, 'error'=>'Category not empty'], 400);
+        if( count($products) != 0 )
+            return Response::json( ['code'=>3, 'error'=>'Category not empty'], 400);
 
-		try {
-			$category->delete();
-		}
-		catch(\Exception $e) {
-			return Response::json( ['code'=>4, 'error'=>'Database error'], 400);
-		}
+        try {
+            $category->delete();
+        }
+        catch(\Exception $e) {
+            return Response::json( ['code'=>4, 'error'=>'Database error'], 400);
+        }
 
-    	return Response::json( [], 200);
-	}
+        return Response::json( [], 200);
+    }
 
-	private function isID($id) {
+    private function isID($id) {
 
-		return (bool) preg_match('/^[0-9]{1,10}$/', $id);
-	}
+        return (bool) preg_match('/^[0-9]{1,10}$/', $id);
+    }
 }

app/Http/Controllers/LoginController.php

Indentation +11 added lines, -11 removed lines

@@ -13,17 +13,17 @@ 
 
 class LoginController extends Controller {
 
-	private $userRepository;
+    private $userRepository;
 	
-	public function __construct(UserRepository $repository)
-	{
-		$this->userRepository = $repository;
-	}
+    public function __construct(UserRepository $repository)
+    {
+        $this->userRepository = $repository;
+    }
 
-	public function getLoginForm()
-	{
-		return view('public.login');	
-	}
+    public function getLoginForm()
+    {
+        return view('public.login');	
+    }
     
     public function loginAttempt(Request $request)
     {
@@ -43,11 +43,11 @@ 
 
         try 
         {
-        	$user = $this->userRepository->findActive($email);
+            $user = $this->userRepository->findActive($email);
         }
         catch (RepositoryException $e)
         {
-        	return redirect('/')->with('error', 'The email and password you entered don\'t match')
+            return redirect('/')->with('error', 'The email and password you entered don\'t match')
                                 ->with('email', $email);
         }
                         

app/Http/Controllers/PublicController.php

Indentation +5 added lines, -5 removed lines

@@ -2,10 +2,10 @@
 
 class PublicController extends Controller {
 	
-	// UNUSED
-	public function home()
-	{        
-		return view('public.home');
-	}
+    // UNUSED
+    public function home()
+    {        
+        return view('public.home');
+    }
 
 }

app/Http/Controllers/SnapshotController.php

Indentation +30 added lines, -30 removed lines

@@ -8,35 +8,35 @@
 
 class SnapshotController extends \Controller {
 	
-	protected $repository;
-
-	public function __construct(SnapshotRepository $repository)
-	{
-		$this->repository = $repository;
-	}
-
-	public function index()
-	{
-		$snapshots = $this->repository->all();
-		return Response::json( $this->repository->APIFormat($snapshots), 200);
-	}
-
-	public function store()
-	{		
-		$snapshot = $this->repository->store( Input::all() );
-		return Response::json( ['id' => $snapshot->id], 200);
-	}
-
-	public function show($id)
-	{
-		$snapshot = $this->repository->get($id);
-		return Response::json($this->repository->APIFormat($snapshot), 200);
-	}
-
-	public function getCurrent()
-	{
-		$snapshot = $this->repository->current();
-		return Response::json($this->repository->APIFormat($snapshot), 200);
-	}
+    protected $repository;
+
+    public function __construct(SnapshotRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function index()
+    {
+        $snapshots = $this->repository->all();
+        return Response::json( $this->repository->APIFormat($snapshots), 200);
+    }
+
+    public function store()
+    {		
+        $snapshot = $this->repository->store( Input::all() );
+        return Response::json( ['id' => $snapshot->id], 200);
+    }
+
+    public function show($id)
+    {
+        $snapshot = $this->repository->get($id);
+        return Response::json($this->repository->APIFormat($snapshot), 200);
+    }
+
+    public function getCurrent()
+    {
+        $snapshot = $this->repository->current();
+        return Response::json($this->repository->APIFormat($snapshot), 200);
+    }
 
 }

app/Http/Controllers/UsersController.php

Indentation +50 added lines, -50 removed lines

@@ -8,34 +8,34 @@ 
 
 class UsersController extends Controller {
 	
-	private $userRepository;
+    private $userRepository;
     private $connectRepository;
 
-	public function __construct(UserRepository $repository, ConnectRepository $connectRepository)
-	{
-		$this->userRepository = $repository;
+    public function __construct(UserRepository $repository, ConnectRepository $connectRepository)
+    {
+        $this->userRepository = $repository;
         $this->connectRepository = $connectRepository;
-	}
+    }
 
     public function getActiveUsers()
     {
-    	$allUsers = $this->userRepository->allByStatus(true);
+        $allUsers = $this->userRepository->allByStatus(true);
         $otherUsersCount = count($this->userRepository->allByStatus(false));
 
         return view('users.app')->with('users', $allUsers)
-        						->with('roles', $this->getRoleNames())
-        						->with('isActive', true)
+                                ->with('roles', $this->getRoleNames())
+                                ->with('isActive', true)
                                 ->with('otherUsersCount', $otherUsersCount);
     }
     
     public function getDisabledUsers()
     {
-    	$allUsers = $this->userRepository->allByStatus(false);
+        $allUsers = $this->userRepository->allByStatus(false);
         $otherUsersCount = count($this->userRepository->allByStatus(true));
 
-    	return view('users.app')->with('users', $allUsers)
-    							->with('roles', $this->getRoleNames())
-    							->with('isActive', false)
+        return view('users.app')->with('users', $allUsers)
+                                ->with('roles', $this->getRoleNames())
+                                ->with('isActive', false)
                                 ->with('otherUsersCount', $otherUsersCount);
     }
 
@@ -50,70 +50,70 @@ 
     
     public function getRegisterForm()
     {
-    	return view('users.register');
+        return view('users.register');
     }
     
     public function registerNewUser()
     {
-    	try {
-    		$user = $this->userRepository->store(Input::all());
-    	}
+        try {
+            $user = $this->userRepository->store(Input::all());
+        }
         catch(ValidationException $e) {
             return redirect('app/users/register')->withInput()
-                                                 ->with('error', $e->getMessageBag()->first());
+                                                    ->with('error', $e->getMessageBag()->first());
         }
         catch (RepositoryException $e) {
-    		return redirect('app/users/register')->with('error', 'Could not add new user: '.strtolower($e->getMessage()))
-                                                 ->withInput();
-    	}
+            return redirect('app/users/register')->with('error', 'Could not add new user: '.strtolower($e->getMessage()))
+                                                    ->withInput();
+        }
     	    	
-    	return redirect('app/users')->with('success', $user->firstname.' account added');
+        return redirect('app/users')->with('success', $user->firstname.' account added');
     }
     
     public function changeAccountStatus($userId)
     {    	
-    	try {
-    		$user = $this->userRepository->changeStatus($userId);
-    	}
-    	catch(RepositoryException $e) {
-    		return redirect('app/users')->with('error', 'Could not change account status');
-    	}
+        try {
+            $user = $this->userRepository->changeStatus($userId);
+        }
+        catch(RepositoryException $e) {
+            return redirect('app/users')->with('error', 'Could not change account status');
+        }
     	
-    	if($user->is_active)
-    		return redirect('app/users/disabled')->with('success', 'User <b>'.$user->firstname.'</b> enabled');
-    	else
-    		return redirect('app/users')->with('success', 'User <b>'.$user->firstname.'</b> disabled');
+        if($user->is_active)
+            return redirect('app/users/disabled')->with('success', 'User <b>'.$user->firstname.'</b> enabled');
+        else
+            return redirect('app/users')->with('success', 'User <b>'.$user->firstname.'</b> disabled');
     }
     
     public function changeAccountRole($userId)
     {
-    	try {
-    		$user = $this->userRepository->changeRole($userId);
-    	}
-    	catch(RepositoryException $e) {
-    		return redirect('app/users')->with('error', 'Could not change user role');
-    	}
+        try {
+            $user = $this->userRepository->changeRole($userId);
+        }
+        catch(RepositoryException $e) {
+            return redirect('app/users')->with('error', 'Could not change user role');
+        }
     	
-    	$redirectUrl = 'app/users';
-    	if( !$user->is_active )
-    		$redirectUrl .= '/disabled';
+        $redirectUrl = 'app/users';
+        if( !$user->is_active )
+            $redirectUrl .= '/disabled';
     	
-    	$roleNames = ['ADMN'=>'administrator','MNGR'=>'manager','USER'=>'user'];
-    	$roleName = $roleNames[$user->role];
+        $roleNames = ['ADMN'=>'administrator','MNGR'=>'manager','USER'=>'user'];
+        $roleName = $roleNames[$user->role];
     	
-    	return redirect($redirectUrl)->with('success', 'User <b>'.$user->firstname.'</b> is now <i>'.$roleName.'</i>');
+        return redirect($redirectUrl)->with('success', 'User <b>'.$user->firstname.'</b> is now <i>'.$roleName.'</i>');
     }
     
     public function deleteUser($userId)
     {
-    	try {
-    		$user = $this->userRepository->softDelete($userId);
-    	}
-    	catch(RepositoryException $e) {
-    		return redirect('app/users')->with('error', 'User could not be deleted: '.$e->getMessage());
-    	}
+        try {
+            $user = $this->userRepository->softDelete($userId);
+        }
+        catch(RepositoryException $e) {
+            return redirect('app/users')->with('error', 'User could not be deleted: '.$e->getMessage());
+        }
     	
-    	return redirect('app/users')->with('success', 'User <b>'.$user->firstname.'</b> deleted');
+        return redirect('app/users')->with('success', 'User <b>'.$user->firstname.'</b> deleted');
     }
 
     private function getRoleNames()

app/Http/Kernel.php

Indentation +23 added lines, -23 removed lines

@@ -4,33 +4,33 @@
 
 class Kernel extends HttpKernel {
 
-	/**
-	 * The application's global HTTP middleware stack.
-	 *
-	 * @var array
-	 */
-	protected $middleware = [
-		'Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode',
-		'Illuminate\Cookie\Middleware\EncryptCookies',
-		'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse',
-		'Illuminate\Session\Middleware\StartSession',
-		'Illuminate\View\Middleware\ShareErrorsFromSession',
-		'App\Http\Middleware\VerifyCsrfToken',
-	];
+    /**
+     * The application's global HTTP middleware stack.
+     *
+     * @var array
+     */
+    protected $middleware = [
+        'Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode',
+        'Illuminate\Cookie\Middleware\EncryptCookies',
+        'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse',
+        'Illuminate\Session\Middleware\StartSession',
+        'Illuminate\View\Middleware\ShareErrorsFromSession',
+        'App\Http\Middleware\VerifyCsrfToken',
+    ];
 
-	/**
-	 * The application's route middleware.
-	 *
-	 * @var array
-	 */
-	protected $routeMiddleware = [
-		'auth'          => 'App\Http\Middleware\Authenticate',
-		'auth.basic'    => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
-		'guest'         => 'App\Http\Middleware\RedirectIfAuthenticated',
+    /**
+     * The application's route middleware.
+     *
+     * @var array
+     */
+    protected $routeMiddleware = [
+        'auth'          => 'App\Http\Middleware\Authenticate',
+        'auth.basic'    => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
+        'guest'         => 'App\Http\Middleware\RedirectIfAuthenticated',
         'user'          => 'App\Http\Middleware\User',
         'manager'       => 'App\Http\Middleware\Manager',
         'administrator' => 'App\Http\Middleware\Administrator',
         'installed'     => 'App\Http\Middleware\RedirectIfInstalled',
-	];
+    ];
 
 }