cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update v1.0.6.5

Browse Source
This commit is contained in:
sujitprasad
2016-03-02 15:16:24 +05:30
parent c56ff86194
commit dbe471498c
2 changed files with 69 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/Http/Controllers/Api/v1/InstallerApiController.php
View File

@@ -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;
@@ -53,14 +55,15 @@ class InstallerApiController extends Controller
'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'];
@@ -127,14 +141,15 @@ class InstallerApiController extends Controller
'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

25
app/Http/Controllers/Installer/helpdesk/InstallController.php
View File

@@ -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