safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

avoid PHP notices

Browse Source
This commit is contained in:
Sarah Hoffmann
2012-05-25 23:45:59 +02:00
parent c433a2d739
commit a44e21de49
6 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/log.php
View File

@@ -5,6 +5,9 @@
$aStartTime = explode('.',microtime(true)); $aStartTime = explode('.',microtime(true));
if (!$aStartTime[1]) $aStartTime[1] = '0'; if (!$aStartTime[1]) $aStartTime[1] = '0';
$sOutputFormat = '';
if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
$hLog = array( $hLog = array(
date('Y-m-d H:i:s',$aStartTime[0]).'.'.$aStartTime[1], date('Y-m-d H:i:s',$aStartTime[0]).'.'.$aStartTime[1],
$_SERVER["REMOTE_ADDR"], $_SERVER["REMOTE_ADDR"],
@@ -14,15 +17,15 @@
if (CONST_Log_DB) if (CONST_Log_DB)
{ {
// Log // Log
if ($sType == 'search') 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 = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format)';
$sSQL .= ' values ('.getDBQuoted($sType).','.getDBQuoted($hLog[0]).','.getDBQuoted($hLog[2]); $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); $oDB->query($sSQL);
} }
@@ -40,7 +43,7 @@
$_GET['lon'].','. $_GET['lon'].','.
$_GET['zoom'].','. $_GET['zoom'].','.
'"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'. '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
'"'.addslashes($_GET['format']).'"'."\n", '"'.addslashes($sOutputFormat).'"'."\n",
FILE_APPEND); FILE_APPEND);
} }
} }
@@ -50,9 +53,9 @@
function logEnd(&$oDB, $hLog, $iNumResults) function logEnd(&$oDB, $hLog, $iNumResults)
{ {
$aEndTime = explode('.',microtime(true)); $aEndTime = explode('.',microtime(true));
if (!$aEndTime[1]) $aEndTime[1] = '0'; if (!$aEndTime[1]) $aEndTime[1] = '0';
$sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1]; $sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
if (CONST_Log_DB) if (CONST_Log_DB)
{ {
@@ -79,7 +82,7 @@
'"'.addslashes($hLog[1]).'",'. '"'.addslashes($hLog[1]).'",'.
'"'.addslashes($hLog[3]).'",'. '"'.addslashes($hLog[3]).'",'.
'"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'. '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
'"'.addslashes($_GET['format']).'",'. '"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'.
$iNumResults."\n", $iNumResults."\n",
FILE_APPEND); FILE_APPEND);
} }

8
lib/template/search-html.php
View File

@@ -332,7 +332,7 @@ form{
<a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Documentation</a> | <a href="http://wiki.openstreetmap.org/wiki/Nominatim/FAQ" <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Documentation</a> | <a href="http://wiki.openstreetmap.org/wiki/Nominatim/FAQ"
target="_blank">FAQ</a></td> target="_blank">FAQ</a></td>
<?php } ?> <td style="text-align:right;"><?php if ($sQuery) { if ($sReportDescription) {?><div style="text-align:center;"><b>Thank you for your problem report</b></div><?php } else { ?><input type="button" value="Report Problem With Results" onclick="$('report').style.visibility=($('report').style.visibility=='hidden'?'visible':'hidden')"><?php }} ?></td> <?php } ?> <td style="text-align:right;"><?php if ($sQuery) { ?><input type="button" value="Report Problem With Results" onclick="$('report').style.visibility=($('report').style.visibility=='hidden'?'visible':'hidden')"><?php } ?></td>
</tr> </tr>
</table> </table>
</form> </form>
@@ -358,7 +358,7 @@ target="_blank">FAQ</a></td>
echo ', '.$aResult['aBoundingBox'][1]; echo ', '.$aResult['aBoundingBox'][1];
echo ', '.$aResult['aBoundingBox'][2]; echo ', '.$aResult['aBoundingBox'][2];
echo ', '.$aResult['aBoundingBox'][3]; echo ', '.$aResult['aBoundingBox'][3];
echo ', '.javascript_renderData($aResult['aPolyPoints']); if (isset($aResult['aPolyPoints'])) echo ', '.javascript_renderData($aResult['aPolyPoints']);
echo ');\'>'; echo ');\'>';
} }
elseif (isset($aResult['zoom'])) elseif (isset($aResult['zoom']))
@@ -370,7 +370,7 @@ target="_blank">FAQ</a></td>
echo '<div class="result" onClick="panToLatLon('.$aResult['lat'].', '.$aResult['lon'].');">'; echo '<div class="result" onClick="panToLatLon('.$aResult['lat'].', '.$aResult['lon'].');">';
} }
echo ($aResult['icon']?'<img src="'.$aResult['icon'].'">':''); echo (isset($aResult['icon'])?'<img src="'.$aResult['icon'].'">':'');
echo ' <span class="name">'.$aResult['name'].'</span>'; echo ' <span class="name">'.$aResult['name'].'</span>';
echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lat'],3).'</span>'; echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lat'],3).'</span>';
echo ' <span class="place_id">'.$aResult['place_id'].'</span>'; echo ' <span class="place_id">'.$aResult['place_id'].'</span>';
@@ -450,7 +450,7 @@ init();
echo ', '.$aResult['aBoundingBox'][1]; echo ', '.$aResult['aBoundingBox'][1];
echo ', '.$aResult['aBoundingBox'][2]; echo ', '.$aResult['aBoundingBox'][2];
echo ', '.$aResult['aBoundingBox'][3]; echo ', '.$aResult['aBoundingBox'][3];
echo ', '.javascript_renderData($aResult['aPolyPoints']); if (isset($aResult['aPolyPoints'])) echo ', '.javascript_renderData($aResult['aPolyPoints']);
echo ');'."\n"; echo ');'."\n";
} }
else else

2
lib/template/search-xml.php
View File

@@ -10,7 +10,7 @@
echo " timestamp='".date(DATE_RFC822)."'"; echo " timestamp='".date(DATE_RFC822)."'";
echo " attribution='Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.'"; echo " attribution='Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.'";
echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'"; 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')."'"; echo " polygon='".($bShowPolygons?'true':'false')."'";
if (sizeof($aExcludePlaceIDs)) if (sizeof($aExcludePlaceIDs))
{ {

1
settings/settings.php
View File

@@ -17,6 +17,7 @@
@define('CONST_ClosedForIndexing', false); @define('CONST_ClosedForIndexing', false);
@define('CONST_ClosedForIndexingExceptionIPs', ''); @define('CONST_ClosedForIndexingExceptionIPs', '');
@define('CONST_BlockedIPs', ''); @define('CONST_BlockedIPs', '');
@define('CONST_BulkUserIPs', '');
@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/'); @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
@define('CONST_Tile_Default', 'Mapnik'); @define('CONST_Tile_Default', 'Mapnik');

23
website/reverse.php
View File

@@ -69,7 +69,7 @@
18 => 30, // or >, Building 18 => 30, // or >, Building
19 => 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 // Find the nearest point
$fSearchDiam = 0.0001; $fSearchDiam = 0.0001;
@@ -144,13 +144,20 @@
$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']); $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
} }
$aClassType = getClassTypes(); $aClassType = getClassTypes();
$sAddressType = ''; $sAddressType = '';
if (isset($aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']])) $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
$sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]['simplelabel']; if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
elseif (isset($aClassType[$aPlace['class'].':'.$aPlace['type']])) {
$sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type']]['simplelabel']; $sAddressType = $aClassType[$aClassType]['simplelabel'];
else $sAddressType = $aPlace['class']; }
$aPlace['addresstype'] = $sAddressType; 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'); include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');

8
website/search.php
View File

@@ -92,7 +92,7 @@
// Search query // Search query
$sQuery = (isset($_GET['q'])?trim($_GET['q']):''); $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); $sQuery = substr($_SERVER['PATH_INFO'], 1);
@@ -452,7 +452,7 @@
if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
} }
} }
elseif ($aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null) elseif (isset($aSearchTerm['lat']) && $aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null)
{ {
if ($aSearch['fLat'] === '') if ($aSearch['fLat'] === '')
{ {
@@ -1312,10 +1312,10 @@
$bFirst = false; $bFirst = false;
} }
if (!$bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']]) 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; $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; $aSearchResults[] = $aResult;
} }