lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 17:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: straighten out the wan/lan assign code a little

Browse Source
This commit is contained in:
Franco Fichtner 2015-07-01 21:05:14 +02:00
parent 679b72f355
commit 5ddbfd16c7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/etc/inc/config.console.inc
View File

@ -106,21 +106,21 @@ EOD;
do {
echo "\n" . gettext("Enter the WAN interface name or 'a' for auto-detection:") . " ";
if ($interactive) {
$wanif = chop(fgets($fp));
} else {
$wanif = $ifnames[0];
echo $wanif . PHP_EOL;
}
if ($wanif == '') {
return;
}
if ($wanif == 'a') {
$wanif = autodetect_interface('WAN', $fp);
} elseif (!array_key_exists($wanif, $iflist)) {
printf(gettext("%sInvalid interface name '%s'%s"), "\n", $wanif, "\n");
}
if (!array_key_exists($wanif, $iflist)) {
printf("\n" . gettext("Invalid interface name '%s'") . "\n", $wanif);
unset($wanif);
continue;
}
} while (!$wanif);
@ -139,12 +139,14 @@ EOD;
if ($lanif == '') {
break;
}
if ($lanif == 'a') {
$lanif = autodetect_interface('LAN', $fp);
} elseif (!array_key_exists($lanif, $iflist)) {
}
if (!array_key_exists($lanif, $iflist)) {
printf(gettext("%sInvalid interface name '%s'%s"), "\n", $lanif, "\n");
unset($lanif);
continue;
}
} while (!$lanif);