From a213f092ab2abc7d0033044b074a327f28287507 Mon Sep 17 00:00:00 2001
From: Pim van den Berg
Date: Mon, 25 May 2015 12:02:35 +0200
Subject: inc/functions: merge functions GET and validate_get

And make sure all input from $_GET variables are parsed and validated.
---
 detail.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'detail.php')

diff --git a/detail.php b/detail.php
index b4ece36..8978350 100644
--- a/detail.php
+++ b/detail.php
@@ -15,12 +15,12 @@ if (empty($_GET['y']))
 if ($CONFIG['graph_type'] == 'hybrid')
 	$CONFIG['graph_type'] = 'canvas';
 
-$host = validate_get(GET('h'), 'h');
-$plugin = validate_get(GET('p'), 'p');
-$pinstance = validate_get(GET('pi'), 'pi');
-$category = validate_get(GET('c'), 'c');
-$type = validate_get(GET('t'), 't');
-$tinstance = validate_get(GET('ti'), 'ti');
+$host = GET('h');
+$plugin = GET('p');
+$pinstance = GET('pi');
+$category = GET('c');
+$type = GET('t');
+$tinstance = GET('ti');
 $seconds = GET('s');
 
 $selected_plugins = !$plugin ? $CONFIG['overview'] : array($plugin);
@@ -40,7 +40,7 @@ plugins_list($host, $selected_plugins);
 echo '<div class="graphs">';
 plugin_header($host, $plugin);
 
-$args = $_GET;
+$args = GET();
 print '<ul class="time-range">' . "\n";
 foreach($CONFIG['term'] as $key => $s) {
 	$args['s'] = $s;
@@ -59,7 +59,8 @@ if ($CONFIG['graph_type'] == 'canvas') {
 } else {
 	printf("<img src=\"%s%s\">\n",
 		htmlentities($CONFIG['weburl']),
-		htmlentities(build_url('graph.php', $_GET)));
+		htmlentities(build_url('graph.php', GET()))
+	);
 }
 echo '</div>';
 echo "</fieldset>\n";
-- 
cgit v1.1