From e95e1e535d60d7cfbf87a8ee56bd3eb01a24656b Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 28 Mar 2013 16:52:22 -0400
Subject: Add command output and log output capabilities to the "mail reports"
 package.

---
 config/mailreport/status_mail_report_add_graph.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'config/mailreport/status_mail_report_add_graph.php')

diff --git a/config/mailreport/status_mail_report_add_graph.php b/config/mailreport/status_mail_report_add_graph.php
index c0287367..165124f3 100644
--- a/config/mailreport/status_mail_report_add_graph.php
+++ b/config/mailreport/status_mail_report_add_graph.php
@@ -50,13 +50,8 @@ if(! isset($config['rrd']['enable'])) {
 	header("Location: status_rrd_graph_settings.php");
 }
 
-$reportid = $_GET['reportid'];
-if (isset($_POST['reportid']))
-	$reportid = $_POST['reportid'];
-
-$id = $_GET['id'];
-if (isset($_POST['id']))
-	$id = $_POST['id'];
+$reportid = $_REQUEST['reportid'];
+$id = $_REQUEST['id'];
 
 if (!is_array($config['mailreports']['schedule']))
 	$config['mailreports']['schedule'] = array();
@@ -65,7 +60,7 @@ $a_mailreports = &$config['mailreports']['schedule'];
 
 if (!isset($reportid) || !isset($a_mailreports[$reportid])) {
 	header("Location: status_mail_report.php");
-	exit;
+	return;
 }
 
 if (!is_array($a_mailreports[$reportid]['row']))
@@ -80,7 +75,7 @@ if (isset($id) && $a_graphs[$id]) {
 
 if (isset($id) && !($a_graphs[$id])) {
 	header("Location: status_mail_report_edit.php?id={$reportid}");
-	exit;
+	return;
 }
 
 
@@ -159,7 +154,7 @@ if ($_POST) {
 
 	write_config();
 	header("Location: status_mail_report_edit.php?id={$reportid}");
-	exit;
+	return;
 }
 
 
-- 
cgit v1.2.3