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

Removed nbproject

Browse Source 
Added nbproject in gitignore as it is not related to Faveo source.
This commit is contained in:
Manish Verma
2018-08-09 10:51:23 +05:30
parent 035bc5a069
commit 3079bafd14
4 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -3,7 +3,7 @@
Homestead.yaml Homestead.yaml
Homestead.json Homestead.json
/config/lfm.php /config/lfm.php
/nbproject/private/ /nbproject/*
/node_modules /node_modules
/public/error_log /public/error_log
/public/lb-faveo/media/ /public/lb-faveo/media/

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

@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\helpdesk\InstallerRequest; use App\Http\Requests\helpdesk\InstallerRequest;
use App\Model\helpdesk\Settings\System; use App\Model\helpdesk\Settings\System;
// models // models
use App\Model\helpdesk\Utility\Date_time_format;
use App\Model\helpdesk\Utility\Timezones; use App\Model\helpdesk\Utility\Timezones;
use App\User; use App\User;
use Artisan; use Artisan;
@@ -246,9 +247,17 @@ class InstallController extends Controller
$password = $request->input('password'); $password = $request->input('password');
$language = $request->input('language'); $language = $request->input('language');
$timezone = $request->input('timezone'); // checking requested timezone for the admin and system
$date = $request->input('date'); $timezones = Timezones::where('name', '=', $request->input('timezone'))->first();
$datetime = $request->input('datetime'); if ($timezones == null) {
return redirect()->back()->with('fails', 'Invalid time-zone');
}
// checking requested date time format for the admin and system
$date_time_format = Date_time_format::where('format', '=', $request->input('datetime'))->first();
if ($date_time_format == null) {
return redirect()->back()->with('fails', 'invalid date-time format');
}
$lang_path = base_path('resources/lang'); $lang_path = base_path('resources/lang');
//check user input language package is available or not in the system //check user input language package is available or not in the system
@@ -266,19 +275,15 @@ class InstallController extends Controller
$system = System::where('id', '=', 1)->first(); $system = System::where('id', '=', 1)->first();
$system->status = 1; $system->status = 1;
$system->department = 1; $system->department = 1;
$system->date_time_format = $datetime; //$date_time_format->id; $system->date_time_format = $date_time_format->id;
$system->time_zone = $timezone; //$timezones->id; $system->time_zone = $timezones->id;
$version = \Config::get('app.tags'); $version = \Config::get('app.tags');
// $version = explode(' ', $version); // $version = explode(' ', $version);
// $version = $version[1]; // $version = $version[1];
$system->version = $version; $system->version = $version;
$system->save(); $system->save();
$admin_tzone = 14; $admin_tzone = $timezones->id;
$tzone = Timezones::select('id')->where('name', '=', $timezone)->first();
if ($tzone) {
$admin_tzone = $tzone->id;
}
// creating an user // creating an user
$user = User::updateOrCreate(['id' => 1], [ $user = User::updateOrCreate(['id' => 1], [
'first_name' => $firstname, 'first_name' => $firstname,

7
nbproject/project.properties
View File

@@ -1,7 +0,0 @@
include.path=${php.global.include.path}
php.version=PHP_56
source.encoding=UTF-8
src.dir=.
tags.asp=false
tags.short=false
web.root=.

9
nbproject/project.xml
View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.php.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/php-project/1">
<name>faveo-helpdesk-community</name>
</data>
</configuration>
</project>