Merge pull request #2016 from lonvia/locale-address-russia

[nominatim.git] / lib / ParameterParser.php

diff --git a/lib/ParameterParser.php b/lib/ParameterParser.php
index 0c0471a39b732b185573d51a22295173ede572ec..32a848b93011fce3edaa1975ad6450369b121725 100644 (file)
--- a/lib/ParameterParser.php
+++ b/lib/ParameterParser.php
@@ -1,16 +1,18 @@
 <?php
 
 <?php
 

+namespace Nominatim;
+

 class ParameterParser
 {
     private $aParams;
 
 
 class ParameterParser
 {
     private $aParams;
 
 

-    function __construct($aParams = null)
+    public function __construct($aParams = null)

     {
         $this->aParams = ($aParams === null) ? $_GET : $aParams;
     }
 
     {
         $this->aParams = ($aParams === null) ? $_GET : $aParams;
     }
 

-    function getBool($sName, $bDefault = false)
+    public function getBool($sName, $bDefault = false)

     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $bDefault;
     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $bDefault;


@@ -19,9 +21,9 @@ class ParameterParser
         return (bool) $this->aParams[$sName];
     }
 
         return (bool) $this->aParams[$sName];
     }
 

-    function getInt($sName, $bDefault = false)
+    public function getInt($sName, $bDefault = false)

     {
     {

-        if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
+        if (!isset($this->aParams[$sName])) {

             return $bDefault;
         }
 
             return $bDefault;
         }
 


@@ -32,9 +34,9 @@ class ParameterParser
         return (int) $this->aParams[$sName];
     }
 
         return (int) $this->aParams[$sName];
     }
 

-    function getFloat($sName, $bDefault = false)
+    public function getFloat($sName, $bDefault = false)

     {
     {

-        if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
+        if (!isset($this->aParams[$sName])) {

             return $bDefault;
         }
 
             return $bDefault;
         }
 


@@ -45,7 +47,7 @@ class ParameterParser
         return (float) $this->aParams[$sName];
     }
 
         return (float) $this->aParams[$sName];
     }
 

-    function getString($sName, $bDefault = false)
+    public function getString($sName, $bDefault = false)

     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $bDefault;
     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $bDefault;


@@ -54,7 +56,7 @@ class ParameterParser
         return $this->aParams[$sName];
     }
 
         return $this->aParams[$sName];
     }
 

-    function getSet($sName, $aValues, $sDefault = false)
+    public function getSet($sName, $aValues, $sDefault = false)

     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $sDefault;
     {
         if (!isset($this->aParams[$sName]) || strlen($this->aParams[$sName]) == 0) {
             return $sDefault;


@@ -67,28 +69,29 @@ class ParameterParser
         return $this->aParams[$sName];
     }
 
         return $this->aParams[$sName];
     }
 

-    function getStringList($sName, $aDefault = false)
+    public function getStringList($sName, $aDefault = false)

     {
         $sValue = $this->getString($sName);
 
         if ($sValue) {
     {
         $sValue = $this->getString($sName);
 
         if ($sValue) {

-            return explode(',', $sValue);
+            // removes all NULL, FALSE and Empty Strings but leaves 0 (zero) values
+            return array_values(array_filter(explode(',', $sValue), 'strlen'));

         }
 
         return $aDefault;
     }
 
         }
 
         return $aDefault;
     }
 

-    function getPreferredLanguages($sFallback = null)
+    public function getPreferredLanguages($sFallback = null)

     {
     {

-        if ($sFallback === null && isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
-            $sFallback = $_SERVER["HTTP_ACCEPT_LANGUAGE"];
+        if ($sFallback === null && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            $sFallback = $_SERVER['HTTP_ACCEPT_LANGUAGE'];

         }
 
         $aLanguages = array();
         $sLangString = $this->getString('accept-language', $sFallback);
 
         if ($sLangString) {
         }
 
         $aLanguages = array();
         $sLangString = $this->getString('accept-language', $sFallback);
 
         if ($sLangString) {

-            if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)) {
+            if (preg_match_all('/(([a-z]{1,8})([-_][a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)) {

                 foreach ($aLanguagesParse as $iLang => $aLanguage) {
                     $aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
                     if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;
                 foreach ($aLanguagesParse as $iLang => $aLanguage) {
                     $aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
                     if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;


@@ -96,23 +99,34 @@ class ParameterParser
                 arsort($aLanguages);
             }
         }
                 arsort($aLanguages);
             }
         }

-        if (!sizeof($aLanguages) && CONST_Default_Language) {
+        if (empty($aLanguages) && CONST_Default_Language) {

             $aLanguages[CONST_Default_Language] = 1;
         }
 
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
             $aLanguages[CONST_Default_Language] = 1;
         }
 
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {

-            $aLangPrefOrder['short_name:'.$sLanguage] = 'short_name:'.$sLanguage;

             $aLangPrefOrder['name:'.$sLanguage] = 'name:'.$sLanguage;
         }
             $aLangPrefOrder['name:'.$sLanguage] = 'name:'.$sLanguage;
         }

-        $aLangPrefOrder['short_name'] = 'short_name';

         $aLangPrefOrder['name'] = 'name';
         $aLangPrefOrder['brand'] = 'brand';
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
             $aLangPrefOrder['official_name:'.$sLanguage] = 'official_name:'.$sLanguage;
         $aLangPrefOrder['name'] = 'name';
         $aLangPrefOrder['brand'] = 'brand';
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
             $aLangPrefOrder['official_name:'.$sLanguage] = 'official_name:'.$sLanguage;

+            $aLangPrefOrder['short_name:'.$sLanguage] = 'short_name:'.$sLanguage;

         }
         $aLangPrefOrder['official_name'] = 'official_name';
         }
         $aLangPrefOrder['official_name'] = 'official_name';

+        $aLangPrefOrder['short_name'] = 'short_name';

         $aLangPrefOrder['ref'] = 'ref';
         $aLangPrefOrder['type'] = 'type';
         return $aLangPrefOrder;
     }
         $aLangPrefOrder['ref'] = 'ref';
         $aLangPrefOrder['type'] = 'type';
         return $aLangPrefOrder;
     }

+
+    public function hasSetAny($aParamNames)
+    {
+        foreach ($aParamNames as $sName) {
+            if ($this->getBool($sName)) {
+                return true;
+            }
+        }
+
+        return false;
+    }

 }
 }