From: Sarah Hoffmann Date: Fri, 25 May 2012 21:45:59 +0000 (+0200) Subject: avoid PHP notices X-Git-Tag: v2.0.0~58 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a44e21de49d397d8fb6d860a03f1cde711be59c0?ds=inline avoid PHP notices --- diff --git a/lib/log.php b/lib/log.php index e3126c0e..5b847a41 100644 --- a/lib/log.php +++ b/lib/log.php @@ -5,6 +5,9 @@ $aStartTime = explode('.',microtime(true)); if (!$aStartTime[1]) $aStartTime[1] = '0'; + $sOutputFormat = ''; + if (isset($_GET['format'])) $sOutputFormat = $_GET['format']; + $hLog = array( date('Y-m-d H:i:s',$aStartTime[0]).'.'.$aStartTime[1], $_SERVER["REMOTE_ADDR"], @@ -14,15 +17,15 @@ if (CONST_Log_DB) { - // Log + // Log if ($sType == 'search') { - $oDB->query('insert into query_log values ('.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[3]).','.getDBQuoted($hLog[1]).')'); + $oDB->query('insert into query_log values ('.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[3]).','.getDBQuoted($hLog[1]).')'); } $sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format)'; $sSQL .= ' values ('.getDBQuoted($sType).','.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[2]); - $sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($_GET['format']).')'; + $sSQL .= ','.getDBQuoted($hLog[1]).','.getDBQuoted($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($sOutputFormat).')'; $oDB->query($sSQL); } @@ -40,7 +43,7 @@ $_GET['lon'].','. $_GET['zoom'].','. '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'. - '"'.addslashes($_GET['format']).'"'."\n", + '"'.addslashes($sOutputFormat).'"'."\n", FILE_APPEND); } } @@ -50,9 +53,9 @@ function logEnd(&$oDB, $hLog, $iNumResults) { - $aEndTime = explode('.',microtime(true)); - if (!$aEndTime[1]) $aEndTime[1] = '0'; - $sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1]; + $aEndTime = explode('.',microtime(true)); + if (!$aEndTime[1]) $aEndTime[1] = '0'; + $sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1]; if (CONST_Log_DB) { @@ -79,7 +82,7 @@ '"'.addslashes($hLog[1]).'",'. '"'.addslashes($hLog[3]).'",'. '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'. - '"'.addslashes($_GET['format']).'",'. + '"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'. $iNumResults."\n", FILE_APPEND); } diff --git a/lib/template/search-html.php b/lib/template/search-html.php index f66ee705..8b79e40c 100644 --- a/lib/template/search-html.php +++ b/lib/template/search-html.php @@ -332,7 +332,7 @@ form{ Documentation | FAQ -
Thank you for your problem report
+ @@ -358,7 +358,7 @@ target="_blank">FAQ echo ', '.$aResult['aBoundingBox'][1]; echo ', '.$aResult['aBoundingBox'][2]; echo ', '.$aResult['aBoundingBox'][3]; - echo ', '.javascript_renderData($aResult['aPolyPoints']); + if (isset($aResult['aPolyPoints'])) echo ', '.javascript_renderData($aResult['aPolyPoints']); echo ');\'>'; } elseif (isset($aResult['zoom'])) @@ -370,7 +370,7 @@ target="_blank">FAQ echo '
'; } - echo ($aResult['icon']?'':''); + echo (isset($aResult['icon'])?'':''); echo ' '.$aResult['name'].''; echo ' '.round($aResult['lat'],3).','.round($aResult['lat'],3).''; echo ' '.$aResult['place_id'].''; @@ -450,7 +450,7 @@ init(); echo ', '.$aResult['aBoundingBox'][1]; echo ', '.$aResult['aBoundingBox'][2]; echo ', '.$aResult['aBoundingBox'][3]; - echo ', '.javascript_renderData($aResult['aPolyPoints']); + if (isset($aResult['aPolyPoints'])) echo ', '.javascript_renderData($aResult['aPolyPoints']); echo ');'."\n"; } else diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php index 6ceb53cd..0521de0e 100644 --- a/lib/template/search-xml.php +++ b/lib/template/search-xml.php @@ -10,7 +10,7 @@ echo " timestamp='".date(DATE_RFC822)."'"; echo " attribution='Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.'"; echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'"; - if ($sViewBox) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'"; + if (isset($sViewBox)) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'"; echo " polygon='".($bShowPolygons?'true':'false')."'"; if (sizeof($aExcludePlaceIDs)) { diff --git a/settings/settings.php b/settings/settings.php index 011198b6..4ebc199d 100644 --- a/settings/settings.php +++ b/settings/settings.php @@ -17,6 +17,7 @@ @define('CONST_ClosedForIndexing', false); @define('CONST_ClosedForIndexingExceptionIPs', ''); @define('CONST_BlockedIPs', ''); + @define('CONST_BulkUserIPs', ''); @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/'); @define('CONST_Tile_Default', 'Mapnik'); diff --git a/website/reverse.php b/website/reverse.php index aac99c0d..b053d764 100755 --- a/website/reverse.php +++ b/website/reverse.php @@ -69,7 +69,7 @@ 18 => 30, // or >, Building 19 => 30, // or >, Building ); - $iMaxRank = isset($aZoomRank[$_GET['zoom']])?$aZoomRank[$_GET['zoom']]:28; + $iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28; // Find the nearest point $fSearchDiam = 0.0001; @@ -144,13 +144,20 @@ $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']); } $aClassType = getClassTypes(); - $sAddressType = ''; - if (isset($aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']])) - $sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]['simplelabel']; - elseif (isset($aClassType[$aPlace['class'].':'.$aPlace['type']])) - $sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type']]['simplelabel']; - else $sAddressType = $aPlace['class']; - $aPlace['addresstype'] = $sAddressType; + $sAddressType = ''; + $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']; + if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel'])) + { + $sAddressType = $aClassType[$aClassType]['simplelabel']; + } + else + { + $sClassType = $aPlace['class'].':'.$aPlace['type']; + if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel'])) + $sAddressType = $aClassType[$sClassType]['simplelabel']; + else $sAddressType = $aPlace['class']; + } + $aPlace['addresstype'] = $sAddressType; } include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php'); diff --git a/website/search.php b/website/search.php index a1d0db72..71041080 100755 --- a/website/search.php +++ b/website/search.php @@ -92,7 +92,7 @@ // Search query $sQuery = (isset($_GET['q'])?trim($_GET['q']):''); - if (!$sQuery && $_SERVER['PATH_INFO'] && $_SERVER['PATH_INFO'][0] == '/') + if (!$sQuery && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/') { $sQuery = substr($_SERVER['PATH_INFO'], 1); @@ -452,7 +452,7 @@ if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; } } - elseif ($aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null) + elseif (isset($aSearchTerm['lat']) && $aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null) { if ($aSearch['fLat'] === '') { @@ -1312,10 +1312,10 @@ $bFirst = false; } if (!$bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']]) - && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['osm_class'].$aResult['name']]))) + && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['name']]))) { $aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true; - $aClassTypeNameDone[$aResult['osm_type'].$aResult['osm_class'].$aResult['name']] = true; + $aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['name']] = true; $aSearchResults[] = $aResult; }