From 1cbd142ad7fa7e426ef1ae5116c204c053cf0e9f Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Thu, 23 Jul 2015 17:48:22 +0100
Subject: [PATCH] Fixed some scrut issues

---
 html/ajax_dash.php                            |  9 +--------
 html/ajax_form.php                            |  8 +-------
 html/ajax_listports.php                       |  9 +--------
 html/ajax_rulesuggest.php                     |  1 +
 html/ajax_search.php                          |  9 +--------
 html/ajax_table.php                           |  9 +--------
 html/includes/common/availability-map.inc.php |  2 +-
 html/includes/functions.inc.php               | 20 +++++++++++++++++++
 includes/defaults.inc.php                     | 12 +++++++++++
 9 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/html/ajax_dash.php b/html/ajax_dash.php
index 5336cef76..e25994282 100644
--- a/html/ajax_dash.php
+++ b/html/ajax_dash.php
@@ -12,15 +12,8 @@
  * the source code distribution for details.
  */
 
-if (isset($_REQUEST['debug'])) {
-    ini_set('display_errors', 1);
-    ini_set('display_startup_errors', 0);
-    ini_set('log_errors', 0);
-    ini_set('allow_url_fopen', 0);
-    ini_set('error_reporting', E_ALL);
-}
-
 require_once '../includes/defaults.inc.php';
+set_debug($_REQUEST['debug']);
 require_once '../config.php';
 require_once '../includes/definitions.inc.php';
 require_once 'includes/functions.inc.php';
diff --git a/html/ajax_form.php b/html/ajax_form.php
index a9547d352..b668551dd 100644
--- a/html/ajax_form.php
+++ b/html/ajax_form.php
@@ -13,15 +13,9 @@
  */
 
 // FUA
-if (isset($_REQUEST['debug'])) {
-    ini_set('display_errors', 1);
-    ini_set('display_startup_errors', 0);
-    ini_set('log_errors', 0);
-    ini_set('allow_url_fopen', 0);
-    ini_set('error_reporting', E_ALL);
-}
 
 require_once '../includes/defaults.inc.php';
+set_debug($_REQUEST['debug']);
 require_once '../config.php';
 require_once '../includes/definitions.inc.php';
 require_once 'includes/functions.inc.php';
diff --git a/html/ajax_listports.php b/html/ajax_listports.php
index 0ebab67b1..ea5e8fd02 100644
--- a/html/ajax_listports.php
+++ b/html/ajax_listports.php
@@ -11,15 +11,8 @@
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
-if (isset($_GET['debug'])) {
-    ini_set('display_errors', 1);
-    ini_set('display_startup_errors', 0);
-    ini_set('log_errors', 0);
-    ini_set('allow_url_fopen', 0);
-    ini_set('error_reporting', E_ALL);
-}
-
 require_once '../includes/defaults.inc.php';
+set_debug($_REQUEST['debug']);
 require_once '../config.php';
 require_once '../includes/definitions.inc.php';
 require_once 'includes/functions.inc.php';
diff --git a/html/ajax_rulesuggest.php b/html/ajax_rulesuggest.php
index 159d4630c..cba0a197e 100644
--- a/html/ajax_rulesuggest.php
+++ b/html/ajax_rulesuggest.php
@@ -29,6 +29,7 @@ if (!isset($_SESSION['authenticated'])) {
 }
 
 require_once '../includes/defaults.inc.php';
+set_debug($_REQUEST['debug']);
 require_once '../config.php';
 require_once '../includes/definitions.inc.php';
 require_once '../includes/functions.php';
diff --git a/html/ajax_search.php b/html/ajax_search.php
index d9c961054..791513972 100644
--- a/html/ajax_search.php
+++ b/html/ajax_search.php
@@ -1,14 +1,7 @@
 <?php
 
-if (isset($_REQUEST['debug'])) {
-    ini_set('display_errors', 1);
-    ini_set('display_startup_errors', 0);
-    ini_set('log_errors', 0);
-    ini_set('allow_url_fopen', 0);
-    ini_set('error_reporting', E_ALL);
-}
-
 require_once '../includes/defaults.inc.php';
+set_debug($_REQUEST['debug']);
 require_once '../config.php';
 require_once '../includes/definitions.inc.php';
 require_once 'includes/functions.inc.php';
diff --git a/html/ajax_table.php b/html/ajax_table.php
index 3684681a4..f16cc2da9 100644
--- a/html/ajax_table.php
+++ b/html/ajax_table.php
@@ -12,15 +12,8 @@
  * the source code distribution for details.
  */
 
-if (isset($_REQUEST['debug'])) {
-    ini_set('display_errors', 1);
-    ini_set('display_startup_errors', 0);
-    ini_set('log_errors', 0);
-    ini_set('allow_url_fopen', 0);
-    ini_set('error_reporting', E_ALL);
-}
-
 require_once '../includes/defaults.inc.php';
+set_debug($_REQUEST['debug']);
 require_once '../config.php';
 require_once '../includes/definitions.inc.php';
 require_once 'includes/functions.inc.php';
diff --git a/html/includes/common/availability-map.inc.php b/html/includes/common/availability-map.inc.php
index 966d6d999..c3990c544 100644
--- a/html/includes/common/availability-map.inc.php
+++ b/html/includes/common/availability-map.inc.php
@@ -12,7 +12,7 @@
 
 $sql = 'SELECT `D`.`hostname`,`D`.`device_id`,`D`.`status`,`D`.`uptime` FROM `devices` AS `D`';
 
-if (is_admin() === false && is_read() === false) {
+if (is_normal_user() === true) {
     $sql .= ' , `devices_perms` AS P WHERE D.`device_id` = P.`device_id` AND P.`user_id` = ? AND';
     $param = array($_SESSION['user_id']);
 }
diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index aa83aca1f..16ac27db4 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -966,6 +966,25 @@ function is_read() {
 
 }//end is_read()
 
+function is_demo_user() {
+
+    if ($_SESSION['userlevel'] == 11) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}// end is_demo_user();
+
+function is_normal_user() {
+
+    if (is_admin() === false && is_read() === false && is_demo_user() === false) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}// end is_normal_user()
 
 function demo_account() {
     print_error("You are logged in as a demo account, this page isn't accessible to you");
@@ -1130,3 +1149,4 @@ function alert_details($details) {
     return $fault_detail;
 
 }//end alert_details()
+
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 1c209b785..51cb81c30 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -23,6 +23,18 @@
 //
 error_reporting(E_ERROR);
 
+function set_debug($debug) {
+
+    if (isset($debug)) {
+        ini_set('display_errors', 1);
+        ini_set('display_startup_errors', 0);
+        ini_set('log_errors', 0);
+        ini_set('allow_url_fopen', 0);
+        ini_set('error_reporting', E_ALL);
+    }
+
+}//end set_debug()
+
 // Default directories
 $config['project_name'] = 'LibreNMS';
 $config['project_id']   = strtolower($config['project_name']);