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

Fixed user perms for alert log dropdown

Browse Source
This commit is contained in:
laf
2015-04-22 20:51:14 +01:00
parent e34bb7235c
commit 2891346a52
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/table/alertlog.inc.php
View File

@@ -11,7 +11,7 @@ if ($_SESSION['userlevel'] >= '5') {
$sql = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id WHERE $where"; $sql = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id WHERE $where";
} else { } else {
$sql = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id RIGHT JOIN devices_perms AS P ON E.device_id = P.device_id WHERE $where AND P.user_id = ?"; $sql = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id RIGHT JOIN devices_perms AS P ON E.device_id = P.device_id WHERE $where AND P.user_id = ?";
$param[] = $_SESSION['user_id']; $param[] = array($_SESSION['user_id']);
} }
if (isset($searchPhrase) && !empty($searchPhrase)) { if (isset($searchPhrase) && !empty($searchPhrase)) {

7
html/pages/alert-log.inc.php
View File

@@ -45,12 +45,15 @@ var grid = $("#alertlog").bootgrid({
"<option value=\"\">All Devices</option>"+ "<option value=\"\">All Devices</option>"+
<?php <?php
foreach (get_all_devices() as $hostname) { foreach (get_all_devices() as $hostname) {
echo('"<option value=\"'.getidbyname($hostname).'\""+'); $device_id = getidbyname($hostname);
if (device_permitted($device_id)) {
echo('"<option value=\"'.$device_id.'\""+');
if (getidbyname($hostname) == $_POST['device_id']) { if (getidbyname($hostname) == $_POST['device_id']) {
echo('" selected "+'); echo('" selected "+');
} }
echo('">'.$hostname.'</option>"+'); echo('">'.$hostname.'</option>"+');
} }
}
?> ?>
"</select>"+ "</select>"+
"</div>"+ "</div>"+