Merge pull request #1635 from RaspAP/fix/nordvpn-cli

Update parsing of NordVPN countries, fixes #1634
RaspAP · Aug 10, 2024 · a5e2d83 · a5e2d83
2 parents 90d63a6 + 484820f
commit a5e2d83
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/includes/provider.php b/includes/provider.php
@@ -102,7 +102,7 @@ function DisplayProviderConfig()
 }
 
 /**
- * Validates VPN provider settings 
+ * Validates VPN provider settings
  *
  * @param object $status
  * @param string $binPath
@@ -240,11 +240,9 @@ function getCountries($id, $binPath)
         }
         break;
     case 3: // nordvpn
-        $output = stripArtifacts($output,'\s');
         $arrTmp = explode(",", $output[0]);
-        $countries = array_combine($arrTmp, $arrTmp);
-        foreach ($countries as $key => $value) {
-            $countries[$key] = str_replace("_", " ", $value);
+        foreach ($output as $key => $value) {
+            $countries[$value] = str_replace("_", " ", $value);
         }
         break;
     default: