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

Merge pull request #734 from f0o/issue-714

Browse Source 
Use functions defined in authentication-modules to obtain contact-list
This commit is contained in:
Neil Lathwood
2015-04-05 21:05:56 +01:00
parent 50b806ee50 83b3208540
commit 55cdfd115b
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
includes/alerts.inc.php
View File

@@ -23,6 +23,7 @@
*/ */
include_once('includes/device-groups.inc.php'); include_once('includes/device-groups.inc.php');
include_once('html/includes/authentication/'.$config['auth_mechanism'].'.inc.php');
/** /**
* Generate SQL from Rule * Generate SQL from Rule
@@ -144,6 +145,7 @@ function GetContacts($results) {
if( $config['alerts']['email']['default_only'] ) { if( $config['alerts']['email']['default_only'] ) {
return array($config['alerts']['email']['default'] => 'NOC'); return array($config['alerts']['email']['default'] => 'NOC');
} }
$users = get_userlist();
$contacts = array(); $contacts = array();
$uids = array(); $uids = array();
foreach( $results as $result ) { foreach( $results as $result ) {
@@ -163,22 +165,19 @@ function GetContacts($results) {
} }
} }
} }
if( $config["alert"]["globals"] ) { foreach( $users as $user ) {
$tmpa = dbFetchRows("SELECT realname,email FROM users WHERE level >= 5 AND level < 10"); if( empty($user['email']) ) {
foreach( $tmpa as $tmp ) { continue;
$contacts[$tmp['email']] = $tmp['realname']; } elseif( empty($user['realname']) ) {
$user['realname'] = $user['username'];
} }
} $user['level'] = get_userlevel($user['username']);
if( $config["alert"]["admins"] ) { if( $config["alert"]["globals"] && ( $user['level'] >= 5 && $user['level'] < 10 ) ) {
$tmpa = dbFetchRows("SELECT realname,email FROM users WHERE level = 10"); $contacts[$user['email']] = $user['realname'];
foreach( $tmpa as $tmp ) { } elseif( $config["alert"]["admins"] && $user['level'] == 10 ) {
$contacts[$tmp['email']] = $tmp['realname']; $contacts[$user['email']] = $user['realname'];
} } elseif( in_array($user['user_id'],$uids) ) {
} $contacts[$user['email']] = $user['realname'];
if( is_array($uids) ) {
foreach( $uids as $uid ) {
$tmp = dbFetchRow("SELECT realname,email FROM users WHERE user_id = ?", array($uid));
$contacts[$tmp['email']] = $tmp['realname'];
} }
} }
return $contacts; return $contacts;