query the last updated timestamp only if output format is HTML

Avoids a number of warnings on PHP7.

ChangeLog

@@ -1,3 +1,8 @@
+2.5.1
+
+ * fix layout error in details page when keywords are displayed
+ * fix website check during setup
+
 2.5
 
  * reverse geocoding includes looking up housenumbers from Tiger data

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(Nominatim,2.5)
+AC_INIT(Nominatim,2.5.1)
 if git rev-parse HEAD 2>/dev/null >/dev/null; then
     AC_SUBST([PACKAGE_VERSION], [$PACKAGE_VERSION-git-`git rev-parse --short HEAD`])
 fi

lib/db.php

@@ -4,7 +4,7 @@
 	function &getDB($bNew = false, $bPersistent = false)
 	{
 		// Get the database object
-		$oDB =& DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
+		$oDB = DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
 		if (PEAR::IsError($oDB))
 		{
 			var_dump(CONST_Database_DSN);

lib/template/address-html.php

@@ -111,13 +111,13 @@
   <script type="text/javascript">
   <?php
 
-    $aNominatimMapInit = [
+    $aNominatimMapInit = array(
       'zoom' => isset($_GET['zoom']) ? htmlspecialchars($_GET['zoom']) : CONST_Default_Zoom,
       'lat'  => isset($_GET['lat'] ) ? htmlspecialchars($_GET['lat'] ) : CONST_Default_Lat,
       'lon'  => isset($_GET['lon'] ) ? htmlspecialchars($_GET['lon'] ) : CONST_Default_Lon,
       'tile_url' => $sTileURL,
       'tile_attribution' => $sTileAttribution
-    ];
+    );
     echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
     echo 'var nominatim_results = ' . json_encode([$aPlace], JSON_PRETTY_PRINT) . ';'; 

lib/template/details-html.php

@@ -113,6 +113,19 @@
 		echo "</tr>\n";
 	}
 
+	function _one_keyword_row($keyword_token,$word_id){
+		echo "<tr>\n";
+		echo '<td>';
+		// mark partial tokens (those starting with a space) with a star for readability
+		echo ($keyword_token[0]==' '?'*':'');
+		echo $keyword_token;
+		if (isset($word_id))
+		{
+			echo '</td><td>word id: '.$word_id;
+		}
+		echo "</td></tr>\n";
+	}
+
 ?>
 
 
@@ -209,7 +222,7 @@
 		headline('Name Keywords');
 		foreach($aPlaceSearchNameKeywords as $aRow)
 		{
-			echo '<div>'.$aRow['word_token']."</div>\n";
+			_one_keyword_row($aRow['word_token'], $aRow['word_id']);
 		}
 	}
 
@@ -218,7 +231,7 @@
 		headline('Address Keywords');
 		foreach($aPlaceSearchAddressKeywords as $aRow)
 		{
-			echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."</div>\n";
+			_one_keyword_row($aRow['word_token'], $aRow['word_id']);
 		}
 	}
 	
@@ -264,17 +277,17 @@
 	<script type="text/javascript">
 	<?php
 
-    $aNominatimMapInit = [
+    $aNominatimMapInit = array(
       'tile_url' => $sTileURL,
       'tile_attribution' => $sTileAttribution
-    ];
+    );
     echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
-    $aPlace = [
+    $aPlace = array(
 			'outlinestring' => $aPointDetails['outlinestring'],
 			'lon' => $aPointDetails['lon'],
 			'lat' => $aPointDetails['lat'],
-    ];
+	);
 	  echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
 
 

lib/template/includes/html-top-navigation.php

@@ -9,7 +9,7 @@
         </div>
       </div>
       <div id="last-updated" class="col-xs-4 text-center">
-        <?php if ($sDataDate){ ?>
+        <?php if (isset($sDataDate)){ ?>
           Data last updated:
           <br>
           <?php echo $sDataDate; ?>

lib/template/search-html.php

@@ -96,13 +96,13 @@
 	<script type="text/javascript">
 	<?php
 
-		$aNominatimMapInit = [
+		$aNominatimMapInit = array(
 			'zoom' => $iZoom,
 			'lat' => $fLat,
 			'lon' => $fLon,
 			'tile_url' => $sTileURL,
 			'tile_attribution' => $sTileAttribution
-		];
+		);
 		echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
 		echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';'; 

utils/query.php

@@ -31,7 +31,7 @@
         if (isset($aCMDResult['bounded'])) $aCMDResult['bounded'] = 'true';
         if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
 
-        $oGeocode =& new Geocode($oDB);
+        $oGeocode = new Geocode($oDB);
         if (isset($aCMDResult['accept-language']) && $aCMDResult['accept-language'])
             $oGeocode->setLanguagePreference(getPreferredLanguages($aCMDResult['accept-language']));
         else

utils/setup.php

@@ -97,7 +97,7 @@
 	{
 		echo "Create DB\n";
 		$bDidSomething = true;
-		$oDB =& DB::connect(CONST_Database_DSN, false);
+		$oDB = DB::connect(CONST_Database_DSN, false);
 		if (!PEAR::isError($oDB))
 		{
 			fail('database already exists ('.CONST_Database_DSN.')');
@@ -722,7 +722,7 @@
 		@symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
 		echo "Symlinks created\n";
 
-		$sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/tiles.js');
+		$sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/nominatim-ui.js');
 		if (!$sTestFile)
 		{
 			echo "\nWARNING: Unable to access the website at ".CONST_Website_BaseURL."\n";

website/details.php

@@ -159,7 +159,12 @@
 
 	logEnd($oDB, $hLog, 1);
 
+	if ($sOutputFormat=='html')
+	{
+		$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
 		$sTileURL = CONST_Map_Tile_URL;
 		$sTileAttribution = CONST_Map_Tile_Attribution;
+	}
+
 	
 	include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');

website/reverse.php

@@ -76,6 +76,10 @@
 		exit;
 	}
 
+	if ($sOutputFormat=='html')
+	{
+		$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
 		$sTileURL = CONST_Map_Tile_URL;
 		$sTileAttribution = CONST_Map_Tile_Attribution;
+	}
 	include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');

website/search.php

@@ -13,8 +13,6 @@
 	$fLat = CONST_Default_Lat;
 	$fLon = CONST_Default_Lon;
 	$iZoom = CONST_Default_Zoom;
-	$sTileURL = CONST_Map_Tile_URL;
-	$sTileAttribution = CONST_Map_Tile_Attribution;
 
 	$oGeocode =& new Geocode($oDB);
 
@@ -118,8 +116,12 @@
 	$aSearchResults = $oGeocode->lookup();
 	if ($aSearchResults === false) $aSearchResults = array();
 
+	if ($sOutputFormat=='html')
+	{
 		$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-
+		$sTileURL = CONST_Map_Tile_URL;
+		$sTileAttribution = CONST_Map_Tile_Attribution;
+	}
 	logEnd($oDB, $hLog, sizeof($aSearchResults));
 
 	$bAsText = $oGeocode->getIncludePolygonAsText();