Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / log.php

diff --git a/lib/log.php b/lib/log.php
index 93ad8f95f658e0b63af6b05f50322d38a8dcd6cb..8022376d93a246272c27a69bb1c7caa54673214b 100644 (file)
--- a/lib/log.php
+++ b/lib/log.php
@@ -5,6 +5,9 @@
                $aStartTime = explode('.',microtime(true));
                if (!$aStartTime[1]) $aStartTime[1] = '0';
 
+               $sOutputFormat = '';
+               if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
+
                $hLog = array(
                                date('Y-m-d H:i:s',$aStartTime[0]).'.'.$aStartTime[1],
                                $_SERVER["REMOTE_ADDR"],
@@ -14,19 +17,18 @@
 
                if (CONST_Log_DB)
                {
-                       // Log
-                       if ($sType == 'search')
-                       {
-                               $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)';
+                       if (isset($_GET['email']))
+                               $sUserAgent = $_GET['email'];
+                       else
+                               $sUserAgent = $_SERVER['HTTP_USER_AGENT'];
+                       $sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format,searchterm)';
                        $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($sUserAgent).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($sOutputFormat).','.getDBQuoted($hLog[3]).')';
                        $oDB->query($sSQL);
                }
 
-               if (CONST_Log_File && CONST_Log_File_ReverseLog != '') {
+               if (CONST_Log_File && CONST_Log_File_ReverseLog != '')
+               {
                 if ($sType == 'reverse')
                 {
                         $aStartTime = explode('.',$hLog[0]);
@@ -39,7 +41,7 @@
                                 $_GET['lon'].','.
                                 $_GET['zoom'].','.
                                 '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
-                                '"'.addslashes($_GET['format']).'"'."\n",
+                                '"'.addslashes($sOutputFormat).'"'."\n",
                         FILE_APPEND);
                 }
                }
@@ -49,18 +51,12 @@
 
        function logEnd(&$oDB, $hLog, $iNumResults)
        {
-                $aEndTime = explode('.',microtime(true));
-                if (!$aEndTime[1]) $aEndTime[1] = '0';
-                $sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
+               $aEndTime = explode('.',microtime(true));
+               if (!$aEndTime[1]) $aEndTime[1] = '0';
+               $sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
 
                if (CONST_Log_DB)
                {
-                       $sSQL = 'update query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
-                       $sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
-                       $sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
-                       $sSQL .= ' and query = '.getDBQuoted($hLog[3]);
-                       $oDB->query($sSQL);
-
                        $sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
                        $sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
                        $sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
@@ -68,7 +64,8 @@
                        $oDB->query($sSQL);
                }
 
-               if (CONST_Log_File && CONST_Log_File_SearchLog != '') {
+               if (CONST_Log_File && CONST_Log_File_SearchLog != '')
+               {
                 $aStartTime = explode('.',$hLog[0]);
                 file_put_contents(CONST_Log_File_SearchLog,
                                 $aStartTime[0].','.$aStartTime[1].','.
@@ -77,7 +74,7 @@
                                 '"'.addslashes($hLog[1]).'",'.
                                 '"'.addslashes($hLog[3]).'",'.
                                 '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
-                                '"'.addslashes($_GET['format']).'",'.
+                                '"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'.
                                 $iNumResults."\n",
                         FILE_APPEND);
                }