diff --git a/src/usr/local/emhttp/plugins/tailscale/include/Pages/Log.php b/src/usr/local/emhttp/plugins/tailscale/include/Pages/Log.php index 9f3cb0b..2c0b565 100644 --- a/src/usr/local/emhttp/plugins/tailscale/include/Pages/Log.php +++ b/src/usr/local/emhttp/plugins/tailscale/include/Pages/Log.php @@ -74,5 +74,5 @@ function showLog(log) { Log size:   - " onclick="window.open('/plugins/plugin-diagnostics/download.php?plugin=tailscale','_blank')" /> + " onclick="window.open('/plugins/plugin-diagnostics/download.php?plugin=tailscale','_blank')">

\ No newline at end of file
diff --git a/src/usr/local/emhttp/plugins/tailscale/include/Pages/Main.php b/src/usr/local/emhttp/plugins/tailscale/include/Pages/Main.php
index 0041ea3..cd25f7d 100644
--- a/src/usr/local/emhttp/plugins/tailscale/include/Pages/Main.php
+++ b/src/usr/local/emhttp/plugins/tailscale/include/Pages/Main.php
@@ -13,6 +13,7 @@
         showStatus('tailscaled');
     });
 
+
 Enable) {
     echo($tr->tr("tailscale_disabled"));
diff --git a/src/usr/local/emhttp/plugins/tailscale/include/Pages/Settings.php b/src/usr/local/emhttp/plugins/tailscale/include/Pages/Settings.php
index b706ccd..8583b8f 100644
--- a/src/usr/local/emhttp/plugins/tailscale/include/Pages/Settings.php
+++ b/src/usr/local/emhttp/plugins/tailscale/include/Pages/Settings.php
@@ -10,29 +10,14 @@
     return;
 }
 ?>
-
 
 
 
 
- - + value="tailscale/tailscale.cfg"> + +

tr("settings.system_settings"); ?>

@@ -149,7 +134,7 @@

tr("settings.restart"); ?>

- +
tr("settings.context.restart"); ?>
@@ -162,7 +147,7 @@

tr("settings.diagnostics"); ?>

- +
tr("settings.context.diagnostics"); ?>
@@ -177,7 +162,7 @@

tr("settings.erase"); ?>

- +
tr("settings.context.erase"); ?>
@@ -195,7 +180,7 @@
- + -

diff --git a/src/usr/local/emhttp/plugins/tailscale/include/Tailscale/Info.php b/src/usr/local/emhttp/plugins/tailscale/include/Tailscale/Info.php index 5e3962d..439e6b7 100644 --- a/src/usr/local/emhttp/plugins/tailscale/include/Tailscale/Info.php +++ b/src/usr/local/emhttp/plugins/tailscale/include/Tailscale/Info.php @@ -59,9 +59,9 @@ public function getStatusInfo(): StatusInfo $statusInfo->KeyExpiration = isset($status->Self->KeyExpiry) ? $status->Self->KeyExpiry : $this->tr("disabled"); $statusInfo->Online = isset($status->Self->Online) ? ($status->Self->Online ? $this->tr("yes") : $this->tr("no")) : $this->tr("unknown"); $statusInfo->InNetMap = isset($status->Self->InNetworkMap) ? ($status->Self->InNetworkMap ? $this->tr("yes") : $this->tr("no")) : $this->tr("unknown"); - $statusInfo->Tags = isset($status->Self->Tags) ? implode("
", $status->Self->Tags) : ""; + $statusInfo->Tags = isset($status->Self->Tags) ? implode("
", $status->Self->Tags) : ""; $statusInfo->LoggedIn = isset($prefs->LoggedOut) ? ($prefs->LoggedOut ? $this->tr("no") : $this->tr("yes")) : $this->tr("unknown"); - $statusInfo->TsHealth = isset($status->Health) ? implode("
", $status->Health) : ""; + $statusInfo->TsHealth = isset($status->Health) ? implode("
", $status->Health) : ""; $statusInfo->LockEnabled = $this->getTailscaleLockEnabled() ? $this->tr("yes") : $this->tr("no"); if ($this->getTailscaleLockEnabled()) { @@ -87,9 +87,9 @@ public function getConnectionInfo(): ConnectionInfo $info->HostName = isset($status->Self->HostName) ? $status->Self->HostName : $this->tr("unknown"); $info->DNSName = isset($status->Self->DNSName) ? $status->Self->DNSName : $this->tr("unknown"); - $info->TailscaleIPs = isset($status->TailscaleIPs) ? implode("
", $status->TailscaleIPs) : $this->tr("unknown"); + $info->TailscaleIPs = isset($status->TailscaleIPs) ? implode("
", $status->TailscaleIPs) : $this->tr("unknown"); $info->MagicDNSSuffix = isset($status->MagicDNSSuffix) ? $status->MagicDNSSuffix : $this->tr("unknown"); - $info->AdvertisedRoutes = isset($prefs->AdvertiseRoutes) ? implode("
", $prefs->AdvertiseRoutes) : $this->tr("none"); + $info->AdvertisedRoutes = isset($prefs->AdvertiseRoutes) ? implode("
", $prefs->AdvertiseRoutes) : $this->tr("none"); $info->AcceptRoutes = isset($prefs->RouteAll) ? ($prefs->RouteAll ? $this->tr("yes") : $this->tr("no")) : $this->tr("unknown"); $info->AcceptDNS = isset($prefs->CorpDNS) ? ($prefs->CorpDNS ? $this->tr("yes") : $this->tr("no")) : $this->tr("unknown"); diff --git a/src/usr/local/emhttp/plugins/tailscale/include/data/Lock.php b/src/usr/local/emhttp/plugins/tailscale/include/data/Lock.php index 6709bb9..15eb01d 100644 --- a/src/usr/local/emhttp/plugins/tailscale/include/data/Lock.php +++ b/src/usr/local/emhttp/plugins/tailscale/include/data/Lock.php @@ -25,7 +25,7 @@ continue; } - $rows .= ""; + $rows .= ""; } $output = <<Traffic ? $peer->TxBytes : ""; $rxBytes = $peer->Traffic ? $peer->RxBytes : ""; $pingHost = ($peer->SharedUser || $peer->Active || ! $peer->Online || $peer->Mullvad) ? "" : ""; - $ips = implode("
", $peer->IP); + $ips = implode("
", $peer->IP); $rows .= << diff --git a/src/usr/local/emhttp/plugins/tailscale/include/tailscale-lock/signing.php b/src/usr/local/emhttp/plugins/tailscale/include/tailscale-lock/signing.php index 23a70ad..0bbd727 100644 --- a/src/usr/local/emhttp/plugins/tailscale/include/tailscale-lock/signing.php +++ b/src/usr/local/emhttp/plugins/tailscale/include/tailscale-lock/signing.php @@ -46,7 +46,7 @@ function loadFilteredPeers() { - +
{$lockHost}{$lockKey}
{$lockHost}{$lockKey}
 

diff --git a/src/usr/local/emhttp/plugins/tailscale/style.css b/src/usr/local/emhttp/plugins/tailscale/style.css new file mode 100644 index 0000000..459605c --- /dev/null +++ b/src/usr/local/emhttp/plugins/tailscale/style.css @@ -0,0 +1,15 @@ +.tablesorter .filtered { + display: none; +} +.tablesorter-filter.disabled { + display: none; +} +.fileTree { + width: 300px; + max-height: 150px; + overflow-y: scroll; + overflow-x: hidden; + position: absolute; + z-index: 100; + display: none +} \ No newline at end of file