From f732abd3924d8e174a780dc7f14cdf0fbabe62c7 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Mon, 5 Dec 2011 16:29:59 +0100 Subject: [PATCH] Fixed some minor issues in the new Logon/Logoff report --- .../report.eventlog.logonlogoff.class.php | 34 +++++-------------- .../report.eventlog.logonlogoff.lang.en.php | 9 +---- .../report.eventlog.logonlogoff.template.html | 15 +------- .../report.eventlog.logonlogoff.template.pdf | 2 +- 4 files changed, 11 insertions(+), 49 deletions(-) diff --git a/src/classes/reports/report.eventlog.logonlogoff.class.php b/src/classes/reports/report.eventlog.logonlogoff.class.php index 36e0b83..0c47e2c 100644 --- a/src/classes/reports/report.eventlog.logonlogoff.class.php +++ b/src/classes/reports/report.eventlog.logonlogoff.class.php @@ -5,13 +5,13 @@ * ----------------------------------------------------------------- * * Some constants * * * - * Eventsummary Report is a basic report for EventLog + * Logon/Logoff Report is a basic report for EventLog based Data * * \version 1.0.0 Init Version * * * All directives are explained within this file * * - * Copyright (C) 2008-2009 Adiscon GmbH. + * Copyright (C) 2008-2011 Adiscon GmbH. * * This file is part of LogAnalyzer. * @@ -50,16 +50,16 @@ class Report_logonlogoff extends Report { public $_reportVersion = 1; // Internally Version of the ReportEngine public $_reportID = "report.eventlog.logonlogoff.class"; // ID for the report, needs to be unique! public $_reportFileBasicName = "report.eventlog.logonlogoff"; // Basic Filename for reportfiles - public $_reportTitle = "EventLog Logon/Logoff Report"; // Display name for the report + public $_reportTitle = "EventLog Logon/Logoff Report"; // Display name for the report public $_reportDescription = "This is a EventLog Logon/Logoff Summary Report"; public $_reportHelpArticle = "http://loganalyzer.adiscon.com/plugins/reports/eventlog-logonlogoff"; - public $_reportNeedsInit = false; // True means that this report needs additional init stuff - public $_reportInitialized = false; // True means report is installed + public $_reportNeedsInit = false; // True means that this report needs additional init stuff + public $_reportInitialized = false; // True means report is installed // Advanced Report Options - private $_maxHosts = 20; // Threshold for maximum hosts to analyse! - private $_maxLogOnLogOffsPerHost = 100; // Threshold for maximum amount of logon/logoffs to analyse per host - private $_colorThreshold = 10; // Threshold for coloured display of Eventcounter + private $_maxHosts = 20; // Threshold for maximum hosts to analyse! + private $_maxLogOnLogOffsPerHost = 100; // Threshold for maximum amount of logon/logoffs to analyse per host + private $_colorThreshold = 10; // Threshold for coloured display of Eventcounter // Constructor public function Report_logonlogoff() { @@ -172,24 +172,6 @@ class Report_logonlogoff extends Report { else return ERROR_REPORT_NODATA; -/* - // Get List of hosts - $content["report_computers"] = $this->_streamObj->ConsolidateItemListByField( SYSLOG_HOST, $this->_maxHosts, SYSLOG_HOST, SORTING_ORDER_DESC ); - - // TimeStats - $nowtime = microtime_float(); - $content["report_rendertime"] .= number_format($nowtime - $gl_starttime, 2, '.', '') . "s, "; - - if ( is_array($content["report_computers"]) && count($content["report_computers"]) > 0 ) - { - // Create plain hosts list for Consolidate function - foreach ( $content["report_computers"] as $tmpComputer ) - $arrHosts[] = $tmpComputer[SYSLOG_HOST]; - } - else - return ERROR_REPORT_NODATA; -*/ - // This function will consolidate the Events based per Host! $this->ConsolidateLogonLogoffs(); // ($arrHosts); diff --git a/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.lang.en.php b/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.lang.en.php index b8b6393..036bcc5 100644 --- a/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.lang.en.php +++ b/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.lang.en.php @@ -28,8 +28,7 @@ global $content; // Global Stuff -$content['ln_report_event_summary'] = "Event Summary"; -$content['ln_report_computer_summary'] = "Computer Summary"; +$content['ln_report_logonoff_summary'] = "Summary of Logon/Logoff events"; $content['ln_report_consolidation'] = "Logon / Logoff Events consolidated per User"; $content['ln_report_summary'] = "Report Summary"; $content['ln_report_number'] = "No."; @@ -47,11 +46,5 @@ $content['ln_report_maxLogOnLogOffsPerHost_description'] = "The maximum number o $content['ln_report_colorThreshold_displayname'] = "Counter Threshold"; $content['ln_report_colorThreshold_description'] = "If the amount of consolidated events is higher then this threshold, the countfield will be marked red."; $content['ln_report_'] = ""; -$content['ln_report_'] = ""; -$content['ln_report_'] = ""; -$content['ln_report_'] = ""; -$content['ln_report_'] = ""; -$content['ln_report_'] = ""; -$content['ln_report_'] = ""; ?> \ No newline at end of file diff --git a/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.template.html b/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.template.html index 8ae2cda..08a0cba 100644 --- a/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.template.html +++ b/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.template.html @@ -51,7 +51,7 @@ - + @@ -61,19 +61,6 @@
{ln_report_event_summary}{ln_report_logonoff_summary}
- - - - - - - -
{ln_report_computer_summary}
- - {FROMHOST}({itemcount}), - -
- diff --git a/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.template.pdf b/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.template.pdf index 87369f5..2ec7f99 100644 --- a/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.template.pdf +++ b/src/classes/reports/report.eventlog.logonlogoff/report.eventlog.logonlogoff.template.pdf @@ -33,7 +33,7 @@ - +
{ln_report_event_summary}{ln_report_logonoff_summary}