Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / ParameterParser.php

diff --git a/lib-php/ParameterParser.php b/lib-php/ParameterParser.php
index d4068aa37c2c938458c5062585d23393b050658a..a4936d376d3cb773e31b9acf5386096fc209fc1a 100644 (file)
--- a/lib-php/ParameterParser.php
+++ b/lib-php/ParameterParser.php
@@ -1,4 +1,12 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 
 namespace Nominatim;
 
 
 namespace Nominatim;
 


@@ -14,7 +22,10 @@ class ParameterParser
 
     public function getBool($sName, $bDefault = false)
     {
 
     public function getBool($sName, $bDefault = false)
     {

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

             return $bDefault;
         }
 
             return $bDefault;
         }
 


@@ -23,7 +34,7 @@ class ParameterParser
 
     public function getInt($sName, $bDefault = false)
     {
 
     public function getInt($sName, $bDefault = false)
     {

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

             return $bDefault;
         }
 
             return $bDefault;
         }
 


@@ -36,7 +47,7 @@ class ParameterParser
 
     public function getFloat($sName, $bDefault = false)
     {
 
     public function getFloat($sName, $bDefault = false)
     {

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

             return $bDefault;
         }
 
             return $bDefault;
         }
 


@@ -49,7 +60,10 @@ class ParameterParser
 
     public function getString($sName, $bDefault = false)
     {
 
     public function getString($sName, $bDefault = false)
     {

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

             return $bDefault;
         }
 
             return $bDefault;
         }
 


@@ -58,11 +72,14 @@ class ParameterParser
 
     public function getSet($sName, $aValues, $sDefault = false)
     {
 
     public function getSet($sName, $aValues, $sDefault = false)
     {

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

             return $sDefault;
         }
 
             return $sDefault;
         }
 

-        if (!in_array($this->aParams[$sName], $aValues)) {
+        if (!in_array($this->aParams[$sName], $aValues, true)) {

             userError("Parameter '$sName' must be one of: ".join(', ', $aValues));
         }
 
             userError("Parameter '$sName' must be one of: ".join(', ', $aValues));
         }
 


@@ -106,21 +123,27 @@ class ParameterParser
         }
 
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
         }
 
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {

-            $aLangPrefOrder['name:'.$sLanguage] = 'name:'.$sLanguage;
+            $this->addNameTag($aLangPrefOrder, 'name:'.$sLanguage);

         }
         }

-        $aLangPrefOrder['name'] = 'name';
-        $aLangPrefOrder['brand'] = 'brand';
+        $this->addNameTag($aLangPrefOrder, 'name');
+        $this->addNameTag($aLangPrefOrder, 'brand');

         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {

-            $aLangPrefOrder['official_name:'.$sLanguage] = 'official_name:'.$sLanguage;
-            $aLangPrefOrder['short_name:'.$sLanguage] = 'short_name:'.$sLanguage;
+            $this->addNameTag($aLangPrefOrder, 'official_name:'.$sLanguage);
+            $this->addNameTag($aLangPrefOrder, 'short_name:'.$sLanguage);

         }
         }

-        $aLangPrefOrder['official_name'] = 'official_name';
-        $aLangPrefOrder['short_name'] = 'short_name';
-        $aLangPrefOrder['ref'] = 'ref';
-        $aLangPrefOrder['type'] = 'type';
+        $this->addNameTag($aLangPrefOrder, 'official_name');
+        $this->addNameTag($aLangPrefOrder, 'short_name');
+        $this->addNameTag($aLangPrefOrder, 'ref');
+        $this->addNameTag($aLangPrefOrder, 'type');

         return $aLangPrefOrder;
     }
 
         return $aLangPrefOrder;
     }
 

+    private function addNameTag(&$aLangPrefOrder, $sTag)
+    {
+        $aLangPrefOrder[$sTag] = $sTag;
+        $aLangPrefOrder['_place_'.$sTag] = '_place_'.$sTag;
+    }
+

     public function hasSetAny($aParamNames)
     {
         foreach ($aParamNames as $sName) {
     public function hasSetAny($aParamNames)
     {
         foreach ($aParamNames as $sName) {