--- a/include/top_graph_header.php 2015/11/17 01:39:54 7758 +++ b/include/top_graph_header.php 2015/11/28 20:08:16 7767 @@ -146,12 +146,12 @@ $graph_data_array["print_source"] = true; /* override: graph start time (unix time) */ - if (!empty($_GET["graph_start"])) { + if (!empty($_REQUEST["graph_start"])) { $graph_data_array["graph_start"] = get_request_var_request("graph_start"); } /* override: graph end time (unix time) */ - if (!empty($_GET["graph_end"])) { + if (!empty($_REQUEST["graph_end"])) { $graph_data_array["graph_end"] = get_request_var_request("graph_end"); } --- a/graph.php 2015/08/10 01:16:44 7755 +++ b/graph.php 2015/11/28 20:08:16 7767 @@ -32,43 +32,43 @@ api_plugin_hook_function('graph'); -include_once("./lib/html_tree.php"); -include_once("./include/top_graph_header.php"); - /* ================= input validation ================= */ -input_validate_input_regex(get_request_var("rra_id"), "^([0-9]+|all)$"); -input_validate_input_number(get_request_var("local_graph_id")); -input_validate_input_number(get_request_var("graph_end")); -input_validate_input_number(get_request_var("graph_start")); +input_validate_input_regex(get_request_var_request("rra_id"), "^([0-9]+|all)$"); +input_validate_input_number(get_request_var_request("local_graph_id")); +input_validate_input_number(get_request_var_request("graph_end")); +input_validate_input_number(get_request_var_request("graph_start")); input_validate_input_regex(get_request_var_request("view_type"), "^([a-zA-Z0-9]+)$"); /* ==================================================== */ -if (!isset($_GET['rra_id'])) { - $_GET['rra_id'] = 'all'; +include_once("./lib/html_tree.php"); +include_once("./include/top_graph_header.php"); + +if (!isset($_REQUEST['rra_id'])) { + $_REQUEST['rra_id'] = 'all'; } -if ($_GET["rra_id"] == "all") { +if ($_REQUEST["rra_id"] == "all") { $sql_where = " where id is not null"; }else{ - $sql_where = " where id=" . $_GET["rra_id"]; + $sql_where = " where id=" . $_REQUEST["rra_id"]; } /* make sure the graph requested exists (sanity) */ -if (!(db_fetch_cell("select local_graph_id from graph_templates_graph where local_graph_id=" . $_GET["local_graph_id"]))) { +if (!(db_fetch_cell("select local_graph_id from graph_templates_graph where local_graph_id=" . $_REQUEST["local_graph_id"]))) { print "GRAPH DOES NOT EXIST"; exit; } /* take graph permissions into account here, if the user does not have permission give an "access denied" message */ if (read_config_option("auth_method") != 0) { - $access_denied = !(is_graph_allowed($_GET["local_graph_id"])); + $access_denied = !(is_graph_allowed($_REQUEST["local_graph_id"])); if ($access_denied == true) { print "ACCESS DENIED"; exit; } } -$graph_title = get_graph_title($_GET["local_graph_id"]); +$graph_title = get_graph_title($_REQUEST["local_graph_id"]); if ($_REQUEST["view_type"] == "tree") { print ""; @@ -76,15 +76,15 @@ print "
"; } -$rras = get_associated_rras($_GET["local_graph_id"]); +$rras = get_associated_rras($_REQUEST["local_graph_id"]); switch ($_REQUEST["action"]) { case 'view': api_plugin_hook_function('page_buttons', - array('lgid' => $_GET["local_graph_id"], + array('lgid' => $_REQUEST["local_graph_id"], 'leafid' => '',//$leaf_id, 'mode' => 'mrtg', - 'rraid' => $_GET["rra_id"]) + 'rraid' => $_REQUEST["rra_id"]) ); ?> @@ -105,13 +105,13 @@
@@ -143,7 +143,7 @@ } /* fetch information for the current RRA */ - $rra = db_fetch_row("select id,timespan,steps,name from rra where id=" . $_GET["rra_id"]); + $rra = db_fetch_row("select id,timespan,steps,name from rra where id=" . $_REQUEST["rra_id"]); /* define the time span, which decides which rra to use */ $timespan = -($rra["timespan"]); @@ -154,24 +154,24 @@ FROM (data_template_data,data_template_rrd,graph_templates_item) WHERE graph_templates_item.task_item_id=data_template_rrd.id AND data_template_rrd.local_data_id=data_template_data.local_data_id - AND graph_templates_item.local_graph_id=" . $_GET["local_graph_id"] . + AND graph_templates_item.local_graph_id=" . $_REQUEST["local_graph_id"] . " LIMIT 0,1"); $ds_step = empty($ds_step) ? 300 : $ds_step; $seconds_between_graph_updates = ($ds_step * $rra["steps"]); $now = time(); - if (isset($_GET["graph_end"]) && ($_GET["graph_end"] <= $now - $seconds_between_graph_updates)) { - $graph_end = $_GET["graph_end"]; + if (isset($_REQUEST["graph_end"]) && ($_REQUEST["graph_end"] <= $now - $seconds_between_graph_updates)) { + $graph_end = $_REQUEST["graph_end"]; }else{ $graph_end = $now - $seconds_between_graph_updates; } - if (isset($_GET["graph_start"])) { - if (($graph_end - $_GET["graph_start"])>$max_timespan) { + if (isset($_REQUEST["graph_start"])) { + if (($graph_end - $_REQUEST["graph_start"])>$max_timespan) { $graph_start = $now - $max_timespan; }else { - $graph_start = $_GET["graph_start"]; + $graph_start = $_REQUEST["graph_start"]; } }else{ $graph_start = $now + $timespan; @@ -186,7 +186,7 @@ graph_templates_graph.height, graph_templates_graph.width from graph_templates_graph - where graph_templates_graph.local_graph_id=" . $_GET["local_graph_id"]); + where graph_templates_graph.local_graph_id=" . $_REQUEST["local_graph_id"]); $graph_height = $graph["height"]; $graph_width = $graph["width"]; @@ -214,12 +214,12 @@
- <?php print htmlspecialchars($graph_title, ENT_QUOTES);?> + <?php print htmlspecialchars($graph_title, ENT_QUOTES);?> - Zoom Graph
- CSV Export
- Graph Source/Properties - 'view', 'local_graph_id' => $_GET['local_graph_id'], 'rra' => $rra['id'], 'view_type' => $_REQUEST['view_type'])); ?> + Zoom Graph
+ CSV Export
+ Graph Source/Properties + 'view', 'local_graph_id' => $_REQUEST['local_graph_id'], 'rra' => $rra['id'], 'view_type' => $_REQUEST['view_type'])); ?> images/graph_page_top.gif' border='0' alt='Page Top' title='Page Top' style='padding: 3px;'>
@@ -249,17 +249,17 @@
- <?php print htmlspecialchars($graph_title, ENT_QUOTES);?> + <?php print htmlspecialchars($graph_title, ENT_QUOTES);?> - Graph Source/Properties - CSV Export
- 'zoom', 'local_graph_id' => $_GET['local_graph_id'], 'rra' => $_GET['rra_id'], 'view_type' => $_REQUEST['view_type'])); ?> + Graph Source/Properties + CSV Export
+ 'zoom', 'local_graph_id' => $_REQUEST['local_graph_id'], 'rra' => $_REQUEST['rra_id'], 'view_type' => $_REQUEST['view_type'])); ?>
- <?php print htmlspecialchars($graph_title);?> + <?php print htmlspecialchars($graph_title);?> - Zoom Graph
- CSV Export
- 'properties', 'local_graph_id' => $_GET['local_graph_id'], 'rra' => $_GET['rra_id'], 'view_type' => $_REQUEST['view_type'])); ?> + Zoom Graph
+ CSV Export
+ 'properties', 'local_graph_id' => $_REQUEST['local_graph_id'], 'rra' => $_REQUEST['rra_id'], 'view_type' => $_REQUEST['view_type'])); ?>
- +