diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
index 0cdacd6c7..012897c17 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php
@@ -240,27 +240,27 @@ foreach ($containers as $ct) {
// Construct TSinfo from TSstats
$TSinfo = '';
if (!$TSstats["Self"]["Online"]) {
- $TSinfo .= ""._("Online:")."❌
"._("Please check the logs!")."
";
+ $TSinfo .= ""._("Online").":❌
"._("Please check the logs")."!
";
} else {
$TS_version = explode('-', $TSstats["Version"])[0];
if (!empty($TS_version)) {
if (!empty($TS_latest_version)) {
if ($TS_version !== $TS_latest_version) {
- $TSinfo .= ""._("Tailscale:")."v" . $TS_version . " ➔ v" . $TS_latest_version . " "._("available!")."
";
+ $TSinfo .= ""._("Tailscale").":v" . $TS_version . " ➔ v" . $TS_latest_version . " "._("available")."!
";
} else {
- $TSinfo .= ""._("Tailscale:")."v" . $TS_version . "
";
+ $TSinfo .= ""._("Tailscale").":v" . $TS_version . "
";
}
} else {
- $TSinfo .= "".("Tailscale:")."v" . $TS_version . "
";
+ $TSinfo .= "".("Tailscale").":v" . $TS_version . "
";
}
}
- $TSinfo .= ""._("Online:")."✅
";
+ $TSinfo .= ""._("Online").":✅
";
$TS_DNSName = $TSstats["Self"]["DNSName"];
$TS_HostNameActual = substr($TS_DNSName, 0, strpos($TS_DNSName, '.'));
if (strcasecmp($TS_HostNameActual, $TShostname) !== 0 && !empty($TS_DNSName)) {
- $TSinfo .= ""._("Hostname:").""._("Real Hostname")." ➔ " . $TS_HostNameActual . "
";
+ $TSinfo .= ""._("Hostname").":"._("Real Hostname")." ➔ " . $TS_HostNameActual . "
";
} else {
- $TSinfo .= ""._("Hostname:")."" . $TShostname . "
";
+ $TSinfo .= ""._("Hostname").":" . $TShostname . "
";
}
// Map region relay code to cleartext region if TS_derp_list is available
if (!empty($TS_derp_list)) {
@@ -271,31 +271,31 @@ foreach ($containers as $ct) {
}
}
if (!empty($TSregion)) {
- $TSinfo .= ""._("DERP Relay:")."" . $TSregion . "
";
+ $TSinfo .= ""._("DERP Relay").":" . $TSregion . "
";
} else {
- $TSinfo .= ""._("DERP Relay:")."" . $TSstats["Self"]["Relay"] . "
";
+ $TSinfo .= ""._("DERP Relay").":" . $TSstats["Self"]["Relay"] . "
";
}
} else {
$TSinfo .= ""._("DERP Relay").":" . $TSstats["Self"]["Relay"] . "
";
}
if (!empty($TSstats["Self"]["TailscaleIPs"])) {
- $TSinfo .= ""._("Addresses:")."" . implode("
", $TSstats["Self"]["TailscaleIPs"]) . "
";
+ $TSinfo .= ""._("Addresses").":" . implode("
", $TSstats["Self"]["TailscaleIPs"]) . "
";
}
if (!empty($TSstats["Self"]["PrimaryRoutes"])) {
- $TSinfo .= ""._("Routes:")."" . implode("
", $TSstats["Self"]["PrimaryRoutes"]) . "
";
+ $TSinfo .= ""._("Routes").":" . implode("
", $TSstats["Self"]["PrimaryRoutes"]) . "
";
}
if ($TSstats["Self"]["ExitNodeOption"]) {
- $TSinfo .= ""._("Is Exit Node:")."✅
";
+ $TSinfo .= ""._("Is Exit Node").":✅
";
} else {
if (!empty($TSstats["ExitNodeStatus"])) {
$TS_exit_node_status = ($TSstats["ExitNodeStatus"]["Online"]) ? "✅" : "❌";
- $TSinfo .= ""._("Exit Node:")."" . strstr($TSstats["ExitNodeStatus"]["TailscaleIPs"][0], '/', true) . " | Status: " . $TS_exit_node_status ."
";
+ $TSinfo .= ""._("Exit Node").":" . strstr($TSstats["ExitNodeStatus"]["TailscaleIPs"][0], '/', true) . " | Status: " . $TS_exit_node_status ."
";
} else {
- $TSinfo .= ""._("Is Exit Node:")."❌
";
+ $TSinfo .= ""._("Is Exit Node").":❌
";
}
}
if (!empty($TSwebGui)) {
- $TSinfo .= ""._("URL:")."" . $TSwebGui . "
";
+ $TSinfo .= ""._("URL").":" . $TSwebGui . "
";
}
if (!empty($TSstats["Self"]["KeyExpiry"])) {
$TS_expiry = new DateTime($TSstats["Self"]["KeyExpiry"]);
@@ -303,9 +303,9 @@ foreach ($containers as $ct) {
$TS_expiry_formatted = $TS_expiry->format('Y-m-d');
$TS_expiry_diff = $current_Date->diff($TS_expiry);
if ($TS_expiry_diff->invert) {
- $TSinfo .= ""._("Key Expiry:")."❌ "._("Expired! Renew/Disable key expiry!")."
";
+ $TSinfo .= ""._("Key Expiry").":❌ "._("Expired! Renew/Disable key expiry!")."
";
} else {
- $TSinfo .= ""._("Key Expiry:")."" . $TS_expiry_formatted . " (" . $TS_expiry_diff->days . " days)
";
+ $TSinfo .= ""._("Key Expiry").":" . $TS_expiry_formatted . " (" . $TS_expiry_diff->days . " days)
";
}
}
}
@@ -313,7 +313,7 @@ foreach ($containers as $ct) {
$TS_status = "
";
} else {
// Display message to refresh page if Tailscale in the container wasn't maybe ready to get the data
- $TS_status = "
";
+ $TS_status = "
";
}
} else {
// Display message that container isn't running
Tailscale