vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

v2.51

Browse Source 
Fix Bug #1
This commit is contained in:
pucherot
2021-01-11 14:16:22 +01:00
parent 2f9ccddd09
commit 8bf95aed5b
9 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
back/pialert.conf
View File

@@ -1,6 +1,6 @@
VERSION = '2.50' VERSION = '2.51'
VERSION_YEAR = '2020' VERSION_YEAR = '2021'
VERSION_DATE = '2020-12-30' VERSION_DATE = '2021-01-11'
DB_PATH = '/home/pi/pialert/db/pialert.db' DB_PATH = '/home/pi/pialert/db/pialert.db'
LOG_PATH = '/home/pi/pialert/log' LOG_PATH = '/home/pi/pialert/log'

17
back/pialert.py
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
# #
# Pi.Alert v2.50 / 2020-12-30 # Pi.Alert v2.51 / 2021-01-11
# Puche 2020 # Puche 2020
# GNU GPLv3 # GNU GPLv3
@@ -486,10 +486,17 @@ def read_DHCP_leases ():
return return
# Read DHCP Leases # Read DHCP Leases
with open(DHCP_LEASES) as f: # Bugfix #1 - dhcp.leases: lines with different number of columns (5 col)
reader = csv.reader(f, delimiter=' ') data = []
data = [(col1, col2, col3, col4, col5) with open(DHCP_LEASES, 'r') as f:
for col1, col2, col3, col4, col5 in reader] for line in f:
row = line.rstrip().split()
if len(row) == 5 :
data.append (row)
# with open(DHCP_LEASES) as f:
# reader = csv.reader(f, delimiter=' ')
# data = [(col1, col2, col3, col4, col5)
# for col1, col2, col3, col4, col5 in reader]
# Insert into PiAlert table # Insert into PiAlert table
sql.execute ("DELETE FROM DHCP_Leases") sql.execute ("DELETE FROM DHCP_Leases")

6
docs/report_sample_1.html
View File

@@ -16,7 +16,7 @@
<td> <td>
<table width=100% border=0 bgcolor=#FFD966 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 16px; text-align:center; color:#5F5000"> <table width=100% border=0 bgcolor=#FFD966 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 16px; text-align:center; color:#5F5000">
<tr> <tr>
<td width=33%> Report Date: <b>2021-01-02 08:20</b> </td> <td width=33%> Report Date: <b>2021-01-11 08:00</b> </td>
<td width=34%> Scan Cycle: <b>Internet</b> </td> <td width=34%> Scan Cycle: <b>Internet</b> </td>
<td width=33%> Server: <b>pi4</b> </td> <td width=33%> Server: <b>pi4</b> </td>
</tr> </tr>
@@ -58,8 +58,8 @@
<td> <td>
<table width=100% border=0 bgcolor=#70AD47 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 12px; font-weight: bold; color:#385723"> <table width=100% border=0 bgcolor=#70AD47 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 12px; font-weight: bold; color:#385723">
<tr> <tr>
<td width=25% style="text-align:Left"> Puche 2020</td> <td width=25% style="text-align:Left"> Puche 2021</td>
<td width=50% style="text-align:center"> Pi.Alert 2.50 &nbsp; / &nbsp; 2020-12-30 </td> <td width=50% style="text-align:center"> Pi.Alert 2.51 &nbsp; / &nbsp; 2021-01-11 </td>
<td width=25% style="text-align:right"> GNU GPLv3</td> <td width=25% style="text-align:right"> GNU GPLv3</td>
</tr> </tr>
</table> </table>

6
docs/report_sample_2.html
View File

@@ -16,7 +16,7 @@
<td> <td>
<table width=100% border=0 bgcolor=#FFD966 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 16px; text-align:center; color:#5F5000"> <table width=100% border=0 bgcolor=#FFD966 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 16px; text-align:center; color:#5F5000">
<tr> <tr>
<td width=33%> Report Date: <b>2021-01-02 08:20</b> </td> <td width=33%> Report Date: <b>2021-01-11 08:00</b> </td>
<td width=34%> Scan Cycle: <b>1</b> </td> <td width=34%> Scan Cycle: <b>1</b> </td>
<td width=33%> Server: <b>pi4</b> </td> <td width=33%> Server: <b>pi4</b> </td>
</tr> </tr>
@@ -121,8 +121,8 @@
<td> <td>
<table width=100% border=0 bgcolor=#70AD47 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 12px; font-weight: bold; color:#385723"> <table width=100% border=0 bgcolor=#70AD47 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 12px; font-weight: bold; color:#385723">
<tr> <tr>
<td width=25% style="text-align:Left"> Puche 2020</td> <td width=25% style="text-align:Left"> Puche 2021</td>
<td width=50% style="text-align:center"> Pi.Alert 2.50 &nbsp; / &nbsp; 2020-12-30 </td> <td width=50% style="text-align:center"> Pi.Alert 2.51 &nbsp; / &nbsp; 2021-01-11 </td>
<td width=25% style="text-align:right"> GNU GPLv3</td> <td width=25% style="text-align:right"> GNU GPLv3</td>
</tr> </tr>
</table> </table>

4
front/php/templates/footer.php
View File

@@ -1,10 +1,10 @@
<!-- Main Footer --> <!-- Main Footer -->
<footer class="main-footer"> <footer class="main-footer">
<!-- Default to the left --> <!-- Default to the left -->
&copy; 2020 Puche &copy; 2021 Puche
<!-- To the right --> <!-- To the right -->
<div class="pull-right no-hidden-xs"> <div class="pull-right no-hidden-xs">
Pi.alert&nbsp&nbsp2.50&nbsp&nbsp<small>(2019-12-30)</small> Pi.alert&nbsp&nbsp2.51&nbsp&nbsp<small>(2021-01-11)</small>
</div> </div>
</footer> </footer>

BIN
install/pialert_2.50.tar
View File

Binary file not shown.

BIN
install/pialert_latest.tar
View File

Binary file not shown.

4
log/report_output.html
View File

@@ -34,8 +34,8 @@
<td> <td>
<table width=100% border=0 bgcolor=#70AD47 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 12px; font-weight: bold; color:#385723"> <table width=100% border=0 bgcolor=#70AD47 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 12px; font-weight: bold; color:#385723">
<tr> <tr>
<td width=25% style="text-align:Left"> Puche 2020</td> <td width=25% style="text-align:Left"> Puche 2021</td>
<td width=50% style="text-align:center"> Pi.Alert DEV 2.50 &nbsp; / &nbsp; 2020-12-30 </td> <td width=50% style="text-align:center"> Pi.Alert DEV 2.51 &nbsp; / &nbsp; 2021-01-11 </td>
<td width=25% style="text-align:right"> GNU GPLv3</td> <td width=25% style="text-align:right"> GNU GPLv3</td>
</tr> </tr>
</table> </table>

4
log/report_output.txt
View File

@@ -2,7 +2,7 @@
Pi.Alert Report Pi.Alert Report
======================================== ========================================
Report Date: 2021-01-01 00:00 Report Date: 2021-01-11 00:00
Scan Cycle: 1 Scan Cycle: 1
Server: pi4 Server: pi4
@@ -12,4 +12,4 @@ Events
---------------------------------------------------------------------- ----------------------------------------------------------------------
Puche 2020 Pi.Alert 2.50 / 2020-12-30 GNU GPLv3 Puche 2021 Pi.Alert 2.51 / 2021-01-11 GNU GPLv3