From 03623d493dff5e11d9bee7970ce27f069372f7c5 Mon Sep 17 00:00:00 2001 From: Shift Date: Fri, 6 Jan 2023 11:53:21 +0000 Subject: [PATCH] Convert to `event` helper Laravel has deprecated the `fire()` helper and `Event::fire()`. These will be removed in Laravel 5.8. Instead, you should use the `event()` helper. --- app/Api/v1/TicketController.php | 4 +- app/Console/Commands/TicketFetch.php | 2 +- .../Admin/helpdesk/AgentController.php | 2 +- .../Agent/helpdesk/TicketController.php | 44 +++++++++---------- .../Agent/helpdesk/UserController.php | 4 +- app/Http/Controllers/Auth/AuthController.php | 10 ++--- .../Auth/ForgotPasswordController.php | 4 +- .../Controllers/Auth/PasswordController.php | 4 +- .../Client/helpdesk/FormController.php | 2 +- .../Client/helpdesk/GuestController.php | 2 +- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/app/Api/v1/TicketController.php b/app/Api/v1/TicketController.php index 99bc790d1..414f3f3fb 100644 --- a/app/Api/v1/TicketController.php +++ b/app/Api/v1/TicketController.php @@ -269,7 +269,7 @@ class TicketController extends Controller $source = $eventthread->source; $form_data = $request->except('reply_content', 'ticket_ID', 'attachment'); - \Event::fire(new \App\Events\ClientTicketFormPost($form_data, $emailadd, $source)); + event(new \App\Events\ClientTicketFormPost($form_data, $emailadd, $source)); $reply_content = $request->input('reply_content'); $thread->ticket_id = $request->input('ticket_id'); $thread->poster = 'support'; @@ -317,7 +317,7 @@ class TicketController extends Controller } else { $agentsign = null; } - \Event::fire(new \App\Events\FaveoAfterReply($reply_content, $user->phone_number, $request, $tickets)); + event(new \App\Events\FaveoAfterReply($reply_content, $user->phone_number, $request, $tickets)); // Mail::send(array('html' => 'emails.ticket_re-reply'), ['content' => $reply_content, 'ticket_number' => $ticket_number, 'From' => $company, 'name' => $username, 'Agent_Signature' => $agentsign], function ($message) use ($email, $user_name, $ticket_number, $ticket_subject, $check_attachment) { // $message->to($email, $user_name)->subject($ticket_subject . '[#' . $ticket_number . ']'); diff --git a/app/Console/Commands/TicketFetch.php b/app/Console/Commands/TicketFetch.php index 549b99b68..a77666c63 100644 --- a/app/Console/Commands/TicketFetch.php +++ b/app/Console/Commands/TicketFetch.php @@ -47,7 +47,7 @@ class TicketFetch extends Command $system = new \App\Model\helpdesk\Settings\System(); $ticket = new \App\Model\helpdesk\Settings\Ticket(); $controller->readmails($emails, $settings_email, $system, $ticket); - Event::fire('ticket.fetch', ['event' => '']); + event('ticket.fetch', ['event' => '']); loging('fetching-ticket', 'Ticket has read', 'info'); //\Log::info('Ticket has read'); $this->info('Ticket has read'); diff --git a/app/Http/Controllers/Admin/helpdesk/AgentController.php b/app/Http/Controllers/Admin/helpdesk/AgentController.php index ec44e48e8..54ac125ad 100644 --- a/app/Http/Controllers/Admin/helpdesk/AgentController.php +++ b/app/Http/Controllers/Admin/helpdesk/AgentController.php @@ -155,7 +155,7 @@ class AgentController extends Controller } // returns for the success case if ($request->input('active') == '0' || $request->input('active') == 0) { - \Event::fire(new \App\Events\LoginEvent($request)); + event(new \App\Events\LoginEvent($request)); } return redirect('agents')->with('success', Lang::get('lang.agent_creation_success')); diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index cbd7aa1e3..5d26648ec 100755 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -274,7 +274,7 @@ class TicketController extends Controller */ public function reply(Ticket_Thread $thread, Request $request, Ticket_attachments $ta, $mail = true, $system_reply = true, $user_id = '') { - \Event::fire('reply.request', [$request]); + event('reply.request', [$request]); try { if (is_array($request->file('attachment'))) { @@ -301,7 +301,7 @@ class TicketController extends Controller $emailadd = User::where('id', $eventuserid)->first()->email; $source = $eventthread->source; $form_data = $request->except('reply_content', 'ticket_ID', 'attachment'); - \Event::fire(new \App\Events\ClientTicketFormPost($form_data, $emailadd, $source)); + event(new \App\Events\ClientTicketFormPost($form_data, $emailadd, $source)); $reply_content = $request->input('reply_content'); $thread->ticket_id = $request->input('ticket_ID'); @@ -335,7 +335,7 @@ class TicketController extends Controller $data = [ 'id' => $tickets->id, ]; - \Event::fire('ticket-assignment', [$data]); + event('ticket-assignment', [$data]); } if ($tickets->status > 1) { $this->open($ticket_id, new Tickets()); @@ -380,7 +380,7 @@ class TicketController extends Controller } // Event - \Event::fire(new \App\Events\FaveoAfterReply($reply_content, $user->mobile, $user->country_code, $request, $tickets, $thread)); + event(new \App\Events\FaveoAfterReply($reply_content, $user->mobile, $user->country_code, $request, $tickets, $thread)); if (Auth::user()) { $u_id = Auth::user()->first_name.' '.Auth::user()->last_name; } else { @@ -392,7 +392,7 @@ class TicketController extends Controller 'body' => $request->input('reply_content'), ]; if (! $request->has('do-not-send')) { - \Event::fire('Reply-Ticket', [$data]); + event('Reply-Ticket', [$data]); } // sending attachments via php mail function $message = ''; @@ -681,10 +681,10 @@ class TicketController extends Controller 'user_name' => $unique, 'password' => $password, ]; - \Event::fire(new \App\Events\LoginEvent($value)); + event(new \App\Events\LoginEvent($value)); } // Event fire - \Event::fire(new \App\Events\ReadMailEvent($user_id, $password)); + event(new \App\Events\ReadMailEvent($user_id, $password)); try { if ($auto_response == 0) { @@ -701,7 +701,7 @@ class TicketController extends Controller $username = $checkemail->first_name; $user_id = $checkemail->id; } - \Event::fire(new \App\Events\ClientTicketFormPost($from_data, $emailadd, $source)); + event(new \App\Events\ClientTicketFormPost($from_data, $emailadd, $source)); $ticket_number = $this->check_ticket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $from_data, $status); $ticket_number2 = $ticket_number[0]; @@ -841,11 +841,11 @@ class TicketController extends Controller 'status' => $status, 'Priority' => $priority, ]; - \Event::fire('Create-Ticket', [$data]); + event('Create-Ticket', [$data]); $data = [ 'id' => $ticketdata->id, ]; - \Event::fire('ticket-assignment', [$data]); + event('ticket-assignment', [$data]); $this->NotificationController->create($ticketdata->id, $user_id, '3'); return ['0' => $ticket_number2, '1' => true]; @@ -943,7 +943,7 @@ class TicketController extends Controller 'first_name' => $username, 'last_name' => '', ]; - \Event::fire('change-status', [$data]); + event('change-status', [$data]); } if (isset($id)) { if ($this->ticketThread($subject, $body, $id, $user_id)) { @@ -1050,7 +1050,7 @@ class TicketController extends Controller } } } - \Event::fire('after.ticket.created', [['ticket' => $ticket, 'form_data' => $form_data]]); + event('after.ticket.created', [['ticket' => $ticket, 'form_data' => $form_data]]); // store collaborators $this->storeCollaborators($headers, $id); @@ -1077,7 +1077,7 @@ class TicketController extends Controller $thread->title = $subject; $thread->body = $body; if ($thread->save()) { - \Event::fire('ticket.details', ['ticket' => $thread]); //get the ticket details + event('ticket.details', ['ticket' => $thread]); //get the ticket details return true; } @@ -1159,7 +1159,7 @@ class TicketController extends Controller 'first_name' => Auth::user()->first_name, 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', [$data]); + event('change-status', [$data]); return 'your ticket'.$ticket_status->ticket_number.' has been closed'; } @@ -1204,7 +1204,7 @@ class TicketController extends Controller 'first_name' => Auth::user()->first_name, 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', [$data]); + event('change-status', [$data]); return 'your ticket'.$ticket_status->ticket_number.' has been resolved'; } @@ -1243,7 +1243,7 @@ class TicketController extends Controller 'first_name' => Auth::user()->first_name, 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', [$data]); + event('change-status', [$data]); return 'your ticket'.$ticket_status->ticket_number.' has been opened'; } @@ -1274,7 +1274,7 @@ class TicketController extends Controller 'first_name' => Auth::user()->first_name, 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', [$data]); + event('change-status', [$data]); return 'your ticket has been delete'; } else { @@ -1294,7 +1294,7 @@ class TicketController extends Controller 'first_name' => Auth::user()->first_name, 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', [$data]); + event('change-status', [$data]); return 'your ticket'.$ticket_delete->ticket_number.' has been delete'; } @@ -1365,7 +1365,7 @@ class TicketController extends Controller $data = [ 'id' => $id, ]; - \Event::fire('ticket-assignment', [$data]); + event('ticket-assignment', [$data]); $ticket_thread = Ticket_Thread::where('ticket_id', '=', $id)->first(); $ticket_subject = $ticket_thread->title; $thread = new Ticket_Thread(); @@ -1414,7 +1414,7 @@ class TicketController extends Controller 'u_id' => Auth::user()->first_name.' '.Auth::user()->last_name, 'body' => $InternalContent, ]; - \Event::fire('Reply-Ticket', [$data]); + event('Reply-Ticket', [$data]); return 1; } @@ -1757,7 +1757,7 @@ class TicketController extends Controller $tickets = Tickets::find($ticket->id); $tickets->delete(); $data = ['id' => $ticket->id]; - \Event::fire('ticket-permanent-delete', [$data]); + event('ticket-permanent-delete', [$data]); } } if ($value == 'Delete') { @@ -2214,7 +2214,7 @@ class TicketController extends Controller Tickets::where('id', '=', $value) ->update(['status' => 3]); //event has $p_id and $value - \Event::fire('ticket.merge', [['parent' => $p_id, 'child' => $value]]); + event('ticket.merge', [['parent' => $p_id, 'child' => $value]]); if (! empty(Input::get('reason'))) { $reason = Input::get('reason'); } else { diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 676f7f361..4c16681eb 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -330,7 +330,7 @@ class UserController extends Controller // returns for the success case $email_mandatory = CommonSettings::select('status')->where('option_name', '=', 'email_mandatory')->first(); if (($request->input('active') == '0' || $request->input('active') == 0) || ($email_mandatory->status == '0') || $email_mandatory->status == 0) { - \Event::fire(new \App\Events\LoginEvent($request)); + event(new \App\Events\LoginEvent($request)); } return redirect('user')->with('success', Lang::get('lang.User-Created-Successfully')); @@ -1012,7 +1012,7 @@ class UserController extends Controller if (\Schema::hasTable('sms')) { $sms = DB::table('sms')->get(); if (count($sms) > 0) { - \Event::fire(new \App\Events\LoginEvent($request)); + event(new \App\Events\LoginEvent($request)); return 1; } diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index e785ae833..4e52cbe34 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -130,7 +130,7 @@ class AuthController extends Controller $settings = $settings->select('status')->where('option_name', '=', 'send_otp')->first(); $email_mandatory = $settings->select('status')->where('option_name', '=', 'email_mandatory')->first(); //dd($settings->status); - \Event::fire(new \App\Events\FormRegisterEvent()); + event(new \App\Events\FormRegisterEvent()); if (Auth::user()) { if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') { return \Redirect::route('dashboard'); @@ -186,7 +186,7 @@ class AuthController extends Controller $settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first(); $sms = Plugin::select('status')->where('name', '=', 'SMS')->first(); // Event for login - \Event::fire(new \App\Events\LoginEvent($request)); + event(new \App\Events\LoginEvent($request)); if ($request->input('email') !== '') { $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)]); } @@ -295,7 +295,7 @@ class AuthController extends Controller { try { // dd($request->input()); - \Event::fire('auth.login.event', []); //added 5/5/2016 + event('auth.login.event', []); //added 5/5/2016 // Set login attempts and login time $value = $_SERVER['REMOTE_ADDR']; $usernameinput = $request->input('email'); @@ -586,7 +586,7 @@ class AuthController extends Controller } else { $sms = DB::table('sms')->get(); if (count($sms) > 0) { - \Event::fire(new \App\Events\LoginEvent($request)); + event(new \App\Events\LoginEvent($request)); return 1; } else { @@ -644,7 +644,7 @@ class AuthController extends Controller */ public function getLogout(Request $request) { - \Event::fire('user.logout', []); + event('user.logout', []); $login = new LoginController(); return $login->logout($request); diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index bafae4eed..ae900519b 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -46,7 +46,7 @@ class ForgotPasswordController extends Controller try { $date = date('Y-m-d H:i:s'); $this->validate($request, ['email' => 'required']); - \Event::fire('reset.password', []); + event('reset.password', []); $user = User::where('email', '=', $request->all('email'))->orWhere('mobile', '=', $request->all('email'))->first(); if (isset($user)) { $user1 = $user->email; @@ -72,7 +72,7 @@ class ForgotPasswordController extends Controller 'name' => $name, 'mobile' => $user->mobile, 'code' => $user->country_code, ]; - \Event::fire('reset.password2', [$value]); + event('reset.password2', [$value]); } return redirect()->back()->with('status', Lang::get('lang.we_have_e-mailed_your_password_reset_link')); diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 9bd329528..830d77ac0 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -53,7 +53,7 @@ class PasswordController extends Controller try { $date = date('Y-m-d H:i:s'); $this->validate($request, ['email' => 'required']); - \Event::fire('reset.password', []); + event('reset.password', []); $user = User::where('email', '=', $request->all('email'))->orWhere('mobile', '=', $request->all('email'))->first(); if (isset($user)) { $user1 = $user->email; @@ -79,7 +79,7 @@ class PasswordController extends Controller 'name' => $name, 'mobile' => $user->mobile, 'code' => $user->country_code, ]; - \Event::fire('reset.password2', [$value]); + event('reset.password2', [$value]); } return redirect()->back()->with('status', Lang::get('lang.we_have_e-mailed_your_password_reset_link')); diff --git a/app/Http/Controllers/Client/helpdesk/FormController.php b/app/Http/Controllers/Client/helpdesk/FormController.php index 2fa271535..9470edf8b 100755 --- a/app/Http/Controllers/Client/helpdesk/FormController.php +++ b/app/Http/Controllers/Client/helpdesk/FormController.php @@ -227,7 +227,7 @@ class FormController extends Controller } } } - \Event::fire(new \App\Events\ClientTicketFormPost($form_extras, $email, $source)); + event(new \App\Events\ClientTicketFormPost($form_extras, $email, $source)); $result = $this->TicketWorkflowController->workflow($email, $name, $subject, $details, $phone, $phonecode, $mobile_number, $helptopic, $sla, $priority, $source, $collaborator, $department, $assignto, $team_assign, $status, $form_extras, $auto_response); // dd($result); if ($result[1] == 1) { diff --git a/app/Http/Controllers/Client/helpdesk/GuestController.php b/app/Http/Controllers/Client/helpdesk/GuestController.php index 27e3c9c18..be66acdae 100644 --- a/app/Http/Controllers/Client/helpdesk/GuestController.php +++ b/app/Http/Controllers/Client/helpdesk/GuestController.php @@ -380,7 +380,7 @@ class GuestController extends Controller if (\Schema::hasTable('sms')) { $sms = DB::table('sms')->get(); if (count($sms) > 0) { - \Event::fire(new \App\Events\LoginEvent($request)); + event(new \App\Events\LoginEvent($request)); return 1; }