Bernhard.Linz/mailGraph
1
0
Fork 0
mirror of https://github.com/moudsen/mailGraph synced 2025-10-31 17:47:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added transport none,ssl,tls to config.json as smtp_transport (v1.13)

Browse Source
This commit is contained in:
Mark Oudsen
2021-03-01 18:36:28 +01:00
parent 1fb10ed089
commit db81193e17
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.json.template
View File

@@ -14,5 +14,6 @@
"zabbix_api_pwd": "astrongpassword",
"mail_from": "sender@domain.com",
"smtp_server": "localhost",
"smtp_port": 25
"smtp_port": 25,
"smtp_transport": "none"
}

15
mailGraph.php
View File

@@ -13,6 +13,7 @@
// 1.10 2021/02/27 - Mark Oudsen - Moved all configuration outside code
// 1.11 2021/02/28 - Mark Oudsen - Bugfixes
// 1.12 2021/03/01 - Mark Oudsen - Bugfixes - Adding mail server configuration via config.json
// 1.13 2021/03/01 - Mark Oudsen - Added smtp options to encrypt none,ssl,tls
// ------------------------------------------------------------------------------------------------------
//
// (C) M.J.Oudsen, mark.oudsen@puzzl.nl
@@ -369,6 +370,10 @@
$p_smtp_port = 25;
if (isset($config['smtp_port'])) { $p_smtp_port = $config['smtp_port']; }
$p_smtp_transport = 'none';
if ((isset($config['smtp_transport'])) && ($config['smtp_transport']=='tls')) { $p_smtp_transport = 'tls'; }
if ((isset($config['smtp_transport'])) && ($config['smtp_transport']=='ssl')) { $p_smtp_transport = 'ssl'; }
// --- CONFIGURATION ---
// Script related settings
@@ -687,7 +692,15 @@
_log('# Setting up mailer');
$transport = (new Swift_SmtpTransport($p_smtp_server, $p_smtp_port));
if (($p_smtp_transport=='tls') || ($p_smtp_transport=='ssl'))
{
$transport = (new Swift_SmtpTransport($p_smtp_server, $p_smtp_port, $p_smtp_transport));
}
else
{
$transport = (new Swift_SmtpTransport($p_smtp_server, $p_smtp_port));
}
$mailer = new Swift_Mailer($transport);
$message = (new Swift_Message());