From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 12 Jun 2016 21:22:14 +0000 (+0200)
Subject: allow parameters to be empty
X-Git-Tag: v3.0.0~159^2~1
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/e842d8793c1c416a75bbae39c004184f1ed66289

allow parameters to be empty

Consider empty parameters as unset and use the default. Simplifies
use in forms.
---

diff --git a/lib/website.php b/lib/website.php
index 23cec940..cb714959 100644
--- a/lib/website.php
+++ b/lib/website.php
@@ -91,14 +91,14 @@ INTERNALFAIL;
 
 	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];
 	}
 
 	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]))
 		{
@@ -110,7 +110,7 @@ INTERNALFAIL;
 
 	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]))
 		{
@@ -122,14 +122,14 @@ INTERNALFAIL;
 
 	function getParamString($sName, $bDefault=false)
 	{
-		if (!isset($_GET[$sName])) return $bDefault;
+		if (!isset($_GET[$sName]) || strlen($_GET[$sName]) == 0) return $bDefault;
 
 		return $_GET[$sName];
 	}
 
 	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))
 		{