Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib-php/log.php b/lib-php/log.php
index 25ed75cb2c7117411d013a5b78931129496cfec3..1d567733938d5afdbf783442c75ac9c5ccf5cf08 100644 (file)
--- a/lib-php/log.php
+++ b/lib-php/log.php
@@ -1,19 +1,35 @@
 <?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.
+ */

 
 
 function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
 {
     $fStartTime = microtime(true);
     $aStartTime = explode('.', $fStartTime);
 
 
 function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
 {
     $fStartTime = microtime(true);
     $aStartTime = explode('.', $fStartTime);

-    if (!isset($aStartTime[1])) $aStartTime[1] = '0';
+    if (!isset($aStartTime[1])) {
+        $aStartTime[1] = '0';
+    }

 
     $sOutputFormat = '';
 
     $sOutputFormat = '';

-    if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
+    if (isset($_GET['format'])) {
+        $sOutputFormat = $_GET['format'];
+    }

 
     if ($sType == 'reverse') {
         $sOutQuery = (isset($_GET['lat'])?$_GET['lat']:'').'/';
 
     if ($sType == 'reverse') {
         $sOutQuery = (isset($_GET['lat'])?$_GET['lat']:'').'/';

-        if (isset($_GET['lon'])) $sOutQuery .= $_GET['lon'];
-        if (isset($_GET['zoom'])) $sOutQuery .= '/'.$_GET['zoom'];
+        if (isset($_GET['lon'])) {
+            $sOutQuery .= $_GET['lon'];
+        }
+        if (isset($_GET['zoom'])) {
+            $sOutQuery .= '/'.$_GET['zoom'];
+        }

     } else {
         $sOutQuery = $sQuery;
     }
     } else {
         $sOutQuery = $sQuery;
     }


@@ -28,13 +44,15 @@ function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
             );
 
     if (CONST_Log_DB) {
             );
 
     if (CONST_Log_DB) {

-        if (isset($_GET['email']))
+        if (isset($_GET['email'])) {

             $sUserAgent = $_GET['email'];
             $sUserAgent = $_GET['email'];

-        elseif (isset($_SERVER['HTTP_REFERER']))
+        } elseif (isset($_SERVER['HTTP_REFERER'])) {

             $sUserAgent = $_SERVER['HTTP_REFERER'];
             $sUserAgent = $_SERVER['HTTP_REFERER'];

-        elseif (isset($_SERVER['HTTP_USER_AGENT']))
+        } elseif (isset($_SERVER['HTTP_USER_AGENT'])) {

             $sUserAgent = $_SERVER['HTTP_USER_AGENT'];
             $sUserAgent = $_SERVER['HTTP_USER_AGENT'];

-        else $sUserAgent = '';
+        } else {
+            $sUserAgent = '';
+        }

         $sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format,searchterm)';
         $sSQL .= ' values (';
         $sSQL .= join(',', $oDB->getDBQuotedList(array(
         $sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format,searchterm)';
         $sSQL .= ' values (';
         $sSQL .= join(',', $oDB->getDBQuotedList(array(


@@ -60,7 +78,9 @@ function logEnd(&$oDB, $hLog, $iNumResults)
 
     if (CONST_Log_DB) {
         $aEndTime = explode('.', $fEndTime);
 
     if (CONST_Log_DB) {
         $aEndTime = explode('.', $fEndTime);

-        if (!$aEndTime[1]) $aEndTime[1] = '0';
+        if (!isset($aEndTime[1])) {
+            $aEndTime[1] = '0';
+        }

         $sEndTime = date('Y-m-d H:i:s', $aEndTime[0]).'.'.$aEndTime[1];
 
         $sSQL = 'update new_query_log set endtime = '.$oDB->getDBQuoted($sEndTime).', results = '.$iNumResults;
         $sEndTime = date('Y-m-d H:i:s', $aEndTime[0]).'.'.$aEndTime[1];
 
         $sSQL = 'update new_query_log set endtime = '.$oDB->getDBQuoted($sEndTime).', results = '.$iNumResults;