From d9761e771f6ede563864f4c9f8b5f911130c7f72 Mon Sep 17 00:00:00 2001 From: Carlos V <76731844+cvc90@users.noreply.github.com> Date: Sun, 6 Aug 2023 10:07:18 +0200 Subject: [PATCH 1/3] Create and Update report_template.html Modified creator banner url repot_template.html --> report_template.html Modified the creators banner adding to cvc90 Removed several white spaces between banner and tag Changed the background color in the table (bgcolor=#00c0ef --> bgcolor=#4b99d3) Changed the color of the text to white in the table (bgcolor=#4b99d3 --> bgcolor=#ffffff) Changed the background color in td (bgcolor=#F5F5F5 --> bgcolor=#F1F5F5) Changed the background color in the footer table (bgcolor=#46802e --> bgcolor=#3c8dbc) Added in the footer table the color of the text to white (color: white) Changed footer text --- back/report_template.html | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/back/report_template.html b/back/report_template.html index 4befe628..3328aec5 100755 --- a/back/report_template.html +++ b/back/report_template.html @@ -1,11 +1,14 @@ - +#---------------------------------------------------------------------------------# +# Pi.Alert # +# Open Source Network Guard / WIFI & LAN intrusion detector # +# # +# report_template.html - Back module. Template to email reporting in HTML format # +#---------------------------------------------------------------------------------# +# Puche 2021 pi.alert.application@gmail.com GNU GPLv3 # +# jokob-sk 2022 jokob.sk@gmail.com GNU GPLv3 # +# leiweibau 2022 https://github.com/leiweibau GNU GPLv3 # +# cvc90 2023 https://github.com/cvc90 GNU GPLv3 # +#---------------------------------------------------------------------------------# @@ -23,7 +26,7 @@ - +
Report Date:
@@ -31,7 +34,7 @@ - + @@ -39,14 +42,23 @@ + - +
- +
Pi.Alert - + Pi.Alert + () +
©2020 Puche (2022+ + jokob-sk) | Built on: | Version: | + + Docs + +
@@ -54,4 +66,4 @@ - \ No newline at end of file + From 42ebb687f814c7d28c0d45a2d378cff9a1c07e0f Mon Sep 17 00:00:00 2001 From: Carlos V <76731844+cvc90@users.noreply.github.com> Date: Sun, 6 Aug 2023 10:13:32 +0200 Subject: [PATCH 2/3] Create and update report_template_new_version.html Modified creator banner url (repot_template.html --> report_template_new_version.html) Modified the creators banner adding to cvc90 Removed several white spaces between banner and tag Changed the background color in the table (bgcolor=#00c0ef --> bgcolor=#4b99d3) Changed the color of the text to white in the table ( bgcolor=#4b99d3 --> bgcolor=#ffffff) Changed the background color in td (bgcolor=#F5F5F5 --> bgcolor=#F1F5F5) Changed the background color in the footer table (bgcolor=#46802e --> bgcolor=#3c8dbc) Added in the footer table the color of the text to white (color: white) Changed footer text --- back/report_template_new_version.html | 62 +++++++++++++++------------ 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/back/report_template_new_version.html b/back/report_template_new_version.html index 958a6f25..3328aec5 100755 --- a/back/report_template_new_version.html +++ b/back/report_template_new_version.html @@ -1,11 +1,14 @@ - +#---------------------------------------------------------------------------------# +# Pi.Alert # +# Open Source Network Guard / WIFI & LAN intrusion detector # +# # +# report_template.html - Back module. Template to email reporting in HTML format # +#---------------------------------------------------------------------------------# +# Puche 2021 pi.alert.application@gmail.com GNU GPLv3 # +# jokob-sk 2022 jokob.sk@gmail.com GNU GPLv3 # +# leiweibau 2022 https://github.com/leiweibau GNU GPLv3 # +# cvc90 2023 https://github.com/cvc90 GNU GPLv3 # +#---------------------------------------------------------------------------------# @@ -20,14 +23,10 @@ Pi.Alert Report - - - 🆕 New version available 🆕 - - + - +
Report Date:
@@ -35,27 +34,36 @@ - - - - - - - - + + + + + + + + + + + - +
- +
Pi.Alert - + Pi.Alert + () +
©2020 Puche (2022+ + jokob-sk) | Built on: | Version: | + + Docs + +
- - - \ No newline at end of file + From 6c166908a1236f48d6902520b2133930b6d23ee3 Mon Sep 17 00:00:00 2001 From: Carlos V <76731844+cvc90@users.noreply.github.com> Date: Sun, 6 Aug 2023 10:18:32 +0200 Subject: [PATCH 3/3] Create and update reporting.py Added creator banner Added import const Changed color in headerProps variable (color:blue --> color:white) Modified bgcolor in headerProps variable (bgcolor=#909090 --> bgcolor=#64a0d6) Modified bgcolor in the thProps variable (bgcolor=#909090 --> bgcolor=#64a0d6) --- pialert/reporting.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pialert/reporting.py b/pialert/reporting.py index c3f6abaa..405de198 100755 --- a/pialert/reporting.py +++ b/pialert/reporting.py @@ -1,4 +1,14 @@ - +#---------------------------------------------------------------------------------# +# Pi.Alert # +# Open Source Network Guard / WIFI & LAN intrusion detector # +# # +# reporting.py - Pialert Back module. Template to email reporting in HTML format # +#---------------------------------------------------------------------------------# +# Puche 2021 pi.alert.application@gmail.com GNU GPLv3 # +# jokob-sk 2022 jokob.sk@gmail.com GNU GPLv3 # +# leiweibau 2022 https://github.com/leiweibau GNU GPLv3 # +# cvc90 2023 https://github.com/cvc90 GNU GPLv3 # +#---------------------------------------------------------------------------------# import datetime import json @@ -11,6 +21,7 @@ from json2table import convert # pialert modules import conf +import const from const import pialertPath, logPath, apiPath from helper import noti_struc, generate_mac_links, removeDuplicateNewLines, timeNow, hide_email, updateState, get_file_content, write_file from logger import logResult, mylog, print_log @@ -46,8 +57,8 @@ def construct_notifications(db, sqlQuery, tableTitle, skipText = False, supplied return noti_struc("", "", "") table_attributes = {"style" : "border-collapse: collapse; font-size: 12px; color:#70707", "width" : "100%", "cellspacing" : 0, "cellpadding" : "3px", "bordercolor" : "#C0C0C0", "border":"1"} - headerProps = "width='120px' style='color:blue; font-size: 16px;' bgcolor='#909090' " - thProps = "width='120px' style='color:#F0F0F0' bgcolor='#909090' " + headerProps = "width='120px' style='color:white; font-size: 16px;' bgcolor='#64a0d6' " + thProps = "width='120px' style='color:#F0F0F0' bgcolor='#64a0d6' " build_direction = "TOP_TO_BOTTOM" text_line = '{}\t{}\n' @@ -522,4 +533,4 @@ def handle_test(testType): if testType == 'REPORT_PUSHSAFER': send_pushsafer (sample_msg) - mylog('info', ['[Test Publishers] END Test: ', testType]) \ No newline at end of file + mylog('info', ['[Test Publishers] END Test: ', testType])