From c651d4bea6c81d610008a01cb9d7793bfbf0dff6 Mon Sep 17 00:00:00 2001 From: jim-p Date: Thu, 2 Jan 2014 10:05:57 -0500 Subject: Remove mailreports redirect if RRD is disabled (except for page adding an rrd graph). Since it works with other info, it no longer r elies on RRD being enabled. Also fixup (c), filename, and privilege headers. --- config/mailreport/status_mail_report.php | 17 ++++++----------- config/mailreport/status_mail_report_add_cmd.php | 12 ++++++------ config/mailreport/status_mail_report_add_graph.php | 12 ++++++------ config/mailreport/status_mail_report_add_log.php | 12 ++++++------ config/mailreport/status_mail_report_edit.php | 18 ++++++------------ 5 files changed, 30 insertions(+), 41 deletions(-) (limited to 'config') diff --git a/config/mailreport/status_mail_report.php b/config/mailreport/status_mail_report.php index b1705fac..e08a7272 100644 --- a/config/mailreport/status_mail_report.php +++ b/config/mailreport/status_mail_report.php @@ -1,9 +1,9 @@ + Copyright (C) 2011-2014 Jim Pingle All rights reserved. Redistribution and use in source and binary forms, with or without @@ -32,20 +32,15 @@ */ ##|+PRIV -##|*IDENT=page-status-rrdgraphs -##|*NAME=Status: RRD Graphs page -##|*DESCR=Allow access to the 'Status: RRD Graphs' page. -##|*MATCH=status_rrd_graph.php* +##|*IDENT=page-status-mailreports +##|*NAME=Status: E-Mail Reports page +##|*DESCR=Allow access to the 'Status: E-Mail Reports' page. +##|*MATCH=status_mail_report.php* ##|-PRIV require("guiconfig.inc"); require_once("mail_reports.inc"); -/* if the rrd graphs are not enabled redirect to settings page */ -if(! isset($config['rrd']['enable'])) { - header("Location: status_rrd_graph_settings.php"); -} - if (!is_array($config['mailreports']['schedule'])) $config['mailreports']['schedule'] = array(); diff --git a/config/mailreport/status_mail_report_add_cmd.php b/config/mailreport/status_mail_report_add_cmd.php index 7693f7a4..b4527584 100644 --- a/config/mailreport/status_mail_report_add_cmd.php +++ b/config/mailreport/status_mail_report_add_cmd.php @@ -1,9 +1,9 @@ + Copyright (C) 2011-2014 Jim Pingle Portions Copyright (C) 2007-2011 Seth Mos All rights reserved. @@ -33,10 +33,10 @@ */ ##|+PRIV -##|*IDENT=page-status-rrdgraphs -##|*NAME=Status: RRD Graphs page -##|*DESCR=Allow access to the 'Status: RRD Graphs' page. -##|*MATCH=status_rrd_graph.php* +##|*IDENT=page-status-mailreportsaddcmd +##|*NAME=Status: E-Mail Reports: Add Command page +##|*DESCR=Allow access to the 'Status: E-Mail Reports: Add Command' page. +##|*MATCH=status_mail_report_add_cmd.php* ##|-PRIV require("guiconfig.inc"); diff --git a/config/mailreport/status_mail_report_add_graph.php b/config/mailreport/status_mail_report_add_graph.php index 165124f3..663d8f9b 100644 --- a/config/mailreport/status_mail_report_add_graph.php +++ b/config/mailreport/status_mail_report_add_graph.php @@ -1,9 +1,9 @@ + Copyright (C) 2011-2014 Jim Pingle Portions Copyright (C) 2007-2011 Seth Mos All rights reserved. @@ -33,10 +33,10 @@ */ ##|+PRIV -##|*IDENT=page-status-rrdgraphs -##|*NAME=Status: RRD Graphs page -##|*DESCR=Allow access to the 'Status: RRD Graphs' page. -##|*MATCH=status_rrd_graph.php* +##|*IDENT=page-status-mailreportsaddgraph +##|*NAME=Status: E-Mail Reports: Add Graph page +##|*DESCR=Allow access to the 'Status: E-Mail Reports: Add Graph' page. +##|*MATCH=status_mail_report_add_graph.php* ##|-PRIV require("guiconfig.inc"); diff --git a/config/mailreport/status_mail_report_add_log.php b/config/mailreport/status_mail_report_add_log.php index 75d092b5..0b140723 100644 --- a/config/mailreport/status_mail_report_add_log.php +++ b/config/mailreport/status_mail_report_add_log.php @@ -1,9 +1,9 @@ + Copyright (C) 2011-2014 Jim Pingle Portions Copyright (C) 2007-2011 Seth Mos All rights reserved. @@ -33,10 +33,10 @@ */ ##|+PRIV -##|*IDENT=page-status-rrdgraphs -##|*NAME=Status: RRD Graphs page -##|*DESCR=Allow access to the 'Status: RRD Graphs' page. -##|*MATCH=status_rrd_graph.php* +##|*IDENT=page-status-mailreportsaddlog +##|*NAME=Status: E-Mail Reports: Add Log page +##|*DESCR=Allow access to the 'Status: E-Mail Reports: Add Log' page. +##|*MATCH=status_mail_report_add_log.php* ##|-PRIV require("guiconfig.inc"); diff --git a/config/mailreport/status_mail_report_edit.php b/config/mailreport/status_mail_report_edit.php index dcfa6d98..9e6bb071 100644 --- a/config/mailreport/status_mail_report_edit.php +++ b/config/mailreport/status_mail_report_edit.php @@ -1,9 +1,9 @@ + Copyright (C) 2011-2014 Jim Pingle All rights reserved. Redistribution and use in source and binary forms, with or without @@ -32,21 +32,15 @@ */ ##|+PRIV -##|*IDENT=page-status-rrdgraphs -##|*NAME=Status: RRD Graphs page -##|*DESCR=Allow access to the 'Status: RRD Graphs' page. -##|*MATCH=status_rrd_graph.php* +##|*IDENT=page-status-mailreportsedit +##|*NAME=Status: E-Mail Reports: Edit Report page +##|*DESCR=Allow access to the 'Status: E-Mail Reports: Edit Report' page. +##|*MATCH=status_mail_report_edit.php* ##|-PRIV require("guiconfig.inc"); require_once("mail_reports.inc"); -/* if the rrd graphs are not enabled redirect to settings page */ -if(! isset($config['rrd']['enable'])) { - header("Location: status_rrd_graph_settings.php"); - return; -} - $cmdid = $_REQUEST['cmdid']; $logid = $_REQUEST['logid']; $graphid = $_REQUEST['graphid']; -- cgit v1.2.3