diff --git a/src/admin/reports.php b/src/admin/reports.php index 9281185..50fde45 100644 --- a/src/admin/reports.php +++ b/src/admin/reports.php @@ -95,6 +95,7 @@ if ( isset($_GET['op']) ) // Get Reference to parser! $myReport = $content['REPORTS'][ $content['ReportID'] ]; + $content['Category'] = $myReport['Category']; $content['DisplayName'] = $myReport['DisplayName']; $content['Description'] = $myReport['Description']; @@ -103,6 +104,23 @@ if ( isset($_GET['op']) ) $content['EnableHelpArticle'] = true; $content['ReportHelpArticle'] = $myReport['ReportHelpArticle']; } + + // check for custom fields + + if ( isset($myReport['RequiredFieldsList']) && count($myReport['RequiredFieldsList']) > 0 ) + { + // Needs custom fields! + $content['EnableRequiredFields'] = true; + // $content['CustomFieldsList'] = $myParser['CustomFieldsList']; + + foreach( $myReport['RequiredFieldsList'] as $myField ) + { + if ( isset($fields[$myField]) ) + $content['RequiredFieldsList'][$myField] = array ("FieldID" => $myField, "FieldDefine" => $fields[$myField]["FieldDefine"], "FieldCaption" => $fields[$myField]["FieldCaption"] ); + else + $content['RequiredFieldsList'][$myField] = array ("FieldID" => $myField, "FieldDefine" => $myField, "FieldCaption" => $myField ); + } + } // check for custom fields if ( $myReport['NeedsInit'] ) // && count($myReport['CustomFieldsList']) > 0 ) @@ -1270,13 +1288,13 @@ function CreateCronCommand( $myReportID, $mySavedReportID = null ) { // Running on Windows $phpCmd = PHP_BINDIR . "\\php.exe"; - $phpScript = realpath($gl_root_path) . "cron\\cmdreportgen.php"; + $phpScript = realpath($gl_root_path) . "\\cron\\cmdreportgen.php"; } else { // Running on LINUX $phpCmd = PHP_BINDIR . "/php"; - $phpScript = realpath($gl_root_path) . "cron/cmdreportgen.php"; + $phpScript = realpath($gl_root_path) . "/cron/cmdreportgen.php"; } // Enable display of report command diff --git a/src/classes/reports/report.class.php b/src/classes/reports/report.class.php index 4efd4d2..5d5e7f2 100644 --- a/src/classes/reports/report.class.php +++ b/src/classes/reports/report.class.php @@ -441,6 +441,15 @@ abstract class Report { } + /* + * Helper function to return the arrProperties + */ + public function GetRequiredProperties() + { + // return Filebasename + return $this->_arrProperties; + } + /* * Helper function to return the BaseFileName */ diff --git a/src/classes/reports/report.eventlog.eventsummary.class.php b/src/classes/reports/report.eventlog.eventsummary.class.php index 04d5d2d..b9d4d5e 100644 --- a/src/classes/reports/report.eventlog.eventsummary.class.php +++ b/src/classes/reports/report.eventlog.eventsummary.class.php @@ -52,7 +52,7 @@ class Report_eventsummary extends Report { public $_reportFileBasicName = "report.eventlog.eventsummary"; // Basic Filename for reportfiles public $_reportTitle = "EventLog Summary Report"; // Display name for the report public $_reportDescription = "This is a EventLog Summary Report"; - public $_reportHelpArticle = ""; + public $_reportHelpArticle = "http://loganalyzer.adiscon.com/plugins/reports/eventlog-eventsummary"; public $_reportNeedsInit = false; // True means that this report needs additional init stuff public $_reportInitialized = false; // True means report is installed diff --git a/src/classes/reports/report.syslog.syslogsummary.class.php b/src/classes/reports/report.syslog.syslogsummary.class.php index 8550787..95b8e2c 100644 --- a/src/classes/reports/report.syslog.syslogsummary.class.php +++ b/src/classes/reports/report.syslog.syslogsummary.class.php @@ -52,7 +52,7 @@ class Report_syslogsummary extends Report { public $_reportFileBasicName = "report.syslog.syslogsummary"; // Basic Filename for reportfiles public $_reportTitle = "Syslog Summary Report"; // Display name for the report public $_reportDescription = "This is a Syslog Summary Report"; - public $_reportHelpArticle = ""; + public $_reportHelpArticle = "http://loganalyzer.adiscon.com/plugins/reports/syslog-syslogsummary"; public $_reportNeedsInit = false; // True means that this report needs additional init stuff public $_reportInitialized = false; // True means report is installed diff --git a/src/images/main/Header-Logo.png b/src/images/main/Header-Logo.png index 1a1de59..a59aceb 100644 Binary files a/src/images/main/Header-Logo.png and b/src/images/main/Header-Logo.png differ diff --git a/src/include/functions_common.php b/src/include/functions_common.php index df370b0..0ed30b2 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -68,7 +68,7 @@ $LANG = "en"; // Default language // Default Template vars $content['BUILDNUMBER'] = "3.0.0"; $content['UPDATEURL'] = "http://loganalyzer.adiscon.com/files/version.txt"; -$content['TITLE'] = "LogAnalyzer :: Release " . $content['BUILDNUMBER']; // Default page title +$content['TITLE'] = "Adiscon LogAnalyzer :: Release " . $content['BUILDNUMBER']; // Default page title $content['BASEPATH'] = $gl_root_path; $content['SHOW_DONATEBUTTON'] = true; // Default = true! @@ -127,7 +127,7 @@ function CheckForInstallPhp() // Check for installscript! if ( file_exists($content['BASEPATH'] . "install.php") ) $strinstallmsg = '

' - . '
Click here to Install LogAnalyzer!

' + . '
Click here to Install Adiscon LogAnalyzer!

' // . 'See the Installation Guides for more Details!
' // . 'English Installation Guide | ' // . 'German Installation Guide

' @@ -801,7 +801,7 @@ function InitConfigurationValues() else if ( defined('IS_ADMINPAGE') ) { // Language System not initialized yet - DieWithFriendlyErrorMsg( "You need to be logged in in order to access the admin pages." ); + DieWithFriendlyErrorMsg( "You need to be logged in in order to access the admin pages.", "login.php", "Click here to login" ); } } @@ -984,7 +984,7 @@ function DieWithErrorMsg( $szerrmsg ) else if ( $RUNMODE == RUNMODE_WEBSERVER ) { print( - "LogAnalyzer :: Critical Error occured" . + "Adiscon LogAnalyzer :: Critical Error occured" . "

" . "". ""; + if ( strlen($szLink) > 0 && strlen($szLinkLable) > 0 ) + echo ""; + echo + "
" . @@ -1002,7 +1002,7 @@ function DieWithErrorMsg( $szerrmsg ) exit; } -function DieWithFriendlyErrorMsg( $szerrmsg ) +function DieWithFriendlyErrorMsg( $szerrmsg, $szLink = "", $szLinkLable = "" ) { global $RUNMODE, $content, $gl_root_path; if ( $RUNMODE == RUNMODE_COMMANDLINE ) @@ -1014,19 +1014,23 @@ function DieWithFriendlyErrorMsg( $szerrmsg ) else if ( $RUNMODE == RUNMODE_WEBSERVER ) { - print( - "LogAnalyzer :: Error occured" . + echo + "Adiscon LogAnalyzer :: Error occured" . "

" . "". "" . "" . - "
" . "

Error occured

" . "
Errordetails:
" . + "
" . $szerrmsg . - "

" . - "" - ); + "

$szLinkLable
" . + ""; + } // Abort further execution @@ -1053,7 +1057,7 @@ function InitPageTitle() } // Append LogAnalyzer - $szReturn .= "LogAnalyzer"; + $szReturn .= "Adiscon LogAnalyzer"; if ( defined('IS_ADMINPAGE') ) $szReturn .= " :: " . $content['LN_ADMIN_CENTER'] . " :: "; diff --git a/src/include/functions_config.php b/src/include/functions_config.php index ed7e988..ed968d5 100644 --- a/src/include/functions_config.php +++ b/src/include/functions_config.php @@ -323,6 +323,7 @@ function InitReportModules() $szReportHelpArticle = $tmpReport->_reportHelpArticle; $bNeedsInit = $tmpReport->_reportNeedsInit; $bInitialized = $tmpReport->_reportInitialized; + $aRequiredFieldsList = $tmpReport->GetRequiredProperties(); /* // check for required fields! @@ -351,7 +352,7 @@ function InitReportModules() "Initialized" => $bInitialized, "ObjRef" => $tmpReport, // "CustomFields" => $bCustomFields, -// "CustomFieldsList" => $aCustomFieldList, + "RequiredFieldsList" => $aRequiredFieldsList, ); // --- Now Search and populate savedReports | but only if DB Version is 9 or higher. diff --git a/src/lang/de/admin.php b/src/lang/de/admin.php index 20d99a3..0696cf4 100644 --- a/src/lang/de/admin.php +++ b/src/lang/de/admin.php @@ -353,7 +353,7 @@ $content['LN_PARSERS_NAME'] = "Melungs Parser Name"; $content['LN_PARSERS_DESCRIPTION'] = "Meldungs Parser Beschreibung"; $content['LN_PARSERS_ERROR_NOPARSERS'] = "Es konnte kein gültiger Meldungs Parser in Ihrer Installation gefunden werden. "; $content['LN_PARSERS_HELP'] = "Hilfe"; -$content['LN_PARSERS_HELP_CLICK'] = "Klicken Sie hier, um weitere Hilfe zu erhalten"; +$content['LN_PARSERS_HELP_CLICK'] = "Klicken Sie hier, um weitere Hilfe und Beschreibung zu erhalten"; $content['LN_PARSERS_INFO'] = "Details für diesen Meldungs Parser anzeigen."; $content['LN_PARSERS_INIT'] = "Einstellungen für diesen Meldungs Parser."; $content['LN_PARSERS_REMOVE'] = "Einstellungen für diesen Meldungs Parser entfernen."; @@ -387,11 +387,13 @@ $content['LN_CMD_'] = ""; $content['LN_REPORTS_EDIT'] = "Edit Report"; $content['LN_REPORTS_DELETE'] = "Remove Report"; $content['LN_REPORTS_ID'] = "Report ID"; +$content['LN_REPORTS_CAT'] = "Report Category"; $content['LN_REPORTS_NAME'] = "Report Name"; $content['LN_REPORTS_DESCRIPTION'] = "Report Description"; +$content['LN_REPORTS_REQUIREDFIELDS'] = "Required Fields"; $content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation."; $content['LN_REPORTS_HELP'] = "Help"; -$content['LN_REPORTS_HELP_CLICK'] = "Click here for more help"; +$content['LN_REPORTS_HELP_CLICK'] = "Klicken Sie hier, um weitere Hilfe und Beschreibung zum Report zu erhalten"; $content['LN_REPORTS_INFO'] = "Show more Information for this report module."; $content['LN_REPORTS_INIT'] = "Initialize settings for this report module."; $content['LN_REPORTS_REMOVE'] = "Remove settings for this report module."; diff --git a/src/lang/en/admin.php b/src/lang/en/admin.php index 256388e..da46500 100644 --- a/src/lang/en/admin.php +++ b/src/lang/en/admin.php @@ -366,7 +366,7 @@ $content['LN_PARSERS_NAME'] = "Message Parser Name"; $content['LN_PARSERS_DESCRIPTION'] = "Message Parser Description"; $content['LN_PARSERS_ERROR_NOPARSERS'] = "There were no valid message parsers found in your installation. "; $content['LN_PARSERS_HELP'] = "Help"; -$content['LN_PARSERS_HELP_CLICK'] = "Click here for more help"; +$content['LN_PARSERS_HELP_CLICK'] = "Click here for a detailed description"; $content['LN_PARSERS_INFO'] = "Show more Information for this message parser."; $content['LN_PARSERS_INIT'] = "Initialize settings for this message parser."; $content['LN_PARSERS_REMOVE'] = "Remove settings for this message parser."; @@ -399,12 +399,14 @@ $content['LN_CMD_'] = ""; // Report Options $content['LN_REPORTS_EDIT'] = "Edit Report"; $content['LN_REPORTS_DELETE'] = "Remove Report"; +$content['LN_REPORTS_CAT'] = "Report Category"; $content['LN_REPORTS_ID'] = "Report ID"; $content['LN_REPORTS_NAME'] = "Report Name"; $content['LN_REPORTS_DESCRIPTION'] = "Report Description"; +$content['LN_REPORTS_REQUIREDFIELDS'] = "Required Fields"; $content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation."; $content['LN_REPORTS_HELP'] = "Help"; -$content['LN_REPORTS_HELP_CLICK'] = "Click here for more help"; +$content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description"; $content['LN_REPORTS_INFO'] = "Show more Information for this report module."; $content['LN_REPORTS_INIT'] = "Initialize settings for this report module."; $content['LN_REPORTS_REMOVE'] = "Remove settings for this report module."; diff --git a/src/lang/it_IT/admin.php b/src/lang/it_IT/admin.php index d5da508..0e0647b 100644 --- a/src/lang/it_IT/admin.php +++ b/src/lang/it_IT/admin.php @@ -364,7 +364,7 @@ $content['LN_PARSERS_NAME'] = "Message Parser Name"; $content['LN_PARSERS_DESCRIPTION'] = "Message Parser Description"; $content['LN_PARSERS_ERROR_NOPARSERS'] = "There were no valid message parsers found in your installation. "; $content['LN_PARSERS_HELP'] = "Help"; -$content['LN_PARSERS_HELP_CLICK'] = "Click here for more help"; +$content['LN_PARSERS_HELP_CLICK'] = "Click here for a detailed description"; $content['LN_PARSERS_INFO'] = "Show more Information for this message parser."; $content['LN_PARSERS_INIT'] = "Initialize settings for this message parser."; $content['LN_PARSERS_REMOVE'] = "Remove settings for this message parser."; @@ -398,11 +398,13 @@ $content['LN_CMD_'] = ""; $content['LN_REPORTS_EDIT'] = "Edit Report"; $content['LN_REPORTS_DELETE'] = "Remove Report"; $content['LN_REPORTS_ID'] = "Report ID"; +$content['LN_REPORTS_CAT'] = "Report Category"; $content['LN_REPORTS_NAME'] = "Report Name"; $content['LN_REPORTS_DESCRIPTION'] = "Report Description"; +$content['LN_REPORTS_REQUIREDFIELDS'] = "Required Fields"; $content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation."; $content['LN_REPORTS_HELP'] = "Help"; -$content['LN_REPORTS_HELP_CLICK'] = "Click here for more help"; +$content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description"; $content['LN_REPORTS_INFO'] = "Show more Information for this report module."; $content['LN_REPORTS_INIT'] = "Initialize settings for this report module."; $content['LN_REPORTS_REMOVE'] = "Remove settings for this report module."; diff --git a/src/lang/pt_BR/admin.php b/src/lang/pt_BR/admin.php index 9f3dfc9..1e3bcf2 100644 --- a/src/lang/pt_BR/admin.php +++ b/src/lang/pt_BR/admin.php @@ -353,7 +353,7 @@ $content['LN_PARSERS_NAME'] = "Message Parser Name"; $content['LN_PARSERS_DESCRIPTION'] = "Message Parser Description"; $content['LN_PARSERS_ERROR_NOPARSERS'] = "There were no valid message parsers found in your installation. "; $content['LN_PARSERS_HELP'] = "Help"; -$content['LN_PARSERS_HELP_CLICK'] = "Click here for more help"; +$content['LN_PARSERS_HELP_CLICK'] = "Click here for a detailed description"; $content['LN_PARSERS_INFO'] = "Show more Information for this message parser."; $content['LN_PARSERS_INIT'] = "Initialize settings for this message parser."; $content['LN_PARSERS_REMOVE'] = "Remove settings for this message parser."; @@ -386,12 +386,14 @@ $content['LN_CMD_'] = ""; // Report Options $content['LN_REPORTS_EDIT'] = "Edit Report"; $content['LN_REPORTS_DELETE'] = "Remove Report"; +$content['LN_REPORTS_CAT'] = "Report Category"; $content['LN_REPORTS_ID'] = "Report ID"; $content['LN_REPORTS_NAME'] = "Report Name"; $content['LN_REPORTS_DESCRIPTION'] = "Report Description"; +$content['LN_REPORTS_REQUIREDFIELDS'] = "Required Fields"; $content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation."; $content['LN_REPORTS_HELP'] = "Help"; -$content['LN_REPORTS_HELP_CLICK'] = "Click here for more help"; +$content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description"; $content['LN_REPORTS_INFO'] = "Show more Information for this report module."; $content['LN_REPORTS_INIT'] = "Initialize settings for this report module."; $content['LN_REPORTS_REMOVE'] = "Remove settings for this report module."; diff --git a/src/templates/admin/admin_reports.html b/src/templates/admin/admin_reports.html index 61737cc..26451d5 100644 --- a/src/templates/admin/admin_reports.html +++ b/src/templates/admin/admin_reports.html @@ -132,6 +132,10 @@ {LN_REPORTS_DETAILS} + + {LN_REPORTS_CAT} + {Category} + {LN_REPORTS_ID} {ReportID} @@ -144,6 +148,17 @@ {LN_REPORTS_DESCRIPTION} {Description} + + + {LN_REPORTS_REQUIREDFIELDS} + + +
{FieldCaption} ({FieldDefine}) + +

+ + + {LN_REPORTS_HELP} diff --git a/src/templates/include_footer.html b/src/templates/include_footer.html index afab258..08a9471 100644 --- a/src/templates/include_footer.html +++ b/src/templates/include_footer.html @@ -3,7 +3,7 @@ Made by Adiscon GmbH (2008) -  LogAnalyzer Version {BUILDNUMBER} +  Adiscon LogAnalyzer Version {BUILDNUMBER}  Partners: diff --git a/src/templates/include_header.html b/src/templates/include_header.html index f1d93db..9e3ebbc 100644 --- a/src/templates/include_header.html +++ b/src/templates/include_header.html @@ -23,7 +23,7 @@ - Satisfied with LogAnalyzer?
+ Satisfied with Adiscon LogAnalyzer?
Donate and help keep the project alive!