X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/79d4db5db6253d67412769448ea94736d0e0997e..ff2e5a81d99c460d4de13e19a75f38cb4894415f:/lib/log.php?ds=inline

diff --git a/lib/log.php b/lib/log.php
index d81ef46d..80e2ac54 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -3,45 +3,45 @@
 	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'];
 
+		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,
+				$sOutputFormat
+				);
 
 		if (CONST_Log_DB)
 		{
+			if (isset($_GET['email']))
+				$sUserAgent = $_GET['email'];
+			elseif (isset($_SERVER['HTTP_REFERER']))
+				$sUserAgent = $_SERVER['HTTP_REFERER'];
+			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($_SERVER['HTTP_USER_AGENT']).','.getDBQuoted(join(',',$aLanguageList)).','.getDBQuoted($_GET['format']).','.getDBQuoted($hLog[3]).')';
+			$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;
 	}
 
@@ -60,19 +60,15 @@
 			$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 = array($hLog[0], $sEndTime, $iNumResults, $hLog[4], $hLog[2]);
+			$fLog = fopen(CONST_Log_File, 'a');
+			flock($fLog, LOCK_EX);
+			fputcsv($fLog, $aOutdata);
+			fflush($fLog);
+			flock($fLog, LOCK_UN);
+			fclose($fLog);
 		}
 
 	}