diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 0d7899c9d..410de761f 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -29,8 +29,8 @@ use Mail; * * @author Ladybird */ -class AuthController extends Controller { - +class AuthController extends Controller +{ use AuthenticatesAndRegistersUsers; /* to redirect after login */ @@ -50,7 +50,8 @@ class AuthController extends Controller { * * @return void */ - public function __construct(PhpMailController $PhpMailController) { + public function __construct(PhpMailController $PhpMailController) + { $this->PhpMailController = $PhpMailController; SettingsController::smtp(); $this->middleware('guest', ['except' => 'getLogout']); @@ -61,7 +62,8 @@ class AuthController extends Controller { * * @return type Response */ - public function getRegister() { + public function getRegister() + { // Event for login \Event::fire(new \App\Events\FormRegisterEvent()); if (Auth::user()) { @@ -83,7 +85,8 @@ class AuthController extends Controller { * * @return type Response */ - public function postRegister(User $user, RegisterRequest $request) { + public function postRegister(User $user, RegisterRequest $request) + { // Event for login \Event::fire(new \App\Events\LoginEvent($request)); $password = Hash::make($request->input('password')); @@ -97,7 +100,7 @@ class AuthController extends Controller { $user->remember_token = $code; $user->save(); $message12 = ''; - $var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]); + $var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/'.$code)]); if ($var == null) { $message12 = Lang::get('lang.failed_to_send_email_contact_administrator'); @@ -116,7 +119,8 @@ class AuthController extends Controller { * * @return type redirect */ - public function accountActivate($token) { + public function accountActivate($token) + { $user = User::where('remember_token', '=', $token)->first(); if ($user) { $user->active = 1; @@ -137,7 +141,8 @@ class AuthController extends Controller { * * @return type Response */ - public function getMail($token, User $user) { + public function getMail($token, User $user) + { $user = $user->where('remember_token', $token)->where('active', 0)->first(); if ($user) { $user->active = 1; @@ -154,9 +159,10 @@ class AuthController extends Controller { * * @return type Response */ - public function getLogin() { + public function getLogin() + { $directory = base_path(); - if (file_exists($directory . DIRECTORY_SEPARATOR . ".env")) { + if (file_exists($directory.DIRECTORY_SEPARATOR.'.env')) { if (Auth::user()) { if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') { return \Redirect::route('dashboard'); @@ -178,7 +184,8 @@ class AuthController extends Controller { * * @return type Response */ - public function postLogin(LoginRequest $request) { + public function postLogin(LoginRequest $request) + { // Set login attempts and login time $value = $_SERVER['REMOTE_ADDR']; $usernameinput = $request->input('email'); @@ -197,7 +204,7 @@ class AuthController extends Controller { return redirect()->back() ->withInput($request->only('email', 'remember')) ->withErrors([ - 'email' => $this->getFailedLoginMessage(), + 'email' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(), ])->with('error', Lang::get('lang.this_account_is_currently_inactive')); } @@ -205,7 +212,7 @@ class AuthController extends Controller { return redirect()->back() ->withInput($request->only('email', 'remember')) ->withErrors([ - 'email' => $this->getFailedLoginMessage(), + 'email' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(), ])->with('error', Lang::get('lang.this_account_is_currently_inactive')); } @@ -248,7 +255,7 @@ class AuthController extends Controller { return redirect()->back() ->withInput($request->only('email', 'remember')) ->withErrors([ - 'email' => $this->getFailedLoginMessage(), + 'email' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(), ])->with('error', Lang::get('lang.invalid')); // Increment login attempts @@ -261,7 +268,8 @@ class AuthController extends Controller { * * @return type Response */ - public function addLoginAttempt($value, $field) { + public function addLoginAttempt($value, $field) + { $result = DB::table('login_attempts')->where('IP', '=', $value)->first(); $data = $result; $security = Security::whereId('1')->first(); @@ -269,7 +277,7 @@ class AuthController extends Controller { if ($data) { $attempts = $data->Attempts + 1; if ($attempts == $apt) { - $result = DB::select('UPDATE login_attempts SET Attempts=' . $attempts . ", LastLogin=NOW() WHERE IP = '$value' OR User = '$field'"); + $result = DB::select('UPDATE login_attempts SET Attempts='.$attempts.", LastLogin=NOW() WHERE IP = '$value' OR User = '$field'"); } else { $result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts]); // $result = DB::select("UPDATE login_attempts SET Attempts=".$attempts." WHERE IP = '$value' OR User = '$field'"); @@ -286,7 +294,8 @@ class AuthController extends Controller { * * @return type Response */ - public function clearLoginAttempts($value, $field) { + public function clearLoginAttempts($value, $field) + { $data = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['attempts' => '0']); return $data; @@ -299,13 +308,14 @@ class AuthController extends Controller { * * @return type Response */ - public function confirmIPAddress($value, $field) { + public function confirmIPAddress($value, $field) + { $security = Security::whereId('1')->first(); $time = $security->lockout_period; $max_attempts = $security->backlist_threshold; $table = 'login_attempts'; - $result = DB::select('SELECT Attempts, (CASE when LastLogin is not NULL and DATE_ADD(LastLogin, INTERVAL ' . $time . ' MINUTE)>NOW() then 1 else 0 end) as Denied ' . - ' FROM ' . $table . " WHERE IP = '$value' OR User = '$field'"); + $result = DB::select('SELECT Attempts, (CASE when LastLogin is not NULL and DATE_ADD(LastLogin, INTERVAL '.$time.' MINUTE)>NOW() then 1 else 0 end) as Denied '. + ' FROM '.$table." WHERE IP = '$value' OR User = '$field'"); $data = $result; //Verify that at least one login attempt is in database if (!$data) { @@ -329,8 +339,8 @@ class AuthController extends Controller { * * @return type string */ - protected function getFailedLoginMessage() { + protected function getFailedLoginMessage() + { return Lang::get('lang.this_field_do_not_match_our_records'); } - } diff --git a/app/Http/Controllers/Client/helpdesk/WelcomepageController.php b/app/Http/Controllers/Client/helpdesk/WelcomepageController.php index 17510d4aa..99b57a9aa 100644 --- a/app/Http/Controllers/Client/helpdesk/WelcomepageController.php +++ b/app/Http/Controllers/Client/helpdesk/WelcomepageController.php @@ -15,10 +15,11 @@ use Redirect; * * @author Ladybird */ -class WelcomepageController extends Controller { - - public function __construct() { -// $this->middleware('board'); +class WelcomepageController extends Controller +{ + public function __construct() + { + // $this->middleware('board'); } /** @@ -26,7 +27,8 @@ class WelcomepageController extends Controller { * * @return Response */ - public function get(System $note) { + public function get(System $note) + { if (Config::get('database.install') == '%0%') { return Redirect::route('licence'); } @@ -38,13 +40,13 @@ class WelcomepageController extends Controller { return view('themes.default1.client.guest-user.guest', compact('heading', 'content')); } - public function index() { + public function index() + { $directory = base_path(); - if (file_exists($directory .DIRECTORY_SEPARATOR. ".env")) { + if (file_exists($directory.DIRECTORY_SEPARATOR.'.env')) { return view('themes.default1.client.helpdesk.guest-user.index'); } else { return Redirect::route('licence'); } } - } diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index 47aa76ee3..76e0d6b95 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -7,24 +7,24 @@ use App\Http\Controllers\Controller; // requests use App\Http\Requests\helpdesk\DatabaseRequest; use App\Http\Requests\helpdesk\InstallerRequest; -use Illuminate\Http\Request; -// models use App\Model\helpdesk\Settings\System; +// models use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Timezones; use App\User; -// classes use Artisan; +// classes +use Cache; use Config; use DB; use Exception; use File; use Hash; +use Illuminate\Http\Request; use Input; use Redirect; use Session; use View; -use Cache; /** * |======================================================================= @@ -36,21 +36,23 @@ use Cache; * * @author Ladybird */ -class InstallController extends Controller { - +class InstallController extends Controller +{ /** * Get Licence (step 1). * * @return type view */ - public function licence() { + public function licence() + { // checking if the installation is running for the first time or not $directory = base_path(); - if (file_exists($directory . DIRECTORY_SEPARATOR . ".env")) { + if (file_exists($directory.DIRECTORY_SEPARATOR.'.env')) { return redirect('/auth/login'); } else { Cache::flush(); Artisan::call('config:clear'); + return view('themes/default1/installer/helpdesk/view1'); } } @@ -60,11 +62,13 @@ class InstallController extends Controller { * * @return type view */ - public function licencecheck(Request $request) { + public function licencecheck(Request $request) + { // checking if the user have accepted the licence agreement $accept = (Input::has('accept1')) ? true : false; if ($accept == 'accept') { Cache::forever('step1', 'step1'); + return Redirect::route('prerequisites'); } else { return Redirect::route('licence')->with('fails', 'Failed! first accept the licence agreeement'); @@ -79,7 +83,8 @@ class InstallController extends Controller { * * @return type view */ - public function prerequisites(Request $request) { + public function prerequisites(Request $request) + { // checking if the installation is running for the first time or not if (Cache::get('step1') == 'step1') { return View::make('themes/default1/installer/helpdesk/view2'); @@ -94,8 +99,10 @@ class InstallController extends Controller { * * @return type view */ - public function prerequisitescheck(Request $request) { + public function prerequisitescheck(Request $request) + { Cache::forever('step2', 'step2'); + return Redirect::route('configuration'); } @@ -105,7 +112,8 @@ class InstallController extends Controller { * * @return type view */ - public function localization(Request $request) { + public function localization(Request $request) + { // checking if the installation is running for the first time or not if (Cache::get('step2') == 'step2') { return View::make('themes/default1/installer/helpdesk/view3'); @@ -120,7 +128,8 @@ class InstallController extends Controller { * * @return type view */ - public function localizationcheck(Request $request) { + public function localizationcheck(Request $request) + { Cache::forever('step3', 'step3'); $request->session()->put('step3', 'step3'); @@ -138,7 +147,8 @@ class InstallController extends Controller { * * @return type view */ - public function configuration(Request $request) { + public function configuration(Request $request) + { // checking if the installation is running for the first time or not if (Cache::get('step2') == 'step2') { return View::make('themes/default1/installer/helpdesk/view3'); @@ -153,7 +163,8 @@ class InstallController extends Controller { * * @return type view */ - public function configurationcheck(DatabaseRequest $request) { + public function configurationcheck(DatabaseRequest $request) + { Cache::forever('step4', 'step4'); Session::set('default', $request->input('default')); @@ -171,8 +182,8 @@ class InstallController extends Controller { * * @return type view */ - public function postconnection(Request $request) { - + public function postconnection(Request $request) + { error_reporting(E_ALL & ~E_NOTICE); $default = Input::get('default'); $host = Input::get('host'); @@ -207,7 +218,7 @@ class InstallController extends Controller { $config .= "{$key}={$val}\n"; } // Write environment file - $fp = fopen(base_path() . '/.env', 'w'); + $fp = fopen(base_path().'/.env', 'w'); fwrite($fp, $config); fclose($fp); @@ -220,7 +231,8 @@ class InstallController extends Controller { * * @return type view */ - public function database(Request $request) { + public function database(Request $request) + { // checking if the installation is running for the first time or not if (Cache::get('step4') == 'step4') { return View::make('themes/default1/installer/helpdesk/view4'); @@ -235,10 +247,12 @@ class InstallController extends Controller { * * @return type view */ - public function account(Request $request) { + public function account(Request $request) + { // checking if the installation is running for the first time or not if (Cache::get('step4') == 'step4') { $request->session()->put('step5', $request->input('step5')); + return View::make('themes/default1/installer/helpdesk/view5'); } else { return Redirect::route('configuration'); @@ -253,7 +267,8 @@ class InstallController extends Controller { * * @return type view */ - public function accountcheck(InstallerRequest $request) { + public function accountcheck(InstallerRequest $request) + { // checking is the installation was done previously try { $check_for_pre_installation = System::all(); @@ -261,10 +276,9 @@ class InstallController extends Controller { return redirect()->back()->with('fails', 'The data in database already exist. Please provide fresh database'); } } catch (Exception $e) { - } if ($request->input('dummy-data') == 'on') { - $path = base_path() . '/DB/dummy-data.sql'; + $path = base_path().'/DB/dummy-data.sql'; DB::unprepared(file_get_contents($path)); } else { // migrate database @@ -302,26 +316,27 @@ class InstallController extends Controller { $system->date_time_format = $date_time_format->id; $system->time_zone = $timezones->id; $version = \Config::get('app.version'); - $version = explode(" ", $version); + $version = explode(' ', $version); $version = $version[1]; $system->version = $version; $system->save(); // creating an user $user = User::create([ - 'first_name' => $firstname, - 'last_name' => $lastname, - 'email' => $email, - 'user_name' => $username, - 'password' => Hash::make($password), + 'first_name' => $firstname, + 'last_name' => $lastname, + 'email' => $email, + 'user_name' => $username, + 'password' => Hash::make($password), 'assign_group' => 1, - 'primary_dpt' => 1, - 'active' => 1, - 'role' => 'admin', + 'primary_dpt' => 1, + 'active' => 1, + 'role' => 'admin', ]); // checking if the user have been created if ($user) { Cache::forever('step6', 'step6'); + return Redirect::route('final'); } } @@ -332,11 +347,12 @@ class InstallController extends Controller { * * @return type view */ - public function finalize() { -// checking if the installation have been completed or not - if (Cache::get('step6') == "step6") { + public function finalize() + { + // checking if the installation have been completed or not + if (Cache::get('step6') == 'step6') { $value = '1'; - $install = base_path() . DIRECTORY_SEPARATOR . '.env'; + $install = base_path().DIRECTORY_SEPARATOR.'.env'; $datacontent = File::get($install); $datacontent = str_replace('%0%', $value, $datacontent); File::put($install, $datacontent); @@ -349,20 +365,20 @@ class InstallController extends Controller { $content24 = File::get($path23); $content23 = str_replace('"%smtplink%"', $smtpfilepath, $content23); $content24 = str_replace("'%url%'", $lfmpath, $content24); - $link = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; + $link = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; $pos = strpos($link, 'final'); $link = substr($link, 0, $pos); - $app_url = base_path() . DIRECTORY_SEPARATOR . '.env'; + $app_url = base_path().DIRECTORY_SEPARATOR.'.env'; $datacontent2 = File::get($app_url); $datacontent2 = str_replace('http://localhost', $link, $datacontent2); File::put($app_url, $datacontent2); File::put($path22, $content23); File::put($path23, $content24); try { - Cache::flush(); Artisan::call('key:generate'); + return View::make('themes/default1/installer/helpdesk/view6'); } catch (Exception $e) { return Redirect::route('account')->with('fails', $e->getMessage()); @@ -378,7 +394,8 @@ class InstallController extends Controller { * * @return type view */ - public function finalcheck() { + public function finalcheck() + { try { return redirect('/auth/login'); } catch (Exception $e) { @@ -386,8 +403,9 @@ class InstallController extends Controller { } } - public function changeFilePermission() { - $path1 = base_path() . DIRECTORY_SEPARATOR . '.env'; + public function changeFilePermission() + { + $path1 = base_path().DIRECTORY_SEPARATOR.'.env'; if (chmod($path1, 0644)) { $f1 = substr(sprintf('%o', fileperms($path1)), -3); if ($f1 >= '644') { @@ -400,8 +418,8 @@ class InstallController extends Controller { } } - public function jsDisabled() { + public function jsDisabled() + { return view('themes/default1/installer/helpdesk/check-js')->with('url', 'step1'); } - } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 50ce2841f..17ebf6c61 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -7,8 +7,8 @@ use Illuminate\Foundation\Http\Kernel as HttpKernel; /** * Kernel. */ -class Kernel extends HttpKernel { - +class Kernel extends HttpKernel +{ /** * The application's global HTTP middleware stack. * @@ -46,19 +46,18 @@ class Kernel extends HttpKernel { * @var array */ protected $routeMiddleware = [ - 'auth' => \App\Http\Middleware\Authenticate::class, - 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, - 'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class, - 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, - 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, - 'roles' => \App\Http\Middleware\CheckRole::class, - 'role.agent' => \App\Http\Middleware\CheckRoleAgent::class, - 'role.user' => \App\Http\Middleware\CheckRoleUser::class, - 'api' => \App\Http\Middleware\ApiKey::class, - 'jwt.auth' => \Tymon\JWTAuth\Middleware\GetUserFromToken::class, + 'auth' => \App\Http\Middleware\Authenticate::class, + 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, + 'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class, + 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, + 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, + 'roles' => \App\Http\Middleware\CheckRole::class, + 'role.agent' => \App\Http\Middleware\CheckRoleAgent::class, + 'role.user' => \App\Http\Middleware\CheckRoleUser::class, + 'api' => \App\Http\Middleware\ApiKey::class, + 'jwt.auth' => \Tymon\JWTAuth\Middleware\GetUserFromToken::class, 'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class, - 'update' => \App\Http\Middleware\CheckUpdate::class, - 'board' => \App\Http\Middleware\CheckBoard::class, + 'update' => \App\Http\Middleware\CheckUpdate::class, + 'board' => \App\Http\Middleware\CheckBoard::class, ]; - } diff --git a/app/Http/routes.php b/app/Http/routes.php index 46c4507e5..2f9f29e84 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -13,7 +13,7 @@ Route::group(['middleware' => ['web']], function () { Route::group(['middleware' => 'update'], function () { Route::controllers([ - 'auth' => 'Auth\AuthController', + 'auth' => 'Auth\AuthController', 'password' => 'Auth\PasswordController', ]); }); @@ -545,11 +545,11 @@ Route::group(['middleware' => ['web']], function () { }); //route for submit error and debugging setting form page Route::post('post-settings', ['as' => 'post.error.debug.settings', - 'uses' => 'Admin\helpdesk\ErrorAndDebuggingController@postSettings',]); + 'uses' => 'Admin\helpdesk\ErrorAndDebuggingController@postSettings', ]); //route to error logs table page Route::get('show-error-logs', [ - 'as' => 'error.logs', + 'as' => 'error.logs', 'uses' => 'Admin\helpdesk\ErrorAndDebuggingController@showErrorLogs', ]); }); @@ -889,7 +889,7 @@ Route::group(['middleware' => ['web']], function () { }); Route::any('getdata', function () { $term = Illuminate\Support\Str::lower(Input::get('term')); - $data = Illuminate\Support\Facades\DB::table('tickets')->distinct()->select('ticket_number')->where('ticket_number', 'LIKE', $term . '%')->groupBy('ticket_number')->take(10)->get(); + $data = Illuminate\Support\Facades\DB::table('tickets')->distinct()->select('ticket_number')->where('ticket_number', 'LIKE', $term.'%')->groupBy('ticket_number')->take(10)->get(); foreach ($data as $v) { return [ 'value' => $v->ticket_number, @@ -1039,24 +1039,24 @@ Route::group(['middleware' => ['web']], function () { |============================================================= */ Route::get('500', ['as' => 'error500', function () { - return view('errors.500'); -}]); + return view('errors.500'); + }]); Breadcrumbs::register('error500', function ($breadcrumbs) { $breadcrumbs->push('500'); }); Route::get('404', ['as' => 'error404', function () { - return view('errors.404'); -}]); + return view('errors.404'); + }]); Breadcrumbs::register('error404', function ($breadcrumbs) { $breadcrumbs->push('404'); }); Route::get('board-offline', ['as' => 'board.offline', function () { - return view('errors.offline'); -}]); + return view('errors.offline'); + }]); Breadcrumbs::register('board.offline', function ($breadcrumbs) { $breadcrumbs->push('Board Offline');