X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e686ce868062a70acfbdddc68c8f4384789f0a40..e7c128b973dc89898583ca10f501affa2b702685:/lib/log.php diff --git a/lib/log.php b/lib/log.php index 9a064b9b..25ed75cb 100644 --- a/lib/log.php +++ b/lib/log.php @@ -20,7 +20,7 @@ function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array()) $hLog = array( date('Y-m-d H:i:s', $aStartTime[0]).'.'.$aStartTime[1], - $_SERVER["REMOTE_ADDR"], + $_SERVER['REMOTE_ADDR'], $_SERVER['QUERY_STRING'], $sOutQuery, $sType, @@ -36,9 +36,19 @@ function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array()) $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); + $sSQL .= ' values ('; + $sSQL .= join(',', $oDB->getDBQuotedList(array( + $sType, + $hLog[0], + $hLog[2], + $hLog[1], + $sUserAgent, + join(',', $aLanguageList), + $sOutputFormat, + $hLog[3] + ))); + $sSQL .= ')'; + $oDB->exec($sSQL); } return $hLog; @@ -53,11 +63,11 @@ function logEnd(&$oDB, $hLog, $iNumResults) 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]); - $sSQL .= ' and query = '.getDBQuoted($hLog[2]); - $oDB->query($sSQL); + $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->exec($sSQL); } if (CONST_Log_File) {