frodovdr
/
raspap-webgui
mirror of https://github.com/billz/raspap-webgui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify and cleanup handling of return values of system calls 

Handling of return values done in a single line.
Determine only, if access is possible not not (true, false). The actual displayed text has to be determined, when displaying the result of the access check.
This commit is contained in:
zbchristian 2020-06-29 13:12:29 +02:00 committed by GitHub
parent d878cbf356
commit 4623060f08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
includes/internetRoute.php
View File

@ -12,24 +12,15 @@ if (!empty($routes) ) {
// resolve the name of the gateway (if possible)
unset($host);
exec('host '.$prop[2].' | sed -rn "s/.*domain name pointer (.*)\./\1/p" | head -n 1', $host);
if (empty($host)) {
$host[0]="*";
}
$rInfo[$i]["gw-name"] = $host[0];
$rInfo[$i]["gw-name"] = empty($host) ? "*" : $host[0];
if (isset($checkAccess) && $checkAccess) {
// check internet connectivity w/ and w/o DNS resolution
unset($okip);
exec('ping -W1 -c 1 -I '.$prop[0].' '.RASPI_ACCESS_CHECK_IP.' | sed -rn "s/.*icmp_seq=1.*time=.*/\&check\;/p"', $okip);
if (empty($okip)) {
$okip[0]="failed";
}
$rInfo[$i]["access-ip"] = $okip[0];
exec('ping -W1 -c 1 -I '.$prop[0].' '.ACCESS_CHECK_IP.' | sed -rn "s/.*icmp_seq=1.*time=.*/OK/p"',$okip);
$rInfo[$i]["access-ip"] = empty($okip) ? false : true;
unset($okdns);
exec('ping -W1 -c 1 -I '.$prop[0].' '.RASPI_ACCESS_CHECK_DNS.' | sed -rn "s/.*icmp_seq=1.*time=.*/\&check\;/p"', $okdns);
if (empty($okdns)) {
$okdns[0]="failed";
}
$rInfo[$i]["access-dns"] = $okdns[0];
exec('ping -W1 -c 1 -I '.$prop[0].' '.ACCESS_CHECK_DNS.' | sed -rn "s/.*icmp_seq=1.*time=.*/OK/p"',$okdns);
$rInfo[$i]["access-dns"] = empty($okdns) ? false : true;
}
}
} else {