README: tiny markdown syntax error

[nominatim.git] / lib / ParameterParser.php

diff --git a/lib/ParameterParser.php b/lib/ParameterParser.php
index 2eed1629b04742ad274c6ac9f5cf8d9bf1ebfbd3..ad281d70b634260bfcac15d4656c425d4299e4f1 100644 (file)
--- a/lib/ParameterParser.php
+++ b/lib/ParameterParser.php
@@ -23,7 +23,7 @@ class ParameterParser
 
     public 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;
         }
 


@@ -36,7 +36,7 @@ class ParameterParser
 
     public 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;
         }
 


@@ -74,7 +74,8 @@ class ParameterParser
         $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;


@@ -90,7 +91,7 @@ class ParameterParser
         $sLangString = $this->getString('accept-language', $sFallback);
 
         if ($sLangString) {
         $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;


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