Merge pull request #3530 from lonvia/clean-use-of-os-environ

[nominatim.git] / lib-php / template / address-xml.php

diff --git a/lib-php/template/address-xml.php b/lib-php/template/address-xml.php
index ab0bc72cbab623cbe62ff13d217ba6325b0deaf3..c418a4c496c0e886128e86513cab6823f04f53ae 100644 (file)
--- a/lib-php/template/address-xml.php
+++ b/lib-php/template/address-xml.php
@@ -1,4 +1,12 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 header('content-type: text/xml; charset=UTF-8');
 
 echo '<';
 header('content-type: text/xml; charset=UTF-8');
 
 echo '<';


@@ -12,17 +20,29 @@ echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'"
 echo ">\n";
 
 if (empty($aPlace)) {
 echo ">\n";
 
 if (empty($aPlace)) {

-    if (isset($sError))
+    if (isset($sError)) {

         echo "<error>$sError</error>";
         echo "<error>$sError</error>";

-    else echo '<error>Unable to geocode</error>';
+    } else {
+        echo '<error>Unable to geocode</error>';
+    }

 } else {
     echo '<result';
 } else {
     echo '<result';

-    if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
+    if ($aPlace['place_id']) {
+        echo ' place_id="'.$aPlace['place_id'].'"';
+    }

     $sOSMType = formatOSMType($aPlace['osm_type']);
     $sOSMType = formatOSMType($aPlace['osm_type']);

-    if ($sOSMType) echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
-    if ($aPlace['ref']) echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
-    if (isset($aPlace['lat'])) echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
-    if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
+    if ($sOSMType) {
+        echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
+    }
+    if ($aPlace['ref']) {
+        echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
+    }
+    if (isset($aPlace['lat'])) {
+        echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
+    }
+    if (isset($aPlace['lon'])) {
+        echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';
+    }

     if (isset($aPlace['aBoundingBox'])) {
         echo ' boundingbox="';
         echo join(',', $aPlace['aBoundingBox']);
     if (isset($aPlace['aBoundingBox'])) {
         echo ' boundingbox="';
         echo join(',', $aPlace['aBoundingBox']);