frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1707 from RaspAP/maint/attribution

Browse Source 
Update w/ code attribution - thx @easylo
This commit is contained in:
Bill Zimmerman 2024-12-07 08:33:53 +01:00 committed by GitHub
commit a7ac30f548
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/provider.php
View File

@ -278,6 +278,10 @@ function getCountries($id, $binPath)
$countries[$value] = str_replace("_", " ", $value); $countries[$value] = str_replace("_", " ", $value);
} }
break; break;
/**
* Thanks to GitHub user @easylo who contributed this portion
* of the AdGuard CLI country output parsing
*/
case 4: // adguard case 4: // adguard
$raw_countries = []; $raw_countries = [];
$totalLines = count($output); $totalLines = count($output);
@ -302,7 +306,7 @@ function getCountries($id, $binPath)
ksort($raw_countries); ksort($raw_countries);
// sort cities within each country // sort cities within each country
foreach ($raw_countries as $country => $cities) { foreach ($raw_countries as $country => $cities) {
sort($raw_countries[$country]); // Trier les villes par ordre alphabétique sort($raw_countries[$country]);
} }
// sort results by country, then by city // sort results by country, then by city
foreach ($raw_countries as $country => $cities) { foreach ($raw_countries as $country => $cities) {