cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #226 from ladybirdweb/analysis-8jVL2r

Browse Source 
Applied fixes from StyleCI
This commit is contained in:
Manish Verma
2016-09-28 13:33:54 +05:30
committed by GitHub
parent 6f1831e58b ccce4b97c6
commit 299c3f8108
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Client/helpdesk/ClientTicketController.php
View File

@@ -87,6 +87,7 @@ class ClientTicketController extends Controller
$inline_attachment = null; $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); $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')); return \Redirect::back()->with('success1', Lang::get('lang.successfully_replied'));
} }
} }

5
app/Http/Controllers/Client/helpdesk/FormController.php
View File

@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Client\helpdesk;
// controllers // controllers
use App\Http\Controllers\Agent\helpdesk\TicketWorkflowController; use App\Http\Controllers\Agent\helpdesk\TicketWorkflowController;
use App\Http\Controllers\Controller;
use App\Http\Controllers\Common\FileuploadController; use App\Http\Controllers\Common\FileuploadController;
use App\Http\Controllers\Controller;
// requests // requests
use App\Http\Requests\helpdesk\ClientRequest; use App\Http\Requests\helpdesk\ClientRequest;
use App\Model\helpdesk\Agent\Department; use App\Model\helpdesk\Agent\Department;
@@ -75,6 +75,7 @@ class FormController extends Controller
$fileupload = $fileupload->file_upload_max_size(); $fileupload = $fileupload->file_upload_max_size();
$max_size_in_bytes = $fileupload[0]; $max_size_in_bytes = $fileupload[0];
$max_size_in_actual = $fileupload[1]; $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); return view('themes.default1.client.helpdesk.form', compact('topics', 'codes', 'max_size_in_bytes', 'max_size_in_actual'))->with('phonecode', $phonecode);
} else { } else {
return \Redirect::route('home'); return \Redirect::route('home');
@@ -194,7 +195,7 @@ class FormController extends Controller
} }
} }
// this param is used for inline attachments via email // this param is used for inline attachments via email
if(empty($attachments)) { if (empty($attachments)) {
$inline_attachment = $attachments; $inline_attachment = $attachments;
} else { } else {
$inline_attachment = null; $inline_attachment = null;

10
app/Http/Controllers/Common/PhpMailController.php
View File

@@ -277,23 +277,23 @@ class PhpMailController extends Controller
if ($add_embedded_images != null) { if ($add_embedded_images != null) {
// dd($add_embedded_images); // dd($add_embedded_images);
foreach ($add_embedded_images as $add_embedded_image) { 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; $cid = $add_embedded_image->id;
} else { } else {
$cid = null; $cid = null;
} }
if(isset($add_embedded_image->name)) { if (isset($add_embedded_image->name)) {
$file_name = $add_embedded_image->name; $file_name = $add_embedded_image->name;
} else { } else {
$file_name = null; $file_name = null;
} }
if(isset($add_embedded_image->filePath)) { if (isset($add_embedded_image->filePath)) {
$file_path = $add_embedded_image->filePath; $file_path = $add_embedded_image->filePath;
} else { } else {
$file_path = null; $file_path = null;
} }
if(isset($add_embedded_image->disposition)) { if (isset($add_embedded_image->disposition)) {
if($add_embedded_image->disposition == 'INLINE') { if ($add_embedded_image->disposition == 'INLINE') {
$mail->AddEmbeddedImage($file_path, $cid, $file_name); $mail->AddEmbeddedImage($file_path, $cid, $file_name);
} else { } else {
$mail->addAttachment($file_path, $file_name); $mail->addAttachment($file_path, $file_name);