X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/45383ee291e4b28dd249691d6e14f1b49fdd121a..54126633f6078ebb86b53c614fcb243039e839fb:/lib/log.php

diff --git a/lib/log.php b/lib/log.php
index 59e04d17..de19167b 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -2,17 +2,29 @@
 
 	function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
 	{
-		$aStartTime = explode('.',microtime(true));
+		$fStartTime = microtime(true);
+		$aStartTime = explode('.', $fStartTime);
 		if (!isset($aStartTime[1])) $aStartTime[1] = '0';
 
 		$sOutputFormat = '';
 		if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
 
+		if ($sType == 'reverse')
+		{
+			$sOutQuery = (isset($_GET['lat'])?$_GET['lat']:'').'/';
+			if (isset($_GET['lon'])) $sOutQuery .= $_GET['lon'];
+			if (isset($_GET['zoom'])) $sOutQuery .= '/'.$_GET['zoom'];
+		}
+		else
+			$sOutQuery = $sQuery;
+
 		$hLog = array(
 				date('Y-m-d H:i:s',$aStartTime[0]).'.'.$aStartTime[1],
 				$_SERVER["REMOTE_ADDR"],
 				$_SERVER['QUERY_STRING'],
-				$sQuery
+				$sOutQuery,
+				$sType,
+				$fStartTime
 				);
 
 		if (CONST_Log_DB)
@@ -21,44 +33,29 @@
 				$sUserAgent = $_GET['email'];
 			elseif (isset($_SERVER['HTTP_REFERER']))
 				$sUserAgent = $_SERVER['HTTP_REFERER'];
-			else
+			elseif (isset($_SERVER['HTTP_USER_AGENT']))
 				$sUserAgent = $_SERVER['HTTP_USER_AGENT'];
+			else
+				$sUserAgent = '';
 			$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($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);
-			}
-		}
-
 		return $hLog;
 	}
 
 	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];
+		$fEndTime = microtime(true);
 
 		if (CONST_Log_DB)
 		{
+			$aEndTime = explode('.', $fEndTime);
+			if (!$aEndTime[1]) $aEndTime[1] = '0';
+			$sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
+
 			$sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
 			$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
 			$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
@@ -66,19 +63,12 @@
 			$oDB->query($sSQL);
 		}
 
-		if (CONST_Log_File && CONST_Log_File_SearchLog != '')
+		if (CONST_Log_File)
 		{
-			$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);
+			$aOutdata = sprintf("[%s] %.4f %d %s \"%s\"\n",
+			                    $hLog[0], $fEndTime-$hLog[5], $iNumResults,
+			                    $hLog[4], $hLog[2]);
+			file_put_contents(CONST_Log_File, $aOutdata, FILE_APPEND | LOCK_EX);
 		}
 
 	}