Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / ParameterParser.php

diff --git a/lib/ParameterParser.php b/lib/ParameterParser.php
index aff2612cdfefe0702ccc6d7f5d146953cb801b1d..26b648bb2865165d8b9ee897263b2ebed17016f1 100644 (file)
--- a/lib/ParameterParser.php
+++ b/lib/ParameterParser.php
@@ -1,15 +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;


@@ -18,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;
         }
 


@@ -31,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;
         }
 


@@ -44,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;


@@ -53,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;


@@ -66,21 +69,22 @@ 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();
         }
 
         $aLanguages = array();


@@ -95,7 +99,7 @@ class ParameterParser
                 arsort($aLanguages);
             }
         }
                 arsort($aLanguages);
             }
         }

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

             $aLanguages[CONST_Default_Language] = 1;
         }
 
             $aLanguages[CONST_Default_Language] = 1;
         }