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

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Manish Verma
2018-08-13 13:11:15 +00:00
committed by StyleCI Bot
parent 2f6ce43fe1
commit 776289bde6
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Common/CommonMailer.php
View File

@@ -13,22 +13,25 @@ class CommonMailer
return false; return false;
} }
$https = []; $https = [];
$https['ssl']['verify_peer'] = FALSE; $https['ssl']['verify_peer'] = false;
$https['ssl']['verify_peer_name'] = FALSE; $https['ssl']['verify_peer_name'] = false;
$transport = new \Swift_SmtpTransport($config['host'], $config['port'], $config['security']); $transport = new \Swift_SmtpTransport($config['host'], $config['port'], $config['security']);
$transport->setUsername($config['username']); $transport->setUsername($config['username']);
$transport->setPassword($config['password']); $transport->setPassword($config['password']);
$transport->setStreamOptions($https); $transport->setStreamOptions($https);
$set = new \Swift_Mailer($transport); $set = new \Swift_Mailer($transport);
// Set the mailer // Set the mailer
\Mail::setSwiftMailer($set); \Mail::setSwiftMailer($set);
return true; return true;
} catch (Exception $e) { } catch (Exception $e) {
loging($e->getMessage()); loging($e->getMessage());
return $e->getMessage(); return $e->getMessage();
} }
} }
public function setMailGunDriver($config) public function setMailGunDriver($config)
{ {
if (!$config) { if (!$config) {

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

@@ -19,12 +19,11 @@ class PhpMailController extends Controller
/** /**
*@var variable to instantiate common mailer class *@var variable to instantiate common mailer class
*/ */
public function __construct() public function __construct()
{ {
$this->commonMailer = new CommonMailer; $this->commonMailer = new CommonMailer();
} }
public function fetch_smtp_details($id) public function fetch_smtp_details($id)
{ {
$emails = Emails::where('id', '=', $id)->first(); $emails = Emails::where('id', '=', $id)->first();

2
resources/lang/en/lang.php
View File

@@ -1592,7 +1592,7 @@ return [
'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
//updated 15-5-2017 //updated 15-5-2017
'session-expired' => 'Session expired or invalid, please try again.', 'session-expired' => 'Session expired or invalid, please try again.',
//update since v1.10 //update since v1.10
'your_helpdesk_is_ready' => 'Your Helpdesk is Ready!', '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.', 'all_right_sparky_you_have_made_it' => 'All right, sparky! You’ve made it through the installation.',