From 28d163cf0b5a518329a2b7d476f29a220ac125de Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Fri, 29 Jul 2022 16:41:38 +0200
Subject: [PATCH] Merge Comit
 https://github.com/jokob-sk/Pi.Alert/commit/6c4e354f5ffdc1be83d21c10c078297245e69131

---
 back/pialert.py           | 4 ++--
 back/report_template.html | 4 +---
 back/report_template.txt  | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/back/pialert.py b/back/pialert.py
index be91a372..64e6f206 100644
--- a/back/pialert.py
+++ b/back/pialert.py
@@ -1215,8 +1215,8 @@ def email_reporting ():
     mail_text = mail_text.replace ('<REPORT_DATE>', timeFormated)
     mail_html = mail_html.replace ('<REPORT_DATE>', timeFormated)
 
-    mail_text = mail_text.replace ('<SCAN_CYCLE>', cycle )
-    mail_html = mail_html.replace ('<SCAN_CYCLE>', cycle )
+    # mail_text = mail_text.replace ('<SCAN_CYCLE>', cycle )
+    # mail_html = mail_html.replace ('<SCAN_CYCLE>', cycle )
 
     mail_text = mail_text.replace ('<SERVER_NAME>', socket.gethostname() )
     mail_html = mail_html.replace ('<SERVER_NAME>', socket.gethostname() )
diff --git a/back/report_template.html b/back/report_template.html
index e6b340ad..4ef981db 100644
--- a/back/report_template.html
+++ b/back/report_template.html
@@ -24,9 +24,7 @@
         <tr>
         <td>
             <table width=100% border=0 bgcolor=#FFD966 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 15px; text-align:center; color:#404040">            <tr>
-                <td width=50%> Report Date: <b><REPORT_DATE></b> </td>
-                <td width=50%> Scan Cycle: <b><SCAN_CYCLE></b> </td>
-                
+                <td width=100%> Report Date: <b><REPORT_DATE></b> </td>
             </tr>
             </table>
         </td>
diff --git a/back/report_template.txt b/back/report_template.txt
index 9a2d72e3..a25c9af0 100644
--- a/back/report_template.txt
+++ b/back/report_template.txt
@@ -1,5 +1,4 @@
 Report Date: <REPORT_DATE>
-Scan Cycle:  <SCAN_CYCLE>
 Server:      <SERVER_NAME>
 
 <SECTION_INTERNET>