frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Merge pull request #358 from glaszig/fix/dashboard-ipv6-addresses

Browse Source 
fix display of ip addresses in dashboard
This commit is contained in:
Bill Zimmerman 2019-07-30 19:03:32 -07:00 committed by GitHub
commit 1b32ed53d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
includes/dashboard.php
View File

@ -29,32 +29,27 @@ function DisplayDashboard()
$ipv4Addrs = '';
$ipv4Netmasks = '';
if (!preg_match_all('/inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/([0-3][0-9])/i', $stdoutIpWRepeatedSpaces, $matchesIpv4AddrAndSubnet)) {
if (!preg_match_all('/inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/([0-3][0-9])/i', $stdoutIpWRepeatedSpaces, $matchesIpv4AddrAndSubnet, PREG_SET_ORDER)) {
$ipv4Addrs = _('No IPv4 Address Found');
} else {
$numMatchesIpv4AddrAndSubnet = count($matchesIpv4AddrAndSubnet);
for ($i = 1; $i < $numMatchesIpv4AddrAndSubnet; $i += 2) {
if ($i > 2) {
$ipv4Netmasks .= ' ';
$ipv4Addrs .= ' ';
}
foreach ($matchesIpv4AddrAndSubnet as $inet) {
$address = $inet[1];
$suffix = (int) $inet[2];
$netmask = long2ip(-1 << (32 - $suffix));
$ipv4Addrs .= $matchesIpv4AddrAndSubnet[$i][0];
$ipv4Netmasks .= long2ip(-1 << (32 -(int)$matchesIpv4AddrAndSubnet[$i+1][0]));
$ipv4Addrs .= " $address";
$ipv4Netmasks .= " $netmask";
}
$ipv4Addrs = trim($ipv4Addrs);
$ipv4Netmasks = trim($ipv4Netmasks);
}
$ipv6Addrs = '';
if (!preg_match_all('/inet6 ([a-f0-9:]+)/i', $stdoutIpWRepeatedSpaces, $matchesIpv6Addr)) {
$ipv6Addrs = _('No IPv6 Address Found');
} else {
$numMatchesIpv6Addr = count($matchesIpv6Addr);
for ($i = 1; $i < $numMatchesIpv6Addr; ++$i) {
if ($i > 1) {
$ipv6Addrs .= ' ';
}
$ipv6Addrs .= $matchesIpv6Addr[$i];
if (isset($matchesIpv6Addr[1])) {
$ipv6Addrs = implode(' ', $matchesIpv6Addr[1]);
}
}