Merge pull request #855 from laf/user-perms

Added function for read only admin and updating lots of areas with user perms issue.
This commit is contained in:
Daniel Preussker
2015-04-23 16:48:03 +00:00
9 changed files with 113 additions and 27 deletions

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";
} 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)) {