lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: console PHP 8+ issues and inconsistencies

Browse Source
This commit is contained in:
Franco Fichtner 2022-08-25 13:16:47 +02:00
parent 79e122ff08
commit ead2c880c6
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/etc/inc/console.inc
View File

@ -218,16 +218,16 @@ EOD;
if ($wanif == 'a') {
$wanif = autodetect_interface('WAN', $fp);
if (!$wanif) {
if ($wanif == '') {
continue;
}
}
if (!array_key_exists($wanif, $iflist_all)) {
printf("\nInvalid interface name '%s'\n", $wanif);
unset($wanif);
$wanif = '';
}
} while (!$wanif);
} while ($wanif == '');
do {
echo "\nEnter the LAN interface name or 'a' for auto-detection\n" .
@ -248,7 +248,7 @@ EOD;
if ($lanif == 'a') {
$lanif = autodetect_interface('LAN', $fp);
if (!$lanif) {
if ($lanif == '') {
continue;
}
}
@ -258,15 +258,15 @@ EOD;
unset($lanif);
}
if ($wanif && $lanif == $wanif) {
unset($lanif);
if ($wanif != '' && $lanif == $wanif) {
$lanif = '';
echo <<<EOD
Error: you cannot assign the same interface name twice!
EOD;
}
} while (!$lanif);
} while ($lanif == '');
$done = false;
while (!$done) {
@ -298,12 +298,11 @@ EOD;
}
if ($optif[$i] == 'a') {
$ad = autodetect_interface('OPT' . $io, $fp);
if (!$ad) {
$optif[$i] = autodetect_interface('OPT' . $io, $fp);
if ($optif[$i] == '') {
unset($optif[$i]);
continue;
}
$optif[$i] = $ad;
}
if (!array_key_exists($optif[$i], $iflist_all)) {
@ -313,12 +312,12 @@ EOD;
}
/* check for double assignments */
$ifarr = array_merge(array($lanif, $wanif), $optif);
$ifarr = array_merge([$lanif, $wanif], $optif);
$again = false;
for ($k = 0; $k < (count($ifarr) - 1); $k++) {
for ($j = ($k + 1); $j < count($ifarr); $j++) {
if ($ifarr[$k] == $ifarr[$j]) {
if ($ifarr[$k] != '' && $ifarr[$k] == $ifarr[$j]) {
$again = true;
echo <<<EOD
@ -503,7 +502,7 @@ EOD;
echo "No link-up detected.\n";
return false;
return '';
}
function lagg_setup($iflist, $fp)