Bug Fixes

- Fixed loging method in CommonmailController
- Fixed mail config file
- Fixed attachment variable initalization in MailController
- Fixed sendEmail() method in PhpMailController passing empty array as default value for $template_variables
- Fixed Bugsnag reported issue for sendmail() which is happening for reports
This commit is contained in:
Manish Verma
2018-09-18 12:31:06 +05:30
committed by Manish Verma
parent 426a285431
commit e9650156bb
6 changed files with 5 additions and 23 deletions

View File

@@ -1043,7 +1043,7 @@ class FilterController extends Controller
$tz = explode(')', substr($location, stripos($location, 'T')
+ 1));
return $tz[0];
return ($tz[0] != "") ? $tz[0] : "+00:00";
}
/**

View File

@@ -200,7 +200,7 @@ class MailController extends Controller
$address = $message->getAddresses('from');
}
$collaborators = $this->collaburators($message, $email);
$attachments = $message->getAttachments();
$attachments = (!$message->getAttachments()) ? []: $message->getAttachments();
//dd(['body' => $body, 'subject' => $subject, 'address' => $address, 'cc' => $collaborator, 'attachments' => $attachments]);
$this->workflow($address, $subject, $body, $collaborators, $attachments, $email);
}

View File

@@ -26,7 +26,7 @@ class CommonMailer
return true;
} catch (Exception $e) {
loging($e->getMessage());
loging('mail-config', $e->getMessage());
return $e->getMessage();
}

View File

@@ -78,7 +78,7 @@ class PhpMailController extends Controller
$this->dispatch($job);
}
public function sendEmail($from, $to, $message, $template_variables)
public function sendEmail($from, $to, $message, $template_variables = [])
{
$from_address = $this->fetch_smtp_details($from);
if ($from_address == null) {

View File

@@ -15,7 +15,7 @@ return [
|
*/
'driver' => env('MAIL', 'smtp'),
'driver' =>env('MAIL_DRIVER', 'smtp'),
/*
|--------------------------------------------------------------------------
| SMTP Host Address

View File

@@ -1,18 +0,0 @@
APP_ENV=production
APP_DEBUG=false
APP_KEY=SomeRandomString
DB_TYPE=
DB_HOST=
DB_PORT=
DB_DATABASE=
DB_USERNAME=
DB_PASSWORD=
DB_INSTALL=%0%
MAIL_DRIVER=smtp
MAIL_HOST=mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=sync