services: properly hook up dhcp services

src/www/diag_logs_dhcp.php

@@ -10,6 +10,6 @@ function clear_hook()
 }
 
 require_once 'services.inc';
-$shortcut_section = 'dhcp';
+$shortcut_section = 'dhcpd';
 
 require_once 'diag_logs_template.inc';

src/www/fbegin.inc

@@ -33,7 +33,10 @@ function find_service_by_shortcut($name)
 {
 	$shortcuts = array();
 
-	$shortcuts['dhcp'] = 'dhcpd';
+	/* WIP unify mapping so "shortcuts" are no longer needed */
+	$shortcuts['dhcpd'] = 'dhcpd';
+	$shortcuts['dhcrelay'] = 'dhcrelay';
+	$shortcuts['dhcrelay6'] = 'dhcrelay6';
 	$shortcuts['forwarder'] = 'dnsmasq';
 	$shortcuts['gateways'] = 'apinger';
 	$shortcuts['ipsec'] = 'ipsec';

src/www/services_dhcp.php

@@ -535,7 +535,7 @@ if ($act == "del") {
 	}
 }
 
-$shortcut_section = "dhcp";
+$shortcut_section = 'dhcpd';
 $closehead = false;
 
 include("head.inc");

src/www/services_dhcp_edit.php

@@ -306,7 +306,7 @@ if ($_POST) {
 	}
 }
 
-$shortcut_section = "dhcp";
+$shortcut_section = 'dhcpd';
 $closehead = false;
 
 include("head.inc");

src/www/services_dhcp_relay.php

 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
-	Copyright (C) 2003-2004 Justin Ellison <justin@techadvise.com>.
-	Copyright (C) 2010	Ermal Luçi
+	Copyright (C) 2010 Ermal Luçi
+	Copyright (C) 2003-2004 Justin Ellison <justin@techadvise.com>
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -94,7 +95,7 @@ if ($_POST) {
 	}
 }
 
-$shortcut_section = "dhcp";
+$shortcut_section = 'dhcrelay';
 $closehead = false;
 
 include("head.inc");

src/www/services_dhcpv6.php

@@ -345,6 +345,7 @@ if ($_GET['act'] == "del") {
 	}
 }
 
+$shortcut_section = 'dhcpd';
 $closehead = false;
 
 include("head.inc");

src/www/services_dhcpv6_edit.php

@@ -162,6 +162,8 @@ if ($_POST) {
 	}
 }
 
+$shortcut_section = 'dhcpd';
+
 include("head.inc");
 
 ?>

src/www/services_dhcpv6_relay.php

@@ -90,6 +90,7 @@ if ($_POST) {
 	}
 }
 
+$shortcut_section = 'dhcrelay6';
 $closehead = false;
 
 include("head.inc");

src/www/status_dhcp_leases.php

@@ -34,7 +34,7 @@ require_once("services.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
-$shortcut_section = "dhcp";
+$shortcut_section = 'dhcpd';
 
 $leasesfile = "{$g['dhcpd_chroot_path']}/var/db/dhcpd.leases";
 

src/www/status_dhcpv6_leases.php

@@ -74,6 +74,8 @@ if (($_GET['deleteip']) && (is_ipaddr($_GET['deleteip']))) {
 // Load MAC-Manufacturer table
 $mac_man = load_mac_manufacturer_table();
 
+$shortcut_section = 'dhcpd';
+
 include("head.inc");
 
 ?>