v2.56

BUGFIX #23

back/pialert.conf

@@ -1,6 +1,6 @@
-VERSION           = '2.55'
+VERSION           = '2.56'
 VERSION_YEAR      = '2021'
-VERSION_DATE      = '2021-01-13'
+VERSION_DATE      = '2021-01-15'
 
 DB_PATH           = '/home/pi/pialert/db/pialert.db'
 LOG_PATH          = '/home/pi/pialert/log'

back/pialert.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
-# Pi.Alert v2.55  /  2021-01-13
-# Puche 2020
+# Pi.Alert v2.56  /  2021-01-15
+# Puche 2021
 # GNU GPLv3
 
 
@@ -712,16 +712,39 @@ def create_new_devices ():
 
     # DHCP Leases - Create New Devices
     print_log ('New devices - 6 DHCP Leases Create devices')
-    sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_Vendor,
-                        dev_LastIP, dev_FirstConnection, dev_LastConnection,
+    # BUGFIX #23 - Duplicated MAC in DHCP.Leases
+    # TEST - Force Duplicated MAC
+        # sql.execute ("""INSERT INTO DHCP_Leases VALUES
+        #                 (1610700000, 'TEST1', '10.10.10.1', 'Test 1', '*')""")
+        # sql.execute ("""INSERT INTO DHCP_Leases VALUES
+        #                 (1610700000, 'TEST2', '10.10.10.2', 'Test 2', '*')""")
+    sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_LastIP, 
+                        dev_Vendor, dev_FirstConnection, dev_LastConnection,
                         dev_ScanCycle, dev_AlertEvents, dev_AlertDeviceDown,
                         dev_PresentLastScan)
-                    SELECT DHCP_MAC, DHCP_Name, '(unknown)', DHCP_IP, ?, ?,
-                        1, 1, 0, 1
-                    FROM DHCP_Leases
+                    SELECT DISTINCT DHCP_MAC,
+                        (SELECT DHCP_Name FROM DHCP_Leases AS D2
+                         WHERE D2.DHCP_MAC = D1.DHCP_MAC
+                         ORDER BY DHCP_DateTime DESC LIMIT 1),
+                        (SELECT DHCP_IP FROM DHCP_Leases AS D2
+                         WHERE D2.DHCP_MAC = D1.DHCP_MAC
+                         ORDER BY DHCP_DateTime DESC LIMIT 1),
+                        '(unknown)', ?, ?, 1, 1, 0, 1
+                    FROM DHCP_Leases AS D1
                     WHERE NOT EXISTS (SELECT 1 FROM Devices
                                       WHERE dev_MAC = DHCP_MAC) """,
                     (startTime, startTime) ) 
+
+    # sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_Vendor,
+    #                     dev_LastIP, dev_FirstConnection, dev_LastConnection,
+    #                     dev_ScanCycle, dev_AlertEvents, dev_AlertDeviceDown,
+    #                     dev_PresentLastScan)
+    #                 SELECT DHCP_MAC, DHCP_Name, '(unknown)', DHCP_IP, ?, ?,
+    #                     1, 1, 0, 1
+    #                 FROM DHCP_Leases
+    #                 WHERE NOT EXISTS (SELECT 1 FROM Devices
+    #                                   WHERE dev_MAC = DHCP_MAC) """,
+    #                 (startTime, startTime) ) 
     print_log ('New Devices end')
 
 #-------------------------------------------------------------------------------

docs/INSTALL.md

@@ -76,7 +76,7 @@ Estimated time: 20'
 
 5 - Connect to web admin panel
   - http://192.168.1.x/admin/
-  - (*replace the 192.168.1.x with your Raspberry IP*)
+  - (*replace 192.168.1.x with your Raspberry IP*)
 
 6 - Activate DHCP server
   - Pi-hole -> Settings -> DHCP -> Mark "DHCP server enabled"
@@ -84,7 +84,7 @@ Estimated time: 20'
 7 - Add pi.alert DNS Record
   - Pi-hole -> Local DNS -> DNS Records -> Add new domain /IP
     - pi.alert    192.168.1.x
-    - (*replace the 192.168.1.x with your Raspberry IP*)
+    - (*replace 192.168.1.x with your Raspberry IP*)
 
 8 - Deactivate your current DHCP Server (*Normaly at your router or AP*)
 
@@ -183,14 +183,22 @@ Estimated time: 20'
   (crontab -l 2>/dev/null; cat ~/pialert/back/pialert.cron) | crontab -
 ```
 
-9 - Add DB permissions to the web-server user
+9 - Add permissions to the web-server user
 ```
-  sudo chgrp -R www-data ~/pialert/db
-  chmod -R 770 ~/pialert/db
+  sudo chgrp -R www-data ~/pialert/back ~/pialert/back/pialert.conf ~/pialert/front ~/pialert/db
+  chmod -R 770 ~/pialert/back ~/pialert/back/pialert.conf ~/pialert/front ~/pialert/db
 ```
 
-10 - Use admin panel to configure the devices
-  - http://pi.alert/
+10 - Check DNS record por pi.alert (explained in point 7 of Pi.hole installing)
+   - Add pi.alert DNS Record
+     - Pi-hole -> Local DNS -> DNS Records -> Add new domain /IP
+       - pi.alert    192.168.1.x
+       - (*replace 192.168.1.x with your Raspberry IP*)
+
+11 - Use admin panel to configure the devices
+   - http://pi.alert/
+   - http://192.168.1.x/pialert/
+     - (*replace 192.168.1.x with your Raspberry IP*)
 
 
 ## Device Management

front/php/templates/footer.php

@@ -1,10 +1,28 @@
+
   <!-- Main Footer -->
   <footer class="main-footer">
     <!-- Default to the left -->
-    &copy; 2021 Puche
+
+    <!-- 
+    &copy; 2020 Puche
+    -->
+    <?php
+      $conf_file = '../back/pialert.conf';
+      $conf_data = parse_ini_file($conf_file);
+      echo '<span style="display:inline-block; transform: rotate(180deg)">&copy;</span> '. $conf_data['VERSION_YEAR'] .' Puche';
+    ?>
+
     <!-- To the right -->
     <div class="pull-right no-hidden-xs">
-      Pi.alert&nbsp&nbsp2.55&nbsp&nbsp<small>(2021-01-13)</small>
+
+    <!-- 
+      Pi.alert&nbsp&nbsp2.50&nbsp&nbsp<small>(2019-12-30)</small>
+    -->
+    <?php
+      $conf_file = '../back/pialert.conf';
+      $conf_data = parse_ini_file($conf_file);
+      echo 'Pi.alert&nbsp&nbsp'. $conf_data['VERSION'] .'&nbsp&nbsp<small>('. $conf_data['VERSION_DATE'] .')</small>';
+    ?>
     </div>
   </footer>
 

front/php/templates/header.php

@@ -91,15 +91,20 @@
               <li class="user-body">
                 <div class="row">
                   <div class="col-xs-4 text-center">
-                    <a href="https://github.com/pucherot/Pi.Alert">GitHub</a>
                   </div>
                   <div class="col-xs-4 text-center">
-                    <a href="https://github.com/pucherot/Pi.Alert">Pi.Alert</a>
-                    <!-- <a href="#">Website</a> -->
+                    <a href="https://github.com/pucherot/Pi.Alert">GitHub</a>
                   </div>
+                  <!--
+                  <div class="col-xs-4 text-center">
+                    <a href="https://github.com/pucherot/Pi.Alert">Pi.Alert</a>
+                  </div>
+                  -->
+                  <!--
                   <div class="col-xs-4 text-center">
                     <a href="#">Updates</a>
                   </div>
+                  -->
                 </div>
                 <!-- /.row -->
               </li>

install/create_tar.sh

@@ -1,16 +1,18 @@
 #
-PIALERT_VERSION=2.55
+PIALERT_VERSION=`awk '$1=="VERSION" { print $3 }' ../back/pialert.conf | tr -d \'`
 PIALERT_DEV_PATH=/media/WD_4TB/dev
 
 cd $PIALERT_DEV_PATH
+pwd
 
+ls -l pialert/install/pialert*.tar
 tar tvf pialert/install/pialert_latest.tar | wc -l
 rm pialert/install/pialert_*.tar
 
 tar cvf pialert/install/pialert_$PIALERT_VERSION.tar --exclude="pialert/install" --exclude="pialert/.git" pialert | wc -l
 
-# rm pialert/install/pialert_latest.tar
 ln -s pialert_$PIALERT_VERSION.tar pialert/install/pialert_latest.tar
+ls -l pialert/install/pialert*.tar