From 77ca17c851d07b1601ee9c05f1816768bad71b68 Mon Sep 17 00:00:00 2001
From: Brian Read <brianr@koozali.org>
Date: Mon, 17 Mar 2025 15:27:16 +0000
Subject: [PATCH] * Mon Mar 17 2025 Brian Read <brianr@koozali.org>
 11.0.0-69.sme - Add a total summary report across all existing logs [SME:
 12951]

---
 .../smanager/lib/SrvMngr/Controller/Qmailanalog.pm     | 10 ++++++++++
 .../I18N/Modules/Qmailanalog/qmailanalog_en.lex        |  1 +
 smeserver-manager.spec                                 |  5 ++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm
index 61cfa90..ed383fa 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm
@@ -68,6 +68,9 @@ sub generateReport {
     elsif ($selected_report eq 'daily_summary_today') {
         $out .= daily_summary_report_today($log_path);  
     }
+    elsif ($selected_report eq 'daily_summary_all') {
+        $out .= daily_summary_report_all($log_path);  
+    }
     elsif ($selected_report eq 'top_senders') {
         $out .= top_senders_and_recipients($log_path);  
     }
@@ -118,6 +121,7 @@ sub reportType_list {
     my @array = (
 		[$c->l('qma_Daily_Summary_Report_yesterday') => 'daily_summary'],
 		[$c->l('qma_Daily_Summary_Report_today') => 'daily_summary_today'],
+		[$c->l('qma_Daily_Summary_Report_all') => 'daily_summary_all'],
 		#[$c->l('qma_Top Senders and Recipients') => 'top_senders'],
 		#[$c->l('qma_Bounce Rate Analysis') => 'bounce_analysis'],
 		#[$c->l('qma_Spam and Virus Filtering Report') => 'spam_and_virus'],
@@ -146,6 +150,12 @@ sub daily_summary_report_today {
     return format_as_html("Daily Summary Report", $output);
 }
 
+sub daily_summary_report_all {
+    my $log_file = shift;  # Path to log file
+    my $output = qx(ls -1 /var/log/maillog* | xargs cat |pflogsumm --detail 0 --no-no-msg-size);
+    return format_as_html("Summary Report across all logs", $output);
+}
+
 sub top_senders_and_recipients {
     my $log_file = shift;
     my $output = qx(pflogsumm --smtpd-stats $log_file);
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmailanalog/qmailanalog_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmailanalog/qmailanalog_en.lex
index 462b7e6..7f3f7ae 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmailanalog/qmailanalog_en.lex
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmailanalog/qmailanalog_en.lex
@@ -15,6 +15,7 @@ these reports</P>',
 
 'qma_Daily_Summary_Report_yesterday' => 'Summary report for yesterday',
 'qma_Daily_Summary_Report_today' => 'Summary report for today up to now',
+'qma_Daily_Summary_Report_all' => 'Summary report for all time up to now',
 
 'qma_LIST_OUTGOING' => 'List outgoing messages and recipients',
 'qma_SUMMARIZE_QUEUE' => 'Summarize status of mail queue',
diff --git a/smeserver-manager.spec b/smeserver-manager.spec
index 1ce6384..5112776 100644
--- a/smeserver-manager.spec
+++ b/smeserver-manager.spec
@@ -2,7 +2,7 @@ Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 11.0.0
-%define release 68
+%define release 69
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -143,6 +143,9 @@ true
 %defattr(-,root,root)
 
 %changelog
+* Mon Mar 17 2025 Brian Read <brianr@koozali.org> 11.0.0-69.sme
+- Add a total summary report across all existing logs [SME: 12951]
+
 * Mon Mar 17 2025 Brian Read <brianr@koozali.org> 11.0.0-68.sme
 - re-write qmailanalog for postfix [SME: 12951]
 - Clean up backup.pm