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 #1468 from RaspAP/fix/isoquery-opts

Browse Source 
Fix: Version compatibility check for isoquery options
This commit is contained in:
Bill Zimmerman
2023-12-04 08:59:21 +01:00
committed by GitHub
parent ff7f1f01b4 89cb4621fa
commit 7e39bc0d35
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
includes/functions.php
View File

@@ -874,10 +874,15 @@ function loadFooterScripts($extraFooterScripts)
* *
* @param string $locale * @param string $locale
* @param boolean $flag * @param boolean $flag
* @see https://salsa.debian.org/debian/isoquery/
*/ */
function getCountryCodes($locale = 'en', $flag = true) { function getCountryCodes($locale = 'en', $flag = true) {
define("FLAG_SUPPORT", "3.3.0");
$output = []; $output = [];
if ($flag) { $version = shell_exec("isoquery --version | grep -oP '(?<=isoquery )\d+\.\d+\.\d+'");
$compat = checkReleaseVersion(FLAG_SUPPORT, $version);
if ($flag && $compat) {
$opt = '--flag'; $opt = '--flag';
} }
exec("isoquery $opt --locale $locale | awk -F'\t' '{print $5 \"\t\" $0}' | sort | cut -f2-", $output); exec("isoquery $opt --locale $locale | awk -F'\t' '{print $5 \"\t\" $0}' | sort | cut -f2-", $output);