X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ab6a99677293c9ddb96a717f03b8a009e98ab955..a9bcf2ae61ee5cb23e007e254cc4ad2899947e08:/lib/log.php

diff --git a/lib/log.php b/lib/log.php
index 12e2953c..7515cbbd 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -12,17 +12,31 @@
 				$sQuery
 			);
 
-                // Log
-		if ($sType == 'search')
+		if (CONST_Log_DB)
 		{
-	                $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,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]).')';
+			$oDB->query($sSQL);
 		}
 
-		$sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format)';
-		$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']).')';
-		$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($_GET['format']).'"'."\n",
+                        FILE_APPEND);
+                }
+		}
 
 		return $hLog;
 	}
@@ -33,15 +47,27 @@
                 if (!$aEndTime[1]) $aEndTime[1] = '0';
                 $sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
 
-		$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]);
-		$sSQL .= ' and query = '.getDBQuoted($hLog[2]);
-		$oDB->query($sSQL);
+		if (CONST_Log_DB)
+		{
+			$sSQL = 'update new_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[2]);
+			$oDB->query($sSQL);
+		}
+
+		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($_GET['format']).'",'.
+                                $iNumResults."\n",
+                        FILE_APPEND);
+		}
+
 	}