From 776289bde68ac4fec207a90ff270ad331beb4d01 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Mon, 13 Aug 2018 13:11:15 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Http/Controllers/Common/CommonMailer.php | 11 +++++++---- app/Http/Controllers/Common/PhpMailController.php | 5 ++--- resources/lang/en/lang.php | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Common/CommonMailer.php b/app/Http/Controllers/Common/CommonMailer.php index f2f8cd474..4daf61ddf 100644 --- a/app/Http/Controllers/Common/CommonMailer.php +++ b/app/Http/Controllers/Common/CommonMailer.php @@ -13,22 +13,25 @@ class CommonMailer return false; } $https = []; - $https['ssl']['verify_peer'] = FALSE; - $https['ssl']['verify_peer_name'] = FALSE; - $transport = new \Swift_SmtpTransport($config['host'], $config['port'], $config['security']); + $https['ssl']['verify_peer'] = false; + $https['ssl']['verify_peer_name'] = false; + $transport = new \Swift_SmtpTransport($config['host'], $config['port'], $config['security']); $transport->setUsername($config['username']); $transport->setPassword($config['password']); $transport->setStreamOptions($https); - $set = new \Swift_Mailer($transport); + $set = new \Swift_Mailer($transport); // Set the mailer \Mail::setSwiftMailer($set); + return true; } catch (Exception $e) { loging($e->getMessage()); + return $e->getMessage(); } } + public function setMailGunDriver($config) { if (!$config) { diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index 6a8190ce0..6e3781370 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -19,12 +19,11 @@ class PhpMailController extends Controller /** *@var variable to instantiate common mailer class */ - public function __construct() { - $this->commonMailer = new CommonMailer; + $this->commonMailer = new CommonMailer(); } - + public function fetch_smtp_details($id) { $emails = Emails::where('id', '=', $id)->first(); diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 443de7feb..4bf5a65f9 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1592,7 +1592,7 @@ return [ 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', //updated 15-5-2017 'session-expired' => 'Session expired or invalid, please try again.', - + //update since v1.10 'your_helpdesk_is_ready' => 'Your Helpdesk is Ready!', 'all_right_sparky_you_have_made_it' => 'All right, sparky! You’ve made it through the installation.',