Merge pull request #1318 from mtmail/php-pdo

[nominatim.git] / lib / log.php

diff --git a/lib/log.php b/lib/log.php
index 72619c0d06fc327a30f28b8483366acb134eb4eb..ae4253c0f23861da1d8c4fedc48a415a0de19cac 100644 (file)
--- a/lib/log.php
+++ b/lib/log.php
@@ -1,5 +1,6 @@
 <?php
 
 <?php
 

+

 function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
 {
     $fStartTime = microtime(true);
 function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
 {
     $fStartTime = microtime(true);


@@ -9,37 +10,44 @@ function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
     $sOutputFormat = '';
     if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
 
     $sOutputFormat = '';
     if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
 

-    if ($sType == 'reverse')
-    {
+    if ($sType == 'reverse') {

         $sOutQuery = (isset($_GET['lat'])?$_GET['lat']:'').'/';
         if (isset($_GET['lon'])) $sOutQuery .= $_GET['lon'];
         if (isset($_GET['zoom'])) $sOutQuery .= '/'.$_GET['zoom'];
         $sOutQuery = (isset($_GET['lat'])?$_GET['lat']:'').'/';
         if (isset($_GET['lon'])) $sOutQuery .= $_GET['lon'];
         if (isset($_GET['zoom'])) $sOutQuery .= '/'.$_GET['zoom'];

-    }
-    else
+    } else {

         $sOutQuery = $sQuery;
         $sOutQuery = $sQuery;

+    }

 
     $hLog = array(
 
     $hLog = array(

-            date('Y-m-d H:i:s',$aStartTime[0]).'.'.$aStartTime[1],
-            $_SERVER["REMOTE_ADDR"],
-            $_SERVER['QUERY_STRING'],
-            $sOutQuery,
-            $sType,
-            $fStartTime
+             date('Y-m-d H:i:s', $aStartTime[0]).'.'.$aStartTime[1],
+             $_SERVER['REMOTE_ADDR'],
+             $_SERVER['QUERY_STRING'],
+             $sOutQuery,
+             $sType,
+             $fStartTime

             );
 
             );
 

-    if (CONST_Log_DB)
-    {
+    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'];
         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 = '';
+        else $sUserAgent = '';

         $sSQL = 'insert into new_query_log (type,starttime,query,ipaddress,useragent,language,format,searchterm)';
         $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]).')';
+        $sSQL .= ' values ('.
+        $sSQL .= join(',', $oDB->getDBQuotedList(array(
+            $sType,
+            $hLog[0],
+            $hLog[2],
+            $hLog[1],
+            $sUserAgent,
+            join(',', $aLanguageList),
+            $sOutputFormat,
+            $hLog[3]
+        )));
+        $sSQL .= ')';

         $oDB->query($sSQL);
     }
 
         $oDB->query($sSQL);
     }
 


@@ -50,25 +58,27 @@ function logEnd(&$oDB, $hLog, $iNumResults)
 {
     $fEndTime = microtime(true);
 
 {
     $fEndTime = microtime(true);
 

-    if (CONST_Log_DB)
-    {
+    if (CONST_Log_DB) {

         $aEndTime = explode('.', $fEndTime);
         if (!$aEndTime[1]) $aEndTime[1] = '0';
         $aEndTime = explode('.', $fEndTime);
         if (!$aEndTime[1]) $aEndTime[1] = '0';

-        $sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
+        $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]);
-        $sSQL .= ' and query = '.getDBQuoted($hLog[2]);
+        $sSQL = 'update new_query_log set endtime = '.$oDB->getDBQuoted($sEndTime).', results = '.$iNumResults;
+        $sSQL .= ' where starttime = '.$oDB->getDBQuoted($hLog[0]);
+        $sSQL .= ' and ipaddress = '.$oDB->getDBQuoted($hLog[1]);
+        $sSQL .= ' and query = '.$oDB->getDBQuoted($hLog[2]);

         $oDB->query($sSQL);
     }
 
         $oDB->query($sSQL);
     }
 

-    if (CONST_Log_File)
-    {
-        $aOutdata = sprintf("[%s] %.4f %d %s \"%s\"\n",
-                            $hLog[0], $fEndTime-$hLog[5], $iNumResults,
-                            $hLog[4], $hLog[2]);
+    if (CONST_Log_File) {
+        $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);
     }
         file_put_contents(CONST_Log_File, $aOutdata, FILE_APPEND | LOCK_EX);
     }

-

 }
 }