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 12:25:21 +05:30
parent 7011553462
commit c56ff86194
218 changed files with 17161 additions and 2358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Installer\helpdesk;
// controllers
use App\Http\Controllers\Controller;
// requests
use App\Http\Requests\helpdesk\DatabaseRequest;
use App\Http\Requests\helpdesk\InstallerRequest;
// models
use App\Model\helpdesk\Settings\System;
@@ -133,7 +134,6 @@ class InstallController extends Controller
public function localizationcheck()
{
Session::put('step3', 'step3');
Session::put('language', Input::get('language'));
Session::put('timezone', Input::get('timezone'));
Session::put('date', Input::get('date'));
@@ -168,22 +168,21 @@ class InstallController extends Controller
*
* @return type view
*/
public function configurationcheck()
public function configurationcheck(DatabaseRequest $request)
{
Session::put('step4', 'step4');
// dd(Input::get('default'));
// dd(Input::get('host'));
// dd(Input::get('databasename'));
// dd(Input::get('username'));
// dd(Input::get('password'));
// dd(Input::get('port'));
Session::put('default', Input::get('default'));
Session::put('host', Input::get('host'));
Session::put('databasename', Input::get('databasename'));
Session::put('username', Input::get('username'));
Session::put('password', Input::get('password'));
Session::put('port', Input::get('port'));
// dd($request->input('default'));
// dd($request->input('host'));
// dd($request->input('databasename'));
// dd($request->input('username'));
// dd($request->input('password'));
// dd($request->input('port'));
Session::put('default', $request->input('default'));
Session::put('host', $request->input('host'));
Session::put('databasename', $request->input('databasename'));
Session::put('username', $request->input('username'));
Session::put('password', $request->input('password'));
Session::put('port', $request->input('port'));
return Redirect::route('database');
}
@@ -311,15 +310,15 @@ class InstallController extends Controller
// $system->save();
// checking requested timezone for the admin and system
$timezones = Timezones::where('name', '=', $timezone)->first();
if ($timezones->id == null) {
return ['response' => 'fail', 'reason' => 'Invalid time-zone', 'status' => '0'];
if ($timezones == null) {
return redirect()->back()->with('fails', 'Invalid time-zone');
// return ['response' => 'fail', 'reason' => 'Invalid time-zone', 'status' => '0'];
}
// var_dump($datetime);
// checking requested date time format for the admin and system
$date_time_format = Date_time_format::where('format', '=', $datetime)->first();
// dd($date_time_format);
if ($date_time_format->id == null) {
return ['response' => 'fail', 'reason' => 'invalid date-time format', 'status' => '0'];
if ($date_time_format == null) {
return redirect()->back()->with('fails', 'invalid date-time format');
// return ['response' => 'fail', 'reason' => 'invalid date-time format', 'status' => '0'];
}
// Creating minum settings for system