mirror of
https://github.com/RaspAP/raspap-webgui.git
synced 2024-11-25 00:50:29 +00:00
Merge pull request #1635 from RaspAP/fix/nordvpn-cli
Update parsing of NordVPN countries, fixes #1634
This commit is contained in:
commit
a5e2d832ef
1 changed files with 3 additions and 5 deletions
|
@ -102,7 +102,7 @@ function DisplayProviderConfig()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validates VPN provider settings
|
* Validates VPN provider settings
|
||||||
*
|
*
|
||||||
* @param object $status
|
* @param object $status
|
||||||
* @param string $binPath
|
* @param string $binPath
|
||||||
|
@ -240,11 +240,9 @@ function getCountries($id, $binPath)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 3: // nordvpn
|
case 3: // nordvpn
|
||||||
$output = stripArtifacts($output,'\s');
|
|
||||||
$arrTmp = explode(",", $output[0]);
|
$arrTmp = explode(",", $output[0]);
|
||||||
$countries = array_combine($arrTmp, $arrTmp);
|
foreach ($output as $key => $value) {
|
||||||
foreach ($countries as $key => $value) {
|
$countries[$value] = str_replace("_", " ", $value);
|
||||||
$countries[$key] = str_replace("_", " ", $value);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in a new issue