rrd: purge the old frontend, move settings to settings

src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml

@@ -54,6 +54,7 @@
             <Miscellaneous url="/system_advanced_misc.php"/>
             <Tunables VisibleName="Tunables" url="/system_advanced_sysctl.php"/>
             <Notifications url="/system_advanced_notifications.php"/>
+            <RRDGraphs VisibleName="RRD Graphs" url="/status_rrd_graph_settings.php"/>
         </Settings>
         <Wizard url="/wizard.php" cssClass="fa fa-magic">
             <Step url="/wizard.php*"/>
@@ -247,9 +248,6 @@
         </LoadBalancer>
         <NTP url="/status_ntpd.php"/>
         <OpenVPN url="/status_openvpn.php"/>
-        <RRDGraphs VisibleName="RRD Graphs" url="/status_rrd_graph.php">
-            <Settings url="/status_rrd_graph_settings.php"/>
-        </RRDGraphs>
         <Services url="/status_services.php">
             <ServicesActions url="/status_services.php?*"/>
         </Services>

src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json

@@ -1129,14 +1129,6 @@
             "status_openvpn.php*"
         ]
     },
-    "page-status-rrdgraphs": {
-        "name": "WebCfg - Status: RRD Graphs page",
-        "descr": "Allow access to the 'Status: RRD Graphs' page.",
-        "match": [
-            "status_rrd_graph.php*",
-            "status_rrd_graph_img.php*"
-        ]
-    },
     "page-status-rrdgraph-settings": {
         "name": "WebCfg - Status: RRD Graphs settings page",
         "descr": "Allow access to the 'Status: RRD Graphs: settings' page.",

src/www/status_rrd_graph_settings.php

 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2007 Seth Mos <seth.mos@dds.nl>
@@ -98,7 +99,7 @@ foreach($databases as $database) {
 	}
 }
 
-$pgtitle = array(gettext("Status"),gettext("RRD Graphs"));
+$pgtitle = array(gettext('System'), gettext('Settings'), gettext('RRD Graphs'));
 include("head.inc");
 
 ?>
@@ -116,8 +117,6 @@ include("head.inc");
 
 			    <section class="col-xs-12">
 
-				<? include("status_rrd_graph_tabs.inc"); ?>
-
 					<div class="tab-content content-box col-xs-12">
 
 

src/www/status_rrd_graph_tabs.inc

-<?php
-    $tab_array = array();
-	if($curcat == "system") { $tabactive = True; } else { $tabactive = False; }
-        $tab_array[] = array(gettext("System"), $tabactive, "status_rrd_graph.php?cat=system");
-	if($curcat == "traffic") { $tabactive = True; } else { $tabactive = False; }
-        $tab_array[] = array(gettext("Traffic"), $tabactive, "status_rrd_graph.php?cat=traffic");
-	if($curcat == "packets") { $tabactive = True; } else { $tabactive = False; }
-        $tab_array[] = array(gettext("Packets"), $tabactive, "status_rrd_graph.php?cat=packets");
-	if($curcat == "quality") { $tabactive = True; } else { $tabactive = False; }
-        $tab_array[] = array(gettext("Quality"), $tabactive, "status_rrd_graph.php?cat=quality");
-	if($wireless) {
-		if($curcat == "wireless") { $tabactive = True; } else { $tabactive = False; }
-	        $tab_array[] = array(gettext("Wireless"), $tabactive, "status_rrd_graph.php?cat=wireless");
-	}
-	if($cellular) {
-		if($curcat == "cellular") { $tabactive = True; } else { $tabactive = False; }
-	        $tab_array[] = array(gettext("Cellular"), $tabactive, "status_rrd_graph.php?cat=cellular");
-	}
-	if($vpnusers) {
-		if($curcat == "vpnusers") { $tabactive = True; } else { $tabactive = False; }
-	        $tab_array[] = array("VPN", $tabactive, "status_rrd_graph.php?cat=vpnusers");
-	}
-	if($captiveportal) {
-		if($curcat == "captiveportal") { $tabactive = True; } else { $tabactive = False; }
-	        $tab_array[] = array("Captive Portal", $tabactive, "status_rrd_graph.php?cat=captiveportal");
-	}
-	if($ntpd) {
-		if($curcat == "ntpd") { $tabactive = True; } else { $tabactive = False; }
-	        $tab_array[] = array("NTP", $tabactive, "status_rrd_graph.php?cat=ntpd");
-	}
-	if($curcat == "custom") { $tabactive = True; } else { $tabactive = False; }
-        $tab_array[] = array(gettext("Custom"), $tabactive, "status_rrd_graph.php?cat=custom");
-	if($curcat == "settings") { $tabactive = True; } else { $tabactive = False; }
-        $tab_array[] = array(gettext("Settings"), $tabactive, "status_rrd_graph_settings.php");
-        display_top_tabs($tab_array);
-?>