X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7f95590a77d358a246f057f954c33bc8640e3def..a446ea5ffc2e3c559d93f3c4f242ff7a579f0860:/lib/log.php

diff --git a/lib/log.php b/lib/log.php
index 37d83c47..59e04d17 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -17,15 +17,15 @@
 
 		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);
 		}
 
@@ -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]);