From 7a15a177372cb13b5d50933b5797c3f288155493 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Fri, 25 Apr 2008 17:43:51 +0200 Subject: [PATCH 01/11] Added backlink to ListView in detailpage and added Records per Page selector The records per page selector makes it possible to change the pagesize on the fly. By default, the pagesize from the config.php will be used. --- src/include/functions_common.php | 49 +++++++++++++++++++++++++------- src/index.php | 4 +-- src/lang/de/main.php | 1 + src/lang/en/main.php | 1 + src/templates/details.html | 3 +- src/templates/index.html | 19 ++++++++++++- src/userchange.php | 11 +++++-- 7 files changed, 71 insertions(+), 17 deletions(-) diff --git a/src/include/functions_common.php b/src/include/functions_common.php index 9df8945..11a2332 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -183,6 +183,9 @@ function InitPhpLogCon() // Init Predefined Searches List CreatePredefinedSearches(); + // Init predefined paging sizes + CreatePagesizesList(); + // --- Enable PHP Debug Mode InitPhpDebugMode(); // --- @@ -241,6 +244,23 @@ function CreateDBTypesList( $selectedDBType ) } +function CreatePagesizesList() +{ + global $CFG, $content; + + $content['pagesizes'][0] = array( "ID" => 0, "Selected" => "", "DisplayName" => "Preconfigured (" . $CFG['ViewEntriesPerPage'] . ")", "Value" => $CFG['ViewEntriesPerPage'] ); + $content['pagesizes'][1] = array( "ID" => 1, "Selected" => "", "DisplayName" => " 25 records per page", "Value" => 25 ); + $content['pagesizes'][2] = array( "ID" => 2, "Selected" => "", "DisplayName" => " 50 records per page", "Value" => 50 ); + $content['pagesizes'][3] = array( "ID" => 3, "Selected" => "", "DisplayName" => " 75 records per page", "Value" => 75 ); + $content['pagesizes'][4] = array( "ID" => 4, "Selected" => "", "DisplayName" => " 100 records per page", "Value" => 100 ); + + // Set default selected pagesize + $content['pagesizes'][ $_SESSION['PAGESIZE_ID'] ]["Selected"] = "selected"; + + // The content variable will now contain the user selected oaging size + $content["ViewEntriesPerPage"] = $content['pagesizes'][ $_SESSION['PAGESIZE_ID'] ]["Value"]; +} + function CreatePredefinedSearches() { global $CFG, $content; @@ -316,17 +336,17 @@ function InitFrontEndVariables() { global $content; - $content['MENU_FOLDER_OPEN'] = "image=" . $content['BASEPATH'] . "images/icons/folder_closed.png"; - $content['MENU_FOLDER_CLOSED'] = "overimage=" . $content['BASEPATH'] . "images/icons/folder.png"; - $content['MENU_HOMEPAGE'] = "image=" . $content['BASEPATH'] . "images/icons/home.png"; - $content['MENU_LINK'] = "image=" . $content['BASEPATH'] . "images/icons/link.png"; - $content['MENU_PREFERENCES'] = "image=" . $content['BASEPATH'] . "images/icons/preferences.png"; - $content['MENU_ADMINENTRY'] = "image=" . $content['BASEPATH'] . "images/icons/star_blue.png"; - $content['MENU_ADMINLOGOFF'] = "image=" . $content['BASEPATH'] . "images/icons/exit.png"; - $content['MENU_ADMINUSERS'] = "image=" . $content['BASEPATH'] . "images/icons/businessmen.png"; - $content['MENU_SEARCH'] = "image=" . $content['BASEPATH'] . "images/icons/view.png"; - $content['MENU_SELECTION_DISABLED'] = "image=" . $content['BASEPATH'] . "images/icons/selection.png"; - $content['MENU_SELECTION_ENABLED'] = "image=" . $content['BASEPATH'] . "images/icons/selection_delete.png"; + $content['MENU_FOLDER_OPEN'] = $content['BASEPATH'] . "images/icons/folder_closed.png"; + $content['MENU_FOLDER_CLOSED'] = $content['BASEPATH'] . "images/icons/folder.png"; + $content['MENU_HOMEPAGE'] = $content['BASEPATH'] . "images/icons/home.png"; + $content['MENU_LINK'] = $content['BASEPATH'] . "images/icons/link.png"; + $content['MENU_PREFERENCES'] = $content['BASEPATH'] . "images/icons/preferences.png"; + $content['MENU_ADMINENTRY'] = $content['BASEPATH'] . "images/icons/star_blue.png"; + $content['MENU_ADMINLOGOFF'] = $content['BASEPATH'] . "images/icons/exit.png"; + $content['MENU_ADMINUSERS'] = $content['BASEPATH'] . "images/icons/businessmen.png"; + $content['MENU_SEARCH'] = $content['BASEPATH'] . "images/icons/view.png"; + $content['MENU_SELECTION_DISABLED'] = $content['BASEPATH'] . "images/icons/selection.png"; + $content['MENU_SELECTION_ENABLED'] = $content['BASEPATH'] . "images/icons/selection_delete.png"; $content['MENU_PAGER_BEGIN'] = $content['BASEPATH'] . "images/icons/media_beginning.png"; $content['MENU_PAGER_PREVIOUS'] = $content['BASEPATH'] . "images/icons/media_rewind.png"; @@ -412,6 +432,13 @@ function InitConfigurationValues() } } + // Paging Size handling! + if ( !isset($_SESSION['PAGESIZE_ID']) ) + { + // Default is 0! + $_SESSION['PAGESIZE_ID'] = 0; + } + // Theme Handling if ( !isset($content['web_theme']) ) { $content['web_theme'] = $CFG['ViewDefaultTheme'] /*"default"*/; } if ( isset($_SESSION['CUSTOM_THEME']) && VerifyTheme($_SESSION['CUSTOM_THEME']) ) diff --git a/src/index.php b/src/index.php index 24e08a9..11199ba 100644 --- a/src/index.php +++ b/src/index.php @@ -396,11 +396,11 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Increment Counter $counter++; - } while ($counter < $CFG['ViewEntriesPerPage'] && ($ret = $stream->ReadNext($uID, $logArray)) == SUCCESS); + } while ($counter < $content['ViewEntriesPerPage'] && ($ret = $stream->ReadNext($uID, $logArray)) == SUCCESS); //print_r ( $content['syslogmessages'] ); - if ( $content['main_recordcount'] == -1 || $content['main_recordcount'] > $CFG['ViewEntriesPerPage'] ) + if ( $content['main_recordcount'] == -1 || $content['main_recordcount'] > $content['ViewEntriesPerPage'] ) { // Enable Pager in any case here! $content['main_pagerenabled'] = true; diff --git a/src/lang/de/main.php b/src/lang/de/main.php index 055cbf6..ce728b7 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -118,5 +118,6 @@ $content['LN_CFG_FIRSTSYSLOGSOURCE'] = "Erste Syslog Quelle"; // Details page $content['LN_DETAILS_FORSYSLOGMSG'] = "Details for the syslog messages with id"; $content['LN_DETAILS_DETAILSFORMSG'] = "Details for message id"; +$content['LN_DETAIL_BACKTOLIST'] = "Back to Listview"; ?> diff --git a/src/lang/en/main.php b/src/lang/en/main.php index eeca194..99d76e4 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -118,5 +118,6 @@ $content['LN_CFG_FIRSTSYSLOGSOURCE'] = "First Syslog Source"; // Details page $content['LN_DETAILS_FORSYSLOGMSG'] = "Details for the syslog messages with id"; $content['LN_DETAILS_DETAILSFORMSG'] = "Details for message id"; +$content['LN_DETAIL_BACKTOLIST'] = "Back to Listview"; ?> \ No newline at end of file diff --git a/src/templates/details.html b/src/templates/details.html index e3d1b65..3df4db9 100644 --- a/src/templates/details.html +++ b/src/templates/details.html @@ -7,7 +7,8 @@ - - + From 424bfed63b9e7d3ac2560b16789636fef2f904cc Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Wed, 30 Apr 2008 17:05:41 +0200 Subject: [PATCH 10/11] Changed Msgtype Eventreporter into WinEventLog --- src/include/constants_filters.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/constants_filters.php b/src/include/constants_filters.php index 18fabb0..5447e78 100644 --- a/src/include/constants_filters.php +++ b/src/include/constants_filters.php @@ -107,7 +107,7 @@ $content['filter_severity_list'][] = array( "ID" => SYSLOG_DEBUG, "DisplayName" // Init MessageType LIST //$content['filter_messagetype_list'][] = array( "ID" => IUT_Unknown, "DisplayName" => "Unknown", "selected" => "" ); $content['filter_messagetype_list'][] = array( "ID" => IUT_Syslog, "DisplayName" => "Syslog", "selected" => "" ); -$content['filter_messagetype_list'][] = array( "ID" => IUT_NT_EventReport, "DisplayName" => "EventReporter", "selected" => "" ); +$content['filter_messagetype_list'][] = array( "ID" => IUT_NT_EventReport, "DisplayName" => "WinEventLog", "selected" => "" ); $content['filter_messagetype_list'][] = array( "ID" => IUT_File_Monitor, "DisplayName" => "File Monitor", "selected" => "" ); ?> \ No newline at end of file From 99b9857cf6a708ce14de703ed193c41cfffb9b32 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Wed, 30 Apr 2008 17:44:45 +0200 Subject: [PATCH 11/11] Made DB Row Counting configurable for better performance. If you have a large database, it is recommended to turn DB Row Counting off as it will have impact on the performance of phplogcon. However if you have a smaller database below 500000 records), it is a very nice feature. --- src/classes/logstreamconfigdb.class.php | 1 + src/classes/logstreamdb.class.php | 32 ++++++++++++++----------- src/include/functions_config.php | 1 + src/install.php | 21 +++++++++++++++- src/lang/en/main.php | 1 + src/templates/install.html | 6 +++++ 6 files changed, 47 insertions(+), 15 deletions(-) diff --git a/src/classes/logstreamconfigdb.class.php b/src/classes/logstreamconfigdb.class.php index d59d197..672758f 100644 --- a/src/classes/logstreamconfigdb.class.php +++ b/src/classes/logstreamconfigdb.class.php @@ -47,6 +47,7 @@ class LogStreamConfigDB extends LogStreamConfig { public $DBType = DB_MYSQL; // Default = MYSQL! public $DBTableType = 'winsyslog'; // Default = WINSYSLOG DB Layout! public $DBTableName = 'systemevents'; // Default Tabelname from WINSYSLOG + public $DBEnableRowCounting = true; // Default RowCounting is enabled! // Runtime configuration variables public $RecordsPerQuery = 100; // This will determine how to limit sql statements diff --git a/src/classes/logstreamdb.class.php b/src/classes/logstreamdb.class.php index b274aae..93c073f 100644 --- a/src/classes/logstreamdb.class.php +++ b/src/classes/logstreamdb.class.php @@ -112,12 +112,6 @@ class LogStreamDB extends LogStream { // Create SQL Where Clause first! $this->CreateSQLWhereClause(); - // Obtain count of records -// $this->_totalRecordCount = $this->GetRowCountFromTable(); -// -// if ( $this->_totalRecordCount <= 0 ) -// return ERROR_NOMORERECORDS; - // Success, this means we init the Pagenumber to ONE! $this->_currentPageNumber = 1; @@ -275,7 +269,13 @@ class LogStreamDB extends LogStream { $bFound = false; $tmpuID = $uID; $ret = ERROR_NOMORERECORDS; // Set Default error code! - $totalpages = intval($this->_totalRecordCount / $this->_logStreamConfigObj->_pageCount); + + // Set totalpages number if available + if ( $this->_totalRecordCount != -1 ) + $totalpages = intval($this->_totalRecordCount / $this->_logStreamConfigObj->_pageCount); + else + $totalpages = 1; + while( $bFound == false && $this->ReadNextIDsFromDB() == SUCCESS ) { foreach ( $this->bufferedRecords as $myRecord ) @@ -602,8 +602,8 @@ class LogStreamDB extends LogStream { // Free Query ressources mysql_free_result ($myquery); - // Obtain count of records if needed! - if ( $this->_totalRecordCount == -1 ) + // Only obtain count if enabled and not done before + if ( $this->_logStreamConfigObj->DBEnableRowCounting && $this->_totalRecordCount == -1 ) { $this->_totalRecordCount = $this->GetRowCountFromTable(); @@ -650,8 +650,8 @@ class LogStreamDB extends LogStream { // Free Query ressources mysql_free_result ($myquery); - // Obtain count of records if needed! - if ( $this->_totalRecordCount == -1 ) + // Only obtain count if enabled and not done before + if ( $this->_logStreamConfigObj->DBEnableRowCounting && $this->_totalRecordCount == -1 ) { $this->_totalRecordCount = $this->GetRowCountFromTable(); @@ -677,8 +677,13 @@ class LogStreamDB extends LogStream { $szTableType = $this->_logStreamConfigObj->DBTableType; $szSortColumn = $this->_logStreamConfigObj->SortColumn; - // Create SQL String - $sqlString = "SELECT SQL_CALC_FOUND_ROWS " . $dbmapping[$szTableType][SYSLOG_UID]; + // Create Basic SQL String + if ( $this->_logStreamConfigObj->DBEnableRowCounting ) // with SQL_CALC_FOUND_ROWS + $sqlString = "SELECT SQL_CALC_FOUND_ROWS " . $dbmapping[$szTableType][SYSLOG_UID]; + else // without row calc + $sqlString = "SELECT " . $dbmapping[$szTableType][SYSLOG_UID]; + + // Append fields if needed if ( $includeFields && $this->_arrProperties != null ) { // Loop through all requested fields @@ -776,7 +781,6 @@ class LogStreamDB extends LogStream { */ private function GetRowCountFromTable() { - global $querycount; if ( $myquery = mysql_query("Select FOUND_ROWS();", $this->_dbhandle) ) { // Get first and only row! diff --git a/src/include/functions_config.php b/src/include/functions_config.php index 639aed9..bb81085 100644 --- a/src/include/functions_config.php +++ b/src/include/functions_config.php @@ -98,6 +98,7 @@ if ( isset($mysource['DBPort']) ) { $content['Sources'][$iSourceID]['ObjRef']->DBPort = $mysource['DBPort']; } if ( isset($mysource['DBUser']) ) { $content['Sources'][$iSourceID]['ObjRef']->DBUser = $mysource['DBUser']; } if ( isset($mysource['DBPassword']) ) { $content['Sources'][$iSourceID]['ObjRef']->DBPassword = $mysource['DBPassword']; } + if ( isset($mysource['DBEnableRowCounting']) ) { $content['Sources'][$iSourceID]['ObjRef']->DBEnableRowCounting = $mysource['DBEnableRowCounting']; } } else { diff --git a/src/install.php b/src/install.php index fd58d56..46d4258 100644 --- a/src/install.php +++ b/src/install.php @@ -476,6 +476,17 @@ else if ( $content['INSTALL_STEP'] == 7 ) if ( isset($_SESSION['SourceDBTableName']) ) { $content['SourceDBTableName'] = $_SESSION['SourceDBTableName']; } else { $content['SourceDBTableName'] = "systemevents"; } if ( isset($_SESSION['SourceDBUser']) ) { $content['SourceDBUser'] = $_SESSION['SourceDBUser']; } else { $content['SourceDBUser'] = "user"; } if ( isset($_SESSION['SourceDBPassword']) ) { $content['SourceDBPassword'] = $_SESSION['SourceDBPassword']; } else { $content['SourceDBPassword'] = ""; } + if ( isset($_SESSION['SourceDBEnableRowCounting']) ) { $content['SourceDBEnableRowCounting'] = $_SESSION['SourceDBEnableRowCounting']; } else { $content['SourceDBEnableRowCounting'] = "false"; } + if ( $content['SourceDBEnableRowCounting'] == "true" ) + { + $content['SourceDBEnableRowCounting_true'] = "checked"; + $content['SourceDBEnableRowCounting_false'] = ""; + } + else + { + $content['SourceDBEnableRowCounting_true'] = ""; + $content['SourceDBEnableRowCounting_false'] = "checked"; + } // Check for Error Msg if ( isset($_GET['errormsg']) ) @@ -550,7 +561,14 @@ else if ( $content['INSTALL_STEP'] == 8 ) $_SESSION['SourceDBPassword'] = DB_RemoveBadChars($_POST['SourceDBPassword']); else $_SESSION['SourceDBPassword'] = ""; - + + if ( isset($_POST['SourceDBEnableRowCounting']) ) + { + $_SESSION['SourceDBEnableRowCounting'] = DB_RemoveBadChars($_POST['SourceDBEnableRowCounting']); + if ( $_SESSION['SourceDBEnableRowCounting'] != "true" ) + $_SESSION['SourceDBEnableRowCounting'] = "false"; + } + // TODO: Check database connectivity! } @@ -592,6 +610,7 @@ else if ( $content['INSTALL_STEP'] == 8 ) "\$CFG['Sources']['Source1']['DBUser'] = '" . $_SESSION['SourceDBUser'] . "';\r\n" . "\$CFG['Sources']['Source1']['DBPassword'] = '" . $_SESSION['SourceDBPassword'] . "';\r\n" . "\$CFG['Sources']['Source1']['DBTableName'] = '" . $_SESSION['SourceDBTableName'] . "';\r\n" . + "\$CFG['Sources']['Source1']['DBEnableRowCounting'] = " . $_SESSION['SourceDBEnableRowCounting'] . ";\r\n" . ""; } $patterns[] = "/\/\/ --- \%Insert Source Here\%/"; diff --git a/src/lang/en/main.php b/src/lang/en/main.php index 2979ce3..84c25b4 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -123,6 +123,7 @@ $content['LN_CFG_DBSTORAGEENGINE'] = "Database Storage Engine"; $content['LN_CFG_DBTABLENAME'] = "Database Tablename"; $content['LN_CFG_NAMEOFTHESOURCE'] = "Name of the Source"; $content['LN_CFG_FIRSTSYSLOGSOURCE'] = "First Syslog Source"; +$content['LN_CFG_DBROWCOUNTING'] = "Enable Row Counting"; // Details page $content['LN_DETAILS_FORSYSLOGMSG'] = "Details for the syslog messages with id"; diff --git a/src/templates/install.html b/src/templates/install.html index e07614d..f3bd217 100644 --- a/src/templates/install.html +++ b/src/templates/install.html @@ -331,6 +331,12 @@ + + + +
+ + {LN_DETAIL_BACKTOLIST} {LN_GEN_PAGE} {main_currentpagenumber} diff --git a/src/templates/index.html b/src/templates/index.html index 2636778..d1e8c77 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -101,7 +101,24 @@ {LN_GEN_PAGERSIZE}:{ViewEntriesPerPage} + +
+ + + + + +
+ +
+
+ + 		Pager:   diff --git a/src/userchange.php b/src/userchange.php index 4a4a36e..6e8ad39 100644 --- a/src/userchange.php +++ b/src/userchange.php @@ -50,17 +50,24 @@ else if ( isset($_GET['op']) ) { - if ( $_GET['op'] == "changestyle" ) + if ( $_GET['op'] == "changestyle" && isset($_GET['stylename']) ) { if ( VerifyTheme($_GET['stylename']) ) $_SESSION['CUSTOM_THEME'] = $_GET['stylename']; } - if ( $_GET['op'] == "changelang" ) + if ( $_GET['op'] == "changelang" && isset($_GET['langcode']) ) { if ( VerifyLanguage($_GET['langcode']) ) $_SESSION['CUSTOM_LANG'] = $_GET['langcode']; } + + if ( $_GET['op'] == "changepagesize" && isset($_GET['pagesizeid']) ) + { + if ( intval($_GET['pagesizeid']) >= 0 && intval($_GET['pagesizeid']) < 5 ) + $_SESSION['PAGESIZE_ID'] = intval($_GET['pagesizeid']); + } + } // Final redirect From a5f0fb0ac9bb91ff00ec9a7c9963bd7178590728 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Mon, 28 Apr 2008 11:52:17 +0200 Subject: [PATCH 02/11] Added two more record per page sizes, 250 records and 500 records. --- src/include/functions_common.php | 12 +++++++----- src/lang/en/main.php | 3 +++ src/userchange.php | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/include/functions_common.php b/src/include/functions_common.php index 11a2332..f8fe7ab 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -248,11 +248,13 @@ function CreatePagesizesList() { global $CFG, $content; - $content['pagesizes'][0] = array( "ID" => 0, "Selected" => "", "DisplayName" => "Preconfigured (" . $CFG['ViewEntriesPerPage'] . ")", "Value" => $CFG['ViewEntriesPerPage'] ); - $content['pagesizes'][1] = array( "ID" => 1, "Selected" => "", "DisplayName" => " 25 records per page", "Value" => 25 ); - $content['pagesizes'][2] = array( "ID" => 2, "Selected" => "", "DisplayName" => " 50 records per page", "Value" => 50 ); - $content['pagesizes'][3] = array( "ID" => 3, "Selected" => "", "DisplayName" => " 75 records per page", "Value" => 75 ); - $content['pagesizes'][4] = array( "ID" => 4, "Selected" => "", "DisplayName" => " 100 records per page", "Value" => 100 ); + $content['pagesizes'][0] = array( "ID" => 0, "Selected" => "", "DisplayName" => $content['LN_GEN_PRECONFIGURED'] . " (" . $CFG['ViewEntriesPerPage'] . ")", "Value" => $CFG['ViewEntriesPerPage'] ); + $content['pagesizes'][1] = array( "ID" => 1, "Selected" => "", "DisplayName" => " 25 " . $content['LN_GEN_RECORDSPERPAGE'], "Value" => 25 ); + $content['pagesizes'][2] = array( "ID" => 2, "Selected" => "", "DisplayName" => " 50 " . $content['LN_GEN_RECORDSPERPAGE'], "Value" => 50 ); + $content['pagesizes'][3] = array( "ID" => 3, "Selected" => "", "DisplayName" => " 75 " . $content['LN_GEN_RECORDSPERPAGE'], "Value" => 75 ); + $content['pagesizes'][4] = array( "ID" => 4, "Selected" => "", "DisplayName" => " 100 " . $content['LN_GEN_RECORDSPERPAGE'], "Value" => 100 ); + $content['pagesizes'][5] = array( "ID" => 5, "Selected" => "", "DisplayName" => " 250 " . $content['LN_GEN_RECORDSPERPAGE'], "Value" => 250 ); + $content['pagesizes'][6] = array( "ID" => 6, "Selected" => "", "DisplayName" => " 500 " . $content['LN_GEN_RECORDSPERPAGE'], "Value" => 500 ); // Set default selected pagesize $content['pagesizes'][ $_SESSION['PAGESIZE_ID'] ]["Selected"] = "selected"; diff --git a/src/lang/en/main.php b/src/lang/en/main.php index 99d76e4..f95217b 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -43,6 +43,9 @@ $content['LN_GEN_PAGE'] = "Page"; $content['LN_GEN_PREDEFINEDSEARCHES'] = "Predefined Searches"; $content['LN_GEN_SOURCE_DISK'] = "Diskfile"; $content['LN_GEN_SOURCE_DB'] = "Database"; +$content['LN_GEN_RECORDSPERPAGE'] = "records per page"; +$content['LN_GEN_PRECONFIGURED'] = "Preconfigured"; + // Main Index Site $content['LN_ERROR_INSTALLFILEREMINDER'] = "Warning! You still have NOT removed the 'install.php' from your phpLogCon main directory!"; diff --git a/src/userchange.php b/src/userchange.php index 6e8ad39..be99fa6 100644 --- a/src/userchange.php +++ b/src/userchange.php @@ -64,7 +64,7 @@ if ( isset($_GET['op']) ) if ( $_GET['op'] == "changepagesize" && isset($_GET['pagesizeid']) ) { - if ( intval($_GET['pagesizeid']) >= 0 && intval($_GET['pagesizeid']) < 5 ) + if ( intval($_GET['pagesizeid']) >= 0 && intval($_GET['pagesizeid']) < 7 ) $_SESSION['PAGESIZE_ID'] = intval($_GET['pagesizeid']); } From 148f4ce4265ef9026a1580a6a41c28fd305fba49 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Mon, 28 Apr 2008 16:21:09 +0200 Subject: [PATCH 03/11] Working on new filter functions when you search for events ... --- src/include/constants_logstream.php | 6 +++--- src/index.php | 6 ++++++ src/samplelogs/syslog | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/include/constants_logstream.php b/src/include/constants_logstream.php index d720bc5..9287183 100644 --- a/src/include/constants_logstream.php +++ b/src/include/constants_logstream.php @@ -89,13 +89,13 @@ $fields[SYSLOG_HOST]['FieldCaptionID'] = 'LN_FIELDS_HOST'; $fields[SYSLOG_HOST]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_HOST]['Sortable'] = true; $fields[SYSLOG_HOST]['DefaultWidth'] = "80"; -$fields[SYSLOG_HOST]['FieldAlign'] = "center"; +$fields[SYSLOG_HOST]['FieldAlign'] = "left"; $fields[SYSLOG_MESSAGETYPE]['FieldID'] = SYSLOG_MESSAGETYPE; $fields[SYSLOG_MESSAGETYPE]['FieldCaptionID'] = 'LN_FIELDS_MESSAGETYPE'; $fields[SYSLOG_MESSAGETYPE]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_MESSAGETYPE]['Sortable'] = true; $fields[SYSLOG_MESSAGETYPE]['DefaultWidth'] = "90"; -$fields[SYSLOG_MESSAGETYPE]['FieldAlign'] = "center"; +$fields[SYSLOG_MESSAGETYPE]['FieldAlign'] = "left"; // Syslog specific $fields[SYSLOG_FACILITY]['FieldID'] = SYSLOG_FACILITY; @@ -115,7 +115,7 @@ $fields[SYSLOG_SYSLOGTAG]['FieldCaptionID'] = 'LN_FIELDS_SYSLOGTAG'; $fields[SYSLOG_SYSLOGTAG]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_SYSLOGTAG]['Sortable'] = true; $fields[SYSLOG_SYSLOGTAG]['DefaultWidth'] = "85"; -$fields[SYSLOG_SYSLOGTAG]['FieldAlign'] = "center"; +$fields[SYSLOG_SYSLOGTAG]['FieldAlign'] = "left"; $fields[SYSLOG_PROCESSID]['FieldID'] = SYSLOG_PROCESSID; $fields[SYSLOG_PROCESSID]['FieldCaptionID'] = 'LN_FIELDS_PROCESSID'; $fields[SYSLOG_PROCESSID]['FieldType'] = FILTER_TYPE_NUMBER; diff --git a/src/index.php b/src/index.php index 11199ba..29cb6db 100644 --- a/src/index.php +++ b/src/index.php @@ -388,6 +388,12 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c $content['syslogmessages'][$counter]['values'][$mycolkey]['messagesdetails'][$myIndex]['detailfieldvalue'] = $myfield['fieldvalue']; } } + + if ( strlen($content['searchstr']) > 0 ) + { + // Prepend button + $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = "" . $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue']; + } } } } diff --git a/src/samplelogs/syslog b/src/samplelogs/syslog index 6fca8a9..9f099c3 100644 --- a/src/samplelogs/syslog +++ b/src/samplelogs/syslog @@ -1,3 +1,19 @@ +2008-04-27T04:02:27-04:00 cmpsvr kernel: imklog 3.14.2, log source = /proc/kmsg started. +2008-04-27T04:02:27-04:00 cmpsvr kernel: Inspecting /boot/System.map-2.6.9-55.0.2.EL +2008-04-27T04:02:28-04:00 cmpsvr kernel: Loaded 24080 symbols from /boot/System.map-2.6.9-55.0.2.EL. +2008-04-27T04:02:28-04:00 cmpsvr kernel: Symbols match kernel version 2.6.9. +2008-04-27T04:02:42-04:00 cmpsvr kernel: Loaded 9698 symbols from 28 modules. +2008-04-27T04:02:42.992883-04:00 cmpsvr rsyslogd: [origin software="rsyslogd" swVersion="3.14.2" x-pid="1554" x-info="http://www.rsyslog.com"] restart +2008-04-27T04:04:13-04:00 uzdomfw pf: 1055. 619145 rule 268/0(match): block in on ng0: (tos 0x0, ttl 50, id 35580, offset 0, flags [none], proto: UDP (17), length: 485) 202.97.238.230.40659 > 76.10.159.40.1026: UDP, length 457 +2008-04-27T04:04:13-04:00 uzdomfw pf: 001346 rule 268/0(match): block in on ng0: (tos 0x0, ttl 50, id 10488, offset 0, flags [none], proto: UDP (17), length: 485) 202.97.238.230.40659 > 76.10.159.40.1027: UDP, length 457 +2008-04-27T04:04:24-04:00 uzdomfw pf: 10. 532742 rule 268/0(match): block in on ng0: (tos 0x0, ttl 50, id 9191, offset 0, flags [none], proto: UDP (17), length: 485) 202.97.238.230.40735 > 76.10.159.40.1026: UDP, length 457 +2008-04-27T04:04:24-04:00 uzdomfw pf: 001096 rule 268/0(match): block in on ng0: (tos 0x0, ttl 50, id 23751, offset 0, flags [none], proto: UDP (17), length: 485) 202.97.238.230.40735 > 76.10.159.40.1027: UDP, length 457 +2008-04-27T04:04:50.780189-04:00 cmpsvr ntpdate[9441]: adjust time server 192.168.0.55 offset 0.148018 sec +2008-04-27T04:05:51-04:00 uzdomfw pf: 87. 171897 rule 268/0(match): block in on ng0: (tos 0x0, ttl 109, id 61513, offset 0, flags [none], proto: TCP (6), length: 48) 76.10.62.133.2548 > 76.10.159.40.1433: S, cksum 0xd9ad (correct), 762117069:762117069(0) win 64240 +2008-04-27T04:16:23-04:00 uzdomfw pf: 631. 992233 rule 268/0(match): block in on ng0: (tos 0x0, ttl 49, id 51694, offset 0, flags [none], proto: UDP (17), length: 486) 221.208.208.97.46577 > 76.10.159.40.1026: UDP, length 458 +2008-04-27T04:16:23-04:00 uzdomfw pf: 049128 rule 268/0(match): block in on ng0: (tos 0x0, ttl 49, id 9090, offset 0, flags [none], proto: UDP (17), length: 486) 221.208.208.97.46577 > 76.10.159.40.1026: UDP, length 458 +2008-04-27T04:16:23-04:00 uzdomfw pf: 001210 rule 268/0(match): block in on ng0: (tos 0x0, ttl 49, id 52628, offset 0, flags [none], proto: UDP (17), length: 486) 221.208.208.97.46577 > 76.10.159.40.1027: UDP, length 458 +2008-04-27T04:18:21-04:00 uzdomfw pf: 117. 412299 rule 268/0(match): block in on ng0: (tos 0x0, ttl 112, id 30035, offset 0, flags [none], proto: TCP (6), length: 48) 76.8.177.186.3645 > 76.10.159.40.1433: S, cksum 0x74bd (correct), 4216527706:4216527706(0) win 64240 Mar 10 14:45:39 debandre syslogd 1.4.1#18: restart. Mar 10 14:45:44 debandre anacron[3226]: Job `cron.daily' terminated (mailing output) Mar 10 14:45:45 debandre anacron[3226]: Normal exit (1 job run) From 270f6da023810ef88514b8a96c3c5098ea57a427 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Mon, 28 Apr 2008 16:42:12 +0200 Subject: [PATCH 04/11] removed tracking for syslog sample file in this branch as well. --- src/samplelogs/syslog | 255 ------------------------------------------ 1 file changed, 255 deletions(-) delete mode 100644 src/samplelogs/syslog diff --git a/src/samplelogs/syslog b/src/samplelogs/syslog deleted file mode 100644 index 9f099c3..0000000 --- a/src/samplelogs/syslog +++ /dev/null @@ -1,255 +0,0 @@ -2008-04-27T04:02:27-04:00 cmpsvr kernel: imklog 3.14.2, log source = /proc/kmsg started. -2008-04-27T04:02:27-04:00 cmpsvr kernel: Inspecting /boot/System.map-2.6.9-55.0.2.EL -2008-04-27T04:02:28-04:00 cmpsvr kernel: Loaded 24080 symbols from /boot/System.map-2.6.9-55.0.2.EL. -2008-04-27T04:02:28-04:00 cmpsvr kernel: Symbols match kernel version 2.6.9. -2008-04-27T04:02:42-04:00 cmpsvr kernel: Loaded 9698 symbols from 28 modules. -2008-04-27T04:02:42.992883-04:00 cmpsvr rsyslogd: [origin software="rsyslogd" swVersion="3.14.2" x-pid="1554" x-info="http://www.rsyslog.com"] restart -2008-04-27T04:04:13-04:00 uzdomfw pf: 1055. 619145 rule 268/0(match): block in on ng0: (tos 0x0, ttl 50, id 35580, offset 0, flags [none], proto: UDP (17), length: 485) 202.97.238.230.40659 > 76.10.159.40.1026: UDP, length 457 -2008-04-27T04:04:13-04:00 uzdomfw pf: 001346 rule 268/0(match): block in on ng0: (tos 0x0, ttl 50, id 10488, offset 0, flags [none], proto: UDP (17), length: 485) 202.97.238.230.40659 > 76.10.159.40.1027: UDP, length 457 -2008-04-27T04:04:24-04:00 uzdomfw pf: 10. 532742 rule 268/0(match): block in on ng0: (tos 0x0, ttl 50, id 9191, offset 0, flags [none], proto: UDP (17), length: 485) 202.97.238.230.40735 > 76.10.159.40.1026: UDP, length 457 -2008-04-27T04:04:24-04:00 uzdomfw pf: 001096 rule 268/0(match): block in on ng0: (tos 0x0, ttl 50, id 23751, offset 0, flags [none], proto: UDP (17), length: 485) 202.97.238.230.40735 > 76.10.159.40.1027: UDP, length 457 -2008-04-27T04:04:50.780189-04:00 cmpsvr ntpdate[9441]: adjust time server 192.168.0.55 offset 0.148018 sec -2008-04-27T04:05:51-04:00 uzdomfw pf: 87. 171897 rule 268/0(match): block in on ng0: (tos 0x0, ttl 109, id 61513, offset 0, flags [none], proto: TCP (6), length: 48) 76.10.62.133.2548 > 76.10.159.40.1433: S, cksum 0xd9ad (correct), 762117069:762117069(0) win 64240 -2008-04-27T04:16:23-04:00 uzdomfw pf: 631. 992233 rule 268/0(match): block in on ng0: (tos 0x0, ttl 49, id 51694, offset 0, flags [none], proto: UDP (17), length: 486) 221.208.208.97.46577 > 76.10.159.40.1026: UDP, length 458 -2008-04-27T04:16:23-04:00 uzdomfw pf: 049128 rule 268/0(match): block in on ng0: (tos 0x0, ttl 49, id 9090, offset 0, flags [none], proto: UDP (17), length: 486) 221.208.208.97.46577 > 76.10.159.40.1026: UDP, length 458 -2008-04-27T04:16:23-04:00 uzdomfw pf: 001210 rule 268/0(match): block in on ng0: (tos 0x0, ttl 49, id 52628, offset 0, flags [none], proto: UDP (17), length: 486) 221.208.208.97.46577 > 76.10.159.40.1027: UDP, length 458 -2008-04-27T04:18:21-04:00 uzdomfw pf: 117. 412299 rule 268/0(match): block in on ng0: (tos 0x0, ttl 112, id 30035, offset 0, flags [none], proto: TCP (6), length: 48) 76.8.177.186.3645 > 76.10.159.40.1433: S, cksum 0x74bd (correct), 4216527706:4216527706(0) win 64240 -Mar 10 14:45:39 debandre syslogd 1.4.1#18: restart. -Mar 10 14:45:44 debandre anacron[3226]: Job `cron.daily' terminated (mailing output) -Mar 10 14:45:45 debandre anacron[3226]: Normal exit (1 job run) -Mar 10 14:48:03 debandre /USR/SBIN/CRON[5436]: (gforge) CMD ([ -x /usr/lib/gforge/bin/massmail.php ] && /usr/lib/gforge/bin/massmail.php -d include_path=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www/include > /dev/null 2>&1) -Mar 10 14:48:03 debandre /USR/SBIN/CRON[5437]: (al) CMD (/usr/bin/logger test) -Mar 10 14:48:03 debandre logger: test -Mar 10 14:50:01 debandre /USR/SBIN/CRON[5459]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 14:50:01 debandre /USR/SBIN/CRON[5465]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 14:50:01 debandre /USR/SBIN/CRON[5461]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 14:50:01 debandre /USR/SBIN/CRON[5463]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 14:50:01 debandre /USR/SBIN/CRON[5473]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 14:55:01 debandre /USR/SBIN/CRON[5531]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 14:55:01 debandre /USR/SBIN/CRON[5532]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 14:55:01 debandre /USR/SBIN/CRON[5533]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 14:55:01 debandre /USR/SBIN/CRON[5535]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 14:55:01 debandre /USR/SBIN/CRON[5541]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 14:55:02 debandre /USR/SBIN/CRON[5544]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:00:01 debandre /USR/SBIN/CRON[5601]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:00:01 debandre /USR/SBIN/CRON[5603]: (root) CMD ([ -x /usr/lib/gforge/bin/update-user-group-cvs.sh ] && /usr/lib/gforge/bin/update-user-group-cvs.sh > /dev/null 2>&1) -Mar 10 15:00:01 debandre /USR/SBIN/CRON[5612]: (root) CMD ([ -f /var/lib/gforge/bind/dns.head ] && [ -x /usr/lib/gforge/bin/dns_conf.pl ] && /usr/lib/gforge/bin/dns_conf.pl && /usr/sbin/invoke-rc.d --quiet bind9 reload ) -Mar 10 15:00:01 debandre /USR/SBIN/CRON[5607]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:00:01 debandre /USR/SBIN/CRON[5609]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:00:01 debandre /USR/SBIN/CRON[5616]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:00:01 debandre /USR/SBIN/CRON[5620]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:00:01 debandre /USR/SBIN/CRON[5621]: (al) CMD (/usr/bin/logger test) -Mar 10 15:00:01 debandre logger: test -Mar 10 15:02:01 debandre /USR/SBIN/CRON[5659]: (root) CMD (if [ -x /usr/sbin/pg_maintenance ]; then /usr/sbin/pg_maintenance --analyze >/dev/null; fi) -Mar 10 15:05:01 debandre /USR/SBIN/CRON[5691]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:05:01 debandre /USR/SBIN/CRON[5698]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:05:01 debandre /USR/SBIN/CRON[5693]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 15:05:01 debandre /USR/SBIN/CRON[5695]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:05:01 debandre /USR/SBIN/CRON[5703]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:05:01 debandre /USR/SBIN/CRON[5704]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:05:59 debandre init: Trying to re-exec init -Mar 10 15:09:05 debandre /USR/SBIN/CRON[8007]: (root) CMD ( [ -d /var/lib/php5 ] && find /var/lib/php5/ -type f -cmin +$(/usr/lib/php5/maxlifetime) -print0 | xargs -r -0 rm) -Mar 10 15:09:05 debandre /USR/SBIN/CRON[8008]: (root) CMD ( [ -d /var/lib/php4 ] && find /var/lib/php4/ -type f -cmin +$(/usr/lib/php4/maxlifetime) -print0 | xargs -r -0 rm) -Mar 10 15:10:03 debandre /USR/SBIN/CRON[8496]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:10:03 debandre /USR/SBIN/CRON[8490]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:10:03 debandre /USR/SBIN/CRON[8492]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:10:03 debandre /USR/SBIN/CRON[8494]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:10:03 debandre /USR/SBIN/CRON[8504]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:11:29 debandre gconfd (root-9213): starting (version 2.16.1), pid 9213 user 'root' -Mar 10 15:11:29 debandre gconfd (root-9213): Resolved address "xml:readonly:/etc/gconf/gconf.xml.mandatory" to a read-only configuration source at position 0 -Mar 10 15:11:29 debandre gconfd (root-9213): Resolved address "xml:readwrite:/root/.gconf" to a writable configuration source at position 1 -Mar 10 15:11:29 debandre gconfd (root-9213): Resolved address "xml:readonly:/etc/gconf/gconf.xml.defaults" to a read-only configuration source at position 2 -Mar 10 15:11:29 debandre gconfd (root-9213): Resolved address "xml:readonly:/var/lib/gconf/debian.defaults" to a read-only configuration source at position 3 -Mar 10 15:11:29 debandre gconfd (root-9213): Resolved address "xml:readonly:/var/lib/gconf/defaults" to a read-only configuration source at position 4 -Mar 10 15:11:59 debandre gconfd (root-9213): GConf server is not in use, shutting down. -Mar 10 15:11:59 debandre gconfd (root-9213): Exiting -Mar 10 15:12:02 debandre /USR/SBIN/CRON[10877]: (al) CMD (/usr/bin/logger test) -Mar 10 15:12:02 debandre logger: test -Mar 10 15:12:36 debandre named[2412]: shutting down: flushing changes -Mar 10 15:12:37 debandre named[2412]: stopping command channel on 127.0.0.1#953 -Mar 10 15:12:37 debandre named[2412]: stopping command channel on ::1#953 -Mar 10 15:12:37 debandre named[2412]: no longer listening on ::#53 -Mar 10 15:12:37 debandre named[2412]: no longer listening on 127.0.0.1#53 -Mar 10 15:12:37 debandre named[2412]: no longer listening on 172.16.0.125#53 -Mar 10 15:12:37 debandre named[2412]: exiting -Mar 10 15:12:39 debandre named[13300]: starting BIND 9.3.4 -u bind -Mar 10 15:12:39 debandre named[13300]: found 1 CPU, using 1 worker thread -Mar 10 15:12:39 debandre named[13300]: loading configuration from '/etc/bind/named.conf' -Mar 10 15:12:39 debandre named[13300]: listening on IPv6 interfaces, port 53 -Mar 10 15:12:39 debandre named[13300]: listening on IPv4 interface lo, 127.0.0.1#53 -Mar 10 15:12:39 debandre named[13300]: listening on IPv4 interface eth0, 172.16.0.125#53 -Mar 10 15:12:39 debandre named[13300]: command channel listening on 127.0.0.1#953 -Mar 10 15:12:39 debandre named[13300]: command channel listening on ::1#953 -Mar 10 15:12:39 debandre named[13300]: zone 0.in-addr.arpa/IN: loaded serial 1 -Mar 10 15:12:39 debandre named[13300]: zone 127.in-addr.arpa/IN: loaded serial 1 -Mar 10 15:12:39 debandre named[13300]: zone 255.in-addr.arpa/IN: loaded serial 1 -Mar 10 15:12:39 debandre named[13300]: zone debandre.intern.adiscon.com/IN: loaded serial 2008031001 -Mar 10 15:12:39 debandre named[13300]: zone localhost/IN: loaded serial 1 -Mar 10 15:12:39 debandre named[13300]: running -Mar 10 15:15:01 debandre /USR/SBIN/CRON[13922]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:15:02 debandre /USR/SBIN/CRON[13925]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:15:02 debandre /USR/SBIN/CRON[13933]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 15:15:02 debandre /USR/SBIN/CRON[13927]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:15:02 debandre /USR/SBIN/CRON[13929]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:15:02 debandre /USR/SBIN/CRON[13931]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:17:01 debandre /USR/SBIN/CRON[13968]: (root) CMD ( cd / && run-parts --report /etc/cron.hourly) -Mar 10 15:20:01 debandre /USR/SBIN/CRON[14023]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:20:01 debandre /USR/SBIN/CRON[14018]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:20:01 debandre /USR/SBIN/CRON[14024]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:20:01 debandre /USR/SBIN/CRON[14020]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:20:01 debandre /USR/SBIN/CRON[14022]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:23:39 debandre mysqld_safe[14277]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER ! -Mar 10 15:23:39 debandre mysqld_safe[14277]: To do so, start the server, then issue the following commands: -Mar 10 15:23:39 debandre mysqld_safe[14277]: /usr/bin/mysqladmin -u root password 'new-password' -Mar 10 15:23:39 debandre mysqld_safe[14277]: /usr/bin/mysqladmin -u root -h debandre password 'new-password' -Mar 10 15:23:39 debandre mysqld_safe[14277]: See the manual for more instructions. -Mar 10 15:23:39 debandre mysqld_safe[14277]: -Mar 10 15:23:39 debandre mysqld_safe[14277]: Please report any problems with the /usr/bin/mysqlbug script! -Mar 10 15:23:39 debandre mysqld_safe[14277]: -Mar 10 15:23:39 debandre mysqld_safe[14277]: The latest information about MySQL is available on the web at -Mar 10 15:23:39 debandre mysqld_safe[14277]: http://www.mysql.com -Mar 10 15:23:39 debandre mysqld_safe[14277]: Support MySQL by buying support/licenses at http://shop.mysql.com -Mar 10 15:23:42 debandre mysqld_safe[14417]: started -Mar 10 15:23:42 debandre mysqld[14422]: InnoDB: The first specified data file ./ibdata1 did not exist: -Mar 10 15:23:42 debandre mysqld[14422]: InnoDB: a new database to be created! -Mar 10 15:23:42 debandre mysqld[14422]: 080310 15:23:42 InnoDB: Setting file ./ibdata1 size to 10 MB -Mar 10 15:23:42 debandre mysqld[14422]: InnoDB: Database physically writes the file full: wait... -Mar 10 15:23:42 debandre mysqld[14422]: 080310 15:23:42 InnoDB: Log file ./ib_logfile0 did not exist: new to be created -Mar 10 15:23:42 debandre mysqld[14422]: InnoDB: Setting log file ./ib_logfile0 size to 5 MB -Mar 10 15:23:42 debandre mysqld[14422]: InnoDB: Database physically writes the file full: wait... -Mar 10 15:23:43 debandre mysqld[14422]: 080310 15:23:43 InnoDB: Log file ./ib_logfile1 did not exist: new to be created -Mar 10 15:23:43 debandre mysqld[14422]: InnoDB: Setting log file ./ib_logfile1 size to 5 MB -Mar 10 15:23:43 debandre mysqld[14422]: InnoDB: Database physically writes the file full: wait... -Mar 10 15:23:43 debandre mysqld[14422]: InnoDB: Doublewrite buffer not found: creating new -Mar 10 15:23:43 debandre mysqld[14422]: InnoDB: Doublewrite buffer created -Mar 10 15:23:43 debandre mysqld[14422]: InnoDB: Creating foreign key constraint system tables -Mar 10 15:23:43 debandre mysqld[14422]: InnoDB: Foreign key constraint system tables created -Mar 10 15:23:43 debandre mysqld[14422]: 080310 15:23:43 InnoDB: Started; log sequence number 0 0 -Mar 10 15:23:43 debandre mysqld[14422]: 080310 15:23:43 [Note] /usr/sbin/mysqld: ready for connections. -Mar 10 15:23:43 debandre mysqld[14422]: Version: '5.0.32-Debian_7etch5-log' socket: '/var/run/mysqld/mysqld.sock' port: 3306 Debian etch distribution -Mar 10 15:23:44 debandre /etc/mysql/debian-start[14465]: Upgrading MySQL tables if necessary. -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.columns_priv OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.db OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.func OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.help_category OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.help_keyword OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.help_relation OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.help_topic OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.host OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.proc OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.procs_priv OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.tables_priv OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.time_zone OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.time_zone_leap_second OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.time_zone_name OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.time_zone_transition OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.time_zone_transition_type OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14468]: mysql.user OK -Mar 10 15:23:47 debandre /etc/mysql/debian-start[14488]: Checking for crashed MySQL tables. -Mar 10 15:24:02 debandre /USR/SBIN/CRON[14909]: (al) CMD (/usr/bin/logger test) -Mar 10 15:24:02 debandre logger: test -Mar 10 15:25:01 debandre /USR/SBIN/CRON[14920]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:25:01 debandre /USR/SBIN/CRON[14924]: (root) CMD ([ -d /var/cache/gforge ] && find /var/cache/gforge/ -type f -and -cmin +60 -exec /bin/rm -f "{}" \; > /dev/null 2>&1) -Mar 10 15:25:01 debandre /USR/SBIN/CRON[14925]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:25:01 debandre /USR/SBIN/CRON[14927]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:25:01 debandre /USR/SBIN/CRON[14929]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:25:01 debandre /USR/SBIN/CRON[14931]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:25:01 debandre /USR/SBIN/CRON[14936]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 15:30:01 debandre /USR/SBIN/CRON[14991]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:30:01 debandre /USR/SBIN/CRON[14993]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:30:01 debandre /USR/SBIN/CRON[14999]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:30:01 debandre /USR/SBIN/CRON[14998]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:30:01 debandre /USR/SBIN/CRON[15002]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:35:01 debandre /USR/SBIN/CRON[15188]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:35:01 debandre /USR/SBIN/CRON[15190]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:35:01 debandre /USR/SBIN/CRON[15196]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 15:35:01 debandre /USR/SBIN/CRON[15199]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:35:01 debandre /USR/SBIN/CRON[15198]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:35:01 debandre /USR/SBIN/CRON[15202]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:36:01 debandre /USR/SBIN/CRON[15251]: (al) CMD (/usr/bin/logger test) -Mar 10 15:36:01 debandre logger: test -Mar 10 15:39:01 debandre /USR/SBIN/CRON[15418]: (root) CMD ( [ -d /var/lib/php5 ] && find /var/lib/php5/ -type f -cmin +$(/usr/lib/php5/maxlifetime) -print0 | xargs -r -0 rm) -Mar 10 15:39:01 debandre /USR/SBIN/CRON[15420]: (root) CMD ( [ -d /var/lib/php4 ] && find /var/lib/php4/ -type f -cmin +$(/usr/lib/php4/maxlifetime) -print0 | xargs -r -0 rm) -Mar 10 15:40:01 debandre /USR/SBIN/CRON[15456]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:40:01 debandre /USR/SBIN/CRON[15458]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:40:02 debandre /USR/SBIN/CRON[15459]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:40:02 debandre /USR/SBIN/CRON[15461]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:40:02 debandre /USR/SBIN/CRON[15464]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:45:01 debandre /USR/SBIN/CRON[15528]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:45:01 debandre /USR/SBIN/CRON[15530]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:45:01 debandre /USR/SBIN/CRON[15535]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 15:45:01 debandre /USR/SBIN/CRON[15536]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:45:01 debandre /USR/SBIN/CRON[15538]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:45:01 debandre /USR/SBIN/CRON[15542]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:48:01 debandre /USR/SBIN/CRON[15586]: (gforge) CMD ([ -x /usr/lib/gforge/bin/massmail.php ] && /usr/lib/gforge/bin/massmail.php -d include_path=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www/include > /dev/null 2>&1) -Mar 10 15:48:01 debandre /USR/SBIN/CRON[15588]: (al) CMD (/usr/bin/logger test) -Mar 10 15:48:01 debandre logger: test -Mar 10 15:50:01 debandre /USR/SBIN/CRON[15610]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:50:01 debandre /USR/SBIN/CRON[15613]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:50:01 debandre /USR/SBIN/CRON[15614]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:50:01 debandre /USR/SBIN/CRON[15616]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:50:01 debandre /USR/SBIN/CRON[15620]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 15:55:01 debandre /USR/SBIN/CRON[15680]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 15:55:01 debandre /USR/SBIN/CRON[15682]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 15:55:01 debandre /USR/SBIN/CRON[15686]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 15:55:01 debandre /USR/SBIN/CRON[15687]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 15:55:01 debandre /USR/SBIN/CRON[15689]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 15:55:01 debandre /USR/SBIN/CRON[15694]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 16:00:01 debandre /USR/SBIN/CRON[15759]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 16:00:01 debandre /USR/SBIN/CRON[15760]: (root) CMD ([ -x /usr/lib/gforge/bin/update-user-group-cvs.sh ] && /usr/lib/gforge/bin/update-user-group-cvs.sh > /dev/null 2>&1) -Mar 10 16:00:01 debandre /USR/SBIN/CRON[15761]: (root) CMD ([ -f /var/lib/gforge/bind/dns.head ] && [ -x /usr/lib/gforge/bin/dns_conf.pl ] && /usr/lib/gforge/bin/dns_conf.pl && /usr/sbin/invoke-rc.d --quiet bind9 reload ) -Mar 10 16:00:01 debandre /USR/SBIN/CRON[15769]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 16:00:01 debandre /USR/SBIN/CRON[15765]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 16:00:01 debandre /USR/SBIN/CRON[15767]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 16:00:01 debandre /USR/SBIN/CRON[15773]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 16:00:02 debandre /USR/SBIN/CRON[15774]: (al) CMD (/usr/bin/logger test) -Mar 10 16:00:02 debandre logger: test -Mar 10 16:05:01 debandre /USR/SBIN/CRON[15844]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 16:05:01 debandre /USR/SBIN/CRON[15845]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 16:05:01 debandre /USR/SBIN/CRON[15847]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 16:05:01 debandre /USR/SBIN/CRON[15848]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 16:05:01 debandre /USR/SBIN/CRON[15850]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 16:05:01 debandre /USR/SBIN/CRON[15854]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 16:09:01 debandre /USR/SBIN/CRON[15909]: (root) CMD ( [ -d /var/lib/php5 ] && find /var/lib/php5/ -type f -cmin +$(/usr/lib/php5/maxlifetime) -print0 | xargs -r -0 rm) -Mar 10 16:09:01 debandre /USR/SBIN/CRON[15910]: (root) CMD ( [ -d /var/lib/php4 ] && find /var/lib/php4/ -type f -cmin +$(/usr/lib/php4/maxlifetime) -print0 | xargs -r -0 rm) -Mar 10 16:10:01 debandre /USR/SBIN/CRON[15944]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 16:10:01 debandre /USR/SBIN/CRON[15945]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 16:10:01 debandre /USR/SBIN/CRON[15948]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 16:10:01 debandre /USR/SBIN/CRON[15947]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 16:10:01 debandre /USR/SBIN/CRON[15952]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 16:12:01 debandre /USR/SBIN/CRON[15984]: (al) CMD (/usr/bin/logger test) -Mar 10 16:12:01 debandre logger: test -Mar 10 16:15:01 debandre /USR/SBIN/CRON[16017]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 16:15:01 debandre /USR/SBIN/CRON[16018]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 16:15:01 debandre /USR/SBIN/CRON[16019]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 16:15:01 debandre /USR/SBIN/CRON[16020]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 16:15:01 debandre /USR/SBIN/CRON[16022]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 16:15:01 debandre /USR/SBIN/CRON[16027]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 16:17:01 debandre /USR/SBIN/CRON[16059]: (root) CMD ( cd / && run-parts --report /etc/cron.hourly) -Mar 10 16:20:01 debandre /USR/SBIN/CRON[16093]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 16:20:01 debandre /USR/SBIN/CRON[16095]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 16:20:01 debandre /USR/SBIN/CRON[16094]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 16:20:01 debandre /USR/SBIN/CRON[16097]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 16:20:01 debandre /USR/SBIN/CRON[16102]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 16:24:01 debandre /USR/SBIN/CRON[16150]: (al) CMD (/usr/bin/logger test) -Mar 10 16:24:01 debandre logger: test -Mar 10 16:25:01 debandre /USR/SBIN/CRON[16165]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 16:25:01 debandre /USR/SBIN/CRON[16166]: (root) CMD ([ -d /var/cache/gforge ] && find /var/cache/gforge/ -type f -and -cmin +60 -exec /bin/rm -f "{}" \; > /dev/null 2>&1) -Mar 10 16:25:01 debandre /USR/SBIN/CRON[16173]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 16:25:01 debandre /USR/SBIN/CRON[16167]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 16:25:01 debandre /USR/SBIN/CRON[16169]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 16:25:01 debandre /USR/SBIN/CRON[16171]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 16:25:02 debandre /USR/SBIN/CRON[16177]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 16:30:01 debandre /USR/SBIN/CRON[16241]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 16:30:01 debandre /USR/SBIN/CRON[16240]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 16:30:01 debandre /USR/SBIN/CRON[16243]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 16:30:01 debandre /USR/SBIN/CRON[16244]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 16:30:01 debandre /USR/SBIN/CRON[16249]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 16:35:01 debandre /USR/SBIN/CRON[16306]: (mailping) CMD (if [ -x /usr/bin/mailping-cron ]; then /usr/bin/mailping-cron; fi) -Mar 10 16:35:01 debandre /USR/SBIN/CRON[16308]: (svn-autoreleasedeb) CMD (sh /etc/default/svn-autoreleasedeb && /usr/bin/svn-autoreleasedeb 2>&1 >> /var/log/svn-autoreleasedeb/run.log) -Mar 10 16:35:01 debandre /USR/SBIN/CRON[16314]: (gnats) CMD (test -x /usr/lib/gnats/queue-pr && /usr/lib/gnats/queue-pr --run ; exit 0) -Mar 10 16:35:01 debandre /USR/SBIN/CRON[16317]: (cvs-autoreleasedeb) CMD (sh /etc/default/cvs-autoreleasedeb && /usr/bin/cvs-autoreleasedeb 2>&1 >> /var/log/cvs-autoreleasedeb/run.log) -Mar 10 16:35:01 debandre /USR/SBIN/CRON[16316]: (root) CMD (if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi) -Mar 10 16:35:01 debandre /USR/SBIN/CRON[16320]: (debarchiver) CMD (test -x /usr/bin/debarchiver && /usr/bin/debarchiver -so | logger -t debarchiver -p daemon.info) -Mar 10 16:36:01 debandre /USR/SBIN/CRON[16343]: (al) CMD (/usr/bin/logger test) -Mar 10 16:36:01 debandre logger: test From f2bd44ed112c3190fcac63ce116f8bd667dbb594 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Mon, 28 Apr 2008 17:41:25 +0200 Subject: [PATCH 05/11] Added inline search buttons into the main view. Going to discuss these new buttons tomorrow with rainer. I kind of like them, but I also have additional ideas. --- src/include/functions_common.php | 2 ++ src/index.php | 44 ++++++++++++++++++++++++++++++-- src/lang/de/main.php | 3 +++ src/lang/en/main.php | 4 +++ src/templates/index.html | 15 +++++++++-- 5 files changed, 64 insertions(+), 4 deletions(-) diff --git a/src/include/functions_common.php b/src/include/functions_common.php index d464fa8..ce68455 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -342,6 +342,8 @@ function InitFrontEndVariables() $content['MENU_FOLDER_CLOSED'] = $content['BASEPATH'] . "images/icons/folder.png"; $content['MENU_HOMEPAGE'] = $content['BASEPATH'] . "images/icons/home.png"; $content['MENU_LINK'] = $content['BASEPATH'] . "images/icons/link.png"; + $content['MENU_LINK_VIEW'] = $content['BASEPATH'] . "images/icons/link_view.png"; + $content['MENU_VIEW'] = $content['BASEPATH'] . "images/icons/view.png"; $content['MENU_PREFERENCES'] = $content['BASEPATH'] . "images/icons/preferences.png"; $content['MENU_ADMINENTRY'] = $content['BASEPATH'] . "images/icons/star_blue.png"; $content['MENU_ADMINLOGOFF'] = $content['BASEPATH'] . "images/icons/exit.png"; diff --git a/src/index.php b/src/index.php index 29cb6db..404dfa0 100644 --- a/src/index.php +++ b/src/index.php @@ -189,6 +189,11 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c $content['fields'][$mycolkey]['FieldType'] = $fields[$mycolkey]['FieldType']; $content['fields'][$mycolkey]['FieldSortable'] = $stream->IsPropertySortable($mycolkey); // $fields[$mycolkey]['Sortable']; $content['fields'][$mycolkey]['DefaultWidth'] = $fields[$mycolkey]['DefaultWidth']; + + if ( $mycolkey == SYSLOG_MESSAGE ) + $content['fields'][$mycolkey]['colspan'] = ' colspan="2" '; + else + $content['fields'][$mycolkey]['colspan'] = ''; } // --- @@ -391,10 +396,45 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c if ( strlen($content['searchstr']) > 0 ) { - // Prepend button - $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = "" . $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue']; + // Enable buttons + $content['syslogmessages'][$counter]['buttons_enabled'] = true; + + // Prepend Msg centered button + $content['syslogmessages'][$counter]['buttons'][]['htmlcode'] = ''; } } + else if ( $mycolkey == SYSLOG_SYSLOGTAG ) + { + // Append Syslogtag Search Button + $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '' . '' . $logArray[$mycolkey]; + } + else if ( $mycolkey == SYSLOG_HOST ) + { + // Append Syslogtag Search Button + $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '' . '' . $logArray[$mycolkey]; +/* TODO ... +$content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = ' + +' . $logArray[$mycolkey]; +*/ + } + } } } diff --git a/src/lang/de/main.php b/src/lang/de/main.php index ce728b7..cd4211a 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -56,6 +56,9 @@ $content['LN_SEARCH_ADVANCED'] = "Erweiterte Suche"; $content['LN_SEARCH'] = "Suche"; $content['LN_SEARCH_RESET'] = "Suche zurücksetzen"; $content['LN_SEARCH_PERFORMADVANCED'] = "Erweiterte Suche starten"; +$content['LN_VIEW_MESSAGECENTERED'] = "View syslog message centered in logstream"; +$content['LN_VIEW_RELATEDMSG'] = "View related syslog messages"; +$content['LN_VIEW_FILTERFOR'] = "Filter message for "; $content['LN_HIGHLIGHT'] = "Hightlight >>"; $content['LN_HIGHLIGHT_OFF'] = "Hightlight <<"; diff --git a/src/lang/en/main.php b/src/lang/en/main.php index f95217b..03057e7 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -59,6 +59,10 @@ $content['LN_SEARCH_ADVANCED'] = "Advanced Search"; $content['LN_SEARCH'] = "Search"; $content['LN_SEARCH_RESET'] = "Reset search"; $content['LN_SEARCH_PERFORMADVANCED'] = "Perform Advanced Search"; +$content['LN_VIEW_MESSAGECENTERED'] = "View syslog message centered in logstream"; +$content['LN_VIEW_RELATEDMSG'] = "View related syslog messages"; +$content['LN_VIEW_FILTERFOR'] = "Filter message for "; + $content['LN_HIGHLIGHT'] = "Hightlight >>"; $content['LN_HIGHLIGHT_OFF'] = "Hightlight <<"; diff --git a/src/templates/index.html b/src/templates/index.html index d1e8c77..91b9ecb 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -177,7 +177,7 @@ - + @@ -196,8 +196,8 @@ - + @@ -209,6 +209,7 @@ + {fieldvalue} @@ -225,6 +226,16 @@ + + + + + + From 8dd71e818f0f4c7c6c596abcc20ae511263c97d1 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Tue, 29 Apr 2008 14:51:26 +0200 Subject: [PATCH 06/11] Added new kind of popup menu for use within the grid. The popup menu uses javascript and is shown on click. It seems to be the best option so far for later development. This state is kind of in the middle as I need to take care of a bug in the beta branch. --- src/css/defaults.css | 2 +- src/css/menu.css | 19 +++-- src/images/icons/bullet_ball_glass_blue.png | Bin 0 -> 661 bytes src/images/icons/bullet_ball_glass_green.png | Bin 0 -> 673 bytes src/images/icons/bullet_ball_glass_grey.png | Bin 0 -> 643 bytes src/images/icons/bullet_ball_glass_red.png | Bin 0 -> 649 bytes src/images/icons/bullet_ball_glass_yellow.png | Bin 0 -> 666 bytes src/include/constants_logstream.php | 2 +- src/include/functions_common.php | 7 +- src/index.php | 19 +++-- src/js/common.js | 79 +++++++++++++++++- src/lang/en/main.php | 1 + src/templates/index.html | 55 +++++++++--- src/themes/dark/main.css | 4 +- src/themes/default/main.css | 4 +- 15 files changed, 160 insertions(+), 32 deletions(-) create mode 100644 src/images/icons/bullet_ball_glass_blue.png create mode 100644 src/images/icons/bullet_ball_glass_green.png create mode 100644 src/images/icons/bullet_ball_glass_grey.png create mode 100644 src/images/icons/bullet_ball_glass_red.png create mode 100644 src/images/icons/bullet_ball_glass_yellow.png diff --git a/src/css/defaults.css b/src/css/defaults.css index 2ccf210..523489f 100644 --- a/src/css/defaults.css +++ b/src/css/defaults.css @@ -24,7 +24,7 @@ .SelectSavedFilter { - margin-top: 3px; + margin-top: 2px; border: 1px solid; border-color: #233B51 #124A7C #124A7C #233B51; } diff --git a/src/css/menu.css b/src/css/menu.css index f42df92..076c0ba 100644 --- a/src/css/menu.css +++ b/src/css/menu.css @@ -14,11 +14,11 @@ border-width: 1px; border-style: solid; margin: 0; - padding: 2px 3px; + padding: 1px 1px; } #menu h2 { - font: bold 11px/16px; + font: bold; text-align: center; } @@ -33,22 +33,27 @@ } #menu li { - z-index:10; /* make the list elements a containing block for the nested lists */ position: relative; } #menu ul ul { + z-index:10; + position: absolute; - top: 16px; - left: 0px; /* to position them to the right of their containing block */ + top: 12px; + left: 4px; /* to position them to the right of their containing block */ width: 300; /* width is based on the containing block */ } div#menu ul ul, div#menu ul li:hover ul ul -{display: none;} +{ + display: none; +} div#menu ul li:hover ul, div#menu ul ul li:hover ul -{display: block;} \ No newline at end of file +{ + display: block; +} \ No newline at end of file diff --git a/src/images/icons/bullet_ball_glass_blue.png b/src/images/icons/bullet_ball_glass_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..143f23ca2f8bb934e7d224d946c6d2479fcdcae9 GIT binary patch literal 661 zcmV;G0&4wWdKcYATcu_Piu4_GB7YRATTgGFf%$dIUp-AF)%Qy!D_((000McNliru z)&&<0F)4wnxk&&3010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00Heu zL_t(|+O<&id}1JAZqrG^hx7(%rO)f-6_#^ zS6;oTU}o|yS!S)sk-#`l&RbK%v9facybetdz!Dk^U7%I5#0R_c8uqj6__pxXcT%~M zawuSy9z>LVrKmMv)l~7Ns3JwA%>eRT3kyd<|Ii&Wdx)lkFzrylaT7Ti#B?TzsG-6L zRMWFtme|}=;dnpCq5GSIssC2T5r%0Ah{AxgfxNXMh#idtW%LWN9eyhC}fvH zZLNbHVIUR)BEf2ca%K7@%eCodZShlm(T;MES$*p6WMsPmbW)_J1?Y|d7dgMs%xZ3b zmv}Yynapj!5_JMk240p@$?@go4cRDM#Loa%Xts%UoL}6Kg%@Mbu|A(8bA|YETq9NQ zm$-iq9XE!zC3n%YM{EzVyz#E;KFHSj<00000NkvXXu0mjfxAhp} literal 0 HcmV?d00001 diff --git a/src/images/icons/bullet_ball_glass_green.png b/src/images/icons/bullet_ball_glass_green.png new file mode 100644 index 0000000000000000000000000000000000000000..9e8a4b49115d3feef37e38c16be77bc04a9289e7 GIT binary patch literal 673 zcmV;S0$%-zP)WdKcYATcu_Piu4_GB7YRATTgGFfuwaGaxH4F)%PE99K2~000McNliru z)&&<0F)4wnxk&&3010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00H?) zL_t(|+O?C8arlb*qA|3d!Z|D7(_hSb5&n5kXPW)AXtFN<# zxDnk6M3hgoa-h6vZHD(2Z(gf~w)SNAJ(&glLG}V%cyXf8+=&)WkDp_?%q*-!D!>G6&4wapq>8dW&pp0TFSWm> znRH8Hy#QXleOpmSnL>UIQH9GZs1r@$LQyy*&0%Bn+GR35Ntiu9r6+`f=XJG%wXldC zX%r?`=?Dp}*h95bgRF7LlPpK3GsGvNxi3J_iP?l? z7zPsAp@0s3OY7f6?P2Q+nO4$C?4N@7EGqkRf%!eC<#SV$($v^E98HJodw8_`N~}KE zejG0G#Q7z$nzU{3BK@xK5^i7)SFGdO3~43rW4nZ>C}IV>q+ceMh^^jT7`%x|PmU0$ zQjVtk+eDH0kjl}pw;-o;9_j0LQgf1lmkeg;TNt7fIEeKNaNW8?>e9ok00000NkvXX Hu0mjfm?I~W literal 0 HcmV?d00001 diff --git a/src/images/icons/bullet_ball_glass_grey.png b/src/images/icons/bullet_ball_glass_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..5ae8681ca762a39718c590db802b6723526a6019 GIT binary patch literal 643 zcmV-}0(||6P)WdKHUATlx_N_A`?GB7YTATc*OGc`IfHXti7F)%Rco(Z)8000McNliru z)&&<0F)4wnxk&&3010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00G-c zL_t(|+ND#=PQp+Sowl?`{XrV36C550dM#D``dS~v;>6w{(0oGj9Kh9=fLVR;;OAKsmi27s_MFE3kZX(s?f+oh`3L`v=yk!Y5npP!6@uCQVB!L(R zfPnDfp7>_A4UKyJ;rry41l@i=dsnU6B$4;~K|qM)i^;@ybA4@}ou4Zh+H)rHbqcjw ztsM#mnNG90yB&*BI7Se79=e?l6mvQIv{*b*6h+0*OT;5-&-aT&)X1@D^bnhs@=H>j zl%%O@{khdrG);R&^9pg{sIY&!iKM9^M9k@S*zxxfw+@I3^S8G^J9GB0beq)t{?k=n d`!TJ(J^=$7uj{Pt1QP%N002ovPDHLkV1h-Y4MYF{ literal 0 HcmV?d00001 diff --git a/src/images/icons/bullet_ball_glass_red.png b/src/images/icons/bullet_ball_glass_red.png new file mode 100644 index 0000000000000000000000000000000000000000..9c6e7a19035d43e9cab3292c2948a573bc58910e GIT binary patch literal 649 zcmV;40(Sk0P)WdKcYATcu_Piu4_GB7YRATTgGFfuwdHXti7F)%QH;c$&dO`;4Gl zBT&qu)`emY^Xn&qP6ZvZjVnPk)xW`qd1xe2c6ifJE};rpEM4bF zh~siHCM*e+Ulg=7hKdcNA~skZiz5ZPut)9~8iIJD>m!!^!oW5K8%GR&c*KYW- jtAe}hzp#tVn5R8yDSW`00000NkvXXu0mjf?(GsB literal 0 HcmV?d00001 diff --git a/src/images/icons/bullet_ball_glass_yellow.png b/src/images/icons/bullet_ball_glass_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..ae0ef19069552df0aabf5065168535526e26b3e7 GIT binary patch literal 666 zcmV;L0%iS)P)WdKcYATcu_Piu4_GB7YRATTgGFf%$bG9W83F)%Q0sW-d;000McNliru z)&&<0F)4wnxk&&3010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00Htz zL_t(|+O<_$AUK#4g}^*TtUNmydx7CT#;SwcSSB#B^me%h%H?$9m6VXp-6Trlu=E`Z@29-sSEbRnQ$g_uVwtGa z?m?jMUO(>MOkwD1d!iFUi21BN|6&4jpR%A9d?Yf&*Jz;D^Dmqc^YA~;FBJ`%5|l|mB>(^b07*qoM6N<$f)AS@ A2><{9 literal 0 HcmV?d00001 diff --git a/src/include/constants_logstream.php b/src/include/constants_logstream.php index 9287183..6c14185 100644 --- a/src/include/constants_logstream.php +++ b/src/include/constants_logstream.php @@ -95,7 +95,7 @@ $fields[SYSLOG_MESSAGETYPE]['FieldCaptionID'] = 'LN_FIELDS_MESSAGETYPE'; $fields[SYSLOG_MESSAGETYPE]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_MESSAGETYPE]['Sortable'] = true; $fields[SYSLOG_MESSAGETYPE]['DefaultWidth'] = "90"; -$fields[SYSLOG_MESSAGETYPE]['FieldAlign'] = "left"; +$fields[SYSLOG_MESSAGETYPE]['FieldAlign'] = "center"; // Syslog specific $fields[SYSLOG_FACILITY]['FieldID'] = SYSLOG_FACILITY; diff --git a/src/include/functions_common.php b/src/include/functions_common.php index f13d6f8..e49c35a 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -360,11 +360,16 @@ function InitFrontEndVariables() $content['MENU_NAV_RIGHT'] = $content['BASEPATH'] . "images/icons/navigate_right.png"; $content['MENU_NAV_CLOSE'] = $content['BASEPATH'] . "images/icons/navigate_close.png"; $content['MENU_NAV_OPEN'] = $content['BASEPATH'] . "images/icons/navigate_open.png"; - $content['MENU_PAGER_BEGIN_GREY'] = $content['BASEPATH'] . "images/icons/grey/media_beginning.png"; $content['MENU_PAGER_PREVIOUS_GREY'] = $content['BASEPATH'] . "images/icons/grey/media_rewind.png"; $content['MENU_PAGER_NEXT_GREY'] = $content['BASEPATH'] . "images/icons/grey/media_fast_forward.png"; $content['MENU_PAGER_END_GREY'] = $content['BASEPATH'] . "images/icons/grey/media_end.png"; + + $content['MENU_BULLET_BLUE'] = $content['BASEPATH'] . "images/icons/bullet_ball_glass_blue.png"; + $content['MENU_BULLET_GREEN'] = $content['BASEPATH'] . "images/icons/bullet_ball_glass_green.png"; + $content['MENU_BULLET_RED'] = $content['BASEPATH'] . "images/icons/bullet_ball_glass_red.png"; + $content['MENU_BULLET_YELLOW'] = $content['BASEPATH'] . "images/icons/bullet_ball_glass_yellow.png"; + $content['MENU_BULLET_GREY'] = $content['BASEPATH'] . "images/icons/bullet_ball_glass_grey.png"; } // Lang Helper for Strings with ONE variable diff --git a/src/index.php b/src/index.php index 404dfa0..01fd4c7 100644 --- a/src/index.php +++ b/src/index.php @@ -267,6 +267,8 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c if ( isset($logArray[$mycolkey]) ) { // Set defaults + $content['syslogmessages'][$counter]['values'][$mycolkey]['FieldColumn'] = $mycolkey; + $content['syslogmessages'][$counter]['values'][$mycolkey]['uid'] = $uID; $content['syslogmessages'][$counter]['values'][$mycolkey]['FieldAlign'] = $fields[$mycolkey]['FieldAlign']; $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldcssclass'] = $content['syslogmessages'][$counter]['cssclass']; $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldbgcolor'] = ""; @@ -408,15 +410,22 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c { // Append Syslogtag Search Button $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '' . '' . $logArray[$mycolkey]; + '&search=Search" target="_top">' . $logArray[$mycolkey]. ''; +// ' } else if ( $mycolkey == SYSLOG_HOST ) { + $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; + $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( + 'ButtonUrl' => '?filter=source%3A' . $logArray[$mycolkey] . '&search=Search', + 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . $logArray[$mycolkey] . "'" + ); + // Append Syslogtag Search Button - $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '' . '' . $logArray[$mycolkey]; +// $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '' . '' . $logArray[$mycolkey]; + /* TODO ... $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = ' - - - - - diff --git a/src/themes/default/main.css b/src/themes/default/main.css index f6020ec..daeab01 100644 --- a/src/themes/default/main.css +++ b/src/themes/default/main.css @@ -123,6 +123,7 @@ font /* Cells for listening */ .line0 { + height: 16px; font-size: 8pt; color: #000000; background-color: #DDDDDD; @@ -134,6 +135,7 @@ font .line1 { + height: 16px; font-size: 8pt; color: #000000; background-color: #EEEEEE; @@ -145,6 +147,7 @@ font .line2 { + height: 16px; font-size: 8pt; color: #000000; background-color: #F5F5F5; @@ -188,12 +191,12 @@ font } */ -.lineColouredWhite +.lineColouredWhite, .lineColouredWhite:hover, A.lineColouredWhite { font-size: 8pt; color: #FFFFFF; } -.lineColouredBlack +.lineColouredBlack, .lineColouredBlack:hover, A.lineColouredBlack { font-size: 8pt; color: #000000; From 2e6c50e8c982d53d8faf269dc04dcbfc11c38949 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Wed, 30 Apr 2008 13:19:07 +0200 Subject: [PATCH 08/11] Optimiced db driver, performs much faster on larger database now if you run a search. We are using the SQL_CALC_FOUND_ROWS and FOUND_ROWS() mysql feature which is available since MYSQL 4.x. So this also means we require at least MYSQL 4.x for phplogcon to run on. --- src/classes/logstreamdb.class.php | 50 +++++++++++++++++++++++++------ src/index.php | 24 ++++++++++----- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/src/classes/logstreamdb.class.php b/src/classes/logstreamdb.class.php index 24a7d3a..b274aae 100644 --- a/src/classes/logstreamdb.class.php +++ b/src/classes/logstreamdb.class.php @@ -113,10 +113,10 @@ class LogStreamDB extends LogStream { $this->CreateSQLWhereClause(); // Obtain count of records - $this->_totalRecordCount = $this->GetRowCountFromTable(); - - if ( $this->_totalRecordCount <= 0 ) - return ERROR_NOMORERECORDS; +// $this->_totalRecordCount = $this->GetRowCountFromTable(); +// +// if ( $this->_totalRecordCount <= 0 ) +// return ERROR_NOMORERECORDS; // Success, this means we init the Pagenumber to ONE! $this->_currentPageNumber = 1; @@ -602,6 +602,15 @@ class LogStreamDB extends LogStream { // Free Query ressources mysql_free_result ($myquery); + // Obtain count of records if needed! + if ( $this->_totalRecordCount == -1 ) + { + $this->_totalRecordCount = $this->GetRowCountFromTable(); + + if ( $this->_totalRecordCount <= 0 ) + return ERROR_NOMORERECORDS; + } + // Increment for the Footer Stats $querycount++; @@ -641,6 +650,15 @@ class LogStreamDB extends LogStream { // Free Query ressources mysql_free_result ($myquery); + // Obtain count of records if needed! + if ( $this->_totalRecordCount == -1 ) + { + $this->_totalRecordCount = $this->GetRowCountFromTable(); + + if ( $this->_totalRecordCount <= 0 ) + return ERROR_NOMORERECORDS; + } + // Increment for the Footer Stats $querycount++; @@ -660,7 +678,7 @@ class LogStreamDB extends LogStream { $szSortColumn = $this->_logStreamConfigObj->SortColumn; // Create SQL String - $sqlString = "SELECT " . $dbmapping[$szTableType][SYSLOG_UID]; + $sqlString = "SELECT SQL_CALC_FOUND_ROWS " . $dbmapping[$szTableType][SYSLOG_UID]; if ( $includeFields && $this->_arrProperties != null ) { // Loop through all requested fields @@ -758,9 +776,25 @@ class LogStreamDB extends LogStream { */ private function GetRowCountFromTable() { + global $querycount; + if ( $myquery = mysql_query("Select FOUND_ROWS();", $this->_dbhandle) ) + { + // Get first and only row! + $myRow = mysql_fetch_array($myquery); + + // copy row count + $numRows = $myRow[0]; + } + else + $numRows = -1; + + // return result! + return $numRows; + + /* OLD slow code! global $dbmapping,$querycount; $szTableType = $this->_logStreamConfigObj->DBTableType; - + // Create Statement and perform query! $szSql = "SELECT count(" . $dbmapping[$szTableType][SYSLOG_UID] . ") FROM " . $this->_logStreamConfigObj->DBTableName . $this->_SQLwhereClause; if ($myQuery = mysql_query($szSql, $this->_dbhandle)) @@ -777,9 +811,7 @@ class LogStreamDB extends LogStream { } else $numRows = -1; - - // return result! - return $numRows; + */ } diff --git a/src/index.php b/src/index.php index 5858b30..7a8270b 100644 --- a/src/index.php +++ b/src/index.php @@ -191,7 +191,7 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c $content['fields'][$mycolkey]['DefaultWidth'] = $fields[$mycolkey]['DefaultWidth']; if ( $mycolkey == SYSLOG_MESSAGE ) - $content['fields'][$mycolkey]['colspan'] = ' colspan="2" '; + $content['fields'][$mycolkey]['colspan'] = ''; //' colspan="2" '; else $content['fields'][$mycolkey]['colspan'] = ''; } @@ -217,14 +217,24 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c else $ret = $stream->ReadNext($uID, $logArray); - // --- If Forward direction is used, we need to SKIP one entry! - if ( $ret == SUCCESS && $content['read_direction'] == EnumReadDirection::Forward ) + // --- Check if Read was successfull! + if ( $ret == SUCCESS ) { - // Ok the current ID is our NEXT ID in this reading direction, so we save it! - $content['uid_next'] = $uID; + // If Forward direction is used, we need to SKIP one entry! + if ( $content['read_direction'] == EnumReadDirection::Forward ) + { + // Ok the current ID is our NEXT ID in this reading direction, so we save it! + $content['uid_next'] = $uID; - // Skip this entry and move to the next - $stream->ReadNext($uID, $logArray); + // Skip this entry and move to the next + $stream->ReadNext($uID, $logArray); + } + } + else + { + // This will disable to Main SyslogView and show an error message + $content['syslogmessagesenabled'] = "false"; + $content['detailederror'] = "No syslog messages found."; } // --- From 180a0c3dd0fa9ff85f806821ae59e317f9098c68 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Wed, 30 Apr 2008 17:00:26 +0200 Subject: [PATCH 09/11] Added filter for messagetype field into logstream and search form this filter is usefull if you have multiple sources writing into the same database table. --- src/classes/logstream.class.php | 45 +++++++++++++++++++++++++++++++ src/include/constants_filters.php | 3 ++- src/include/functions_filters.php | 25 ++++++++++++----- src/index.php | 8 ++++++ src/lang/de/main.php | 1 + src/lang/en/main.php | 1 + src/search.php | 17 ++++++++++-- src/templates/index.html | 2 +- src/templates/search.html | 14 ++++++++-- 9 files changed, 104 insertions(+), 12 deletions(-) diff --git a/src/classes/logstream.class.php b/src/classes/logstream.class.php index 789fd77..bb1ea34 100644 --- a/src/classes/logstream.class.php +++ b/src/classes/logstream.class.php @@ -313,6 +313,33 @@ abstract class LogStream { } // --- break; + case "messagetype": + $tmpKeyName = SYSLOG_MESSAGETYPE; + $tmpFilterType = FILTER_TYPE_NUMBER; + // --- Extra Check to convert string representations into numbers! + if ( isset($tmpValues) ) + { + foreach( $tmpValues as $mykey => $szValue ) + { + if ( !is_numeric($szValue) ) + { + $tmpMsgTypeCode = $this->ConvertMessageTypeString($szValue); + if ( $tmpMsgTypeCode != -1 ) + $tmpValues[$mykey] = $tmpMsgTypeCode; + } + } + } + else + { + if ( !is_numeric($tmpArray[FILTER_TMP_VALUE]) ) + { + $tmpMsgTypeCode = $this->ConvertMessageTypeString($tmpArray[FILTER_TMP_VALUE]); + if ( $tmpMsgTypeCode != -1 ) + $tmpArray[FILTER_TMP_VALUE] = $tmpMsgTypeCode; + } + } + // --- + break; case "syslogtag": $tmpKeyName = SYSLOG_SYSLOGTAG; $tmpFilterType = FILTER_TYPE_STRING; @@ -470,6 +497,24 @@ abstract class LogStream { return -1; } + /* + * Helper function to convert a messagetype string into a messagetype number + */ + private function ConvertMessageTypeString($szValue) + { + global $content; + + foreach ( $content['filter_messagetype_list'] as $mymsgtype ) + { + if ( stripos( $mymsgtype['DisplayName'], $szValue) !== false ) + return $mymsgtype['ID']; + } + + // reached here means we failed to convert the facility! + return -1; + } + + } ?> diff --git a/src/include/constants_filters.php b/src/include/constants_filters.php index 4bea7c8..18fabb0 100644 --- a/src/include/constants_filters.php +++ b/src/include/constants_filters.php @@ -105,8 +105,9 @@ $content['filter_severity_list'][] = array( "ID" => SYSLOG_DEBUG, "DisplayName" // --- // Init MessageType LIST -$content['filter_messagetype_list'][] = array( "ID" => IUT_Unknown, "DisplayName" => "Unknown", "selected" => "" ); +//$content['filter_messagetype_list'][] = array( "ID" => IUT_Unknown, "DisplayName" => "Unknown", "selected" => "" ); $content['filter_messagetype_list'][] = array( "ID" => IUT_Syslog, "DisplayName" => "Syslog", "selected" => "" ); $content['filter_messagetype_list'][] = array( "ID" => IUT_NT_EventReport, "DisplayName" => "EventReporter", "selected" => "" ); +$content['filter_messagetype_list'][] = array( "ID" => IUT_File_Monitor, "DisplayName" => "File Monitor", "selected" => "" ); ?> \ No newline at end of file diff --git a/src/include/functions_filters.php b/src/include/functions_filters.php index ba439ec..867a284 100644 --- a/src/include/functions_filters.php +++ b/src/include/functions_filters.php @@ -150,27 +150,25 @@ function InitFilterHelpers() if ( $filters['filter_lastx_default'] == DATE_LASTX_31DAYS ) { $content['filter_daterange_last_x_list'][4]['selected'] = "selected"; } else { $content['filter_daterange_last_x_list'][4]['selected'] = ""; } // --- - // Init Default Syslog Facility from SESSION! + // --- Init Default Syslog Facility from SESSION! if ( isset($_SESSION['filter_facility']) ) $filters['filter_facility'] = intval($_SESSION['filter_facility']); else - $filters['filter_facility'] = array ( SYSLOG_KERN, SYSLOG_USER, SYSLOG_MAIL, SYSLOG_DAEMON, SYSLOG_AUTH, SYSLOG_SYSLOG, SYSLOG_LPR, SYSLOG_NEWS, SYSLOG_UUCP, SYSLOG_CRON, SYSLOG_LOCAL0, SYSLOG_LOCAL1, SYSLOG_LOCAL2, SYSLOG_LOCAL3, SYSLOG_LOCAL4, SYSLOG_LOCAL5, SYSLOG_LOCAL6, SYSLOG_LOCAL7 ); -// $filters['filter_facility'] = SYSLOG_LOCAL0; + $filters['filter_facility'] = array ( SYSLOG_KERN, SYSLOG_USER, SYSLOG_MAIL, SYSLOG_DAEMON, SYSLOG_AUTH, SYSLOG_SYSLOG, SYSLOG_LPR, SYSLOG_NEWS, SYSLOG_UUCP, SYSLOG_CRON, SYSLOG_SECURITY, SYSLOG_FTP, SYSLOG_NTP, SYSLOG_LOGAUDIT, SYSLOG_LOGALERT, SYSLOG_CLOCK, SYSLOG_LOCAL0, SYSLOG_LOCAL1, SYSLOG_LOCAL2, SYSLOG_LOCAL3, SYSLOG_LOCAL4, SYSLOG_LOCAL5, SYSLOG_LOCAL6, SYSLOG_LOCAL7 ); $iCount = count($content['filter_facility_list']); for ( $i = 0; $i < $iCount; $i++ ) { -// echo $content['filter_facility_list'][$i]["ID"] . "-" . $filters['filter_facility'] . "
"; if ( in_array($content['filter_facility_list'][$i]["ID"], $filters['filter_facility']) ) $content['filter_facility_list'][$i]["selected"] = "selected"; } + // --- - // Init Default Syslog Severity from SESSION! + // --- Init Default Syslog Severity from SESSION! if ( isset($_SESSION['filter_severity']) ) $filters['filter_severity'] = intval($_SESSION['filter_severity']); else $filters['filter_severity'] = array ( SYSLOG_EMERG, SYSLOG_ALERT, SYSLOG_CRIT, SYSLOG_ERR, SYSLOG_WARNING, SYSLOG_NOTICE, SYSLOG_INFO, SYSLOG_DEBUG ); -// $filters['filter_severity'] = SYSLOG_NOTICE; $iCount = count($content['filter_severity_list']); for ( $i = 0; $i < $iCount; $i++ ) @@ -178,6 +176,21 @@ function InitFilterHelpers() if ( in_array( $content['filter_severity_list'][$i]["ID"], $filters['filter_severity']) ) $content['filter_severity_list'][$i]["selected"] = "selected"; } + // --- + + // --- Init Default Message Type from SESSION! + if ( isset($_SESSION['filter_messagetype']) ) + $filters['filter_messagetype'] = intval($_SESSION['filter_messagetype']); + else + $filters['filter_messagetype'] = array ( IUT_Syslog, IUT_NT_EventReport, IUT_File_Monitor ); + + $iCount = count($content['filter_messagetype_list']); + for ( $i = 0; $i < $iCount; $i++ ) + { + if ( in_array( $content['filter_messagetype_list'][$i]["ID"], $filters['filter_messagetype']) ) + $content['filter_messagetype_list'][$i]["selected"] = "selected"; + } + // --- } diff --git a/src/index.php b/src/index.php index 7a8270b..ee60133 100644 --- a/src/index.php +++ b/src/index.php @@ -361,6 +361,14 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Use default colour! $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $msgtype_colors[IUT_Unknown] . '" '; } + + // Set OnClick Menu for SYSLOG_MESSAGETYPE + $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; + $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( + 'ButtonUrl' => '?filter=messagetype%3A' . $logArray[$mycolkey] . '&search=Search', + 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . GetMessageTypeDisplayName( $logArray[$mycolkey] ). "'", + 'IconSource' => $content['MENU_BULLET_BLUE'] + ); } } diff --git a/src/lang/de/main.php b/src/lang/de/main.php index c194a09..b135411 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -90,6 +90,7 @@ $content['LN_FILTER_OTHERS'] = "Andere Filter"; $content['LN_FILTER_MESSAGE'] = "Syslog Meldungen"; $content['LN_FILTER_SYSLOGTAG'] = "Syslogtag"; $content['LN_FILTER_SOURCE'] = "Quelle (Hostname)"; + $content['LN_FILTER_MESSAGETYPE'] = "Message Type"; // Field Captions $content['LN_FIELDS_DATE'] = "Datum"; diff --git a/src/lang/en/main.php b/src/lang/en/main.php index 666ba39..2979ce3 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -92,6 +92,7 @@ $content['LN_FILTER_OTHERS'] = "Other Filters"; $content['LN_FILTER_MESSAGE'] = "Syslog Message"; $content['LN_FILTER_SYSLOGTAG'] = "Syslogtag"; $content['LN_FILTER_SOURCE'] = "Source (Hostname)"; +$content['LN_FILTER_MESSAGETYPE'] = "Message Type"; // Field Captions $content['LN_FIELDS_DATE'] = "Date"; diff --git a/src/search.php b/src/search.php index 7781006..b031264 100644 --- a/src/search.php +++ b/src/search.php @@ -117,7 +117,7 @@ if ( (isset($_POST['search']) || isset($_GET['search'])) ) } } - if ( isset($_GET['filter_facility']) && count($_GET['filter_facility']) < 18 ) // If we have more than 18 elements, this means all facilities are enabled + if ( isset($_GET['filter_facility']) && count($_GET['filter_facility']) < count($content['filter_facility_list']) ) // If we have more elements as in the filter list array, this means all are enabled { $tmpStr = ""; foreach ($_GET['filter_facility'] as $tmpfacility) @@ -129,7 +129,7 @@ if ( (isset($_POST['search']) || isset($_GET['search'])) ) $content['searchstr'] .= "facility:" . $tmpStr . " "; } - if ( isset($_GET['filter_severity']) && count($_GET['filter_severity']) < 7 ) // If we have more than 7 elements, this means all facilities are enabled) + if ( isset($_GET['filter_severity']) && count($_GET['filter_severity']) < count($content['filter_severity_list']) ) // If we have more elements as in the filter list array, this means all are enabled { $tmpStr = ""; foreach ($_GET['filter_severity'] as $tmpfacility) @@ -141,6 +141,19 @@ if ( (isset($_POST['search']) || isset($_GET['search'])) ) $content['searchstr'] .= "severity:" . $tmpStr . " "; } + if ( isset($_GET['filter_messagetype']) && count($_GET['filter_messagetype']) < count($content['filter_messagetype_list']) ) // If we have more elements as in the filter list array, this means all are enabled + { + $tmpStr = ""; + foreach ($_GET['filter_messagetype'] as $tmpmsgtype) + { + if ( strlen($tmpStr) > 0 ) + $tmpStr .= ","; + $tmpStr .= $tmpmsgtype; + } + $content['searchstr'] .= "messagetype:" . $tmpStr . " "; + } + + // Spaces need to be converted! if ( isset($_GET['filter_syslogtag']) && strlen($_GET['filter_syslogtag']) > 0 ) { diff --git a/src/templates/index.html b/src/templates/index.html index acafffd..b973f81 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -227,7 +227,7 @@ - + {fieldvalue} diff --git a/src/templates/search.html b/src/templates/search.html index 55f04fb..3b9df58 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -116,7 +116,7 @@ - - + + + +
+ + {htmlcode} + +
- - - - - {fieldvalue} - - - - + + + + + + + + + + + + {fieldvalue} + + + + + + + + + + diff --git a/src/themes/dark/main.css b/src/themes/dark/main.css index 3a54fe5..a663adf 100644 --- a/src/themes/dark/main.css +++ b/src/themes/dark/main.css @@ -243,12 +243,12 @@ font /* Cell Columns */ .cellmenu1 { - height: 15px; +/* height: 15px; */ border:1px solid; border-color: #353A3F #050A0F #050A0F #353A3F; text-indent:5px; - font: 10px Verdana, Arial, Helvetica, sans-serif; + font: bold 10px Verdana, Arial, Helvetica, sans-serif; color: #FFFCE5; background-color: #103B65; } diff --git a/src/themes/default/main.css b/src/themes/default/main.css index f3bf131..f6020ec 100644 --- a/src/themes/default/main.css +++ b/src/themes/default/main.css @@ -272,12 +272,12 @@ font /* Cell Columns */ .cellmenu1 { - height: 16px; +/* height: 16px; */ border:1px ridge; border-color: #79AABE #09506C #09506C #79AABE; text-indent:5px; - font: 10px Verdana, Arial, Helvetica, sans-serif; + font: bold 10px Verdana, Arial, Helvetica, sans-serif; color: #FFFFFF; background-color: #6C8E9C; } From 1388efe36d491540a41d05bc275af1563437ed8b Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Tue, 29 Apr 2008 17:44:52 +0200 Subject: [PATCH 07/11] Finalized new inline button menus, the inline search also works for severity and facility now. --- src/css/menu.css | 2 +- src/include/functions_common.php | 1 + src/index.php | 73 +++++++++++++++-------------- src/lang/de/main.php | 5 +- src/lang/en/main.php | 2 +- src/templates/index.html | 79 +++++++++++++++----------------- src/themes/default/main.css | 7 ++- 7 files changed, 89 insertions(+), 80 deletions(-) diff --git a/src/css/menu.css b/src/css/menu.css index 076c0ba..f6c2f3f 100644 --- a/src/css/menu.css +++ b/src/css/menu.css @@ -43,7 +43,7 @@ position: absolute; top: 12px; left: 4px; /* to position them to the right of their containing block */ - width: 300; /* width is based on the containing block */ + width: 350; /* width is based on the containing block */ } div#menu ul ul, diff --git a/src/include/functions_common.php b/src/include/functions_common.php index e49c35a..bc27351 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -351,6 +351,7 @@ function InitFrontEndVariables() $content['MENU_SEARCH'] = $content['BASEPATH'] . "images/icons/view.png"; $content['MENU_SELECTION_DISABLED'] = $content['BASEPATH'] . "images/icons/selection.png"; $content['MENU_SELECTION_ENABLED'] = $content['BASEPATH'] . "images/icons/selection_delete.png"; + $content['MENU_TEXT_FIND'] = $content['BASEPATH'] . "images/icons/text_find.png"; $content['MENU_PAGER_BEGIN'] = $content['BASEPATH'] . "images/icons/media_beginning.png"; $content['MENU_PAGER_PREVIOUS'] = $content['BASEPATH'] . "images/icons/media_rewind.png"; diff --git a/src/index.php b/src/index.php index 01fd4c7..5858b30 100644 --- a/src/index.php +++ b/src/index.php @@ -272,6 +272,7 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c $content['syslogmessages'][$counter]['values'][$mycolkey]['FieldAlign'] = $fields[$mycolkey]['FieldAlign']; $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldcssclass'] = $content['syslogmessages'][$counter]['cssclass']; $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldbgcolor'] = ""; + $content['syslogmessages'][$counter]['values'][$mycolkey]['isnowrap'] = "nowrap"; $content['syslogmessages'][$counter]['values'][$mycolkey]['hasdetails'] = "false"; // Set default link @@ -302,6 +303,14 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Use default colour! $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $facility_colors[SYSLOG_LOCAL0] . '" '; } + + // Set OnClick Menu for SYSLOG_FACILITY + $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; + $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( + 'ButtonUrl' => '?filter=facility%3A' . $logArray[$mycolkey] . '&search=Search', + 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . GetFacilityDisplayName( $logArray[$mycolkey] ). "'", + 'IconSource' => $content['MENU_BULLET_BLUE'] + ); } else if ( $mycolkey == SYSLOG_SEVERITY ) { @@ -318,6 +327,14 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Use default colour! $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $severity_colors[SYSLOG_INFO] . '" '; } + + // Set OnClick Menu for SYSLOG_FACILITY + $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; + $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( + 'ButtonUrl' => '?filter=severity%3A' . $logArray[$mycolkey] . '&search=Search', + 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . GetSeverityDisplayName( $logArray[$mycolkey] ). "'", + 'IconSource' => $content['MENU_BULLET_BLUE'] + ); } else if ( $mycolkey == SYSLOG_MESSAGETYPE ) { @@ -345,13 +362,16 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c // Special Handling for the Syslog Message! if ( $mycolkey == SYSLOG_MESSAGE ) { + // No NOWRAP for Syslog Message! + $content['syslogmessages'][$counter]['values'][$mycolkey]['isnowrap'] = ""; + // Set truncasted message for display if ( isset($logArray[SYSLOG_MESSAGE]) ) { $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = GetStringWithHTMLCodes(strlen($logArray[SYSLOG_MESSAGE]) > $CFG['ViewMessageCharacterLimit'] ? substr($logArray[SYSLOG_MESSAGE], 0, $CFG['ViewMessageCharacterLimit'] ) . " ..." : $logArray[SYSLOG_MESSAGE]); // Enable LINK property! for this field - $content['syslogmessages'][$counter]['values'][$mycolkey]['haslink'] = true; + $content['syslogmessages'][$counter]['values'][$mycolkey]['ismessagefield'] = true; $content['syslogmessages'][$counter]['values'][$mycolkey]['detaillink'] = "details.php?uid=" . $uID; } else @@ -398,50 +418,35 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['Sources'][$c if ( strlen($content['searchstr']) > 0 ) { - // Enable buttons - $content['syslogmessages'][$counter]['buttons_enabled'] = true; - - // Prepend Msg centered button - $content['syslogmessages'][$counter]['buttons'][]['htmlcode'] = ''; + // Set OnClick Menu for SYSLOG_MESSAGE + $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; + $content['syslogmessages'][$counter]['values'][$mycolkey]['hasdropdownbutton'] = true; + $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( + 'ButtonUrl' => '?uid=' . $uID, + 'DisplayName' => $content['LN_VIEW_MESSAGECENTERED'], + 'IconSource' => $content['MENU_BULLET_GREEN'] + ); } } else if ( $mycolkey == SYSLOG_SYSLOGTAG ) { - // Append Syslogtag Search Button - $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '' . $logArray[$mycolkey]. ''; -// ' + // Set OnClick Menu for SYSLOG_SYSLOGTAG + $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; + $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( + 'ButtonUrl' => '?filter=syslogtag%3A' . $logArray[$mycolkey] . '&search=Search', + 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . $logArray[$mycolkey] . "'", + 'IconSource' => $content['MENU_BULLET_BLUE'] + ); } else if ( $mycolkey == SYSLOG_HOST ) { + // Set OnClick Menu for SYSLOG_HOST $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( 'ButtonUrl' => '?filter=source%3A' . $logArray[$mycolkey] . '&search=Search', - 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . $logArray[$mycolkey] . "'" + 'DisplayName' => $content['LN_VIEW_FILTERFOR'] . "'" . $logArray[$mycolkey] . "'", + 'IconSource' => $content['MENU_BULLET_BLUE'] ); - - // Append Syslogtag Search Button -// $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = '' . '' . $logArray[$mycolkey]; - -/* TODO ... -$content['syslogmessages'][$counter]['values'][$mycolkey]['fieldvalue'] = ' - -' . $logArray[$mycolkey]; -*/ } } diff --git a/src/lang/de/main.php b/src/lang/de/main.php index cd4211a..c194a09 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -43,6 +43,9 @@ $content['LN_GEN_PAGE'] = "Seite"; $content['LN_GEN_PREDEFINEDSEARCHES'] = "Vordefinierte Suchkriterien"; $content['LN_GEN_SOURCE_DISK'] = "Datei"; $content['LN_GEN_SOURCE_DB'] = "Datenbank"; + $content['LN_GEN_RECORDSPERPAGE'] = "records per page"; + $content['LN_GEN_PRECONFIGURED'] = "Preconfigured"; + $content['LN_GEN_AVAILABLESEARCHES'] = "Available searches"; // Index Site $content['LN_ERROR_INSTALLFILEREMINDER'] = "Warnung! Du hast das Installationsscript 'install.php' noch nicht aus dem phpLogCon Hauptordner entfernt!"; @@ -56,7 +59,7 @@ $content['LN_SEARCH_ADVANCED'] = "Erweiterte Suche"; $content['LN_SEARCH'] = "Suche"; $content['LN_SEARCH_RESET'] = "Suche zurücksetzen"; $content['LN_SEARCH_PERFORMADVANCED'] = "Erweiterte Suche starten"; -$content['LN_VIEW_MESSAGECENTERED'] = "View syslog message centered in logstream"; +$content['LN_VIEW_MESSAGECENTERED'] = "Back to unfiltered view with this message at top"; $content['LN_VIEW_RELATEDMSG'] = "View related syslog messages"; $content['LN_VIEW_FILTERFOR'] = "Filter message for "; diff --git a/src/lang/en/main.php b/src/lang/en/main.php index f9bd7a6..666ba39 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -60,7 +60,7 @@ $content['LN_SEARCH_ADVANCED'] = "Advanced Search"; $content['LN_SEARCH'] = "Search"; $content['LN_SEARCH_RESET'] = "Reset search"; $content['LN_SEARCH_PERFORMADVANCED'] = "Perform Advanced Search"; -$content['LN_VIEW_MESSAGECENTERED'] = "View syslog message centered in logstream"; +$content['LN_VIEW_MESSAGECENTERED'] = "Back to unfiltered view with this message at top"; $content['LN_VIEW_RELATEDMSG'] = "View related syslog messages"; $content['LN_VIEW_FILTERFOR'] = "Filter message for "; diff --git a/src/templates/index.html b/src/templates/index.html index 186dd28..acafffd 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -198,75 +198,72 @@ - - + + + + - - - - + - + + + + {fieldvalue} - + + - + + {fieldvalue} + + + + + + + {fieldvalue} - + - + + + + {fieldvalue} + + + + + + + + + +
{popupcaption}
{detailfieldtitle}{detailfieldvalue}
 - - - - - 		- {fieldvalue} - - - - - - - - - -
{popupcaption}
{detailfieldtitle}{detailfieldvalue}
- - - + + 		- - {htmlcode} - -
{LN_FILTER_FACILITY} + {LN_FILTER_SEVERITY} +
{LN_FILTER_MESSAGETYPE} + +
{LN_CFG_DBPASSWORD}
{LN_CFG_DBROWCOUNTING} + Yes No +