mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix alerting email issues (#8255)

Browse Source 
* Fix alerting email issues
Variable collision

* changed the wrong line
This commit is contained in:
Tony Murray
2018-02-14 23:16:51 -06:00
committed by GitHub
parent 4a0acad79a
commit 30ca1e1a2e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/pages/settings/alerting.inc.php
View File

@@ -308,7 +308,7 @@ $mail_conf = array(
),
array('name' => 'email_backend',
'descr' => 'How to deliver mail',
'options' => $config['email_backend'],
'options' => $config['email_backend_options'],
'type' => 'select',
),
array('name' => 'email_user',
@@ -346,7 +346,7 @@ $mail_conf = array(
array('name' => 'email_smtp_secure',
'descr' => 'SMTP Secure',
'type' => 'select',
'options' => $config['email_smtp_secure'],
'options' => $config['email_smtp_secure_options'],
),
array('name' => 'email_auto_tls',
'descr' => 'SMTP Auto TLS Support',

4
includes/defaults.inc.php
View File

@@ -876,12 +876,12 @@ $config['ipmi']['type'][] = 'imb';
$config['ipmi']['type'][] = 'open';
// Options needed for dynamic config - do NOT edit
$config['email_backend'] = array(
$config['email_backend_options'] = array(
'mail',
'sendmail',
'smtp',
);
$config['email_smtp_secure'] = array(
$config['email_smtp_secure_options'] = array(
'',
'tls',
'ssl',