fix warning about missing HTTP_USER_AGENT

[nominatim.git] / lib / log.php

diff --git a/lib/log.php b/lib/log.php
index 501259d0ed2d48dfc8be60fe97ef5f40a07c268d..c2103716ef91d684b5d665e9bf113ff581848088 100644 (file)
--- a/lib/log.php
+++ b/lib/log.php
@@ -3,7 +3,7 @@
        function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
        {
                $aStartTime = explode('.',microtime(true));
        function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
        {
                $aStartTime = explode('.',microtime(true));

-               if (!$aStartTime[1]) $aStartTime[1] = '0';
+               if (!isset($aStartTime[1])) $aStartTime[1] = '0';

 
                $sOutputFormat = '';
                if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
 
                $sOutputFormat = '';
                if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];


@@ -21,8 +21,10 @@
                                $sUserAgent = $_GET['email'];
                        elseif (isset($_SERVER['HTTP_REFERER']))
                                $sUserAgent = $_SERVER['HTTP_REFERER'];
                                $sUserAgent = $_GET['email'];
                        elseif (isset($_SERVER['HTTP_REFERER']))
                                $sUserAgent = $_SERVER['HTTP_REFERER'];

-                       else
+                       elseif (isset($_SERVER['HTTP_USER_AGENT']))

                                $sUserAgent = $_SERVER['HTTP_USER_AGENT'];
                                $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]).')';
                        $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]).')';