From 5db1c9402b120528787086bce4fc35d2669f83a6 Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 6 Jan 2023 11:55:15 +0000 Subject: [PATCH] Shift cleanup --- app/Api/v1/ApiController.php | 4 ++-- app/Api/v1/ApiExceptAuthController.php | 2 +- app/Api/v1/TokenAuthController.php | 2 +- app/Console/Commands/InstallDB.php | 2 +- app/Console/Commands/TicketFetch.php | 1 - app/Http/Controllers/Admin/helpdesk/FormController.php | 8 ++++---- .../Controllers/Admin/helpdesk/SettingsController.php | 8 ++++---- .../Controllers/Admin/helpdesk/SettingsController2.php | 8 ++++---- app/Http/Controllers/Agent/helpdesk/MailController.php | 4 ++-- app/Http/Controllers/Agent/helpdesk/TicketController.php | 8 ++++---- app/Http/Controllers/Agent/kb/ArticleController.php | 8 ++++---- app/Http/Controllers/Agent/kb/CategoryController.php | 8 ++++---- app/Http/Controllers/Agent/kb/PageController.php | 8 ++++---- app/Http/Controllers/Auth/AuthController.php | 6 +++--- app/Http/Controllers/Auth/ForgotPasswordController.php | 2 +- app/Http/Controllers/Auth/PasswordController.php | 6 +++--- app/Http/Controllers/Common/SettingsController.php | 8 ++++---- app/Http/Controllers/Update/UpgradeController.php | 2 +- app/Http/Requests/helpdesk/ClientRequest.php | 2 +- app/Model/helpdesk/Ticket/Ticket_attachments.php | 2 +- 20 files changed, 49 insertions(+), 50 deletions(-) diff --git a/app/Api/v1/ApiController.php b/app/Api/v1/ApiController.php index 3c85fb819..ff5a59e90 100644 --- a/app/Api/v1/ApiController.php +++ b/app/Api/v1/ApiController.php @@ -2,11 +2,10 @@ namespace App\Api\v1; -use Illuminate\Support\Str; use App\Http\Controllers\Agent\helpdesk\TicketController as CoreTicketController; use App\Http\Controllers\Controller; -//use Illuminate\Support\Facades\Request as Value; use App\Http\Requests\helpdesk\TicketRequest; +//use Illuminate\Support\Facades\Request as Value; use App\Model\helpdesk\Agent\Department; use App\Model\helpdesk\Agent\Teams; use App\Model\helpdesk\Manage\Help_topic; @@ -22,6 +21,7 @@ use Exception; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; +use Illuminate\Support\Str; /** * ----------------------------------------------------------------------------- diff --git a/app/Api/v1/ApiExceptAuthController.php b/app/Api/v1/ApiExceptAuthController.php index 545da0ba0..8c0c0d95e 100644 --- a/app/Api/v1/ApiExceptAuthController.php +++ b/app/Api/v1/ApiExceptAuthController.php @@ -2,9 +2,9 @@ namespace App\Api\v1; -use Illuminate\Support\Str; use App\Http\Controllers\Controller; use Illuminate\Http\Request; +use Illuminate\Support\Str; class ApiExceptAuthController extends Controller { diff --git a/app/Api/v1/TokenAuthController.php b/app/Api/v1/TokenAuthController.php index 70a8ec7b0..4c0c61452 100644 --- a/app/Api/v1/TokenAuthController.php +++ b/app/Api/v1/TokenAuthController.php @@ -2,12 +2,12 @@ namespace App\Api\v1; -use Illuminate\Support\Str; use App\Http\Controllers\Common\PhpMailController; use App\Http\Controllers\Controller; use App\User; use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; +use Illuminate\Support\Str; use JWTAuth; use Tymon\JWTAuth\Exceptions\JWTException; diff --git a/app/Console/Commands/InstallDB.php b/app/Console/Commands/InstallDB.php index c2e1f0ec1..94a2b2859 100644 --- a/app/Console/Commands/InstallDB.php +++ b/app/Console/Commands/InstallDB.php @@ -2,10 +2,10 @@ namespace App\Console\Commands; -use Illuminate\Support\Str; use App\Http\Controllers\Installer\helpdesk\InstallController; use DB; use Illuminate\Console\Command; +use Illuminate\Support\Str; class InstallDB extends Command { diff --git a/app/Console/Commands/TicketFetch.php b/app/Console/Commands/TicketFetch.php index a77666c63..2c1798609 100644 --- a/app/Console/Commands/TicketFetch.php +++ b/app/Console/Commands/TicketFetch.php @@ -4,7 +4,6 @@ namespace App\Console\Commands; use App\Http\Controllers\Agent\helpdesk\MailController; use App\Http\Controllers\Agent\helpdesk\TicketWorkflowController; -use Event; use Illuminate\Console\Command; class TicketFetch extends Command diff --git a/app/Http/Controllers/Admin/helpdesk/FormController.php b/app/Http/Controllers/Admin/helpdesk/FormController.php index 735b8f4c6..e34dcd980 100644 --- a/app/Http/Controllers/Admin/helpdesk/FormController.php +++ b/app/Http/Controllers/Admin/helpdesk/FormController.php @@ -3,17 +3,17 @@ namespace App\Http\Controllers\Admin\helpdesk; // Controller -use Illuminate\Support\Str; use App\Http\Controllers\Controller; -// Model use App\Model\helpdesk\Form\Fields; +// Model use App\Model\helpdesk\Form\Forms; use App\Model\helpdesk\Manage\Help_topic; -// Request use Exception; -// Class +// Request use Form; +// Class use Illuminate\Http\Request; +use Illuminate\Support\Str; use Input; use Lang; use Redirect; diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index 6822b67da..957974c0e 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -3,16 +3,15 @@ namespace App\Http\Controllers\Admin\helpdesk; // controllers -use Illuminate\Support\Str; use App\Http\Controllers\Controller; -// requests use App\Http\Requests\helpdesk\CompanyRequest; +// requests use App\Http\Requests\helpdesk\EmailRequest; use App\Http\Requests\helpdesk\Job\TaskRequest; use App\Http\Requests\helpdesk\RatingUpdateRequest; use App\Http\Requests\helpdesk\StatusRequest; -// models use App\Http\Requests\helpdesk\SystemRequest; +// models use App\Model\helpdesk\Agent\Department; use App\Model\helpdesk\Email\Emails; use App\Model\helpdesk\Email\Template; @@ -33,12 +32,13 @@ use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Time_format; use App\Model\helpdesk\Utility\Timezones; use App\Model\helpdesk\Workflow\WorkflowClose; -// classes use DateTime; +// classes use DB; use Exception; use File; use Illuminate\Http\Request; +use Illuminate\Support\Str; use Input; use Lang; diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController2.php b/app/Http/Controllers/Admin/helpdesk/SettingsController2.php index 73ea459df..b2ac18a4c 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController2.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController2.php @@ -3,14 +3,13 @@ namespace App\Http\Controllers\Admin\helpdesk; // controllers -use Illuminate\Support\Str; use App\Http\Controllers\Controller; -// requests use App\Http\Requests\helpdesk\CompanyRequest; +// requests use App\Http\Requests\helpdesk\EmailRequest; use App\Http\Requests\helpdesk\SystemRequest; -// models use App\Model\helpdesk\Agent\Department; +// models use App\Model\helpdesk\Email\Emails; use App\Model\helpdesk\Email\Template; use App\Model\helpdesk\Manage\Help_topic; @@ -29,10 +28,11 @@ use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Time_format; use App\Model\helpdesk\Utility\Timezones; use DateTime; -// classes use DB; +// classes use Exception; use Illuminate\Http\Request; +use Illuminate\Support\Str; use Input; use Lang; diff --git a/app/Http/Controllers/Agent/helpdesk/MailController.php b/app/Http/Controllers/Agent/helpdesk/MailController.php index 78a8143ad..e9a0e1139 100644 --- a/app/Http/Controllers/Agent/helpdesk/MailController.php +++ b/app/Http/Controllers/Agent/helpdesk/MailController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Agent\helpdesk; // models -use Illuminate\Support\Str; use App\Http\Controllers\Admin\MailFetch as Fetch; use App\Http\Controllers\Controller; use App\Model\helpdesk\Email\Emails; @@ -14,8 +13,9 @@ use App\Model\helpdesk\Settings\Ticket; use App\Model\helpdesk\Ticket\Ticket_attachments; use App\Model\helpdesk\Ticket\Ticket_source; use App\Model\helpdesk\Ticket\Ticket_Thread; -// classes use App\Model\helpdesk\Ticket\Tickets; +// classes +use Illuminate\Support\Str; /** * MailController. diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 026df378c..0e6b50877 100755 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -3,16 +3,15 @@ namespace App\Http\Controllers\Agent\helpdesk; // controllers -use Illuminate\Support\Str; use App\Http\Controllers\Common\FileuploadController; use App\Http\Controllers\Common\NotificationController as Notify; use App\Http\Controllers\Common\PhpMailController; use App\Http\Controllers\Controller; -// requests use App\Http\Requests\helpdesk\CreateTicketRequest; +// requests use App\Http\Requests\helpdesk\TicketRequest; -// models use App\Model\helpdesk\Agent\Department; +// models use App\Model\helpdesk\Agent\Teams; use App\Model\helpdesk\Email\Emails; use App\Model\helpdesk\Form\Fields; @@ -40,11 +39,12 @@ use Auth; use Crypt; use DB; use Exception; -// classes use GeoIP; +// classes use Hash; use Illuminate\Http\Request; use Illuminate\support\Collection; +use Illuminate\Support\Str; use Input; use Lang; use Mail; diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php index 87b8b89de..d8880d298 100644 --- a/app/Http/Controllers/Agent/kb/ArticleController.php +++ b/app/Http/Controllers/Agent/kb/ArticleController.php @@ -3,24 +3,24 @@ namespace App\Http\Controllers\Agent\kb; // Controllers -use Illuminate\Support\Str; use App\Http\Controllers\Controller; -// Requests use App\Http\Requests\kb\ArticleRequest; +// Requests use App\Http\Requests\kb\ArticleUpdate; -// Models use App\Model\kb\Article; +// Models use App\Model\kb\Category; use App\Model\kb\Comment; use App\Model\kb\Relationship; use App\Model\kb\Settings; -// Classes use Auth; +// Classes use Chumper\Datatable\Table; use Datatable; use DB; use Exception; use Illuminate\Http\Request; +use Illuminate\Support\Str; use Lang; use Redirect; diff --git a/app/Http/Controllers/Agent/kb/CategoryController.php b/app/Http/Controllers/Agent/kb/CategoryController.php index bbb1d0001..3034bab3b 100644 --- a/app/Http/Controllers/Agent/kb/CategoryController.php +++ b/app/Http/Controllers/Agent/kb/CategoryController.php @@ -3,18 +3,18 @@ namespace App\Http\Controllers\Agent\kb; // Controllers -use Illuminate\Support\Str; use App\Http\Controllers\Agent\helpdesk\TicketController; use App\Http\Controllers\Controller; -// Requests use App\Http\Requests\kb\CategoryRequest; +// Requests use App\Http\Requests\kb\CategoryUpdate; -// Model use App\Model\kb\Category; +// Model use App\Model\kb\Relationship; -// Classes use Datatable; +// Classes use Exception; +use Illuminate\Support\Str; use Lang; use Redirect; diff --git a/app/Http/Controllers/Agent/kb/PageController.php b/app/Http/Controllers/Agent/kb/PageController.php index abc824faa..2b942c3c9 100644 --- a/app/Http/Controllers/Agent/kb/PageController.php +++ b/app/Http/Controllers/Agent/kb/PageController.php @@ -2,18 +2,18 @@ namespace App\Http\Controllers\Agent\kb; -use Illuminate\Support\Str; use App\Http\Controllers\Agent\helpdesk\TicketController; use App\Http\Controllers\Controller; -// request use App\Http\Requests\kb\PageRequest; +// request use App\Http\Requests\kb\PageUpdate; use App\Model\kb\Page; -// Model use Datatable; -// classes +// Model use Exception; +// classes use Illuminate\Http\Request; +use Illuminate\Support\Str; use Lang; /** diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index e7a1347a0..e7301a1b6 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -3,11 +3,10 @@ namespace App\Http\Controllers\Auth; // controllers -use Illuminate\Support\Str; use App\Http\Controllers\Admin\helpdesk\SocialMedia\SocialMediaController; use App\Http\Controllers\Common\PhpMailController; -// requests use App\Http\Controllers\Controller; +// requests use App\Http\Requests\helpdesk\LoginRequest; use App\Http\Requests\helpdesk\OtpVerifyRequest; use App\Http\Requests\helpdesk\RegisterRequest; @@ -15,8 +14,8 @@ use App\Model\helpdesk\Settings\CommonSettings; use App\Model\helpdesk\Settings\Plugin; use App\Model\helpdesk\Settings\Security; use App\Model\helpdesk\Ticket\Ticket_Thread; -// classes use App\Model\helpdesk\Ticket\Tickets; +// classes use App\Model\helpdesk\Utility\Otp; use App\User; use Auth; @@ -24,6 +23,7 @@ use DateTime; use DB; use Hash; use Illuminate\Http\Request; +use Illuminate\Support\Str; use Lang; use Socialite; diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 9859cbfd6..bd65b7d1d 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -2,12 +2,12 @@ namespace App\Http\Controllers\Auth; -use Illuminate\Support\Str; use App\Http\Controllers\Common\PhpMailController; use App\Http\Controllers\Controller; use App\User; use Illuminate\Foundation\Auth\SendsPasswordResetEmails; use Illuminate\Http\Request; +use Illuminate\Support\Str; use Lang; class ForgotPasswordController extends Controller diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index dd4bf67f7..49a17a147 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -3,15 +3,15 @@ namespace App\Http\Controllers\Auth; // controllers -use Illuminate\Support\Str; use App\Http\Controllers\Common\PhpMailController; use App\Http\Controllers\Controller; -// request use App\User; +// request +use Illuminate\Foundation\Auth\ResetsPasswords; // model // classes -use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Http\Request; +use Illuminate\Support\Str; use Lang; /** diff --git a/app/Http/Controllers/Common/SettingsController.php b/app/Http/Controllers/Common/SettingsController.php index 038880a24..2a562b98d 100644 --- a/app/Http/Controllers/Common/SettingsController.php +++ b/app/Http/Controllers/Common/SettingsController.php @@ -3,20 +3,20 @@ namespace App\Http\Controllers\Common; // controllers -use Illuminate\Support\Arr; use App\Http\Controllers\Controller; -// requests use App\Http\Requests; +// requests use App\Http\Requests\helpdesk\SmtpRequest; use App\Model\helpdesk\Email\Smtp; -// models use App\Model\helpdesk\Settings\Plugin; +// models use App\Model\helpdesk\Theme\Widgets; use Config; -// classes use Crypt; +// classes use Exception; use Illuminate\Http\Request; +use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Input; use Lang; diff --git a/app/Http/Controllers/Update/UpgradeController.php b/app/Http/Controllers/Update/UpgradeController.php index c5b4515f6..357d6bc5d 100644 --- a/app/Http/Controllers/Update/UpgradeController.php +++ b/app/Http/Controllers/Update/UpgradeController.php @@ -2,13 +2,13 @@ namespace App\Http\Controllers\Update; -use Illuminate\Support\Str; use App\Http\Controllers\Controller; use App\Http\Controllers\Utility\LibraryController as Utility; use App\Model\Update\BarNotification; use Artisan; use Exception; use Illuminate\Http\Request; +use Illuminate\Support\Str; class UpgradeController extends Controller { diff --git a/app/Http/Requests/helpdesk/ClientRequest.php b/app/Http/Requests/helpdesk/ClientRequest.php index 71fc3ea31..499e5b6bf 100644 --- a/app/Http/Requests/helpdesk/ClientRequest.php +++ b/app/Http/Requests/helpdesk/ClientRequest.php @@ -2,9 +2,9 @@ namespace App\Http\Requests\helpdesk; -use Illuminate\Support\Arr; use App\Http\Requests\Request; use App\Model\helpdesk\Settings\CommonSettings; +use Illuminate\Support\Arr; /** * CompanyRequest. diff --git a/app/Model/helpdesk/Ticket/Ticket_attachments.php b/app/Model/helpdesk/Ticket/Ticket_attachments.php index 7f3c17549..599387ba4 100644 --- a/app/Model/helpdesk/Ticket/Ticket_attachments.php +++ b/app/Model/helpdesk/Ticket/Ticket_attachments.php @@ -2,8 +2,8 @@ namespace App\Model\helpdesk\Ticket; -use Illuminate\Support\Str; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Str; class Ticket_attachments extends Model {