Commit b3d01d5f authored by Franco Fichtner's avatar Franco Fichtner

dashboard: according to crash reports DynDNS widget can race

Fix a few style errors while there.

(cherry picked from commit 63a0231e)
(cherry picked from commit a10382ca)
(cherry picked from commit 79863b19)
parent d5813b76
...@@ -46,35 +46,41 @@ if (!empty($_REQUEST['getdyndnsstatus'])) { ...@@ -46,35 +46,41 @@ if (!empty($_REQUEST['getdyndnsstatus'])) {
$first_entry = false; $first_entry = false;
} else { } else {
// Put a vertical bar delimiter between the echoed HTML for each entry processed. // Put a vertical bar delimiter between the echoed HTML for each entry processed.
echo "|"; echo '|';
} }
$filename = "/conf/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}.cache"; $filename = "/conf/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}.cache";
$filename_v6 = "/conf/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}_v6.cache"; $fdata = '';
if (file_exists($filename) && !empty($dyndns['enable'])) { if (!empty($dyndns['enable']) && file_exists($filename)) {
$ipaddr = dyndnsCheckIP($dyndns['interface']); $ipaddr = dyndnsCheckIP($dyndns['interface']);
$cached_ip_s = preg_split('/:/', file_get_contents($filename)); $fdata = @file_get_contents($filename);
$cached_ip = $cached_ip_s[0];
if ($ipaddr <> $cached_ip) {
echo "<font color='red'>";
} else {
echo "<font color='green'>";
} }
echo htmlspecialchars($cached_ip);
echo "</font>"; $filename_v6 = "/conf/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}_v6.cache";
} elseif (file_exists($filename_v6) && !empty($dyndns['enable'])) { $fdata6 = '';
if (!empty($dyndns['enable']) && file_exists($filename_v6)) {
$ipv6addr = get_interface_ipv6($dyndns['interface']); $ipv6addr = get_interface_ipv6($dyndns['interface']);
$cached_ipv6_s = explode("|", file_get_contents($filename_v6)); $fdata6 = @file_get_contents($filename_v6);
$cached_ipv6 = $cached_ipv6_s[0];
if ($ipv6addr <> $cached_ipv6) {
echo "<font color='red'>";
} else {
echo "<font color='green'>";
} }
echo htmlspecialchars($cached_ipv6);
echo "</font>"; if (!empty($fdata)) {
$cached_ip_s = preg_split('/:/', $fdata);
$cached_ip = $cached_ip_s[0];
echo sprintf(
'<font color="%s">%s</font>',
$ipaddr != $cached_ip ? 'red' : 'green',
htmlspecialchars($cached_ip)
);
} elseif (!empty($fdata6)) {
$cached_ipv6_s = explode('|', $fdata6);
$cached_ipv6 = $cached_ipv6_s[0];
echo sprintf(
'<font color="%s">%s</font>',
$ipv6addr != $cached_ipv6 ? 'red' : 'green',
htmlspecialchars($cached_ipv6)
);
} else { } else {
echo '<span class="text-muted">' . gettext('N/A') . '</span>'; echo sprintf('<span class="text-muted">%s</span>', gettext('N/A'));
} }
} }
exit; exit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment