From b3b057e0cc298e5ce0eb644b61e98b11d3c2f1a1 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Fri, 24 Mar 2023 06:00:31 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Api/routes.php | 140 +++++++++--------- app/Api/v1/ApiController.php | 1 + app/Api/v1/TicketController.php | 1 + app/Api/v1/TokenAuthController.php | 1 + app/Console/Commands/SecureFaveoAPPKey.php | 2 +- app/Console/Commands/Sync.php | 1 + app/Console/Kernel.php | 2 +- app/Exceptions/Handler.php | 1 - app/Exports/UserExport.php | 1 - app/FaveoLog/routes.php | 1 - app/Helper/Finder.php | 38 ++--- .../Admin/helpdesk/LanguageController.php | 4 - .../Admin/helpdesk/PriorityController.php | 4 +- .../helpdesk/Filter/FilterController.php | 7 +- .../helpdesk/Filter/FilterControllerOld.php | 46 +++--- .../Agent/helpdesk/TicketController.php | 2 - .../Agent/helpdesk/UserController.php | 8 +- .../Agent/kb/CategoryController.php | 1 - app/Http/Controllers/Auth/AuthController.php | 2 +- .../Client/helpdesk/FormController.php | 2 +- .../Client/helpdesk/GuestController.php | 2 +- .../Client/helpdesk/UnAuthController.php | 26 ++-- .../Installer/helpdesk/InstallController.php | 14 +- app/Http/Controllers/Job/MailController.php | 2 +- .../Update/SyncFaveoToLatestVersion.php | 13 +- .../Controllers/Update/UpgradeController.php | 8 +- app/Http/Requests/helpdesk/AgentRequest.php | 1 - app/Http/Requests/helpdesk/ClientRequest.php | 2 +- app/Model/helpdesk/Settings/System.php | 2 +- app/Providers/AppServiceProvider.php | 2 - app/Providers/EventServiceProvider.php | 1 - database/seeders/v_2_0_0/DatabaseSeeder.php | 6 +- routes/web.php | 12 +- 33 files changed, 172 insertions(+), 184 deletions(-) diff --git a/app/Api/routes.php b/app/Api/routes.php index 196d3d16a..42303aca5 100644 --- a/app/Api/routes.php +++ b/app/Api/routes.php @@ -3,81 +3,81 @@ use App\Http\Controllers\Common; use Illuminate\Support\Facades\Route; +/* + * ================================================================================================ + * @version v1 + * @access public + * @copyright (c) 2016, Ladybird web solution + * @author Vijay Sebastian + * @name Faveo + */ +Route::prefix('api/v1')->group(function () { + Route::post('authenticate', [\App\Api\v1\TokenAuthController::class, 'authenticate']); + Route::get('authenticate/user', [\App\Api\v1\TokenAuthController::class, 'getAuthenticatedUser']); + Route::get('/database-config', [\App\Api\v1\InstallerApiController::class, 'config_database'])->name('database-config'); + Route::get('/system-config', [\App\Api\v1\InstallerApiController::class, 'config_system'])->name('database-config'); /* - * ================================================================================================ - * @version v1 - * @access public - * @copyright (c) 2016, Ladybird web solution - * @author Vijay Sebastian - * @name Faveo + * Helpdesk */ - Route::prefix('api/v1')->group(function () { - Route::post('authenticate', [\App\Api\v1\TokenAuthController::class, 'authenticate']); - Route::get('authenticate/user', [\App\Api\v1\TokenAuthController::class, 'getAuthenticatedUser']); - Route::get('/database-config', [\App\Api\v1\InstallerApiController::class, 'config_database'])->name('database-config'); - Route::get('/system-config', [\App\Api\v1\InstallerApiController::class, 'config_system'])->name('database-config'); + Route::prefix('helpdesk')->group(function () { + Route::post('create', [\App\Api\v1\ApiController::class, 'createTicket']); + Route::post('reply', [\App\Api\v1\ApiController::class, 'ticketReply']); + Route::post('edit', [\App\Api\v1\ApiController::class, 'editTicket']); + Route::post('delete', [\App\Api\v1\ApiController::class, 'deleteTicket']); + Route::post('assign', [\App\Api\v1\ApiController::class, 'assignTicket']); + Route::get('open', [\App\Api\v1\ApiController::class, 'openedTickets']); + Route::get('unassigned', [\App\Api\v1\ApiController::class, 'unassignedTickets']); + Route::get('closed', [\App\Api\v1\ApiController::class, 'closeTickets']); + Route::get('agents', [\App\Api\v1\ApiController::class, 'getAgents']); + Route::get('teams', [\App\Api\v1\ApiController::class, 'getTeams']); + Route::get('customers', [\App\Api\v1\ApiController::class, 'getCustomers']); + Route::get('customer', [\App\Api\v1\ApiController::class, 'getCustomer']); + Route::get('ticket-search', [\App\Api\v1\ApiController::class, 'searchTicket']); + Route::get('ticket-thread', [\App\Api\v1\ApiController::class, 'ticketThreads']); + Route::get('url', [\App\Api\v1\ApiExceptAuthController::class, 'checkUrl']); + Route::get('check-url', [\App\Api\v1\ApiExceptAuthController::class, 'urlResult']); + Route::get('api_key', [\App\Api\v1\ApiController::class, 'generateApiKey']); + Route::get('help-topic', [\App\Api\v1\ApiController::class, 'getHelpTopic']); + Route::get('sla-plan', [\App\Api\v1\ApiController::class, 'getSlaPlan']); + Route::get('priority', [\App\Api\v1\ApiController::class, 'getPriority']); + Route::get('department', [\App\Api\v1\ApiController::class, 'getDepartment']); + Route::get('tickets', [\App\Api\v1\ApiController::class, 'getTickets']); + Route::get('ticket', [\App\Api\v1\ApiController::class, 'getTicketById']); + Route::get('inbox', [\App\Api\v1\ApiController::class, 'inbox']); + Route::get('trash', [\App\Api\v1\ApiController::class, 'getTrash']); + Route::get('my-tickets-agent', [\App\Api\v1\ApiController::class, 'getMyTicketsAgent']); + Route::post('internal-note', [\App\Api\v1\ApiController::class, 'internalNote']); /* - * Helpdesk + * Newly added */ - Route::prefix('helpdesk')->group(function () { - Route::post('create', [\App\Api\v1\ApiController::class, 'createTicket']); - Route::post('reply', [\App\Api\v1\ApiController::class, 'ticketReply']); - Route::post('edit', [\App\Api\v1\ApiController::class, 'editTicket']); - Route::post('delete', [\App\Api\v1\ApiController::class, 'deleteTicket']); - Route::post('assign', [\App\Api\v1\ApiController::class, 'assignTicket']); - Route::get('open', [\App\Api\v1\ApiController::class, 'openedTickets']); - Route::get('unassigned', [\App\Api\v1\ApiController::class, 'unassignedTickets']); - Route::get('closed', [\App\Api\v1\ApiController::class, 'closeTickets']); - Route::get('agents', [\App\Api\v1\ApiController::class, 'getAgents']); - Route::get('teams', [\App\Api\v1\ApiController::class, 'getTeams']); - Route::get('customers', [\App\Api\v1\ApiController::class, 'getCustomers']); - Route::get('customer', [\App\Api\v1\ApiController::class, 'getCustomer']); - Route::get('ticket-search', [\App\Api\v1\ApiController::class, 'searchTicket']); - Route::get('ticket-thread', [\App\Api\v1\ApiController::class, 'ticketThreads']); - Route::get('url', [\App\Api\v1\ApiExceptAuthController::class, 'checkUrl']); - Route::get('check-url', [\App\Api\v1\ApiExceptAuthController::class, 'urlResult']); - Route::get('api_key', [\App\Api\v1\ApiController::class, 'generateApiKey']); - Route::get('help-topic', [\App\Api\v1\ApiController::class, 'getHelpTopic']); - Route::get('sla-plan', [\App\Api\v1\ApiController::class, 'getSlaPlan']); - Route::get('priority', [\App\Api\v1\ApiController::class, 'getPriority']); - Route::get('department', [\App\Api\v1\ApiController::class, 'getDepartment']); - Route::get('tickets', [\App\Api\v1\ApiController::class, 'getTickets']); - Route::get('ticket', [\App\Api\v1\ApiController::class, 'getTicketById']); - Route::get('inbox', [\App\Api\v1\ApiController::class, 'inbox']); - Route::get('trash', [\App\Api\v1\ApiController::class, 'getTrash']); - Route::get('my-tickets-agent', [\App\Api\v1\ApiController::class, 'getMyTicketsAgent']); - Route::post('internal-note', [\App\Api\v1\ApiController::class, 'internalNote']); - /* - * Newly added - */ - Route::get('customers-custom', [\App\Api\v1\ApiController::class, 'getCustomersWith']); - Route::get('collaborator/search', [\App\Api\v1\ApiController::class, 'collaboratorSearch']); - Route::post('collaborator/create', [\App\Api\v1\ApiController::class, 'addCollaboratorForTicket']); - Route::post('collaborator/remove', [\App\Api\v1\ApiController::class, 'deleteCollaborator']); - Route::post('collaborator/get-ticket', [\App\Api\v1\ApiController::class, 'getCollaboratorForTicket']); - Route::get('my-tickets-user', [\App\Api\v1\ApiController::class, 'getMyTicketsUser']); - Route::get('dependency', [\App\Api\v1\ApiController::class, 'dependency']); - Route::post('register', [\App\Api\v1\ApiController::class, 'createUser']); - }); + Route::get('customers-custom', [\App\Api\v1\ApiController::class, 'getCustomersWith']); + Route::get('collaborator/search', [\App\Api\v1\ApiController::class, 'collaboratorSearch']); + Route::post('collaborator/create', [\App\Api\v1\ApiController::class, 'addCollaboratorForTicket']); + Route::post('collaborator/remove', [\App\Api\v1\ApiController::class, 'deleteCollaborator']); + Route::post('collaborator/get-ticket', [\App\Api\v1\ApiController::class, 'getCollaboratorForTicket']); + Route::get('my-tickets-user', [\App\Api\v1\ApiController::class, 'getMyTicketsUser']); + Route::get('dependency', [\App\Api\v1\ApiController::class, 'dependency']); + Route::post('register', [\App\Api\v1\ApiController::class, 'createUser']); + }); - /* - * FCM token response - */ - Route::post('fcmtoken', [Common\PushNotificationController::class, 'fcmToken'])->name('fcmtoken'); - }); /* - * ================================================================================================ - * @version v1 - * @access public - * @copyright (c) 2016, Ladybird web solution - * @author Manish Verma - * @name Faveo + * FCM token response */ - Route::prefix('api/v2')->group(function () { - /* - * Helpdesk - */ - Route::prefix('helpdesk')->group(function () { - Route::get('tickets', [\App\Api\v2\TicketController::class, 'getTickets']); - }); + Route::post('fcmtoken', [Common\PushNotificationController::class, 'fcmToken'])->name('fcmtoken'); +}); +/* + * ================================================================================================ + * @version v1 + * @access public + * @copyright (c) 2016, Ladybird web solution + * @author Manish Verma + * @name Faveo + */ +Route::prefix('api/v2')->group(function () { + /* + * Helpdesk + */ + Route::prefix('helpdesk')->group(function () { + Route::get('tickets', [\App\Api\v2\TicketController::class, 'getTickets']); }); +}); diff --git a/app/Api/v1/ApiController.php b/app/Api/v1/ApiController.php index 18cdaf3ed..cd6feaa59 100644 --- a/app/Api/v1/ApiController.php +++ b/app/Api/v1/ApiController.php @@ -32,6 +32,7 @@ use Illuminate\Support\Str; * * @author Vijay Sebastian * @copyright (c) 2016, Ladybird Web Solution + * * @name Faveo HELPDESK * * @version v1 diff --git a/app/Api/v1/TicketController.php b/app/Api/v1/TicketController.php index bff53961b..a6d2f1073 100644 --- a/app/Api/v1/TicketController.php +++ b/app/Api/v1/TicketController.php @@ -26,6 +26,7 @@ use Mail; * * @author Vijay Sebastian * @copyright (c) 2016, Ladybird Web Solution + * * @name Faveo HELPDESK * * @version v1 diff --git a/app/Api/v1/TokenAuthController.php b/app/Api/v1/TokenAuthController.php index 2325a6569..577d5836b 100644 --- a/app/Api/v1/TokenAuthController.php +++ b/app/Api/v1/TokenAuthController.php @@ -19,6 +19,7 @@ use Tymon\JWTAuth\Exceptions\JWTException; * * @author Vijay Sebastian * @copyright (c) 2016, Ladybird Web Solution + * * @name Faveo HELPDESK * * @version v1 diff --git a/app/Console/Commands/SecureFaveoAPPKey.php b/app/Console/Commands/SecureFaveoAPPKey.php index 9ed3bb792..b78bad6d0 100644 --- a/app/Console/Commands/SecureFaveoAPPKey.php +++ b/app/Console/Commands/SecureFaveoAPPKey.php @@ -70,7 +70,7 @@ class SecureFaveoAPPKey extends Command } $this->line("\r\nAPP_KEY has been updated in the environment."); $this->line("\r\nNext you might want to check if your configured email is working fine or not. If it has any problem you can update the password and restart your queue workers if you are processing mail jobs in queue.\r\n"); - exit(); + exit; } $this->info('Alright, calm down we did not make any changes to your environment. But if you think your APP_KEY was compromised or you were using Faveo without generating APP_KEY explicitly(for version v1.10.* or older) we recommend you to run this command on priority basis.'); } diff --git a/app/Console/Commands/Sync.php b/app/Console/Commands/Sync.php index a44de0448..249605ac1 100644 --- a/app/Console/Commands/Sync.php +++ b/app/Console/Commands/Sync.php @@ -29,6 +29,7 @@ class Sync extends Command public function handle() { (new SyncFaveoToLatestVersion())->sync(); + return Command::SUCCESS; } } diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index edd4634e0..631ce1c76 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -25,7 +25,7 @@ class Kernel extends ConsoleKernel \App\Console\Commands\InstallDB::class, \App\Console\Commands\SetupTestEnv::class, \App\Console\Commands\SecureFaveoAPPKey::class, - SyncFaveoToLatestVersion::class + SyncFaveoToLatestVersion::class, ]; /** diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 5c1affd5d..5bc7cbdb3 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Http\Exceptions\HttpResponseException; use Illuminate\Session\TokenMismatchException; -use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Config; use Illuminate\Validation\ValidationException; use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; diff --git a/app/Exports/UserExport.php b/app/Exports/UserExport.php index b9490319a..a95cdbd28 100644 --- a/app/Exports/UserExport.php +++ b/app/Exports/UserExport.php @@ -3,7 +3,6 @@ namespace App\Exports; use Maatwebsite\Excel\Concerns\FromArray; -use Maatwebsite\Excel\Concerns\FromCollection; use Maatwebsite\Excel\Concerns\WithHeadings; class UserExport implements FromArray, WithHeadings diff --git a/app/FaveoLog/routes.php b/app/FaveoLog/routes.php index 37d014107..a0ee8b48e 100644 --- a/app/FaveoLog/routes.php +++ b/app/FaveoLog/routes.php @@ -1,6 +1,5 @@ fails()) { - // send back to the page with the input data and errors return Redirect::back()->withInput()->withErrors($validator); } else { - //Checking if package already exists or not in lang folder $path = base_path('lang'); if (in_array(strtolower(Request::get('iso-code')), scandir($path))) { - //sending back with error message Session::flash('fails', Lang::get('lang.package_exist')); Session::flash('link', 'change-language/'.strtolower(Request::get('iso-code'))); @@ -169,7 +166,6 @@ class LanguageController extends Controller return Redirect::back()->withInput(); } else { - // checking file is valid. if (Request::file('File')->isValid()) { $name = Request::file('File')->getClientOriginalName(); //uploaded file's original name diff --git a/app/Http/Controllers/Admin/helpdesk/PriorityController.php b/app/Http/Controllers/Admin/helpdesk/PriorityController.php index a4d395fda..e891d24e9 100644 --- a/app/Http/Controllers/Admin/helpdesk/PriorityController.php +++ b/app/Http/Controllers/Admin/helpdesk/PriorityController.php @@ -159,7 +159,7 @@ class PriorityController extends Controller ->update(['is_default' => 1]); } - return \Redirect::route('priority.index')->with('success', (Lang::get('lang.priority_successfully_updated'))); + return \Redirect::route('priority.index')->with('success', Lang::get('lang.priority_successfully_updated')); } /** @@ -187,6 +187,6 @@ class PriorityController extends Controller $tk_priority->delete(); - return \Redirect::route('priority.index')->with('success', (Lang::get('lang.delete_successfully'))); + return \Redirect::route('priority.index')->with('success', Lang::get('lang.delete_successfully')); } } diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index b2d9218e6..25efbd324 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -318,7 +318,7 @@ class FilterController extends Controller return $table; break; - // case 'show-overdue': + // case 'show-overdue': // $table = $this->filterByDate('overdue', $value, $table); // return $table; // break; @@ -610,7 +610,7 @@ class FilterController extends Controller return $table; break; - // case 'overdue': + // case 'overdue': // if ($value[0] == 1 || $value[0] == '1') { // $table = $table->where('isanswered', '=', 0) // ->whereNotNull('tickets.duedate') @@ -857,7 +857,7 @@ class FilterController extends Controller return [$start, $end]; break; - // cases for due date + // cases for due date case 'any-time': return ['any']; @@ -952,6 +952,7 @@ class FilterController extends Controller * @category function to filter tickets by SLA * * @param string array $value, builder $table + * * @ * * @return builder diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php index 0ea38781d..48919929a 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php @@ -102,12 +102,12 @@ class FilterControllerOld extends Controller ->whereIn('ticket_status.state', ['closed']); }); case '/ticket/myticket': - return $table - ->leftJoin('ticket_status', function ($join) { - $join->on('ticket_status.id', '=', 'tickets.status'); - }) - ->orWhere('tickets.assigned_to', '=', Auth::user()->id) - ->where('tickets.status', '=', 1); + return $table + ->leftJoin('ticket_status', function ($join) { + $join->on('ticket_status.id', '=', 'tickets.status'); + }) + ->orWhere('tickets.assigned_to', '=', Auth::user()->id) + ->where('tickets.status', '=', 1); case '/unassigned': if (Auth::user()->role == 'agent') { $id = Auth::user()->primary_dpt; @@ -126,17 +126,17 @@ class FilterControllerOld extends Controller $table = $table->where('tickets.dept_id', '=', $id); } - return $table - ->leftJoin('ticket_status', function ($join) { - $join->on('ticket_status.id', '=', 'tickets.status'); - }) - ->where('tickets.status', '=', 1) - ->where('tickets.isanswered', '=', 0) - ->whereNotNull('tickets.duedate') - ->where('tickets.duedate', '!=', '00-00-00 00:00:00') + return $table + ->leftJoin('ticket_status', function ($join) { + $join->on('ticket_status.id', '=', 'tickets.status'); + }) + ->where('tickets.status', '=', 1) + ->where('tickets.isanswered', '=', 0) + ->whereNotNull('tickets.duedate') + ->where('tickets.duedate', '!=', '00-00-00 00:00:00') - // ->where('duedate','>',\Carbon\Carbon::now()); - ->where('tickets.duedate', '<', \Carbon\Carbon::now()); + // ->where('duedate','>',\Carbon\Carbon::now()); + ->where('tickets.duedate', '<', \Carbon\Carbon::now()); case '/ticket/approval/closed': if (Auth::user()->role == 'agent') { $id = Auth::user()->primary_dpt; @@ -203,14 +203,14 @@ class FilterControllerOld extends Controller $table = $table->where('tickets.dept_id', '=', $id); } - return $table - ->leftJoin('ticket_status', function ($join) { - $join->on('ticket_status.id', '=', 'tickets.status'); - }) - ->where('tickets.status', '=', 1) + return $table + ->leftJoin('ticket_status', function ($join) { + $join->on('ticket_status.id', '=', 'tickets.status'); + }) + ->where('tickets.status', '=', 1) - ->whereNotNull('tickets.duedate') - ->whereDate('tickets.duedate', '=', \Carbon\Carbon::now()->format('Y-m-d')); + ->whereNotNull('tickets.duedate') + ->whereDate('tickets.duedate', '=', \Carbon\Carbon::now()->format('Y-m-d')); case '/ticket/followup': if (Auth::user()->role == 'agent') { diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 127f19b28..f29f86336 100755 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Agent\helpdesk; // controllers -use App\Http\Controllers\Agent\helpdesk\Filter\FilterControllerOld; use App\Http\Controllers\Common\FileuploadController; use App\Http\Controllers\Common\NotificationController as Notify; use App\Http\Controllers\Common\PhpMailController; @@ -51,7 +50,6 @@ use Illuminate\Support\Str; use Lang; use Mail; use UTC; -use Vsmoraes\Pdf\Pdf; use Vsmoraes\Pdf\PdfFacade; use Yajra\DataTables\Facades\DataTables; diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 755014d57..82e209e04 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -600,8 +600,8 @@ class UserController extends Controller } } // } catch (Exception $e) { - /* redirect to Index page with Fails Message */ - // return redirect('user')->with('fails', $e->getMessage()); + /* redirect to Index page with Fails Message */ + // return redirect('user')->with('fails', $e->getMessage()); // } } @@ -640,7 +640,6 @@ class UserController extends Controller public function edit($id, CountryCode $code) { try { - // dd('here'); $settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first(); $email_mandatory = CommonSettings::select('status')->where('option_name', '=', 'email_mandatory')->first(); @@ -996,6 +995,7 @@ class UserController extends Controller $users = $this->getUsers($first_date, $second_date); $excel_controller = new \App\Http\Controllers\Common\ExcelController(); $filename = 'users'.$date; + return $excel_controller->export($filename, $users); } catch (Exception $ex) { return redirect()->back()->with('fails', $ex->getMessage()); @@ -1046,7 +1046,7 @@ class UserController extends Controller ->first(); if ($otp != null) { $otp_length = strlen(Input::get('otp')); - if (($otp_length == 6 && !preg_match('/[a-z]/i', Input::get('otp')))) { + if ($otp_length == 6 && !preg_match('/[a-z]/i', Input::get('otp'))) { $otp2 = Hash::make(Input::get('otp')); $date1 = date_format($otp->updated_at, 'Y-m-d h:i:sa'); $date2 = date('Y-m-d h:i:sa'); diff --git a/app/Http/Controllers/Agent/kb/CategoryController.php b/app/Http/Controllers/Agent/kb/CategoryController.php index 55a157b35..bdf2b75b8 100644 --- a/app/Http/Controllers/Agent/kb/CategoryController.php +++ b/app/Http/Controllers/Agent/kb/CategoryController.php @@ -184,7 +184,6 @@ class CategoryController extends Controller */ public function update($id, CategoryRequest $request) { - /* Edit the selected category via id */ $category = Category::where('id', $id)->first(); $sl = $request->input('name'); diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 3715e6242..d1d9fb892 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -550,7 +550,7 @@ class AuthController extends Controller $otp = Otp::select('otp', 'updated_at')->where('user_id', '=', $user->id) ->first(); if ($otp != null) { - if (($otp_length == 6 && !preg_match('/[a-z]/i', $request->input('otp')))) { + if ($otp_length == 6 && !preg_match('/[a-z]/i', $request->input('otp'))) { $otp2 = Hash::make($request->input('otp')); $date1 = date_format($otp->updated_at, 'Y-m-d h:i:sa'); $date2 = date('Y-m-d h:i:sa'); diff --git a/app/Http/Controllers/Client/helpdesk/FormController.php b/app/Http/Controllers/Client/helpdesk/FormController.php index 8ec6dd06a..73d69859a 100755 --- a/app/Http/Controllers/Client/helpdesk/FormController.php +++ b/app/Http/Controllers/Client/helpdesk/FormController.php @@ -188,7 +188,7 @@ class FormController extends Controller // $priority = $ticket_settings->first()->priority; $default_priority = Ticket_Priority::where('is_default', '=', 1)->first(); $user_priority = CommonSettings::where('option_name', '=', 'user_priority')->first(); - if (!($request->input('priority'))) { + if (!$request->input('priority')) { $priority = $default_priority->priority_id; if ($helpTopicObj->exists() && ($helpTopicObj->value('status') == 1)) { $priority = $helpTopicObj->value('priority'); diff --git a/app/Http/Controllers/Client/helpdesk/GuestController.php b/app/Http/Controllers/Client/helpdesk/GuestController.php index 96debd234..33f0d9eee 100644 --- a/app/Http/Controllers/Client/helpdesk/GuestController.php +++ b/app/Http/Controllers/Client/helpdesk/GuestController.php @@ -409,7 +409,7 @@ class GuestController extends Controller ->first(); if ($otp != null) { $otp_length = strlen(Input::get('otp')); - if (($otp_length == 6 && !preg_match('/[a-z]/i', Input::get('otp')))) { + if ($otp_length == 6 && !preg_match('/[a-z]/i', Input::get('otp'))) { $otp2 = Hash::make(Input::get('otp')); $date1 = date_format($otp->updated_at, 'Y-m-d h:i:sa'); $date2 = date('Y-m-d h:i:sa'); diff --git a/app/Http/Controllers/Client/helpdesk/UnAuthController.php b/app/Http/Controllers/Client/helpdesk/UnAuthController.php index 56e5ae2ef..a49f30d10 100755 --- a/app/Http/Controllers/Client/helpdesk/UnAuthController.php +++ b/app/Http/Controllers/Client/helpdesk/UnAuthController.php @@ -344,7 +344,7 @@ class UnAuthController extends Controller \Cache::forever('language', $lang); // dd(Cache::get('language')); - // dd() + // dd() } else { return false; } @@ -361,31 +361,31 @@ class UnAuthController extends Controller switch ($condition) { case 'everyMinute': - $followup_set = ' + 1 minute'; + $followup_set = ' + 1 minute'; break; case 'everyFiveMinutes': - $followup_set = ' + 5 minute'; + $followup_set = ' + 5 minute'; break; case 'everyTenMinutes': - $followup_set = ' + 10 minute'; + $followup_set = ' + 10 minute'; break; case 'everyThirtyMinutes': - $followup_set = ' + 30 minute'; + $followup_set = ' + 30 minute'; break; case 'hourly': - $followup_set = ' + 1 hours'; + $followup_set = ' + 1 hours'; break; case 'daily': - $followup_set = ' + 1 day'; + $followup_set = ' + 1 day'; break; case 'weekly': - $followup_set = ' + 7 day'; + $followup_set = ' + 7 day'; break; case 'monthly': - $followup_set = ' + 30 day'; + $followup_set = ' + 30 day'; break; case 'yearly': - $followup_set = ' + 365 day'; + $followup_set = ' + 365 day'; break; } @@ -410,12 +410,12 @@ class UnAuthController extends Controller $ticket->follow_up = 1; $ticket->save(); // Tickets::where('id', '=',$id) - // ->update(['follow_up' => 1]); + // ->update(['follow_up' => 1]); - // } + // } } // if($id=2) - // {dd($ticket);} + // {dd($ticket);} } } } diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index 2c395d347..ef2c216e5 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -12,20 +12,20 @@ use App\Model\helpdesk\Settings\System; use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Timezones; use App\User; -Use Illuminate\Support\Facades\Artisan; -// classes -use Illuminate\Support\Facades\Cache; use DB; +// classes use Exception; -use Illuminate\Support\Facades\File; use Hash; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Artisan; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\File; +use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Request as Input; use Illuminate\Support\Facades\Schema; -use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Session; -use UnAuth; use Illuminate\Support\Facades\View; +use UnAuth; /** * |======================================================================= @@ -436,7 +436,7 @@ class InstallController extends Controller $ENV['DB_DATABASE'] = '"'.$database.'"'; $ENV['DB_USERNAME'] = '"'.$dbusername.'"'; $ENV['DB_PASSWORD'] = '"'.$dbpassword.'"'; - $ENV['DB_ENGINE'] = 'InnoDB'; + $ENV['DB_ENGINE'] = 'InnoDB'; $ENV['MAIL_MAILER'] = 'smtp'; $ENV['MAIL_HOST'] = 'mailtrap.io'; $ENV['MAIL_PORT'] = '2525'; diff --git a/app/Http/Controllers/Job/MailController.php b/app/Http/Controllers/Job/MailController.php index 1ca66fdf1..268123053 100644 --- a/app/Http/Controllers/Job/MailController.php +++ b/app/Http/Controllers/Job/MailController.php @@ -70,7 +70,7 @@ class MailController extends Controller case 'log': return $form; case 'ses': - $form .= "
".$this->form('Key', 'key', 'col-md-6 form-group'); + $form .= "
".$this->form('Key', 'key', 'col-md-6 form-group'); $form .= $this->form('Secret Key', 'secret', 'col-md-6 form-group').$this->form('Region', 'region', 'col-md-6 form-group').'
'; return $form; diff --git a/app/Http/Controllers/Update/SyncFaveoToLatestVersion.php b/app/Http/Controllers/Update/SyncFaveoToLatestVersion.php index d0561289f..bf4f3f81a 100644 --- a/app/Http/Controllers/Update/SyncFaveoToLatestVersion.php +++ b/app/Http/Controllers/Update/SyncFaveoToLatestVersion.php @@ -4,12 +4,8 @@ namespace App\Http\Controllers\Update; use App\Http\Controllers\Controller; use App\Model\helpdesk\Settings\System; -use Exception; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Config; -use Illuminate\Support\Facades\Schema; -use Illuminate\Support\Str; class SyncFaveoToLatestVersion extends Controller { @@ -20,7 +16,7 @@ class SyncFaveoToLatestVersion extends Controller set_time_limit(0); $latestVersion = $this->getPhpComaptibleVersion(Config::get('app.version')); - $olderVersion = $this->getOlderVersion(); + $olderVersion = $this->getOlderVersion(); if (version_compare($latestVersion, $olderVersion) == 1) { $this->updateToLatestVersion($olderVersion); @@ -35,14 +31,14 @@ class SyncFaveoToLatestVersion extends Controller $seederPath = base_path('database'.DIRECTORY_SEPARATOR.'seeders'); - if(file_exists($seederPath)){ + if (file_exists($seederPath)) { $seederVersions = scandir($seederPath); natsort($seederVersions); $formattedOlderVersion = $olderVersion; foreach ($seederVersions as $version) { - if(version_compare($this->getPhpComaptibleVersion($version), $formattedOlderVersion) == 1){ - Artisan::call('db:seed',['--class' => "Database\Seeders\\$version\DatabaseSeeder", '--force' => true]); + if (version_compare($this->getPhpComaptibleVersion($version), $formattedOlderVersion) == 1) { + Artisan::call('db:seed', ['--class' => "Database\Seeders\\$version\DatabaseSeeder", '--force' => true]); } } } @@ -55,6 +51,7 @@ class SyncFaveoToLatestVersion extends Controller } $version = System::value('version') ?: '0.0.0'; + return $this->getPhpComaptibleVersion($version); } diff --git a/app/Http/Controllers/Update/UpgradeController.php b/app/Http/Controllers/Update/UpgradeController.php index d694ca3fa..b6a285549 100644 --- a/app/Http/Controllers/Update/UpgradeController.php +++ b/app/Http/Controllers/Update/UpgradeController.php @@ -98,7 +98,7 @@ class UpgradeController extends Controller $dlHandler = fopen($this->dir.'/UPDATES/'.'/faveo-helpdesk-master.zip', 'w'); if (!fwrite($dlHandler, $newUpdate)) { echo '

Could not save new update. Operation aborted.

'; - exit(); + exit; } fclose($dlHandler); echo '

Update Downloaded And Saved

'; @@ -205,7 +205,7 @@ class UpgradeController extends Controller echo "
  • ".$ex->getMessage().'
    • '; echo ''; } - exit(); + exit; } public function deleteBarNotification($key) @@ -293,7 +293,7 @@ class UpgradeController extends Controller } } else { echo '

    Latest code found. » Download Now?

    '; - exit(); + exit; } } else { echo '

    Update already downloaded.

    '; @@ -302,7 +302,7 @@ class UpgradeController extends Controller $updated = $this->doUpdate(); } else { echo '

    Update ready. » Install Now?

    '; - exit(); + exit; } if ($updated == true) { diff --git a/app/Http/Requests/helpdesk/AgentRequest.php b/app/Http/Requests/helpdesk/AgentRequest.php index bac8b29db..2f19c576c 100644 --- a/app/Http/Requests/helpdesk/AgentRequest.php +++ b/app/Http/Requests/helpdesk/AgentRequest.php @@ -4,7 +4,6 @@ namespace App\Http\Requests\helpdesk; use App\Http\Requests\Request; use App\Model\helpdesk\Settings\CommonSettings; -use Illuminate\Contracts\Validation\Validator; /** * AgentRequest. diff --git a/app/Http/Requests/helpdesk/ClientRequest.php b/app/Http/Requests/helpdesk/ClientRequest.php index a4939cbb1..6a7301bd8 100644 --- a/app/Http/Requests/helpdesk/ClientRequest.php +++ b/app/Http/Requests/helpdesk/ClientRequest.php @@ -129,7 +129,7 @@ class ClientRequest extends Request { $settings = $settings->select('status')->where('option_name', '=', 'send_otp')->first(); $email_mandatory = $settings->select('status')->where('option_name', '=', 'email_mandatory')->first(); - if (($email_mandatory->status == 0 || $email_mandatory->status == '0')) { + if ($email_mandatory->status == 0 || $email_mandatory->status == '0') { if (!\Auth::check()) { return [ 'Name' => 'required', diff --git a/app/Model/helpdesk/Settings/System.php b/app/Model/helpdesk/Settings/System.php index 9d191d856..79f242f61 100644 --- a/app/Model/helpdesk/Settings/System.php +++ b/app/Model/helpdesk/Settings/System.php @@ -13,6 +13,6 @@ class System extends BaseModel protected $fillable = [ 'id', 'status', 'url', 'name', 'department', 'page_size', 'log_level', 'purge_log', 'name_format', - 'time_farmat', 'date_format', 'date_time_format', 'day_date_time', 'time_zone', 'content', 'api_key', 'api_enable', 'api_key_mandatory', 'version' + 'time_farmat', 'date_format', 'date_time_format', 'day_date_time', 'time_zone', 'content', 'api_key', 'api_enable', 'api_key_mandatory', 'version', ]; } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 13d4409cd..7d09bba51 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,10 +2,8 @@ namespace App\Providers; -use App\Model\helpdesk\Settings\System; use App\Model\Update\BarNotification; use Illuminate\Queue\Events\JobFailed; -use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Route; use Illuminate\Support\ServiceProvider; use Laravel\Dusk\DuskServiceProvider; diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 5009414a3..ed3f19505 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -26,7 +26,6 @@ class EventServiceProvider extends ServiceProvider */ public function boot() { - // } diff --git a/database/seeders/v_2_0_0/DatabaseSeeder.php b/database/seeders/v_2_0_0/DatabaseSeeder.php index 9d2fc7e53..a6fe5a3a5 100644 --- a/database/seeders/v_2_0_0/DatabaseSeeder.php +++ b/database/seeders/v_2_0_0/DatabaseSeeder.php @@ -51,18 +51,18 @@ class DatabaseSeeder extends Seeder $tables = Schema::getAllTables(); foreach ($tables as $table) { - $tableName = (array)$table; + $tableName = (array) $table; $tableName = reset($tableName); $columns = Schema::getColumnListing($tableName); foreach ($columns as $column) { if (Schema::getColumnType($tableName, $column) == 'string') { - Schema::table($tableName, function ($table) use($column) { + Schema::table($tableName, function ($table) use ($column) { $table->string($column)->nullable()->change(); }); } elseif (Schema::getColumnType($tableName, $column) == 'boolean') { - Schema::table($tableName, function ($table) use($column) { + Schema::table($tableName, function ($table) use ($column) { $table->boolean($column)->default(0)->change(); }); } diff --git a/routes/web.php b/routes/web.php index 665725e1b..0c566a9d3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -461,10 +461,10 @@ Route::middleware('web')->group(function () { Route::get('/ticket/unassigned', [Agent\helpdesk\TicketController::class, 'get_unassigned'])->name('get.unassigned.ticket'); /* Get tickets in datatable */ // Department ticket - Route::get('/{dept}/open', [Agent\helpdesk\TicketController::class, 'deptopen'])->name('dept.open.ticket'); // Open - Route::get('tickets/{dept}/{status}', [Agent\helpdesk\TicketController::class, 'deptTicket'])->name('dept.ticket'); // Open + Route::get('/{dept}/open', [Agent\helpdesk\TicketController::class, 'deptopen'])->name('dept.open.ticket'); // Open + Route::get('tickets/{dept}/{status}', [Agent\helpdesk\TicketController::class, 'deptTicket'])->name('dept.ticket'); // Open - Route::get('/{dept}/assigned', [Agent\helpdesk\TicketController::class, 'deptinprogress'])->name('dept.inprogress.ticket'); // Inprogress + Route::get('/{dept}/assigned', [Agent\helpdesk\TicketController::class, 'deptinprogress'])->name('dept.inprogress.ticket'); // Inprogress Route::get('/{dept}/closed', [Agent\helpdesk\TicketController::class, 'deptclose'])->name('dept.closed.ticket'); // Closed /* @@ -473,8 +473,8 @@ Route::middleware('web')->group(function () { Route::get('/ticket/followup', [Agent\helpdesk\TicketController::class, 'followupTicketList'])->name('followup.ticket'); // Get Closed Ticket / Route::get('/ticket/get-followup', [Agent\helpdesk\TicketController::class, 'getFollowup'])->name('get.followup.ticket'); // Get tickets in datatable / - Route::get('/ticket/close/get-approval/{id}', [Agent\helpdesk\TicketController::class, 'getCloseapproval'])->name('get.close.approval.ticket'); // Get tickets in datatable / - Route::get('filter', [Agent\helpdesk\Filter\FilterControllerOld::class, 'getFilter'])->name('filter'); + Route::get('/ticket/close/get-approval/{id}', [Agent\helpdesk\TicketController::class, 'getCloseapproval'])->name('get.close.approval.ticket'); // Get tickets in datatable / + Route::get('filter', [Agent\helpdesk\Filter\FilterControllerOld::class, 'getFilter'])->name('filter'); /* *======================================================================= @@ -527,7 +527,7 @@ Route::middleware('web')->group(function () { // show ticket via have a ticket Route::get('show-ticket/{id}/{code}', [Client\helpdesk\UnAuthController::class, 'showTicketCode'])->name('show.ticket'); //detail ticket information -//testing ckeditor + //testing ckeditor //=================================================================================== Route::middleware('auth')->group(function () { Route::get('client-profile', [Client\helpdesk\GuestController::class, 'getProfile'])->name('client.profile'); /* User profile get */