From 915f1f87225ec027d127996b60fbc89e8578b93b Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Wed, 4 Jul 2018 15:26:12 +0200 Subject: [PATCH] Improved install Process. 1. Added csrf token to form on install. This was causing Laravel to throw an error as no CSRF token was present. 2. During the install process default to MySQL as the default database. --- app/Http/Controllers/InstallerController.php | 2 +- installed | 1 + resources/views/Installer/Installer.blade.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 installed diff --git a/app/Http/Controllers/InstallerController.php b/app/Http/Controllers/InstallerController.php index 7fc90e48..1bce3634 100644 --- a/app/Http/Controllers/InstallerController.php +++ b/app/Http/Controllers/InstallerController.php @@ -64,8 +64,8 @@ class InstallerController extends Controller * Optional PHP extensions */ $data['optional_requirements'] = [ - 'pdo_pgsql', 'pdo_mysql', + 'pdo_pgsql', ]; return view('Installer.Installer', $data); diff --git a/installed b/installed new file mode 100644 index 00000000..afaf360d --- /dev/null +++ b/installed @@ -0,0 +1 @@ +1.0.0 \ No newline at end of file diff --git a/resources/views/Installer/Installer.blade.php b/resources/views/Installer/Installer.blade.php index 7e5bb4e4..c0edddb1 100644 --- a/resources/views/Installer/Installer.blade.php +++ b/resources/views/Installer/Installer.blade.php @@ -106,8 +106,8 @@
{!! Form::label('database_type', trans("Installer.database_type"), array('class'=>'required control-label ')) !!} {!! Form::select('database_type', array( - 'pgsql' => "Postgres", 'mysql' => "MySQL", + 'pgsql' => "Postgres", ), Input::old('database_type'), array( 'class'=>'form-control' @@ -246,7 +246,7 @@ 'class'=>'form-control' )) !!}
- + {!! csrf_field() !!} @include("Installer.Partials.Footer") {!! Form::submit(trans("Installer.install"), ['class'=>" btn-block btn btn-success"]) !!}