add combined file query logging

diff --git a/lib/log.php b/lib/log.php
index c2103716ef91d684b5d665e9bf113ff581848088..d38bb892b78a0d876e5c93a79e5b85032413b500 100644 (file)
--- a/lib/log.php
+++ b/lib/log.php
@@ -5,14 +5,35 @@
                $aStartTime = explode('.',microtime(true));
                if (!isset($aStartTime[1])) $aStartTime[1] = '0';
 
+               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 = '';
+
                $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,
+                               $sUserAgent,
+                               $sOutputFormat
                                );
 
                if (CONST_Log_DB)
@@ -31,25 +52,6 @@
                        $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;
        }
 
@@ -68,19 +70,16 @@
                        $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);
+                       array_unshift($hLog, $sEndTime);
+                       $hLog[] = $iNumResults;
+                       $fLog = fopen(CONST_Log_File, 'a');
+                       flock($fLog, LOCK_EX);
+                       fputcsv($fLog, $hLog);
+                       fflush($fLog);
+                       flock($fLog, LOCK_UN);
+                       fclose($fLog);
                }
 
        }

diff --git a/website/reverse.php b/website/reverse.php
index ed877899faa672aa0160539840bf3b9fc6afbda3..3f062f46bff8b870eaff8a4194cb0990dea89f24 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -48,6 +48,8 @@
                $aPlace = $oReverseGeocode->lookup();
        }
 
+       logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
+
        if (CONST_Debug) exit;
 
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');