smecontribs/smeserver-mailstats
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make text version a bit more readable

Browse Source
This commit is contained in:
Brian Read 2025-04-12 11:52:07 +01:00
parent f885ab684e
commit 756e0f94c3
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
root/usr/bin/mailstats.py
View File

@ -1697,7 +1697,7 @@ if __name__ == "__main__":
with open(template_path, 'r') as template_file: with open(template_path, 'r') as template_file:
template_content = template_file.read() template_content = template_file.read()
#Use the hello string to create a suitable heading for the web page #Use the hello string to create a suitable heading for the web page
html_title = hello_string.replace("Printed at"," <span class='greyed-out'>Printeded at") html_title = hello_string.replace("Printed at:"," <span class='greyed-out'>Printed at:")
html_title += "</span>" html_title += "</span>"
# Create a Chameleon template instance # Create a Chameleon template instance
@ -1706,7 +1706,8 @@ if __name__ == "__main__":
# Render the template with the 2D array data and column headers # Render the template with the 2D array data and column headers
try: try:
rendered_html = template(array_2d=columnCounts_2d, column_headers=columnHeaders, rendered_html = template(array_2d=columnCounts_2d, column_headers=columnHeaders,
reporting_date=analysis_date, title=html_title, reporting_date=analysis_date,
title=html_title,
version=version_string, version=version_string,
nolinks=nolinks, nolinks=nolinks,
PreviousDate=previous_date_str, PreviousDate=previous_date_str,
@ -1793,19 +1794,21 @@ if __name__ == "__main__":
# Render the template with the 2D array data and column headers # Render the template with the 2D array data and column headers
try: try:
rendered_html = template(array_2d=columnCounts_2d, column_headers=columnHeaders, rendered_html = template(array_2d=columnCounts_2d, column_headers=columnHeaders,
reporting_date=analysis_date, title=html_title, reporting_date=analysis_date,
title="",
version=version_string, version=version_string,
nolinks=True, nolinks=True,
PreviousDate=previous_date_str, PreviousDate=previous_date_str,
NextDate=next_date_str, NextDate=next_date_str,
DomainName=DomainName, DomainName=DomainName,
SystemName=SystemName, SystemName=SystemName,
enable_graphs=enable_graphs enable_graphs=False
) )
except Exception as e: except Exception as e:
logging.error(f"Chameleon template Exception {e}") logging.error(f"Chameleon template Exception {e}")
# Need to add the sub tables # Need to add the sub tables
full_rendered_html = ''.join([ full_rendered_html = ''.join([
html_title+"<br />",
header_rendered_html, header_rendered_html,
rendered_html, rendered_html,
blacklist_rendered_html, blacklist_rendered_html,
@ -1815,6 +1818,10 @@ if __name__ == "__main__":
qpsmtpd_rendered_html, qpsmtpd_rendered_html,
virus_rendered_html virus_rendered_html
]) ])
# delete next and prev
start = full_rendered_html.find("Previous")
end = full_rendered_html.find("Table")
full_rendered_html = full_rendered_html[:start] + full_rendered_html[end:]
with open(temp_file_name, 'w') as output_file: with open(temp_file_name, 'w') as output_file:
output_file.write(full_rendered_html) output_file.write(full_rendered_html)
else: else: