" . $errormsg;
+ }
}
function DB_RemoveParserSpecialBadChars($myString)
@@ -437,4 +451,4 @@ function GetRowsAffected()
return mysql_affected_rows();
}
-?>
+?>
\ No newline at end of file
diff --git a/src/include/functions_debugoutput.php b/src/include/functions_debugoutput.php
index 5b5ef7e..1d89793 100644
--- a/src/include/functions_debugoutput.php
+++ b/src/include/functions_debugoutput.php
@@ -28,7 +28,7 @@
*
* A copy of the GPL can be found in the file "COPYING" in this
* distribution.
- *
+ *
* Adiscon LogAnalyzer is also available under a commercial license.
* For details, contact info@adiscon.com or visit
* http://loganalyzer.adiscon.com/commercial
@@ -199,4 +199,4 @@ function CreateHTMLFooter()
}
-?>
+?>
\ No newline at end of file
diff --git a/src/include/functions_filters.php b/src/include/functions_filters.php
index 77c9831..9cf3adb 100644
--- a/src/include/functions_filters.php
+++ b/src/include/functions_filters.php
@@ -24,7 +24,7 @@
*
* A copy of the GPL can be found in the file "COPYING" in this
* distribution.
- *
+ *
* Adiscon LogAnalyzer is also available under a commercial license.
* For details, contact info@adiscon.com or visit
* http://loganalyzer.adiscon.com/commercial
@@ -357,4 +357,4 @@ function GetDateTimeDetailsFromTimeString($szTimeString, &$second, &$minute, &$h
return false;
}
-?>
+?>
\ No newline at end of file
diff --git a/src/include/functions_frontendhelpers.php b/src/include/functions_frontendhelpers.php
index fef3b19..484dc59 100644
--- a/src/include/functions_frontendhelpers.php
+++ b/src/include/functions_frontendhelpers.php
@@ -28,7 +28,7 @@
*
* A copy of the GPL can be found in the file "COPYING" in this
* distribution.
- *
+ *
* Adiscon LogAnalyzer is also available under a commercial license.
* For details, contact info@adiscon.com or visit
* http://loganalyzer.adiscon.com/commercial
@@ -217,23 +217,32 @@ function GetFormatedDate($evttimearray)
{
global $content;
- if ( !is_array($evttimearray) )
- return $evttimearray;
-
- if (
- GetConfigSetting("ViewUseTodayYesterday", 0, CFGLEVEL_USER) == 1
- &&
- ( date('m', $evttimearray[EVTIME_TIMESTAMP]) == date('m') && date('Y', $evttimearray[EVTIME_TIMESTAMP]) == date('Y') )
- )
+ if ( is_array($evttimearray) )
{
- if ( date('d', $evttimearray[EVTIME_TIMESTAMP]) == date('d') )
- return "Today " . date("H:i:s", $evttimearray[EVTIME_TIMESTAMP] );
- else if ( date('d', $evttimearray[EVTIME_TIMESTAMP] + 86400) == date('d') )
- return "Yesterday " . date("H:i:s", $evttimearray[EVTIME_TIMESTAMP] );
+ if (
+ GetConfigSetting("ViewUseTodayYesterday", 0, CFGLEVEL_USER) == 1
+ &&
+ ( date('m', $evttimearray[EVTIME_TIMESTAMP]) == date('m') && date('Y', $evttimearray[EVTIME_TIMESTAMP]) == date('Y') )
+ )
+ {
+ if ( date('d', $evttimearray[EVTIME_TIMESTAMP]) == date('d') )
+ return "Today " . date("H:i:s", $evttimearray[EVTIME_TIMESTAMP] );
+ else if ( date('d', $evttimearray[EVTIME_TIMESTAMP] + 86400) == date('d') )
+ return "Yesterday " . date("H:i:s", $evttimearray[EVTIME_TIMESTAMP] );
+ }
+
+ // Copy to local variable
+ $nMyTimeStamp = $evttimearray[EVTIME_TIMESTAMP];
+ }
+ else
+ {
+ $nMyTimeStamp = strtotime($evttimearray);
+ if ( $nMyTimeStamp === FALSE ) // Could not convert into timestamp so return original!
+ return $evttimearray;
}
// Reach return normal format!
- return $szDateFormatted = date("Y-m-d H:i:s", $evttimearray[EVTIME_TIMESTAMP] );
+ return $szDateFormatted = date("Y-m-d H:i:s", $nMyTimeStamp );
}
function GetDebugBgColor( $szDebugMode )
@@ -312,4 +321,4 @@ function GetPriorityFromDebugLevel( $DebugLevel )
}
}
-?>
+?>
\ No newline at end of file
diff --git a/src/include/functions_installhelpers.php b/src/include/functions_installhelpers.php
index 99f22a2..4ae6c2c 100644
--- a/src/include/functions_installhelpers.php
+++ b/src/include/functions_installhelpers.php
@@ -29,7 +29,7 @@
*
* A copy of the GPL can be found in the file "COPYING" in this
* distribution.
- *
+ *
* Adiscon LogAnalyzer is also available under a commercial license.
* For details, contact info@adiscon.com or visit
* http://loganalyzer.adiscon.com/commercial
@@ -258,4 +258,4 @@ function ConvertCustomSources()
}
// ---
-?>
+?>
\ No newline at end of file
diff --git a/src/include/functions_reports.php b/src/include/functions_reports.php
new file mode 100644
index 0000000..604271f
--- /dev/null
+++ b/src/include/functions_reports.php
@@ -0,0 +1,268 @@
+ *
+ * *
+ * All directives are explained within this file *
+ *
+ * Copyright (C) 2008-2011 Adiscon GmbH.
+ *
+ * This file is part of LogAnalyzer.
+ *
+ * LogAnalyzer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LogAnalyzer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LogAnalyzer. If not, see .
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this
+ * distribution.
+ *
+ * Adiscon LogAnalyzer is also available under a commercial license.
+ * For details, contact info@adiscon.com or visit
+ * http://loganalyzer.adiscon.com/commercial
+ *********************************************************************
+*/
+
+// --- Avoid directly accessing this file!
+if ( !defined('IN_PHPLOGCON') )
+{
+ die('Hacking attempt');
+ exit;
+}
+// ---
+
+// ---
+// --- BEGIN Helper functions
+// ---
+function CreateCronCommand( $myReportID, $mySavedReportID = null )
+{
+ global $content, $gl_root_path, $myReport;
+
+ if ( isset($mySavedReportID) )
+ {
+ // Get Reference to report!
+ $myReport = $content['REPORTS'][ $myReportID ];
+
+ // Get reference to savedreport
+ $mySavedReport = $myReport['SAVEDREPORTS'][ $mySavedReportID ];
+
+ // Get configured Source for savedreport
+ $myReportSource = null;
+ if ( isset($content['Sources'][ $mySavedReport['sourceid'] ]) )
+ $myReportSource = $content['Sources'][ $mySavedReport['sourceid'] ];
+
+ $pos = strpos( strtoupper(PHP_OS), "WIN");
+ if ($pos !== false)
+ {
+ // Running on Windows
+ $phpCmd = PHP_BINDIR . "\\php.exe";
+ $phpScript = realpath($gl_root_path) . "cron\\cmdreportgen.php";
+ }
+ else
+ {
+ // Running on LINUX
+ $phpCmd = PHP_BINDIR . "/php";
+ $phpScript = realpath($gl_root_path) . "/cron/cmdreportgen.php";
+ }
+
+ // Enable display of report command
+ $content['enableCronCommand'] = true;
+ $szCommand = $phpCmd . " " . $phpScript . " runreport " . $myReportID . " " . $mySavedReportID;
+
+ // --- Check for user or group sources
+ if ( $myReportSource['userid'] != null )
+ {
+ $szCommand .= " " . "userid=" . $myReportSource['userid'];
+ }
+ else if ( $myReportSource['groupid'] != null )
+ {
+ $szCommand .= " " . "groupid=" . $myReportSource['groupid'];
+ }
+ // ---
+ }
+ else
+ {
+ // Disable display of report command
+ $content['enableCronCommand'] = false;
+ $szCommand = "";
+ }
+
+ // return result
+ return $szCommand;
+}
+
+function InitOnlineReports()
+{
+ global $content;
+
+ $xmlArray = xml2array( URL_ONLINEREPORTS );
+ if ( is_array($xmlArray) && isset($xmlArray['reports']['report']) && count($xmlArray['reports']['report']) > 0 )
+ {
+ foreach( $xmlArray['reports']['report'] as $myOnlineReport )
+ {
+ // Copy to OnlineReports Array
+ $content['ONLINEREPORTS'][] = $myOnlineReport;
+ }
+
+ // Success!
+ return true;
+ }
+ else
+ // Failure
+ return false;
+}
+
+// Helper function from php doc
+function xml2array($url, $get_attributes = 1, $priority = 'tag')
+{
+ $contents = "";
+ if (!function_exists('xml_parser_create'))
+ {
+ return false;
+ }
+ $parser = xml_parser_create('');
+ if (!($fp = @ fopen($url, 'rb')))
+ {
+ return false;
+ }
+ while (!feof($fp))
+ {
+ $contents .= fread($fp, 8192);
+ }
+ fclose($fp);
+ xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8");
+ xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+ xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+ xml_parse_into_struct($parser, trim($contents), $xml_values);
+ xml_parser_free($parser);
+ if (!$xml_values)
+ return; //Hmm...
+ $xml_array = array ();
+ $parents = array ();
+ $opened_tags = array ();
+ $arr = array ();
+ $current = & $xml_array;
+ $repeated_tag_index = array ();
+ foreach ($xml_values as $data)
+ {
+ unset ($attributes, $value);
+ extract($data);
+ $result = array ();
+ $attributes_data = array ();
+ if (isset ($value))
+ {
+ if ($priority == 'tag')
+ $result = $value;
+ else
+ $result['value'] = $value;
+ }
+ if (isset ($attributes) and $get_attributes)
+ {
+ foreach ($attributes as $attr => $val)
+ {
+ if ($priority == 'tag')
+ $attributes_data[$attr] = $val;
+ else
+ $result['attr'][$attr] = $val; //Set all the attributes in a array called 'attr'
+ }
+ }
+ if ($type == "open")
+ {
+ $parent[$level -1] = & $current;
+ if (!is_array($current) or (!in_array($tag, array_keys($current))))
+ {
+ $current[$tag] = $result;
+ if ($attributes_data)
+ $current[$tag . '_attr'] = $attributes_data;
+ $repeated_tag_index[$tag . '_' . $level] = 1;
+ $current = & $current[$tag];
+ }
+ else
+ {
+ if (isset ($current[$tag][0]))
+ {
+ $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
+ $repeated_tag_index[$tag . '_' . $level]++;
+ }
+ else
+ {
+ $current[$tag] = array (
+ $current[$tag],
+ $result
+ );
+ $repeated_tag_index[$tag . '_' . $level] = 2;
+ if (isset ($current[$tag . '_attr']))
+ {
+ $current[$tag]['0_attr'] = $current[$tag . '_attr'];
+ unset ($current[$tag . '_attr']);
+ }
+ }
+ $last_item_index = $repeated_tag_index[$tag . '_' . $level] - 1;
+ $current = & $current[$tag][$last_item_index];
+ }
+ }
+ elseif ($type == "complete")
+ {
+ if (!isset ($current[$tag]))
+ {
+ $current[$tag] = $result;
+ $repeated_tag_index[$tag . '_' . $level] = 1;
+ if ($priority == 'tag' and $attributes_data)
+ $current[$tag . '_attr'] = $attributes_data;
+ }
+ else
+ {
+ if (isset ($current[$tag][0]) and is_array($current[$tag]))
+ {
+ $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
+ if ($priority == 'tag' and $get_attributes and $attributes_data)
+ {
+ $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
+ }
+ $repeated_tag_index[$tag . '_' . $level]++;
+ }
+ else
+ {
+ $current[$tag] = array (
+ $current[$tag],
+ $result
+ );
+ $repeated_tag_index[$tag . '_' . $level] = 1;
+ if ($priority == 'tag' and $get_attributes)
+ {
+ if (isset ($current[$tag . '_attr']))
+ {
+ $current[$tag]['0_attr'] = $current[$tag . '_attr'];
+ unset ($current[$tag . '_attr']);
+ }
+ if ($attributes_data)
+ {
+ $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
+ }
+ }
+ $repeated_tag_index[$tag . '_' . $level]++; //0 and 1 index is already taken
+ }
+ }
+ }
+ elseif ($type == 'close')
+ {
+ $current = & $parent[$level -1];
+ }
+ }
+ return ($xml_array);
+}
+
+
+?>
\ No newline at end of file
diff --git a/src/include/functions_themes.php b/src/include/functions_themes.php
index 5ac1bf4..bbdbb04 100644
--- a/src/include/functions_themes.php
+++ b/src/include/functions_themes.php
@@ -28,7 +28,7 @@
*
* A copy of the GPL can be found in the file "COPYING" in this
* distribution.
- *
+ *
* Adiscon LogAnalyzer is also available under a commercial license.
* For details, contact info@adiscon.com or visit
* http://loganalyzer.adiscon.com/commercial
diff --git a/src/include/functions_users.php b/src/include/functions_users.php
index 211db1d..81d1f8d 100644
--- a/src/include/functions_users.php
+++ b/src/include/functions_users.php
@@ -28,7 +28,7 @@
*
* A copy of the GPL can be found in the file "COPYING" in this
* distribution.
- *
+ *
* Adiscon LogAnalyzer is also available under a commercial license.
* For details, contact info@adiscon.com or visit
* http://loganalyzer.adiscon.com/commercial
@@ -365,4 +365,4 @@ function CompareVersionNumbers( $oldVer, $newVer )
-?>
+?>
\ No newline at end of file
diff --git a/src/index.php b/src/index.php
index 9b12b93..ba84b5a 100644
--- a/src/index.php
+++ b/src/index.php
@@ -28,7 +28,7 @@
*
* A copy of the GPL can be found in the file "COPYING" in this
* distribution
- *
+ *
* Adiscon LogAnalyzer is also available under a commercial license.
* For details, contact info@adiscon.com or visit
* http://loganalyzer.adiscon.com/commercial
@@ -1004,4 +1004,4 @@ function AddOnClickMenu(&$fieldGridItem, $fieldType, $FieldID)
}
// ---
-?>
+?>
\ No newline at end of file
diff --git a/src/install.php b/src/install.php
index 7698581..109c90e 100644
--- a/src/install.php
+++ b/src/install.php
@@ -28,7 +28,7 @@
*
* A copy of the GPL can be found in the file "COPYING" in this
* distribution
- *
+ *
* Adiscon LogAnalyzer is also available under a commercial license.
* For details, contact info@adiscon.com or visit
* http://loganalyzer.adiscon.com/commercial
@@ -834,4 +834,4 @@ function InitUserDbSettings()
define('DB_VIEWS', $CFG['UserDBPref'] . "views");
}
// ---
-?>
+?>
\ No newline at end of file
diff --git a/src/lang/de/admin.php b/src/lang/de/admin.php
index a95b4b7..1de0ccf 100644
--- a/src/lang/de/admin.php
+++ b/src/lang/de/admin.php
@@ -395,14 +395,8 @@ $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 a detailed report description";
$content['LN_REPORTS_INFO'] = "Show more Information";
$content['LN_REPORTS_INIT'] = "Initialize settings";
$content['LN_REPORTS_REMOVE'] = "Remove settings";
@@ -414,8 +408,6 @@ $content['LN_REPORTS_ERROR_HASBEENREMOVED'] = "All settings for the report '%1'
$content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added.";
$content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added.";
$content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized.";
-$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport";
-$content['LN_REPORTS_EDITSAVEDREPORT'] = "Edit Savedreport";
$content['LN_REPORTS_REMOVESAVEDREPORT'] = "Remove Savedreport";
$content['LN_REPORTS_CUSTOMTITLE'] = "Report Title";
$content['LN_REPORTS_CUSTOMCOMMENT'] = "Comment / Description";
@@ -427,7 +419,6 @@ $content['LN_REPORTS_HASBEENEDIT'] = "The Savedreport '%1' has been successfully
$content['LN_REPORTS_SOURCEID'] = "Logstream source";
$content['LN_REPORTS_ERROR_SAVEDREPORTIDNOTFOUND'] = "There was no savedreport with ID '%1' found.";
$content['LN_REPORTS_ERROR_INVALIDSAVEDREPORTID'] = "Invalid savedreport id.";
-$content['LN_REPORTS_SAVEDREPORTS'] = "Saved reports";
$content['LN_REPORTS_RUNNOW'] = "Run saved report now!";
$content['LN_REPORTS_WARNDELETESAVEDREPORT'] = "Are you sure that you want to delete the savedreport '%1'?";
$content['LN_REPORTS_ERROR_DELSAVEDREPORT'] = "Deleting of the savedreport with id '%1' failed!";
@@ -447,16 +438,36 @@ $content['LN_REPORTS_ADVANCEDFILTERLIST'] = "List of advanced report filters";
$content['LN_REPORTS_OUTPUTTARGET_DETAILS'] = "Outputtarget Options";
$content['LN_REPORTS_OUTPUTTARGET_FILE'] = "Output Path and Filename";
$content['LN_REPORTS_CRONCMD'] = "Local Report command";
-$content['LN_REPORTMENU_LIST'] = "List installed Reports";
-$content['LN_REPORTMENU_ONLINELIST'] = "All Available Reports";
$content['LN_REPORTS_LINKS'] = "Related Links";
$content['LN_REPORTS_INSTALLED'] = "Installed";
$content['LN_REPORTS_NOTINSTALLED'] = "Not installed";
$content['LN_REPORTS_DOWNLOAD'] = "Download Link";
$content['LN_REPORTS_SAMPLELINK'] = "Report Sample";
$content['LN_REPORTS_DETAILSFOR'] = "Details for '%1' report";
-$content['LN_REPORTS_'] = "";
-$content['LN_REPORTS_'] = "";
+$content['LN_REPORTS_PERFORMANCE_WARNING'] = "Logstream Performance Warning";
+$content['LN_REPORTS_OPTIMIZE_LOGSTREAMSOURCE'] = "Yes, optimize logstream source!";
+$content['LN_REPORTS_OPTIMIZE_INDEXES'] = "The datasource '%1' is not optimized for this report. There is at least one INDEX missing. Creating INDEXES will speedup the report generation.
Do you want LogAnalyzer to create the necessary INDEXES now? This may take more then a few minutes, so please be patient!";
+$content['LN_REPORTS_ERROR_FAILED_CREATE_INDEXES'] = "Failed to create INDEXES for datasource '%1' with error code '%2'";
+$content['LN_REPORTS_INDEX_CREATED'] = "Logstream INDEXES created";
+$content['LN_REPORTS_INDEX_CREATED_SUCCESS'] = "Successfully created all INDEXES for datasource '%1'.";
+$content['LN_REPORTS_OPTIMIZE_TRIGGER'] = "The datasource '%1' does not have a TRIGGER installed to automatically generate the message checksum on INSERT. Creating the TRIGGER will speedup the report generation.
Do you want LogAnalyzer to create the TRIGGER now? ";
+$content['LN_REPORTS_TRIGGER_CREATED'] = "Logstream TRIGGER created";
+$content['LN_REPORTS_TRIGGER_CREATED_SUCCESS'] = "Successfully created TRIGGER for datasource '%1'.";
+$content['LN_REPORTS_ERROR_FAILED_CREATE_TRIGGER'] = "Failed to create TRIGGER for datasource '%1' with error code '%2'";
+$content['LN_REPORTS_CHANGE_CHECKSUM'] = "The Checksum field for datasource '%1' is not set to UNSIGNED INT. To get the report work properly, changing the CHECKSUM field to UNSIGNED INT is necessary!
Do you want LogAnalyzer to change the CHECKSUM field now? This may take more then a few minutes, so please be patient!";
+$content['LN_REPORTS_ERROR_FAILED_CHANGE_CHECKSUM'] = "Failed to change the CHECKSUM field for datasource '%1' with error code '%2'";
+$content['LN_REPORTS_CHECKSUM_CHANGED'] = "Checksum field changed";
+$content['LN_REPORTS_CHECKSUM_CHANGED_SUCCESS'] = "Successfully changed the Checksum field for datasource '%1'.";
+$content['LN_REPORTS_LOGSTREAM_WARNING'] = "Logstream Warning";
+$content['LN_REPORTS_ADD_MISSINGFIELDS'] = "The datasource '%1' does not contain all necessary datafields There is at least one FIELD missing.
Do you want LogAnalyzer to create the missing datafields now?";
+$content['LN_REPORTS_ERROR_FAILED_ADDING_FIELDS'] = "Failed adding missing datafields in datasource '%1' with error code '%2'";
+$content['LN_REPORTS_FIELDS_CREATED'] = "Added missing datafields";
+$content['LN_REPORTS_FIELDS_CREATED_SUCCESS'] = "Successfully added missing datafields for datasource '%1'.";
+$content['LN_REPORTS_RECHECKLOGSTREAMSOURCE'] = "Do you want to check the current logstream source again?";
+$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport and save changes";
+$content['LN_REPORTS_EDITSAVEDREPORT'] = "Save changes";
+$content['LN_REPORTS_ADDSAVEDREPORTANDRETURN'] = "Add Savedreport and return to reportlist";
+$content['LN_REPORTS_EDITSAVEDREPORTANDRETURN'] = "Save changes and return to reportlist";
$content['LN_REPORTS_'] = "";
?>
\ No newline at end of file
diff --git a/src/lang/de/main.php b/src/lang/de/main.php
index d1d2b34..7e044c2 100644
--- a/src/lang/de/main.php
+++ b/src/lang/de/main.php
@@ -328,28 +328,46 @@ $content['LN_ORACLE_FIELD'] = "Feld";
$content['LN_ORACLE_ONLINESEARCH'] = "Online Suche";
$content['LN_ORACLE_WHOIS'] = "WHOIS Abfrage für '%1' - '%2'";
- $content['LN_GEN_ERROR_INVALIDOP'] = "Invalid or missing operation type";
- $content['LN_GEN_ERROR_INVALIDREPORTID'] = "Invalid or missing report id";
- $content['LN_GEN_ERROR_MISSINGSAVEDREPORTID'] = "Invalid or missing savedreport id";
- $content['LN_GEN_ERROR_REPORTGENFAILED'] = "Failed generating report '%1' with the following error reason: %2";
- $content['LN_GEN_ERROR_WHILEREPORTGEN'] = "Error occured while generating report";
- $content['LN_GEN_ERROR_REPORT_NODATA'] = "No data found for report generation";
- $content['LN_GEN_ALL_OTHER_EVENTS'] = "All other events";
- $content['LN_REPORT_FOOTER_ENDERED'] = "Report rendered in";
- $content['LN_REPORT_FILTERS'] = "List of used filters";
- $content['LN_REPORT_FILTERTYPE_DATE'] = "Date";
- $content['LN_REPORT_FILTERTYPE_NUMBER'] = "Number";
- $content['LN_REPORT_FILTERTYPE_STRING'] = "String";
- $content['LN_GEN_SUCCESS_WHILEREPORTGEN'] = "Report was successfully generated";
- $content['LN_GEN_ERROR_REPORTFAILEDTOGENERATE'] = "Failed to generate report, error details: %1";
- $content['LN_GEN_SUCCESS_REPORTWASGENERATED_DETAILS'] = "Successfully generated report: %1";
+$content['LN_GEN_ERROR_INVALIDOP'] = "Invalid or missing operation type";
+$content['LN_GEN_ERROR_INVALIDREPORTID'] = "Invalid or missing report id";
+$content['LN_GEN_ERROR_MISSINGSAVEDREPORTID'] = "Invalid or missing savedreport id";
+$content['LN_GEN_ERROR_REPORTGENFAILED'] = "Failed generating report '%1' with the following error reason: %2";
+$content['LN_GEN_ERROR_WHILEREPORTGEN'] = "Error occured while generating report";
+$content['LN_GEN_ERROR_REPORT_NODATA'] = "No data found for report generation";
+$content['LN_GEN_ALL_OTHER_EVENTS'] = "All other events";
+$content['LN_REPORT_FOOTER_ENDERED'] = "Report rendered in";
+$content['LN_REPORT_FILTERS'] = "List of used filters";
+$content['LN_REPORT_FILTERTYPE_DATE'] = "Date";
+$content['LN_REPORT_FILTERTYPE_NUMBER'] = "Number";
+$content['LN_REPORT_FILTERTYPE_STRING'] = "String";
+$content['LN_GEN_SUCCESS_WHILEREPORTGEN'] = "Report was successfully generated";
+$content['LN_GEN_ERROR_REPORTFAILEDTOGENERATE'] = "Failed to generate report, error details: %1";
+$content['LN_GEN_SUCCESS_REPORTWASGENERATED_DETAILS'] = "Successfully generated report: %1";
- $content['LN_CMD_RUNREPORT'] = "Generating saved report '%1'";
- $content['LN_CMD_REPORTIDNOTFOUND'] = "Invalid Report ID '%1'";
- $content['LN_CMD_SAVEDREPORTIDNOTFOUND'] = "Invalid SavedReport ID '%1'";
- $content['LN_CMD_NOREPORTID'] = "Missing Report ID";
- $content['LN_CMD_NOSAVEDREPORTID'] = "Missing SavedReport ID";
- $content['LN_CMD_NOCMDPROMPT'] = "Error, this script can only be run from the command prompt.";
+$content['LN_CMD_RUNREPORT'] = "Generating saved report '%1'";
+$content['LN_CMD_REPORTIDNOTFOUND'] = "Invalid Report ID '%1'";
+$content['LN_CMD_SAVEDREPORTIDNOTFOUND'] = "Invalid SavedReport ID '%1'";
+$content['LN_CMD_NOREPORTID'] = "Missing Report ID";
+$content['LN_CMD_NOSAVEDREPORTID'] = "Missing SavedReport ID";
+$content['LN_CMD_NOCMDPROMPT'] = "Error, this script can only be run from the command prompt.";
$content['LN_REPORT_GENERATEDTIME'] = "Report generated at: ";
+$content['LN_REPORT_ACTIONS'] = "Run Report Actions";
+$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_HELP'] = "Help";
+$content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description";
+$content['LN_REPORTS_INFO'] = "Show more Information";
+$content['LN_REPORTS_SAVEDREPORTS'] = "Saved reports";
+$content['LN_REPORTS_ADMIN'] = "Administrate Reports";
+$content['LN_REPORTMENU_LIST'] = "List installed Reports";
+$content['LN_REPORTMENU_ONLINELIST'] = "All Available Reports";
+$content['LN_REPORTS_INFORMATION'] = "This page shows a list of installed and available reports including saved report configurations.
+ To run a report, click on the buttons right to the Saved Reports.
+ Attention! Generating reports can be very time consuming depending on the size of your database.
+";
+$content['LN_REPORTS_CHECKLOGSTREAMSOURCE'] = "Verify Logstream optimization";
+
?>
\ No newline at end of file
diff --git a/src/lang/en/admin.php b/src/lang/en/admin.php
index 363b921..63933d1 100644
--- a/src/lang/en/admin.php
+++ b/src/lang/en/admin.php
@@ -407,15 +407,8 @@ $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 a detailed report description";
-$content['LN_REPORTS_INFO'] = "Show more Information";
$content['LN_REPORTS_INIT'] = "Initialize settings";
$content['LN_REPORTS_REMOVE'] = "Remove settings";
$content['LN_REPORTS_ERROR_IDNOTFOUND'] = "There was no report with ID '%1' found.";
@@ -426,8 +419,6 @@ $content['LN_REPORTS_ERROR_HASBEENREMOVED'] = "All settings for the report '%1'
$content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added.";
$content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added.";
$content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized.";
-$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport";
-$content['LN_REPORTS_EDITSAVEDREPORT'] = "Edit Savedreport";
$content['LN_REPORTS_REMOVESAVEDREPORT'] = "Remove Savedreport";
$content['LN_REPORTS_CUSTOMTITLE'] = "Report Title";
$content['LN_REPORTS_CUSTOMCOMMENT'] = "Comment / Description";
@@ -439,7 +430,6 @@ $content['LN_REPORTS_HASBEENEDIT'] = "The Savedreport '%1' has been successfully
$content['LN_REPORTS_SOURCEID'] = "Logstream source";
$content['LN_REPORTS_ERROR_SAVEDREPORTIDNOTFOUND'] = "There was no savedreport with ID '%1' found.";
$content['LN_REPORTS_ERROR_INVALIDSAVEDREPORTID'] = "Invalid savedreport id.";
-$content['LN_REPORTS_SAVEDREPORTS'] = "Saved reports";
$content['LN_REPORTS_RUNNOW'] = "Run saved report now!";
$content['LN_REPORTS_WARNDELETESAVEDREPORT'] = "Are you sure that you want to delete the savedreport '%1'?";
$content['LN_REPORTS_ERROR_DELSAVEDREPORT'] = "Deleting of the savedreport with id '%1' failed!";
@@ -459,16 +449,37 @@ $content['LN_REPORTS_ADVANCEDFILTERLIST'] = "List of advanced report filters";
$content['LN_REPORTS_OUTPUTTARGET_DETAILS'] = "Outputtarget Options";
$content['LN_REPORTS_OUTPUTTARGET_FILE'] = "Output Path and Filename";
$content['LN_REPORTS_CRONCMD'] = "Local Report command";
-$content['LN_REPORTMENU_LIST'] = "List installed Reports";
-$content['LN_REPORTMENU_ONLINELIST'] = "All Available Reports";
$content['LN_REPORTS_LINKS'] = "Related Links";
$content['LN_REPORTS_INSTALLED'] = "Installed";
$content['LN_REPORTS_NOTINSTALLED'] = "Not installed";
$content['LN_REPORTS_DOWNLOAD'] = "Download Link";
$content['LN_REPORTS_SAMPLELINK'] = "Report Sample";
$content['LN_REPORTS_DETAILSFOR'] = "Details for '%1' report";
-$content['LN_REPORTS_'] = "";
-$content['LN_REPORTS_'] = "";
+$content['LN_REPORTS_PERFORMANCE_WARNING'] = "Logstream Performance Warning";
+$content['LN_REPORTS_OPTIMIZE_LOGSTREAMSOURCE'] = "Yes, optimize logstream source!";
+$content['LN_REPORTS_OPTIMIZE_INDEXES'] = "The datasource '%1' is not optimized for this report. There is at least one INDEX missing. Creating INDEXES will speedup the report generation.
Do you want LogAnalyzer to create the necessary INDEXES now? This may take more then a few minutes, so please be patient!";
+$content['LN_REPORTS_ERROR_FAILED_CREATE_INDEXES'] = "Failed to create INDEXES for datasource '%1' with error code '%2'";
+$content['LN_REPORTS_INDEX_CREATED'] = "Logstream INDEXES created";
+$content['LN_REPORTS_INDEX_CREATED_SUCCESS'] = "Successfully created all INDEXES for datasource '%1'.";
+$content['LN_REPORTS_OPTIMIZE_TRIGGER'] = "The datasource '%1' does not have a TRIGGER installed to automatically generate the message checksum on INSERT. Creating the TRIGGER will speedup the report generation.
Do you want LogAnalyzer to create the TRIGGER now? ";
+$content['LN_REPORTS_TRIGGER_CREATED'] = "Logstream TRIGGER created";
+$content['LN_REPORTS_TRIGGER_CREATED_SUCCESS'] = "Successfully created TRIGGER for datasource '%1'.";
+$content['LN_REPORTS_ERROR_FAILED_CREATE_TRIGGER'] = "Failed to create TRIGGER for datasource '%1' with error code '%2'";
+$content['LN_REPORTS_CHANGE_CHECKSUM'] = "The Checksum field for datasource '%1' is not set to UNSIGNED INT. To get the report work properly, changing the CHECKSUM field to UNSIGNED INT is necessary!
Do you want LogAnalyzer to change the CHECKSUM field now? This may take more then a few minutes, so please be patient!";
+$content['LN_REPORTS_ERROR_FAILED_CHANGE_CHECKSUM'] = "Failed to change the CHECKSUM field for datasource '%1' with error code '%2'";
+$content['LN_REPORTS_CHECKSUM_CHANGED'] = "Checksum field changed";
+$content['LN_REPORTS_CHECKSUM_CHANGED_SUCCESS'] = "Successfully changed the Checksum field for datasource '%1'.";
+$content['LN_REPORTS_LOGSTREAM_WARNING'] = "Logstream Warning";
+$content['LN_REPORTS_ADD_MISSINGFIELDS'] = "The datasource '%1' does not contain all necessary datafields There is at least one FIELD missing.
Do you want LogAnalyzer to create the missing datafields now?";
+$content['LN_REPORTS_ERROR_FAILED_ADDING_FIELDS'] = "Failed adding missing datafields in datasource '%1' with error code '%2'";
+$content['LN_REPORTS_FIELDS_CREATED'] = "Added missing datafields";
+$content['LN_REPORTS_FIELDS_CREATED_SUCCESS'] = "Successfully added missing datafields for datasource '%1'.";
+$content['LN_REPORTS_RECHECKLOGSTREAMSOURCE'] = "Do you want to check the current logstream source again?";
+$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport and save changes";
+$content['LN_REPORTS_EDITSAVEDREPORT'] = "Save changes";
+$content['LN_REPORTS_ADDSAVEDREPORTANDRETURN'] = "Add Savedreport and return to reportlist";
+$content['LN_REPORTS_EDITSAVEDREPORTANDRETURN'] = "Save changes and return to reportlist";
$content['LN_REPORTS_'] = "";
+
?>
\ No newline at end of file
diff --git a/src/lang/en/main.php b/src/lang/en/main.php
index 5cceb72..dc7ecbe 100644
--- a/src/lang/en/main.php
+++ b/src/lang/en/main.php
@@ -124,9 +124,9 @@ $content['LN_MENU_LOGOFF'] = "Logoff";
$content['LN_MENU_LOGGEDINAS'] = "Logged in as";
$content['LN_MENU_MAXVIEW'] = "Maximize View";
$content['LN_MENU_NORMALVIEW'] = "Normalize View";
- $content['LN_MENU_STATISTICS'] = "Statistics";
- $content['LN_MENU_CLICKTOEXPANDMENU'] = "Click the icon to show the menu";
-
+$content['LN_MENU_STATISTICS'] = "Statistics";
+$content['LN_MENU_CLICKTOEXPANDMENU'] = "Click the icon to show the menu";
+ $content['LN_MENU_REPORTS'] = "Reports";
// Main Index Site
$content['LN_ERROR_INSTALLFILEREMINDER'] = "Warning! You still have NOT removed the 'install.php' from your LogAnalyzer main directory!";
@@ -339,6 +339,7 @@ $content['LN_ORACLE_FIELD'] = "Field";
$content['LN_ORACLE_ONLINESEARCH'] = "Online Search";
$content['LN_ORACLE_WHOIS'] = "WHOIS Lookup for '%1' value '%2'";
+// Report Strings
$content['LN_GEN_ERROR_INVALIDOP'] = "Invalid or missing operation type";
$content['LN_GEN_ERROR_INVALIDREPORTID'] = "Invalid or missing report id";
$content['LN_GEN_ERROR_MISSINGSAVEDREPORTID'] = "Invalid or missing savedreport id";
@@ -363,5 +364,23 @@ $content['LN_CMD_NOSAVEDREPORTID'] = "Missing SavedReport ID";
$content['LN_CMD_NOCMDPROMPT'] = "Error, this script can only be run from the command prompt.";
$content['LN_REPORT_GENERATEDTIME'] = "Report generated at: ";
+$content['LN_REPORT_ACTIONS'] = "Run Report Actions";
+$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_HELP'] = "Help";
+$content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description";
+$content['LN_REPORTS_INFO'] = "Show more Information";
+$content['LN_REPORTS_SAVEDREPORTS'] = "Saved reports";
+$content['LN_REPORTS_ADMIN'] = "Administrate Reports";
+$content['LN_REPORTMENU_LIST'] = "List installed Reports";
+$content['LN_REPORTMENU_ONLINELIST'] = "All Available Reports";
+$content['LN_REPORTS_INFORMATION'] = "This page shows a list of installed and available reports including saved report configurations.
+ To run a report, click on the buttons right to the Saved Reports.
+ Attention! Generating reports can be very time consuming depending on the size of your database.
+";
+$content['LN_REPORTS_CHECKLOGSTREAMSOURCE'] = "Verify Logstream optimization";
+
?>
\ No newline at end of file
diff --git a/src/login.php b/src/login.php
index ac4e160..17db1c4 100644
--- a/src/login.php
+++ b/src/login.php
@@ -28,7 +28,7 @@
*
* A copy of the GPL can be found in the file "COPYING" in this
* distribution
- *
+ *
* Adiscon LogAnalyzer is also available under a commercial license.
* For details, contact info@adiscon.com or visit
* http://loganalyzer.adiscon.com/commercial
@@ -112,4 +112,4 @@ $page -> parser($content, "login.html");
$page -> output();
// ---
-?>
+?>
\ No newline at end of file
diff --git a/src/reportgenerator.php b/src/reportgenerator.php
index dc3f774..37cb2d4 100644
--- a/src/reportgenerator.php
+++ b/src/reportgenerator.php
@@ -27,8 +27,8 @@
* along with LogAnalyzer. If not, see .
*
* A copy of the GPL can be found in the file "COPYING" in this
- * distribution
- *
+ * distribution
+ *
* Adiscon LogAnalyzer is also available under a commercial license.
* For details, contact info@adiscon.com or visit
* http://loganalyzer.adiscon.com/commercial
@@ -217,4 +217,4 @@ if ( $content['error_occured'] || $content['report_success'] )
// ---
-?>
+?>
\ No newline at end of file
diff --git a/src/reports.php b/src/reports.php
new file mode 100644
index 0000000..245ab55
--- /dev/null
+++ b/src/reports.php
@@ -0,0 +1,147 @@
+ Helps administrating report modules
+ *
+ * All directives are explained within this file
+ *
+ * Copyright (C) 2008-2010 Adiscon GmbH.
+ *
+ * This file is part of LogAnalyzer.
+ *
+ * LogAnalyzer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LogAnalyzer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LogAnalyzer. If not, see .
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this
+ * distribution
+ *
+ * Adiscon LogAnalyzer is also available under a commercial license.
+ * For details, contact info@adiscon.com or visit
+ * http://loganalyzer.adiscon.com/commercial
+ *********************************************************************
+*/
+
+// *** Default includes and procedures *** //
+define('IN_PHPLOGCON', true);
+$gl_root_path = './';
+
+// Now include necessary include files!
+include($gl_root_path . 'include/functions_common.php');
+include($gl_root_path . 'include/functions_frontendhelpers.php');
+include($gl_root_path . 'include/functions_filters.php');
+include($gl_root_path . 'include/functions_reports.php');
+
+InitPhpLogCon();
+InitSourceConfigs();
+InitFrontEndDefaults(); // Only in WebFrontEnd
+InitFilterHelpers(); // Helpers for frontend filtering!
+// ---
+
+// --- BEGIN Custom Code
+
+// Firts of all init List of Reports!
+InitReportModules();
+
+if ( isset($content['REPORTS']) )
+{
+ // This will enable to Stats View
+ $content['reportsenabled'] = true;
+
+ $i = 0; // Help counter!
+ foreach ($content['REPORTS'] as &$myReport )
+ {
+ // Set if help link is enabled
+ if ( strlen($myReport['ReportHelpArticle']) > 0 )
+ $myReport['ReportHelpEnabled'] = true;
+ else
+ $myReport['ReportHelpEnabled'] = false;
+
+ // check for custom fields
+ if ( $myReport['NeedsInit'] ) // && count($myReport['CustomFieldsList']) > 0 )
+ {
+ // Needs custom fields!
+ $myReport['EnableNeedsInit'] = true;
+
+ if ( $myReport['Initialized'] )
+ {
+ $myReport['InitEnabled'] = false;
+ $myReport['DeleteEnabled'] = true;
+ }
+ else
+ {
+ $myReport['InitEnabled'] = true;
+ $myReport['DeleteEnabled'] = false;
+ }
+ }
+
+ // --- Set CSS Class
+ if ( $i % 2 == 0 )
+ {
+ $myReport['cssclass'] = "line1";
+ $myReport['rowbegin'] = '