Merge branch 'fix-merge-5' into pr/60

.env

@@ -0,0 +1,10 @@
+#GLOBAL
+APP_DATA_LOCATION=/path/to/docker_appdata
+APP_CONFIG_LOCATION=/path/to/docker_config
+LOGS_LOCATION=/path/to/docker_logs
+TZ=Europe/Paris
+HOST_USER_ID=1000
+HOST_USER_GID=1000
+PORT=20211
+
+

.github/workflows/docker.yml

@@ -0,0 +1,64 @@
+---
+name: docker
+
+on:
+  schedule:
+    - cron: 0 14 * * 0    # every sunday at 14:00
+  push:
+    branches:
+      - '**'
+    tags:
+      - '*.*.*'
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Set up dynamic build ARGs
+        id: getargs
+        run: echo "::set-output name=version::$(cat ./stable/VERSION)"
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            jokobsk/pi.alert_dev
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=raw,value=latest
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -0,0 +1,39 @@
+FROM debian:buster-slim
+
+# default UID and GID
+ENV USER=pi USER_ID=1000 USER_GID=1000 TZ=Europe/London PORT=20211
+
+# Todo, figure out why using a workdir instead of full paths don't work
+# Todo, do we still need all these packages? I can already see sudo which isn't needed
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo lighttpd php php-cgi php-fpm php-sqlite3 sqlite3 dnsutils net-tools python iproute2 nmap python-pip zip -y \
+    && pip install requests  \
+    && apt-get clean autoclean \
+    && apt-get autoremove \
+    && rm -rf /var/lib/apt/lists/* \
+    && ln -s /home/pi/pialert/install/index.html /var/www/html/index.html \
+    && ln -s /home/pi/pialert/front /var/www/html/pialert \
+    && lighttpd-enable-mod fastcgi-php 
+ 
+   
+# now creating user
+RUN groupadd --gid "${USER_GID}" "${USER}" && \
+    useradd \
+      --uid ${USER_ID} \
+      --gid ${USER_GID} \
+      --create-home \
+      --shell /bin/bash \
+      ${USER}
+
+COPY . /home/pi/pialert
+
+# Pi.Alert 
+RUN python /home/pi/pialert/back/pialert.py update_vendors \    
+    && sed -ie 's/= 80/= '${PORT}'/g' /etc/lighttpd/lighttpd.conf \
+    && (crontab -l 2>/dev/null; cat /home/pi/pialert/install/pialert.cron) | crontab -
+
+# it's easy for permissions set in Git to be overridden, so doing it manually
+RUN chmod -R a+rxw /home/pi/pialert/
+
+CMD ["/home/pi/pialert/dockerfiles/start.sh"]

README.md

@@ -10,8 +10,20 @@ unknown devices. It also warns if a "always connected" devices disconnects.
 *(Apologies for my English and my limited knowledge of Python, php and
 JavaScript)*
 
+# Docker image 🐳
+[![Docker](https://github.com/jokob-sk/Pi.Alert/actions/workflows/docker.yml/badge.svg)](https://github.com/jokob-sk/Pi.Alert/actions/workflows/docker.yml)
+[![Docker Image Size](https://img.shields.io/docker/image-size/jokobsk/pi.alert?logo=Docker)](https://hub.docker.com/r/jokobsk/pi.alert)
+  <a href="https://hub.docker.com/r/jokobsk/pi.alert">
+    <img src="https://img.shields.io/docker/pulls/jokobsk/pi.alert?logo=docker&color=0aa8d2&logoColor=fff" alt="Docker Pulls">
+  </a>
+
+🥇 Pi.Alert credit goes to [pucherot/Pi.Alert](https://github.com/pucherot/Pi.Alert). <br/>
+🐳 Docker Image: [jokobsk/Pi.Alert](https://registry.hub.docker.com/r/jokobsk/pi.alert). <br/>
+📄 [Dockerfile](https://github.com/jokob-sk/Pi.Alert/blob/main/Dockerfile) <br/>
+📚 [Dockerfile instructions](https://github.com/jokob-sk/Pi.Alert/blob/main//dockerfiles/README.md).
+
 ![Main screen dark][main_dark]
-optional Darkmode within this fork
+Dark mode (and Device presence over time) within this fork courtesy of [leiweibau](https://github.com/leiweibau/Pi.Alert)
 
 ## Modifications within this Fork
 ... will follow soon
@@ -53,7 +65,9 @@ In charge of:
   | -------------------- | -------------------- |
 
 ### Front
-There is a configurable login to prevent unauthorized use. The default password is "123456"
+There is a configurable login to prevent unauthorized use. 
+
+> * Set `PIALERT_WEB_PROTECTION = True` in `pialert.conf` to enable
 
 A web frontend that allows:
   - Manage the devices inventory and the characteristics
@@ -67,7 +81,7 @@ A web frontend that allows:
     - Down alerts
     - IP's
     - Manual Nmap scans
-    - Optional speedtest for Device "Internet" in the details view
+    - Optional speedtest for Device "Internet"
     - ...
 
   | ![Screen 1][screen1] | ![Screen 2][screen2] |
@@ -91,9 +105,18 @@ With the work of [jokob-sk/Pi.Alert](https://github.com/jokob-sk/Pi.Alert) and o
 Initially designed to run on a Raspberry Pi, probably it can run on many other
 Linux distributions.
 
-- One-step Automated Install (original):
+> ⚠ Please note, this [fork (jokob-sk)](https://github.com/jokob-sk/Pi.Alert) is only tested via the [docker install method](dockerfiles/README.md)
+
+Instructions for [pucherot's original code](https://github.com/pucherot/Pi.Alert/)
+
+- One-step Automated Install:
   #### `curl -sSL https://github.com/pucherot/Pi.Alert/raw/main/install/pialert_install.sh | bash`
   
+Instructions for [leiweibau's fork](https://github.com/leiweibau/Pi.Alert/)
+  
+- One-step Automated Install:
+  #### `curl -sSL https://github.com/leiweibau/Pi.Alert/raw/main/install/pialert_install.sh | bash`
+  
 - One-step Automated Install without Webserver if another Webserver is already installed. (not recommended):
   #### `curl -sSL https://github.com/leiweibau/Pi.Alert/raw/main/install/pialert_install_no_webserver.sh | bash`
 
@@ -102,9 +125,12 @@ Linux distributions.
 
 # Update
 <!--- --------------------------------------------------------------------- --->
-- One-step Automated Update (original):
+- One-step Automated Update (pucherot):
   #### `curl -sSL https://github.com/pucherot/Pi.Alert/raw/main/install/pialert_update.sh | bash`
   
+- One-step Automated Update (leiweibau):
+  #### `curl -sSL https://github.com/leiweibau/Pi.Alert/raw/main/install/pialert_update.sh | bash`
+
 # Uninstall process
 <!--- --------------------------------------------------------------------- --->
   - [Unistall process](docs/UNINSTALL.md)
@@ -162,6 +188,7 @@ Linux distributions.
    - [Final-Hawk](https://github.com/Final-Hawk): Help with NTFY, styling and other fixes
    - [TeroRERO](https://github.com/terorero): Spanish translation
    - [jokob-sk](https://github.com/jokob-sk/Pi.Alert): DB Maintenance tools
+   - Please see the [Git commit history](https://github.com/jokob-sk/Pi.Alert/commits/main) for a full list of people and their contributions to the project
 
 <!--- --------------------------------------------------------------------- --->
 [main]:    ./docs/img/1_devices.jpg           "Main screen"

back/pialert.py

@@ -75,6 +75,9 @@ def main ():
         return
     cycle = str(sys.argv[1])
 
+    ## Upgrade DB if needed
+    upgradeDB()
+
     ## Main Commands
     if cycle == 'internet_IP':
         res = check_internet_IP()
@@ -353,15 +356,12 @@ def scan_network ():
 
     # ScanCycle data        
     cycle_interval  = scanCycle_data['cic_EveryXmin']
-    arpscan_retries = scanCycle_data['cic_arpscanCycles']
-    # TESTING - Fast scan
-        # arpscan_retries = 1
     
     # arp-scan command
     print ('\nScanning...')
     print ('    arp-scan Method...')
     print_log ('arp-scan starts...')
-    arpscan_devices = execute_arpscan (arpscan_retries)
+    arpscan_devices = execute_arpscan ()
     print_log ('arp-scan ends')
     # DEBUG - print number of rows updated
         # print (arpscan_devices)
@@ -447,26 +447,12 @@ def query_ScanCycle_Data (pOpenCloseDB = False):
     return sqlRow
 
 #-------------------------------------------------------------------------------
-def execute_arpscan (pRetries):
+def execute_arpscan ():
- 
     # #101 - arp-scan subnet configuration
     # Prepare command arguments
     subnets = SCAN_SUBNETS.strip().split()
-
+    # Retry is 6 to avoid false offline devices
-    # arp-scan for larger Networks like /16
+    arpscan_args = ['sudo', 'arp-scan', '--ignoredups', '--retry=6'] + subnets
-    # otherwise the system starts multiple processes. the 15min cronjob isn't necessary.
-    # the scan is about 4min on a /16 network
-    arpscan_args = ['sudo', 'arp-scan', '--ignoredups', '--bandwidth=512k', '--retry=3', SCAN_SUBNETS]
-
-    # Default arp-scan
-    # arpscan_args = ['sudo', 'arp-scan', SCAN_SUBNETS, '--ignoredups', '--retry=' + str(pRetries)]
-    # print (arpscan_args)
-
-    # TESTING - Fast Scan
-        # arpscan_args = ['sudo', 'arp-scan', '--localnet', '--ignoredups', '--retry=1']
-
-    # DEBUG - arp-scan command
-        # print (" ".join (arpscan_args))
    
     # Execute command
     arpscan_output = subprocess.check_output (arpscan_args, universal_newlines=True)
@@ -481,9 +467,6 @@ def execute_arpscan (pRetries):
     devices_list = [device.groupdict()
         for device in re.finditer (re_pattern, arpscan_output)]
 
-    # Bugfix #5 - Delete duplicated MAC's with different IP's
-    # TEST - Force duplicated device
-        # devices_list.append(devices_list[0])
     # Delete duplicate MAC
     unique_mac = [] 
     unique_devices = [] 
@@ -701,14 +684,17 @@ def print_scan_stats ():
     sql.execute("SELECT * FROM Devices")
     History_All = sql.fetchall()
     History_All_Devices  = len(History_All)
+
     sql.execute("SELECT * FROM Devices WHERE dev_Archived = 1")
     History_Archived = sql.fetchall()
     History_Archived_Devices  = len(History_Archived)
-    sql.execute("SELECT * FROM CurrentScan")
+
+    sql.execute("""SELECT * FROM CurrentScan WHERE cur_ScanCycle = ? """, (cycle,))
     History_Online = sql.fetchall()
     History_Online_Devices  = len(History_Online)
     History_Offline_Devices = History_All_Devices - History_Archived_Devices - History_Online_Devices
-    sql.execute ("INSERT INTO Online_History (Scan_Date, Online_Devices, Down_Devices, All_Devices, Archived_Devices ) "+
+    
+    sql.execute ("INSERT INTO Online_History (Scan_Date, Online_Devices, Down_Devices, All_Devices, Archived_Devices) "+
                  "VALUES ( ?, ?, ?, ?, ?)", (startTime, History_Online_Devices, History_Offline_Devices, History_All_Devices, History_Archived_Devices ) )
 
 #-------------------------------------------------------------------------------
@@ -725,6 +711,16 @@ def create_new_devices ():
                                       WHERE dev_MAC = cur_MAC) """,
                     (startTime, cycle) ) 
 
+    print_log ('New devices - Insert Connection into session table')
+    sql.execute ("""INSERT INTO Sessions (ses_MAC, ses_IP, ses_EventTypeConnection, ses_DateTimeConnection,
+                        ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_StillConnected, ses_AdditionalInfo)
+                    SELECT cur_MAC, cur_IP,'Connected',?, NULL , NULL ,1, cur_Vendor
+                    FROM CurrentScan 
+                    WHERE cur_ScanCycle = ? 
+                      AND NOT EXISTS (SELECT 1 FROM Sessions
+                                      WHERE ses_MAC = cur_MAC) """,
+                    (startTime, cycle) ) 
+                    
     # arpscan - Create new devices
     print_log ('New devices - 2 Create devices')
     sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_Vendor,
@@ -952,17 +948,10 @@ def update_devices_data_from_scan ():
     sql.executemany ("UPDATE Devices SET dev_Vendor = ? WHERE dev_MAC = ? ",
         recordsToUpdate )
 
-    # New Apple devices -> Cycle 15
-    print_log ('Update devices - 6 Cycle for Apple devices')
-    sql.execute ("""UPDATE Devices SET dev_ScanCycle = 1
-                    WHERE dev_FirstConnection = ?
-                      AND UPPER(dev_Vendor) LIKE '%APPLE%' """,
-                (startTime,) )
-
     print_log ('Update devices end')
 
 #-------------------------------------------------------------------------------
-# Feature #43 - Resoltion name for unknown devices
+# Feature #43 - Resolve name for unknown devices
 def update_devices_names ():
     # Initialize variables
     recordsToUpdate = []
@@ -1185,20 +1174,21 @@ def skip_repeated_notifications ():
 def email_reporting ():
     global mail_text
     global mail_html
-    
     # Reporting section
     print ('\nReporting...')
     openDB()
 
     # Disable reporting on events for devices where reporting is disabled based on the MAC address
     sql.execute ("""UPDATE Events SET eve_PendingAlertEmail = 0
-                    WHERE eve_PendingAlertEmail = 1 AND eve_MAC IN
+                    WHERE eve_PendingAlertEmail = 1 AND eve_EventType != 'Device Down' AND eve_MAC IN
                         (
                             SELECT dev_MAC FROM Devices WHERE dev_AlertEvents = 0 
 						)""")
-
+    sql.execute ("""UPDATE Events SET eve_PendingAlertEmail = 0
-    # Open text Template
+                    WHERE eve_PendingAlertEmail = 1 AND eve_EventType = 'Device Down' AND eve_MAC IN
-
+                        (
+                            SELECT dev_MAC FROM Devices WHERE dev_AlertDeviceDown = 0 
+						)""")
 
     # Open text Template
     template_file = open(PIALERT_BACK_PATH + '/report_template.txt', 'r') 
@@ -1245,16 +1235,18 @@ def email_reporting ():
                     WHERE eve_PendingAlertEmail = 1 AND eve_MAC = 'Internet'
                     ORDER BY eve_DateTime""")
 
+    
     for eventAlert in sql :
         mail_section_Internet = True
         mail_text_Internet += text_line_template.format (
-            eventAlert['eve_EventType'], eventAlert['eve_DateTime'],
+            'Event:', eventAlert['eve_EventType'], 'Time:', eventAlert['eve_DateTime'],
-            eventAlert['eve_IP'], eventAlert['eve_AdditionalInfo'])
+            'IP:', eventAlert['eve_IP'], 'More Info:', eventAlert['eve_AdditionalInfo'])
         mail_html_Internet += html_line_template.format (
             REPORT_DEVICE_URL, eventAlert['eve_MAC'],
             eventAlert['eve_EventType'], eventAlert['eve_DateTime'],
             eventAlert['eve_IP'], eventAlert['eve_AdditionalInfo'])
 
+
     format_report_section (mail_section_Internet, 'SECTION_INTERNET',
         'TABLE_INTERNET', mail_text_Internet, mail_html_Internet)
 
@@ -1356,16 +1348,16 @@ def email_reporting ():
             send_email (mail_text, mail_html)
         else :
             print ('    Skip mail...')
-        if REPORT_PUSHSAFER :
-            print ('    Sending report by PUSHSAFER...')
-            send_pushsafer (mail_text)
-        else :
-            print ('    Skip PUSHSAFER...')
         if REPORT_NTFY :
             print ('    Sending report by NTFY...')
             send_ntfy (mail_text)
         else :
             print ('    Skip NTFY...')
+        if REPORT_PUSHSAFER :
+            print ('    Sending report by PUSHSAFER...')
+            send_pushsafer (mail_text)
+        else :
+            print ('    Skip PUSHSAFER...')
     else :
         print ('    No changes to report...')
 
@@ -1385,8 +1377,16 @@ def email_reporting ():
     # Commit changes
     sql_connection.commit()
     closeDB()
-
 #-------------------------------------------------------------------------------
+def send_ntfy (_Text):
+    requests.post("https://ntfy.sh/{}".format(NTFY_TOPIC),
+    data=_Text,
+    headers={
+        "Title": "Pi.Alert Notification",
+        "Actions": "view, Open Dashboard, "+ REPORT_DASHBOARD_URL,
+        "Priority": "urgent",
+        "Tags": "warning"
+    })
 
 def send_pushsafer (_Text):
     url = 'https://www.pushsafer.com/api'
@@ -1402,23 +1402,7 @@ def send_pushsafer (_Text):
         "ut" : 'Open Pi.Alert',
         "k" : PUSHSAFER_TOKEN,
         }
-    
     requests.post(url, data=post_fields)
-    #request = Request(url, urlencode(post_fields).encode())
-    #json = urlopen(request).read().decode()
-    # print(json)
-
-#-------------------------------------------------------------------------------
-
-def send_ntfy (_Text):
-    requests.post("https://ntfy.sh/{}".format(NTFY_TOPIC),
-    data=_Text,
-    headers={
-        "Title": "Pi.Alert Notification",
-        "Click": REPORT_DASHBOARD_URL,
-        "Priority": "urgent",
-        "Tags": "warning"
-    })
    
 #-------------------------------------------------------------------------------
 def format_report_section (pActive, pSection, pTable, pText, pHTML):
@@ -1510,6 +1494,46 @@ def SafeParseGlobalBool(boolVariable):
 #===============================================================================
 # DB
 #===============================================================================
+def upgradeDB (): 
+
+    openDB()
+
+    # indicates, if Online_History table is available 
+    onlineHistoryAvailable = sql.execute("""
+    SELECT name FROM sqlite_master WHERE type='table'
+    AND name='Online_History'; 
+    """).fetchall() != []
+
+    # Check if it is incompatible (Check if table has all required columns)
+    isIncompatible = False
+    
+    if onlineHistoryAvailable :
+      isIncompatible = sql.execute ("""
+      SELECT COUNT(*) AS CNTREC FROM pragma_table_info('Online_History') WHERE name='Archived_Devices'
+      """).fetchone()[0] == 0
+    
+    # Drop table if available, but incompatible
+    if onlineHistoryAvailable and isIncompatible:
+      print_log ('Table is incompatible, Dropping the Online_History table)')
+      sql.execute("DROP TABLE Online_History;")
+      onlineHistoryAvailable = False
+
+    if onlineHistoryAvailable == False :
+      sql.execute("""      
+      CREATE TABLE "Online_History" (
+        "Index"	INTEGER,
+        "Scan_Date"	TEXT,
+        "Online_Devices"	INTEGER,
+        "Down_Devices"	INTEGER,
+        "All_Devices"	INTEGER,
+        "Archived_Devices" INTEGER,
+        PRIMARY KEY("Index" AUTOINCREMENT)
+      );      
+      """)
+
+
+#-------------------------------------------------------------------------------
+
 def openDB ():
     global sql_connection
     global sql

back/report_template.txt

@@ -1,11 +1,6 @@
 Report Date: <REPORT_DATE>
 Server:      <SERVER_NAME>
-
+<SECTION_NEW_DEVICES>
-<SECTION_INTERNET>
-Internet
-----------------------
-<TABLE_INTERNET>
-</SECTION_INTERNET><SECTION_NEW_DEVICES>
 New Devices
 ----------------------
 <TABLE_NEW_DEVICES>
@@ -17,4 +12,8 @@ Devices Down
 Events
 ----------------------
 <TABLE_EVENTS>
-</SECTION_EVENTS>
+</SECTION_EVENTS><SECTION_INTERNET>
+Internet
+----------------------
+<TABLE_INTERNET>
+</SECTION_INTERNET>

config/pialert.conf

@@ -7,46 +7,51 @@
 #  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
 #-------------------------------------------------------------------------------
 
-PIALERT_PATH      = '/home/pi/pialert'
+PIALERT_PATH            = '/home/pi/pialert'
-DB_PATH           = PIALERT_PATH + '/db/pialert.db'
+DB_PATH                 = PIALERT_PATH + '/db/pialert.db'
-LOG_PATH          = PIALERT_PATH + '/log'
+LOG_PATH                = PIALERT_PATH + '/log'
-VENDORS_DB        = '/usr/share/arp-scan/ieee-oui.txt'
+VENDORS_DB              = '/usr/share/arp-scan/ieee-oui.txt'
-PRINT_LOG         = False
+PRINT_LOG               = False
-TIMEZONE          = 'Europe/Berlin'
+TIMEZONE                = 'Europe/Berlin'
-PIALERT_WEB_PROTECTION = False
+PIALERT_WEB_PROTECTION  = False
-PIALERT_WEB_PASSWORD = '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92'
+PIALERT_WEB_PASSWORD    = '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92'
 
-SMTP_SERVER       = 'smtp.gmail.com'
+# EMAIL settings
-SMTP_PORT         = 587
+SMTP_SERVER             = 'smtp.gmail.com'
-SMTP_USER         = 'user@gmail.com'
+SMTP_PORT               = 587
-SMTP_PASS         = 'password'
+SMTP_USER               = 'user@gmail.com'
-SMTP_SKIP_TLS	  = False
+SMTP_PASS               = 'password'
-SMTP_SKIP_LOGIN	  = False
+SMTP_SKIP_TLS	          = False
+SMTP_SKIP_LOGIN	        = False
 
-REPORT_MAIL       = False
+REPORT_MAIL             = False
-REPORT_FROM       = 'Pi.Alert <' + SMTP_USER +'>'
+REPORT_FROM             = 'Pi.Alert <' + SMTP_USER +'>'
-REPORT_TO         = 'user@gmail.com'
+REPORT_TO               = 'user@gmail.com'
-REPORT_DEVICE_URL = 'http://pi.alert/deviceDetails.php?mac='
+REPORT_DEVICE_URL       = 'http://pi.alert/deviceDetails.php?mac='
-REPORT_DASHBOARD_URL = 'http://pi.alert/'
+REPORT_DASHBOARD_URL    = 'http://pi.alert/'
 
-REPORT_PUSHSAFER  = False
+# NTFY (https://ntfy.sh/) settings
-PUSHSAFER_TOKEN   = 'ApiKey'
+REPORT_NTFY             = False
+NTFY_TOPIC              = 'replace_my_secure_topicname_91h889f28'
+REPORT_DASHBOARD_URL    = 'http://pi.alert/'
 
-REPORT_NTFY       = False
+# PUSHSAFER (https://www.pushsafer.com/) settings
-NTFY_TOPIC        = 'replace_my_secure_topicname_91h889f28'
+REPORT_PUSHSAFER        = False
+PUSHSAFER_TOKEN         = 'ApiKey'
 
-# QUERY_MYIP_SERVER = 'https://diagnostic.opendns.com/myip'
+# QUERY_MYIP_SERVER       = 'https://diagnostic.opendns.com/myip'
-QUERY_MYIP_SERVER = 'http://ipv4.icanhazip.com'
+QUERY_MYIP_SERVER       = 'http://ipv4.icanhazip.com'
-DDNS_ACTIVE       = False
+DDNS_ACTIVE             = False
-DDNS_DOMAIN       = 'your_domain.freeddns.org'
+DDNS_DOMAIN             = 'your_domain.freeddns.org'
-DDNS_USER         = 'dynu_user'
+DDNS_USER               = 'dynu_user'
-DDNS_PASSWORD     = 'A0000000B0000000C0000000D0000000'
+DDNS_PASSWORD           = 'A0000000B0000000C0000000D0000000'
-DDNS_UPDATE_URL   = 'https://api.dynu.com/nic/update?'
+DDNS_UPDATE_URL         = 'https://api.dynu.com/nic/update?'
 
-PIHOLE_ACTIVE     = False
+# PIHOLE settings
-PIHOLE_DB         = '/etc/pihole/pihole-FTL.db'
+PIHOLE_ACTIVE           = False
-DHCP_ACTIVE       = False
+PIHOLE_DB               = '/etc/pihole/pihole-FTL.db'
-DHCP_LEASES       = '/etc/pihole/dhcp.leases'
+DHCP_ACTIVE             = False
+DHCP_LEASES             = '/etc/pihole/dhcp.leases'
 
 # arp-scan options & samples
 #
@@ -59,4 +64,4 @@ DHCP_LEASES       = '/etc/pihole/dhcp.leases'
 # Scan using interface eth0
 # SCAN_SUBNETS    = '--localnet --interface=eth0'
 
-SCAN_SUBNETS      = '--localnet'
+SCAN_SUBNETS            = '--localnet'

config/version.conf

@@ -1,3 +1,3 @@
 VERSION           = '3.6_leiweibau'
 VERSION_YEAR      = '2022'
-VERSION_DATE      = '2022-07-27'
+VERSION_DATE      = '2022-07-07'

docker-compose.yml

@@ -0,0 +1,16 @@
+version: "3"
+services:
+  pialert:
+    build: .
+    container_name: pialert
+    network_mode: "host"
+    restart: always
+    volumes:
+      - ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config
+      - ${APP_DATA_LOCATION}/pialert/db/pialert.db:/home/pi/pialert/db/pialert.db
+      - ${LOGS_LOCATION}/tmp:/home/pi/pialert/log
+    environment:
+      - TZ=${TZ}
+      - PORT=${PORT}
+      - HOST_USER_ID=${HOST_USER_ID}
+      - HOST_USER_GID=${HOST_USER_GID}

dockerfiles/LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

dockerfiles/README.md

@@ -0,0 +1,114 @@
+[![Docker](https://github.com/jokob-sk/Pi.Alert/actions/workflows/docker.yml/badge.svg)](https://github.com/jokob-sk/Pi.Alert/actions/workflows/docker.yml)
+[![Docker Image Size](https://img.shields.io/docker/image-size/jokobsk/pi.alert?logo=Docker)](https://hub.docker.com/r/jokobsk/pi.alert)
+  <a href="https://hub.docker.com/r/jokobsk/pi.alert">
+    <img src="https://img.shields.io/docker/pulls/jokobsk/pi.alert?logo=docker&color=0aa8d2&logoColor=fff" alt="Docker Pulls">
+  </a>
+
+# 🐳 A docker image for Pi.Alert 
+
+🥇 Pi.Alert credit goes to [pucherot/Pi.Alert](https://github.com/pucherot/Pi.Alert). <br/>
+🐳 Docker Image: [jokobsk/Pi.Alert](https://registry.hub.docker.com/r/jokobsk/pi.alert). <br/>
+📄 [Dockerfile](https://github.com/jokob-sk/Pi.Alert/blob/main/Dockerfile) <br/>
+📚 [Dockerfile instructions](https://github.com/jokob-sk/Pi.Alert/blob/main//dockerfiles/README.md).
+
+Big thanks to <a href="https://github.com/Macleykun">@Macleykun</a> for help and tips&tricks for Dockerfile(s):
+
+<a href="https://github.com/Macleykun">
+  <img src="https://avatars.githubusercontent.com/u/26381427?size=50"> 
+</a>
+
+## ℹ Usage 
+
+pialert.conf
+ - Everytime you rebuilt the container with a new image check if new settings have been added in [pialert.conf](https://github.com/jokob-sk/Pi.Alert/blob/main/config/pialert.conf).
+
+Network
+ - You will have to run the container on the host network, e.g: `sudo docker run --rm --net=host jokobsk/pi.alert`
+
+Default Port 
+ - The app is accessible on the port `:20211`.
+
+> Please note - the cronjob is executed every 3 and 5 minutes so wait that long for all of the scans to run.
+
+## 💾 Setup and Backups
+
+1. (**required**) Download `pialert.conf` and `version.conf` from [here](https://github.com/jokob-sk/Pi.Alert/tree/main/config).     
+2. (**required**) In `pialert.conf` specify your network adapter (will probably be `eth0` or `eth1`) and the network filter (which **significantly** speeds up the scan process), e.g. if your DHCP server assigns IPs in the 192.168.1.0 to 192.168.1.255 range specify it the following way: 
+   * `SCAN_SUBNETS    = '192.168.1.0/24 --interface=eth0'`
+3. (**required**) Use your configuration by: 
+   * Mapping the container folder `/home/pi/pialert/config` to a persistent folder containing `pialert.conf` and `version.conf`,     
+   * ... or by mapping the files individually `pialert.conf:/home/pi/pialert/config/pialert.conf` and `version.conf:/home/pi/pialert/config/version.conf` 
+4. Set the `TZ` environment variable to your current time zone (e.g.`Europe/Paris`). Find your time zone [here](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
+5. Database backup
+   * The DB is stored under `/home/pi/pialert/db/pialert.db`. Map this file to a persistent location (see [Examples](https://github.com/jokob-sk/Pi.Alert/tree/main/dockerfiles#page_facing_up-examples) for details). If facing issues (AJAX errors, can't write to DB, etc, make sure permissions are set correctly, alternatively check the logs under `/home/pi/pialert/log`)
+6. The container supports mapping to local User nad Group IDs. Specify the enviroment variables `HOST_USER_ID` and `HOST_USER_GID` if needed.
+7. You can override the port by specifying the `PORT` env variable.
+
+Config examples can be found below.
+
+## 📄 Examples
+
+### Example 1
+
+`docker-compose.yml` 
+
+```yaml
+version: "3"
+services:
+  pialert:
+    container_name: pialert
+    image: "jokobsk/pi.alert:latest"      
+    network_mode: "host"        
+    restart: always
+    volumes:
+      - ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config
+      - ${APP_DATA_LOCATION}/pialert/db/pialert.db:/home/pi/pialert/db/pialert.db
+      - ${LOGS_LOCATION}/tmp:/home/pi/pialert/log
+    environment:
+      - TZ=${TZ}
+      - PORT=${PORT}
+      - HOST_USER_ID=${HOST_USER_ID}
+      - HOST_USER_GID=${HOST_USER_GID}
+```
+
+`.env` file
+
+```yaml
+#GLOBAL
+APP_DATA_LOCATION=/path/to/docker_appdata
+APP_CONFIG_LOCATION=/path/to/docker_config
+LOGS_LOCATION=/path/to/docker_logs
+TZ=Europe/Paris
+HOST_USER_ID=1000
+HOST_USER_GID=1000
+PORT=20211
+```
+
+To run the container execute: `sudo docker-compose --env-file /path/to/.env up`
+
+### Example 2
+
+Courtesy of [pbek](https://github.com/pbek). The volume `pialert_db` is used by the db directory. The two config files are mounted directly from a local folder to their places in the config folder. You can backup the `docker-compose.yaml` folder and the docker volumes folder.
+
+```yaml
+  pialert:
+    image: jokobsk/pi.alert
+    ports:
+      - "80:20211/tcp"
+    environment:
+      - TZ=Europe/Vienna
+    networks:
+      local:
+        ipv4_address: 192.168.1.2
+    restart: unless-stopped
+    volumes:
+      - pialert_db:/home/pi/pialert/db
+      - ./pialert/pialert.conf:/home/pi/pialert/config/pialert.conf
+      - ./pialert/version.conf:/home/pi/pialert/config/version.conf
+```
+
+## ☕ Support 
+
+> Disclaimer: This is my second container and I might have used unconventional hacks so if anyone is more experienced, feel free to fork/create pull requests. Also, please only donate if you don't have any debt yourself. Support yourself first, then others.
+
+<a href="https://www.buymeacoffee.com/jokobsk" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 117px !important;" width="150px" ></a>

dockerfiles/start.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+/home/pi/pialert/dockerfiles/user-mapping.sh
+
+# if custom variables not set we do not need to do anything
+if [ -n "${TZ}" ]; then  
+  sed -ie "s|Europe/Berlin|${TZ}|g" /home/pi/pialert/install/pialert.cron   
+  sed -ie "s|Europe/Berlin|${TZ}|g" /home/pi/pialert/config/pialert.conf   
+  crontab < /home/pi/pialert/install/pialert.cron
+fi
+if [ -n "${PORT}" ]; then  
+  sed -ie 's/= 20211/= '${PORT}'/g' /etc/lighttpd/lighttpd.conf 
+fi
+
+/etc/init.d/lighttpd start
+cron -f

dockerfiles/user-mapping.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [ -z "${USER}" ]; then
+  echo "We need USER to be set!"; exit 100
+fi
+
+# if both not set we do not need to do anything
+if [ -z "${HOST_USER_ID}" -a -z "${HOST_USER_GID}" ]; then
+    echo "Nothing to do here." ; exit 0
+fi
+
+# reset user_?id to either new id or if empty old (still one of above
+# might not be set)
+USER_ID=${HOST_USER_ID:=$USER_ID}
+USER_GID=${HOST_USER_GID:=$USER_GID}
+
+LINE=$(grep -F "${USER}" /etc/passwd)
+# replace all ':' with a space and create array
+array=( ${LINE//:/ } )
+
+# home is 5th element
+USER_HOME=${array[4]}
+
+sed -i -e "s/^${USER}:\([^:]*\):[0-9]*:[0-9]*/${USER}:\1:${USER_ID}:${USER_GID}/"  /etc/passwd
+sed -i -e "s/^${USER}:\([^:]*\):[0-9]*/${USER}:\1:${USER_GID}/"  /etc/group
+
+chown -R ${USER_ID}:${USER_GID} ${USER_HOME}
+
+exec su - "${USER}"

front/css/dark-patch.css

@@ -594,7 +594,42 @@ input[type="password"]::-webkit-caps-lock-indicator {
 }
 
 /*** Additional fixes For Pi.Alert UI ***/
-
+.small-box {
+    border-radius: 10px;
+    border-top: 0px;
+}
+.pa-small-box-aqua .inner {
+  background-color: rgb(45,108,133);
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+.pa-small-box-green .inner {
+  background-color: rgb(31,76,46);
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+.pa-small-box-yellow .inner {
+  background-color: rgb(151,104,37);
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+.pa-small-box-red .inner {
+  background-color: rgb(120,50,38);
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+.pa-small-box-gray .inner {
+  background-color: #777;
+  /* color: rgba(20,20,20,30%); */
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+.pa-small-box-gray .inner h3 {
+  color:  #bbb;
+}
+.text-gray-20 {
+  color: rgba(220,220,220,30%);
+}
 .bg-gray {
   background-color: #888888 !important;
 }
@@ -671,3 +706,20 @@ input[type="password"]::-webkit-caps-lock-indicator {
   color: #bec5cb;
   background-color: #272c30;
 }
+/* Add border radius to bottom of the status boxes*/
+.pa-small-box-footer {
+  border-bottom-left-radius: 10px;
+  border-bottom-right-radius: 10px;
+}
+
+.small-box > .inner h3, .small-box > .inner p {
+  margin-bottom: 0px;
+  margin-left: 0px;
+}
+.small-box:hover .icon {
+  font-size: 3.74em;
+}
+.small-box .icon { 
+  top: 0.01em;
+  font-size: 3.25em;
+}

front/deviceDetails.php

@@ -263,17 +263,29 @@ if ($_REQUEST['mac'] == 'Internet') { $DevDetail_Tap_temp = "Tools"; } else { $D
                           <textarea class="form-control" rows="3" id="txtComments"></textarea>
                         </div>
                       </div>
-
+                      <!-- Network -->
+                      <h4 class="bottom-border-aqua"><?php echo $pia_lang['DevDetail_MainInfo_Network_Title'];?></h4>                    
                       <div class="form-group">
                         <label class="col-sm-6 control-label"><?php echo $pia_lang['DevDetail_MainInfo_Network'];?></label>
                         <div class="col-sm-6">  
-                          <input class="form-control" id="txtInfrastructure" type="text" value="--">
+                          <div class="input-group"> 
+
+                            <input class="form-control" id="txtNetworkNodeMac" type="text" value="--">
+                            <div class="input-group-btn">
+
+                              <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false" id="buttonNetworkNodeMac">
+                                    <span class="fa fa-caret-down"></span></button>
+                              <ul id="dropdownNetworkNodeMac" class="dropdown-menu dropdown-menu-right">
+                              </ul>
+                            </div>
+
+                          </div>
                         </div>
                       </div>
                       <div class="form-group">
                         <label class="col-sm-6 control-label"><?php echo $pia_lang['DevDetail_MainInfo_Network_Port'];?></label>
                         <div class="col-sm-6">
-                          <input class="form-control" id="txtInfrastructurePort" type="text" value="--">
+                          <input class="form-control" id="txtNetworkPort" type="text" value="--">
                         </div>
                       </div>
 
@@ -704,7 +716,6 @@ function main () {
       
             // Read Cookies
             devicesList = getCookie('devicesList');
-            deleteCookie ('devicesList');
             if (devicesList != '') {
                 devicesList = JSON.parse (devicesList);
             } else {
@@ -804,10 +815,11 @@ function initializeiCheck () {
 // -----------------------------------------------------------------------------
 function initializeCombos () {
   // Initialize combos with queries
-  initializeCombo ( $('#dropdownOwner')[0],       'getOwners',       'txtOwner');
+  initializeCombo ( $('#dropdownOwner')[0],                      'getOwners',       'txtOwner');
-  initializeCombo ( $('#dropdownDeviceType')[0],  'getDeviceTypes',  'txtDeviceType');
+  initializeCombo ( $('#dropdownDeviceType')[0],                 'getDeviceTypes',  'txtDeviceType');
-  initializeCombo ( $('#dropdownGroup')[0],       'getGroups',       'txtGroup');
+  initializeCombo ( $('#dropdownGroup')[0],                      'getGroups',       'txtGroup');
-  initializeCombo ( $('#dropdownLocation')[0],    'getLocations',    'txtLocation');
+  initializeCombo ( $('#dropdownLocation')[0],                   'getLocations',    'txtLocation');
+  initializeCombo ( $('#dropdownNetworkNodeMac')[0],             'getNetworkNodes', 'txtNetworkNodeMac');
 
   // Initialize static combos
   initializeComboSkipRepeated ();
@@ -828,10 +840,17 @@ function initializeCombo (HTMLelement, queryAction, txtDataField) {
         order = item['order'];
       }
 
+      id = item['name'];
+      // use explicitly specified id (value) if avaliable
+      if(item['id'])
+      {
+        id = item['id'];
+      }
+
       // add dropdown item
       HTMLelement.innerHTML +=
         '<li><a href="javascript:void(0)" onclick="setTextValue(\''+
-        txtDataField +'\',\''+ item['name'] +'\')">'+ item['name'] + '</a></li>'
+        txtDataField +'\',\''+ id +'\')">'+ item['name'] + '</a></li>'
     });
   });
 }
@@ -1121,8 +1140,8 @@ function getDeviceData (readAllData=false) {
       $('#txtGroup').val               ('--');
       $('#txtLocation').val            ('--');
       $('#txtComments').val            ('--');
-      $('#txtInfrastructure').val      ('--');
+      $('#txtNetworkNodeMac').val      ('--');
-      $('#txtInfrastructurePort').val  ('--');
+      $('#txtNetworkPort').val  ('--');
 
       $('#txtFirstConnection').val     ('--');
       $('#txtLastConnection').val      ('--');
@@ -1193,6 +1212,13 @@ function getDeviceData (readAllData=false) {
 
         mac                                          =deviceData['dev_MAC'];
 
+        // update the mac parameter in the URL, this makes the selected device persistent when the page is reloaded
+        var searchParams = new URLSearchParams(window.location.search);
+        searchParams.set("mac", mac);
+        var newRelativePathQuery = window.location.pathname + '?' + searchParams.toString();
+        history.pushState(null, '', newRelativePathQuery);
+        getSessionsPresenceEvents();
+
         $('#txtMAC').val                             (deviceData['dev_MAC']);
         $('#txtName').val                            (deviceData['dev_Name']);
         $('#txtOwner').val                           (deviceData['dev_Owner']);
@@ -1203,8 +1229,8 @@ function getDeviceData (readAllData=false) {
         $('#txtGroup').val                           (deviceData['dev_Group']);
         $('#txtLocation').val                        (deviceData['dev_Location']);
         $('#txtComments').val                        (deviceData['dev_Comments']);
-        $('#txtInfrastructure').val                  (deviceData['dev_Infrastructure']);
+        $('#txtNetworkNodeMac').val                  (deviceData['dev_Network_Node_MAC']);
-        $('#txtInfrastructurePort').val              (deviceData['dev_Infrastructure_port']);
+        $('#txtNetworkPort').val              (deviceData['dev_Network_Node_port']);
   
         $('#txtFirstConnection').val                 (deviceData['dev_FirstConnection']);
         $('#txtLastConnection').val                  (deviceData['dev_LastConnection']);
@@ -1313,8 +1339,8 @@ function setDeviceData (refreshCallback='') {
     + '&group='          + $('#txtGroup').val()
     + '&location='       + $('#txtLocation').val()
     + '&comments='       + $('#txtComments').val()
-    + '&infrastructure=' + $('#txtInfrastructure').val()
+    + '&networknode='    + $('#txtNetworkNodeMac').val()
-    + '&infrastructureport=' + $('#txtInfrastructurePort').val()
+    + '&networknodeport=' + $('#txtNetworkPort').val()
     + '&staticIP='       + ($('#chkStaticIP')[0].checked * 1)
     + '&scancycle='      + $('#txtScanCycle').val().split(' ')[0]
     + '&alertevents='    + ($('#chkAlertEvents')[0].checked * 1)
@@ -1336,6 +1362,7 @@ function setDeviceData (refreshCallback='') {
 }
 
 
+
 // -----------------------------------------------------------------------------
 function askSkipNotifications () {
   // Check MAC
@@ -1422,13 +1449,16 @@ function deleteDevice () {
 
 // -----------------------------------------------------------------------------
 function getSessionsPresenceEvents () {
+  // Check MAC in url
+  var urlParams = new URLSearchParams(window.location.search);
+  mac = urlParams.get ('mac');
   // Define Sessions datasource and query dada
   $('#tableSessions').DataTable().ajax.url('php/server/events.php?action=getDeviceSessions&mac=' + mac +'&period='+ period).load();
   
   // Define Presence datasource and query data
   $('#calendar').fullCalendar('removeEventSources');
   $('#calendar').fullCalendar('addEventSource',
-    { url: 'php/server/events.php?action=getDevicePresence&mac=' + mac +'&period='+ period });
+  { url: 'php/server/events.php?action=getDevicePresence&mac=' + mac});
 
   // Query events
   getDeviceEvents();

front/devices.php

@@ -114,7 +114,7 @@ if ($_SESSION["login"] != 1)
           <div class="col-md-12">
           <div class="box" id="clients">
               <div class="box-header with-border">
-                <h3 class="box-title"><?php echo $pia_lang['Device_Shortcut_OnlineChart_a'];?>  <span class="maxlogage-interval">12</span> <?php echo $pia_lang['Device_Shortcut_OnlineChart_b'];?></h3>
+                <h3 class="box-title"><?php echo $pia_lang['Device_Shortcut_OnlineChart'];?> </h3>
               </div>
               <div class="box-body">
                 <div class="chart">
@@ -237,6 +237,12 @@ function main () {
 
 // -----------------------------------------------------------------------------
 function initializeDatatable () {
+  // If the device has a small width (mobile) only show name, ip, and status columns. 
+  if (window.screen.width < 400) {
+    var tableColumnShow = [10,11,12,1,2,3,4,5,6,8];
+  } else {
+    var tableColumnShow = [10, 11, 12];
+  };
   var table=
   $('#tableDevices').DataTable({
     'paging'       : true,
@@ -254,7 +260,7 @@ function initializeDatatable () {
     // 'order'       : [[3,'desc'], [0,'asc']],
 
     'columnDefs'   : [
-      {visible:   false,         targets: [10, 11, 12] },
+      {visible:   false,         targets: tableColumnShow },
       {className: 'text-center', targets: [3, 8, 9] },
       {width:     '80px',        targets: [5, 6] },
       {width:     '0px',         targets: 9 },

front/maintenance.php

@@ -338,9 +338,9 @@ if (submit && isset($_POST['langselector_set'])) {
                         </div>
                         <div class="db_tools_table_cell_b"><?php echo $pia_lang['Maintenance_Tool_purgebackup_text'];?></div>
                     </div>
-                </div>
+                 </div>
-        </div>
+          </div>
-    </div>
+      </div>
 </div>
 
 <div style="width: 100%; height: 20px;"></div>

front/network.php

@@ -1,368 +1,343 @@
 <?php
-session_start();
+  session_start();
-if ($_SESSION["login"] != 1)
+  if ($_SESSION["login"] != 1)
   {
       header('Location: /pialert/index.php');
       exit;
   }
 
-require 'php/templates/header.php';
+  require 'php/templates/header.php';
-require 'php/server/db.php';
+  require 'php/server/db.php';
+  require 'php/server/util.php';
 
-$DBFILE = '../db/pialert.db';
+  // online / offline badges HTML snippets 
-OpenDB();
+  define('badge_online', '<div class="badge bg-green text-white" style="width: 60px;">Online</div>');
-// #####################################
+  define('badge_offline', '<div class="badge bg-red text-white" style="width: 60px;">Offline</div>');
-// ## Create Table if not exists'
+  define('circle_online', '<div class="badge bg-green text-white" style="width: 10px; height: 10px; padding:2px; margin-top: -25px;">&nbsp;</div>');
-// #####################################
+  define('circle_offline', '<div class="badge bg-red text-white" style="width: 10px;  height: 10px; padding:2px; margin-top: -25px;">&nbsp;</div>');
-$sql = 'CREATE TABLE IF NOT EXISTS "network_infrastructure" (
-	"device_id"	INTEGER,
-	"net_device_name"	TEXT NOT NULL,
-	"net_device_typ"	TEXT NOT NULL,
-  "net_device_port"  INTEGER,
-	PRIMARY KEY("device_id" AUTOINCREMENT)
-)';
-$result = $db->query($sql);
-// #####################################
-// ## Expand Devices Table
-// #####################################
-$sql = 'ALTER TABLE "Devices" ADD "dev_Infrastructure" INTEGER';
-$result = $db->query($sql);
-$sql = 'ALTER TABLE "Devices" ADD "dev_Infrastructure_port" INTEGER';
-$result = $db->query($sql);
-// #####################################
-// Add New Network Devices
-// #####################################
-if ($_REQUEST['Networkinsert'] == "yes") {
-	if (isset($_REQUEST['NetworkDeviceName']) && isset($_REQUEST['NetworkDeviceTyp']))
-	{
-		$sql = 'INSERT INTO "network_infrastructure" ("net_device_name", "net_device_typ", "net_device_port") VALUES("'.$_REQUEST['NetworkDeviceName'].'", "'.$_REQUEST['NetworkDeviceTyp'].'", "'.$_REQUEST['NetworkDevicePort'].'")';	
-		$result = $db->query($sql);
-	}
-}
-// #####################################
-// Add New Network Devices
-// #####################################
-if ($_REQUEST['Networkedit'] == "yes") {
-  if (isset($_REQUEST['NewNetworkDeviceName']) && isset($_REQUEST['NewNetworkDeviceTyp']))
-  {
-    $sql = 'UPDATE "network_infrastructure" SET "net_device_name" = "'.$_REQUEST['NewNetworkDeviceName'].'", "net_device_typ" = "'.$_REQUEST['NewNetworkDeviceTyp'].'", "net_device_port" = "'.$_REQUEST['NewNetworkDevicePort'].'" WHERE "device_id"="'.$_REQUEST['NetworkDeviceID'].'"';
-    //$sql = 'INSERT INTO "network_infrastructure" ("net_device_name", "net_device_typ", "net_device_port") VALUES("'.$_REQUEST['NetworkDeviceName'].'", "'.$_REQUEST['NetworkDeviceTyp'].'", "'.$_REQUEST['NetworkDevicePort'].'")'; 
-    $result = $db->query($sql);
-  }
-}
-// #####################################
-// remove Network Devices
-// #####################################
-if ($_REQUEST['Networkdelete'] == "yes") {
-	if (isset($_REQUEST['NetworkDeviceID']))
-	{
-		$sql = 'DELETE FROM "network_infrastructure" WHERE "device_id"="'.$_REQUEST['NetworkDeviceID'].'"';	
-		$result = $db->query($sql);	
-	}
-}
   
+
+  $DBFILE = '../db/pialert.db';
+  $NETWORKTYPES = getNetworkTypes();
+
+  OpenDB();
+
+  // #####################################
+  // ## Expand Devices Table
+  // #####################################
+  $sql = 'ALTER TABLE "Devices" ADD "dev_Network_Node_MAC" INTEGER';
+  $result = $db->query($sql);
+  $sql = 'ALTER TABLE "Devices" ADD "dev_Network_Node_port" INTEGER';
+  $result = $db->query($sql);
 ?>
+
 <!-- Page ------------------------------------------------------------------ -->
 <div class="content-wrapper">
 
-<!-- Content header--------------------------------------------------------- -->
+  <!-- Content header--------------------------------------------------------- -->
-    <section class="content-header">
+  <section class="content-header">
-    <?php require 'php/templates/notification.php'; ?>
+  <?php require 'php/templates/notification.php'; ?>
-      <h1 id="pageTitle">
+    <h1 id="pageTitle">
-         <?php echo $pia_lang['Network_Title'];?>
+        <?php echo $pia_lang['Network_Title'];?>
-      </h1>
+    </h1>
-    </section>
+  </section>
 
-<?php
+  <?php
-echo $_REQUEST['device_id'];
+    echo $_REQUEST['net_MAC'];
-?>
+  ?>
-    <!-- Main content ---------------------------------------------------------- -->
-    <section class="content">
-		<div class="box box-default collapsed-box"> <!-- collapsed-box -->
-        <div class="box-header with-border" data-widget="collapse">
-          <h3 class="box-title"><?php echo $pia_lang['Network_ManageDevices'];?></h3>
-          <div class="box-tools pull-right">
-            <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i></button>
-          </div>
-        </div>
-        <!-- /.box-header -->
-        <div class="box-body" style="">
-          <div class="row">
-            <div class="col-md-4">
-            <h4 class="box-title"><?php echo $pia_lang['Network_ManageAdd'];?></h4>
-            <form role="form" method="post" action="./network.php">
-              <div class="form-group">
-                <label for="NetworkDeviceName"><?php echo $pia_lang['Network_ManageAdd_Name'];?>:</label>
-                <input type="text" class="form-control" id="NetworkDeviceName" name="NetworkDeviceName" placeholder="<?php echo $pia_lang['Network_ManageAdd_Name_text'];?>">
-              </div>
-              <!-- /.form-group -->
-              <div class="form-group">
-               <label><?php echo $pia_lang['Network_ManageAdd_Type'];?>:</label>
-                  <select class="form-control" name="NetworkDeviceTyp">
-                    <option value=""><?php echo $pia_lang['Network_ManageAdd_Type_text'];?></option>
-                    <option value="Router">Router</option>
-                    <option value="Switch">Switch</option>
-                    <option value="WLAN">WLAN</option>
-                    <option value="Powerline">Powerline</option>
-                  </select>
-              </div>
-              <div class="form-group">
-                <label for="NetworkDevicePort"><?php echo $pia_lang['Network_ManageAdd_Port'];?>:</label>
-                <input type="text" class="form-control" id="NetworkDevicePort" name="NetworkDevicePort" placeholder="<?php echo $pia_lang['Network_ManageAdd_Port_text'];?>">
-              </div>
-              <div class="form-group">
-              <button type="submit" class="btn btn-success" name="Networkinsert" value="yes"><?php echo $pia_lang['Network_ManageAdd_Submit'];?></button>
-          	  </div>
-          </form>
-              <!-- /.form-group -->
-            </div>
-            <!-- /.col -->
-            <div class="col-md-4">
-              <h4 class="box-title"><?php echo $pia_lang['Network_ManageEdit'];?></h4>
-              <form role="form" method="post" action="./network.php">
-              <div class="form-group">
-              	<label><?php echo $pia_lang['Network_ManageEdit_ID'];?>:</label>
-                  <select class="form-control" name="NetworkDeviceID">
-                    <option value=""><?php echo $pia_lang['Network_ManageEdit_ID_text'];?></option>
-					<?php
-					$sql = 'SELECT "device_id", "net_device_name", "net_device_typ" FROM "network_infrastructure"'; 
-					$result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC); 
-					while($res = $result->fetchArray(SQLITE3_ASSOC)){
-						if(!isset($res['device_id'])) continue; 
-					    echo '<option value="'.$res['device_id'].'">'.$res['net_device_name'].' / '.$res['net_device_typ'].'</option>';
-					} 
-					?>
-                  </select>
-              </div>
-              <div class="form-group">
-                <label for="NetworkDeviceName"><?php echo $pia_lang['Network_ManageEdit_Name'];?>:</label>
-                <input type="text" class="form-control" id="NewNetworkDeviceName" name="NewNetworkDeviceName" placeholder="<?php echo $pia_lang['Network_ManageEdit_Name_text'];?>">
-              </div>
-              <div class="form-group">
-               <label><?php echo $pia_lang['Network_ManageEdit_Type'];?>:</label>
-                  <select class="form-control" name="NewNetworkDeviceTyp">
-                    <option value=""><?php echo $pia_lang['Network_ManageEdit_Type_text'];?></option>
-                    <option value="Router">Router</option>
-                    <option value="Switch">Switch</option>
-                    <option value="WLAN">WLAN</option>
-                    <option value="Powerline">Powerline</option>
-                  </select>
-              </div>
-              <div class="form-group">
-                <label for="NetworkDevicePort"><?php echo $pia_lang['Network_ManageEdit_Port'];?>:</label>
-                <input type="text" class="form-control" id="NewNetworkDevicePort" name="NewNetworkDevicePort" placeholder="<?php echo $pia_lang['Network_ManageEdit_Port_text'];?>">
-              </div>
-              <!-- /.form-group -->
-              <div class="form-group">
-                <button type="submit" class="btn btn-primary" name="Networkedit" value="yes"><?php echo $pia_lang['Network_ManageEdit_Submit'];?></button>
-              </div>
-         	 </form>
-              <!-- /.form-group -->
-            </div>
-            <!-- /.col -->
-           <div class="col-md-4">
-            <h4 class="box-title"><?php echo $pia_lang['Network_ManageDel'];?></h4>
-              <form role="form" method="post" action="./network.php">
-              <div class="form-group">
-                <label><?php echo $pia_lang['Network_ManageDel_Name'];?>:</label>
-                  <select class="form-control" name="NetworkDeviceID">
-                    <option value=""><?php echo $pia_lang['Network_ManageDel_Name_text'];?></option>
-          <?php
-          $sql = 'SELECT "device_id", "net_device_name", "net_device_typ" FROM "network_infrastructure"'; 
-          $result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC); 
-          while($res = $result->fetchArray(SQLITE3_ASSOC)){
-            if(!isset($res['device_id'])) continue; 
-              echo '<option value="'.$res['device_id'].'">'.$res['net_device_name'].' / '.$res['net_device_typ'].'</option>';
-          } 
-          ?>
-                  </select>
-              </div>
-              <!-- /.form-group -->
-              <div class="form-group">
-                <button type="submit" class="btn btn-danger" name="Networkdelete" value="yes"><?php echo $pia_lang['Network_ManageDel_Submit'];?></button>
-              </div>
-           </form>
-              <!-- /.form-group -->
-            </div>
-          </div>
-          <!-- /.row -->
-        </div>
-        <!-- /.box-body -->
-      </div>
 
-<?php
+  <!-- Main content ---------------------------------------------------------- -->
-// #####################################
+  <section class="content">
-// ## Start Function Setup
+    <?php
-// #####################################
+
-function createnetworktab($pia_func_netdevid, $pia_func_netdevname, $pia_func_netdevtyp, $pia_func_netdevport, $activetab) {
+      // Create top-level node (network devices) tabs 
-	echo '<li class="'.$activetab.'"><a href="#'.$pia_func_netdevid.'" data-toggle="tab">'.$pia_func_netdevname.' / '.$pia_func_netdevtyp;
+      function createDeviceTabs($node_mac, $node_name, $node_status, $node_type, $node_ports_count, $activetab) {
-  if ($pia_func_netdevport != "") {echo ' ('.$pia_func_netdevport.')';}
+        global $pia_lang; //language strings
-  echo '</a></li>';
+
-}
+        // prepare string with port number in brackets if available
-function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_func_netdevtyp, $pia_func_netdevport, $activetab) {
+        $str_port = "";
-	global $pia_lang;
+        if ($node_ports_count != "") {
-  echo '<div class="tab-pane '.$activetab.'" id="'.$pia_func_netdevid.'">
+          $str_port = ' ('.$node_ports_count.')';
-	      <h4>'.$pia_func_netdevname.' (ID: '.$pia_func_netdevid.')</h4><br>';
-  echo '<div class="box-body no-padding">
-    <table class="table table-striped">
-      <tbody><tr>
-        <th style="width: 40px">Port</th>
-        <th style="width: 100px">'.$pia_lang['Network_Table_State'].'</th>
-        <th>'.$pia_lang['Network_Table_Hostname'].'</th>
-        <th>'.$pia_lang['Network_Table_IP'].'</th>
-      </tr>';
-  // Prepare Array for Devices with Port value
-  // If no Port is set, the Port number is set to 1
-  if ($pia_func_netdevport == "") {$pia_func_netdevport = 1;}
-  // Create Array with specific length
-  $network_device_portname = array();
-  $network_device_portmac = array();
-  $network_device_portip = array();
-  $network_device_portstate = array();
-  // make sql query for Network Hardware ID
-	global $db;
-	$func_sql = 'SELECT * FROM "Devices" WHERE "dev_Infrastructure" = "'.$pia_func_netdevid.'"';
-	$func_result = $db->query($func_sql);//->fetchArray(SQLITE3_ASSOC); 
-	while($func_res = $func_result->fetchArray(SQLITE3_ASSOC)) {
-    //if(!isset($func_res['dev_Name'])) continue;
-		if ($func_res['dev_PresentLastScan'] == 1) {$port_state = '<div class="badge bg-green text-white" style="width: 60px;">Online</div>';} else {$port_state = '<div class="badge bg-red text-white" style="width: 60px;">Offline</div>';}
-		// Prepare Table with Port > push values in array
-    if ($pia_func_netdevport > 1)
-      {
-        if (stristr($func_res['dev_Infrastructure_port'], ',') == '') {
-        if ($network_device_portname[$func_res['dev_Infrastructure_port']] != '') {$network_device_portname[$func_res['dev_Infrastructure_port']] = $network_device_portname[$func_res['dev_Infrastructure_port']].','.$func_res['dev_Name'];} else {$network_device_portname[$func_res['dev_Infrastructure_port']] = $func_res['dev_Name'];}
-        if ($network_device_portmac[$func_res['dev_Infrastructure_port']] != '') {$network_device_portmac[$func_res['dev_Infrastructure_port']] = $network_device_portmac[$func_res['dev_Infrastructure_port']].','.$func_res['dev_MAC'];} else {$network_device_portmac[$func_res['dev_Infrastructure_port']] = $func_res['dev_MAC'];}
-        if ($network_device_portip[$func_res['dev_Infrastructure_port']] != '') {$network_device_portip[$func_res['dev_Infrastructure_port']] = $network_device_portip[$func_res['dev_Infrastructure_port']].','.$func_res['dev_LastIP'];} else {$network_device_portip[$func_res['dev_Infrastructure_port']] = $func_res['dev_LastIP'];}
-        if (isset($network_device_portstate[$func_res['dev_Infrastructure_port']])) {$network_device_portstate[$func_res['dev_Infrastructure_port']] = $network_device_portstate[$func_res['dev_Infrastructure_port']].','.$func_res['dev_PresentLastScan'];} else {$network_device_portstate[$func_res['dev_Infrastructure_port']] = $func_res['dev_PresentLastScan'];}
-        } else {
-          $multiport = array();
-          $multiport = explode(',',$func_res['dev_Infrastructure_port']);
-          foreach($multiport as $row) {
-              $network_device_portname[trim($row)] = $func_res['dev_Name'];
-              $network_device_portmac[trim($row)] = $func_res['dev_MAC'];
-              $network_device_portip[trim($row)] = $func_res['dev_LastIP'];
-              $network_device_portstate[trim($row)] = $func_res['dev_PresentLastScan'];
-          }
-          unset($multiport);
         }
-      } else {
+
-        // Table without Port > echo values
+        // online/offline status circle (red/green)
-        // Specific icon for devicetype
+        $node_badge = "";
-        if ($pia_func_netdevtyp == "WLAN") {$dev_port_icon = 'fa-wifi';}
+        if($node_status == 1) // 1 means online, 0 offline
-        if ($pia_func_netdevtyp == "Powerline") {$dev_port_icon = 'fa-flash';}
-        echo '<tr><td style="text-align: center;"><i class="fa '.$dev_port_icon.'"></i></td><td>'.$port_state.'</td><td style="padding-left: 10px;"><a href="./deviceDetails.php?mac='.$func_res['dev_MAC'].'"><b>'.$func_res['dev_Name'].'</b></a></td><td>'.$func_res['dev_LastIP'].'</td></tr>';
-      }
-	}
-  // Create table with Port
-  if ($pia_func_netdevport > 1)
-    {
-      for ($x=1; $x<=$pia_func_netdevport; $x++) 
         {
-          // Prepare online/offline badge for later functions
+          $node_badge = circle_online; 
-          $online_badge = '<div class="badge bg-green text-white" style="width: 60px;">Online</div>';
+        } else
-          $offline_badge = '<div class="badge bg-red text-white" style="width: 60px;">Offline</div>';
+        {
-          // Set online/offline badge
+          $node_badge = circle_offline;
-          echo '<tr>';
-          echo '<td style="text-align: right; padding-right:16px;">'.$x.'</td>';
-          // Set online/offline badge
-          // Check if multiple badges necessary
-          if (stristr($network_device_portstate[$x],',') == '') {
-            // Set single online/offline badge
-            if ($network_device_portstate[$x] == 1) {$port_state = $online_badge;} else {$port_state = $offline_badge;}
-            echo '<td>'.$port_state.'</td>';
-          } else {
-            // Set multiple online/offline badges
-            $multistate = array();
-            $multistate = explode(',',$network_device_portstate[$x]);
-            echo '<td>';
-            foreach($multistate as $key => $value) {
-                if ($value == 1) {$port_state = $online_badge;} else {$port_state = $offline_badge;}
-                echo $port_state.'<br>';
-            }
-            echo '</td>';
-            unset($multistate);
-          }  
-          // Check if multiple Hostnames are set
-          // print single hostname         
-          if (stristr($network_device_portmac[$x],',') == '') {
-            echo '<td style="padding-left: 10px;"><a href="./deviceDetails.php?mac='.$network_device_portmac[$x].'"><b>'.$network_device_portname[$x].'</b></a></td>';
-          } else {
-            // print multiple hostnames with separate links  
-            $multimac = array();
-            $multimac = explode(',',$network_device_portmac[$x]);
-            $multiname = array();
-            $multiname = explode(',',$network_device_portname[$x]);
-            echo '<td style="padding-left: 10px;">';
-            foreach($multiname as $key => $value) {
-                echo '<a href="./deviceDetails.php?mac='.$multimac[$key].'"><b>'.$value.'</b></a><br>';
-            }
-            echo '</td>';
-            unset($multiname, $multimac);
-          }
-          // Check if multiple IP are set
-          // print single IP  
-          if (stristr($network_device_portip[$x],',') == '') {
-            echo '<td style="padding-left: 10px;">'.$network_device_portip[$x].'</td>';
-          } else {
-            // print multiple IPs
-            $multiip = array();
-            $multiip = explode(',',$network_device_portip[$x]);
-            echo '<td style="padding-left: 10px;">';
-            foreach($multiip as $key => $value) {
-                echo $value.'<br>';
-            }
-            echo '</td>';
-            unset($multiip);
-          }
-          echo '</tr>';
         }
-    }
-  echo '        </tbody></table>
-            </div>';
-	echo '</div> ';
-}
-// #####################################
-// ## End Function Setup
-// #####################################
         
-// #####################################
+
-// ## Create Tabs
+        $str_tab_header = '<li class="'.$activetab.'">
-// #####################################
+                              <a href="#'.str_replace(":", "_", $node_mac).'" data-toggle="tab">'
-$sql = 'SELECT "device_id", "net_device_name", "net_device_typ", "net_device_port" FROM "network_infrastructure"'; 
+                                  .$node_name.' ' .$str_port.$node_badge.
-$result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC); 
+                              '</a>
-?>
+                          </li>';
-      <div class="nav-tabs-custom" style="margin-bottom: 0px;">
+
-            <ul class="nav nav-tabs">
+        echo $str_tab_header;
-<?php
+
-$i = 0;
+      }
-while($res = $result->fetchArray(SQLITE3_ASSOC)){
+
-	if(!isset($res['device_id'])) continue;
+      // Create pane content (displayed inside of the tabs)      
-	if ($i == 0) {$active = 'active';} else {$active = '';}
+      function createPane($node_mac, $node_name, $node_status, $node_type, $node_ports_count, $activetab){
-    createnetworktab($res['device_id'], $res['net_device_name'], $res['net_device_typ'], $res['net_device_port'], $active);
+        global $pia_lang; //language strings
-    $i++;
+
-}
+        // online/offline status circle (red/green)
-?>              
+        $node_badge = "";
-            </ul>
+        if($node_status == 1) // 1 means online, 0 offline
-			<div class="tab-content">
+        {
-<?php
+          $node_badge = badge_online; 
-// #####################################
+        } else
-// ## Ctreate Tab Content
+        {
-// #####################################
+          $node_badge = badge_offline;
-$i = 0;
+        }
-while($res = $result->fetchArray(SQLITE3_ASSOC)){
+
-	if(!isset($res['device_id'])) continue; 
+        $str_tab_pane = '<div class="tab-pane '.$activetab.'" id="'.str_replace(":", "_", $node_mac).'">
-	if ($i == 0) {$active = 'active';} else {$active = '';}
+                            <a href="./deviceDetails.php?mac='.$node_mac.'">
-  createnetworktabcontent($res['device_id'], $res['net_device_name'], $res['net_device_typ'], $res['net_device_port'], $active);
+                              <h4>'.$node_name.'</h4>
-    $i++;
+                            </a>
-}
+                            <table class="table table-striped" style="width:200px;"> 
-unset($i);
+                              <tbody>
-?>
+                                <tr> 
-              <!-- /.tab-pane -->
+                                  <td>
-            </div>
+                                    <b>MAC:</b>
-            <!-- /.tab-content -->
+                                  </td>
-  </div>
+                                  <td>'
-  <div style="width: 100%; height: 20px;"></div>
+                                    .$node_mac.
-</section>
+                                  '</td>
+                                </tr>
+                                <tr>
+                                  <td>
+                                    <b>'.$pia_lang['Device_TableHead_Type'].'</b>
+                                  </td>
+                                  <td>
+                                  ' .$node_type. '
+                                  </td>
+                                </tr>
+                                <tr> 
+                                  <td>
+                                    <b>'.$pia_lang['Network_Table_State'].':</b> 
+                                  </td>
+                                  <td>  '
+                                    .$node_badge.
+                                  '</td>
+                                </tr>
+                              </tbody>
+                            </table>
+                            <br>
+                             <div class="box-body no-padding">';
+
+        $str_table =      '   <h4>
+                              '.$pia_lang['Device_Title'].'
+                              </h4>
+                              <table class="table table-striped">
+                                <tbody>
+                                <tr>
+                                  <th style="width: 40px">Port</th>
+                                  <th style="width: 100px">'.$pia_lang['Network_Table_State'].'</th>
+                                  <th>'.$pia_lang['Network_Table_Hostname'].'</th>
+                                  <th>'.$pia_lang['Network_Table_IP'].'</th>
+                                </tr>';
+        
+        // Prepare Array for Devices with Port value
+        // If no Port is set, the Port number is set to 0
+        if ($node_ports_count == "") {
+          $node_ports_count = 0;
+        }
+
+        // Get all leafs connected to a node based on the node_mac        
+        $func_sql = 'SELECT dev_Network_Node_port as port,
+                            dev_MAC as mac,  
+                            dev_PresentLastScan as online, 
+                            dev_Name as name,
+                            dev_DeviceType as type, 
+                            dev_LastIP as last_ip,
+                            (select dev_DeviceType from Devices a where dev_MAC = "'.$node_mac.'") as node_type
+                        FROM Devices WHERE dev_Network_Node_MAC = "'.$node_mac.'" order by port asc';
+        
+        global $db;
+        $func_result = $db->query($func_sql);        
+        
+        // array 
+        $tableData = array();
+        while ($row = $func_result -> fetchArray (SQLITE3_ASSOC)) {   
+            // Push row data      
+            $tableData[] = array( 'port'            => $row['port'], 
+                                  'mac'             => $row['mac'],
+                                  'online'          => $row['online'],
+                                  'name'            => $row['name'],
+                                  'type'            => $row['type'],
+                                  'last_ip'         => $row['last_ip'],
+                                  'node_type'       => $row['node_type']); 
+        }
+    
+        // Control no rows
+        if (empty($tableData)) {
+          $tableData = [];
+        }
+
+        $str_table_rows = "";        
+
+        foreach ($tableData as $row) {                            
+         
+          if ($row['online'] == 1) {
+            $port_state = badge_online;
+          } else {
+            $port_state = badge_offline;
+          }
+                    
+          // prepare HTML for the port table column cell
+          $port_content = "N/A";
+  
+          if ($row['node_type'] == "WLAN" || $row['node_type'] == "AP" ) { 
+            $port_content = '<i class="fa fa-wifi"></i>';
+          } elseif ($row['node_type'] == "Powerline") 
+          {
+            $port_content = '<i class="fa fa-flash"></i>';
+          } elseif ($row['port'] != NULL && $row['port'] != "") 
+          {
+            $port_content = $row['port'];
+          }
+  
+          $str_table_rows = $str_table_rows.
+                            '<tr>
+                              <td style="text-align: center;">
+                                '.$port_content.'                  
+                              </td>
+                              <td>'
+                                .$port_state.
+                              '</td>
+                              <td style="padding-left: 10px;">
+                                <a href="./deviceDetails.php?mac='.$row['mac'].'">
+                                  <b>'.$row['name'].'</b>
+                                </a>
+                              </td>
+                              <td>'
+                                .$row['last_ip'].
+                              '</td>
+                            </tr>';
+          
+        }        
+
+        $str_table_close =    '</tbody>
+                            </table>';
+
+        // no connected device - don't render table, just dispaly some info
+        if($str_table_rows == "")
+        {
+          $str_table = "<div>
+                          <h4>
+                            ".$pia_lang['Device_Title']."
+                          </h4>
+                          <div>
+                            This network device (node) doesn't have any assigned devices (leaf nodes).                             
+                            Go to <a href='./devices.php'><b>".$pia_lang['Device_Title']."</b></a>, select a device you want to attach to this node and assign it in the <b>Details</b> tab by selecting it in the <b>".$pia_lang['DevDetail_MainInfo_Network'] ."</b> dropdown.
+                          </div>
+                        </div>";
+          $str_table_close = "";
+        }
+         
+        $str_close_pane = '</div>       
+          </div>';  
+
+        // write the HTML
+        echo  ''.$str_tab_header.
+              $str_tab_pane.
+              $str_table.
+              $str_table_rows.
+              $str_table_close.
+              $str_close_pane;
+      }     
+
+    
+    // Create Top level tabs   (List of network devices), explanation of the terminology below:
+    //
+    //             Switch 1 (node) 
+    //              /(p1)    \ (p2)     <----- port numbers
+    //             /          \
+    //   Smart TV (leaf)      Switch 2 (node (for the PC) and leaf (for Switch 1))
+    //                          \
+    //                          PC (leaf)
+    
+    $sql = "SELECT node_name, node_mac, online, node_type, node_ports_count
+                  FROM 
+                  (
+                        SELECT  a.dev_Name as  node_name,        
+                              a.dev_MAC as node_mac,
+                              a.dev_PresentLastScan as online,
+                              a.dev_DeviceType as node_type 
+                        FROM Devices a 
+                        WHERE a.dev_DeviceType in ('AP', 'Gateway', 'Powerline', 'Switch', 'WLAN', 'PLC', 'Router','USB LAN Adapter', 'USB WIFI Adapter', 'Internet')					
+                  ) t1
+                  LEFT JOIN
+                  (
+                        SELECT  b.dev_Network_Node_MAC as node_mac_2,
+                              count() as node_ports_count 
+                        FROM Devices b 
+                        WHERE b.dev_Network_Node_MAC NOT NULL group by b.dev_Network_Node_MAC
+                  ) t2
+                  ON (t1.node_mac = t2.node_mac_2);
+          ";
+
+    $result = $db->query($sql);    
+
+    // array 
+    $tableData = array();
+    while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {   
+        // Push row data      
+        $tableData[] = array( 'node_mac'                => $row['node_mac'], 
+                              'node_name'               => $row['node_name'],
+                              'online'                  => $row['online'],
+                              'node_type'               => $row['node_type'],
+                              'node_ports_count'        => $row['node_ports_count']); 
+    }
+
+    // Control no rows
+    if (empty($tableData)) {
+      $tableData = [];
+    }
+
+    echo '<div class="nav-tabs-custom" style="margin-bottom: 0px;">
+    <ul class="nav nav-tabs">';
+
+    $activetab='active';                    
+    foreach ($tableData as $row) {                            
+        createDeviceTabs( $row['node_mac'], 
+                          $row['node_name'], 
+                          $row['online'],
+                          $row['node_type'], 
+                          $row['node_ports_count'],
+                          $activetab);
+
+                          $activetab = ""; // reset active tab indicator, only the first tab is active
+      
+    }
+    echo ' </ul>  <div class="tab-content">';
+
+    $activetab='active';    
+
+    foreach ($tableData as $row) {                            
+      createPane($row['node_mac'], 
+                  $row['node_name'],
+                  $row['online'], 
+                  $row['node_type'], 
+                  $row['node_ports_count'],
+                  $activetab);
+
+                  $activetab = ""; // reset active tab indicator, only the first tab is active
+    
+    }
+                              
+    $db->close();
+
+    ?>
+                  <!-- /.tab-pane -->
+          </div>
+         
+  </section>
 
     <!-- /.content -->
   </div>

front/php/server/db.php

@@ -8,6 +8,13 @@
 //  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
 //------------------------------------------------------------------------------
 
+// ## TimeZone processing
+$config_file = "../../../config/pialert.conf";
+$config_file_lines = file($config_file);
+$config_file_lines_timezone = array_values(preg_grep('/^TIMEZONE\s.*/', $config_file_lines));
+$timezone_line = explode("'", $config_file_lines_timezone[0]);
+$Pia_TimeZone = $timezone_line[1];
+date_default_timezone_set($Pia_TimeZone);
 
 //------------------------------------------------------------------------------
 // DB File Path
@@ -51,6 +58,7 @@ function OpenDB () {
   }
 
   $db = SQLite3_connect(true);
+  $db->exec('PRAGMA journal_mode = wal;');
   if(!$db)
   {
     die ('Error connecting to database');

front/php/server/devices.php

@@ -7,6 +7,13 @@
 //------------------------------------------------------------------------------
 //  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
 //------------------------------------------------------------------------------
+// ## TimeZone processing
+$config_file = "../../../config/pialert.conf";
+$config_file_lines = file($config_file);
+$config_file_lines_timezone = array_values(preg_grep('/^TIMEZONE\s.*/', $config_file_lines));
+$timezone_line = explode("'", $config_file_lines_timezone[0]);
+$Pia_TimeZone = $timezone_line[1];
+date_default_timezone_set($Pia_TimeZone);
 
 foreach (glob("../../../db/setting_language*") as $filename) {
     $pia_lang_selected = str_replace('setting_language_','',basename($filename));
@@ -34,6 +41,7 @@ if (strlen($pia_lang_selected) == 0) {$pia_lang_selected = 'en_us';}
     switch ($action) {
       case 'getDeviceData':           getDeviceData();                         break;
       case 'setDeviceData':           setDeviceData();                         break;
+      case 'getNetworkNodes':         getNetworkNodes();                       break;
       case 'deleteDevice':            deleteDevice();                          break;
       case 'deleteAllWithEmptyMACs':  deleteAllWithEmptyMACs();                break;      
       case 'createBackupDB':          createBackupDB();                        break;
@@ -87,8 +95,8 @@ function getDeviceData() {
   $deviceData = $row;
   $mac = $deviceData['dev_MAC'];
 
-  $deviceData['dev_Infrastructure'] = $row['dev_Infrastructure'];
+  $deviceData['dev_Network_Node_MAC'] = $row['dev_Network_Node_MAC'];
-  $deviceData['dev_Infrastructure_port'] = $row['dev_Infrastructure_port'];
+  $deviceData['dev_Network_Node_port'] = $row['dev_Network_Node_port'];
   $deviceData['dev_FirstConnection'] = formatDate ($row['dev_FirstConnection']); // Date formated
   $deviceData['dev_LastConnection'] =  formatDate ($row['dev_LastConnection']);  // Date formated
 
@@ -119,8 +127,10 @@ function getDeviceData() {
   $row = $result -> fetchArray (SQLITE3_NUM);
   $deviceData['dev_DownAlerts'] = $row[0];
 
+  // Get current date using php, sql datetime does not return time respective to timezone.
+  $currentdate = date("Y-m-d H:i:s");
   // Presence hours
-  $sql = 'SELECT CAST(( MAX (0, SUM (julianday (IFNULL (ses_DateTimeDisconnection, DATETIME("now","localtime")))
+  $sql = 'SELECT CAST(( MAX (0, SUM (julianday (IFNULL (ses_DateTimeDisconnection,"'. $currentdate .'" ))
                                      - julianday (CASE WHEN ses_DateTimeConnection < '. $periodDate .' THEN '. $periodDate .'
                                                        ELSE ses_DateTimeConnection END)) *24 )) AS INT)
           FROM Sessions
@@ -156,8 +166,8 @@ function setDeviceData() {
                  dev_Group           = "'. quotes($_REQUEST['group'])        .'",
                  dev_Location        = "'. quotes($_REQUEST['location'])     .'",
                  dev_Comments        = "'. quotes($_REQUEST['comments'])     .'",
-                 dev_Infrastructure  = "'. quotes($_REQUEST['infrastructure']).'",
+                 dev_Network_Node_MAC  = "'. quotes($_REQUEST['networknode']).'",
-                 dev_Infrastructure_port  = "'. quotes($_REQUEST['infrastructureport']).'",
+                 dev_Network_Node_port  = "'. quotes($_REQUEST['networknodeport']).'",
                  dev_StaticIP        = "'. quotes($_REQUEST['staticIP'])     .'",
                  dev_ScanCycle       = "'. quotes($_REQUEST['scancycle'])    .'",
                  dev_AlertEvents     = "'. quotes($_REQUEST['alertevents'])  .'",
@@ -590,12 +600,43 @@ function getOwners() {
 }
 
 
+//------------------------------------------------------------------------------
+//  Query Device Data
+//------------------------------------------------------------------------------
+function getNetworkNodes() {
+  global $db;
+
+  // Device Data
+  $sql = 'SELECT * FROM Devices WHERE dev_DeviceType in (  "AP", "Gateway", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter")';
+
+  $result = $db->query($sql);
+
+  // arrays of rows
+  $tableData = array();
+  while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {   
+    // Push row data
+    $tableData[] = array('id'    => $row['dev_MAC'], 
+                         'name'  => $row['dev_Name'] );                        
+  }
+  
+  // Control no rows
+  if (empty($tableData)) {
+    $tableData = [];
+  }
+  
+    // Return json
+  echo (json_encode ($tableData));
+}
+
+
 //------------------------------------------------------------------------------
 //  Query the List of types
 //------------------------------------------------------------------------------
 function getDeviceTypes() {
   global $db;
 
+  $networkTypes = getNetworkTypes();
+
   // SQL
   $sql = 'SELECT DISTINCT 9 as dev_Order, dev_DeviceType
           FROM Devices
@@ -604,7 +645,7 @@ function getDeviceTypes() {
                  "Laptop", "Mini PC", "PC", "Printer", "Server", "Singleboard Computer (SBC)",
                  "Game Console", "SmartTV", "TV Decoder", "Virtual Assistance",
                  "Clock", "House Appliance", "Phone", "Radio",
-                 "AP", "NAS", "PLC", "Router")
+                 "AP", "Gateway", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter" )
 
           UNION SELECT 1 as dev_Order, "Smartphone"
           UNION SELECT 1 as dev_Order, "Tablet"
@@ -615,6 +656,7 @@ function getDeviceTypes() {
           UNION SELECT 2 as dev_Order, "Printer"
           UNION SELECT 2 as dev_Order, "Server"
           UNION SELECT 2 as dev_Order, "Singleboard Computer (SBC)"
+          UNION SELECT 2 as dev_Order, "NAS"
 
           UNION SELECT 3 as dev_Order, "Domotic"
           UNION SELECT 3 as dev_Order, "Game Console"
@@ -627,8 +669,12 @@ function getDeviceTypes() {
           UNION SELECT 4 as dev_Order, "Phone"
           UNION SELECT 4 as dev_Order, "Radio"
 
+          -- network devices
           UNION SELECT 5 as dev_Order, "AP"
-          UNION SELECT 5 as dev_Order, "NAS"
+          UNION SELECT 5 as dev_Order, "Gateway"
+          UNION SELECT 5 as dev_Order, "Powerline"
+          UNION SELECT 5 as dev_Order, "Switch"
+          UNION SELECT 5 as dev_Order, "WLAN"
           UNION SELECT 5 as dev_Order, "PLC"
           UNION SELECT 5 as dev_Order, "Router"
           UNION SELECT 5 as dev_Order, "USB LAN Adapter"
@@ -637,6 +683,8 @@ function getDeviceTypes() {
           UNION SELECT 10 as dev_Order, "Other"
 
           ORDER BY 1,2';
+
+          
   $result = $db->query($sql);
 
   // arrays of rows
@@ -649,8 +697,6 @@ function getDeviceTypes() {
   // Return json
   echo (json_encode ($tableData));
 }
-
-
 //------------------------------------------------------------------------------
 //  Query the List of groups
 //------------------------------------------------------------------------------

front/php/server/events.php

@@ -7,7 +7,13 @@
 //------------------------------------------------------------------------------
 //  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
 //------------------------------------------------------------------------------
-
+// ## TimeZone processing
+$config_file = "../../../config/pialert.conf";
+$config_file_lines = file($config_file);
+$config_file_lines_timezone = array_values(preg_grep('/^TIMEZONE\s.*/', $config_file_lines));
+$timezone_line = explode("'", $config_file_lines_timezone[0]);
+$Pia_TimeZone = $timezone_line[1];
+date_default_timezone_set($Pia_TimeZone);
 
 //------------------------------------------------------------------------------
   // External files
@@ -225,7 +231,7 @@ function getDeviceSessions() {
     }
 
     // Duration
-    if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') {
+    if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeConnection'] == NULL || $row['ses_EventTypeDisconnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == NULL) {
       $dur = '...';
     } elseif ($row['ses_StillConnected'] == true) {
       $dur = formatDateDiff ($row['ses_DateTimeConnection'], '');  //***********
@@ -261,7 +267,6 @@ function getDevicePresence() {
 
   // Request Parameters
   $mac        = $_REQUEST['mac'];
-  $periodDate = getDateFromPeriod();
   $startDate  = '"'. formatDateISO ($_REQUEST ['start']) .'"';
   $endDate    = '"'. formatDateISO ($_REQUEST ['end'])   .'"';
 
@@ -276,7 +281,7 @@ function getDevicePresence() {
                  END AS ses_DateTimeConnectionCorrected,
 
                  CASE
-                   WHEN ses_EventTypeDisconnection = "<missing event>" THEN
+                   WHEN ses_EventTypeDisconnection = "<missing event>" OR ses_EventTypeDisconnection = NULL THEN
                         (SELECT MIN(ses_DateTimeConnection) FROM Sessions AS SES2 WHERE SES2.ses_MAC = SES1.ses_MAC AND SES2.ses_DateTimeConnection > SES1.ses_DateTimeConnection)
                    ELSE ses_DateTimeDisconnection
                  END AS ses_DateTimeDisconnectionCorrected
@@ -290,13 +295,14 @@ function getDevicePresence() {
   // arrays of rows
   while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
     // Event color
-  if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') {
+    if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') {
-        $color = '#f39c12';
+      $color = '#f39c12';
-      } elseif ($row['ses_StillConnected'] == 1 ) {
+    } elseif ($row['ses_StillConnected'] == 1 ) {
-        $color = '#00a659';
+      $color = '#00a659';
-      } else {
+    } else {
-        $color = '#0073b7';
+      $color = '#0073b7';
-      }
+    }
+
 
     // tooltip
     $tooltip = 'Connection: '    . formatEventDate ($row['ses_DateTimeConnection'],    $row['ses_EventTypeConnection'])    . chr(13) .
@@ -358,12 +364,12 @@ function getEventsCalendar() {
   while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
     // Event color
     if ($row['ses_EventTypeConnection'] == '<missing event>' || $row['ses_EventTypeDisconnection'] == '<missing event>') {
-        $color = '#f39c12';
+      $color = '#f39c12';
-      } elseif ($row['ses_StillConnected'] == 1 ) {
+    } elseif ($row['ses_StillConnected'] == 1 ) {
-        $color = '#00a659';
+      $color = '#00a659';
-      } else {
+    } else {
-        $color = '#0073b7';
+      $color = '#0073b7';
-      }
+    }
 
     // tooltip
     $tooltip = 'Connection: '    . formatEventDate ($row['ses_DateTimeConnection'],    $row['ses_EventTypeConnection'])    . chr(13) .

front/php/server/util.php

@@ -8,6 +8,13 @@
 //  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
 //------------------------------------------------------------------------------
 
+// ## TimeZone processing
+$config_file = "../../../config/pialert.conf";
+$config_file_lines = file($config_file);
+$config_file_lines_timezone = array_values(preg_grep('/^TIMEZONE\s.*/', $config_file_lines));
+$timezone_line = explode("'", $config_file_lines_timezone[0]);
+$Pia_TimeZone = $timezone_line[1];
+date_default_timezone_set($Pia_TimeZone);
 
 //------------------------------------------------------------------------------
 // Formatting data functions
@@ -58,4 +65,12 @@ function logServerConsole ($text) {
   $y = $x['__________'. $text .'__________'];
 }
 
+function getNetworkTypes(){
+
+  $array = array(
+    "AP", "Gateway", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter"
+  );
+
+  return $array;
+}
 ?>

front/php/templates/graph.php

@@ -1,10 +1,16 @@
 <?php
+
+require 'php/server/db.php';
+$DBFILE = '../db/pialert.db';
+OpenDB();
+
 $Pia_Graph_Device_Time = array();
 $Pia_Graph_Device_All = array();
 $Pia_Graph_Device_Online = array();
 $Pia_Graph_Device_Down = array();
 $Pia_Graph_Device_Arch = array();
-$db = new SQLite3('../db/pialert.db');
+
+//$db = new SQLite3('../db/pialert.db');
 $results = $db->query('SELECT * FROM Online_History ORDER BY Scan_Date DESC LIMIT 144');
 while ($row = $results->fetchArray()) {
    $time_raw = explode(' ', $row['Scan_Date']);

front/php/templates/header.php

@@ -102,6 +102,7 @@ if ($ENABLED_DARKMODE === True) {
 ?>
 <!-- Servertime to the right of the hostname -->
 <script>
+
 var pia_servertime = new Date(<?php echo date("Y, n, j, G, i, s") ?>);
 
 function show_pia_servertime() {
@@ -232,7 +233,6 @@ function show_pia_servertime() {
         <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">
           <a href="maintenance.php"><i class="fa fa-cog"></i> <span><?php echo $pia_lang['Navigation_Maintenance'];?></span></a>
         </li>
-
 <!--
         <li class="treeview">
           <a href="#"><i class="fa fa-link"></i> <span>Config</span>

front/php/templates/language/de_de.php

@@ -27,8 +27,7 @@ $pia_lang['Device_Shortcut_NewDevices'] = 'Neue Geräte';
 $pia_lang['Device_Shortcut_DownAlerts'] = 'Down Meldungen';
 $pia_lang['Device_Shortcut_Archived'] = 'Archiviert';
 $pia_lang['Device_Shortcut_Devices'] = 'Geräte';
-$pia_lang['Device_Shortcut_OnlineChart_a'] = 'Netzwerkaktivität über die letzten';
+$pia_lang['Device_Shortcut_OnlineChart'] = 'Gerätepräsenz im Laufe der Zeit';
-$pia_lang['Device_Shortcut_OnlineChart_b'] = 'Stunden';
 $pia_lang['Device_TableHead_Name'] = 'Name';
 $pia_lang['Device_TableHead_Owner'] = 'Eigentümer';
 $pia_lang['Device_TableHead_Type'] = 'Typ';

front/php/templates/language/en_us.php

@@ -10,6 +10,7 @@ $pia_lang['Gen_Backup'] = 'Run Backup';
 $pia_lang['Gen_Restore'] = 'Run Restore';
 $pia_lang['Gen_Switch'] = 'Switch';
 
+
 //////////////////////////////////////////////////////////////////
 // Device Page
 //////////////////////////////////////////////////////////////////
@@ -27,8 +28,7 @@ $pia_lang['Device_Shortcut_NewDevices'] = 'New Devices';
 $pia_lang['Device_Shortcut_DownAlerts'] = 'Down Alerts';
 $pia_lang['Device_Shortcut_Archived'] = 'Archived';
 $pia_lang['Device_Shortcut_Devices'] = 'Devices';
-$pia_lang['Device_Shortcut_OnlineChart_a'] = 'Network activity over last';
+$pia_lang['Device_Shortcut_OnlineChart'] = 'Device presence over time';
-$pia_lang['Device_Shortcut_OnlineChart_b'] = 'hours';
 $pia_lang['Device_TableHead_Name'] = 'Name';
 $pia_lang['Device_TableHead_Owner'] = 'Owner';
 $pia_lang['Device_TableHead_Type'] = 'Type';
@@ -133,8 +133,9 @@ $pia_lang['DevDetail_MainInfo_Favorite'] = 'Favorite';
 $pia_lang['DevDetail_MainInfo_Group'] = 'Group';
 $pia_lang['DevDetail_MainInfo_Location'] = 'Location';
 $pia_lang['DevDetail_MainInfo_Comments'] = 'Comments';
-$pia_lang['DevDetail_MainInfo_Network'] = 'Network Hardware (ID)';
+$pia_lang['DevDetail_MainInfo_Network_Title'] = 'Network';
-$pia_lang['DevDetail_MainInfo_Network_Port'] = 'Network HW Port';
+$pia_lang['DevDetail_MainInfo_Network'] = 'Network Node (MAC)';
+$pia_lang['DevDetail_MainInfo_Network_Port'] = 'Connected to Port';
 $pia_lang['DevDetail_SessionInfo_Title'] = 'Session Info';
 $pia_lang['DevDetail_SessionInfo_Status'] = 'Status';
 $pia_lang['DevDetail_SessionInfo_FirstSession'] = 'First Session';
@@ -152,6 +153,8 @@ $pia_lang['DevDetail_EveandAl_RandomMAC'] = 'Random MAC';
 $pia_lang['DevDetail_EveandAl_ScanCycle_a'] = 'Scan Device (1 min)';
 $pia_lang['DevDetail_EveandAl_ScanCycle_z'] = 'Don't Scan Device (0 min)';
 $pia_lang['DevDetail_button_Delete'] = 'Delete Device';
+$pia_lang['DevDetail_button_DeleteEvents'] = 'Delete Events';
+$pia_lang['DevDetail_button_DeleteEvents_Warning'] = 'Are you sure you want to delete all Events of this device?<br><br>(this will clear the <b>Events history</b> and the <b>Sessions</b> and might help with constant (persistent) notifications)';
 $pia_lang['DevDetail_button_Reset'] = 'Reset Changes';
 $pia_lang['DevDetail_button_Save'] = 'Save';
 $pia_lang['DevDetail_button_DeleteEvents'] = 'Delete Events';

front/php/templates/language/es_es.php

@@ -26,8 +26,7 @@ $pia_lang['Device_Shortcut_NewDevices'] = 'Nuevo(s)';
 $pia_lang['Device_Shortcut_DownAlerts'] = 'Alerta(s) de caída(s)';
 $pia_lang['Device_Shortcut_Archived'] = 'Archivado(s)';
 $pia_lang['Device_Shortcut_Devices'] = 'Dispositivos';
-$pia_lang['Device_Shortcut_OnlineChart_a'] = 'Actividad de la red durante las últimas';
+$pia_lang['Device_Shortcut_OnlineChart'] = 'Presencia del dispositivo a lo largo del tiempo';
-$pia_lang['Device_Shortcut_OnlineChart_b'] = 'horas';
 $pia_lang['Device_TableHead_Name'] = 'Nombre';
 $pia_lang['Device_TableHead_Owner'] = 'Propietario';
 $pia_lang['Device_TableHead_Type'] = 'Tipo';

front/presence.php

@@ -114,7 +114,7 @@ if ($_SESSION["login"] != 1)
           <div class="col-md-12">
           <div class="box" id="clients">
               <div class="box-header with-border">
-                <h3 class="box-title"><?php echo $pia_lang['Device_Shortcut_OnlineChart_a'];?>  <span class="maxlogage-interval">12</span> <?php echo $pia_lang['Device_Shortcut_OnlineChart_b'];?></h3>
+                <h3 class="box-title"><?php echo $pia_lang['Device_Shortcut_OnlineChart'];?></h3>
               </div>
               <div class="box-body">
                 <div class="chart">

install/pialert.cron

@@ -7,7 +7,9 @@
 #  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
 #-------------------------------------------------------------------------------
 
-0 3 * * 1      python ~/pialert/back/pialert.py update_vendors >~/pialert/log/pialert.vendors.log  2>&1
+TZ=Europe/Berlin
-*/1 * * * *    python ~/pialert/back/pialert.py internet_IP    >~/pialert/log/pialert.IP.log       2>&1
+
-*/5 * * * *    python ~/pialert/back/pialert.py 1              >~/pialert/log/pialert.1.log        2>&1
+0 3 * * 1       python /home/pi/pialert/back/pialert.py update_vendors >/home/pi/pialert/log/pialert.vendors.log  2>&1
-#*/15 * * * *   python ~/pialert/back/pialert.py 15             >~/pialert/log/pialert.15.log       2>&1
+*/3 * * * *     python /home/pi/pialert/back/pialert.py internet_IP    >/home/pi/pialert/log/pialert.IP.log       2>&1
+*/5 * * * *     python /home/pi/pialert/back/pialert.py 1              >/home/pi/pialert/log/pialert.1.log        2>&1
+

tar/create_tar.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+# ------------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  create_tar.sh - Create the tar file for installation
+# ------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+# ------------------------------------------------------------------------------
+
+PIALERT_DEV_PATH=$(pwd)
+cd $PIALERT_DEV_PATH'/../'
+
+PIALERT_VERSION=`awk '$1=="VERSION" { print $3 }' config/version.conf | tr -d \'`
+echo $PIALERT_VERSION
+
+# ------------------------------------------------------------------------------
+ls -l tar/pialert*.tar
+tar tvf tar/pialert_latest.tar | wc -l
+rm tar/pialert_*.tar
+
+# ------------------------------------------------------------------------------
+tar cvf tar/pialert_$PIALERT_VERSION.tar --exclude="tar" --exclude=".git" --exclude=".gitignore" ./ | wc -l
+
+#ln -s pialert_$PIALERT_VERSION.tar tar/pialert_latest.tar
+cp tar/pialert_$PIALERT_VERSION.tar tar/pialert_latest.tar
+#ls -l tar/pialert*.tar