Merge pull request #8 from lbausch/development

Minor Updates

Author: lbausch

.env.example

@@ -27,5 +27,6 @@ MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
 
-ASSETS_PIPELINE=true
+ASSETS_PIPELINE=auto

.gitignore

@@ -1,12 +1,11 @@
 /vendor
 /node_modules
+Homestead.yaml
+Homestead.json
 .env
 
-## Composer
-composer.lock
+## PhpStorm
+.idea/
 
 ## Assets
 /public/assets/min
-
-## PhpStorm
-.idea/

README.md

@@ -3,7 +3,6 @@ SQLgreyGUI
 
 Web interface for [SQLgrey](http://sqlgrey.sourceforge.net/) using the [Laravel 5](http://laravel.com/) Framework.
 
-
 ## Features
 * Dashboard: quick overview of emails / domains in greylist, whitelist, opt-out and opt-in
 * Greylist: delete entries or move them to the whitelist
@@ -23,12 +22,12 @@ Web interface for [SQLgrey](http://sqlgrey.sourceforge.net/) using the [Laravel
 1. grab a copy of the code (download [master.zip](https://github.com/lbausch/SQLgreyGUI/archive/master.zip) or use `git clone https://github.com/lbausch/SQLgreyGUI.git`)
 2. make your webserver use the `public` directory as document root
 3. copy `.env.example` to `.env` and adjust it to your needs (`APP_URL`, `APP_TIMEZONE`, `APP_KEY` and database settings)
-4. run `composer update` to install all necessary dependencies and set a new application key with `php artisan key:generate`
-5. run `php artisan migrate --force` to create the database tables
-6. run `php artisan db:seed --force` to create an admin user
+4. run `composer install` to install all necessary dependencies
+5. set a new application key with `php artisan key:generate`
+6. run `php artisan migrate --seed --force` to create the database tables and an admin user
 7. login with the username `admin` and the password `joh316` (you can change the password in "Settings")
 
 
 ## Screenshots
 ![Dasboard](/../screenshots/dashboard.png?raw=true "Dashboard")
-![Auto-Whitelist](/../screenshots/auto-whitelist.png?raw=true "Auto-Whitelist")
+![Auto-Whitelist](/../screenshots/auto-whitelist.png?raw=true "Auto-Whitelist")

app/Console/Commands/Inspire.php

@@ -1,32 +1,33 @@
-<?php namespace SQLgreyGUI\Console\Commands;
+<?php
+
+namespace SQLgreyGUI\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;
 
-class Inspire extends Command {
-
-	/**
-	 * The console command name.
-	 *
-	 * @var string
-	 */
-	protected $name = 'inspire';
-
-	/**
-	 * The console command description.
-	 *
-	 * @var string
-	 */
-	protected $description = 'Display an inspiring quote';
+class Inspire extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'inspire';
 
-	/**
-	 * Execute the console command.
-	 *
-	 * @return mixed
-	 */
-	public function handle()
-	{
-		$this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
-	}
+    /**
+     * 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);
+    }
 }

app/Console/Kernel.php

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

app/Events/Event.php

@@ -1,7 +1,8 @@
-<?php namespace SQLgreyGUI\Events;
+<?php
 
-abstract class Event {
-
-	//
+namespace SQLgreyGUI\Events;
 
+abstract class Event
+{
+    //
 }

app/Exceptions/Handler.php

@@ -1,42 +1,51 @@
-<?php namespace SQLgreyGUI\Exceptions;
+<?php
+
+namespace SQLgreyGUI\Exceptions;
 
 use Exception;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
-class Handler extends ExceptionHandler {
-
-	/**
-	 * A list of the exception types that should not be reported.
-	 *
-	 * @var array
-	 */
-	protected $dontReport = [
-		'Symfony\Component\HttpKernel\Exception\HttpException'
-	];
+class Handler extends ExceptionHandler
+{
+    /**
+     * A list of the exception types that should not be reported.
+     *
+     * @var array
+     */
+    protected $dontReport = [
+        HttpException::class,
+        ModelNotFoundException::class,
+    ];
 
-	/**
-	 * Report or log an exception.
-	 *
-	 * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-	 *
-	 * @param  \Exception  $e
-	 * @return void
-	 */
-	public function report(Exception $e)
-	{
-		return parent::report($e);
-	}
+    /**
+     * Report or log an exception.
+     *
+     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     *
+     * @param \Exception $e
+     */
+    public function report(Exception $e)
+    {
+        return parent::report($e);
+    }
 
-	/**
-	 * Render an exception into an HTTP response.
-	 *
-	 * @param  \Illuminate\Http\Request  $request
-	 * @param  \Exception  $e
-	 * @return \Illuminate\Http\Response
-	 */
-	public function render($request, Exception $e)
-	{
-		return parent::render($request, $e);
-	}
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Exception               $e
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request, Exception $e)
+    {
+        if ($e instanceof ModelNotFoundException) {
+            $e = new NotFoundHttpException($e->getMessage(), $e);
+        }
 
+        return parent::render($request, $e);
+    }
 }

app/Http/Controllers/AboutController.php

@@ -4,25 +4,21 @@
 
 class AboutController extends Controller
 {
-
     /**
-     * Constructor
-     * 
-     * @return void
+     * Constructor.
      */
     public function __construct()
     {
         parent::__construct();
     }
 
     /**
-     * index
+     * Index.
      *
-     * @return Response
+     * @return \Illuminate\Http\Response
      */
     public function index()
     {
         return view('about.index');
     }
-
 }

app/Http/Controllers/AuthController.php

@@ -3,24 +3,24 @@
 namespace SQLgreyGUI\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Auth;
 
 class AuthController extends Controller
 {
-
     /**
-     * show login form
+     * Show login form.
      *
-     * @return Response
+     * @return \Illuminate\Http\Response
      */
     public function showLogin()
     {
         return view('auth.login');
     }
 
     /**
-     * login
-     * 
-     * @return Response
+     * Login.
+     *
+     * @return \Illuminate\Http\Response
      */
     public function login(Request $req)
     {
@@ -36,35 +36,35 @@ public function login(Request $req)
         $this->validate($req, $rules);
 
         // Try to log the user in.
-        if (\Auth::attempt([
-                    'username' => $req->input('username'),
-                    'password' => $req->input('password'),
-                    'enabled' => 1,
-                        ], $remember)) {
+        if (Auth::attempt([
+            'username' => $req->input('username'),
+            'password' => $req->input('password'),
+            'enabled' => 1,
+        ], $remember)
+        ) {
 
             // Redirect to dashboard
-            return \Redirect::intended('/')
-                            ->withSuccess('You have logged in successfully');
+            return redirect()->intended('/')
+                ->withSuccess('You have logged in successfully');
         }
 
         // Redirect to the login page
         return redirect(action('AuthController@showLogin'))
-                        ->withErrors(['general' => 'Username/ Password invalid'])
-                        ->withInput($req->except('password'));
+            ->withErrors(['general' => 'Username/ Password invalid'])
+            ->withInput($req->except('password'));
     }
 
     /**
-     * logout
+     * logout.
      *
      * @return Response
      */
     public function logout()
     {
-        \Auth::logout();
+        Auth::logout();
 
         // Redirect to homepage
         return redirect('/')
-                        ->withSuccess('You are logged out');
+            ->withSuccess('You are logged out');
     }
-
 }