Merge branch 'laravel5'

Author: Lorenz Bausch

.env.example

@@ -0,0 +1,31 @@
+APP_ENV=production
+APP_DEBUG=false
+APP_URL=http://localhost:8000
+APP_TIMEZONE=Europe/Berlin
+APP_KEY=SomeRandomString
+
+# database for SQLgreyGUI
+# if you want to use a single database for both SQLgreyGUI and SQLgrey
+# use only this config block
+DB_HOST=localhost
+DB_DATABASE=sqlgrey
+DB_USERNAME=sqlgrey
+DB_PASSWORD=sqlgrey
+
+# Uncomment the following lines if SQLgrey resides in a different database
+#SQLGREY_DB_HOST=null
+#SQLGREY_DB_DATABASE=null
+#SQLGREY_DB_USERNAME=null
+#SQLGREY_DB_PASSWORD=null
+
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+MAIL_DRIVER=mail
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+
+ASSETS_PIPELINE=true

.gitattributes

@@ -1 +1,3 @@
 * text=auto
+*.css linguist-vendored
+*.less linguist-vendored

.gitignore

@@ -1,22 +1,9 @@
-/bootstrap/compiled.php
 /vendor
-composer.phar
-composer.lock
-.env.*.php
-.env.php
-.DS_Store
-Thumbs.db
-
-
-# config file(s)
-/app/config/app.php
-/app/config/mail.php
-/config.php
-
-# components
-/components
+/node_modules
+.env
 
+## Composer
+composer.lock
 
-# assets
-/public/assets/minified/*.js
-/public/assets/minified/*.css
+## Assets
+/public/assets/min

README.md

@@ -1,16 +1,15 @@
 SQLgreyGUI
 ==========
 
-Web interface for [SQLgrey](http://sqlgrey.sourceforge.net/) using the [Laravel](http://laravel.com/) Framework.
+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
+* Dashboard: quick overview of emails / domains in greylist, whitelist, opt-out and opt-in
 * Greylist: delete entries or move them to the whitelist
-* Greylist: new entries are displayed without the need to refresh periodically
-* Whitelist: add sender eMails or sender domains to prevent them from being greylisted and delivered directly
-* Opt-out: define eMails or Domains you don't want greylisting to be enabled for
-* Opt-in: define  eMails or Domains for which you want to enforce greylisting permanently
+* Whitelist: add sender emails or sender domains to prevent them from being greylisted and delivered directly
+* Opt-out: define emails or domains you don't want greylisting to be enabled for
+* Opt-in: define  emails or domains for which you want to enforce greylisting permanently
 * Option of using seperate databases for SQLgrey and the application itself. This way you can maintain a user database in a single place and use it with all installations of SQLgreyGUI. In addition you don't need to alter the SQLgrey database at all.
 
 
@@ -20,14 +19,14 @@ Web interface for [SQLgrey](http://sqlgrey.sourceforge.net/) using the [Laravel]
 * PHP >= 5.4.0
 
 
-## Installation in 7 steps
+## Installation in 7 simple steps
 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. rename `config-dist.php` to `config.php`, `app/config/app-dist.php` to `app/config/app.php` and `app/config/mail-dist.php` to `app/config/mail.php`. Adjust the settings to your needs (check `timezone` setting in `app/config/app.php`!).
-4. run `composer update` to install all necessary dependencies
+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
-7. login with the username `admin` and the password `joh316`
+7. login with the username `admin` and the password `joh316` (you can change the password in "Settings")
 
 
 ## Screenshots

app/Commands/Command.php

@@ -0,0 +1,7 @@
+<?php namespace SQLgreyGUI\Commands;
+
+abstract class Command {
+
+	//
+
+}

app/Console/Commands/Inspire.php

@@ -0,0 +1,32 @@
+<?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';
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
+	}
+
+}

app/Console/Kernel.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace SQLgreyGUI\Console;
+
+use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+
+class Kernel extends ConsoleKernel
+{
+
+    /**
+     * The Artisan commands provided by your application.
+     *
+     * @var array
+     */
+    protected $commands = [
+        'SQLgreyGUI\Console\Commands\Inspire',
+    ];
+
+    /**
+     * Define the application's command schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @return void
+     */
+    protected function schedule(Schedule $schedule)
+    {
+        //$schedule->command('inspire')->hourly();
+    }
+
+}

app/Events/Event.php

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

app/Exceptions/Handler.php

@@ -0,0 +1,42 @@
+<?php namespace SQLgreyGUI\Exceptions;
+
+use Exception;
+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'
+	];
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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);
+	}
+
+}