From 0351b54fb8f07923b38c4b8ee1a7a6a52dff8915 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Wed, 14 Sep 2016 04:05:49 -0500
Subject: [PATCH] webui: make d_echo work in webui (#4432)

* webui: make d_echo work in webui
Remove d_print_r(), it is redundant to d_echo()
Remove d_echo calls in services.inc.php

* Switched debug check to work with nginx
---
 html/includes/modal/new_service.inc.php |  1 -
 html/index.php                          |  6 ++++--
 includes/common.php                     | 21 ++++-----------------
 includes/services.inc.php               |  2 --
 includes/snmp.inc.php                   |  6 +++---
 5 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/html/includes/modal/new_service.inc.php b/html/includes/modal/new_service.inc.php
index 509993fcdf..ecba0b7628 100644
--- a/html/includes/modal/new_service.inc.php
+++ b/html/includes/modal/new_service.inc.php
@@ -17,7 +17,6 @@ if (is_admin() !== false) {
     if (file_exists($dir) && is_dir($dir)) {
         $files = scandir($dir);
         $dir .= DIRECTORY_SEPARATOR;
-        d_print_r($files);
         foreach ($files as $file) {
             if (is_executable($dir.$file) && is_file($dir.$file) && strstr($file, 'check_')) {
                 list(,$check_name) = explode('_', $file, 2);
diff --git a/html/index.php b/html/index.php
index 6136a260d7..4c1dc88c5f 100644
--- a/html/index.php
+++ b/html/index.php
@@ -34,14 +34,16 @@ function catchFatal()
     }
 }
 
-if (strpos($_SERVER['PATH_INFO'], "debug")) {
-    $debug = "1";
+if (strpos($_SERVER['REQUEST_URI'], "debug")) {
+    $debug = true;
     ini_set('display_errors', 0);
     ini_set('display_startup_errors', 1);
     ini_set('log_errors', 1);
     ini_set('error_reporting', E_ALL);
     set_error_handler('logErrors');
     register_shutdown_function('catchFatal');
+    $sql_debug = array();
+    $php_debug = array();
 } else {
     $debug = false;
     ini_set('display_errors', 0);
diff --git a/includes/common.php b/includes/common.php
index c7f9ec7395..5e6b61faf6 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -651,12 +651,12 @@ function is_valid_hostname($hostname)
  */
 function d_echo($text, $no_debug_text = null)
 {
-    global $debug;
+    global $debug, $php_debug;
     if ($debug) {
-        if (is_array($text)) {
-            print_r($text);
+        if (isset($php_debug)) {
+            $php_debug[] = $text;
         } else {
-            echo "$text";
+            print_r($text);
         }
     } elseif ($no_debug_text) {
         echo "$no_debug_text";
@@ -684,19 +684,6 @@ function c_echo($string, $enabled = true)
     }
 }
 
-/*
- * convenience function - please use this instead of 'if ($debug) { print_r ...; }'
- */
-function d_print_r($var, $no_debug_text = null)
-{
-    global $debug;
-    if ($debug) {
-        print_r($var);
-    } elseif ($no_debug_text) {
-        echo "$no_debug_text";
-    }
-} // d_print_r
-
 
 /*
  * @return true if the given graph type is a dynamic MIB graph
diff --git a/includes/services.inc.php b/includes/services.inc.php
index 9f165e7e7f..b59011dde0 100644
--- a/includes/services.inc.php
+++ b/includes/services.inc.php
@@ -18,7 +18,6 @@ function get_service_status($device = null)
         $sql_query = substr($sql_query, 0, strlen($sql_query)-6);
     }
     $sql_query .= " GROUP BY service_status";
-    d_echo("SQL Query: ".$sql_query);
 
     // $service is not null, get only what we want.
     $result = dbFetchRows($sql_query, $sql_param);
@@ -30,7 +29,6 @@ function get_service_status($device = null)
         $service_count[$v['service_status']] = $v['count'];
     }
 
-    d_echo("Service Count by Status: ".print_r($service_count, true)."\n");
     return $service_count;
 }
 
diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php
index 9563f46790..95b8e33652 100644
--- a/includes/snmp.inc.php
+++ b/includes/snmp.inc.php
@@ -991,7 +991,7 @@ function snmp_mib_load($mib, $module, $included_by, $mibdir = null)
         $mibs[$obj['object_type']] = $obj;
         $mibs[$obj['object_type']]['included_by'] = $included_by;
     }
-    d_print_r($mibs);
+    d_echo($mibs);
     // NOTE: `last_modified` omitted due to being automatically maintained by MySQL
     $columns = array('module', 'mib', 'object_type', 'oid', 'syntax', 'description', 'max_access', 'status', 'included_by');
     update_db_table('mibdefs', $columns, 3, $mibs);
@@ -1202,7 +1202,7 @@ function load_mibdefs($module, $name)
         }
     }
 
-    d_print_r($result);
+    d_echo($result);
     return $result;
 } // load_mibdefs
 
@@ -1236,7 +1236,7 @@ function poll_mibs($device, &$graphs)
         echo "$name ";
         d_echo("\n");
         $oids = snmpwalk_cache_oid($device, $name, array(), $module, null, "-OQUsb");
-        d_print_r($oids);
+        d_echo($oids);
         save_mibs($device, $name, $oids, load_mibdefs($module, $name), $graphs);
     }
     echo "\n";