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:

committed by
Manish Verma

parent
426a285431
commit
e9650156bb
@@ -1043,7 +1043,7 @@ class FilterController extends Controller
|
|||||||
$tz = explode(')', substr($location, stripos($location, 'T')
|
$tz = explode(')', substr($location, stripos($location, 'T')
|
||||||
+ 1));
|
+ 1));
|
||||||
|
|
||||||
return $tz[0];
|
return ($tz[0] != "") ? $tz[0] : "+00:00";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -200,7 +200,7 @@ class MailController extends Controller
|
|||||||
$address = $message->getAddresses('from');
|
$address = $message->getAddresses('from');
|
||||||
}
|
}
|
||||||
$collaborators = $this->collaburators($message, $email);
|
$collaborators = $this->collaburators($message, $email);
|
||||||
$attachments = $message->getAttachments();
|
$attachments = (!$message->getAttachments()) ? []: $message->getAttachments();
|
||||||
//dd(['body' => $body, 'subject' => $subject, 'address' => $address, 'cc' => $collaborator, 'attachments' => $attachments]);
|
//dd(['body' => $body, 'subject' => $subject, 'address' => $address, 'cc' => $collaborator, 'attachments' => $attachments]);
|
||||||
$this->workflow($address, $subject, $body, $collaborators, $attachments, $email);
|
$this->workflow($address, $subject, $body, $collaborators, $attachments, $email);
|
||||||
}
|
}
|
||||||
|
@@ -26,7 +26,7 @@ class CommonMailer
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
loging($e->getMessage());
|
loging('mail-config', $e->getMessage());
|
||||||
|
|
||||||
return $e->getMessage();
|
return $e->getMessage();
|
||||||
}
|
}
|
||||||
|
@@ -78,7 +78,7 @@ class PhpMailController extends Controller
|
|||||||
$this->dispatch($job);
|
$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);
|
$from_address = $this->fetch_smtp_details($from);
|
||||||
if ($from_address == null) {
|
if ($from_address == null) {
|
||||||
|
@@ -15,7 +15,7 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'driver' => env('MAIL', 'smtp'),
|
'driver' =>env('MAIL_DRIVER', 'smtp'),
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| SMTP Host Address
|
| SMTP Host Address
|
||||||
|
18
example.env
18
example.env
@@ -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
|
|
Reference in New Issue
Block a user