From db3f749e6c0ae651ae0dd141e1f90865e123fc0f Mon Sep 17 00:00:00 2001 From: FreeScout Date: Mon, 30 Jul 2018 15:13:33 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Conversation.php | 9 ++++---- app/Customer.php | 15 +++++++------ app/Email.php | 10 +++++---- .../Controllers/ConversationsController.php | 22 +++++++++---------- app/Http/Controllers/SecureController.php | 1 - app/Mailbox.php | 3 ++- 6 files changed, 31 insertions(+), 29 deletions(-) diff --git a/app/Conversation.php b/app/Conversation.php index 32d74a579..2276b11b7 100644 --- a/app/Conversation.php +++ b/app/Conversation.php @@ -3,8 +3,6 @@ namespace App; use Illuminate\Database\Eloquent\Model; -use App\Customer; -use App\Email; class Conversation extends Model { @@ -410,7 +408,7 @@ public function setCc($emails) /** * Set BCC as JSON. */ - public function setBcc( $emails) + public function setBcc($emails) { $emails_array = self::sanitizeEmails($emails); if ($emails_array) { @@ -422,8 +420,8 @@ public function setBcc( $emails) /** * Convert list of email to array. - * - * @return + * + * @return */ public static function sanitizeEmails($emails) { @@ -441,6 +439,7 @@ public static function sanitizeEmails($emails) unset($emails_array[$i]); } } + return $emails_array; } } diff --git a/app/Customer.php b/app/Customer.php index fe5adbe65..641e6c3a6 100644 --- a/app/Customer.php +++ b/app/Customer.php @@ -3,7 +3,6 @@ namespace App; use Illuminate\Database\Eloquent\Model; -use App\Email; class Customer extends Model { @@ -469,6 +468,7 @@ public function getFullName($email_if_empty = false) return explode('@', $this->emails[0]->email)[0]; } } + return ''; } @@ -615,22 +615,23 @@ public function setWebsites(array $websites_array) /** * Create customer or get existing. - * - * @param string $email - * @param array $data [description] - * @return [type] [description] + * + * @param string $email + * @param array $data [description] + * + * @return [type] [description] */ public static function create($email, $data = []) { $email = Email::sanitizeEmail($email); if (!$email) { - return null; + return; } $email_obj = Email::where('email', $email)->first(); if ($email_obj) { $customer = $email_obj->customer; } else { - $customer = new Customer(); + $customer = new self(); $email_obj = new Email(); $email_obj->email = $email; } diff --git a/app/Email.php b/app/Email.php index c07c33c7b..998dbcf2a 100644 --- a/app/Email.php +++ b/app/Email.php @@ -14,8 +14,8 @@ class Email extends Model const TYPE_OTHER = 3; public static $types = [ - self::TYPE_WORK => 'work', - self::TYPE_HOME => 'home', + self::TYPE_WORK => 'work', + self::TYPE_HOME => 'home', self::TYPE_OTHER => 'other', ]; @@ -36,8 +36,9 @@ public function customer() /** * Sanitize email address. - * - * @param string $email + * + * @param string $email + * * @return string */ public static function sanitizeEmail($email) @@ -47,6 +48,7 @@ public static function sanitizeEmail($email) } $email = filter_var($email, FILTER_SANITIZE_EMAIL); $email = strtolower($email); + return $email; } } diff --git a/app/Http/Controllers/ConversationsController.php b/app/Http/Controllers/ConversationsController.php index 466d55772..1238bc1d8 100644 --- a/app/Http/Controllers/ConversationsController.php +++ b/app/Http/Controllers/ConversationsController.php @@ -4,13 +4,13 @@ use App\Conversation; use App\Customer; +use App\Events\ConversationStatusChanged; +use App\Events\ConversationUserChanged; use App\Folder; use App\Mailbox; use App\Thread; -use Validator; use Illuminate\Http\Request; -use App\Events\ConversationStatusChanged; -use App\Events\ConversationUserChanged; +use Validator; class ConversationsController extends Controller { @@ -276,7 +276,7 @@ public function ajax(Request $request) case 'send_reply': $mailbox = Mailbox::findOrFail($request->mailbox_id); - + if (!$response['msg'] && !$user->can('view', $mailbox)) { $response['msg'] = __('Not enough permissions'); } @@ -296,11 +296,11 @@ public function ajax(Request $request) if (!$response['msg']) { $validator = Validator::make($request->all(), [ - 'to' => 'required|string', + 'to' => 'required|string', 'subject' => 'required|string|max:998', - 'body' => 'required|string', - 'cc' => 'nullable|string', - 'bcc' => 'nullable|string', + 'body' => 'required|string', + 'cc' => 'nullable|string', + 'bcc' => 'nullable|string', ]); if ($validator->fails()) { @@ -329,11 +329,11 @@ public function ajax(Request $request) if (!$response['msg']) { $now = date('Y-m-d H:i:s'); - + if ($new) { // New conversation $customer = Customer::create($to_array[0]); - + $conversation = new Conversation(); $conversation->type = Conversation::TYPE_EMAIL; $conversation->status = $request->status; @@ -354,7 +354,7 @@ public function ajax(Request $request) $customer = $conversation->customer; } $conversation->status = $request->status; - if ((int)$request->user_id != -1) { + if ((int) $request->user_id != -1) { // Check if user has access to the current mailbox if ($mailbox->userHasAccess($request->user_id)) { $conversation->user_id = $request->user_id; diff --git a/app/Http/Controllers/SecureController.php b/app/Http/Controllers/SecureController.php index b860a8d69..b8163ff8c 100644 --- a/app/Http/Controllers/SecureController.php +++ b/app/Http/Controllers/SecureController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use App\ActivityLog; -use App\Conversation; use Illuminate\Http\Request; class SecureController extends Controller diff --git a/app/Mailbox.php b/app/Mailbox.php index 45f4898a2..28f936e97 100644 --- a/app/Mailbox.php +++ b/app/Mailbox.php @@ -285,6 +285,7 @@ public function userIdsHavingAccess() /** * Check if user has access to the mailbox. + * * @return bool */ public function userHasAccess($user_id) @@ -293,7 +294,7 @@ public function userHasAccess($user_id) if ($user && $user->isAdmin()) { return true; } else { - return (bool)$this->users()->where('users.id', $user_id)->count(); + return (bool) $this->users()->where('users.id', $user_id)->count(); } } }