From 3079bafd144c94e6ae12aa6f3bb6715409805375 Mon Sep 17 00:00:00 2001
From: Manish Verma <alerts@ladybirdweb.com>
Date: Thu, 9 Aug 2018 10:51:23 +0530
Subject: [PATCH] Removed nbproject

Added nbproject in gitignore as it is not related to Faveo source.
---
 .gitignore                                    |  2 +-
 .../Installer/helpdesk/InstallController.php  | 25 +++++++++++--------
 nbproject/project.properties                  |  7 ------
 nbproject/project.xml                         |  9 -------
 4 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 nbproject/project.properties
 delete mode 100644 nbproject/project.xml

diff --git a/.gitignore b/.gitignore
index b2f6dee54..70a7cc7f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 Homestead.yaml
 Homestead.json
 /config/lfm.php
-/nbproject/private/
+/nbproject/*
 /node_modules
 /public/error_log
 /public/lb-faveo/media/
diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php
index ecf2975a2..4b387c622 100644
--- a/app/Http/Controllers/Installer/helpdesk/InstallController.php
+++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php
@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\helpdesk\InstallerRequest;
 use App\Model\helpdesk\Settings\System;
 // models
+use App\Model\helpdesk\Utility\Date_time_format;
 use App\Model\helpdesk\Utility\Timezones;
 use App\User;
 use Artisan;
@@ -246,9 +247,17 @@ class InstallController extends Controller
         $password = $request->input('password');
 
         $language = $request->input('language');
-        $timezone = $request->input('timezone');
-        $date = $request->input('date');
-        $datetime = $request->input('datetime');
+        // checking requested timezone for the admin and system
+        $timezones = Timezones::where('name', '=', $request->input('timezone'))->first();
+        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');
 
         //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->status = 1;
         $system->department = 1;
-        $system->date_time_format = $datetime; //$date_time_format->id;
-        $system->time_zone = $timezone; //$timezones->id;
+        $system->date_time_format = $date_time_format->id;
+        $system->time_zone = $timezones->id;
         $version = \Config::get('app.tags');
         // $version = explode(' ', $version);
         // $version = $version[1];
         $system->version = $version;
         $system->save();
 
-        $admin_tzone = 14;
-        $tzone = Timezones::select('id')->where('name', '=', $timezone)->first();
-        if ($tzone) {
-            $admin_tzone = $tzone->id;
-        }
+        $admin_tzone = $timezones->id;
         // creating an user
         $user = User::updateOrCreate(['id' => 1], [
                     'first_name'   => $firstname,
diff --git a/nbproject/project.properties b/nbproject/project.properties
deleted file mode 100644
index 76f6f9183..000000000
--- a/nbproject/project.properties
+++ /dev/null
@@ -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=.
diff --git a/nbproject/project.xml b/nbproject/project.xml
deleted file mode 100644
index dc6cbbfa9..000000000
--- a/nbproject/project.xml
+++ /dev/null
@@ -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>