diff --git a/back/pialert.conf b/back/pialert.conf index fbb9dd67..eeeb4131 100644 --- a/back/pialert.conf +++ b/back/pialert.conf @@ -1,6 +1,6 @@ -VERSION = '2.50' -VERSION_YEAR = '2020' -VERSION_DATE = '2020-12-30' +VERSION = '2.51' +VERSION_YEAR = '2021' +VERSION_DATE = '2021-01-11' DB_PATH = '/home/pi/pialert/db/pialert.db' LOG_PATH = '/home/pi/pialert/log' diff --git a/back/pialert.py b/back/pialert.py index 16cceb24..29b971cc 100644 --- a/back/pialert.py +++ b/back/pialert.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Pi.Alert v2.50 / 2020-12-30 +# Pi.Alert v2.51 / 2021-01-11 # Puche 2020 # GNU GPLv3 @@ -486,10 +486,17 @@ def read_DHCP_leases (): return # Read DHCP Leases - 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] + # Bugfix #1 - dhcp.leases: lines with different number of columns (5 col) + data = [] + with open(DHCP_LEASES, 'r') as f: + 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 sql.execute ("DELETE FROM DHCP_Leases") diff --git a/docs/report_sample_1.html b/docs/report_sample_1.html index c207daea..afd1dc47 100644 --- a/docs/report_sample_1.html +++ b/docs/report_sample_1.html @@ -16,7 +16,7 @@ - + @@ -58,8 +58,8 @@
Report Date: 2021-01-02 08:20 Report Date: 2021-01-11 08:00 Scan Cycle: Internet Server: pi4
- - + +
Puche 2020 Pi.Alert 2.50   /   2020-12-30 Puche 2021 Pi.Alert 2.51   /   2021-01-11 GNU GPLv3
diff --git a/docs/report_sample_2.html b/docs/report_sample_2.html index bc60b972..52e1ceef 100644 --- a/docs/report_sample_2.html +++ b/docs/report_sample_2.html @@ -16,7 +16,7 @@ 		- + @@ -121,8 +121,8 @@
Report Date: 2021-01-02 08:20 Report Date: 2021-01-11 08:00 Scan Cycle: 1 Server: pi4
- - + +
Puche 2020 Pi.Alert 2.50   /   2020-12-30 Puche 2021 Pi.Alert 2.51   /   2021-01-11 GNU GPLv3
diff --git a/front/php/templates/footer.php b/front/php/templates/footer.php index 5f44717d..ef963fb0 100644 --- a/front/php/templates/footer.php +++ b/front/php/templates/footer.php @@ -1,10 +1,10 @@
- © 2020 Puche + © 2021 Puche
- Pi.alert  2.50  (2019-12-30) + Pi.alert  2.51  (2021-01-11)
diff --git a/install/pialert_2.50.tar b/install/pialert_2.50.tar index e3397330..8742a306 100644 Binary files a/install/pialert_2.50.tar and b/install/pialert_2.50.tar differ diff --git a/install/pialert_latest.tar b/install/pialert_latest.tar index e3397330..8742a306 100644 Binary files a/install/pialert_latest.tar and b/install/pialert_latest.tar differ diff --git a/log/report_output.html b/log/report_output.html index 95dbc520..509aba0e 100644 --- a/log/report_output.html +++ b/log/report_output.html @@ -34,8 +34,8 @@ 		- - + +
Puche 2020 Pi.Alert DEV 2.50   /   2020-12-30 Puche 2021 Pi.Alert DEV 2.51   /   2021-01-11 GNU GPLv3
diff --git a/log/report_output.txt b/log/report_output.txt index 27100b09..f0cbd7a9 100644 --- a/log/report_output.txt +++ b/log/report_output.txt @@ -2,7 +2,7 @@ Pi.Alert Report ======================================== - Report Date: 2021-01-01 00:00 + Report Date: 2021-01-11 00:00 Scan Cycle: 1 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