Update v1.0.6.5
This commit is contained in:
sujitprasad
@@ -6,6 +6,8 @@ namespace App\Http\Controllers\Api\v1;
|
|||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
// requests
|
// requests
|
||||||
use App\Model\helpdesk\Settings\System;
|
use App\Model\helpdesk\Settings\System;
|
||||||
|
use App\Http\Requests\helpdesk\DatabaseRequest;
|
||||||
|
use App\Http\Requests\helpdesk\InstallerRequest;
|
||||||
// models
|
// models
|
||||||
use App\Model\helpdesk\Utility\Date_time_format;
|
use App\Model\helpdesk\Utility\Date_time_format;
|
||||||
use App\Model\helpdesk\Utility\Timezones;
|
use App\Model\helpdesk\Utility\Timezones;
|
||||||
@@ -39,28 +41,29 @@ class InstallerApiController extends Controller
|
|||||||
{
|
{
|
||||||
$validator = \Validator::make(
|
$validator = \Validator::make(
|
||||||
[
|
[
|
||||||
'database' => $request->database,
|
'database' => $request->database,
|
||||||
'host' => $request->host,
|
'host' => $request->host,
|
||||||
'databasename' => $request->databasename,
|
'databasename' => $request->databasename,
|
||||||
'dbusername' => $request->dbusername,
|
'dbusername' => $request->dbusername,
|
||||||
'port' => $request->port,
|
'port' => $request->port,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'database' => 'required|min:1',
|
'database' => 'required|min:1',
|
||||||
'host' => 'required',
|
'host' => 'required',
|
||||||
'databasename' => 'required|min:1',
|
'databasename' => 'required|min:1',
|
||||||
'dbusername' => 'required|min:1',
|
'dbusername' => 'required|min:1',
|
||||||
'port' => 'integer|min:0',
|
'port' => 'integer|min:0',
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
if ($validator->fails()) {
|
if ($validator->fails())
|
||||||
|
{
|
||||||
$jsons = $validator->messages();
|
$jsons = $validator->messages();
|
||||||
$val = '';
|
$val ="";
|
||||||
foreach ($jsons->all() as $key => $value) {
|
foreach($jsons->all() as $key => $value)
|
||||||
|
{
|
||||||
$val .= $value;
|
$val .= $value;
|
||||||
}
|
}
|
||||||
$return_data = rtrim(str_replace('.', ',', $val), ',');
|
$return_data = rtrim(str_replace(".", ",", $val), ",");
|
||||||
|
|
||||||
return ['response' => 'fail', 'reason' => $return_data, 'status' => '0'];
|
return ['response' => 'fail', 'reason' => $return_data, 'status' => '0'];
|
||||||
}
|
}
|
||||||
// dd($validator->messages());
|
// dd($validator->messages());
|
||||||
@@ -75,21 +78,32 @@ class InstallerApiController extends Controller
|
|||||||
$port = $request->port;
|
$port = $request->port;
|
||||||
if (isset($default) && isset($host) && isset($database) && isset($dbusername)) {
|
if (isset($default) && isset($host) && isset($database) && isset($dbusername)) {
|
||||||
// Setting environment values
|
// Setting environment values
|
||||||
$_ENV['DB_TYPE'] = $default;
|
$ENV['APP_ENV'] = 'local';
|
||||||
$_ENV['DB_HOST'] = $host;
|
$ENV['APP_DEBUG'] = 'false';
|
||||||
$_ENV['DB_PORT'] = $port;
|
$ENV['APP_KEY'] = 'SomeRandomString';
|
||||||
$_ENV['DB_DATABASE'] = $database;
|
$ENV['DB_TYPE'] = $default;
|
||||||
$_ENV['DB_USERNAME'] = $dbusername;
|
$ENV['DB_HOST'] = $host;
|
||||||
$_ENV['DB_PASSWORD'] = $dbpassword;
|
$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 = '';
|
$config = '';
|
||||||
foreach ($_ENV as $key => $val) {
|
foreach ($ENV as $key => $val) {
|
||||||
$config .= "{$key}={$val}\n";
|
$config .= "{$key}={$val}\n";
|
||||||
}
|
}
|
||||||
// Write environment file
|
// Write environment file
|
||||||
$fp = fopen(base_path().'/.env', 'w');
|
$fp = fopen(base_path().'/.env', 'w');
|
||||||
fwrite($fp, $config);
|
fwrite($fp, $config);
|
||||||
fclose($fp);
|
fclose($fp);
|
||||||
|
|
||||||
return ['response' => 'success', 'status' => '1'];
|
return ['response' => 'success', 'status' => '1'];
|
||||||
} else {
|
} else {
|
||||||
return ['response' => 'fail', 'reason' => 'insufficient parameters', 'status' => '0'];
|
return ['response' => 'fail', 'reason' => 'insufficient parameters', 'status' => '0'];
|
||||||
@@ -111,30 +125,31 @@ class InstallerApiController extends Controller
|
|||||||
[
|
[
|
||||||
'firstname' => $request->firstname,
|
'firstname' => $request->firstname,
|
||||||
'lastname' => $request->lastname,
|
'lastname' => $request->lastname,
|
||||||
'email' => $request->email,
|
'email' => $request->email,
|
||||||
'username' => $request->username,
|
'username' => $request->username,
|
||||||
'password' => $request->password,
|
'password' => $request->password,
|
||||||
'timezone' => $request->timezone,
|
'timezone' => $request->timezone,
|
||||||
'datetime' => $request->datetime,
|
'datetime' => $request->datetime,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'firstname' => 'required|alpha|min:1',
|
'firstname' => 'required|alpha|min:1',
|
||||||
'lastname' => 'required|alpha|min:1',
|
'lastname' => 'required|alpha|min:1',
|
||||||
'email' => 'required|email|min:1',
|
'email' => 'required|email|min:1',
|
||||||
'username' => 'required|min:4',
|
'username' => 'required|min:4',
|
||||||
'password' => 'required|min:6',
|
'password' => 'required|min:6',
|
||||||
'timezone' => 'required|min:1',
|
'timezone' => 'required|min:1',
|
||||||
'datetime' => 'required|min:1',
|
'datetime' => 'required|min:1',
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
if ($validator->fails()) {
|
if ($validator->fails())
|
||||||
|
{
|
||||||
$jsons = $validator->messages();
|
$jsons = $validator->messages();
|
||||||
$val = '';
|
$val ="";
|
||||||
foreach ($jsons->all() as $key => $value) {
|
foreach($jsons->all() as $key => $value)
|
||||||
|
{
|
||||||
$val .= $value;
|
$val .= $value;
|
||||||
}
|
}
|
||||||
$return_data = rtrim(str_replace('.', ',', $val), ',');
|
$return_data = rtrim(str_replace(".", ",", $val), ",");
|
||||||
|
|
||||||
return ['response' => 'fail', 'reason' => $return_data, 'status' => '0'];
|
return ['response' => 'fail', 'reason' => $return_data, 'status' => '0'];
|
||||||
}
|
}
|
||||||
// Check for pre install
|
// Check for pre install
|
||||||
@@ -155,14 +170,12 @@ class InstallerApiController extends Controller
|
|||||||
$timezones = Timezones::where('name', '=', $timezone)->first();
|
$timezones = Timezones::where('name', '=', $timezone)->first();
|
||||||
if ($timezones == null) {
|
if ($timezones == null) {
|
||||||
Artisan::call('migrate:reset', ['--force' => true]);
|
Artisan::call('migrate:reset', ['--force' => true]);
|
||||||
|
|
||||||
return ['response' => 'fail', 'reason' => 'Invalid time-zone', 'status' => '0'];
|
return ['response' => 'fail', 'reason' => 'Invalid time-zone', 'status' => '0'];
|
||||||
}
|
}
|
||||||
// checking requested date time format for the admin and system
|
// checking requested date time format for the admin and system
|
||||||
$date_time_format = Date_time_format::where('format', '=', $datetime)->first();
|
$date_time_format = Date_time_format::where('format', '=', $datetime)->first();
|
||||||
if ($date_time_format == null) {
|
if ($date_time_format == null) {
|
||||||
Artisan::call('migrate:reset', ['--force' => true]);
|
Artisan::call('migrate:reset', ['--force' => true]);
|
||||||
|
|
||||||
return ['response' => 'fail', 'reason' => 'invalid date-time format', 'status' => '0'];
|
return ['response' => 'fail', 'reason' => 'invalid date-time format', 'status' => '0'];
|
||||||
}
|
}
|
||||||
// Creating minum settings for system
|
// Creating minum settings for system
|
||||||
|
|||||||
@@ -203,15 +203,26 @@ class InstallController extends Controller
|
|||||||
$port = Input::get('port');
|
$port = Input::get('port');
|
||||||
|
|
||||||
// Setting environment values
|
// Setting environment values
|
||||||
$_ENV['DB_TYPE'] = $default;
|
$ENV['APP_ENV'] = 'local';
|
||||||
$_ENV['DB_HOST'] = $host;
|
$ENV['APP_DEBUG'] = 'false';
|
||||||
$_ENV['DB_PORT'] = $port;
|
$ENV['APP_KEY'] = 'SomeRandomString';
|
||||||
$_ENV['DB_DATABASE'] = $database;
|
$ENV['DB_TYPE'] = $default;
|
||||||
$_ENV['DB_USERNAME'] = $dbusername;
|
$ENV['DB_HOST'] = $host;
|
||||||
$_ENV['DB_PASSWORD'] = $dbpassword;
|
$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 = '';
|
$config = '';
|
||||||
foreach ($_ENV as $key => $val) {
|
foreach ($ENV as $key => $val) {
|
||||||
$config .= "{$key}={$val}\n";
|
$config .= "{$key}={$val}\n";
|
||||||
}
|
}
|
||||||
// Write environment file
|
// Write environment file
|
||||||
|
|||||||
Reference in New Issue
Block a user