From b33ed9e20702fef8b95e3816fe367fb2e982ae10 Mon Sep 17 00:00:00 2001
From: Maurice Walker <maurice@walker.earth>
Date: Wed, 24 Aug 2022 00:40:46 +0200
Subject: [PATCH] Interfaces Overview, merge DHCPv4 / DHCPv6 buttons

Having two sets of buttons implies that they only act on the respective protocol, but this is not the case.
---
 src/www/status_interfaces.php | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/www/status_interfaces.php b/src/www/status_interfaces.php
index 0eb7601c0..0a7f90495 100644
--- a/src/www/status_interfaces.php
+++ b/src/www/status_interfaces.php
@@ -125,30 +125,21 @@ include("head.inc");
 <?php endif ?>
                       </td>
                     </tr>
-<?php if (!empty($ifinfo['dhcplink']) && !empty($ifinfo['enable'])): ?>
+<?php if ((!empty($ifinfo['dhcplink']) || !empty($ifinfo['dhcp6link'])) && !empty($ifinfo['enable'])): ?>
                     <tr>
                       <td> <?=gettext("DHCP");?></td>
                       <td>
                         <form name="dhcplink_form" method="post">
                           <input type="hidden" name="if" value="<?= $ifdescr ?>" />
-                          <input type="hidden" name="status" value="<?= $ifinfo['dhcplink'] ?>" />
-                          <?= $ifinfo['dhcplink'] ?>&nbsp;&nbsp;
+                          <input type="hidden" name="status" value="<?= ($ifinfo['dhcplink'] == "up" || $ifinfo['dhcp6link'] == "up") ? gettext("up") : gettext("down") ?>" />
+                          <?php if (!empty($ifinfo['dhcplink'])): ?>
+                            <?= gettext("DHCPv4 ") ?><?= $ifinfo['dhcplink'] ?>&nbsp;&nbsp;
+                          <?php endif ?>
+                          <?php if (!empty($ifinfo['dhcp6link'])): ?>
+                            <?= gettext("DHCPv6 ") ?><?= $ifinfo['dhcp6link'] ?>&nbsp;&nbsp;
+                          <?php endif ?>
                           <button type="submit" name="submit" class="btn btn-primary btn-xs" value="remote"><?= gettext('Reload') ?></button>
-                          <button type="submit" name="submit" class="btn btn-xs" value="local"><?= $ifinfo['dhcplink'] == "up" ? gettext("Release") : gettext("Renew") ?></button>
-                        </form>
-                      </td>
-                    </tr>
-<?php endif ?>
-<?php if (!empty($ifinfo['dhcp6link']) && !empty($ifinfo['enable'])): ?>
-                    <tr>
-                      <td> <?=gettext("DHCP6");?></td>
-                      <td>
-                        <form name="dhcp6link_form" method="post">
-                          <input type="hidden" name="if" value="<?= $ifdescr ?>" />
-                          <input type="hidden" name="status" value="<?= $ifinfo['dhcp6link'] ?>" />
-                          <?= $ifinfo['dhcp6link'] ?>&nbsp;&nbsp;
-                          <button type="submit" name="submit" class="btn btn-primary btn-xs" value="remote"><?= gettext('Reload') ?></button>
-                          <button type="submit" name="submit" class="btn btn-xs" value="local"><?= $ifinfo['dhcp6link'] == "up" ? gettext("Release") : gettext("Renew") ?></button>
+                          <button type="submit" name="submit" class="btn btn-xs" value="local"><?= ($ifinfo['dhcplink'] == "up" || $ifinfo['dhcp6link'] == "up") ? gettext("Release") : gettext("Renew") ?></button>
                         </form>
                       </td>
                     </tr>