php: prefer structured over free-form query

[nominatim.git] / lib-php / DebugHtml.php

diff --git a/lib-php/DebugHtml.php b/lib-php/DebugHtml.php
index 98da8794055c644e23fbb90ffdbbc6d3d5b45f8e..7b0cba2d0e569114a90d7f446ac5543717e6a923 100644 (file)
--- a/lib-php/DebugHtml.php
+++ b/lib-php/DebugHtml.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.
+ */

 
 namespace Nominatim;
 
 
 namespace Nominatim;
 


@@ -78,7 +86,7 @@ class Debug
         echo '<th>Address Tokens</th><th>Address Not</th>';
         echo '<th>country</th><th>operator</th>';
         echo '<th>class</th><th>type</th><th>postcode</th><th>housenumber</th></tr>';
         echo '<th>Address Tokens</th><th>Address Not</th>';
         echo '<th>country</th><th>operator</th>';
         echo '<th>class</th><th>type</th><th>postcode</th><th>housenumber</th></tr>';

-        foreach ($aSearches as $iRank => $aRankedSet) {
+        foreach ($aSearches as $aRankedSet) {

             foreach ($aRankedSet as $aRow) {
                 $aRow->dumpAsHtmlTableRow($aWordsIDs);
             }
             foreach ($aRankedSet as $aRow) {
                 $aRow->dumpAsHtmlTableRow($aWordsIDs);
             }


@@ -127,7 +135,7 @@ class Debug
 
     public static function printSQL($sSQL)
     {
 
     public static function printSQL($sSQL)
     {

-        echo '<p><tt><font color="#aaa">'.$sSQL.'</font></tt></p>'."\n";
+        echo '<p><tt><b>'.date('c').'</b> <font color="#aaa">'.htmlspecialchars($sSQL, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401).'</font></tt></p>'."\n";

     }
 
     private static function outputVar($mVar, $sPreNL)
     }
 
     private static function outputVar($mVar, $sPreNL)


@@ -170,11 +178,12 @@ class Debug
         }
 
         if (is_string($mVar)) {
         }
 
         if (is_string($mVar)) {

-            echo "'$mVar'";
-            return strlen($mVar) + 2;
+            $sOut = "'$mVar'";
+        } else {
+            $sOut = (string)$mVar;

         }
 
         }
 

-        echo (string)$mVar;
-        return strlen((string)$mVar);
+        echo htmlspecialchars($sOut, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401);
+        return strlen($sOut);

     }
 }
     }
 }