Merge Comit 6c4e354f5f
This commit is contained in:
@@ -1215,8 +1215,8 @@ def email_reporting ():
|
|||||||
mail_text = mail_text.replace ('<REPORT_DATE>', timeFormated)
|
mail_text = mail_text.replace ('<REPORT_DATE>', timeFormated)
|
||||||
mail_html = mail_html.replace ('<REPORT_DATE>', timeFormated)
|
mail_html = mail_html.replace ('<REPORT_DATE>', timeFormated)
|
||||||
|
|
||||||
mail_text = mail_text.replace ('<SCAN_CYCLE>', cycle )
|
# mail_text = mail_text.replace ('<SCAN_CYCLE>', cycle )
|
||||||
mail_html = mail_html.replace ('<SCAN_CYCLE>', cycle )
|
# mail_html = mail_html.replace ('<SCAN_CYCLE>', cycle )
|
||||||
|
|
||||||
mail_text = mail_text.replace ('<SERVER_NAME>', socket.gethostname() )
|
mail_text = mail_text.replace ('<SERVER_NAME>', socket.gethostname() )
|
||||||
mail_html = mail_html.replace ('<SERVER_NAME>', socket.gethostname() )
|
mail_html = mail_html.replace ('<SERVER_NAME>', socket.gethostname() )
|
||||||
|
|||||||
@@ -24,9 +24,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>
|
<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>
|
<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=100%> Report Date: <b><REPORT_DATE></b> </td>
|
||||||
<td width=50%> Scan Cycle: <b><SCAN_CYCLE></b> </td>
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
Report Date: <REPORT_DATE>
|
Report Date: <REPORT_DATE>
|
||||||
Scan Cycle: <SCAN_CYCLE>
|
|
||||||
Server: <SERVER_NAME>
|
Server: <SERVER_NAME>
|
||||||
|
|
||||||
<SECTION_INTERNET>
|
<SECTION_INTERNET>
|
||||||
|
|||||||
Reference in New Issue
Block a user