Merge pull request #1449 from RaspAP/fix/dashboard-ifaces

Fix: dashboard interface stop/start button mismatch
RaspAP · Nov 6, 2023 · 6731f3a · 6731f3a
2 parents b31b1a7 + be1feb2
commit 6731f3a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/includes/dashboard.php b/includes/dashboard.php
@@ -39,7 +39,6 @@ function DisplayDashboard(&$extraFooterScripts)
             $address = $inet[1];
             $suffix  = (int) $inet[2];
             $netmask = long2ip(-1 << (32 - $suffix));
-
             $ipv4Addrs    .= " $address";
             $ipv4Netmasks .= " $netmask";
         }
@@ -157,7 +156,7 @@ function DisplayDashboard(&$extraFooterScripts)
             // Pressed stop button
             if ($interfaceState === 'UP') {
                 $status->addMessage(sprintf(_('Interface is going %s.'), _('down')), 'warning');
-                exec('sudo ip link set '.$_SESSION['wifi_client_interface'].' down');
+                exec('sudo ip link set '.$_SESSION['ap_interface'].' down');
                 $wlan0up = false;
                 $status->addMessage(sprintf(_('Interface is now %s.'), _('down')), 'success');
             } elseif ($interfaceState === 'unknown') {
@@ -169,8 +168,8 @@ function DisplayDashboard(&$extraFooterScripts)
             // Pressed start button
             if ($interfaceState === 'DOWN') {
                 $status->addMessage(sprintf(_('Interface is going %s.'), _('up')), 'warning');
-                exec('sudo ip link set ' .$_SESSION['wifi_client_interface']. ' up');
-                exec('sudo ip -s a f label ' . $_SESSION['wifi_client_interface']);
+                exec('sudo ip link set ' .$_SESSION['ap_interface']. ' up');
+                exec('sudo ip -s a f label ' .$_SESSION['ap_interface']);
                 $wlan0up = true;
                 $status->addMessage(sprintf(_('Interface is now %s.'), _('up')), 'success');
             } elseif ($interfaceState === 'unknown') {

diff --git a/templates/dashboard.php b/templates/dashboard.php
@@ -126,9 +126,9 @@
                 <?php echo CSRFTokenFieldTag() ?>
                 <?php if (!RASPI_MONITOR_ENABLED) : ?>
                     <?php if (!$wlan0up) : ?>
-                    <input type="submit" class="btn btn-success" value="<?php echo _("Start").' '.$clientInterface ?>" name="ifup_wlan0" />
+                    <input type="submit" class="btn btn-success" value="<?php echo _("Start").' '.$apInterface ?>" name="ifup_wlan0" />
                     <?php else : ?>
-                    <input type="submit" class="btn btn-warning" value="<?php echo _("Stop").' '.$clientInterface ?>"  name="ifdown_wlan0" />
+                    <input type="submit" class="btn btn-warning" value="<?php echo _("Stop").' '.$apInterface ?>"  name="ifdown_wlan0" />
                     <?php endif ?>
                 <?php endif ?>
               <button type="button" onClick="window.location.reload();" class="btn btn-outline btn-primary"><i class="fas fa-sync-alt"></i> <?php echo _("Refresh") ?></a>