From 3da89eac8fcf631efd6f88f5be28a3f1d2d288b4 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 17 Sep 2008 11:13:29 +0200 Subject: [PATCH] Further adjustments for the new apache logparser --- src/include/constants_logstream.php | 12 ++++++++++-- src/include/functions_common.php | 8 ++++++++ src/lang/de/main.php | 1 + src/lang/en/main.php | 1 + src/lang/pt_BR/main.php | 1 + 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/include/constants_logstream.php b/src/include/constants_logstream.php index 202af10..81af7da 100644 --- a/src/include/constants_logstream.php +++ b/src/include/constants_logstream.php @@ -63,6 +63,7 @@ define('SYSLOG_EVENT_USER', 'user'); define('SYSLOG_WEBLOG_USER', 'http_user'); define('SYSLOG_WEBLOG_METHOD', 'http_method'); define('SYSLOG_WEBLOG_URL', 'http_url'); +define('SYSLOG_WEBLOG_QUERYSTRING', 'http_querystring'); define('SYSLOG_WEBLOG_PVER', 'http_ver'); define('SYSLOG_WEBLOG_STATUS', 'http_status'); define('SYSLOG_WEBLOG_BYTESSEND', 'http_bytessend'); @@ -202,9 +203,16 @@ $fields[SYSLOG_WEBLOG_URL]['FieldID'] = SYSLOG_WEBLOG_URL; $fields[SYSLOG_WEBLOG_URL]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_URL'; $fields[SYSLOG_WEBLOG_URL]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_WEBLOG_URL]['Sortable'] = false; -$fields[SYSLOG_WEBLOG_URL]['DefaultWidth'] = "100%"; +$fields[SYSLOG_WEBLOG_URL]['DefaultWidth'] = "200"; $fields[SYSLOG_WEBLOG_URL]['FieldAlign'] = "left"; $fields[SYSLOG_WEBLOG_URL]['SearchField'] = SYSLOG_WEBLOG_URL; +$fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldID'] = SYSLOG_WEBLOG_QUERYSTRING; +$fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_QUERYSTRING'; +$fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldType'] = FILTER_TYPE_STRING; +$fields[SYSLOG_WEBLOG_QUERYSTRING]['Sortable'] = false; +$fields[SYSLOG_WEBLOG_QUERYSTRING]['DefaultWidth'] = "200"; +$fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldAlign'] = "left"; +$fields[SYSLOG_WEBLOG_QUERYSTRING]['SearchField'] = SYSLOG_WEBLOG_QUERYSTRING; $fields[SYSLOG_WEBLOG_PVER]['FieldID'] = SYSLOG_WEBLOG_PVER; $fields[SYSLOG_WEBLOG_PVER]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_PVER'; $fields[SYSLOG_WEBLOG_PVER]['FieldType'] = FILTER_TYPE_STRING; @@ -230,7 +238,7 @@ $fields[SYSLOG_WEBLOG_REFERER]['FieldID'] = SYSLOG_WEBLOG_REFERER; $fields[SYSLOG_WEBLOG_REFERER]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_REFERER'; $fields[SYSLOG_WEBLOG_REFERER]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_WEBLOG_REFERER]['Sortable'] = false; -$fields[SYSLOG_WEBLOG_REFERER]['DefaultWidth'] = "100"; +$fields[SYSLOG_WEBLOG_REFERER]['DefaultWidth'] = "200"; $fields[SYSLOG_WEBLOG_REFERER]['FieldAlign'] = "left"; $fields[SYSLOG_WEBLOG_REFERER]['SearchField'] = SYSLOG_WEBLOG_REFERER; $fields[SYSLOG_WEBLOG_USERAGENT]['FieldID'] = SYSLOG_WEBLOG_USERAGENT; diff --git a/src/include/functions_common.php b/src/include/functions_common.php index 7834d92..94ad1d3 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -942,6 +942,14 @@ function GetEventTime($szTimStr) $eventtime[EVTIME_TIMEZONE] = date_default_timezone_get(); // WTF TODO! $eventtime[EVTIME_MICROSECONDS] = 0; } + // Sample: 16/Sep/2008:13:37:47 +0200 + else if ( preg_match("/([0-9]{1,2})\/(...)\/([0-9]{1,4}):([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2}) \+([0-9]{1,4})/", $szTimStr, $out ) ) + { + // Apache Logfile typical timestamp + $eventtime[EVTIME_TIMESTAMP] = mktime($out[4], $out[5], $out[6], GetMonthFromString($out[2]), $out[1], $out[3]); + $eventtime[EVTIME_TIMEZONE] = date_default_timezone_get(); // > WTF TODO! > $out[7] + $eventtime[EVTIME_MICROSECONDS] = 0; + } else { $eventtime[EVTIME_TIMESTAMP] = 0; diff --git a/src/lang/de/main.php b/src/lang/de/main.php index c95326a..7efb6eb 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -174,6 +174,7 @@ $content['LN_FIELDS_MESSAGE'] = "Meldung"; $content['LN_FIELDS_WEBLOG_USER'] = "Remote User"; $content['LN_FIELDS_WEBLOG_METHOD'] = "Method"; $content['LN_FIELDS_WEBLOG_URL'] = "URL"; + $content['LN_FIELDS_WEBLOG_QUERYSTRING'] = "Querystring"; $content['LN_FIELDS_WEBLOG_PVER'] = "Version"; $content['LN_FIELDS_WEBLOG_STATUS'] = "Status"; $content['LN_FIELDS_WEBLOG_BYTESSEND'] = "Bytes Send"; diff --git a/src/lang/en/main.php b/src/lang/en/main.php index 5c00294..3481253 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -174,6 +174,7 @@ $content['LN_FIELDS_EVENTUSER'] = "Event User"; $content['LN_FIELDS_WEBLOG_USER'] = "Remote User"; $content['LN_FIELDS_WEBLOG_METHOD'] = "Method"; $content['LN_FIELDS_WEBLOG_URL'] = "URL"; +$content['LN_FIELDS_WEBLOG_QUERYSTRING'] = "Querystring"; $content['LN_FIELDS_WEBLOG_PVER'] = "Version"; $content['LN_FIELDS_WEBLOG_STATUS'] = "Status"; $content['LN_FIELDS_WEBLOG_BYTESSEND'] = "Bytes Send"; diff --git a/src/lang/pt_BR/main.php b/src/lang/pt_BR/main.php index fcb5dcd..6a584c2 100644 --- a/src/lang/pt_BR/main.php +++ b/src/lang/pt_BR/main.php @@ -178,6 +178,7 @@ $content['LN_FIELDS_EVENTUSER'] = "Evento de Usu´rio"; $content['LN_FIELDS_WEBLOG_USER'] = "Remote User"; $content['LN_FIELDS_WEBLOG_METHOD'] = "Method"; $content['LN_FIELDS_WEBLOG_URL'] = "URL"; + $content['LN_FIELDS_WEBLOG_QUERYSTRING'] = "Querystring"; $content['LN_FIELDS_WEBLOG_PVER'] = "Version"; $content['LN_FIELDS_WEBLOG_STATUS'] = "Status"; $content['LN_FIELDS_WEBLOG_BYTESSEND'] = "Bytes Send";