From dbe471498cf823941201e8fa8481e83a1bfda555 Mon Sep 17 00:00:00 2001 From: sujitprasad Date: Wed, 2 Mar 2016 15:16:24 +0530 Subject: [PATCH] Update v1.0.6.5 --- .../Api/v1/InstallerApiController.php | 89 +++++++++++-------- .../Installer/helpdesk/InstallController.php | 25 ++++-- 2 files changed, 69 insertions(+), 45 deletions(-) diff --git a/app/Http/Controllers/Api/v1/InstallerApiController.php b/app/Http/Controllers/Api/v1/InstallerApiController.php index 150a671cf..13a14aef9 100644 --- a/app/Http/Controllers/Api/v1/InstallerApiController.php +++ b/app/Http/Controllers/Api/v1/InstallerApiController.php @@ -6,6 +6,8 @@ namespace App\Http\Controllers\Api\v1; use App\Http\Controllers\Controller; // requests use App\Model\helpdesk\Settings\System; +use App\Http\Requests\helpdesk\DatabaseRequest; +use App\Http\Requests\helpdesk\InstallerRequest; // models use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Timezones; @@ -39,28 +41,29 @@ class InstallerApiController extends Controller { $validator = \Validator::make( [ - 'database' => $request->database, - 'host' => $request->host, + 'database' => $request->database, + 'host' => $request->host, 'databasename' => $request->databasename, - 'dbusername' => $request->dbusername, - 'port' => $request->port, + 'dbusername' => $request->dbusername, + 'port' => $request->port, ], [ - 'database' => 'required|min:1', - 'host' => 'required', + 'database' => 'required|min:1', + 'host' => 'required', 'databasename' => 'required|min:1', - 'dbusername' => 'required|min:1', - 'port' => 'integer|min:0', + 'dbusername' => 'required|min:1', + 'port' => 'integer|min:0', ] ); - if ($validator->fails()) { + if ($validator->fails()) + { $jsons = $validator->messages(); - $val = ''; - foreach ($jsons->all() as $key => $value) { + $val =""; + foreach($jsons->all() as $key => $value) + { $val .= $value; } - $return_data = rtrim(str_replace('.', ',', $val), ','); - + $return_data = rtrim(str_replace(".", ",", $val), ","); return ['response' => 'fail', 'reason' => $return_data, 'status' => '0']; } // dd($validator->messages()); @@ -75,21 +78,32 @@ class InstallerApiController extends Controller $port = $request->port; if (isset($default) && isset($host) && isset($database) && isset($dbusername)) { // Setting environment values - $_ENV['DB_TYPE'] = $default; - $_ENV['DB_HOST'] = $host; - $_ENV['DB_PORT'] = $port; - $_ENV['DB_DATABASE'] = $database; - $_ENV['DB_USERNAME'] = $dbusername; - $_ENV['DB_PASSWORD'] = $dbpassword; + $ENV['APP_ENV'] = 'local'; + $ENV['APP_DEBUG'] = 'false'; + $ENV['APP_KEY'] = 'SomeRandomString'; + $ENV['DB_TYPE'] = $default; + $ENV['DB_HOST'] = $host; + $ENV['DB_PORT'] = $port; + $ENV['DB_DATABASE'] = $database; + $ENV['DB_USERNAME'] = $dbusername; + $ENV['DB_PASSWORD'] = $dbpassword; + $ENV['MAIL_DRIVER'] = 'smtp'; + $ENV['MAIL_HOST'] = 'mailtrap.io'; + $ENV['MAIL_PORT'] = '2525'; + $ENV['MAIL_USERNAME'] = 'null'; + $ENV['MAIL_PASSWORD'] = 'null'; + $ENV['CACHE_DRIVER'] = 'file'; + $ENV['SESSION_DRIVER'] = 'file'; + $ENV['QUEUE_DRIVER'] = 'sync'; + $config = ''; - foreach ($_ENV as $key => $val) { + foreach ($ENV as $key => $val) { $config .= "{$key}={$val}\n"; } // Write environment file $fp = fopen(base_path().'/.env', 'w'); fwrite($fp, $config); fclose($fp); - return ['response' => 'success', 'status' => '1']; } else { return ['response' => 'fail', 'reason' => 'insufficient parameters', 'status' => '0']; @@ -111,30 +125,31 @@ class InstallerApiController extends Controller [ 'firstname' => $request->firstname, 'lastname' => $request->lastname, - 'email' => $request->email, - 'username' => $request->username, - 'password' => $request->password, - 'timezone' => $request->timezone, - 'datetime' => $request->datetime, + 'email' => $request->email, + 'username' => $request->username, + 'password' => $request->password, + 'timezone' => $request->timezone, + 'datetime' => $request->datetime, ], [ 'firstname' => 'required|alpha|min:1', 'lastname' => 'required|alpha|min:1', - 'email' => 'required|email|min:1', - 'username' => 'required|min:4', - 'password' => 'required|min:6', - 'timezone' => 'required|min:1', - 'datetime' => 'required|min:1', + 'email' => 'required|email|min:1', + 'username' => 'required|min:4', + 'password' => 'required|min:6', + 'timezone' => 'required|min:1', + 'datetime' => 'required|min:1', ] ); - if ($validator->fails()) { + if ($validator->fails()) + { $jsons = $validator->messages(); - $val = ''; - foreach ($jsons->all() as $key => $value) { + $val =""; + foreach($jsons->all() as $key => $value) + { $val .= $value; } - $return_data = rtrim(str_replace('.', ',', $val), ','); - + $return_data = rtrim(str_replace(".", ",", $val), ","); return ['response' => 'fail', 'reason' => $return_data, 'status' => '0']; } // Check for pre install @@ -155,14 +170,12 @@ class InstallerApiController extends Controller $timezones = Timezones::where('name', '=', $timezone)->first(); if ($timezones == null) { Artisan::call('migrate:reset', ['--force' => true]); - return ['response' => 'fail', 'reason' => 'Invalid time-zone', 'status' => '0']; } // checking requested date time format for the admin and system $date_time_format = Date_time_format::where('format', '=', $datetime)->first(); if ($date_time_format == null) { Artisan::call('migrate:reset', ['--force' => true]); - return ['response' => 'fail', 'reason' => 'invalid date-time format', 'status' => '0']; } // Creating minum settings for system diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index 355bf8a9d..db3681dbc 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -203,15 +203,26 @@ class InstallController extends Controller $port = Input::get('port'); // Setting environment values - $_ENV['DB_TYPE'] = $default; - $_ENV['DB_HOST'] = $host; - $_ENV['DB_PORT'] = $port; - $_ENV['DB_DATABASE'] = $database; - $_ENV['DB_USERNAME'] = $dbusername; - $_ENV['DB_PASSWORD'] = $dbpassword; + $ENV['APP_ENV'] = 'local'; + $ENV['APP_DEBUG'] = 'false'; + $ENV['APP_KEY'] = 'SomeRandomString'; + $ENV['DB_TYPE'] = $default; + $ENV['DB_HOST'] = $host; + $ENV['DB_PORT'] = $port; + $ENV['DB_DATABASE'] = $database; + $ENV['DB_USERNAME'] = $dbusername; + $ENV['DB_PASSWORD'] = $dbpassword; + $ENV['MAIL_DRIVER'] = 'smtp'; + $ENV['MAIL_HOST'] = 'mailtrap.io'; + $ENV['MAIL_PORT'] = '2525'; + $ENV['MAIL_USERNAME'] = 'null'; + $ENV['MAIL_PASSWORD'] = 'null'; + $ENV['CACHE_DRIVER'] = 'file'; + $ENV['SESSION_DRIVER'] = 'file'; + $ENV['QUEUE_DRIVER'] = 'sync'; $config = ''; - foreach ($_ENV as $key => $val) { + foreach ($ENV as $key => $val) { $config .= "{$key}={$val}\n"; } // Write environment file