From 2891346a5293149724f1015a47acad25301bf36d Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 22 Apr 2015 20:51:14 +0100
Subject: [PATCH] Fixed user perms for alert log dropdown

---
 html/includes/table/alertlog.inc.php | 2 +-
 html/pages/alert-log.inc.php         | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/html/includes/table/alertlog.inc.php b/html/includes/table/alertlog.inc.php
index 0dd0a4d60..0d15037c3 100644
--- a/html/includes/table/alertlog.inc.php
+++ b/html/includes/table/alertlog.inc.php
@@ -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";
 } 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 = ?";
-    $param[] = $_SESSION['user_id'];
+    $param[] = array($_SESSION['user_id']);
 }
 
 if (isset($searchPhrase) && !empty($searchPhrase)) {
diff --git a/html/pages/alert-log.inc.php b/html/pages/alert-log.inc.php
index 0d67679dc..45cfac998 100644
--- a/html/pages/alert-log.inc.php
+++ b/html/pages/alert-log.inc.php
@@ -45,12 +45,15 @@ var grid = $("#alertlog").bootgrid({
                 "<option value=\"\">All Devices</option>"+
 <?php
     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']) {
                 echo('" selected "+');
             }
-            echo('">'.$hostname.'</option>"+');
+           echo('">'.$hostname.'</option>"+');
         }
+    }
 ?>
                "</select>"+
                "</div>"+