From e2390f67d499ea9fefec04bdc81f05db6a065f68 Mon Sep 17 00:00:00 2001 From: Sujit Prasad Date: Fri, 5 Aug 2016 09:24:12 -0400 Subject: [PATCH] Applied fixes from StyleCI --- app/Console/Commands/SendReport.php | 17 +- app/Exceptions/Handler.php | 24 +- .../Admin/helpdesk/AgentController.php | 4 +- .../Admin/helpdesk/DepartmentController.php | 42 +- .../Admin/helpdesk/FormController.php | 14 +- .../Admin/helpdesk/LanguageController.php | 9 +- .../Admin/helpdesk/SettingsController.php | 6 +- .../Admin/helpdesk/TemplateController.php | 15 +- .../Agent/helpdesk/MailController.php | 68 ++- .../Agent/helpdesk/NotificationController.php | 43 +- .../Agent/helpdesk/Ticket2Controller.php | 20 +- .../Agent/helpdesk/TicketController.php | 534 ++++++++++-------- .../helpdesk/TicketWorkflowController.php | 1 + .../Agent/helpdesk/UserController.php | 12 +- .../Agent/kb/ArticleController.php | 2 +- .../Agent/kb/CategoryController.php | 9 +- app/Http/Controllers/Api/v1/ApiController.php | 256 +++++---- .../Api/v1/InstallerApiController.php | 2 +- .../Api/v1/PushNotificationController.php | 44 +- .../Api/v1/TokenAuthController.php | 2 +- app/Http/Controllers/Auth/AuthController.php | 14 +- .../Controllers/Auth/PasswordController.php | 3 +- .../Client/helpdesk/FormController.php | 84 +-- .../Client/helpdesk/GuestController.php | 3 +- .../Controllers/Client/kb/UserController.php | 100 ++-- .../Common/FileuploadController.php | 15 +- .../Common/NotificationController.php | 63 ++- .../Controllers/Common/PhpMailController.php | 369 ++++++------ .../Common/PushNotificationController.php | 32 +- .../Controllers/Common/SettingsController.php | 187 +++--- app/Http/Controllers/HomeController.php | 1 - .../Controllers/Update/UpgradeController.php | 123 ++-- .../Controllers/Utility/LibraryController.php | 36 +- .../Requests/helpdesk/CreateTicketRequest.php | 4 +- .../Requests/helpdesk/Sys_userRequest.php | 6 +- app/Http/Requests/helpdesk/Sys_userUpdate.php | 7 +- app/Http/Requests/helpdesk/TicketRequest.php | 35 +- app/Http/Requests/kb/CategoryRequest.php | 1 + app/Http/Requests/kb/PageRequest.php | 3 +- app/Http/routes.php | 85 ++- app/Jobs/SendEmail.php | 12 +- app/Model/helpdesk/Form/FieldValue.php | 6 +- app/Model/helpdesk/Form/Fields.php | 20 +- app/Model/helpdesk/Form/Forms.php | 55 +- app/Providers/AppServiceProvider.php | 2 +- app/User.php | 2 +- config/app.php | 12 +- config/debugbar.php | 54 +- config/fcm.php | 12 +- .../2016_06_28_141613_version1079table.php | 7 +- database/seeds/DatabaseSeeder.php | 4 +- .../samples/old/assets/posteddata.php | 9 +- resources/lang/en/lang.php | 12 +- 53 files changed, 1397 insertions(+), 1105 deletions(-) diff --git a/app/Console/Commands/SendReport.php b/app/Console/Commands/SendReport.php index e51ffa168..7d20a481b 100644 --- a/app/Console/Commands/SendReport.php +++ b/app/Console/Commands/SendReport.php @@ -2,13 +2,13 @@ namespace App\Console\Commands; -use Illuminate\Console\Command; use App\Http\Controllers\Agent\helpdesk\NotificationController; use App\Http\Controllers\Common\PhpMailController; use Exception; +use Illuminate\Console\Command; -class SendReport extends Command { - +class SendReport extends Command +{ /** * The name and signature of the console command. * @@ -30,7 +30,8 @@ class SendReport extends Command { * * @return void */ - public function __construct() { + public function __construct() + { $mail = new PhpMailController(); $report = new NotificationController($mail); $this->report = $report; @@ -42,15 +43,15 @@ class SendReport extends Command { * * @return mixed */ - public function handle() { + public function handle() + { try { $this->report->send_notification(); - \Log::info("Report has send"); - $this->info("Report has send"); + \Log::info('Report has send'); + $this->info('Report has send'); } catch (Exception $ex) { dd($ex); $this->error($ex->getMessage()); } } - } diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 923126f79..e4e2d326f 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -1,5 +1,7 @@ common($request, $e); } } + /** * Function to render 500 error page. * @@ -84,9 +91,11 @@ class Handler extends ExceptionHandler if (config('app.debug') == true) { return parent::render($request, $e); } + return response()->view('errors.500'); //return redirect()->route('error500', []); } + /** * Function to render 404 error page. * @@ -97,21 +106,23 @@ class Handler extends ExceptionHandler */ public function render404($request, $e) { - $seg = $request->segments(); if (in_array('api', $seg)) { return response()->json(['status' => '404']); } if (config('app.debug') == true) { - if($e->getStatusCode() == '404') { + if ($e->getStatusCode() == '404') { return redirect()->route('error404', []); } + return parent::render($request, $e); } + return redirect()->route('error404', []); } + /** - * Function to render database connection failed + * Function to render database connection failed. * * @param type $request * @param type $e @@ -127,8 +138,10 @@ class Handler extends ExceptionHandler if (config('app.debug') == true) { return parent::render($request, $e); } + return redirect()->route('error404', []); } + /** * Common finction to render both types of codes. * @@ -145,7 +158,7 @@ class Handler extends ExceptionHandler case $e instanceof NotFoundHttpException: return $this->render404($request, $e); case $e instanceof PDOException: - if(strpos('1045', $e->getMessage()) == true) { + if (strpos('1045', $e->getMessage()) == true) { return $this->renderDB($request, $e); } else { return $this->render500($request, $e); @@ -159,6 +172,7 @@ class Handler extends ExceptionHandler default: return $this->render500($request, $e); } + return parent::render($request, $e); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Admin/helpdesk/AgentController.php b/app/Http/Controllers/Admin/helpdesk/AgentController.php index 4a0922335..67c5a086a 100644 --- a/app/Http/Controllers/Admin/helpdesk/AgentController.php +++ b/app/Http/Controllers/Admin/helpdesk/AgentController.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers\Admin\helpdesk; // controller -use App\Http\Controllers\Controller; use App\Http\Controllers\Common\PhpMailController; +use App\Http\Controllers\Controller; // request use App\Http\Requests\helpdesk\AgentRequest; use App\Http\Requests\helpdesk\AgentUpdate; @@ -139,7 +139,7 @@ class AgentController extends Controller // fetch user credentails to send mail $name = $user->first_name; $email = $user->email; - if($request->input('send_email')) { + if ($request->input('send_email')) { try { // send mail on registration $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => null, 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]); diff --git a/app/Http/Controllers/Admin/helpdesk/DepartmentController.php b/app/Http/Controllers/Admin/helpdesk/DepartmentController.php index a261be914..53937c3e1 100644 --- a/app/Http/Controllers/Admin/helpdesk/DepartmentController.php +++ b/app/Http/Controllers/Admin/helpdesk/DepartmentController.php @@ -29,14 +29,15 @@ use Lang; * * @author Ladybird */ -class DepartmentController extends Controller { - +class DepartmentController extends Controller +{ /** * Create a new controller instance. * * @return void */ - public function __construct() { + public function __construct() + { $this->middleware('auth'); $this->middleware('roles'); } @@ -48,9 +49,11 @@ class DepartmentController extends Controller { * * @return type Response */ - public function index(Department $department) { + public function index(Department $department) + { try { $departments = $department->get(); + return view('themes.default1.admin.helpdesk.agent.departments.index', compact('departments')); } catch (Exception $e) { return view('404'); @@ -70,7 +73,8 @@ class DepartmentController extends Controller { * * @return type Response */ - public function create(User $user, Group_assign_department $group_assign_department, Department $department, Sla_plan $sla, Template $template, Emails $email, Groups $group) { + public function create(User $user, Group_assign_department $group_assign_department, Department $department, Sla_plan $sla, Template $template, Emails $email, Groups $group) + { try { $slas = $sla->get(); $user = $user->where('role', 'agent2')->get(); @@ -93,7 +97,8 @@ class DepartmentController extends Controller { * * @return type Response */ - public function store(Department $department, DepartmentRequest $request) { + public function store(Department $department, DepartmentRequest $request) + { try { $department->fill($request->except('group_id', 'manager', 'sla'))->save(); if ($request->sla) { @@ -116,6 +121,7 @@ class DepartmentController extends Controller { ->where('id', 1) ->update(['department' => $department->id]); } + return redirect('departments')->with('success', Lang::get('lang.department_created_sucessfully')); } else { return redirect('departments')->with('fails', Lang::get('lang.failed_to_create_department')); @@ -140,7 +146,8 @@ class DepartmentController extends Controller { * * @return type Response */ - public function edit($id, User $user, Group_assign_department $group_assign_department, Template $template, Teams $team, Department $department, Sla_plan $sla, Emails $email, Groups $group) { + public function edit($id, User $user, Group_assign_department $group_assign_department, Template $template, Teams $team, Department $department, Sla_plan $sla, Emails $email, Groups $group) + { try { $sys_department = \DB::table('settings_system') ->select('department') @@ -170,7 +177,8 @@ class DepartmentController extends Controller { * * @return type Response */ - public function update($id, Group_assign_department $group_assign_department, Department $department, DepartmentUpdate $request) { + public function update($id, Group_assign_department $group_assign_department, Department $department, DepartmentUpdate $request) + { // dd($id); try { $table = $group_assign_department->where('department_id', $id); @@ -218,9 +226,10 @@ class DepartmentController extends Controller { * * @return type Response */ - public function destroy($id, Department $department, Group_assign_department $group_assign_department, System $system, Tickets $tickets) { + public function destroy($id, Department $department, Group_assign_department $group_assign_department, System $system, Tickets $tickets) + { // try { - + $system = $system->where('id', '=', '1')->first(); if ($system->department == $id) { return redirect('departments')->with('fails', Lang::get('lang.you_cannot_delete_default_department')); @@ -232,7 +241,7 @@ class DepartmentController extends Controller { } else { $text_tickets = 'Ticket'; } - $ticket = '
  • ' . $tickets . ' ' . $text_tickets . Lang::get('lang.have_been_moved_to_default_department') . '
    • '; + $ticket = '
  • '.$tickets.' '.$text_tickets.Lang::get('lang.have_been_moved_to_default_department').'
    • '; } else { $ticket = ''; } @@ -243,7 +252,7 @@ class DepartmentController extends Controller { } else { $text_user = 'User'; } - $user = '
  • ' . $users . ' ' . $text_user . Lang::get('lang.have_been_moved_to_default_department') . '
    • '; + $user = '
  • '.$users.' '.$text_user.Lang::get('lang.have_been_moved_to_default_department').'
    • '; } else { $user = ''; } @@ -254,28 +263,27 @@ class DepartmentController extends Controller { } else { $text_emails = 'Email'; } - $email = '
  • ' . $emails . ' System ' . $text_emails . Lang::get('lang.have_been_moved_to_default_department') . '
    • '; + $email = '
  • '.$emails.' System '.$text_emails.Lang::get('lang.have_been_moved_to_default_department').'
    • '; } else { $email = ''; } $helptopic = DB::table('help_topic')->where('department', '=', $id)->update(['department' => null], ['status' => '1']); if ($helptopic > 0) { - $helptopic = '
  • ' . Lang::get('lang.the_associated_helptopic_has_been_deactivated') . '
    • '; + $helptopic = '
  • '.Lang::get('lang.the_associated_helptopic_has_been_deactivated').'
    • '; } else { $helptopic = ''; } - $message = $ticket . $user . $email . $helptopic; + $message = $ticket.$user.$email.$helptopic; /* Becouse of foreign key we delete group_assign_department first */ $group_assign_department = $group_assign_department->where('department_id', $id); $group_assign_department->delete(); $departments = $department->whereId($id)->first(); /* Check the function is Success or Fail */ if ($departments->delete() == true) { - return redirect('departments')->with('success', Lang::get('lang.department_deleted_sucessfully') . $message); + return redirect('departments')->with('success', Lang::get('lang.department_deleted_sucessfully').$message); } else { return redirect('departments')->with('fails', Lang::get('lang.department_can_not_delete')); } } } - } diff --git a/app/Http/Controllers/Admin/helpdesk/FormController.php b/app/Http/Controllers/Admin/helpdesk/FormController.php index 576700f5e..0353d528b 100644 --- a/app/Http/Controllers/Admin/helpdesk/FormController.php +++ b/app/Http/Controllers/Admin/helpdesk/FormController.php @@ -1,5 +1,7 @@ fields = $fields; $this->forms = $forms; $this->middleware('auth'); } + /** * home. * @@ -37,6 +42,7 @@ class FormController extends Controller { return view('forms.home'); } + /** * list of forms. * @@ -52,6 +58,7 @@ class FormController extends Controller return redirect()->back()->with('fails', $e->getMessage()); } } + /** * create a new form. * @@ -65,6 +72,7 @@ class FormController extends Controller return redirect()->back()->with('fails', $e->getMessage()); } } + /** * Show a new form. * @@ -80,6 +88,7 @@ class FormController extends Controller return redirect()->back()->with('fails', $e->getMessage()); } } + /** * Store a new form. * @@ -115,8 +124,10 @@ class FormController extends Controller } } Fields::insert($fields); + return Redirect::back()->with('success', Lang::get('lang.successfully_created_form')); } + /** * Delete Form. * @@ -140,6 +151,7 @@ class FormController extends Controller } $forms = $forms->where('id', $id)->first(); $forms->delete(); + return redirect()->back()->with('success', Lang::get('lang.form_deleted_successfully')); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Admin/helpdesk/LanguageController.php b/app/Http/Controllers/Admin/helpdesk/LanguageController.php index cd28bbc2e..4d0b028ad 100644 --- a/app/Http/Controllers/Admin/helpdesk/LanguageController.php +++ b/app/Http/Controllers/Admin/helpdesk/LanguageController.php @@ -99,11 +99,10 @@ class LanguageController extends Controller return \Datatable::collection(new Collection($values)) ->addColumn('language', function ($model) { if ($model == Config::get('app.fallback_locale')) { - return Config::get('languages.'.$model).' ('.Lang::get('lang.default').')'; + return Config::get('languages.'.$model).' ('.Lang::get('lang.default').')'; } else { return Config::get('languages.'.$model); } - }) ->addColumn('id', function ($model) { return $model; @@ -239,16 +238,17 @@ class LanguageController extends Controller if ($success) { //sending back with success message Session::flash('success', Lang::get('lang.delete-success')); - + return Redirect::back(); } else { //sending back with error message Session::flash('fails', Lang::get('lang.lang-doesnot-exist')); - + return Redirect::back(); } } else { Session::flash('fails', Lang::get('lang.lang-fallback-lang')); + return redirect('languages'); } } else { @@ -257,5 +257,4 @@ class LanguageController extends Controller return redirect('languages'); } } - } diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index 8e1672162..cb2e9748f 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -19,6 +19,7 @@ use App\Model\helpdesk\Manage\Sla_plan; use App\Model\helpdesk\Notification\UserNotification; use App\Model\helpdesk\Ratings\Rating; use App\Model\helpdesk\Settings\Alert; +use App\Model\helpdesk\Settings\CommonSettings; use App\Model\helpdesk\Settings\Company; use App\Model\helpdesk\Settings\Email; use App\Model\helpdesk\Settings\Responder; @@ -30,7 +31,6 @@ 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; -use App\Model\helpdesk\Settings\CommonSettings; use DateTime; // classes use DB; @@ -184,7 +184,7 @@ class SettingsController extends Controller /* Check whether function success or not */ $systems->fill($request->input())->save(); $rtl = CommonSettings::where('option_name', '=', 'enable_rtl')->first(); - if($request->enable_rtl != null) { + if ($request->enable_rtl != null) { $rtl->option_value = 1; } else { $rtl->option_value = 0; @@ -192,7 +192,7 @@ class SettingsController extends Controller $rtl->save(); $usts = CommonSettings::where('option_name', '=', 'user_set_ticket_status')->first(); - if ($usts->status != $request->user_set_ticket_status){ + if ($usts->status != $request->user_set_ticket_status) { $usts->status = $request->user_set_ticket_status; $usts->save(); } diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php index 472fac7ca..99c5d5ddd 100644 --- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php +++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php @@ -12,8 +12,8 @@ use App\Http\Requests\helpdesk\TemplateUdate; // models use App\Model\helpdesk\Email\Emails; use App\Model\helpdesk\Email\Template; -use App\Model\helpdesk\Utility\Languages; use App\Model\helpdesk\Settings\CommonSettings; +use App\Model\helpdesk\Utility\Languages; // classes use Exception; use Illuminate\Http\Request; @@ -329,13 +329,13 @@ class TemplateController extends Controller $mail->AddAddress($address); $mail->Subject = $request->subject; // subject of the email $body = $request->message; // body of the email - $mail->CharSet = "utf8"; + $mail->CharSet = 'utf8'; // $mail->MsgHTML($body); // $body = $request->message; $rtl = CommonSettings::where('option_name', '=', 'enable_rtl')->first(); - if($rtl->option_value == 1) { + if ($rtl->option_value == 1) { $mail->ContentType = 'text/html'; - $body = '' . $body . ''; + $body = ''.$body.''; } else { } if (!$mail->Send()) { @@ -364,13 +364,13 @@ class TemplateController extends Controller $mail->setFrom($email_details->email_address, $email_details->email_name); $mail->addAddress($request->to, ''); // Add a recipient $mail->isHTML(true); // Set email format to HTML - $mail->CharSet = "utf8"; + $mail->CharSet = 'utf8'; $mail->Subject = $request->subject; $body = $request->message; $rtl = CommonSettings::where('option_name', '=', 'enable_rtl')->first(); - if($rtl->option_value == 1) { + if ($rtl->option_value == 1) { $mail->ContentType = 'text/html'; - $body = '' . $body . ''; + $body = ''.$body.''; } else { } $mail->Body = $body; @@ -380,6 +380,7 @@ class TemplateController extends Controller $return = Lang::get('lang.message_has_been_sent'); } } + return redirect()->back()->with('success', $return); } catch (Exception $e) { return redirect()->back()->with('fails', $e->getMessage()); diff --git a/app/Http/Controllers/Agent/helpdesk/MailController.php b/app/Http/Controllers/Agent/helpdesk/MailController.php index 330fd027d..a14c027a4 100644 --- a/app/Http/Controllers/Agent/helpdesk/MailController.php +++ b/app/Http/Controllers/Agent/helpdesk/MailController.php @@ -27,15 +27,16 @@ use PhpImap\Mailbox as ImapMailbox; * * @author Ladybird */ -class MailController extends Controller { - +class MailController extends Controller +{ /** * constructor * Create a new controller instance. * * @param type TicketController $TicketController */ - public function __construct(TicketWorkflowController $TicketWorkflowController) { + public function __construct(TicketWorkflowController $TicketWorkflowController) + { $this->middleware('board'); $this->TicketWorkflowController = $TicketWorkflowController; } @@ -45,7 +46,8 @@ class MailController extends Controller { * * @return type */ - public function readmails(Emails $emails, Email $settings_email, System $system, Ticket $ticket) { + public function readmails(Emails $emails, Email $settings_email, System $system, Ticket $ticket) + { // $path_url = $system->first()->url; if ($settings_email->first()->email_fetching == 1) { if ($settings_email->first()->all_emails == 1) { @@ -80,7 +82,7 @@ class MailController extends Controller { $protocol = $fetching_encryption2; } else { if ($e_mail->fetching_protocol) { - $fetching_protocol = '/' . $e_mail->fetching_protocol; + $fetching_protocol = '/'.$e_mail->fetching_protocol; } else { $fetching_protocol = ''; } @@ -89,20 +91,20 @@ class MailController extends Controller { } else { $fetching_encryption = ''; } - $protocol = $fetching_protocol . $fetching_encryption; + $protocol = $fetching_protocol.$fetching_encryption; } - $imap_config = '{' . $host . ':' . $port . $protocol . '}INBOX'; + $imap_config = '{'.$host.':'.$port.$protocol.'}INBOX'; $password = Crypt::decrypt($e_mail->password); try { $mailbox = new ImapMailbox($imap_config, $e_mail->email_address, $password, __DIR__); } catch (\PhpImap\Exception $e) { - echo "Connection error"; + echo 'Connection error'; } $mails = []; try { - $mailsIds = $mailbox->searchMailBox('SINCE ' . date('d-M-Y', strtotime('-1 day'))); + $mailsIds = $mailbox->searchMailBox('SINCE '.date('d-M-Y', strtotime('-1 day'))); } catch (\PhpImap\Exception $e) { - echo "Connection error"; + echo 'Connection error'; } if (!$mailsIds) { die('Mailbox is empty'); @@ -119,7 +121,7 @@ class MailController extends Controller { try { $mail = $mailbox->getMail($mailId); } catch (\PhpImap\Exception $e) { - echo "Connection error"; + echo 'Connection error'; } if ($settings_email->first()->email_collaborator == 1) { $collaborator = $mail->cc; @@ -137,11 +139,11 @@ class MailController extends Controller { if ($body == null) { $attach = $mail->getAttachments(); if (is_array($attach)) { - if (key_exists('html-body', $attach)) { + if (array_key_exists('html-body', $attach)) { $path = $attach['html-body']->filePath; } if ($path == null) { - if (key_exists('text-body', $attach)) { + if (array_key_exists('text-body', $attach)) { $path = $attach['text-body']->filePath; } } @@ -151,7 +153,7 @@ class MailController extends Controller { if ($body) { $body = self::trimTableTag($body); } else { - $body = ""; + $body = ''; } } } @@ -162,7 +164,7 @@ class MailController extends Controller { $date = $mail->date; $datetime = $overview[0]->date; $date_time = explode(' ', $datetime); - $date = $date_time[1] . '-' . $date_time[2] . '-' . $date_time[3] . ' ' . $date_time[4]; + $date = $date_time[1].'-'.$date_time[2].'-'.$date_time[3].' '.$date_time[4]; $date = date('Y-m-d H:i:s', strtotime($date)); if (isset($mail->subject)) { $subject = $mail->subject; @@ -193,10 +195,10 @@ class MailController extends Controller { $dir_img_paths = __DIR__; $dir_img_path = explode('/code', $dir_img_paths); - $filepath = explode('..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'public', $attachment->filePath); + $filepath = explode('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'public', $attachment->filePath); if ($filepath[1]) { - $path = public_path() . $filepath[1]; + $path = public_path().$filepath[1]; $filesize = filesize($path); $file_data = file_get_contents($path); @@ -205,7 +207,7 @@ class MailController extends Controller { $string = str_replace('-', '', $attachment->name); $filename = explode('src', $attachment->filePath); $filename = str_replace('\\', '', $filename); - $body = str_replace('cid:' . $imageid, $filepath[1], $body); + $body = str_replace('cid:'.$imageid, $filepath[1], $body); $pos = strpos($body, $filepath[1]); if ($pos == false) { if ($settings_email->first()->attachment == 1) { @@ -251,7 +253,8 @@ class MailController extends Controller { * * @return type string */ - public function separate_reply($body) { + public function separate_reply($body) + { $body2 = explode('---Reply above this line---', $body); $body3 = $body2[0]; @@ -265,7 +268,8 @@ class MailController extends Controller { * * @return type string */ - public function decode_imap_text($str) { + public function decode_imap_text($str) + { $result = ''; $decode_header = imap_mime_header_decode($str); foreach ($decode_header as $obj) { @@ -280,7 +284,8 @@ class MailController extends Controller { * * @return type */ - public function fetch_attachments() { + public function fetch_attachments() + { $uploads = Upload::all(); foreach ($uploads as $attachment) { $image = @imagecreatefromstring($attachment->file); @@ -288,8 +293,8 @@ class MailController extends Controller { imagejpeg($image, null, 80); $data = ob_get_contents(); ob_end_clean(); - $var = ''; - echo '
    ' . $var . ''; + $var = ''; + echo '
    '.$var.''; } } @@ -300,17 +305,19 @@ class MailController extends Controller { * * @return type file */ - public function get_data($id) { + public function get_data($id) + { $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('id', '=', $id)->get(); foreach ($attachments as $attachment) { - header('Content-type: application/' . $attachment->type . ''); - header('Content-Disposition: inline; filename=' . $attachment->name . ''); + header('Content-type: application/'.$attachment->type.''); + header('Content-Disposition: inline; filename='.$attachment->name.''); header('Content-Transfer-Encoding: binary'); echo $attachment->file; } } - public static function trimTableTag($html) { + public static function trimTableTag($html) + { if (strpos('', $html) != false) { $first_pos = strpos($html, '', '', '', '']) { + public static function trimInjections($html, $tags = ['', '', '']) + { $replace = []; foreach ($tags as $key => $tag) { $replace[$key] = htmlspecialchars($tag); @@ -341,5 +350,4 @@ class MailController extends Controller { return $body; } - } diff --git a/app/Http/Controllers/Agent/helpdesk/NotificationController.php b/app/Http/Controllers/Agent/helpdesk/NotificationController.php index 3c096b060..35f6e29b7 100644 --- a/app/Http/Controllers/Agent/helpdesk/NotificationController.php +++ b/app/Http/Controllers/Agent/helpdesk/NotificationController.php @@ -22,16 +22,18 @@ use View; * * @author Ladybird */ -class NotificationController extends Controller { - - public function __construct(PhpMailController $PhpMailController) { +class NotificationController extends Controller +{ + public function __construct(PhpMailController $PhpMailController) + { $this->PhpMailController = $PhpMailController; } /** * This function is for sending daily report/notification about the system. * */ - public function send_notification() { + public function send_notification() + { //fetching email settings $email = Email::where('id', '=', '1')->first(); // checking if the daily notification is enabled or not @@ -40,7 +42,6 @@ class NotificationController extends Controller { $notification = Log_notification::where('log', '=', 'NOT-1')->orderBy('id', 'DESC')->first(); $date = explode(' ', $notification->created_at); if (date('Y-m-d') == $date[0]) { - } else { // creating a daily notification log Log_notification::create(['log' => 'NOT-1']); @@ -64,24 +65,25 @@ class NotificationController extends Controller { * * @return mail * */ - public function send_notification_to_admin($company) { + public function send_notification_to_admin($company) + { // get all admin users $users = User::where('role', '=', 'admin')->get(); foreach ($users as $user) { // Send notification details to admin $email = $user->email; - $user_name = $user->first_name . ' ' . $user->last_name; + $user_name = $user->first_name.' '.$user->last_name; $view = View::make('emails.notifications.admin', ['company' => $company, 'name' => $user_name]); $contents = $view->render(); $from = $this->PhpMailController->mailfrom('1', '0'); $to = [ - 'name' => $user_name, - 'email' => $email + 'name' => $user_name, + 'email' => $email, ]; $message = [ - 'subject' => 'Daily Report', + 'subject' => 'Daily Report', 'scenario' => null, - 'body' => $contents + 'body' => $contents, ]; $this->dispatch((new \App\Jobs\SendEmail($from, $to, $message))->onQueue('emails')); //$this->PhpMailController->sendEmail($from,$to,$message); @@ -93,7 +95,8 @@ class NotificationController extends Controller { * * @return mail * */ - public function send_notification_to_manager($company) { + public function send_notification_to_manager($company) + { // get all department managers $depts = Department::all(); foreach ($depts as $dept) { @@ -103,7 +106,7 @@ class NotificationController extends Controller { foreach ($users as $user) { // Send notification details to manager of a department $email = $user->email; - $user_name = $user->first_name . ' ' . $user->last_name; + $user_name = $user->first_name.' '.$user->last_name; $view = View::make('emails.notifications.manager', ['company' => $company, 'name' => $user_name]); $contents = $view->render(); $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Daily Report', 'scenario' => null, 'body' => $contents]); @@ -117,7 +120,8 @@ class NotificationController extends Controller { * * @return mail * */ - public function send_notification_to_team_lead($company) { + public function send_notification_to_team_lead($company) + { // get all Team leads $teams = Teams::all(); foreach ($teams as $team) { @@ -127,7 +131,7 @@ class NotificationController extends Controller { foreach ($users as $user) { // Send notification details to team lead $email = $user->email; - $user_name = $user->first_name . ' ' . $user->last_name; + $user_name = $user->first_name.' '.$user->last_name; $view = View::make('emails.notifications.lead', ['company' => $company, 'name' => $user_name, 'team_id' => $team->id]); $contents = $view->render(); $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Daily Report', 'scenario' => null, 'body' => $contents]); @@ -141,13 +145,14 @@ class NotificationController extends Controller { * * @return mail * */ - public function send_notification_to_agent($company) { + public function send_notification_to_agent($company) + { // get all agents users $users = User::where('role', '=', 'agent')->get(); foreach ($users as $user) { // Send notification details to all the agents $email = $user->email; - $user_name = $user->first_name . ' ' . $user->last_name; + $user_name = $user->first_name.' '.$user->last_name; $view = View::make('emails.notifications.agent', ['company' => $company, 'name' => $user_name, 'user_id' => $user->id]); $contents = $view->render(); $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Daily Report', 'scenario' => null, 'body' => $contents]); @@ -159,7 +164,8 @@ class NotificationController extends Controller { * * @return type variable */ - public function company() { + public function company() + { // fetching comapny model $company = Company::Where('id', '=', '1')->first(); // fetching company name @@ -171,5 +177,4 @@ class NotificationController extends Controller { return $company; } - } diff --git a/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php b/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php index da6157854..43325bf74 100644 --- a/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php +++ b/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Agent\helpdesk; // controllers -use App\Http\Controllers\Common\SettingsController; use App\Http\Controllers\Controller; // requests // models @@ -51,8 +50,10 @@ class Ticket2Controller extends Controller } /** - * this function returns the list of open tickets of a particular department + * this function returns the list of open tickets of a particular department. + * * @param type $id + * * @return type */ public function getOpenTickets($id) @@ -63,6 +64,7 @@ class Ticket2Controller extends Controller $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first(); $tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->get(); } + return Ttable::getTable($tickets); } @@ -84,10 +86,12 @@ class Ticket2Controller extends Controller return view('themes.default1.agent.helpdesk.dept-ticket.closed', compact('id')); } } - + /** - * this function returns the list of close tickets of a particular department + * this function returns the list of close tickets of a particular department. + * * @param type $id + * * @return type */ public function getCloseTickets($id) @@ -98,12 +102,15 @@ class Ticket2Controller extends Controller $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first(); $tickets = Tickets::where('status', '=', '2')->where('status', '=', '3')->where('dept_id', '=', $dept->id)->get(); } + return Ttable::getTable($tickets); } /** - * this function returns the list of close tickets of a particular department + * this function returns the list of close tickets of a particular department. + * * @param type $id + * * @return type */ public function deptinprogress($id) @@ -136,5 +143,4 @@ class Ticket2Controller extends Controller return Ttable::getTable($tickets); } - -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index a250b759e..f14b144cc 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -3,17 +3,17 @@ namespace App\Http\Controllers\Agent\helpdesk; // controllers +use App\Http\Controllers\Common\FileuploadController; use App\Http\Controllers\Common\NotificationController; use App\Http\Controllers\Common\PhpMailController; -use App\Http\Controllers\Common\FileuploadController; use App\Http\Controllers\Controller; // requests use App\Http\Requests\helpdesk\CreateTicketRequest; use App\Http\Requests\helpdesk\TicketRequest; // models +use App\Model\helpdesk\Agent\Department; use App\Model\helpdesk\Agent\Teams; use App\Model\helpdesk\Email\Emails; -use App\Model\helpdesk\Agent\Department; use App\Model\helpdesk\Form\Fields; use App\Model\helpdesk\Manage\Help_topic; use App\Model\helpdesk\Manage\Sla_plan; @@ -38,7 +38,6 @@ use App\User; use Auth; use DB; use Exception; -use ForceUTF8\Encoding; use GeoIP; // classes use Hash; @@ -55,14 +54,15 @@ use UTC; * * @author Ladybird */ -class TicketController extends Controller { - +class TicketController extends Controller +{ /** * Create a new controller instance. * * @return type response */ - public function __construct(PhpMailController $PhpMailController, NotificationController $NotificationController) { + public function __construct(PhpMailController $PhpMailController, NotificationController $NotificationController) + { $this->PhpMailController = $PhpMailController; $this->NotificationController = $NotificationController; $this->middleware('auth'); @@ -73,11 +73,13 @@ class TicketController extends Controller { * * @return type response */ - public function inbox_ticket_list() { + public function inbox_ticket_list() + { return view('themes.default1.agent.helpdesk.ticket.inbox'); } - public function get_inbox() { + public function get_inbox() + { if (Auth::user()->role == 'admin') { $tickets = Tickets::where('status', '=', 1)->get(); } else { @@ -93,11 +95,13 @@ class TicketController extends Controller { * * @return type response */ - public function open_ticket_list() { + public function open_ticket_list() + { return view('themes.default1.agent.helpdesk.ticket.open'); } - public function get_open() { + public function get_open() + { if (Auth::user()->role == 'admin') { $tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->get(); } else { @@ -113,17 +117,20 @@ class TicketController extends Controller { * * @return type response */ - public function answered_ticket_list() { + public function answered_ticket_list() + { return view('themes.default1.agent.helpdesk.ticket.answered'); } - public function get_answered() { + public function get_answered() + { if (Auth::user()->role == 'admin') { $tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->get(); } else { $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first(); $tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->where('dept_id', '=', $dept->id)->get(); } + return $this->getTable($tickets); } @@ -132,16 +139,19 @@ class TicketController extends Controller { * * @return type response */ - public function myticket_ticket_list() { + public function myticket_ticket_list() + { return view('themes.default1.agent.helpdesk.ticket.myticket'); } - public function get_myticket() { + public function get_myticket() + { if (Auth::user()->role == 'admin') { $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get(); } else { $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get(); } + return $this->getTable($tickets); } @@ -150,7 +160,8 @@ class TicketController extends Controller { * * @return type response */ - public function overdue_ticket_list() { + public function overdue_ticket_list() + { return view('themes.default1.agent.helpdesk.ticket.overdue'); } @@ -159,7 +170,8 @@ class TicketController extends Controller { * * @return type json */ - public function getOverdueTickets() { + public function getOverdueTickets() + { if (Auth::user()->role == 'agent') { $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first(); $overdues = Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->get(); @@ -174,7 +186,7 @@ class TicketController extends Controller { $sla_plan = Sla_plan::where('id', '=', $overdue->sla)->first(); $ovadate = $overdue->created_at; - $new_date = date_add($ovadate, date_interval_create_from_date_string($sla_plan->grace_period)) . '

    '; + $new_date = date_add($ovadate, date_interval_create_from_date_string($sla_plan->grace_period)).'

    '; if (date('Y-m-d H:i:s') > $new_date) { $i++; $value[] = $overdue; @@ -196,11 +208,13 @@ class TicketController extends Controller { * * @return type response */ - public function closed_ticket_list() { + public function closed_ticket_list() + { return view('themes.default1.agent.helpdesk.ticket.closed'); } - public function get_closed() { + public function get_closed() + { if (Auth::user()->role == 'admin') { $tickets = Tickets::where('status', '>', 1)->where('status', '<', 4)->get(); } else { @@ -216,11 +230,13 @@ class TicketController extends Controller { * * @return type response */ - public function assigned_ticket_list() { + public function assigned_ticket_list() + { return view('themes.default1.agent.helpdesk.ticket.assigned'); } - public function get_assigned() { + public function get_assigned() + { if (Auth::user()->role == 'admin') { $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->get(); } else { @@ -236,7 +252,8 @@ class TicketController extends Controller { * * @return type response */ - public function newticket(CountryCode $code) { + public function newticket(CountryCode $code) + { $location = GeoIP::getLocation(); $phonecode = $code->where('iso', '=', $location['isoCode'])->first(); @@ -250,10 +267,11 @@ class TicketController extends Controller { * * @return type response */ - public function post_newticket(CreateTicketRequest $request, CountryCode $code) { + public function post_newticket(CreateTicketRequest $request, CountryCode $code) + { try { $email = $request->input('email'); - $fullname = $request->input('first_name') . '%$%' . $request->input('last_name'); + $fullname = $request->input('first_name').'%$%'.$request->input('last_name'); $helptopic = $request->input('helptopic'); $sla = $request->input('sla'); $duedate = $request->input('duedate'); @@ -279,8 +297,8 @@ class TicketController extends Controller { $geoipcode = $code->where('iso', '=', $location['isoCode'])->first(); if ($phonecode == null) { $data = [ - 'fails' => Lang::get('lang.country-code-required-error'), - 'phonecode' => $geoipcode->phonecode, + 'fails' => Lang::get('lang.country-code-required-error'), + 'phonecode' => $geoipcode->phonecode, 'country_code_error' => 1, ]; @@ -289,8 +307,8 @@ class TicketController extends Controller { $code = CountryCode::select('phonecode')->where('phonecode', '=', $phonecode)->get(); if (!count($code)) { $data = [ - 'fails' => Lang::get('lang.incorrect-country-code-error'), - 'phonecode' => $geoipcode->phonecode, + 'fails' => Lang::get('lang.incorrect-country-code-error'), + 'phonecode' => $geoipcode->phonecode, 'country_code_error' => 1, ]; @@ -305,7 +323,7 @@ class TicketController extends Controller { return Redirect('newticket')->with('fails', 'fails'); } } catch (Exception $e) { - return Redirect()->back()->with('fails', '
  • ' . $e->getMessage() . '
    • '); + return Redirect()->back()->with('fails', '
  • '.$e->getMessage().'
    • '); } } @@ -316,13 +334,14 @@ class TicketController extends Controller { * * @return type response */ - public function thread($id) { + public function thread($id) + { if (Auth::user()->role == 'agent') { $dept = Department::where('id', '=', Auth::user()->primary_dpt)->first(); $tickets = Tickets::where('id', '=', $id)->first(); - if($tickets->dept_id == $dept->id) { + if ($tickets->dept_id == $dept->id) { $tickets = $tickets; - } elseif($tickets->assigned_to == Auth::user()->id) { + } elseif ($tickets->assigned_to == Auth::user()->id) { $tickets = $tickets; } else { $tickets = null; @@ -334,6 +353,7 @@ class TicketController extends Controller { } elseif (Auth::user()->role == 'user') { $thread = Ticket_Thread::where('ticket_id', '=', $id)->first(); $ticket_id = \Crypt::encrypt($id); + return redirect()->route('check_ticket', compact('ticket_id')); } if ($tickets == null) { @@ -343,35 +363,39 @@ class TicketController extends Controller { $avg_rate = explode('.', $avg); $avg_rating = $avg_rate[0]; $thread = Ticket_Thread::where('ticket_id', '=', $id)->first(); - $fileupload = new FileuploadController; + $fileupload = new FileuploadController(); $fileupload = $fileupload->file_upload_max_size(); $max_size_in_bytes = $fileupload[0]; $max_size_in_actual = $fileupload[1]; + return view('themes.default1.agent.helpdesk.ticket.timeline', compact('tickets', 'max_size_in_bytes', 'max_size_in_actual'), compact('thread', 'avg_rating')); } - public function size() { + public function size() + { $files = Input::file('attachment'); if (!$files) { - throw new \Exception("file size exceeded"); + throw new \Exception('file size exceeded'); } $size = 0; if (count($files) > 0) { foreach ($files as $file) { - $size +=$file->getSize(); + $size += $file->getSize(); } } + return $size; } - public function error($e,$request) { + public function error($e, $request) + { if ($request->ajax() || $request->wantsJson()) { - $error = $e->getMessage(); if (is_object($error)) { $error = $error->toArray(); } - return response()->json(compact('error')); + + return response()->json(compact('error')); //return $message; } } @@ -384,8 +408,9 @@ class TicketController extends Controller { * * @return type bool */ - public function reply(Ticket_Thread $thread, Request $request, Ticket_attachments $ta) { - if(is_array($request->file('attachment'))) { + public function reply(Ticket_Thread $thread, Request $request, Ticket_attachments $ta) + { + if (is_array($request->file('attachment'))) { } else { try { $size = $this->size(); @@ -394,7 +419,7 @@ class TicketController extends Controller { } } - $fileupload = new FileuploadController; + $fileupload = new FileuploadController(); $fileupload = $fileupload->file_upload_max_size(); $max_size_in_bytes = $fileupload[0]; $max_size_in_actual = $fileupload[1]; @@ -429,11 +454,11 @@ class TicketController extends Controller { $thread2->ticket_id = $thread->ticket_id; $thread2->user_id = Auth::user()->id; $thread2->is_internal = 1; - $thread2->body = 'This Ticket have been assigned to ' . Auth::user()->first_name . ' ' . Auth::user()->last_name; + $thread2->body = 'This Ticket have been assigned to '.Auth::user()->first_name.' '.Auth::user()->last_name; $thread2->save(); } if ($tickets->status > 1) { - $this->open($ticket_id, new Tickets); + $this->open($ticket_id, new Tickets()); } $thread->save(); @@ -471,13 +496,13 @@ class TicketController extends Controller { // Event \Event::fire(new \App\Events\FaveoAfterReply($reply_content, $user->phone_number, $request, $tickets)); - + $data = [ - "ticket_id" => $request->input('ticket_ID'), - 'u_id' => Auth::user()->first_name.' '.Auth::user()->last_name, - 'body' => $request->input('reply_content'), + 'ticket_id' => $request->input('ticket_ID'), + 'u_id' => Auth::user()->first_name.' '.Auth::user()->last_name, + 'body' => $request->input('reply_content'), ]; - \Event::fire('Reply-Ticket',array($data)); + \Event::fire('Reply-Ticket', [$data]); // sending attachments via php mail function $message = ''; if ($check_attachment == 1) { @@ -493,11 +518,12 @@ class TicketController extends Controller { try { $this->NotificationController->create($ticket_id, Auth::user()->id, '2'); $this->PhpMailController->sendmail( - $from = $this->PhpMailController->mailfrom('0', $tickets->dept_id), $to = ['name' => $user_name, 'email' => $email, 'cc' => $collaborators], $message = ['subject' => $ticket_subject . '[#' . $ticket_number . ']', 'body' => $request->input('reply_content'), 'scenario' => 'ticket-reply', 'attachments' => $attachment_files], $template_variables = ['ticket_number' => $ticket_number, 'user' => $username, 'agent_sign' => $agentsign] + $from = $this->PhpMailController->mailfrom('0', $tickets->dept_id), $to = ['name' => $user_name, 'email' => $email, 'cc' => $collaborators], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'body' => $request->input('reply_content'), 'scenario' => 'ticket-reply', 'attachments' => $attachment_files], $template_variables = ['ticket_number' => $ticket_number, 'user' => $username, 'agent_sign' => $agentsign] ); } catch (\Exception $e) { return 0; } + return 1; } @@ -509,7 +535,8 @@ class TicketController extends Controller { * * @return type bool */ - public function ticketEditPost($ticket_id, Ticket_Thread $thread, Tickets $ticket) { + public function ticketEditPost($ticket_id, Ticket_Thread $thread, Tickets $ticket) + { if (Input::get('subject') == null) { return 1; } elseif (Input::get('sla_paln') == null) { @@ -545,11 +572,13 @@ class TicketController extends Controller { * * @return type respponse */ - public function ticket_print($id) { + public function ticket_print($id) + { $tickets = Tickets::where('id', '=', $id)->first(); $thread = Ticket_Thread::where('ticket_id', '=', $id)->first(); $html = view('themes.default1.agent.helpdesk.ticket.pdf', compact('id', 'tickets', 'thread'))->render(); $html1 = mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'); + return PDF::load($html1)->show(); } @@ -560,7 +589,8 @@ class TicketController extends Controller { * * @return type integer */ - public function ticketNumber($ticket_number) { + public function ticketNumber($ticket_number) + { $number = $ticket_number; $number = explode('-', $number); $number1 = $number[0]; @@ -593,7 +623,8 @@ class TicketController extends Controller { * * @return type bool */ - public function checkEmail($email) { + public function checkEmail($email) + { $check = User::where('email', '=', $email)->first(); if ($check == true) { return $check; @@ -616,7 +647,8 @@ class TicketController extends Controller { * * @return type bool */ - public function create_user($emailadd, $username, $subject, $body, $phone, $phonecode, $mobile_number, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $from_data, $auto_response, $status) { + public function create_user($emailadd, $username, $subject, $body, $phone, $phonecode, $mobile_number, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $from_data, $auto_response, $status) + { // define global variables $email; $username; @@ -631,7 +663,7 @@ class TicketController extends Controller { $user = new User(); $user_name_123 = explode('%$%', $username); $user_first_name = $user_name_123[0]; - if(isset($user_name_123[1])) { + if (isset($user_name_123[1])) { $user_last_name = $user_name_123[1]; $user->last_name = $user_last_name; } @@ -655,7 +687,6 @@ class TicketController extends Controller { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->first_name, 'email' => $emailadd], $message = ['subject' => null, 'scenario' => 'registration-notification'], $template_variables = ['user' => $user->first_name, 'email_address' => $emailadd, 'user_password' => $password]); } } catch (\Exception $e) { - } } } else { @@ -669,7 +700,7 @@ class TicketController extends Controller { $is_reply = $ticket_number[1]; // dd($is_reply); $system = $this->system(); - $updated_subject = $threaddata->title . '[#' . $ticket_number2 . ']'; + $updated_subject = $threaddata->title.'[#'.$ticket_number2.']'; if ($ticket_number2) { // send ticket create details to user if ($is_reply == 0) { @@ -685,7 +716,6 @@ class TicketController extends Controller { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket-by-agent', 'body' => $body], $template_variables = ['agent_sign' => Auth::user()->agent_sign, 'ticket_number' => $ticket_number2]); } } catch (\Exception $e) { - } } else { $body2 = null; @@ -694,7 +724,6 @@ class TicketController extends Controller { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'], $template_variables = ['user' => $user->first_name, 'ticket_number' => $ticket_number2, 'department_sign' => '']); } } catch (\Exception $e) { - } } } elseif ($is_reply == 1) { @@ -743,18 +772,18 @@ class TicketController extends Controller { try { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $email_data['to_user'], 'email' => $email_data['to_email']], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $email_data['to_user_name'], 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $email_data['to_user_name'], 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]); } catch (\Exception $e) { - } } - $data = array( + $data = [ 'ticket_number' => $ticket_number2, - 'user_id' => $user_id, - 'subject' => $subject, - 'body' => $body, - 'status' => $status, - 'Priority' => $priority, - ); - \Event::fire('Create-Ticket', array($data)); + 'user_id' => $user_id, + 'subject' => $subject, + 'body' => $body, + 'status' => $status, + 'Priority' => $priority, + ]; + \Event::fire('Create-Ticket', [$data]); + return ['0' => $ticket_number2, '1' => true]; } } @@ -764,7 +793,8 @@ class TicketController extends Controller { * * @return type string */ - public function default_helptopic() { + public function default_helptopic() + { $helptopic = '1'; return $helptopic; @@ -775,7 +805,8 @@ class TicketController extends Controller { * * @return type string */ - public function default_sla() { + public function default_sla() + { $sla = '1'; return $sla; @@ -786,7 +817,8 @@ class TicketController extends Controller { * * @return type string */ - public function default_priority() { + public function default_priority() + { $priority = '1'; return $prioirty; @@ -804,7 +836,8 @@ class TicketController extends Controller { * * @return type string */ - public function check_ticket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $status) { + public function check_ticket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $status) + { $read_ticket_number = explode('[#', $subject); if (isset($read_ticket_number[1])) { $separate = explode(']', $read_ticket_number[1]); @@ -830,29 +863,29 @@ class TicketController extends Controller { if ($user_name->role == 'user') { $username = $user_name->user_name; } elseif ($user_name->role == 'agent' or $user_name->role == 'admin') { - $username = $user_name->first_name . ' ' . $user_name->last_name; + $username = $user_name->first_name.' '.$user_name->last_name; } $ticket_threads = new Ticket_Thread(); $ticket_threads->ticket_id = $id; $ticket_threads->user_id = $user_id; $ticket_threads->is_internal = 1; - $ticket_threads->body = $ticket_status->message . ' ' . $username; + $ticket_threads->body = $ticket_status->message.' '.$username; $ticket_threads->save(); // event fire for internal notes //event to change status $data = [ - 'id' => $ticket_number, - 'status' => 'Open', + 'id' => $ticket_number, + 'status' => 'Open', 'first_name' => $username, - 'last_name' => '', + 'last_name' => '', ]; - \Event::fire('change-status', array($data)); + \Event::fire('change-status', [$data]); } if (isset($id)) { if ($this->ticketThread($subject, $body, $id, $user_id)) { -// event fire for reply [$subject, $body, $id, $user_id] + // event fire for reply [$subject, $body, $id, $user_id] return [$ticket_number, 1]; } } @@ -880,7 +913,8 @@ class TicketController extends Controller { * * @return type string */ - public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $status) { + public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $status) + { $max_number = Tickets::whereRaw('id = (select max(`id`) from tickets)')->first(); if ($max_number == null) { $ticket_number = 'AAAA-9999-9999999'; @@ -915,7 +949,7 @@ class TicketController extends Controller { $ticket_number = $ticket->ticket_number; $id = $ticket->id; - + // store Form Data // Form Data comes from raising a ticket from client panel if ($form_data != null) { @@ -937,6 +971,7 @@ class TicketController extends Controller { $this->storeCollaborators($headers, $id); if ($this->ticketThread($subject, $body, $id, $user_id) == true) { $this->NotificationController->create($id, $user_id, '3'); + return $ticket_number; } } @@ -951,7 +986,8 @@ class TicketController extends Controller { * * @return type */ - public function ticketThread($subject, $body, $id, $user_id) { + public function ticketThread($subject, $body, $id, $user_id) + { $thread = new Ticket_Thread(); $thread->user_id = $user_id; $thread->ticket_id = $id; @@ -971,7 +1007,8 @@ class TicketController extends Controller { * * @return type string */ - public function generateRandomString($length = 10) { + public function generateRandomString($length = 10) + { $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; $charactersLength = strlen($characters); $randomString = ''; @@ -990,7 +1027,8 @@ class TicketController extends Controller { * * @return type string */ - public function close($id, Tickets $ticket) { + public function close($id, Tickets $ticket) + { if (Auth::user()->role == 'user') { $ticket_status = $ticket->where('id', '=', $id)->where('user_id', '=', Auth::user()->id)->first(); } else { @@ -1011,7 +1049,7 @@ class TicketController extends Controller { $thread->ticket_id = $ticket_status->id; $thread->user_id = Auth::user()->id; $thread->is_internal = 1; - $thread->body = $ticket_status_message->message . ' ' . Auth::user()->first_name . ' ' . Auth::user()->last_name; + $thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name; $thread->save(); $user_id = $ticket_status->user_id; @@ -1028,18 +1066,19 @@ class TicketController extends Controller { $from_email = $sending_emails->id; } try { - $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket_status->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $ticket_subject . '[#' . $ticket_number . ']', 'scenario' => 'close-ticket'], $template_variables = ['ticket_number' => $ticket_number]); + $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket_status->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'close-ticket'], $template_variables = ['ticket_number' => $ticket_number]); } catch (\Exception $e) { return 0; } $data = [ - 'id' => $ticket_status->ticket_number, - 'status' => 'Closed', + 'id' => $ticket_status->ticket_number, + 'status' => 'Closed', 'first_name' => Auth::user()->first_name, - 'last_name' => Auth::user()->last_name, + 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', array($data)); - return 'your ticket' . $ticket_status->ticket_number . ' has been closed'; + \Event::fire('change-status', [$data]); + + return 'your ticket'.$ticket_status->ticket_number.' has been closed'; } /** @@ -1050,7 +1089,8 @@ class TicketController extends Controller { * * @return type string */ - public function resolve($id, Tickets $ticket) { + public function resolve($id, Tickets $ticket) + { if (Auth::user()->role == 'user') { $ticket_status = $ticket->where('id', '=', $id)->where('user_id', '=', Auth::user()->id)->first(); } else { @@ -1071,19 +1111,20 @@ class TicketController extends Controller { $thread->user_id = Auth::user()->id; $thread->is_internal = 1; if (Auth::user()->first_name != null) { - $thread->body = $ticket_status_message->message . ' ' . Auth::user()->first_name . ' ' . Auth::user()->last_name; + $thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name; } else { - $thread->body = $ticket_status_message->message . ' ' . Auth::user()->user_name; + $thread->body = $ticket_status_message->message.' '.Auth::user()->user_name; } $thread->save(); $data = [ - 'id' => $ticket_status->ticket_number, - 'status' => 'Resolved', + 'id' => $ticket_status->ticket_number, + 'status' => 'Resolved', 'first_name' => Auth::user()->first_name, - 'last_name' => Auth::user()->last_name, + 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', array($data)); - return 'your ticket' . $ticket_status->ticket_number . ' has been resolved'; + \Event::fire('change-status', [$data]); + + return 'your ticket'.$ticket_status->ticket_number.' has been resolved'; } /** @@ -1091,9 +1132,11 @@ class TicketController extends Controller { * * @param type $id * @param type Tickets $ticket + * * @return type */ - public function open($id, Tickets $ticket) { + public function open($id, Tickets $ticket) + { if (Auth::user()->role == 'user') { $ticket_status = $ticket->where('id', '=', $id)->where('user_id', '=', Auth::user()->id)->first(); } else { @@ -1111,16 +1154,17 @@ class TicketController extends Controller { $thread->ticket_id = $ticket_status->id; $thread->user_id = Auth::user()->id; $thread->is_internal = 1; - $thread->body = $ticket_status_message->message . ' ' . Auth::user()->first_name . ' ' . Auth::user()->last_name; + $thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name; $thread->save(); $data = [ - 'id' => $ticket_status->ticket_number, - 'status' => 'Open', + 'id' => $ticket_status->ticket_number, + 'status' => 'Open', 'first_name' => Auth::user()->first_name, - 'last_name' => Auth::user()->last_name, + 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', array($data)); - return 'your ticket' . $ticket_status->ticket_number . ' has been opened'; + \Event::fire('change-status', [$data]); + + return 'your ticket'.$ticket_status->ticket_number.' has been opened'; } /** @@ -1131,7 +1175,8 @@ class TicketController extends Controller { * * @return type string */ - public function delete($id, Tickets $ticket) { + public function delete($id, Tickets $ticket) + { $ticket_delete = $ticket->where('id', '=', $id)->first(); if ($ticket_delete->status == 5) { $ticket_delete->delete(); @@ -1144,12 +1189,13 @@ class TicketController extends Controller { $ticket_attachment->delete(); } $data = [ - 'id' => $ticket_delete->ticket_number, - 'status' => 'Deleted', + 'id' => $ticket_delete->ticket_number, + 'status' => 'Deleted', 'first_name' => Auth::user()->first_name, - 'last_name' => Auth::user()->last_name, + 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', array($data)); + \Event::fire('change-status', [$data]); + return 'your ticket has been delete'; } else { $ticket_delete->is_deleted = 1; @@ -1160,16 +1206,17 @@ class TicketController extends Controller { $thread->ticket_id = $ticket_delete->id; $thread->user_id = Auth::user()->id; $thread->is_internal = 1; - $thread->body = $ticket_status_message->message . ' ' . Auth::user()->first_name . ' ' . Auth::user()->last_name; + $thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name; $thread->save(); $data = [ - 'id' => $ticket_delete->ticket_number, - 'status' => 'Deleted', + 'id' => $ticket_delete->ticket_number, + 'status' => 'Deleted', 'first_name' => Auth::user()->first_name, - 'last_name' => Auth::user()->last_name, + 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', array($data)); - return 'your ticket' . $ticket_delete->ticket_number . ' has been delete'; + \Event::fire('change-status', [$data]); + + return 'your ticket'.$ticket_delete->ticket_number.' has been delete'; } } @@ -1181,7 +1228,8 @@ class TicketController extends Controller { * * @return type string */ - public function ban($id, Tickets $ticket) { + public function ban($id, Tickets $ticket) + { $ticket_ban = $ticket->where('id', '=', $id)->first(); $ban_email = $ticket_ban->user_id; $user = User::where('id', '=', $ban_email)->first(); @@ -1199,7 +1247,8 @@ class TicketController extends Controller { * * @return type bool */ - public function assign($id) { + public function assign($id) + { $UserEmail = Input::get('assign_to'); $assign_to = explode('_', $UserEmail); $ticket = Tickets::where('id', '=', $id)->first(); @@ -1219,12 +1268,12 @@ class TicketController extends Controller { $thread->ticket_id = $ticket->id; $thread->user_id = Auth::user()->id; $thread->is_internal = 1; - $thread->body = 'This Ticket has been assigned to ' . $assignee; + $thread->body = 'This Ticket has been assigned to '.$assignee; $thread->save(); } elseif ($assign_to[0] == 'user') { $ticket->assigned_to = $assign_to[1]; $user_detail = User::where('id', '=', $assign_to[1])->first(); - $assignee = $user_detail->first_name . ' ' . $user_detail->last_name; + $assignee = $user_detail->first_name.' '.$user_detail->last_name; $company = $this->company(); $system = $this->system(); @@ -1239,15 +1288,15 @@ class TicketController extends Controller { $thread->ticket_id = $ticket->id; $thread->user_id = Auth::user()->id; $thread->is_internal = 1; - $thread->body = 'This Ticket has been assigned to ' . $assignee; + $thread->body = 'This Ticket has been assigned to '.$assignee; $thread->save(); $agent = $user_detail->first_name; $agent_email = $user_detail->email; - $master = Auth::user()->first_name . ' ' . Auth::user()->last_name; + $master = Auth::user()->first_name.' '.Auth::user()->last_name; try { - $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject . '[#' . $ticket_number . ']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master]); + $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master]); } catch (\Exception $e) { return 0; } @@ -1263,7 +1312,8 @@ class TicketController extends Controller { * * @return type bool */ - public function InternalNote($id) { + public function InternalNote($id) + { $InternalContent = Input::get('InternalContent'); $thread = Ticket_Thread::where('ticket_id', '=', $id)->first(); $NewThread = new Ticket_Thread(); @@ -1275,11 +1325,12 @@ class TicketController extends Controller { $NewThread->body = $InternalContent; $NewThread->save(); $data = [ - "ticket_id" => $id, - 'u_id' => Auth::user()->first_name.' '.Auth::user()->last_name, - 'body' => $InternalContent, + 'ticket_id' => $id, + 'u_id' => Auth::user()->first_name.' '.Auth::user()->last_name, + 'body' => $InternalContent, ]; - \Event::fire('Reply-Ticket',array($data)); + \Event::fire('Reply-Ticket', [$data]); + return 1; } @@ -1290,9 +1341,10 @@ class TicketController extends Controller { * * @return type bool */ - public function surrender($id) { + public function surrender($id) + { $ticket = Tickets::where('id', '=', $id)->first(); - $InternalContent = Auth::user()->first_name . ' ' . Auth::user()->last_name . ' has Surrendered the assigned Ticket'; + $InternalContent = Auth::user()->first_name.' '.Auth::user()->last_name.' has Surrendered the assigned Ticket'; $thread = Ticket_Thread::where('ticket_id', '=', $id)->first(); $NewThread = new Ticket_Thread(); $NewThread->ticket_id = $thread->ticket_id; @@ -1316,7 +1368,8 @@ class TicketController extends Controller { * * @return type array */ - public function search($keyword) { + public function search($keyword) + { if (isset($keyword)) { $data = ['ticket_number' => Tickets::search($keyword)]; @@ -1333,7 +1386,8 @@ class TicketController extends Controller { * * @return type array */ - public function stores($ticket_number) { + public function stores($ticket_number) + { $this->layout->header = $ticket_number; $content = View::make('themes.default1.admin.tickets.ticketsearch', with(new Tickets())) ->with('header', $this->layout->header) @@ -1352,7 +1406,8 @@ class TicketController extends Controller { * * @return type */ - public function storeCollaborators($headers, $id) { + public function storeCollaborators($headers, $id) + { $company = $this->company(); if (isset($headers)) { foreach ($headers as $email => $name) { @@ -1375,7 +1430,6 @@ class TicketController extends Controller { try { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]); } catch (\Exception $e) { - } } else { $user = $this->checkEmail($email); @@ -1398,7 +1452,8 @@ class TicketController extends Controller { * * @return type */ - public function company() { + public function company() + { $company = Company::Where('id', '=', '1')->first(); if ($company->company_name == null) { $company = 'Support Center'; @@ -1414,7 +1469,8 @@ class TicketController extends Controller { * * @return type */ - public function system() { + public function system() + { $system = System::Where('id', '=', '1')->first(); if ($system->name == null) { $system = 'Support Center'; @@ -1430,11 +1486,13 @@ class TicketController extends Controller { * * @return type response */ - public function trash() { + public function trash() + { return view('themes.default1.agent.helpdesk.ticket.trash'); } - public function get_trash() { + public function get_trash() + { if (Auth::user()->role == 'admin') { $tickets = Tickets::where('status', '=', 5)->get(); } else { @@ -1450,11 +1508,13 @@ class TicketController extends Controller { * * @return type */ - public function unassigned() { + public function unassigned() + { return view('themes.default1.agent.helpdesk.ticket.unassigned'); } - public function get_unassigned() { + public function get_unassigned() + { if (Auth::user()->role == 'admin') { $tickets = Tickets::where('assigned_to', '=', null)->where('status', '1')->get(); } else { @@ -1470,7 +1530,8 @@ class TicketController extends Controller { * * @return type */ - public function myticket() { + public function myticket() + { return view('themes.default1.agent.helpdesk.ticket.myticket'); } @@ -1481,7 +1542,8 @@ class TicketController extends Controller { * * @return type */ - public function cleanMe($input) { + public function cleanMe($input) + { $input = mysqli_real_escape_string($input); $input = htmlspecialchars($input, ENT_IGNORE, 'utf-8'); $input = strip_tags($input); @@ -1497,9 +1559,10 @@ class TicketController extends Controller { * * @return type json */ - public function autosearch($id) { + public function autosearch($id) + { $term = \Input::get('term'); - $user = \App\User::where('email', 'LIKE', '%' . $term . '%')->lists('email'); + $user = \App\User::where('email', 'LIKE', '%'.$term.'%')->lists('email'); echo json_encode($user); } @@ -1510,7 +1573,8 @@ class TicketController extends Controller { * * @return type json */ - public function autosearch2(User $user) { + public function autosearch2(User $user) + { $user = $user->lists('email'); echo json_encode($user); } @@ -1522,17 +1586,18 @@ class TicketController extends Controller { * * @return type json */ - public function usersearch() { + public function usersearch() + { $email = Input::get('search'); $ticket_id = Input::get('ticket_id'); $data = User::where('email', '=', $email)->first(); if ($data == null) { return '
    ' - . '' - . '' - . 'This Email doesnot exist in the system' - . '
    ' - . ''; + .'' + .'' + .'This Email doesnot exist in the system' + .'' + .''; } $ticket_collaborator = Ticket_Collaborator::where('ticket_id', '=', $ticket_id)->where('user_id', '=', $data->id)->first(); if (!isset($ticket_collaborator)) { @@ -1543,9 +1608,9 @@ class TicketController extends Controller { $ticket_collaborator->role = 'ccc'; $ticket_collaborator->save(); - return '

    Success!

    ' . $data->user_name . '

    ' . $data->email . '
    '; + return '

    Success!

    '.$data->user_name.'

    '.$data->email.'
    '; } else { - return '

    ' . $data->user_name . '

    ' . $data->email . '
    This user already Collaborated
    '; + return '

    '.$data->user_name.'

    '.$data->email.'
    This user already Collaborated
    '; } } @@ -1556,7 +1621,8 @@ class TicketController extends Controller { * * @return type json */ - public function useradd() { + public function useradd() + { $name = Input::get('name'); $email = Input::get('email'); $ticket_id = Input::get('ticket_id'); @@ -1585,7 +1651,7 @@ class TicketController extends Controller { $ticket_collaborator->role = 'ccc'; $ticket_collaborator->save(); - return '

    ' . $user->user_name . '

    ' . $user->email . '
    '; + return '

    '.$user->user_name.'

    '.$user->email.'
    '; } } @@ -1594,7 +1660,8 @@ class TicketController extends Controller { * * @return type */ - public function userremove() { + public function userremove() + { $id = Input::get('data1'); $ticket_collaborator = Ticket_Collaborator::where('id', '=', $id)->delete(); @@ -1606,7 +1673,8 @@ class TicketController extends Controller { * * @return type */ - public function select_all() { + public function select_all() + { if (Input::has('select_all')) { $selectall = Input::get('select_all'); $value = Input::get('submit'); @@ -1616,24 +1684,24 @@ class TicketController extends Controller { $ticket->status = 5; $ticket->save(); $data = [ - 'id' => $ticket->ticket_number, - 'status' => 'Deleted', + 'id' => $ticket->ticket_number, + 'status' => 'Deleted', 'first_name' => Auth::user()->first_name, - 'last_name' => Auth::user()->last_name, + 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', array($data)); + \Event::fire('change-status', [$data]); } elseif ($value == 'Close') { $ticket->status = 2; $ticket->closed = 1; $ticket->closed_at = date('Y-m-d H:i:s'); $ticket->save(); $data = [ - 'id' => $ticket->ticket_number, - 'status' => 'Closed', + 'id' => $ticket->ticket_number, + 'status' => 'Closed', 'first_name' => Auth::user()->first_name, - 'last_name' => Auth::user()->last_name, + 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', array($data)); + \Event::fire('change-status', [$data]); } elseif ($value == 'Open') { $ticket->status = 1; $ticket->reopened = 1; @@ -1642,12 +1710,12 @@ class TicketController extends Controller { $ticket->closed_at = null; $ticket->save(); $data = [ - 'id' => $ticket->ticket_number, - 'status' => 'Open', + 'id' => $ticket->ticket_number, + 'status' => 'Open', 'first_name' => Auth::user()->first_name, - 'last_name' => Auth::user()->last_name, + 'last_name' => Auth::user()->last_name, ]; - \Event::fire('change-status', array($data)); + \Event::fire('change-status', [$data]); } elseif ($value == 'Delete forever') { $notification = Notification::select('id')->where('model_id', '=', $ticket->id)->get(); foreach ($notification as $id) { @@ -1663,7 +1731,7 @@ class TicketController extends Controller { $attachment = Ticket_attachments::where('thread_id', '=', $th_id->id)->get(); if (count($attachment)) { foreach ($attachment as $a_id) { - echo $a_id->id . ' '; + echo $a_id->id.' '; $attachment = Ticket_attachments::find($a_id->id); $attachment->delete(); } @@ -1706,7 +1774,8 @@ class TicketController extends Controller { * * @return type date */ - public static function usertimezone($utc) { + public static function usertimezone($utc) + { $set = System::whereId('1')->first(); $timezone = Timezones::whereId($set->time_zone)->first(); $tz = $timezone->name; @@ -1724,12 +1793,14 @@ class TicketController extends Controller { * * @return date */ - public static function timeOffset($utc) { + public static function timeOffset($utc) + { $set = System::whereId('1')->first(); $timezone = Timezones::whereId($set->time_zone)->first(); $tz = $timezone->name; date_default_timezone_set($tz); $offset = date('Z', strtotime($utc)); + return $offset; } @@ -1738,8 +1809,10 @@ class TicketController extends Controller { * * @return string */ - public static function getDateTimeFormat() { + public static function getDateTimeFormat() + { $set = System::select('date_time_format')->whereId('1')->first(); + return $set->date_time_format; } @@ -1750,7 +1823,8 @@ class TicketController extends Controller { * * @return type null */ - public function lock($id) { + public function lock($id) + { $ticket = Tickets::where('id', '=', $id)->first(); $ticket->lock_by = Auth::user()->id; $ticket->lock_at = date('Y-m-d H:i:s'); @@ -1762,7 +1836,8 @@ class TicketController extends Controller { * * @return type response */ - public function deptopen($id) { + public function deptopen($id) + { $dept = Department::where('name', '=', $id)->first(); if (Auth::user()->role == 'agent') { if (Auth::user()->primary_dpt == $dept->id) { @@ -1780,7 +1855,8 @@ class TicketController extends Controller { * * @return type response */ - public function deptclose($id) { + public function deptclose($id) + { $dept = Department::where('name', '=', $id)->first(); if (Auth::user()->role == 'agent') { if (Auth::user()->primary_dpt == $dept->id) { @@ -1798,7 +1874,8 @@ class TicketController extends Controller { * * @return type response */ - public function deptinprogress($id) { + public function deptinprogress($id) + { $dept = Department::where('name', '=', $id)->first(); if (Auth::user()->role == 'agent') { if (Auth::user()->primary_dpt == $dept->id) { @@ -1816,7 +1893,8 @@ class TicketController extends Controller { * * @return type Redirect */ - public function rating($id, Request $request, \App\Model\helpdesk\Ratings\RatingRef $rating_ref) { + public function rating($id, Request $request, \App\Model\helpdesk\Ratings\RatingRef $rating_ref) + { foreach ($request->all() as $key => $value) { if (strpos($key, '_') !== false) { $ratName = str_replace('_', ' ', $key); @@ -1850,7 +1928,8 @@ class TicketController extends Controller { * * @return type Redirect */ - public function ratingReply($id, Request $request, \App\Model\helpdesk\Ratings\RatingRef $rating_ref) { + public function ratingReply($id, Request $request, \App\Model\helpdesk\Ratings\RatingRef $rating_ref) + { foreach ($request->all() as $key => $value) { $key1 = explode(',', $key); if (strpos($key1[0], '_') !== false) { @@ -1886,7 +1965,8 @@ class TicketController extends Controller { /** * System default email. */ - public function system_mail() { + public function system_mail() + { $email = Email::where('id', '=', '1')->first(); return $email->sys_email; @@ -1900,7 +1980,8 @@ class TicketController extends Controller { * * @return int */ - public function checkLock($id) { + public function checkLock($id) + { $ticket = DB::table('tickets')->select('id', 'lock_at', 'lock_by')->where('id', '=', $id)->first(); $cad = DB::table('settings_ticket')->select('collision_avoid')->where('id', '=', 1)->first(); $cad = $cad->collision_avoid; //collision avoid duration defined in system @@ -1914,12 +1995,12 @@ class TicketController extends Controller { if ($diff < $cad && Auth::user()->id != $ticket->lock_by) { $user_data = User::select('user_name', 'first_name', 'last_name')->where('id', '=', $ticket->lock_by)->first(); if ($user_data->first_name != '') { - $name = $user_data->first_name . ' ' . $user_data->last_name; + $name = $user_data->first_name.' '.$user_data->last_name; } else { $name = $user_data->username; } - return Lang::get('lang.locked-ticket') . " lock_by) . "'>" . $name . ' ' . $diff . ' ' . Lang::get('lang.minutes-ago'); //ticket is locked + return Lang::get('lang.locked-ticket')." lock_by)."'>".$name.' '.$diff.' '.Lang::get('lang.minutes-ago'); //ticket is locked } elseif ($diff < $cad && Auth::user()->id == $ticket->lock_by) { $ticket = Tickets::where('id', '=', $id)->first(); $ticket->lock_at = date('Y-m-d H:i:s'); @@ -1950,7 +2031,8 @@ class TicketController extends Controller { * * @return type bool */ - public function changeOwner($id) { + public function changeOwner($id) + { $action = Input::get('action'); $email = Input::get('email'); $ticket_id = Input::get('ticket_id'); @@ -1981,7 +2063,7 @@ class TicketController extends Controller { $thread->ticket_id = $ticket->id; $thread->user_id = Auth::user()->id; $thread->is_internal = 1; - $thread->body = 'This ticket now belongs to ' . $user->user_name; + $thread->body = 'This ticket now belongs to '.$user->user_name; $thread->save(); //mail functionality @@ -1991,11 +2073,11 @@ class TicketController extends Controller { $agent = $user->first_name; $agent_email = $user->email; - $master = Auth::user()->first_name . ' ' . Auth::user()->last_name; + $master = Auth::user()->first_name.' '.Auth::user()->last_name; if (Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) { // ticket assigned send mail Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from' => $company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) { - $message->to($agent_email, $agent)->subject($ticket_subject . '[#' . $ticket_number . ']'); + $message->to($agent_email, $agent)->subject($ticket_subject.'[#'.$ticket_number.']'); }); } @@ -2012,13 +2094,14 @@ class TicketController extends Controller { * * @return type json */ - public function changeOwnerAdd($email, $name, $ticket_id) { + public function changeOwnerAdd($email, $name, $ticket_id) + { $name = $name; $email = $email; $ticket_id = $ticket_id; $validator = \Validator::make( ['email' => $email, - 'name' => $name,], ['email' => 'required|email', + 'name' => $name, ], ['email' => 'required|email', ] ); $user = User::where('email', '=', $email)->first(); @@ -2041,7 +2124,6 @@ class TicketController extends Controller { try { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]); } catch (\Exception $e) { - } } @@ -2049,12 +2131,13 @@ class TicketController extends Controller { } } - public function getMergeTickets($id) { + public function getMergeTickets($id) + { if ($id == 0) { $t_id = Input::get('data1'); foreach ($t_id as $value) { $title = Ticket_Thread::select('title')->where('ticket_id', '=', $value)->first(); - echo "'; + echo "'; } } else { $ticket = Tickets::select('user_id')->where('id', '=', $id)->first(); @@ -2062,12 +2145,13 @@ class TicketController extends Controller { ->where('user_id', '=', $ticket->user_id)->where('id', '!=', $id)->where('status', '=', 1)->get(); foreach ($ticket_data as $value) { $title = Ticket_Thread::select('title')->where('ticket_id', '=', $value->id)->first(); - echo "'; + echo "'; } } } - public function checkMergeTickets($id) { + public function checkMergeTickets($id) + { if ($id == 0) { if (Input::get('data1') == null || count(Input::get('data1')) == 1) { return 0; @@ -2102,7 +2186,8 @@ class TicketController extends Controller { } } - public function mergeTickets($id) { + public function mergeTickets($id) + { // split the phrase by any number of commas or space characters, // which include " ", \r, \t, \n and \f $t_id = preg_split("/[\s,]+/", $id); @@ -2147,27 +2232,27 @@ class TicketController extends Controller { ->update(['title' => Input::get('title')]); } - $new_thread = new Ticket_Thread; + $new_thread = new Ticket_Thread(); $new_thread->ticket_id = $thread->ticket_id; $new_thread->user_id = Auth::user()->id; $new_thread->poster = $thread->poster; $new_thread->source = $thread->source; $new_thread->is_internal = 0; $new_thread->title = $thread->title; - $new_thread->body = Lang::get('lang.get_merge_message') . - "  #" . $parent_ticket->ticket_number . '

    ' . Lang::get('lang.merge-reason') . ':  ' . $reason; + $new_thread->body = Lang::get('lang.get_merge_message'). + "  #".$parent_ticket->ticket_number.'

    '.Lang::get('lang.merge-reason').':  '.$reason; $new_thread->format = $thread->format; $new_thread->ip_address = $thread->ip_address; - $new_parent_thread = new Ticket_Thread; + $new_parent_thread = new Ticket_Thread(); $new_parent_thread->ticket_id = $p_id; $new_parent_thread->user_id = Auth::user()->id; $new_parent_thread->poster = $parent_thread->poster; $new_parent_thread->source = $parent_thread->source; $new_parent_thread->is_internal = 1; $new_parent_thread->title = $thread->title; - $new_parent_thread->body = Lang::get('lang.ticket') . " #" . $ticket->ticket_number . ' ' . Lang::get('lang.ticket_merged') . '

    ' . Lang::get('lang.merge-reason') . ':  ' . $reason; + $new_parent_thread->body = Lang::get('lang.ticket')." #".$ticket->ticket_number.' '.Lang::get('lang.ticket_merged').'

    '.Lang::get('lang.merge-reason').':  '.$reason; $new_parent_thread->format = $parent_thread->format; $new_parent_thread->ip_address = $parent_thread->ip_address; if ($new_thread->save() && $new_parent_thread->save()) { @@ -2180,13 +2265,14 @@ class TicketController extends Controller { return $success; } - public function getParentTickets($id) { + public function getParentTickets($id) + { $title = Ticket_Thread::select('title')->where('ticket_id', '=', $id)->first(); - echo "'; + echo "'; $tickets = Input::get('data1'); foreach ($tickets as $value) { $title = Ticket_Thread::select('title')->where('ticket_id', '=', $value)->first(); - echo "'; + echo "'; } } @@ -2197,10 +2283,11 @@ class TicketController extends Controller { * @return Array-object */ - public static function getTable($tickets) { + public static function getTable($tickets) + { return \Datatable::collection(new Collection($tickets)) ->addColumn('id', function ($ticket) { - return ""; + return ""; }) ->addColumn('subject', function ($ticket) { $subject = DB::table('ticket_thread')->select('title')->where('ticket_id', '=', $ticket->id)->first(); @@ -2208,7 +2295,7 @@ class TicketController extends Controller { $string = $subject->title; if (strlen($string) > 20) { $stringCut = substr($string, 0, 30); - $string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...'; + $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; } } else { $string = '(no subject)'; @@ -2234,10 +2321,11 @@ class TicketController extends Controller { } else { $attachString = ''; } - return "id]) . "' title='" . $subject->title . "'>" . ucfirst($string) . " (" . $count . ")" . $collabString . $attachString; + + return "id])."' title='".$subject->title."'>".ucfirst($string)." (".$count.")".$collabString.$attachString; }) ->addColumn('ticket_number', function ($ticket) { - return "id]) . "' title='" . $ticket->ticket_number . "'>#" . $ticket->ticket_number . ''; + return "id])."' title='".$ticket->ticket_number."'>#".$ticket->ticket_number.''; }) ->addColumn('priority', function ($ticket) { $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->where('is_internal', '=', 0)->max('id'); @@ -2248,24 +2336,25 @@ class TicketController extends Controller { $username = $LastResponse->user_name; } else { $rep = '#000'; - $username = $LastResponse->first_name . ' ' . $LastResponse->last_name; + $username = $LastResponse->first_name.' '.$LastResponse->last_name; if ($LastResponse->first_name == null || $LastResponse->last_name == null) { $username = $LastResponse->user_name; } } $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first(); if ($priority != null) { - $prio = '' . ucfirst($priority->priority_desc) . ''; + $prio = ''.ucfirst($priority->priority_desc).''; } else { $prio = ''; } + return $prio; }) ->addColumn('from', function ($ticket) { $from = DB::table('users')->select('user_name')->where('id', '=', $ticket->user_id)->first(); $url = route('user.show', $ticket->user_id); - return "user_name) . ''' . Lang::get('lang.see-profile2') . "'>" . ucfirst($from->user_name) . ''; + return "user_name).'''.Lang::get('lang.see-profile2')."'>".ucfirst($from->user_name).''; }) // ->addColumn('Last Replier', function ($ticket) { // $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->where('is_internal', '=', 0)->max('id'); @@ -2290,14 +2379,14 @@ class TicketController extends Controller { $assign = DB::table('users')->where('id', '=', $ticket->assigned_to)->first(); $url = route('user.show', $ticket->assigned_to); - return "first_name) . ''' . Lang::get('lang.see-profile2') . "'>" . ucfirst($assign->first_name) . ' ' . ucfirst($assign->last_name) . ''; + return "first_name).'''.Lang::get('lang.see-profile2')."'>".ucfirst($assign->first_name).' '.ucfirst($assign->last_name).''; } }) ->addColumn('Last', function ($ticket) { $TicketData = Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id'); $TicketDatarow = Ticket_Thread::select('updated_at')->where('id', '=', $TicketData)->first(); - return '' . $TicketDatarow->updated_at . '' . UTC::usertimezone($TicketDatarow->updated_at); + return ''.$TicketDatarow->updated_at.''.UTC::usertimezone($TicketDatarow->updated_at); }) ->searchColumns('subject', 'from', 'assigned_to', 'ticket_number', 'priority') ->orderColumns('subject', 'from', 'assigned_to', 'Last Replier', 'ticket_number', 'priority', 'Last') @@ -2305,7 +2394,8 @@ class TicketController extends Controller { } //Auto-close tickets - public function autoCloseTickets() { + public function autoCloseTickets() + { $workflow = \App\Model\helpdesk\Workflow\WorkflowClose::whereId(1)->first(); if ($workflow->condition == 1) { @@ -2318,7 +2408,7 @@ class TicketController extends Controller { // $sla_plan = Sla_plan::where('id', '=', $overdue->sla)->first(); $ovadate = $overdue->created_at; - $new_date = date_add($ovadate, date_interval_create_from_date_string($workflow->days . ' days')) . '

    '; + $new_date = date_add($ovadate, date_interval_create_from_date_string($workflow->days.' days')).'

    '; if (date('Y-m-d H:i:s') > $new_date) { $i++; $overdue->status = 3; @@ -2338,16 +2428,16 @@ class TicketController extends Controller { // } } } else { - } } /** - * This function is used for auto filling in new ticket + * This function is used for auto filling in new ticket. + * * @return type view */ - public function autofill() { + public function autofill() + { return view('themes.default1.agent.helpdesk.ticket.getautocomplete'); } - } diff --git a/app/Http/Controllers/Agent/helpdesk/TicketWorkflowController.php b/app/Http/Controllers/Agent/helpdesk/TicketWorkflowController.php index b231213ba..15b8611d5 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketWorkflowController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketWorkflowController.php @@ -350,6 +350,7 @@ class TicketWorkflowController extends Controller $ticket_settings_details = $this->changeStatus($workflow_action, $ticket_settings_details); } } + return $ticket_settings_details; } diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 346cc4ef3..d10ccb119 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers\Agent\helpdesk; // controllers -use App\Http\Controllers\Controller; use App\Http\Controllers\Common\PhpMailController; +use App\Http\Controllers\Controller; // requests /* Include Sys_user Model */ use App\Http\Requests\helpdesk\ProfilePassword; @@ -79,7 +79,7 @@ class UserController extends Controller public function user_list() { // displaying list of users with chumper datatables - return \Datatable::collection(User::where('role',"=","user")->get()) + return \Datatable::collection(User::where('role', '=', 'user')->get()) /* searchable column username and email */ ->searchColumns('user_name', 'email', 'phone') /* order column username and email */ @@ -207,7 +207,7 @@ class UserController extends Controller // fetch user credentails to send mail $name = $user->first_name; $email = $user->email; - if($request->input('send_email')) { + if ($request->input('send_email')) { try { // send mail on registration $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => null, 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]); @@ -283,7 +283,7 @@ class UserController extends Controller */ public function update($id, Sys_userUpdate $request) { -// dd($request); + // dd($request); $user = new User(); /* select the field where id = $id(request Id) */ $users = $user->whereId($id)->first(); @@ -510,8 +510,7 @@ class UserController extends Controller return 0; } } - - + /** * Generate a random string for password. * @@ -534,5 +533,4 @@ class UserController extends Controller // return random string return $randomString; } - } diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php index d718c2c55..cc61d8b74 100644 --- a/app/Http/Controllers/Agent/kb/ArticleController.php +++ b/app/Http/Controllers/Agent/kb/ArticleController.php @@ -65,7 +65,7 @@ class ArticleController extends Controller $article = new Article(); $articles = $article ->select('id', 'name', 'description', 'publish_time', 'slug') - ->orderBy('publish_time','desc') + ->orderBy('publish_time', 'desc') ->get(); // returns chumper datatable return Datatable::Collection($articles) diff --git a/app/Http/Controllers/Agent/kb/CategoryController.php b/app/Http/Controllers/Agent/kb/CategoryController.php index ca426d87f..87f54e767 100644 --- a/app/Http/Controllers/Agent/kb/CategoryController.php +++ b/app/Http/Controllers/Agent/kb/CategoryController.php @@ -77,6 +77,7 @@ class CategoryController extends Controller /* add column name */ ->addColumn('name', function ($model) { $string = strip_tags($model->name); + return str_limit($string, 20); }) /* add column Created */ @@ -120,7 +121,7 @@ class CategoryController extends Controller public function create(Category $category) { /* Get the all attributes in the category model */ - $category = $category->lists('name','id')->toArray(); + $category = $category->lists('name', 'id')->toArray(); /* get the view page to create new category with all attributes of category model */ try { @@ -147,6 +148,7 @@ class CategoryController extends Controller // send success message to index page try { $category->fill($request->input())->save(); + return Redirect::back()->with('success', Lang::get('lang.category_inserted_successfully')); } catch (Exception $e) { return Redirect::back()->with('fails', Lang::get('lang.category_not_inserted').'
  • '.$e->getMessage().'
    • '); @@ -165,9 +167,9 @@ class CategoryController extends Controller { /* get the atributes of the category model whose id == $id */ $category = Category::whereId($id)->first(); - $categories = Category::lists('name','id')->toArray(); + $categories = Category::lists('name', 'id')->toArray(); /* get the Edit page the selected category via id */ - return view('themes.default1.agent.kb.category.edit', compact('category','categories')); + return view('themes.default1.agent.kb.category.edit', compact('category', 'categories')); } /** @@ -191,6 +193,7 @@ class CategoryController extends Controller try { $category->slug = $slug; $category->fill($request->input())->save(); + return redirect('category')->with('success', Lang::get('lang.category_updated_successfully')); } catch (Exception $e) { //redirect to index with fails message diff --git a/app/Http/Controllers/Api/v1/ApiController.php b/app/Http/Controllers/Api/v1/ApiController.php index 2b3ab9e83..f1c87c700 100644 --- a/app/Http/Controllers/Api/v1/ApiController.php +++ b/app/Http/Controllers/Api/v1/ApiController.php @@ -33,8 +33,8 @@ use Illuminate\Support\Collection; * * @version v1 */ -class ApiController extends Controller { - +class ApiController extends Controller +{ public $user; public $request; public $ticket; @@ -54,7 +54,8 @@ class ApiController extends Controller { /** * @param Request $request */ - public function __construct(Request $request) { + public function __construct(Request $request) + { $this->request = $request; $this->middleware('jwt.auth'); @@ -63,9 +64,7 @@ class ApiController extends Controller { $user = \JWTAuth::parseToken()->authenticate(); $this->user = $user; } catch (\Tymon\JWTAuth\Exceptions\TokenExpiredException $e) { - } catch (\Tymon\JWTAuth\Exceptions\JWTException $e) { - } $ticket = new TicketController(); @@ -120,16 +119,17 @@ class ApiController extends Controller { * * @return json */ - public function createTicket() { + public function createTicket() + { try { $v = \Validator::make($this->request->all(), [ - 'user_id' => 'required|exists:users,id', - 'subject' => 'required', - 'body' => 'required', + 'user_id' => 'required|exists:users,id', + 'subject' => 'required', + 'body' => 'required', 'helptopic' => 'required|exists:help_topic,id', - 'sla' => 'required|exists:sla_plan,id', - 'priority' => 'required|exists:ticket_priority,priority_id', - 'dept' => 'required|exists:department,id', + 'sla' => 'required|exists:sla_plan,id', + 'priority' => 'required|exists:ticket_priority,priority_id', + 'dept' => 'required|exists:department,id', ]); if ($v->fails()) { $error = $v->errors(); @@ -189,11 +189,12 @@ class ApiController extends Controller { * * @return json */ - public function ticketReply() { + public function ticketReply() + { //dd($this->request->all()); try { $v = \Validator::make($this->request->all(), [ - 'ticket_ID' => 'required|exists:tickets,id', + 'ticket_ID' => 'required|exists:tickets,id', 'reply_content' => 'required', ]); if ($v->fails()) { @@ -223,14 +224,15 @@ class ApiController extends Controller { * * @return json */ - public function editTicket() { + public function editTicket() + { try { $v = \Validator::make($this->request->all(), [ - 'ticket_id' => 'required|exists:tickets,id', - 'subject' => 'required', - 'sla_plan' => 'required|exists:sla_plan,id', - 'help_topic' => 'required|exists:help_topic,id', - 'ticket_source' => 'required|exists:ticket_source,id', + 'ticket_id' => 'required|exists:tickets,id', + 'subject' => 'required', + 'sla_plan' => 'required|exists:sla_plan,id', + 'help_topic' => 'required|exists:help_topic,id', + 'ticket_source' => 'required|exists:ticket_source,id', 'ticket_priority' => 'required|exists:ticket_priority,priority_id', ]); if ($v->fails()) { @@ -260,7 +262,8 @@ class ApiController extends Controller { * * @return json */ - public function deleteTicket() { + public function deleteTicket() + { try { $v = \Validator::make($this->request->all(), [ 'ticket_id' => 'required|exists:tickets,id', @@ -293,15 +296,16 @@ class ApiController extends Controller { * * @return json */ - public function openedTickets() { + public function openedTickets() + { try { // $result = $this->model->where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', null)->orderBy('id', 'DESC')->get(); // return response()->json(compact('result')); $result = $this->user->join('tickets', function ($join) { - $join->on('users.id', '=', 'tickets.user_id') + $join->on('users.id', '=', 'tickets.user_id') ->where('isanswered', '=', 0)->where('status', '=', 1)->whereNull('assigned_to'); - }) + }) ->join('department', 'department.id', '=', 'tickets.dept_id') ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id') ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') @@ -337,15 +341,16 @@ class ApiController extends Controller { * * @return json */ - public function unassignedTickets() { + public function unassignedTickets() + { try { //dd('sdhjbc'); // $result = $this->model->where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->get(); // return response()->json(compact('result')); $unassigned = $this->user->join('tickets', function ($join) { - $join->on('users.id', '=', 'tickets.user_id') + $join->on('users.id', '=', 'tickets.user_id') ->whereNull('assigned_to')->where('status', '=', 1); - }) + }) ->join('department', 'department.id', '=', 'tickets.dept_id') ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id') ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') @@ -355,7 +360,7 @@ class ApiController extends Controller { $join->on('tickets.id', '=', 'ticket_thread.ticket_id') ->whereNotNull('title'); }) - ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') + ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') ->orderBy('updated_at', 'desc') ->groupby('tickets.id') ->distinct() @@ -381,15 +386,16 @@ class ApiController extends Controller { * * @return json */ - public function closeTickets() { + public function closeTickets() + { try { // $result = $this->model->where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->get(); // return response()->json(compact('result')); $result = $this->user->join('tickets', function ($join) { - $join->on('users.id', '=', 'tickets.user_id') - ->where('status','=',3)->orWhere('status','=',2); - }) + $join->on('users.id', '=', 'tickets.user_id') + ->where('status', '=', 3)->orWhere('status', '=', 2); + }) ->join('department', 'department.id', '=', 'tickets.dept_id') ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id') ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') @@ -399,7 +405,7 @@ class ApiController extends Controller { $join->on('tickets.id', '=', 'ticket_thread.ticket_id') ->whereNotNull('title'); }) - ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') + ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') ->orderBy('updated_at', 'desc') ->groupby('tickets.id') ->distinct() @@ -425,7 +431,8 @@ class ApiController extends Controller { * * @return json */ - public function getAgents() { + public function getAgents() + { try { $result = $this->faveoUser->where('role', 'agent')->orWhere('role', 'admin')->where('active', 1)->get(); @@ -448,7 +455,8 @@ class ApiController extends Controller { * * @return json */ - public function getTeams() { + public function getTeams() + { try { $result = $this->team->get(); @@ -471,11 +479,12 @@ class ApiController extends Controller { * * @return json */ - public function assignTicket() { + public function assignTicket() + { try { $v = \Validator::make($this->request->all(), [ 'ticket_id' => 'required', - 'user' => 'required', + 'user' => 'required', ]); if ($v->fails()) { $error = $v->errors(); @@ -509,7 +518,8 @@ class ApiController extends Controller { * * @return json */ - public function getCustomers() { + public function getCustomers() + { try { $v = \Validator::make($this->request->all(), [ 'search' => 'required', @@ -520,7 +530,7 @@ class ApiController extends Controller { return response()->json(compact('error')); } $search = $this->request->input('search'); - $result = $this->faveoUser->where('first_name', 'like', '%' . $search . '%')->orWhere('last_name', 'like', '%' . $search . '%')->orWhere('user_name', 'like', '%' . $search . '%')->orWhere('email', 'like', '%' . $search . '%')->get(); + $result = $this->faveoUser->where('first_name', 'like', '%'.$search.'%')->orWhere('last_name', 'like', '%'.$search.'%')->orWhere('user_name', 'like', '%'.$search.'%')->orWhere('email', 'like', '%'.$search.'%')->get(); return response()->json(compact('result')) ->header('X-Header-One', 'Header Value'); @@ -543,7 +553,8 @@ class ApiController extends Controller { * * @return json */ - public function getCustomersWith() { + public function getCustomersWith() + { try { $users = $this->user ->leftJoin('user_assign_organization', 'user_assign_organization.user_id', '=', 'users.id') @@ -574,7 +585,8 @@ class ApiController extends Controller { * * @return json */ - public function getCustomer() { + public function getCustomer() + { try { $v = \Validator::make($this->request->all(), [ 'user_id' => 'required', @@ -606,7 +618,8 @@ class ApiController extends Controller { * * @return json */ - public function searchTicket() { + public function searchTicket() + { try { $v = \Validator::make($this->request->all(), [ 'search' => 'required', @@ -617,7 +630,7 @@ class ApiController extends Controller { return response()->json(compact('error')); } $search = $this->request->input('search'); - $result = $this->thread->select('ticket_id')->where('title', 'like', '%' . $search . '%')->orWhere('body', 'like', '%' . $search . '%')->get(); + $result = $this->thread->select('ticket_id')->where('title', 'like', '%'.$search.'%')->orWhere('body', 'like', '%'.$search.'%')->get(); return response()->json(compact('result')); } catch (Exception $e) { @@ -638,7 +651,8 @@ class ApiController extends Controller { * * @return json */ - public function ticketThreads() { + public function ticketThreads() + { try { $v = \Validator::make($this->request->all(), [ 'id' => 'required', @@ -675,7 +689,8 @@ class ApiController extends Controller { * * @return json */ - public function checkUrl() { + public function checkUrl() + { //dd($this->request); try { $v = \Validator::make($this->request->all(), [ @@ -692,7 +707,7 @@ class ApiController extends Controller { $url = str_finish($url, '/'); } - $url = $url . '/api/v1/helpdesk/check-url?api_key=' . $this->request->input('api_key') . '&token=' . \Config::get('app.token'); + $url = $url.'/api/v1/helpdesk/check-url?api_key='.$this->request->input('api_key').'&token='.\Config::get('app.token'); $result = $this->CallGetApi($url); //dd($result); return response()->json(compact('result')); @@ -712,7 +727,8 @@ class ApiController extends Controller { * * @return string */ - public function urlResult() { + public function urlResult() + { return 'success'; } @@ -723,7 +739,8 @@ class ApiController extends Controller { * * @return type int|string|json */ - public function callGetApi($url) { + public function callGetApi($url) + { $curl = curl_init($url); curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); curl_setopt($curl, CURLOPT_URL, $url); @@ -732,7 +749,7 @@ class ApiController extends Controller { $response = curl_exec($curl); if (curl_errno($curl)) { - echo 'error:' . curl_error($curl); + echo 'error:'.curl_error($curl); } return $response; @@ -747,7 +764,8 @@ class ApiController extends Controller { * * @return type int|string|json */ - public function callPostApi($url, $data) { + public function callPostApi($url, $data) + { $curl = curl_init($url); curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); curl_setopt($curl, CURLOPT_URL, $url); @@ -757,7 +775,7 @@ class ApiController extends Controller { $response = curl_exec($curl); if (curl_errno($curl)) { - echo 'error:' . curl_error($curl); + echo 'error:'.curl_error($curl); } return $response; @@ -769,7 +787,8 @@ class ApiController extends Controller { * * @return type | json */ - public function generateApiKey() { + public function generateApiKey() + { try { $set = $this->setting->where('id', '1')->first(); //dd($set); @@ -803,7 +822,8 @@ class ApiController extends Controller { * * @return json */ - public function getHelpTopic() { + public function getHelpTopic() + { try { $result = $this->helptopic->get(); @@ -826,7 +846,8 @@ class ApiController extends Controller { * * @return json */ - public function getSlaPlan() { + public function getSlaPlan() + { try { $result = $this->slaPlan->get(); @@ -849,7 +870,8 @@ class ApiController extends Controller { * * @return json */ - public function getPriority() { + public function getPriority() + { try { $result = $this->priority->get(); @@ -872,7 +894,8 @@ class ApiController extends Controller { * * @return json */ - public function getDepartment() { + public function getDepartment() + { try { $result = $this->department->get(); @@ -895,7 +918,8 @@ class ApiController extends Controller { * * @return type json */ - public function getTickets() { + public function getTickets() + { try { $tickets = $this->model->orderBy('created_at', 'desc')->paginate(10); $tickets->toJson(); @@ -919,13 +943,13 @@ class ApiController extends Controller { * * @return type json */ - public function inbox() { + public function inbox() + { try { - $inbox = $this->user->join('tickets', function ($join) { - $join->on('users.id', '=', 'tickets.user_id') + $join->on('users.id', '=', 'tickets.user_id') ->where('status', '=', 1); - }) + }) ->join('department', 'department.id', '=', 'tickets.dept_id') ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id') ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') @@ -935,7 +959,7 @@ class ApiController extends Controller { $join->on('tickets.id', '=', 'ticket_thread.ticket_id') ->whereNotNull('ticket_thread.title'); }) - ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'ticket_thread.title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') + ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'ticket_thread.title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') ->orderBy('updated_at', 'desc') ->groupby('tickets.id') ->distinct() @@ -961,12 +985,13 @@ class ApiController extends Controller { * * @return type json */ - public function internalNote() { + public function internalNote() + { try { $v = \Validator::make($this->request->all(), [ - 'userid' => 'required|exists:users,id', + 'userid' => 'required|exists:users,id', 'ticketid' => 'required|exists:tickets,id', - 'body' => 'required', + 'body' => 'required', ]); if ($v->fails()) { $error = $v->errors(); @@ -993,12 +1018,13 @@ class ApiController extends Controller { } } - public function getTrash() { + public function getTrash() + { try { $trash = $this->user->join('tickets', function ($join) { - $join->on('users.id', '=', 'tickets.user_id') + $join->on('users.id', '=', 'tickets.user_id') ->where('status', '=', 5); - }) + }) ->join('department', 'department.id', '=', 'tickets.dept_id') ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id') ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') @@ -1008,7 +1034,7 @@ class ApiController extends Controller { $join->on('tickets.id', '=', 'ticket_thread.ticket_id') ->whereNotNull('title'); }) - ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') + ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') ->orderBy('updated_at', 'desc') ->groupby('tickets.id') ->distinct() @@ -1029,7 +1055,8 @@ class ApiController extends Controller { } } - public function getMyTicketsAgent() { + public function getMyTicketsAgent() + { try { $v = \Validator::make($this->request->all(), [ 'user_id' => 'required|exists:users,id', @@ -1046,10 +1073,10 @@ class ApiController extends Controller { return response()->json(compact('error')); } $result = $this->user->join('tickets', function ($join) use ($id) { - $join->on('users.id', '=', 'tickets.assigned_to') + $join->on('users.id', '=', 'tickets.assigned_to') ->where('status', '=', 1); //->where('user_id', '=', $id); - }) + }) ->join('department', 'department.id', '=', 'tickets.dept_id') ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id') ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') @@ -1059,8 +1086,8 @@ class ApiController extends Controller { $join->on('tickets.id', '=', 'ticket_thread.ticket_id') ->whereNotNull('title'); }) - ->where('users.id',$id) - ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') + ->where('users.id', $id) + ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name') ->orderBy('updated_at', 'desc') ->groupby('tickets.id') ->distinct() @@ -1081,7 +1108,8 @@ class ApiController extends Controller { } } - public function getMyTicketsUser() { + public function getMyTicketsUser() + { try { $v = \Validator::make($this->request->all(), [ 'user_id' => 'required|exists:users,id', @@ -1098,9 +1126,9 @@ class ApiController extends Controller { return response()->json(compact('error')); } $result = $this->user->join('tickets', function ($join) use ($id) { - $join->on('users.id', '=', 'tickets.user_id') + $join->on('users.id', '=', 'tickets.user_id') ->where('user_id', '=', $id); - }) + }) ->join('department', 'department.id', '=', 'tickets.dept_id') ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id') ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla') @@ -1132,7 +1160,8 @@ class ApiController extends Controller { } } - public function getTicketById() { + public function getTicketById() + { try { $v = \Validator::make($this->request->all(), [ 'id' => 'required|exists:tickets,id', @@ -1144,18 +1173,18 @@ class ApiController extends Controller { } $id = $this->request->input('id'); if (!$this->model->where('id', $id)->first()) { - $error = 'There is no Ticket as ticket id: ' . $id; + $error = 'There is no Ticket as ticket id: '.$id; return response()->json(compact('error')); } $query = $this->user->join('tickets', function ($join) use ($id) { - $join->on('users.id', '=', 'tickets.user_id') + $join->on('users.id', '=', 'tickets.user_id') ->where('tickets.id', '=', $id); - }); + }); $response = $this->differenciateHelpTopic($query); //$select = 'users.email','users.user_name','users.first_name','users.last_name','tickets.id','ticket_number','num_sequence','user_id','priority_id','sla','max_open_ticket','captcha','status','lock_by','lock_at','source','isoverdue','reopened','isanswered','is_deleted', 'closed','is_transfer','transfer_at','reopened_at','duedate','closed_at','last_message_at','last_response_at'; - - $result = $response->addSelect('users.email','users.user_name','users.first_name','users.last_name','tickets.id','ticket_number','user_id','priority_id','sla','status','lock_by','lock_at','source','isoverdue','reopened','isanswered','is_deleted', 'closed','reopened_at','duedate','closed_at','last_message_at','last_response_at','tickets.created_at','tickets.updated_at')->first(); + + $result = $response->addSelect('users.email', 'users.user_name', 'users.first_name', 'users.last_name', 'tickets.id', 'ticket_number', 'user_id', 'priority_id', 'sla', 'status', 'lock_by', 'lock_at', 'source', 'isoverdue', 'reopened', 'isanswered', 'is_deleted', 'closed', 'reopened_at', 'duedate', 'closed_at', 'last_message_at', 'last_response_at', 'tickets.created_at', 'tickets.updated_at')->first(); return response()->json(compact('result')); } catch (\Exception $e) { @@ -1171,7 +1200,8 @@ class ApiController extends Controller { } } - public function createPagination($array, $perPage) { + public function createPagination($array, $perPage) + { try { //Get current page form url e.g. &page=6 $currentPage = LengthAwarePaginator::resolveCurrentPage(); @@ -1199,7 +1229,8 @@ class ApiController extends Controller { } } - public function collaboratorSearch() { + public function collaboratorSearch() + { $this->validate($this->request, ['term' => 'required']); try { $emails = $this->ticket->autosearch(); @@ -1209,7 +1240,7 @@ class ApiController extends Controller { foreach ($emails as $key => $email) { $user_model = $user->where('email', $email)->first(); //return $user_model; - $users[$key]['name'] = $user_model->first_name . ' ' . $user_model->last_name; + $users[$key]['name'] = $user_model->first_name.' '.$user_model->last_name; $users[$key]['email'] = $email; $users[$key]['avatar'] = $this->avatarUrl($email); } @@ -1226,12 +1257,13 @@ class ApiController extends Controller { } } - public function avatarUrl($email) { + public function avatarUrl($email) + { try { $user = new User(); $user = $user->where('email', $email)->first(); if ($user->profile_pic) { - $url = url('uploads/profilepic/' . $user->profile_pic); + $url = url('uploads/profilepic/'.$user->profile_pic); } else { $url = \Gravatar::src($email); } @@ -1243,10 +1275,11 @@ class ApiController extends Controller { } } - public function addCollaboratorForTicket() { + public function addCollaboratorForTicket() + { try { $v = \Validator::make(\Input::get(), [ - 'email' => 'required|email|unique:users', + 'email' => 'required|email|unique:users', 'ticket_id' => 'required', ] ); @@ -1273,7 +1306,8 @@ class ApiController extends Controller { } } - public function getCollaboratorForTicket() { + public function getCollaboratorForTicket() + { try { $v = \Validator::make(\Input::get(), [ 'ticket_id' => 'required', @@ -1302,11 +1336,12 @@ class ApiController extends Controller { } } - public function deleteCollaborator() { + public function deleteCollaborator() + { try { $v = \Validator::make(\Input::get(), [ 'ticketid' => 'required', - 'email' => 'required', + 'email' => 'required', ] ); if ($v->fails()) { @@ -1326,7 +1361,8 @@ class ApiController extends Controller { } } - public function dependency() { + public function dependency() + { try { $department = $this->department->select('name', 'id')->get()->toArray(); $sla = $this->slaPlan->select('name', 'id')->get()->toArray(); @@ -1337,7 +1373,7 @@ class ApiController extends Controller { $status = \DB::table('ticket_status')->select('name', 'id')->get(); $source = \DB::table('ticket_source')->select('name', 'id')->get(); $result = ['departments' => $department, 'sla' => $sla, 'staffs' => $staff, 'teams' => $team, - 'priorities' => $priority, 'helptopics' => $helptopic, 'status' => $status, 'sources' => $source,]; + 'priorities' => $priority, 'helptopics' => $helptopic, 'status' => $status, 'sources' => $source, ]; return response()->json(compact('result')); } catch (\Exception $e) { @@ -1348,33 +1384,36 @@ class ApiController extends Controller { return response()->json(compact('error', 'file', 'line')); } } - - public function differenciateHelpTopic($query){ + + public function differenciateHelpTopic($query) + { $ticket = $query->first(); $check = 'department'; - if($ticket){ - if($ticket->dept_id && $ticket->help_topic_id){ + if ($ticket) { + if ($ticket->dept_id && $ticket->help_topic_id) { return $this->getSystem($check, $query); } - if(!$ticket->dept_id && $ticket->help_topic_id){ + if (!$ticket->dept_id && $ticket->help_topic_id) { return $query->select('tickets.help_topic_id'); } - if($ticket->dept_id && !$ticket->help_topic_id){ + if ($ticket->dept_id && !$ticket->help_topic_id) { return $query->select('tickets.dept_id'); } } } - - public function getSystem($check,$query){ - switch ($check){ + + public function getSystem($check, $query) + { + switch ($check) { case 'department': return $query->select('tickets.dept_id'); case 'helpTopic': return $query->select('tickets.help_topic_id'); - default : + default: return $query->select('tickets.dept_id'); } } + /** * Register a user with username and password. * @@ -1399,8 +1438,8 @@ class ApiController extends Controller { $username = $request->input('email'); $password = \Hash::make($request->input('password')); $role = $request->input('role'); - if($auth->role=='agent'){ - $role = "user"; + if ($auth->role == 'agent') { + $role = 'user'; } $user = new User(); $user->password = $password; @@ -1408,6 +1447,7 @@ class ApiController extends Controller { $user->email = $email; $user->role = $role; $user->save(); + return response()->json(compact('user')); } catch (\Exception $e) { $error = $e->getMessage(); @@ -1415,6 +1455,4 @@ class ApiController extends Controller { return response()->json(compact('error')); } } - - } diff --git a/app/Http/Controllers/Api/v1/InstallerApiController.php b/app/Http/Controllers/Api/v1/InstallerApiController.php index 60855d60b..a4d82c4b2 100644 --- a/app/Http/Controllers/Api/v1/InstallerApiController.php +++ b/app/Http/Controllers/Api/v1/InstallerApiController.php @@ -98,7 +98,7 @@ class InstallerApiController extends Controller $ENV['QUEUE_DRIVER'] = 'sync'; $config = ''; - + foreach ($ENV as $key => $val) { $config .= "{$key}={$val}\n"; } diff --git a/app/Http/Controllers/Api/v1/PushNotificationController.php b/app/Http/Controllers/Api/v1/PushNotificationController.php index ac35f94a7..4a75cb92f 100644 --- a/app/Http/Controllers/Api/v1/PushNotificationController.php +++ b/app/Http/Controllers/Api/v1/PushNotificationController.php @@ -5,33 +5,31 @@ namespace App\Http\Controllers\Api\v1; // Controllers use App\Http\Controllers\Controller; // Requests -use Illuminate\Http\Request; -// Models -use App\User; -use App\Model\helpdesk\Ticket\Tickets; use App\Model\helpdesk\Ticket\Ticket_Thread; +// Models +use App\Model\helpdesk\Ticket\Tickets; +use App\User; +use FCM; // classes -use LaravelFCM\Message\PayloadNotificationBuilder; -use LaravelFCM\Message\Topics; +use Illuminate\Http\Request; use LaravelFCM\Message\OptionsBuilder; use LaravelFCM\Message\PayloadDataBuilder; +use LaravelFCM\Message\PayloadNotificationBuilder; use LaravelFCM\Response\DownstreamResponse; -use FCM; -use FCMGroup; /** * ********************************************** * PushNotificationController * ********************************************** - * This controller is used to send notification to FCM cloud which later will - * foreward notification to Mobile Application + * This controller is used to send notification to FCM cloud which later will + * foreward notification to Mobile Application. * * @author Ladybird */ -class PushNotificationController extends Controller { - - public function Response($token, $body, $ticket_id = null) { - +class PushNotificationController extends Controller +{ + public function Response($token, $body, $ticket_id = null) + { $optionBuiler = new OptionsBuilder(); $optionBuiler->setTimeToLive(60 * 60); @@ -41,8 +39,8 @@ class PushNotificationController extends Controller { ->setIcon('ic_stat_f1') ->setClickAction('OPEN_ACTIVITY_1'); - if($ticket_id != null) { - $ticket_data = Tickets::where('id', '=', $ticket_id )->first(); + if ($ticket_id != null) { + $ticket_data = Tickets::where('id', '=', $ticket_id)->first(); $thread_data = Ticket_Thread::where('ticket_id', '=', $ticket_id)->first(); $dataBuilder = new PayloadDataBuilder(); $dataBuilder->addData(['ticket_id' => $ticket_id]); @@ -73,21 +71,24 @@ class PushNotificationController extends Controller { $downstreamResponse->tokensToRetry(); // return Array (key:token, value:errror) - in production you should remove from your database the tokens } - + /** * function to get the fcm token from the api under a user. + * * @param \Illuminate\Http\Request $request + * * @return type */ - public function fcmToken(Request $request, User $user) { - // get the requested details + public function fcmToken(Request $request, User $user) + { + // get the requested details $user_id = $request->input('user_id'); $fcm_token = $request->input('fcm_token'); // check for all the valid details - if($user_id != null && $user_id != "" && $fcm_token != null && $fcm_token != "") { + if ($user_id != null && $user_id != '' && $fcm_token != null && $fcm_token != '') { // search the user_id in database $user = $user->where('id', '=', $user_id)->first(); - if($user != null) { + if ($user != null) { $user->fcm_token = $fcm_token; $user->save(); // success response for success case @@ -101,5 +102,4 @@ class PushNotificationController extends Controller { return ['response' => 'fail', 'reason' => 'Invalid Credentials']; } } - } diff --git a/app/Http/Controllers/Api/v1/TokenAuthController.php b/app/Http/Controllers/Api/v1/TokenAuthController.php index c1974518e..23a56dedb 100644 --- a/app/Http/Controllers/Api/v1/TokenAuthController.php +++ b/app/Http/Controllers/Api/v1/TokenAuthController.php @@ -50,7 +50,7 @@ class TokenAuthController extends Controller //$credentials = $request->only('email', 'password'); try { - if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password,'active'=>1])) { + if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password, 'active' => 1])) { return response()->json(['error' => 'invalid_credentials', 'status_code' => 401]); } } catch (JWTException $e) { diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 33633b0db..154a03d58 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Auth; // controllers use App\Http\Controllers\Common\PhpMailController; -use App\Http\Controllers\Common\SettingsController; use App\Http\Controllers\Controller; // requests use App\Http\Requests\helpdesk\LoginRequest; @@ -229,7 +228,7 @@ class AuthController extends Controller $field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name'; // If attempts > 3 and time < 10 minutes if ($loginAttempts > $security->backlist_threshold && (time() - $loginAttemptTime <= ($security->lockout_period * 60))) { -// + // return redirect()->back()->withErrors('email', 'incorrect email')->with('error', $security->lockout_message); } // If time > 10 minutes, reset attempts counter and time in session @@ -244,7 +243,7 @@ class AuthController extends Controller } // If auth ok, redirect to restricted area \Session::put('loginAttempts', $loginAttempts + 1); - + if (Auth::Attempt([$field => $usernameinput, 'password' => $password], $request->has('remember'))) { if (Auth::user()->role == 'user') { return \Redirect::route('/'); @@ -278,15 +277,15 @@ 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::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts, 'LastLogin' => Date('Y-m-d H:i:s')]); + // $result = DB::select('UPDATE login_attempts SET Attempts='.$attempts.", LastLogin=NOW() WHERE IP = '$value' OR User = '$field'"); + $result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts, 'LastLogin' => date('Y-m-d H:i:s')]); } 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'"); } } else { -// $result = DB::select("INSERT INTO login_attempts (Attempts,User,IP,LastLogin) values (1,'$field','$value', NOW())"); - $result = DB::table('login_attempts')->update(['Attempts' => 1, 'User' => $field, 'IP' => $value, 'LastLogin' => Date('Y-m-d H:i:s')]); + // $result = DB::select("INSERT INTO login_attempts (Attempts,User,IP,LastLogin) values (1,'$field','$value', NOW())"); + $result = DB::table('login_attempts')->update(['Attempts' => 1, 'User' => $field, 'IP' => $value, 'LastLogin' => date('Y-m-d H:i:s')]); } } @@ -329,6 +328,7 @@ class AuthController extends Controller return 1; } else { $this->clearLoginAttempts($value, $field); + return 0; } } diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 436f5a4df..10da64945 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Auth; // controllers use App\Http\Controllers\Common\PhpMailController; -use App\Http\Controllers\Common\SettingsController; use App\Http\Controllers\Controller; // request use App\User; @@ -53,7 +52,7 @@ class PasswordController extends Controller { $date = date('Y-m-d H:i:s'); $this->validate($request, ['email' => 'required|email']); - \Event::fire('reset.password',array()); + \Event::fire('reset.password', []); $user = User::where('email', '=', $request->only('email'))->first(); if (isset($user)) { $user1 = $user->email; diff --git a/app/Http/Controllers/Client/helpdesk/FormController.php b/app/Http/Controllers/Client/helpdesk/FormController.php index b756f070c..6d571a6b9 100644 --- a/app/Http/Controllers/Client/helpdesk/FormController.php +++ b/app/Http/Controllers/Client/helpdesk/FormController.php @@ -33,15 +33,16 @@ use Redirect; * * @author Ladybird */ -class FormController extends Controller { - +class FormController extends Controller +{ /** * Create a new controller instance. * Constructor to check. * * @return void */ - public function __construct(TicketWorkflowController $TicketWorkflowController) { + public function __construct(TicketWorkflowController $TicketWorkflowController) + { $this->middleware('board'); // creating a TicketController instance $this->TicketWorkflowController = $TicketWorkflowController; @@ -54,7 +55,8 @@ class FormController extends Controller { * * @return type */ - public function getForm(Help_topic $topic, CountryCode $code) { + public function getForm(Help_topic $topic, CountryCode $code) + { if (\Config::get('database.install') == '%0%') { return \Redirect::route('licence'); } @@ -66,8 +68,9 @@ class FormController extends Controller { if ($phonecode->phonecode) { $phonecode = $phonecode->phonecode; } else { - $phonecode = ""; + $phonecode = ''; } + return view('themes.default1.client.helpdesk.form', compact('topics', 'codes'))->with('phonecode', $phonecode); } else { return \Redirect::route('home'); @@ -82,43 +85,43 @@ class FormController extends Controller { * * @return type string */ - public function postForm($id, Help_topic $topic) { + public function postForm($id, Help_topic $topic) + { if ($id != 0) { $helptopic = $topic->where('id', '=', $id)->first(); $custom_form = $helptopic->custom_form; $values = Fields::where('forms_id', '=', $custom_form)->get(); if (!$values) { - } if ($values) { foreach ($values as $form_data) { - if ($form_data->type == "select") { + if ($form_data->type == 'select') { $form_fields = explode(',', $form_data->value); - $var = ""; + $var = ''; foreach ($form_fields as $form_field) { - $var .= ''; + $var .= ''; } - echo '
    '; - } elseif ($form_data->type == "radio") { + echo '
    '; + } elseif ($form_data->type == 'radio') { $type2 = $form_data->value; $vals = explode(',', $type2); - echo '

    '; + echo '

    '; foreach ($vals as $val) { - echo ' ' . $val . '       '; + echo ' '.$val.'       '; } - echo "
    "; - } elseif ($form_data->type == "textarea") { + echo '
    '; + } elseif ($form_data->type == 'textarea') { $type3 = $form_data->value; - echo '

    '; - } elseif ($form_data->type == "checkbox") { + echo '

    '; + } elseif ($form_data->type == 'checkbox') { $type4 = $form_data->value; $checks = explode(',', $type4); - echo '

    '; + echo '

    '; foreach ($checks as $check) { - echo '  ' . $check; + echo '  '.$check; } } else { - echo '
    '; + echo '
    '; } } echo '

    '; @@ -134,7 +137,8 @@ class FormController extends Controller { * @param type Request $request * @param type User $user */ - public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source, Ticket_attachments $ta, CountryCode $code) { + public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source, Ticket_attachments $ta, CountryCode $code) + { $form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token'); $name = $request->input('Name'); @@ -146,12 +150,12 @@ class FormController extends Controller { $mobile_number = $request->input('Mobile'); $status = $ticket_settings->first()->status; $helptopic = $request->input('helptopic'); - $helpTopicObj = Help_topic::where('id','=', $helptopic); - if($helpTopicObj->exists() && ($helpTopicObj->value('status')==1)){ + $helpTopicObj = Help_topic::where('id', '=', $helptopic); + if ($helpTopicObj->exists() && ($helpTopicObj->value('status') == 1)) { $department = $helpTopicObj->value('department'); - }else{ - $defaultHelpTopicID = Ticket::where('id', '=', '1')->first()->help_topic; - $department = Help_topic::where('id','=', $defaultHelpTopicID)->value('department'); + } else { + $defaultHelpTopicID = Ticket::where('id', '=', '1')->first()->help_topic; + $department = Help_topic::where('id', '=', $defaultHelpTopicID)->value('department'); } $sla = $ticket_settings->first()->sla; $priority = $ticket_settings->first()->priority; @@ -166,8 +170,8 @@ class FormController extends Controller { $geoipcode = $code->where('iso', '=', $location['isoCode'])->first(); if ($phonecode == null) { $data = [ - 'fails' => Lang::get('lang.country-code-required-error'), - 'phonecode' => $geoipcode->phonecode, + 'fails' => Lang::get('lang.country-code-required-error'), + 'phonecode' => $geoipcode->phonecode, 'country_code_error' => 1, ]; @@ -176,8 +180,8 @@ class FormController extends Controller { $code = CountryCode::select('phonecode')->where('phonecode', '=', $phonecode)->get(); if (!count($code)) { $data = [ - 'fails' => Lang::get('lang.incorrect-country-code-error'), - 'phonecode' => $geoipcode->phonecode, + 'fails' => Lang::get('lang.incorrect-country-code-error'), + 'phonecode' => $geoipcode->phonecode, 'country_code_error' => 1, ]; @@ -203,7 +207,7 @@ class FormController extends Controller { } } // dd($result); - return Redirect::back()->with('success', Lang::get('lang.Ticket-has-been-created-successfully-your-ticket-number-is') . ' ' . $result[0] . '. ' . Lang::get('lang.Please-save-this-for-future-reference')); + return Redirect::back()->with('success', Lang::get('lang.Ticket-has-been-created-successfully-your-ticket-number-is').' '.$result[0].'. '.Lang::get('lang.Please-save-this-for-future-reference')); } // dd($result); } @@ -215,13 +219,14 @@ class FormController extends Controller { * * @return type view */ - public function post_ticket_reply($id, Request $request) { + public function post_ticket_reply($id, Request $request) + { try { if ($comment != null) { $tickets = Tickets::where('id', '=', $id)->first(); $thread = Ticket_Thread::where('ticket_id', '=', $tickets->id)->first(); - $subject = $thread->title . '[#' . $tickets->ticket_number . ']'; + $subject = $thread->title.'[#'.$tickets->ticket_number.']'; $body = $request->input('comment'); $user_cred = User::where('id', '=', $tickets->user_id)->first(); @@ -255,13 +260,14 @@ class FormController extends Controller { } } - public function getCustomForm(Request $request) { - $html = ""; + public function getCustomForm(Request $request) + { + $html = ''; $helptopic_id = $request->input('helptopic'); $helptopics = new Help_topic(); $helptopic = $helptopics->find($helptopic_id); if (!$helptopic) { - throw new Exception("We can not find your request"); + throw new Exception('We can not find your request'); } $custom_form = $helptopic->custom_form; if ($custom_form) { @@ -270,7 +276,7 @@ class FormController extends Controller { $form_controller = new \App\Http\Controllers\Admin\helpdesk\FormController($fields, $forms); $html = $form_controller->renderForm($custom_form); } + return $html; } - -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Client/helpdesk/GuestController.php b/app/Http/Controllers/Client/helpdesk/GuestController.php index d9b274861..79f0521e7 100644 --- a/app/Http/Controllers/Client/helpdesk/GuestController.php +++ b/app/Http/Controllers/Client/helpdesk/GuestController.php @@ -11,12 +11,12 @@ use App\Http\Requests\helpdesk\ProfileRequest; use App\Http\Requests\helpdesk\TicketRequest; use App\Model\helpdesk\Manage\Help_topic; // models +use App\Model\helpdesk\Settings\CommonSettings; use App\Model\helpdesk\Settings\Company; use App\Model\helpdesk\Settings\System; use App\Model\helpdesk\Ticket\Ticket_Thread; use App\Model\helpdesk\Ticket\Tickets; use App\Model\helpdesk\Utility\CountryCode; -use App\Model\helpdesk\Settings\CommonSettings; use App\User; use Auth; // classes @@ -323,6 +323,7 @@ class GuestController extends Controller $common_setting = $common_settings->select('status') ->where('option_name', '=', 'user_set_ticket_status') ->first(); + return view('themes.default1.client.helpdesk.ckeckticket', compact('id', 'common_setting')); } diff --git a/app/Http/Controllers/Client/kb/UserController.php b/app/Http/Controllers/Client/kb/UserController.php index b80a9d2e4..0e770e49d 100644 --- a/app/Http/Controllers/Client/kb/UserController.php +++ b/app/Http/Controllers/Client/kb/UserController.php @@ -24,9 +24,10 @@ use Lang; use Mail; use Redirect; -class UserController extends Controller { - - public function __construct() { +class UserController extends Controller +{ + public function __construct() + { $this->middleware('board'); } @@ -35,18 +36,20 @@ class UserController extends Controller { * * @return response */ - public function getArticle(Article $article, Category $category, Settings $settings) { + public function getArticle(Article $article, Category $category, Settings $settings) + { $setting = $settings->first(); $pagination = $setting->pagination; if (!Auth::check() || \Auth::user()->role == 'user') { $article = $article->where('status', '1'); } $article = $article->where('type', '1'); - $article = $article->orderBy('publish_time','desc'); + $article = $article->orderBy('publish_time', 'desc'); $article = $article->paginate($pagination); - + $article->setPath('article-list'); $categorys = $category->get(); + return view('themes.default1.client.kb.article-list.articles', compact('time', 'categorys', 'article')); } @@ -59,7 +62,8 @@ class UserController extends Controller { * * @return string excerpt */ - public static function getExcerpt($str, $startPos = 0, $maxLength = 50) { + public static function getExcerpt($str, $startPos = 0, $maxLength = 50) + { if (strlen($str) > $maxLength) { $excerpt = substr($str, $startPos, $maxLength - 3); $lastSpace = strrpos($excerpt, ' '); @@ -82,13 +86,14 @@ class UserController extends Controller { * * @return type view */ - public function search(SearchRequest $request, Category $category, Article $article, Settings $settings) { + public function search(SearchRequest $request, Category $category, Article $article, Settings $settings) + { $settings = $settings->first(); $pagination = $settings->pagination; $search = $request->input('s'); - $result = $article->where('name', 'LIKE', '%' . $search . '%') - ->orWhere('slug', 'LIKE', '%' . $search . '%') - ->orWhere('description', 'LIKE', '%' . $search . '%') + $result = $article->where('name', 'LIKE', '%'.$search.'%') + ->orWhere('slug', 'LIKE', '%'.$search.'%') + ->orWhere('description', 'LIKE', '%'.$search.'%') ->paginate($pagination); $result->setPath('search'); $categorys = $category->get(); @@ -101,15 +106,16 @@ class UserController extends Controller { * * @return response */ - public function show($slug, Article $article, Category $category) { + public function show($slug, Article $article, Category $category) + { //ArticleController::timezone(); $tz = \App\Model\helpdesk\Settings\System::where('id', '1')->first()->time_zone; $tz = \App\Model\helpdesk\Utility\Timezones::where('id', $tz)->first()->name; date_default_timezone_set($tz); $date = \Carbon\Carbon::now()->toDateTimeString(); $arti = $article->where('slug', $slug); - - if (!Auth::check()|| \Auth::user()->role == 'user') { + + if (!Auth::check() || \Auth::user()->role == 'user') { $arti = $arti->where('status', '1'); $arti = $arti->where('publish_time', '<', $date); } @@ -125,7 +131,8 @@ class UserController extends Controller { } } - public function getCategory($slug, Article $article, Category $category, Relationship $relation) { + public function getCategory($slug, Article $article, Category $category, Relationship $relation) + { /* get the article_id where category_id == current category */ $catid = $category->where('slug', $slug)->first(); if (!$catid) { @@ -141,7 +148,8 @@ class UserController extends Controller { return view('themes.default1.client.kb.article-list.category', compact('all', 'id', 'categorys', 'article_id')); } - public function home(Article $article, Category $category, Relationship $relation) { + public function home(Article $article, Category $category, Relationship $relation) + { if (Config::get('database.install') == '%0%') { return redirect('step1'); } else { @@ -153,7 +161,8 @@ class UserController extends Controller { } } - public function Faq(Faq $faq, Category $category) { + public function Faq(Faq $faq, Category $category) + { $faq = $faq->where('id', '1')->first(); $categorys = $category->get(); @@ -165,7 +174,8 @@ class UserController extends Controller { * * @return response */ - public function contact(Category $category, Settings $settings) { + public function contact(Category $category, Settings $settings) + { $settings = $settings->whereId('1')->first(); $categorys = $category->get(); @@ -177,7 +187,8 @@ class UserController extends Controller { * * @return response */ - public function postContact(ContactRequest $request, Contact $contact) { + public function postContact(ContactRequest $request, Contact $contact) + { $this->port(); $this->host(); $this->encryption(); @@ -195,8 +206,8 @@ class UserController extends Controller { //echo $message; //echo $contact->email; $mail = Mail::send('themes.default1.client.kb.article-list.contact-details', ['name' => $name, 'email' => $email, 'subject' => $subject, 'details' => $details], function ($message) use ($contact) { - $message->to($contact->email, $contact->name)->subject('Contact'); - }); + $message->to($contact->email, $contact->name)->subject('Contact'); + }); if ($mail) { return redirect('contact')->with('success', Lang::get('lang.your_details_send_to_system')); } else { @@ -204,7 +215,8 @@ class UserController extends Controller { } } - public function contactDetails() { + public function contactDetails() + { return view('themes.default1.client.kb.article-list.contact-details'); } @@ -218,10 +230,11 @@ class UserController extends Controller { * * @return type response */ - public function postComment($slug, Article $article, CommentRequest $request, Comment $comment) { + public function postComment($slug, Article $article, CommentRequest $request, Comment $comment) + { $article = $article->where('slug', $slug)->first(); - if(!$article){ - return Redirect::back()->with('fails', Lang::get('lang.sorry_not_processed')); + if (!$article) { + return Redirect::back()->with('fails', Lang::get('lang.sorry_not_processed')); } $id = $article->id; $comment->article_id = $id; @@ -232,42 +245,49 @@ class UserController extends Controller { } } - public function getPage($name, Page $page) { + public function getPage($name, Page $page) + { $page = $page->where('slug', $name)->first(); - if($page){ + if ($page) { return view('themes.default1.client.kb.article-list.pages', compact('page')); - }else{ + } else { return Redirect::back()->with('fails', Lang::get('lang.sorry_not_processed')); } } - public static function port() { + public static function port() + { $setting = Settings::whereId('1')->first(); Config::set('mail.port', $setting->port); } - public static function host() { + public static function host() + { $setting = Settings::whereId('1')->first(); Config::set('mail.host', $setting->host); } - public static function encryption() { + public static function encryption() + { $setting = Settings::whereId('1')->first(); Config::set(['mail.encryption' => $setting->encryption, 'mail.username' => $setting->email]); } - public static function email() { + public static function email() + { $setting = Settings::whereId('1')->first(); Config::set(['mail.from' => ['address' => $setting->email, 'name' => 'asd']]); //dd(Config::get('mail')); } - public static function password() { + public static function password() + { $setting = Settings::whereId('1')->first(); Config::set(['mail.password' => $setting->password, 'mail.sendmail' => $setting->email]); } - public function getCategoryList(Article $article, Category $category, Relationship $relation) { + public function getCategoryList(Article $article, Category $category, Relationship $relation) + { //$categorys = $category->get(); $categorys = $category->get(); // $categorys->setPath('home'); @@ -289,13 +309,15 @@ class UserController extends Controller { // //return substr($date, 0, -6); // } - public function clientProfile() { + public function clientProfile() + { $user = Auth::user(); return view('themes.default1.client.kb.article-list.profile', compact('user')); } - public function postClientProfile($id, ProfileRequest $request) { + public function postClientProfile($id, ProfileRequest $request) + { $user = Auth::user(); $user->gender = $request->input('gender'); $user->save(); @@ -314,7 +336,7 @@ class UserController extends Controller { //$extension = Input::file('profile_pic')->getClientOriginalExtension(); $name = Input::file('profile_pic')->getClientOriginalName(); $destinationPath = 'lb-faveo/dist/img'; - $fileName = rand(0000, 9999) . '.' . $name; + $fileName = rand(0000, 9999).'.'.$name; //echo $fileName; Input::file('profile_pic')->move($destinationPath, $fileName); $user->profile_pic = $fileName; @@ -328,7 +350,8 @@ class UserController extends Controller { } } - public function postClientProfilePassword($id, ProfilePassword $request) { + public function postClientProfilePassword($id, ProfilePassword $request) + { $user = Auth::user(); //echo $user->password; if (Hash::check($request->input('old_password'), $user->getAuthPassword())) { @@ -340,5 +363,4 @@ class UserController extends Controller { return redirect()->back()->with('fails', Lang::get('lang.password_was_not_updated')); } } - } diff --git a/app/Http/Controllers/Common/FileuploadController.php b/app/Http/Controllers/Common/FileuploadController.php index 935dd4251..e1b57a815 100644 --- a/app/Http/Controllers/Common/FileuploadController.php +++ b/app/Http/Controllers/Common/FileuploadController.php @@ -4,9 +4,10 @@ namespace App\Http\Controllers\Common; use App\Http\Controllers\Controller; -class FileuploadController extends Controller { - - public function __construct() { +class FileuploadController extends Controller +{ + public function __construct() + { // checking authentication $this->middleware('auth'); // checking if role is agent @@ -15,7 +16,8 @@ class FileuploadController extends Controller { // Returns a file size limit in bytes based on the PHP upload_max_filesize // and post_max_size - function file_upload_max_size() { + public function file_upload_max_size() + { static $max_size = -1; if ($max_size < 0) { @@ -31,11 +33,13 @@ class FileuploadController extends Controller { $max_size_in_actual = ini_get('upload_max_filesize'); } } + return ['0' => $max_size_in_bytes, '1' => $max_size_in_actual]; // return $max_size_in_bytes; } - function parse_size($size) { + public function parse_size($size) + { $unit = preg_replace('/[^bkmgtpezy]/i', '', $size); // Remove the non-unit characters from the size. $size = preg_replace('/[^0-9\.]/', '', $size); // Remove the non-numeric characters from the size. if ($unit) { @@ -45,5 +49,4 @@ class FileuploadController extends Controller { return round($size); } } - } diff --git a/app/Http/Controllers/Common/NotificationController.php b/app/Http/Controllers/Common/NotificationController.php index 486fb613d..06df2f022 100644 --- a/app/Http/Controllers/Common/NotificationController.php +++ b/app/Http/Controllers/Common/NotificationController.php @@ -2,34 +2,35 @@ namespace App\Http\Controllers\Common; +use App\Http\Controllers\Api\v1\PushNotificationController; use App\Http\Controllers\Controller; use App\Model\helpdesk\Notification\Notification; +use App\Model\helpdesk\Notification\NotificationType; use App\Model\helpdesk\Notification\UserNotification; use App\Model\helpdesk\Ticket\Tickets; use App\User; -use App\Http\Controllers\Api\v1\PushNotificationController; -use App\Model\helpdesk\Notification\NotificationType; -class NotificationController extends Controller { +class NotificationController extends Controller +{ /** - ********************************************* + ********************************************* * Class Notification Controller ********************************************* * This controller is used to generate in app notification - * under the folling occurrence + * under the folling occurrence * 1. Ticket Creation * 2. Ticket Reply - * 3. User Creation - * + * 3. User Creation. + * * @author Ladybird */ - public $user; /** - * Constructor - */ - public function __construct(PushNotificationController $PushNotificationController) { + * Constructor. + */ + public function __construct(PushNotificationController $PushNotificationController) + { $this->PushNotificationController = $PushNotificationController; $user = new User(); $this->user = $user; @@ -41,12 +42,14 @@ class NotificationController extends Controller { /** * This function is used to create in app notifications. + * * @param type $model_id * @param type $userid_created * @param type $type_id * @param type $forwhome */ - public function create($model_id, $userid_created, $type_id, $forwhome = []) { + public function create($model_id, $userid_created, $type_id, $forwhome = []) + { try { if (empty($forwhome)) { $ticket = Tickets::where('id', '=', $model_id)->first(); @@ -67,48 +70,62 @@ class NotificationController extends Controller { } /** - * This function is to mark all ticket to read status + * This function is to mark all ticket to read status. + * * @param type $id + * * @return int */ - public function markAllRead($id) { + public function markAllRead($id) + { $markasread = UserNotification::where('user_id', '=', \Auth::user()->id)->where('is_read', '=', '0')->get(); foreach ($markasread as $mark) { $mark->is_read = '1'; $mark->save(); } + return 1; } /** - * This function to mark read + * This function to mark read. + * * @param type $id + * * @return int */ - public function markRead($id) { + public function markRead($id) + { $markasread = UserNotification::where('notification_id', '=', $id)->where('user_id', '=', \Auth::user()->id)->where('is_read', '=', '0')->get(); foreach ($markasread as $mark) { $mark->is_read = '1'; $mark->save(); } + return 1; } /** - * function to show all the notifications + * function to show all the notifications. + * * @return type */ - public function show() { + public function show() + { $notifications = $this->getNotifications(); + return view('notifications-all', compact('notifications')); } /** - * function to delete notifications + * function to delete notifications. + * * @param type $id + * * @return int */ - public function delete($id) { + public function delete($id) + { $markasread = UserNotification::where('notification_id', '=', $id)->where('user_id', '=', \Auth::user()->id)->get(); foreach ($markasread as $mark) { $mark->delete(); @@ -119,14 +136,16 @@ class NotificationController extends Controller { /** * get the page to list the notifications. + * * @return response */ - public static function getNotifications() { + public static function getNotifications() + { $notifications = UserNotification::join('notifications', 'user_notification.notification_id', '=', 'notifications.id') ->join('notification_types', 'notifications.type_id', '=', 'notification_types.id') ->where('user_notification.user_id', '=', \Auth::user()->id) ->paginate(10); + return $notifications; } - } diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index 963dfac15..7dadd33bb 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -6,16 +6,18 @@ use App\Http\Controllers\Controller; use App\Model\Common\TemplateType; use App\Model\helpdesk\Agent\Department; use App\Model\helpdesk\Email\Emails; +use App\Model\helpdesk\Settings\CommonSettings; use App\Model\helpdesk\Settings\Company; use App\Model\helpdesk\Settings\Email; -use App\Model\helpdesk\Settings\CommonSettings; use App\User; use Auth; -class PhpMailController extends Controller { - - public function fetch_smtp_details($id) { +class PhpMailController extends Controller +{ + public function fetch_smtp_details($id) + { $emails = Emails::where('id', '=', $id)->first(); + return $emails; } @@ -24,42 +26,43 @@ class PhpMailController extends Controller { * * @return Mail */ - public function sendmail($from, $to, $message, $template_variables) { -// try { + public function sendmail($from, $to, $message, $template_variables) + { + // try { // dd($from); $from_address = $this->fetch_smtp_details($from); - if ($from_address == null) { - return $from_address; - } else { - // dd($from_address); + if ($from_address == null) { + return $from_address; + } else { + // dd($from_address); $username = $from_address->email_address; - $fromname = $from_address->email_name; - $password = \Crypt::decrypt($from_address->password); - $smtpsecure = $from_address->sending_encryption; - $host = $from_address->sending_host; - $port = $from_address->sending_port; - $protocol = $from_address->sending_protocol; + $fromname = $from_address->email_name; + $password = \Crypt::decrypt($from_address->password); + $smtpsecure = $from_address->sending_encryption; + $host = $from_address->sending_host; + $port = $from_address->sending_port; + $protocol = $from_address->sending_protocol; - if (isset($to['email'])) { - $recipants = $to['email']; - } else { - $recipants = null; - } - if (isset($to['name'])) { - $recipantname = $to['name']; - } else { - $recipantname = null; - } - if (isset($to['cc'])) { - $cc = $to['cc']; - } else { - $cc = null; - } - if (isset($to['bc'])) { - $bc = $to['bc']; - } else { - $bc = null; - } + if (isset($to['email'])) { + $recipants = $to['email']; + } else { + $recipants = null; + } + if (isset($to['name'])) { + $recipantname = $to['name']; + } else { + $recipantname = null; + } + if (isset($to['cc'])) { + $cc = $to['cc']; + } else { + $cc = null; + } + if (isset($to['bc'])) { + $bc = $to['bc']; + } else { + $bc = null; + } // if (isset($message['subject'])) { // $subject = $message['subject']; // } else { @@ -70,16 +73,16 @@ class PhpMailController extends Controller { } else { $content = null; } - if (isset($message['scenario'])) { - $template = $message['scenario']; - } else { - $template = null; - } - if (isset($message['attachments'])) { - $attachment = $message['attachments']; - } else { - $attachment = null; - } + if (isset($message['scenario'])) { + $template = $message['scenario']; + } else { + $template = null; + } + if (isset($message['attachments'])) { + $attachment = $message['attachments']; + } else { + $attachment = null; + } // template variables if (Auth::user()) { @@ -87,86 +90,86 @@ class PhpMailController extends Controller { } else { $agent = null; } - if (isset($template_variables['ticket_agent_name'])) { - $ticket_agent_name = $template_variables['ticket_agent_name']; - } else { - $ticket_agent_name = null; - } - if (isset($template_variables['ticket_number'])) { - $ticket_number = $template_variables['ticket_number']; - } else { - $ticket_number = null; - } - if (isset($template_variables['ticket_client_name'])) { - $ticket_client_name = $template_variables['ticket_client_name']; - } else { - $ticket_client_name = null; - } - if (isset($template_variables['ticket_client_email'])) { - $ticket_client_email = $template_variables['ticket_client_email']; - } else { - $ticket_client_email = null; - } - if (isset($template_variables['ticket_body'])) { - $ticket_body = $template_variables['ticket_body']; - } else { - $ticket_body = null; - } - if (isset($template_variables['ticket_assigner'])) { - $ticket_assigner = $template_variables['ticket_assigner']; - } else { - $ticket_assigner = null; - } - if (isset($template_variables['ticket_link_with_number'])) { - $ticket_link_with_number = $template_variables['ticket_link_with_number']; - } else { - $ticket_link_with_number = null; - } - if (isset($template_variables['system_from'])) { - $system_from = $template_variables['system_from']; - } else { - $system_from = $this->company(); - } - if (isset($template_variables['system_link'])) { - $system_link = $template_variables['system_link']; - } else { - $system_link = url('/'); - } - if (isset($template_variables['system_error'])) { - $system_error = $template_variables['system_error']; - } else { - $system_error = null; - } - if (isset($template_variables['agent_sign'])) { - $agent_sign = $template_variables['agent_sign']; - } else { - $agent_sign = null; - } - if (isset($template_variables['department_sign'])) { - $department_sign = $template_variables['department_sign']; - } else { - $department_sign = null; - } - if (isset($template_variables['password_reset_link'])) { - $password_reset_link = $template_variables['password_reset_link']; - } else { - $password_reset_link = null; - } - if (isset($template_variables['user_password'])) { - $user_password = $template_variables['user_password']; - } else { - $user_password = null; - } - if (isset($template_variables['email_address'])) { - $email_address = $template_variables['email_address']; - } else { - $email_address = null; - } - if (isset($template_variables['user'])) { - $user = $template_variables['user']; - } else { - $user = null; - } + if (isset($template_variables['ticket_agent_name'])) { + $ticket_agent_name = $template_variables['ticket_agent_name']; + } else { + $ticket_agent_name = null; + } + if (isset($template_variables['ticket_number'])) { + $ticket_number = $template_variables['ticket_number']; + } else { + $ticket_number = null; + } + if (isset($template_variables['ticket_client_name'])) { + $ticket_client_name = $template_variables['ticket_client_name']; + } else { + $ticket_client_name = null; + } + if (isset($template_variables['ticket_client_email'])) { + $ticket_client_email = $template_variables['ticket_client_email']; + } else { + $ticket_client_email = null; + } + if (isset($template_variables['ticket_body'])) { + $ticket_body = $template_variables['ticket_body']; + } else { + $ticket_body = null; + } + if (isset($template_variables['ticket_assigner'])) { + $ticket_assigner = $template_variables['ticket_assigner']; + } else { + $ticket_assigner = null; + } + if (isset($template_variables['ticket_link_with_number'])) { + $ticket_link_with_number = $template_variables['ticket_link_with_number']; + } else { + $ticket_link_with_number = null; + } + if (isset($template_variables['system_from'])) { + $system_from = $template_variables['system_from']; + } else { + $system_from = $this->company(); + } + if (isset($template_variables['system_link'])) { + $system_link = $template_variables['system_link']; + } else { + $system_link = url('/'); + } + if (isset($template_variables['system_error'])) { + $system_error = $template_variables['system_error']; + } else { + $system_error = null; + } + if (isset($template_variables['agent_sign'])) { + $agent_sign = $template_variables['agent_sign']; + } else { + $agent_sign = null; + } + if (isset($template_variables['department_sign'])) { + $department_sign = $template_variables['department_sign']; + } else { + $department_sign = null; + } + if (isset($template_variables['password_reset_link'])) { + $password_reset_link = $template_variables['password_reset_link']; + } else { + $password_reset_link = null; + } + if (isset($template_variables['user_password'])) { + $user_password = $template_variables['user_password']; + } else { + $user_password = null; + } + if (isset($template_variables['email_address'])) { + $email_address = $template_variables['email_address']; + } else { + $email_address = null; + } + if (isset($template_variables['user'])) { + $user = $template_variables['user']; + } else { + $user = null; + } // $system_link = url('/'); @@ -174,9 +177,9 @@ class PhpMailController extends Controller { $mail = new \PHPMailer(); - $status = \DB::table('settings_email')->first(); + $status = \DB::table('settings_email')->first(); - $path2 = \Config::get('view.paths'); + $path2 = \Config::get('view.paths'); // $directory = $path2[0].DIRECTORY_SEPARATOR.'emails'.DIRECTORY_SEPARATOR.$status->template.DIRECTORY_SEPARATOR; // @@ -186,31 +189,31 @@ class PhpMailController extends Controller { $template = TemplateType::where('name', '=', $template)->first(); - $set = \App\Model\Common\TemplateSet::where('name', '=', $status->template)->first(); + $set = \App\Model\Common\TemplateSet::where('name', '=', $status->template)->first(); - if (isset($set['id'])) { - $template_data = \App\Model\Common\Template::where('set_id', '=', $set->id)->where('type', '=', $template->id)->first(); - $contents = $template_data->message; - if ($template_data->variable == 1) { - if ($template_data->subject) { - $subject = $template_data->subject; - if ($ticket_number != null) { - $subject = $subject . ' [#' . $ticket_number . ']'; - } - } else { - $subject = $message['subject']; + if (isset($set['id'])) { + $template_data = \App\Model\Common\Template::where('set_id', '=', $set->id)->where('type', '=', $template->id)->first(); + $contents = $template_data->message; + if ($template_data->variable == 1) { + if ($template_data->subject) { + $subject = $template_data->subject; + if ($ticket_number != null) { + $subject = $subject.' [#'.$ticket_number.']'; } } else { $subject = $message['subject']; } } else { - $contents = null; - $subject = null; + $subject = $message['subject']; } + } else { + $contents = null; + $subject = null; + } - $variables = ['{!!$user!!}', '{!!$agent!!}', '{!!$ticket_number!!}', '{!!$content!!}', '{!!$from!!}', '{!!$ticket_agent_name!!}', '{!!$ticket_client_name!!}', '{!!$ticket_client_email!!}', '{!!$ticket_body!!}', '{!!$ticket_assigner!!}', '{!!$ticket_link_with_number!!}', '{!!$system_error!!}', '{!!$agent_sign!!}', '{!!$department_sign!!}', '{!!$password_reset_link!!}', '{!!$email_address!!}', '{!!$user_password!!}', '{!!$system_from!!}', '{!!$system_link!!}']; + $variables = ['{!!$user!!}', '{!!$agent!!}', '{!!$ticket_number!!}', '{!!$content!!}', '{!!$from!!}', '{!!$ticket_agent_name!!}', '{!!$ticket_client_name!!}', '{!!$ticket_client_email!!}', '{!!$ticket_body!!}', '{!!$ticket_assigner!!}', '{!!$ticket_link_with_number!!}', '{!!$system_error!!}', '{!!$agent_sign!!}', '{!!$department_sign!!}', '{!!$password_reset_link!!}', '{!!$email_address!!}', '{!!$user_password!!}', '{!!$system_from!!}', '{!!$system_link!!}']; - $data = [$user, $agent, $ticket_number, $content, $from, $ticket_agent_name, $ticket_client_name, $ticket_client_email, $ticket_body, $ticket_assigner, $ticket_link_with_number, $system_error, $agent_sign, $department_sign, $password_reset_link, $email_address, $user_password, $system_from, $system_link]; + $data = [$user, $agent, $ticket_number, $content, $from, $ticket_agent_name, $ticket_client_name, $ticket_client_email, $ticket_body, $ticket_assigner, $ticket_link_with_number, $system_error, $agent_sign, $department_sign, $password_reset_link, $email_address, $user_password, $system_from, $system_link]; // dd($variables,$data,$contents); // $messagebody = str_replace($variables, $data, $contents); @@ -241,7 +244,7 @@ class PhpMailController extends Controller { $mail->setFrom($username, $fromname); } } - $mail->addAddress($recipants); // Add a recipient + $mail->addAddress($recipants); // Add a recipient $mail->isHTML(true); // Set email format to HTML if ($cc != null) { foreach ($cc as $collaborator) { @@ -253,37 +256,37 @@ class PhpMailController extends Controller { } } - if ($attachment != null) { - $size = count($message['attachments']); - $attach = $message['attachments']; - for ($i = 0; $i < $size; $i++) { - $file_path = $attach[$i]->getRealPath(); - $file_name = $attach[$i]->getClientOriginalName(); - $mail->addAttachment($file_path, $file_name); - } - } - $mail->CharSet = "utf8"; - $mail->Subject = $subject; - if ($template == 'ticket-reply-agent') { - $line = '---Reply above this line---

    '; - $body = $line . $messagebody; - } else { - $body = $messagebody; - } - $rtl = CommonSettings::where('option_name', '=', 'enable_rtl')->first(); - if($rtl->option_value == 1) { - $mail->ContentType = 'text/html'; - $body = '' . $body . ''; - } else { - } - $mail->Body = nl2br($body); - - if (!$mail->send()) { - return; - } else { - return 1; + if ($attachment != null) { + $size = count($message['attachments']); + $attach = $message['attachments']; + for ($i = 0; $i < $size; $i++) { + $file_path = $attach[$i]->getRealPath(); + $file_name = $attach[$i]->getClientOriginalName(); + $mail->addAttachment($file_path, $file_name); } } + $mail->CharSet = 'utf8'; + $mail->Subject = $subject; + if ($template == 'ticket-reply-agent') { + $line = '---Reply above this line---

    '; + $body = $line.$messagebody; + } else { + $body = $messagebody; + } + $rtl = CommonSettings::where('option_name', '=', 'enable_rtl')->first(); + if ($rtl->option_value == 1) { + $mail->ContentType = 'text/html'; + $body = ''.$body.''; + } else { + } + $mail->Body = nl2br($body); + + if (!$mail->send()) { + return; + } else { + return 1; + } + } } /** @@ -291,7 +294,8 @@ class PhpMailController extends Controller { * * @return MailNotification */ - public function sendEmail($from, $to, $message) { + public function sendEmail($from, $to, $message) + { try { $from_address = $this->fetch_smtp_details($from); if ($from_address == null) { @@ -403,7 +407,7 @@ class PhpMailController extends Controller { $mail->addAttachment($file_path, $file_name); } } - $mail->CharSet = "utf8"; + $mail->CharSet = 'utf8'; $mail->Subject = $subject; $mail->Body = $content; if (!$mail->send()) { @@ -411,9 +415,9 @@ class PhpMailController extends Controller { } } } catch (Exception $e) { - if($e instanceof ErrorException) { + if ($e instanceof ErrorException) { return \Lang::get('lang.outgoing_email_failed'); - } + } } } @@ -422,7 +426,8 @@ class PhpMailController extends Controller { * * @return type */ - public function company() { + public function company() + { $company = Company::Where('id', '=', '1')->first(); if ($company->company_name == null) { $company = 'Support Center'; @@ -441,7 +446,8 @@ class PhpMailController extends Controller { * * @return type integer */ - public function mailfrom($reg, $dept_id) { + public function mailfrom($reg, $dept_id) + { $email = Email::where('id', '=', '1')->first(); if ($reg == 1) { return $email->sys_email; @@ -454,5 +460,4 @@ class PhpMailController extends Controller { } } } - -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Common/PushNotificationController.php b/app/Http/Controllers/Common/PushNotificationController.php index 4cea01cdd..3d7d4cd70 100644 --- a/app/Http/Controllers/Common/PushNotificationController.php +++ b/app/Http/Controllers/Common/PushNotificationController.php @@ -5,39 +5,35 @@ namespace App\Http\Controllers\Common; // Controllers use App\Http\Controllers\Controller; // Requests -use Illuminate\Http\Request; -// Models use App\User; -// classes -use LaravelFCM\Message\PayloadNotificationBuilder; -use LaravelFCM\Message\Topics; -use LaravelFCM\Message\OptionsBuilder; -use LaravelFCM\Message\PayloadDataBuilder; -use LaravelFCM\Response\DownstreamResponse; +// Models use FCM; -use FCMGroup; - +// classes +use Illuminate\Http\Request; /** * ********************************************** * PushNotificationController * ********************************************** - * This controller is used to send notification to FCM cloud which later will - * foreward notification to Mobile Application + * This controller is used to send notification to FCM cloud which later will + * foreward notification to Mobile Application. * * @author Ladybird */ -class PushNotificationController extends Controller { - - public function response($token, User $user) { +class PushNotificationController extends Controller +{ + public function response($token, User $user) + { } - + /** * function to get the fcm token from the api under a user. + * * @param \Illuminate\Http\Request $request + * * @return type */ - public function fcmToken(Request $request, User $user) { + public function fcmToken(Request $request, User $user) + { } - } diff --git a/app/Http/Controllers/Common/SettingsController.php b/app/Http/Controllers/Common/SettingsController.php index be394b1a5..90894c503 100644 --- a/app/Http/Controllers/Common/SettingsController.php +++ b/app/Http/Controllers/Common/SettingsController.php @@ -11,7 +11,6 @@ use App\Model\helpdesk\Email\Smtp; // models use App\Model\helpdesk\Settings\Plugin; use App\Model\helpdesk\Theme\Widgets; -use App\Model\helpdesk\Utility\Version_Check; use Config; // classes use Crypt; @@ -27,14 +26,15 @@ use Lang; * *************************** * Controller to keep smtp details and fetch where ever needed. */ -class SettingsController extends Controller { - +class SettingsController extends Controller +{ /** * Create a new controller instance. * * @return type void */ - public function __construct() { + public function __construct() + { $this->middleware('auth'); $this->middleware('roles'); } @@ -44,7 +44,8 @@ class SettingsController extends Controller { * * @return response */ - public function widgets() { + public function widgets() + { return view('themes.default1.admin.helpdesk.theme.widgets'); } @@ -53,7 +54,8 @@ class SettingsController extends Controller { * * @return response */ - public function list_widget() { + public function list_widget() + { return \Datatable::collection(Widgets::where('id', '<', '7')->get()) ->searchColumns('name') ->orderColumns('name', 'title', 'value') @@ -67,33 +69,33 @@ class SettingsController extends Controller { return $model->value; }) ->addColumn('Actions', function ($model) { - return '' . \Lang::get('lang.edit') . ' -     '; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + echo ''; echo ''; } echo '
    ' . $value->getMethods()[0] . '' . $value->getName() . '' . $value->getPath() . '' . $value->getActionName() . ''.$value->getMethods()[0].''.$value->getName().''.$value->getPath().''.$value->getActionName().'
    '; @@ -812,22 +812,22 @@ Route::group(['middleware' => ['web']], function () { Breadcrumbs::register('error404', function ($breadcrumbs) { $breadcrumbs->push('404'); }); - - Route::get('error-in-database-connection', ['as' => 'errordb', function() { + + Route::get('error-in-database-connection', ['as' => 'errordb', function () { return view('errors.db'); }]); - + Breadcrumbs::register('errordb', function ($breadcrumbs) { $breadcrumbs->push('Error establishing connection to database'); - }); - - Route::get('unauthorized', ['as' => 'unauth', function() { + }); + + Route::get('unauthorized', ['as' => 'unauth', function () { return view('errors.unauth'); }]); - + Breadcrumbs::register('unauth', function ($breadcrumbs) { $breadcrumbs->push('Unauthorized Access'); - }); + }); Route::get('board-offline', ['as' => 'board.offline', function () { return view('errors.offline'); }]); @@ -935,7 +935,7 @@ Route::group(['middleware' => ['web']], function () { Route::get('get-articles', ['as' => 'api.article', 'uses' => 'Agent\kb\ArticleController@getData']); Route::get('get-categorys', ['as' => 'api.category', 'uses' => 'Agent\kb\CategoryController@getData']); Route::get('get-comment', ['as' => 'api.comment', 'uses' => 'Agent\kb\SettingsController@getData']); - + Route::post('image', 'Agent\kb\SettingsController@image'); Route::get('direct', function () { return view('direct'); @@ -1090,7 +1090,7 @@ Route::group(['middleware' => ['web']], function () { Route::get('ticket/customers-custom', 'Api\v1\TestController@getCustomersWith'); Route::get('generate/token', 'Api\v1\TestController@generateToken'); Route::get('get/user', 'Api\v1\TestController@getAuthUser'); - + /* * FCM token response */ @@ -1110,9 +1110,8 @@ Route::group(['middleware' => ['web']], function () { $api_control = new \App\Http\Controllers\Common\ApiSettings(); $api_control->ticketDetailEvent($details); }); - - - + + + Route::get('test', ['as' => 'test', 'uses' => 'Common\PushNotificationController@response']); - -}); \ No newline at end of file +}); diff --git a/app/Jobs/SendEmail.php b/app/Jobs/SendEmail.php index 78c8cb58c..59d1cd60a 100644 --- a/app/Jobs/SendEmail.php +++ b/app/Jobs/SendEmail.php @@ -2,20 +2,20 @@ namespace App\Jobs; -use App\Jobs\Job; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Contracts\Queue\ShouldQueue; use App\Http\Controllers\Common\PhpMailController; +use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class SendEmail extends Job implements ShouldQueue { use InteractsWithQueue, SerializesModels; - - + + protected $from; protected $to; protected $message; + /** * Create a new job instance. * diff --git a/app/Model/helpdesk/Form/FieldValue.php b/app/Model/helpdesk/Form/FieldValue.php index 378f90715..867d9c653 100644 --- a/app/Model/helpdesk/Form/FieldValue.php +++ b/app/Model/helpdesk/Form/FieldValue.php @@ -6,8 +6,6 @@ use Illuminate\Database\Eloquent\Model; class FieldValue extends Model { - protected $table = "field_values"; - protected $fillable = ['field_id','parent_id','field_key','field_value']; - - + protected $table = 'field_values'; + protected $fillable = ['field_id', 'parent_id', 'field_key', 'field_value']; } diff --git a/app/Model/helpdesk/Form/Fields.php b/app/Model/helpdesk/Form/Fields.php index cb2521cde..4e967d839 100644 --- a/app/Model/helpdesk/Form/Fields.php +++ b/app/Model/helpdesk/Form/Fields.php @@ -4,8 +4,8 @@ namespace App\Model\helpdesk\Form; use App\BaseModel; -class Fields extends BaseModel { - +class Fields extends BaseModel +{ protected $table = 'custom_form_fields'; /** @@ -15,17 +15,22 @@ class Fields extends BaseModel { */ protected $fillable = ['forms_id', 'label', 'name', 'type', 'value', 'required']; - public function valueRelation() { + public function valueRelation() + { $related = "App\Model\helpdesk\Form\FieldValue"; + return $this->hasMany($related, 'field_id'); } - public function values() { + public function values() + { $value = $this->valueRelation(); + return $value; } - public function deleteValues() { + public function deleteValues() + { $values = $this->values()->get(); if ($values->count() > 0) { foreach ($values as $value) { @@ -34,9 +39,8 @@ class Fields extends BaseModel { } } - public function delete() { - + public function delete() + { parent::delete(); } - } diff --git a/app/Model/helpdesk/Form/Forms.php b/app/Model/helpdesk/Form/Forms.php index 3b6db99cd..e8d1cdb86 100644 --- a/app/Model/helpdesk/Form/Forms.php +++ b/app/Model/helpdesk/Form/Forms.php @@ -14,50 +14,59 @@ class Forms extends BaseModel * @var array */ protected $fillable = ['formname']; - - - public function fieldRelation(){ + + public function fieldRelation() + { $related = "App\Model\helpdesk\Form\Fields"; + return $this->hasMany($related); } - - public function fields(){ + + public function fields() + { $relation = $this->fieldRelation()->get(); - return $relation; + + return $relation; } - - public function fieldsDelete(){ + + public function fieldsDelete() + { $fields = $this->fields(); - if($fields->count()>0){ - foreach($fields as $field){ + if ($fields->count() > 0) { + foreach ($fields as $field) { $field->delete(); } } } - - public function formValueRelation(){ + + public function formValueRelation() + { $related = "App\Model\helpdesk\Form\FieldValue"; - return $this->hasMany($related,'child_id'); + + return $this->hasMany($related, 'child_id'); } - - public function formValueChild(){ + + public function formValueChild() + { $childs = $this->formValueRelation()->get(); + return $childs; } - - public function deleteFormChild(){ + + public function deleteFormChild() + { $childs = $this->formValueChild(); - if($childs->count()>0){ - foreach ($childs as $child){ - $child->child_id = NULL; + if ($childs->count() > 0) { + foreach ($childs as $child) { + $child->child_id = null; $child->save(); } } } - - public function delete() { + + public function delete() + { $this->fieldsDelete(); parent::delete(); } - } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index d7b6832d5..fc586799f 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -50,7 +50,7 @@ class AppServiceProvider extends ServiceProvider \View::composer('themes.default1.update.notification', function () { $notification = new BarNotification(); $not = [ - 'notification' => $notification->where('value','!=','')->get(), + 'notification' => $notification->where('value', '!=', '')->get(), ]; view()->share($not); }); diff --git a/app/User.php b/app/User.php index 00fc6681a..33cd31580 100644 --- a/app/User.php +++ b/app/User.php @@ -28,7 +28,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon protected $fillable = ['user_name', 'email', 'password', 'active', 'first_name', 'last_name', 'ban', 'ext', 'mobile', 'profile_pic', 'phone_number', 'company', 'agent_sign', 'account_type', 'account_status', 'assign_group', 'primary_dpt', 'agent_tzone', 'daylight_save', 'limit_access', - 'directory_listing', 'vacation_mode', 'role', 'internal_note', 'country_code','fcm_token' ]; + 'directory_listing', 'vacation_mode', 'role', 'internal_note', 'country_code', 'fcm_token', ]; /** * The attributes excluded from the model's JSON form. diff --git a/config/app.php b/config/app.php index d260b815c..ddf206e11 100644 --- a/config/app.php +++ b/config/app.php @@ -137,15 +137,15 @@ return [ 'Illuminate\Broadcasting\BroadcastServiceProvider', 'DaveJamesMiller\Breadcrumbs\ServiceProvider', - + /* * Laravel Framework Service Providers... */ - // - + // + 'Illuminate\Auth\AuthServiceProvider', 'Illuminate\Bus\BusServiceProvider', @@ -187,7 +187,7 @@ return [ 'Tymon\JWTAuth\Providers\JWTAuthServiceProvider', 'Torann\GeoIP\GeoIPServiceProvider', - LaravelFCM\FCMServiceProvider::class, + LaravelFCM\FCMServiceProvider::class, Barryvdh\Debugbar\ServiceProvider::class, ], /* @@ -250,7 +250,7 @@ return [ 'Image' => Intervention\Image\Facades\Image::class, 'FCM' => LaravelFCM\Facades\FCM::class, 'FCMGroup' => LaravelFCM\Facades\FCMGroup::class, - 'Debugbar' => Barryvdh\Debugbar\Facade::class, + 'Debugbar' => Barryvdh\Debugbar\Facade::class, ], 'name' => 'faveo helpdesk community', -]; \ No newline at end of file +]; diff --git a/config/debugbar.php b/config/debugbar.php index dcfacea7c..fae0739bb 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -1,6 +1,6 @@ array( + 'storage' => [ 'enabled' => true, 'driver' => 'file', // redis, file, pdo, custom 'path' => storage_path('debugbar'), // For file driver 'connection' => null, // Leave null for default connection (Redis/PDO) - 'provider' => '' // Instance of StorageInterface for custom driver - ), + 'provider' => '', // Instance of StorageInterface for custom driver + ], /* |-------------------------------------------------------------------------- @@ -82,7 +82,7 @@ return array( | */ - 'collectors' => array( + 'collectors' => [ 'phpinfo' => true, // Php version 'messages' => true, // Messages 'time' => true, // Time Datalogger @@ -103,7 +103,7 @@ return array( 'auth' => false, // Display Laravel authentication status 'gate' => false, // Display Laravel Gate checks 'session' => true, // Display session data - ), + ], /* |-------------------------------------------------------------------------- @@ -114,33 +114,33 @@ return array( | */ - 'options' => array( - 'auth' => array( + 'options' => [ + 'auth' => [ 'show_name' => false, // Also show the users name/email in the debugbar - ), - 'db' => array( + ], + 'db' => [ 'with_params' => true, // Render SQL with the parameters substituted 'timeline' => false, // Add the queries to the timeline 'backtrace' => false, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files. - 'explain' => array( // EXPERIMENTAL: Show EXPLAIN output on queries + 'explain' => [ // EXPERIMENTAL: Show EXPLAIN output on queries 'enabled' => false, - 'types' => array('SELECT'), // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ - ), + 'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ + ], 'hints' => true, // Show hints for common mistakes - ), - 'mail' => array( - 'full_log' => false - ), - 'views' => array( + ], + 'mail' => [ + 'full_log' => false, + ], + 'views' => [ 'data' => false, //Note: Can slow down the application, because the data can be quite large.. - ), - 'route' => array( - 'label' => true // show complete route on bar - ), - 'logs' => array( - 'file' => null - ), - ), + ], + 'route' => [ + 'label' => true, // show complete route on bar + ], + 'logs' => [ + 'file' => null, + ], + ], /* |-------------------------------------------------------------------------- @@ -167,4 +167,4 @@ return array( */ 'route_prefix' => '_debugbar', -); +]; diff --git a/config/fcm.php b/config/fcm.php index 3257f353d..51b5668d4 100644 --- a/config/fcm.php +++ b/config/fcm.php @@ -1,14 +1,14 @@ env('FCM_PROTOCOL','http'), + 'driver' => env('FCM_PROTOCOL', 'http'), 'log_enabled' => true, 'http' => [ - 'server_key' => env('FCM_SERVER_KEY','Your FCM server key'), - 'sender_id' => env('FCM_SENDER_ID', 'Your sender id'), - 'server_send_url' => 'https://fcm.googleapis.com/fcm/send', + 'server_key' => env('FCM_SERVER_KEY', 'Your FCM server key'), + 'sender_id' => env('FCM_SENDER_ID', 'Your sender id'), + 'server_send_url' => 'https://fcm.googleapis.com/fcm/send', 'server_group_url' => 'https://android.googleapis.com/gcm/notification', - 'timeout' => 30.0, // in second - ] + 'timeout' => 30.0, // in second + ], ]; diff --git a/database/migrations/2016_06_28_141613_version1079table.php b/database/migrations/2016_06_28_141613_version1079table.php index d04218e84..c085a6c34 100644 --- a/database/migrations/2016_06_28_141613_version1079table.php +++ b/database/migrations/2016_06_28_141613_version1079table.php @@ -1,6 +1,5 @@ where('id', '=', '1')->first(); - if($settings_system != null) { + if ($settings_system != null) { DB::table('settings_system')->insert(['version' => $current_version]); DB::table('common_settings') ->insert( ['option_name' => 'enable_rtl', 'option_value' => ''], ['option_name' => 'user_set_ticket_status', 'status' => 1] - ); + ); } - } - } diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index d60082b53..ac1c516ae 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -26,6 +26,7 @@ use App\Model\helpdesk\Utility\CountryCode; use App\Model\helpdesk\Utility\Date_format; use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Languages; +use App\Model\helpdesk\Utility\Limit_Login; use App\Model\helpdesk\Utility\Log_notification; use App\Model\helpdesk\Utility\MailboxProtocol; use App\Model\helpdesk\Utility\Time_format; @@ -33,7 +34,6 @@ use App\Model\helpdesk\Utility\Timezones; use App\Model\helpdesk\Utility\Version_Check; use App\Model\helpdesk\Workflow\WorkflowClose; use App\Model\kb\Settings; -use App\Model\helpdesk\Utility\Limit_Login; use App\Model\Update\BarNotification; // Knowledge base use Illuminate\Database\Seeder; @@ -1977,7 +1977,7 @@ class DatabaseSeeder extends Seeder Security::create(['id' => '1', 'lockout_message' => 'You have been locked out of application due to too many failed login attempts.', 'backlist_offender' => '0', 'backlist_threshold' => '15', 'lockout_period' => '15', 'days_to_keep_logs' => '0']); - Limit_Login::create(['id'=>'1']); + Limit_Login::create(['id' => '1']); TemplateSet::create(['id' => '1', 'name' => 'default', 'active' => '1']); diff --git a/public/ckeditor/samples/old/assets/posteddata.php b/public/ckeditor/samples/old/assets/posteddata.php index 7006ce62f..2baa84ed6 100644 --- a/public/ckeditor/samples/old/assets/posteddata.php +++ b/public/ckeditor/samples/old/assets/posteddata.php @@ -35,13 +35,10 @@ if (!empty($_POST)) { $value = htmlspecialchars(stripslashes((string) $value)); } else { $value = htmlspecialchars((string) $value); - } - ?> + } ?> - -
    + +
    'We are sorry, but the page you are looking for can not be found.', 'go_back' => 'Go Back', 'the_board_is_offline' => 'The Board is Offline', - 'error_establishing_connection_to_database' => 'Error establishing connection to database', + 'error_establishing_connection_to_database' => 'Error establishing connection to database', 'unauthorized_access' => 'Unauthorized Access', /* |-------------------------------------- @@ -285,7 +285,7 @@ return [ 'Ticket-has-been-created-successfully-your-ticket-number-is' => 'Ticket has been created successfully, your ticket number is', 'Please-save-this-for-future-reference' => 'Please save this for future reference', 'rtl' => 'RTL (Right to left)', - 'the_rtl_support_is_only_applicable_to_the_outgoing_mails' => 'The RTL support is only applicable to the outgoing mails', + 'the_rtl_support_is_only_applicable_to_the_outgoing_mails' => 'The RTL support is only applicable to the outgoing mails', 'user_set_ticket_status' => 'Allow users to set ticket status', /* |-------------------------------------- @@ -435,7 +435,7 @@ return [ | Language page |------------------------------------------------ */ - 'default' => 'default', + 'default' => 'default', 'language-settings' => 'Language Settings', 'iso-code' => 'ISO-CODE', 'download' => 'Downlaod', @@ -458,7 +458,7 @@ return [ 'lang-doesnot-exist' => 'Language package does not exist.', 'active-lang-error' => 'Language package can not be deleted when it is active.', 'language-error' => 'Language package not found in your lang directroy.', - 'lang-fallback-lang' => 'Cannot delete system\'s defualt fallback language', + 'lang-fallback-lang' => 'Cannot delete system\'s defualt fallback language', /* |-------------------------------------- @@ -474,7 +474,7 @@ return [ 'plugin-path-missing' => 'Plugin File Path is not exist', 'no-plugin-file' => 'Their is no ', 'plugin-config-missing' => 'Their is no config.php or ServiceProvider.php', - + /* |---------------------------------------------------------------------------------------- | Manage Pages [English(en)] @@ -1007,7 +1007,7 @@ return [ 'organization_profile' => 'Organization Profile', 'organization-s_head' => "Organization's Head", 'select_department_manager' => 'Select Department Manager', - 'select_organization_manager' => "Select Organization Manager", + 'select_organization_manager' => 'Select Organization Manager', 'users_of' => 'Users of', 'organization_created_successfully' => 'Organization Created Successfully', 'organization_can_not_create' => 'Organization can not Create',