From e94f8f89657f834db53355a6cb563dfe69a0d064 Mon Sep 17 00:00:00 2001 From: pucherot Date: Mon, 11 Jan 2021 14:16:22 +0100 Subject: [PATCH] v2.51 Fix Bug #1 --- back/pialert.conf | 6 +++--- back/pialert.py | 17 ++++++++++++----- docs/report_sample_1.html | 6 +++--- docs/report_sample_2.html | 6 +++--- front/php/templates/footer.php | 4 ++-- install/pialert_2.50.tar | Bin 58542080 -> 58542080 bytes install/pialert_latest.tar | Bin 58542080 -> 58542080 bytes log/report_output.html | 4 ++-- log/report_output.txt | 4 ++-- 9 files changed, 27 insertions(+), 20 deletions(-) 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 e33973305b113898a099c2187d914bcff3260306..8742a30628edaee62e18ae7c24bb2baebb1ca15b 100644 GIT binary patch delta 5254 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 delta 5012 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 delta 5012 zcmb{0c~q439>;N?83aT@Z~?(>+yF&jW|$d7L_t9mR227JTyR4{a90GEL~{j7N=qzD ztt>Sxv{cj=lMl&nWeFEAVsKZFalOrLQ;~PHQcT zwQQ;9sEMV9al6FbKgb&5H6$s0VDGekV}~atq+9ffvxL~Kc5A8Cy@`i4+-47tvR0(I zJ3NDIPKT?OEh;*?W=p$+Ep1NMpIh!U>Si0IhHtR1)nbXXSlHx`pGW)dk14&J(yG)i zHKH^=HM0CfN`O(nq9AqE>JpRpa_{OQ?`lJtlv%l{+R9ydC{I;Kd8xXpp7K^cs=o47 zeyV|Ls2Zup%3lRkdRI3o7+3Q@IGlDJ+GTV7^*`(}uJ1OCDx*=p`KHOkZn1XiY`2zm zOAZXK42un1T-&ggWh4apm*#}Hm04l~y~?Tv1%|b-T7qYe&&!F`ZT_+N`(`bcfBQv2 ze4u}2T0&r)apw$VDAO7C6?%q*lvBA>wCbc{RA&{dx~MqS zRdrMGDnWHuJyfDfQax3&>ZN+C6qTy_sJ^P7N>lyS0F|x=szGY78lr}(VQRP4v zYP1@o#;S2DLycDx)I>E&Wva<)ikhmXsp%?9%}_H{w#renRIbWXv(+3mSItxN)dICp zEmDhBzFMLRRH0g`mZ{}xg}O_vR7Gl)TCMI@Yt&k`POVoP)J9dTN>r)3N8PJ7sWNq+ zx?gQpThs&ULA6ztt8MBb^|0Em9#M~~9criAr5;m{t0&ZM^`v@A?NNKxKJ~P!Q2W(0 z>RDB(4yc3bIrY3cqzO1wl zx~zUsSJaQ{C-t+ss(w+ws%z>u^}D*RZm65;mb$&hXNa*ufeFmu2DQN*Jirs`fEUz- zdf*K{P#=834;ny2XatSH9|E8W1VRurg=WwkT0l#%Kr3hsZJ;f*gJ1}OP-qVwAPhP} zI7C1sSiuH%hyn*V!3ELK31Xl##6lN{gRamG;voULLk~!VB+lA= z2`Aw#cpKh)I42Kag5=Oyj7z1Nr9Avh9gh~N8uP8hZo>QcnMyH6YvVW3a`QI z@CLjIC*du48{UC;;XQaCK7eZY5I%yB;S=~2PQhvT49>vk@CAGcXW<;2hYN5KzJg2e zHGBi#!gugJT!tUu3j7E^!Ow6Net}=%8vF*o!*#d;H{llCHtF?e*1`Z2n86KdgFASD zC)5Eis0;PL8+@QX_<|oafQHZr8iPLsKobarAZQBBpgFXFmSBNa&>Gr6TWANt5CWml z9y&l6bcAq-fJm@{4eSsF4se1CqM;MSKxc@BE)WM@p&P_Q0(6HSkO)c86Oy49^oA5j zg+9<1`av4>hXIfd17Q#hhMK1}l+`d84kKVBjDpcH2FAiT$bj)M0VcvE$b`u-1*XC@ zm=0Mm17<=t - - + +
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