7.0.0-beta3 Release (#541)

* 391 Notification refactorings (#441)

* Refactor notifications to allow easier plugins

* Notification refactoring

* Formatting

* Move news to NewsService; cleanup of events

* More refactoring; added send email out for news item and the template

* Formatting

* Formatting

* Fix missing newsRepo (#445)

* Refactor and add importer to Installer module #443 (#444)

* Refactor and add importer to Installer module #443

* Refactor for finances to use in import

* Import groups into roles

* Formatting

* Formatting

* Add interface in installer for import

* Notes about importing

* Check for installer folder

* Formatting

* Fix pirep->user mapping

* Unused import

* Formatting

* Replace importer with AJAX powered; better error handling #443 (#447)

* Replace importer with AJAX powered; better error handling #443

* Formatting

* Fix command line importer

* Remove bootstrap cache (#448)

* Cleanup the bootstrap/cache directory when packaging

* Fix removal of bootstrap cache

* Formatting

* Stricter checks on ACARS API data (#451)

* Stricter checks on ACARS API data

* More checks

* Fix for flight_number check forcing to exist

* Allow nullable on flight_id

* Avoid proc_open use #455 (#456)

* Use PhpExecutableFinder() closes #457 #458 (#460)

* Use DateTimeZone instead of int for creating datetime

closes #461

* Fix CSV imports giving Storage class not found #454 (#462)

* Fix CSV imports giving Storage class not found #454

* Update yarn files for security alert

* Add PHP 7.4 support (#464)

* Add PHP 7.4 to build matrix

* DB fix

* YAML parser fix in test data

* Show versions

* Package updates

* Track used ICAOs

* 7.4 METAR parsing fix

* METAR parser fix

* Formatting

* Add meters to response units

* Call instance for unit conversion

* Return value

* Catch exception for unknown quantity

* Comment fix

* Formatting

* METAR parsing fixes on PHP 7.4

* Package updates

* More random airport ID

* More random airport ID

* Properly disable toolbar

* Semver written out to version file

* Use dev as default identifier

* Fix BindingResolutionError when debug toolbar isn't present (#465)

* Fix BindingResolutionError when debug toolbar isn't present

* Formatting

* Split the importer module out from the installer module (#468)

* Split the importer module out from the installer module

* Cleanup of unused imports

* Move updater into separate module #453

* Remove unused imports/formatting

* Disable the install and importer modules at the end of the setup

* Unused imports; update IJ style

* test explicit stage for php+mysql

* add more to matrix

* Add different MariaDB versions

* undo

* Cleanup Model doc

* Pilots cannot use the dashboard or flights without admin rights (#481)

* Use auth middleware instead of specific groups for logged in state

* Auth check for admin access

* Check user admin access for updates

* Formatting

* Allow nullable field and calculate distance if nulled for flight import #478 (#482)

* Check for no roles being attached #480 (#483)

* Return the flight fares if there are no subfleet fares #488 (#489)

* Return the flight fares if there are no subfleet fares #488

* Formatting

* Formatting

* Account for units when entering fuel amounts #493

* Search for ICAO not working properly (#496)

* /flights and /flights/search direct to the same endpoint

* Properly set the distance/planned_distance on save (#497)

* 491 Installation Error (#495)

* Disable CSRF token

* Add error handling around looking up the theme and set a default

* Note about logs in issue template

* Formatting

* Fix GeoService errors when viewing PIREP #498 (#499)

* Add new command to export a specific PIREP for debugging (#501)

* Set a default model value for airports on PIREP (#500)

* Set a default model value for airports on PIREP

* Fix airport icao reference

* Default airport models

* Catch broader exception writing out config files #491

* style

* Add reference to docs on doc site (#502)

* Properly create/update rows importing #486 (#503)

* Add base Dockerfile for Dockerhub builds (#504)

* New subfleet not being attached to an airline on import #479 (#505)

* Fix subfleet not being attached to an airline on creation in import #479

* Call airline name with optional() around subfleet

* Minor cleanup

* Search flights by subfleet #484 (#506)

* API level search of flights #484

* Add Subfleet to flights page for search

* Make the fuel used optional (#512)

* Add make to Docker container

* Add getRootDomain() to Utils (#514)

* Show admin dropdown for admin-access ability (#515)

* Show admin dropdown for admin-access ability closes #509

* Formatting

* Check user permissions on the routes #508 (#516)

* Check user permissions on the routes #508

* Formatting

* Return default value on exception for setting()

* Correct text for no subfleets #507 (#518)

* Add a public_url() helper #513 (#519)

* Reduce number of queries for update check (#520)

* Try to clear caches before updating (#522)

* Try to clear caches before updating

* Add clear-compiled to maintenance cache list

* Formatting

* Set PIREPs page to public (#526)

Set PIREPs page to public

* Fix live and route map errors #527 (#528)

* Add menu bar for mobile (#529)

* Format all blade templates to 2 spaces #530 (#531)

* Fix PIREP edit endpoint closes #533 (#534)

* Fix import during flight cron #532 (#535)

* PIREPS resource except for show (#536)

* Use optional() around the airport fields (#537)

* Use optional() around the airport fields

* Add null-coalesce around full_name

* Add link to download ACARS config from profile (#539)

* Add link to download ACARS config from profile

* Formatting

* Update xml config file template (#540)

modules/Installer/Http/Controllers/InstallerController.php

@@ -7,6 +7,8 @@ use App\Facades\Utils;
 use App\Models\User;
 use App\Repositories\AirlineRepository;
 use App\Services\AnalyticsService;
+use App\Services\Installer\DatabaseService;
+use App\Services\Installer\InstallerService;
 use App\Services\Installer\MigrationService;
 use App\Services\Installer\SeederService;
 use App\Services\UserService;
@@ -17,13 +19,8 @@ use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 use Modules\Installer\Services\ConfigService;
-use Modules\Installer\Services\DatabaseService;
 use Modules\Installer\Services\RequirementsService;
-use Symfony\Component\HttpFoundation\File\Exception\FileException;
 
-/**
- * Class InstallerController
- */
 class InstallerController extends Controller
 {
     private $airlineRepo;
@@ -65,6 +62,8 @@ class InstallerController extends Controller
         $this->reqSvc = $reqSvc;
         $this->seederSvc = $seederSvc;
         $this->userService = $userService;
+
+        \App\Support\Utils::disableDebugToolbar();
     }
 
     /**
@@ -106,7 +105,7 @@ class InstallerController extends Controller
             $message = 'Failed! '.$e->getMessage();
         }
 
-        return view('installer::flash/dbtest', [
+        return view('installer::install/dbtest', [
             'status'  => $status,
             'message' => $message,
         ]);
@@ -221,7 +220,7 @@ class InstallerController extends Controller
          */
         try {
             $this->envSvc->createConfigFiles($attrs);
-        } catch (FileException $e) {
+        } catch (\Exception $e) {
             Log::error('Config files failed to write');
             Log::error($e->getMessage());
 
@@ -351,6 +350,9 @@ class InstallerController extends Controller
      */
     public function complete(Request $request)
     {
+        $installerSvc = app(InstallerService::class);
+        $installerSvc->disableInstallerModules();
+
         return redirect('/login');
     }
 }

modules/Installer/Http/Controllers/UpdaterController.php

@@ -1,96 +0,0 @@
-<?php
-
-namespace Modules\Installer\Http\Controllers;
-
-use App\Contracts\Controller;
-use App\Services\Installer\MigrationService;
-use App\Services\Installer\SeederService;
-use function count;
-use Illuminate\Http\Request;
-use Log;
-
-/**
- * Class UpdaterController
- */
-class UpdaterController extends Controller
-{
-    private $migrationSvc;
-    private $seederSvc;
-
-    /**
-     * UpdaterController constructor.
-     *
-     * @param MigrationService $migrationSvc
-     * @param SeederService    $seederSvc
-     */
-    public function __construct(
-        MigrationService $migrationSvc,
-        SeederService $seederSvc
-    ) {
-        $this->migrationSvc = $migrationSvc;
-        $this->seederSvc = $seederSvc;
-    }
-
-    /**
-     * Display a listing of the resource.
-     */
-    public function index()
-    {
-        return view('installer::update/index-start');
-    }
-
-    /**
-     * Step 1. Check if there's an update available. Check if there
-     * are any unrun migrations
-     *
-     * @param Request $request
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function step1(Request $request)
-    {
-        $migrations = $this->migrationSvc->migrationsAvailable();
-        if (count($migrations) > 0) {
-            Log::info('No migrations found');
-        }
-
-        return view('installer::update/steps/step1-update-available');
-    }
-
-    /**
-     * Step 2 Run all of the migrations
-     *
-     * @param Request $request
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function run_migrations(Request $request)
-    {
-        Log::info('Update: run_migrations', $request->post());
-
-        $migrations = $this->migrationSvc->migrationsAvailable();
-        if (count($migrations) === 0) {
-            $this->seederSvc->syncAllSeeds();
-            return view('installer::update/steps/step3-update-complete');
-        }
-
-        $output = $this->migrationSvc->runAllMigrations();
-        $this->seederSvc->syncAllSeeds();
-
-        return view('installer::update/steps/step2-migrations-done', [
-            'console_output' => $output,
-        ]);
-    }
-
-    /**
-     * Final step
-     *
-     * @param Request $request
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function complete(Request $request)
-    {
-        return redirect('/login');
-    }
-}

modules/Installer/Http/Routes/install.php

@@ -1,16 +0,0 @@
-<?php
-
-Route::get('/', 'InstallerController@index')->name('index');
-Route::post('/dbtest', 'InstallerController@dbtest')->name('dbtest');
-
-Route::get('/step1', 'InstallerController@step1')->name('step1');
-Route::post('/step1', 'InstallerController@step1')->name('step1');
-
-Route::get('/step2', 'InstallerController@step2')->name('step2');
-Route::post('/envsetup', 'InstallerController@envsetup')->name('envsetup');
-Route::get('/dbsetup', 'InstallerController@dbsetup')->name('dbsetup');
-
-Route::get('/step3', 'InstallerController@step3')->name('step3');
-Route::post('/usersetup', 'InstallerController@usersetup')->name('usersetup');
-
-Route::get('/complete', 'InstallerController@complete')->name('complete');

modules/Installer/Http/Routes/update.php

@@ -1,9 +0,0 @@
-<?php
-
-Route::get('/', 'UpdaterController@index')->name('index');
-
-Route::get('/step1', 'UpdaterController@step1')->name('step1');
-Route::post('/step1', 'UpdaterController@step1')->name('step1');
-
-Route::post('/run-migrations', 'UpdaterController@run_migrations')->name('run_migrations');
-Route::get('/complete', 'UpdaterController@complete')->name('complete');

modules/Installer/Providers/InstallerServiceProvider.php

@@ -2,27 +2,20 @@
 
 namespace Modules\Installer\Providers;
 
-use App\Services\ModuleService;
+use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
-use Route;
 
 class InstallerServiceProvider extends ServiceProvider
 {
-    protected $moduleSvc;
-
     /**
      * Boot the application events.
      */
     public function boot()
     {
-        $this->moduleSvc = app(ModuleService::class);
-
         $this->registerRoutes();
         $this->registerTranslations();
         $this->registerConfig();
         $this->registerViews();
-
-        $this->loadMigrationsFrom(__DIR__.'/../Database/migrations');
     }
 
     /**
@@ -36,17 +29,21 @@ class InstallerServiceProvider extends ServiceProvider
             'middleware' => ['web'],
             'namespace'  => 'Modules\Installer\Http\Controllers',
         ], function () {
-            $this->loadRoutesFrom(__DIR__.'/../Http/Routes/install.php');
-        });
+            Route::get('/', 'InstallerController@index')->name('index');
+            Route::post('/dbtest', 'InstallerController@dbtest')->name('dbtest');
 
-        Route::group([
-             'as'         => 'update.',
-             'prefix'     => 'update',
-             'middleware' => ['web'],
-             'namespace'  => 'Modules\Installer\Http\Controllers',
-         ], function () {
-             $this->loadRoutesFrom(__DIR__.'/../Http/Routes/update.php');
-         });
+            Route::get('/step1', 'InstallerController@step1')->name('step1');
+            Route::post('/step1', 'InstallerController@step1')->name('step1');
+
+            Route::get('/step2', 'InstallerController@step2')->name('step2');
+            Route::post('/envsetup', 'InstallerController@envsetup')->name('envsetup');
+            Route::get('/dbsetup', 'InstallerController@dbsetup')->name('dbsetup');
+
+            Route::get('/step3', 'InstallerController@step3')->name('step3');
+            Route::post('/usersetup', 'InstallerController@usersetup')->name('usersetup');
+
+            Route::get('/complete', 'InstallerController@complete')->name('complete');
+        });
     }
 
     /**
@@ -54,13 +51,7 @@ class InstallerServiceProvider extends ServiceProvider
      */
     protected function registerConfig()
     {
-        $this->publishes([
-            __DIR__.'/../Config/config.php' => config_path('installer.php'),
-        ], 'installer');
-
-        $this->mergeConfigFrom(
-            __DIR__.'/../Config/config.php', 'installer'
-        );
+        $this->mergeConfigFrom(__DIR__.'/../Config/config.php', 'installer');
     }
 
     /**

modules/Installer/Resources/views/app.blade.php

@@ -2,82 +2,90 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-    <meta name="csrf-token" content="{{ csrf_token() }}">
+  <meta charset="utf-8"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+  <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>@yield('title') - installer</title>
+  <title>@yield('title') - installer</title>
 
-    <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
+  <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
 
-    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
-          name='viewport'/>
+  <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+        name='viewport'/>
+  <meta name="base-url" content="{!! url('') !!}">
+  <meta name="api-key" content="{!! Auth::check() ? Auth::user()->api_key: '' !!}">
+  <meta name="csrf-token" content="{!! csrf_token() !!}">
 
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
+  <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
+  <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
 
-    <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
 
-    <link rel="stylesheet"
-          href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
+  <link rel="stylesheet"
+        href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
 
-    <style>
-        .table tr:first-child td { border-top: 0px; }
-        @yield('css')
-    </style>
+  <style>
+    .table tr:first-child td {
+      border-top: 0px;
+    }
+    @yield('css')
+  </style>
 </head>
 
 <body>
 <!-- Navbar -->
 <nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
-    <div class="container" style="width: 85%!important;">
-        <div class="navbar-translate">
-            <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
-                <a href="{{ url('/') }}">
-                    <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
-                </a>
-            </p>
-        </div>
-        <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
-            @yield('title')
-        </div>
+  <div class="container" style="width: 85%!important;">
+    <div class="navbar-translate">
+      <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
+        <a href="{{ url('/') }}">
+          <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
+        </a>
+      </p>
     </div>
+    <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
+      @yield('title')
+    </div>
+  </div>
 </nav>
 <!-- End Navbar -->
 {{--<div class="clearfix" style="height: 25px;"></div>--}}
 <div class="wrapper">
-    <div class="clear"></div>
-    <div class="container" style="width: 50%">
-        <div class="row">
-            <div class="col-12">
-                @include('installer::flash.message')
-                @yield('content')
-            </div>
-        </div>
+  <div class="clear"></div>
+  <div class="container" style="width: 50%">
+    <div class="row">
+      <div class="col-12">
+        @include('installer::flash.message')
+        @yield('content')
+      </div>
     </div>
-    <div class="clearfix" style="height: 200px;"></div>
+  </div>
+  <div class="clearfix" style="height: 200px;"></div>
 </div>
 
 {{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
 
+<script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
 <script src="{{ public_asset('/assets/installer/js/vendor.js') }}" type="text/javascript"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
 
 <script>
-    hljs.configure({languages: ['sh']});
+  hljs.configure({languages: ['sh']});
 
-    $(document).ready(function () {
+  $(document).ready(function () {
 
-        $(".select2").select2();
+    $(".select2").select2();
 
-        $('pre code').each(function (i, block) {
-            hljs.fixMarkup(block);
-            hljs.highlightBlock(block);
-        });
+    $('pre code').each(function (i, block) {
+      hljs.fixMarkup(block);
+      hljs.highlightBlock(block);
     });
+  });
 </script>
 
 @yield('scripts')

modules/Installer/Resources/views/errors/already-installed.blade.php

@@ -1,11 +1,11 @@
 @extends('installer::app')
 
 @section('content')
-    <h2>phpVMS already installed!</h2>
-    <p>phpVMS has already been installed! Please remove the modules/Installer folder.</p>
-    {{ Form::open(['url' => '/', 'method' => 'get']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Go to your site >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <h2>phpVMS already installed!</h2>
+  <p>phpVMS has already been installed! Please remove the modules/Installer folder.</p>
+  {{ Form::open(['url' => '/', 'method' => 'get']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Go to your site >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection

modules/Installer/Resources/views/flash/check_error.blade.php

@@ -1,6 +1,6 @@
 @if($errors->has($field))
-    <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
-{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
-    {{ $errors->first($field) }}
-</div>--}}
+  <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
+  {{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
+      {{ $errors->first($field) }}
+  </div>--}}
 @endif

modules/Installer/Resources/views/flash/dbtest.blade.php

@@ -1,8 +0,0 @@
-<div class="alert alert-{{ $status }}" role="alert">
-    <div class="container">
-        <div class="alert-icon">
-            <i class="now-ui-icons ui-1_bell-53"></i>
-        </div>
-        {{ $message }}
-    </div>
-</div>

modules/Installer/Resources/views/flash/message.blade.php

@@ -1,11 +1,11 @@
-@foreach (session('flash_notification', collect())->toArray() as $message)
-<div class="alert alert-danger" role="alert">
+@foreach (session('flash_notification', []) as $message)
+  <div class="alert alert-danger" role="alert">
     <div class="container">
-        <div class="alert-icon">
-            <i class="now-ui-icons ui-2_like"></i>
-        </div>
-        {{ $message['message'] }}
+      <div class="alert-icon">
+        <i class="now-ui-icons ui-2_like"></i>
+      </div>
+      {{ $message['message'] }}
     </div>
-</div>
+  </div>
 @endforeach
 {{ session()->forget('flash_notification') }}

modules/Installer/Resources/views/install/dbtest.blade.php

@@ -0,0 +1,8 @@
+<div class="alert alert-{{ $status }}" role="alert">
+  <div class="container">
+    <div class="alert-icon">
+      <i class="now-ui-icons ui-1_bell-53"></i>
+    </div>
+    {{ $message }}
+  </div>
+</div>

modules/Installer/Resources/views/install/index-start.blade.php

@@ -2,11 +2,11 @@
 @section('title', 'Install phpVMS')
 
 @section('content')
-    <h2>phpvms installer</h2>
-    <p>Press continue to start</p>
-    {{ Form::open(['route' => 'installer.step1', 'method' => 'post']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <h2>phpvms installer</h2>
+  <p>Press continue to start</p>
+  {{ Form::open(['route' => 'installer.step1', 'method' => 'post']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection

modules/Installer/Resources/views/install/steps/step1-requirements.blade.php

@@ -2,62 +2,66 @@
 @section('title', 'Requirements Check')
 
 @section('content')
-<div style="align-content: center;">
+  <div style="align-content: center;">
     {{ Form::open(['route' => 'installer.step2', 'method' => 'GET']) }}
     <table class="table" width="25%">
-        <tr><td colspan="2"><h4>php version</h4></td></tr>
-        <tr>
-            <td>PHP Version: {{ $php['version'] }}</td>
-            <td style="text-align:center;">
-                @if($php['passed'] === true)
-                    <span class="badge badge-success">OK!</span>
-                @else
-                    <span class="badge badge-danger">Failed!</span>
-                @endif
-            </td>
-        </tr>
-
-        <tr><td colspan="2"><h4>php extensions</h4></td></tr>
-        @foreach($extensions as $ext)
-            <tr>
-                <td>{{ $ext['ext'] }}</td>
-                <td style="text-align:center;">
-                    @if($ext['passed'] === true)
-                        <span class="badge badge-success">OK!</span>
-                    @else
-                        <span class="badge badge-danger">Failed!</span>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
+      <tr>
+        <td colspan="2"><h4>php version</h4></td>
+      </tr>
+      <tr>
+        <td>PHP Version: {{ $php['version'] }}</td>
+        <td style="text-align:center;">
+          @if($php['passed'] === true)
+            <span class="badge badge-success">OK!</span>
+          @else
+            <span class="badge badge-danger">Failed!</span>
+          @endif
+        </td>
+      </tr>
 
+      <tr>
+        <td colspan="2"><h4>php extensions</h4></td>
+      </tr>
+      @foreach($extensions as $ext)
         <tr>
-            <td colspan="2">
-                <h4>directory permissions</h4>
-                <p>Make sure these directories have read and write permissions</p>
-            </td>
+          <td>{{ $ext['ext'] }}</td>
+          <td style="text-align:center;">
+            @if($ext['passed'] === true)
+              <span class="badge badge-success">OK!</span>
+            @else
+              <span class="badge badge-danger">Failed!</span>
+            @endif
+          </td>
         </tr>
-        @foreach($directories as $dir)
-            <tr>
-                <td>{{ $dir['dir'] }}</td>
-                <td style="text-align:center;">
-                    @if($dir['passed'] === true)
-                        <span class="badge badge-success">OK!</span>
-                    @else
-                        <span class="badge badge-danger">Failed!</span>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
+      @endforeach
+
+      <tr>
+        <td colspan="2">
+          <h4>directory permissions</h4>
+          <p>Make sure these directories have read and write permissions</p>
+        </td>
+      </tr>
+      @foreach($directories as $dir)
+        <tr>
+          <td>{{ $dir['dir'] }}</td>
+          <td style="text-align:center;">
+            @if($dir['passed'] === true)
+              <span class="badge badge-success">OK!</span>
+            @else
+              <span class="badge badge-danger">Failed!</span>
+            @endif
+          </td>
+        </tr>
+      @endforeach
     </table>
     @if($passed === true)
-        <p style="text-align: right">
-            {{ Form::submit('Database Setup >>', ['class' => 'btn btn-success']) }}
-        </p>
+      <p style="text-align: right">
+        {{ Form::submit('Database Setup >>', ['class' => 'btn btn-success']) }}
+      </p>
     @endif
     {{--{{ $php_version }}
     {{ $extensions }}
     {{ $passed }}--}}
     {{ Form::close() }}
-</div>
+  </div>
 @endsection

modules/Installer/Resources/views/install/steps/step2-db.blade.php

@@ -1,154 +1,154 @@
 @extends('installer::app')
 @section('title', 'Database Setup')
 @section('content')
-<div style="align-content: center;">
+  <div style="align-content: center;">
     {{ Form::open(['route' => 'installer.envsetup', 'method' => 'POST']) }}
     <table class="table" width="25%">
 
-        <tr>
-            <td colspan="2"><h4>Site Config</h4></td>
-        </tr>
+      <tr>
+        <td colspan="2"><h4>Site Config</h4></td>
+      </tr>
 
-        <tr>
-            <td>Site Name</td>
-            <td style="text-align:center;">
-                <div class="form-group">
-                    {{ Form::input('text', 'site_name', 'phpvms', ['class' => 'form-control']) }}
-                </div>
-            </td>
-        </tr>
+      <tr>
+        <td>Site Name</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'site_name', 'phpvms', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-        <tr>
-            <td>Site URL</td>
-            <td style="text-align:center;">
-                <div class="form-group">
-                    {{ Form::input('text', 'site_url', Request::root(), ['class' => 'form-control']) }}
-                </div>
-            </td>
-        </tr>
+      <tr>
+        <td>Site URL</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'site_url', Request::root(), ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-        <tr>
-            <td colspan="2"><h4>Database Config</h4></td>
-        </tr>
+      <tr>
+        <td colspan="2"><h4>Database Config</h4></td>
+      </tr>
 
-        <tr>
-            <td><p>Select Database Type</p></td>
-            <td style="text-align:center;">
-                <div class="form-group">
-                {{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }}
-                </div>
-            </td>
-        </tr>
+      <tr>
+        <td><p>Select Database Type</p></td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }}
+          </div>
+        </td>
+      </tr>
 
-        <tbody id="mysql_settings" class="settings_panel">
-            <tr>
-                <td>Database Host</td>
-                <td style="text-align:center;">
-                    <div class="form-group">
-                    {{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }}
-                    </div>
-                </td>
-            </tr>
+      <tbody id="mysql_settings" class="settings_panel">
+      <tr>
+        <td>Database Host</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-            <tr>
-                <td>Database Port</td>
-                <td style="text-align:center;">
-                    <div class="form-group">
-                        {{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }}
-                    </div>
-                </td>
-            </tr>
+      <tr>
+        <td>Database Port</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-            <tr>
-                <td>Database Name</td>
-                <td style="text-align:center;">
-                    <div class="form-group">
-                        {{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }}
-                    </div>
-                </td>
-            </tr>
+      <tr>
+        <td>Database Name</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-            <tr>
-                <td>Database User</td>
-                <td style="text-align:center;">
-                    <div class="form-group">
-                        {{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }}
-                    </div>
-                </td>
-            </tr>
+      <tr>
+        <td>Database User</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-            <tr>
-                <td>Database Password</td>
-                <td style="text-align:center;">
-                    <div class="form-group">
-                        {{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }}
-                    </div>
-                </td>
-            </tr>
+      <tr>
+        <td>Database Password</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-            <tr>
-                <td colspan="2" style="text-align: right;">
-                    {{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }}
-                </td>
-            </tr>
-        </tbody>
+      <tr>
+        <td colspan="2" style="text-align: right;">
+          {{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }}
+        </td>
+      </tr>
+      </tbody>
 
-        <tbody id="sqlite_settings" class="settings_panel">
+      <tbody id="sqlite_settings" class="settings_panel">
 
-        </tbody>
+      </tbody>
 
-        <tr>
-            <td>Database Prefix</td>
-            <td style="text-align:center;">
-                <div class="form-group">
-                    {{ Form::input('text', 'db_prefix', '', ['class' => 'form-control']) }}
-                    <p>Set this if you're sharing the database with another application.</p>
-                </div>
-            </td>
-        </tr>
+      <tr>
+        <td>Database Prefix</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_prefix', '', ['class' => 'form-control']) }}
+            <p>Set this if you're sharing the database with another application.</p>
+          </div>
+        </td>
+      </tr>
 
     </table>
     <div id="dbtest"></div>
     <p style="text-align: right">
-        {{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }}
+      {{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }}
     </p>
     {{ Form::close() }}
-</div>
+  </div>
 @endsection
 
 @section('scripts')
-<script>
-function changeForm(selected) {
-    $("tbody.settings_panel").hide();
-    $("tbody#" + selected + "_settings").show();
-}
+  <script>
+    function changeForm(selected) {
+      $("tbody.settings_panel").hide();
+      $("tbody#" + selected + "_settings").show();
+    }
 
-$(document).ready(() => {
+    $(document).ready(() => {
 
-    const selValue = $("#db_conn option:selected").text();
-    changeForm(selValue);
+      const selValue = $("#db_conn option:selected").text();
+      changeForm(selValue);
 
-    $("#db_conn").change((e) => {
+      $("#db_conn").change((e) => {
         const selValue = $("#db_conn option:selected").text();
         changeForm(selValue);
-    });
+      });
 
-    $("#dbtest_button").click((e) => {
+      $("#dbtest_button").click((e) => {
         e.preventDefault();
         const opts = {
-            _token: "{{ csrf_token() }}",
-            db_conn: $("#db_conn option:selected").text(),
-            db_host: $("input[name=db_host]").val(),
-            db_port: $("input[name=db_port]").val(),
-            db_name: $("input[name=db_name]").val(),
-            db_user: $("input[name=db_user]").val(),
-            db_pass: $("input[name=db_pass]").val(),
+          _token: "{{ csrf_token() }}",
+          db_conn: $("#db_conn option:selected").text(),
+          db_host: $("input[name=db_host]").val(),
+          db_port: $("input[name=db_port]").val(),
+          db_name: $("input[name=db_name]").val(),
+          db_user: $("input[name=db_user]").val(),
+          db_pass: $("input[name=db_pass]").val(),
         };
 
         $.post("{{ route('installer.dbtest') }}", opts, (data) => {
-            $("#dbtest").html(data);
+          $("#dbtest").html(data);
         })
-    })
-});
-</script>
+      })
+    });
+  </script>
 @endsection

modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php

@@ -1,19 +1,19 @@
 @extends('installer::app')
 @section('title', 'Database Setup Completed')
 @section('content')
-<div style="align-content: center;">
+  <div style="align-content: center;">
     {{ Form::open(['route' => 'installer.step3', 'method' => 'GET']) }}
 
     <pre class="lang-sh">
         <code class="lang-sh">
         {{--<code class="language-bash">--}}
-        {{ $console_output }}
+          {{ $console_output }}
         </code>
     </pre>
 
     <p style="text-align: right">
-        {{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }}
+      {{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }}
     </p>
     {{ Form::close() }}
-</div>
+  </div>
 @endsection

modules/Installer/Resources/views/install/steps/step3-user.blade.php

@@ -2,111 +2,118 @@
 @section('title', 'User Setup')
 
 @section('content')
-    <div class="row"><div class="col-md-12">
-<div style="align-content: center;">
-    {{ Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) }}
-    <table class="table" width="25%">
+  <div class="row">
+    <div class="col-md-12">
+      <div style="align-content: center;">
+        {{ Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) }}
+        <table class="table" width="25%">
 
-        <tr>
+          <tr>
+            <td colspan="2" style="text-align: right">
+              <a href="{{ route('importer.index') }}">Importing from a legacy install?</a>
+            </td>
+          </tr>
+
+          <tr>
             <td colspan="2"><h4>Airline Information</h4></td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Airline ICAO</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::input('text', 'airline_icao', null, ['class' => 'form-control']) }}
-                    @include('installer::flash/check_error', ['field' => 'airline_icao'])
-                </div>
+              <div class="form-group">
+                {{ Form::input('text', 'airline_icao', null, ['class' => 'form-control']) }}
+                @include('installer::flash/check_error', ['field' => 'airline_icao'])
+              </div>
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Airline Name</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::input('text', 'airline_name', null, ['class' => 'form-control']) }}
-                    @include('installer::flash/check_error', ['field' => 'airline_name'])
-                </div>
+              <div class="form-group">
+                {{ Form::input('text', 'airline_name', null, ['class' => 'form-control']) }}
+                @include('installer::flash/check_error', ['field' => 'airline_name'])
+              </div>
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Airline Country</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::select('airline_country', $countries, null, ['class' => 'form-control select2' ]) }}
-                    @include('installer::flash/check_error', ['field' => 'airline_country'])
-                </div>
+              <div class="form-group">
+                {{ Form::select('airline_country', $countries, null, ['class' => 'form-control select2' ]) }}
+                @include('installer::flash/check_error', ['field' => 'airline_country'])
+              </div>
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td colspan="2"><h4>First User</h4></td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Name</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::input('text', 'name', null, ['class' => 'form-control']) }}
-                    @include('installer::flash/check_error', ['field' => 'name'])
-                </div>
+              <div class="form-group">
+                {{ Form::input('text', 'name', null, ['class' => 'form-control']) }}
+                @include('installer::flash/check_error', ['field' => 'name'])
+              </div>
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Email</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::input('text', 'email', null, ['class' => 'form-control']) }}
-                    @include('installer::flash/check_error', ['field' => 'email'])
-                </div>
+              <div class="form-group">
+                {{ Form::input('text', 'email', null, ['class' => 'form-control']) }}
+                @include('installer::flash/check_error', ['field' => 'email'])
+              </div>
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Password</p></td>
             <td>
-                {{ Form::password('password', ['class' => 'form-control']) }}
-                @include('installer::flash/check_error', ['field' => 'password'])
+              {{ Form::password('password', ['class' => 'form-control']) }}
+              @include('installer::flash/check_error', ['field' => 'password'])
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td width="40%"><p>Password Confirm</p></td>
             <td>
-                {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
-                @include('installer::flash/check_error', ['field' => 'password_confirmation'])
+              {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
+              @include('installer::flash/check_error', ['field' => 'password_confirmation'])
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td colspan="2"><h4>Options</h4></td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Analytics</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::hidden('telemetry', 0) }}
-                    {{ Form::checkbox('telemetry', 1, true, ['class' => 'form-control']) }}
-                    <br />
-                    <p>
-                        Allows collection of analytics. They won't identify you, and helps us to track
-                        the PHP and database versions that are used, and help to figure out problems
-                        and slowdowns when vaCentral integration is enabled.
-                    </p>
-                </div>
+              <div class="form-group">
+                {{ Form::hidden('telemetry', 0) }}
+                {{ Form::checkbox('telemetry', 1, true, ['class' => 'form-control']) }}
+                <br/>
+                <p>
+                  Allows collection of analytics. They won't identify you, and helps us to track
+                  the PHP and database versions that are used, and help to figure out problems
+                  and slowdowns when vaCentral integration is enabled.
+                </p>
+              </div>
             </td>
-        </tr>
-    </table>
-    <div id="dbtest"></div>
-    <p style="text-align: right">
-        {{ Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
-</div>
-        </div>
+          </tr>
+        </table>
+        <div id="dbtest"></div>
+        <p style="text-align: right">
+          {{ Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) }}
+        </p>
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 @endsection

modules/Installer/Resources/views/install/steps/step3a-completed.blade.php

@@ -2,19 +2,19 @@
 @section('title', 'Installation Completed!')
 
 @section('content')
-    <div style="align-content: center;">
-        {{ Form::open(['route' => 'installer.complete', 'method' => 'GET']) }}
+  <div style="align-content: center;">
+    {{ Form::open(['route' => 'installer.complete', 'method' => 'GET']) }}
 
-        <h4>Installer Completed!</h4>
+    <h4>Installer Completed!</h4>
 
-        <p>Edit the <span class="code">config.php</span> to fill in some additional settings. </p>
-        <p>Click the button to proceed to the login screen!</p>
+    <p>Edit the <span class="code">config.php</span> to fill in some additional settings. </p>
+    <p>Click the button to proceed to the login screen!</p>
 
-        <p style="text-align: right">
-            {{ Form::submit('Install Complete! Continue to Log-In >>',
-                             ['class' => 'btn btn-success'])
-            }}
-        </p>
-        {{ Form::close() }}
-    </div>
+    <p style="text-align: right">
+      {{ Form::submit('Install Complete! Continue to Log-In >>',
+                       ['class' => 'btn btn-success'])
+      }}
+    </p>
+    {{ Form::close() }}
+  </div>
 @endsection

modules/Installer/Resources/views/update/index-start.blade.php

@@ -2,11 +2,11 @@
 @section('title', 'Update phpVMS')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>Press continue to check if there are any updates available.</p>
-    {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <h2>phpvms updater</h2>
+  <p>Press continue to check if there are any updates available.</p>
+  {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection

modules/Installer/Resources/views/update/steps/step1-no-update.blade.php

@@ -2,12 +2,12 @@
 @section('title', 'Update phpVMS')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>It seems like you're up to date!</p>
-    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+  <h2>phpvms updater</h2>
+  <p>It seems like you're up to date!</p>
+  {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
 
-    <p style="text-align: right">
-        {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <p style="text-align: right">
+    {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection

modules/Installer/Resources/views/update/steps/step1-update-available.blade.php

@@ -2,11 +2,11 @@
 @section('title', 'Update phpVMS')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>Click run to complete the update!.</p>
-    {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <h2>phpvms updater</h2>
+  <p>Click run to complete the update!.</p>
+  {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection

modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php

@@ -1,18 +1,18 @@
 @extends('installer::app')
 @section('title', 'Update Completed')
 @section('content')
-    <div style="align-content: center;">
-        {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+  <div style="align-content: center;">
+    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
 
-        <pre class="lang-sh">
+    <pre class="lang-sh">
         <code class="lang-sh">
             {{ $console_output }}
         </code>
     </pre>
 
-        <p style="text-align: right">
-            {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
-        </p>
-        {{ Form::close() }}
-    </div>
+    <p style="text-align: right">
+      {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
+    </p>
+    {{ Form::close() }}
+  </div>
 @endsection

modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php

@@ -2,12 +2,12 @@
 @section('title', 'Update Completed')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>Update completed!.</p>
+  <h2>phpvms updater</h2>
+  <p>Update completed!.</p>
 
-    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection

modules/Installer/Services/ConfigService.php

@@ -13,9 +13,6 @@ use Nwidart\Modules\Support\Stub;
 use PDO;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 
-/**
- * Class ConfigService
- */
 class ConfigService extends Service
 {
     /**

modules/Installer/Services/DatabaseService.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace Modules\Installer\Services;
-
-use App\Contracts\Service;
-use Log;
-use PDO;
-
-class DatabaseService extends Service
-{
-    /**
-     * Check the PHP version that it meets the minimum requirement
-     *
-     * @param $driver
-     * @param $host
-     * @param $port
-     * @param $name
-     * @param $user
-     * @param $pass
-     *
-     * @return bool
-     */
-    public function checkDbConnection($driver, $host, $port, $name, $user, $pass)
-    {
-        Log::info('Testing Connection: '.$driver.'::'.$user.':<hidden>@'.$host.':'.$port.';'.$name);
-
-        if ($driver === 'mysql') {
-            $dsn = "mysql:host=$host;port=$port;dbname=$name";
-            Log::info('Connection string: '.$dsn);
-
-            try {
-                $conn = new PDO($dsn, $user, $pass);
-            } catch (\PDOException $e) {
-                throw $e;
-            }
-        }
-
-        // TODO: Needs testing
-        elseif ($driver === 'postgres') {
-            $dsn = "pgsql:host=$host;port=$port;dbname=$name";
-
-            try {
-                $conn = new PDO($dsn, $user, $pass);
-            } catch (\PDOException $e) {
-                throw $e;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Setup the database by running the migration commands
-     * Only run the setup for sqlite, otherwise, we're assuming
-     * that the MySQL database has already been created
-     */
-    public function setupDB()
-    {
-        $output = '';
-
-        if (config('database.default') === 'sqlite') {
-            \Artisan::call('database:create');
-            $output .= \Artisan::output();
-        }
-
-        return trim($output);
-    }
-}

modules/Installer/composer.json

@@ -1,11 +1,12 @@
 {
     "name": "phpvms/installer",
+    "license": "",
     "type": "laravel-library",
     "description": "The installer module for phpVMS",
     "authors": [
         {
             "name": "Nabeel Shahzad",
-            "email": ""
+            "email": "nabeel@phpvms.net"
         }
     ],
     "require": {