From ccce4b97c690a271f60ff8dfaea8f859f59eaba7 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 28 Sep 2016 08:02:31 +0000 Subject: [PATCH] Applied fixes from StyleCI --- .../helpdesk/TicketWorkflowController.php | 4 ++-- .../helpdesk/ClientTicketController.php | 3 ++- .../Client/helpdesk/FormController.php | 5 +++-- .../Controllers/Common/PhpMailController.php | 20 +++++++++---------- resources/lang/en/lang.php | 8 ++++---- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/TicketWorkflowController.php b/app/Http/Controllers/Agent/helpdesk/TicketWorkflowController.php index 7fdc31442..c95dc9fc0 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketWorkflowController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketWorkflowController.php @@ -285,7 +285,7 @@ class TicketWorkflowController extends Controller */ public function checkStarts($statement, $to_check) { - if (substr($to_check, 0, strlen($statement)) == $statement) { + if (substr($to_check, 0, strlen($statement)) == $statement) { return true; } else { return false; @@ -303,7 +303,7 @@ class TicketWorkflowController extends Controller public function checkEnds($statement, $to_check) { $to_check = strip_tags($to_check); - if (substr($to_check, -strlen($statement)) == $statement) { + if (substr($to_check, -strlen($statement)) == $statement) { return true; } else { return false; diff --git a/app/Http/Controllers/Client/helpdesk/ClientTicketController.php b/app/Http/Controllers/Client/helpdesk/ClientTicketController.php index ea65cbca4..cef903cc2 100644 --- a/app/Http/Controllers/Client/helpdesk/ClientTicketController.php +++ b/app/Http/Controllers/Client/helpdesk/ClientTicketController.php @@ -83,10 +83,11 @@ class ClientTicketController extends Controller $team_assign = null; $ticket_status = null; $auto_response = 0; - + $inline_attachment = null; $this->TicketWorkflowController->workflow($fromaddress, $fromname, $subject, $body, $phone, $phonecode, $mobile_number, $helptopic, $sla, $priority, $source, $collaborator, $dept, $assign, $team_assign, $ticket_status, $form_data, $auto_response, $inline_attachment); + return \Redirect::back()->with('success1', Lang::get('lang.successfully_replied')); } } diff --git a/app/Http/Controllers/Client/helpdesk/FormController.php b/app/Http/Controllers/Client/helpdesk/FormController.php index 8fe498598..c1a2a73b7 100644 --- a/app/Http/Controllers/Client/helpdesk/FormController.php +++ b/app/Http/Controllers/Client/helpdesk/FormController.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Client\helpdesk; // controllers use App\Http\Controllers\Agent\helpdesk\TicketWorkflowController; -use App\Http\Controllers\Controller; use App\Http\Controllers\Common\FileuploadController; +use App\Http\Controllers\Controller; // requests use App\Http\Requests\helpdesk\ClientRequest; use App\Model\helpdesk\Agent\Department; @@ -75,6 +75,7 @@ class FormController extends Controller $fileupload = $fileupload->file_upload_max_size(); $max_size_in_bytes = $fileupload[0]; $max_size_in_actual = $fileupload[1]; + return view('themes.default1.client.helpdesk.form', compact('topics', 'codes', 'max_size_in_bytes', 'max_size_in_actual'))->with('phonecode', $phonecode); } else { return \Redirect::route('home'); @@ -194,7 +195,7 @@ class FormController extends Controller } } // this param is used for inline attachments via email - if(empty($attachments)) { + if (empty($attachments)) { $inline_attachment = $attachments; } else { $inline_attachment = null; diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index b6813688a..fadf38488 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -90,7 +90,7 @@ class PhpMailController extends Controller } else { $add_embedded_images = null; } - + // template variables if (Auth::user()) { $agent = Auth::user()->user_name; @@ -272,31 +272,31 @@ class PhpMailController extends Controller $mail->addAttachment($file_path, $file_name); } } - + // inline images embedded as attachments if ($add_embedded_images != null) { - // dd($add_embedded_images); + // dd($add_embedded_images); foreach ($add_embedded_images as $add_embedded_image) { - if(isset($add_embedded_image->id)) { + if (isset($add_embedded_image->id)) { $cid = $add_embedded_image->id; } else { $cid = null; } - if(isset($add_embedded_image->name)) { + if (isset($add_embedded_image->name)) { $file_name = $add_embedded_image->name; } else { $file_name = null; } - if(isset($add_embedded_image->filePath)) { + if (isset($add_embedded_image->filePath)) { $file_path = $add_embedded_image->filePath; } else { $file_path = null; } - if(isset($add_embedded_image->disposition)) { - if($add_embedded_image->disposition == 'INLINE') { + if (isset($add_embedded_image->disposition)) { + if ($add_embedded_image->disposition == 'INLINE') { $mail->AddEmbeddedImage($file_path, $cid, $file_name); } else { - $mail->addAttachment($file_path, $file_name); + $mail->addAttachment($file_path, $file_name); } } else { $file_path = $add_embedded_image->getRealPath(); @@ -305,7 +305,7 @@ class PhpMailController extends Controller } } } - + $mail->CharSet = 'utf8'; $mail->Subject = $subject; if ($template == 'ticket-reply-agent') { diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 0c239fdd7..cadf3cd3b 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1394,12 +1394,12 @@ return [ 'use_subject' => 'Use Subject', 'reopen' => 'Reopen', 'invalid_attempt' => 'Invalid Attempt', - + /**-------------------------------------------------------------------------------------------- * Attachment Updated * -------------------------------------------------------------------------------------------- */ - 'unable_to_load_file_type' => 'Unable to load file type', - - + 'unable_to_load_file_type' => 'Unable to load file type', + + ];