hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 05:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow parameters to be empty

Browse Source 
Consider empty parameters as unset and use the default. Simplifies
use in forms.
This commit is contained in:
Sarah Hoffmann
2016-06-12 23:22:14 +02:00
parent 348a3082c9
commit e842d8793c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/website.php
View File

@@ -91,14 +91,14 @@ INTERNALFAIL;
function getParamBool($sName, $bDefault=false) function getParamBool($sName, $bDefault=false)
{ {
if (!isset($_GET[$sName])) return $bDefault; if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $bDefault;
return (bool) $_GET[$sName]; return (bool) $_GET[$sName];
} }
function getParamInt($sName, $bDefault=false) function getParamInt($sName, $bDefault=false)
{ {
if (!isset($_GET[$sName])) return $bDefault; if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $bDefault;
if (!preg_match('/^[+-]?[0-9]+$/', $_GET[$sName])) if (!preg_match('/^[+-]?[0-9]+$/', $_GET[$sName]))
{ {
@@ -110,7 +110,7 @@ INTERNALFAIL;
function getParamFloat($sName, $bDefault=false) function getParamFloat($sName, $bDefault=false)
{ {
if (!isset($_GET[$sName])) return $bDefault; if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $bDefault;
if (!preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET[$sName])) if (!preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET[$sName]))
{ {
@@ -122,14 +122,14 @@ INTERNALFAIL;
function getParamString($sName, $bDefault=false) function getParamString($sName, $bDefault=false)
{ {
if (!isset($_GET[$sName])) return $bDefault; if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $bDefault;
return $_GET[$sName]; return $_GET[$sName];
} }
function getParamSet($sName, $aValues, $sDefault=false) function getParamSet($sName, $aValues, $sDefault=false)
{ {
if (!isset($_GET[$sName])) return $sDefault; if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $sDefault;
if (!in_array($_GET[$sName], $aValues)) if (!in_array($_GET[$sName], $aValues))
{ {