Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / log.php

diff --git a/lib/log.php b/lib/log.php
index 5b847a41172d8c84626fcb3dfea9d0df1cbaa080..59e04d1745baf59f5e96232b59984187188f69df 100644 (file)
--- a/lib/log.php
+++ b/lib/log.php
@@ -3,7 +3,7 @@
        function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
        {
                $aStartTime = explode('.',microtime(true));
-               if (!$aStartTime[1]) $aStartTime[1] = '0';
+               if (!isset($aStartTime[1])) $aStartTime[1] = '0';
 
                $sOutputFormat = '';
                if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
@@ -13,39 +13,39 @@
                                $_SERVER["REMOTE_ADDR"],
                                $_SERVER['QUERY_STRING'],
                                $sQuery
-                       );
+                               );
 
                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'];
+                       elseif (isset($_SERVER['HTTP_REFERER']))
+                               $sUserAgent = $_SERVER['HTTP_REFERER'];
+                       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($sOutputFormat).')';
+                       $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 ($sType == 'reverse')
-                {
-                        $aStartTime = explode('.',$hLog[0]);
-                        file_put_contents(CONST_Log_File_ReverseLog,
-                                $aStartTime[0].','.$aStartTime[1].','.
-                                php_uname('n').','.
-                                '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
-                                '"'.addslashes($hLog[1]).'",'.
-                                $_GET['lat'].','.
-                                $_GET['lon'].','.
-                                $_GET['zoom'].','.
-                                '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
-                                '"'.addslashes($sOutputFormat).'"'."\n",
-                        FILE_APPEND);
-                }
+                       if ($sType == 'reverse')
+                       {
+                               $aStartTime = explode('.',$hLog[0]);
+                               file_put_contents(CONST_Log_File_ReverseLog,
+                                                               $aStartTime[0].','.$aStartTime[1].','.
+                                                               php_uname('n').','.
+                                                               '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
+                                                               '"'.addslashes($hLog[1]).'",'.
+                                                               $_GET['lat'].','.
+                                                               $_GET['lon'].','.
+                                                               $_GET['zoom'].','.
+                                                               '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
+                                                               '"'.addslashes($sOutputFormat).'"'."\n",
+                                                               FILE_APPEND);
+                       }
                }
 
                return $hLog;
@@ -59,12 +59,6 @@
 
                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]);
@@ -74,17 +68,17 @@
 
                if (CONST_Log_File && CONST_Log_File_SearchLog != '')
                {
-                $aStartTime = explode('.',$hLog[0]);
-                file_put_contents(CONST_Log_File_SearchLog,
-                                $aStartTime[0].','.$aStartTime[1].','.
-                                php_uname('n').','.
-                                '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
-                                '"'.addslashes($hLog[1]).'",'.
-                                '"'.addslashes($hLog[3]).'",'.
-                                '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
-                                '"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'.
-                                $iNumResults."\n",
-                        FILE_APPEND);
+                       $aStartTime = explode('.',$hLog[0]);
+                       file_put_contents(CONST_Log_File_SearchLog,
+                                       $aStartTime[0].','.$aStartTime[1].','.
+                                       php_uname('n').','.
+                                       '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
+                                       '"'.addslashes($hLog[1]).'",'.
+                                       '"'.addslashes($hLog[3]).'",'.
+                                       '"'.addslashes($_SERVER['HTTP_USER_AGENT']).'",'.
+                                       '"'.addslashes((isset($_GET['format']))?$_GET['format']:'').'",'.
+                                       $iNumResults."\n",
+                                       FILE_APPEND);
                }
 
        }