From 1dab8ca7157b7ddbc08e64a60e8eb0f67abd616d Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 22 Nov 2023 18:28:50 +0100
Subject: [PATCH] Services / DHCP - rename DHCP to ISC DHCP

---
 .../app/models/OPNsense/Base/Menu/MenuSystem.php   | 14 +++++++-------
 .../mvc/app/models/OPNsense/Core/Menu/Menu.xml     |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php
index cf673afdd..3e9d6d2a5 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php
@@ -332,36 +332,36 @@ class MenuSystem
         // add interfaces to "Services: DHCPv[46]" menu tab:
         $ordid = 0;
         foreach ($iftargets['dhcp4'] as $key => $descr) {
-            $this->appendItem('Services.DHCPv4', $key, array(
+            $this->appendItem('Services.ISC_DHCPv4', $key, array(
                 'url' => '/services_dhcp.php?if=' . $key,
                 'visiblename' => "[$descr]",
                 'order' => $ordid++,
             ));
-            $this->appendItem('Services.DHCPv4.' . $key, 'Edit' . $key, array(
+            $this->appendItem('Services.ISC_DHCPv4.' . $key, 'Edit' . $key, array(
                 'url' => '/services_dhcp.php?if=' . $key . '&*',
                 'visibility' => 'hidden',
             ));
-            $this->appendItem('Services.DHCPv4.' . $key, 'AddStatic' . $key, array(
+            $this->appendItem('Services.ISC_DHCPv4.' . $key, 'AddStatic' . $key, array(
                 'url' => '/services_dhcp_edit.php?if=' . $key,
                 'visibility' => 'hidden',
             ));
-            $this->appendItem('Services.DHCPv4.' . $key, 'EditStatic' . $key, array(
+            $this->appendItem('Services.ISC_DHCPv4.' . $key, 'EditStatic' . $key, array(
                 'url' => '/services_dhcp_edit.php?if=' . $key . '&*',
                 'visibility' => 'hidden',
             ));
         }
         $ordid = 0;
         foreach ($iftargets['dhcp6'] as $key => $descr) {
-            $this->appendItem('Services.DHCPv6', $key, array(
+            $this->appendItem('Services.ISC_DHCPv6', $key, array(
                 'url' => '/services_dhcpv6.php?if=' . $key,
                 'visiblename' => "[$descr]",
                 'order' => $ordid++,
             ));
-            $this->appendItem('Services.DHCPv6.' . $key, 'Add' . $key, array(
+            $this->appendItem('Services.ISC_DHCPv6.' . $key, 'Add' . $key, array(
                 'url' => '/services_dhcpv6_edit.php?if=' . $key,
                 'visibility' => 'hidden',
             ));
-            $this->appendItem('Services.DHCPv6.' . $key, 'Edit' . $key, array(
+            $this->appendItem('Services.ISC_DHCPv6.' . $key, 'Edit' . $key, array(
                 'url' => '/services_dhcpv6_edit.php?if=' . $key . '&*',
                 'visibility' => 'hidden',
             ));
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
index b2cb705cc..ef5fdf8ad 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
@@ -177,15 +177,15 @@
         </LogFiles>
     </Firewall>
     <Services order="60" cssClass="fa fa-cog">
-        <DHCPv4 cssClass="fa fa-bullseye fa-fw">
+        <ISC_DHCPv4 VisibleName="ISC DHCPv4" cssClass="fa fa-bullseye fa-fw">
             <Relay order="200" url="/services_dhcp_relay.php"/>
             <Leases order="300" url="/ui/dhcpv4/leases"/>
             <LogFile VisibleName="Log File" order="400" url="/ui/diagnostics/log/core/dhcpd"/>
-        </DHCPv4>
-        <DHCPv6 cssClass="fa fa-bullseye fa-fw">
+        </ISC_DHCPv4>
+        <ISC_DHCPv6 VisibleName="ISC DHCPv6" cssClass="fa fa-bullseye fa-fw">
             <Relay order="300" url="/services_dhcpv6_relay.php"/>
             <Leases order="400" url="/ui/dhcpv6/leases"/>
-        </DHCPv6>
+        </ISC_DHCPv6>
         <OpenDNS VisibleName="OpenDNS" url="/services_opendns.php" cssClass="fa fa-tags fa-fw"/>
         <RouterAdv VisibleName="Router Advertisements" cssClass="fa fa-bullseye fa-fw" />
     </Services>