X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/832547f192904a9ec92e173c27a91e0874fcc757..cf39e07dba72373302e2d1a48de3083339d0decb:/lib/log.php diff --git a/lib/log.php b/lib/log.php index 72619c0d..07b99049 100644 --- a/lib/log.php +++ b/lib/log.php @@ -9,34 +9,31 @@ function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array()) $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']; - } - else + } else { $sOutQuery = $sQuery; + } $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']; - else - $sUserAgent = ''; + 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]).')'; @@ -50,8 +47,7 @@ function logEnd(&$oDB, $hLog, $iNumResults) { $fEndTime = microtime(true); - if (CONST_Log_DB) - { + if (CONST_Log_DB) { $aEndTime = explode('.', $fEndTime); if (!$aEndTime[1]) $aEndTime[1] = '0'; $sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1]; @@ -63,8 +59,7 @@ function logEnd(&$oDB, $hLog, $iNumResults) $oDB->query($sSQL); } - if (CONST_Log_File) - { + if (CONST_Log_File) { $aOutdata = sprintf("[%s] %.4f %d %s \"%s\"\n", $hLog[0], $fEndTime-$hLog[5], $iNumResults, $hLog[4], $hLog[2]);