Disabling cache to fix build issues 🩹

FIX unable to send mail with publisher mail plugin - thanks to @LouisOb 🙏

.github/workflows/docker_dev.yml

@@ -74,6 +74,10 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      # # Disable this after use
+      # - name: Prune Docker Builder
+      #   run: docker builder prune --force
+
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
@@ -82,5 +86,6 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=ghcr.io/jokob-sk/pi.alert:buildcache
-          cache-to: type=registry,ref=ghcr.io/jokob-sk/pi.alert:buildcache,mode=max
+          # # ⚠ disable cache if build is failing to download debian packages
+          # cache-from: type=registry,ref=ghcr.io/jokob-sk/pi.alert:buildcache
+          # cache-to: type=registry,ref=ghcr.io/jokob-sk/pi.alert:buildcache,mode=max

.github/workflows/docker_prod.yml

@@ -80,5 +80,6 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=ghcr.io/jokob-sk/pi.alert:buildcache
-          cache-to: type=registry,ref=ghcr.io/jokob-sk/pi.alert:buildcache,mode=max
+          # # ⚠ disable cache if build is failing to download debian packages
+          # cache-from: type=registry,ref=ghcr.io/jokob-sk/pi.alert:buildcache
+          # cache-to: type=registry,ref=ghcr.io/jokob-sk/pi.alert:buildcache,mode=max

.gitignore

@@ -1,5 +1,6 @@
 .vscode
 .DS_Store
+config/*
 config/pialert.conf
 db/*
 db/pialert.db
@@ -15,3 +16,5 @@ __pycache__/
 
 **/last_result.log
 **/script.log
+**/pialert.conf_bak
+**/pialert.db_bak

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 # default UID and GID
 ENV USER=pi USER_ID=1000 USER_GID=1000  PORT=20211 
@@ -7,15 +7,9 @@ ENV USER=pi USER_ID=1000 USER_GID=1000  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 tini snmp ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo nginx-light php php-cgi php-fpm php-sqlite3 php-curl sqlite3 dnsutils net-tools python3 iproute2 nmap python3-pip zip systemctl usbutils traceroute -y \
-    && pip3 install requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi \
-    && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
-    && apt-get clean autoclean \
-    && apt-get autoremove \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /var/www/html \
-    && ln -s /home/pi/pialert/front /var/www/html 
+RUN apt-get update 
+RUN apt-get install sudo -y 
+
 
 # create pi user and group
 # add root and www-data to pi group so they can r/w files and db
@@ -31,24 +25,26 @@ RUN groupadd --gid "${USER_GID}" "${USER}" && \
 
 COPY --chmod=775 --chown=${USER_ID}:${USER_GID} . /home/pi/pialert/
 
-# Pi.Alert
-RUN rm /etc/nginx/sites-available/default \
-    && ln -s /home/pi/pialert/install/default /etc/nginx/sites-available/default \
-    && sed -ie 's/listen 80/listen '${PORT}'/g' /etc/nginx/sites-available/default \
-    # run the hardware vendors update
-    && /home/pi/pialert/back/update_vendors.sh \
-    # Create a backup of the pialert.conf to be used if the user didn't supply a configuration file
-    && cp /home/pi/pialert/config/pialert.conf /home/pi/pialert/back/pialert.conf_bak \
-    # Create a backup of the pialert.db to be used if the user didn't supply a database
-    && cp /home/pi/pialert/db/pialert.db /home/pi/pialert/back/pialert.db_bak \
-    # Create a buildtimestamp.txt to later check if a new version was released
-    && date +%s > /home/pi/pialert/front/buildtimestamp.txt
 
-ENTRYPOINT ["tini", "--"]
+# ❗ IMPORTANT - if you modify this file modify the /install/install_dependecies.sh file as well ❗ 
+
+RUN apt-get install -y \
+    tini snmp ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo \
+    nginx-light php php-cgi php-fpm php-sqlite3 php-curl sqlite3 dnsutils net-tools \
+    python3 iproute2 nmap python3-pip zip systemctl usbutils traceroute
+
+# Alternate dependencies
+RUN apt-get install nginx nginx-core mtr php-fpm php8.2-fpm php-cli php8.2 php8.2-sqlite3 -y
+RUN phpenmod -v 8.2 sqlite3 
+
+# Setup virtual python environment and use pip3 to install packages
+RUN apt-get install -y python3-venv
+RUN python3 -m venv myenv
+RUN /bin/bash -c "source myenv/bin/activate && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && pip3 install requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet"
+
+# Create a buildtimestamp.txt to later check if a new version was released
+RUN date +%s > /home/pi/pialert/front/buildtimestamp.txt
 
 CMD ["/home/pi/pialert/dockerfiles/start.sh"]
 
 
-
-
-## command to build docker:  DOCKER_BUILDKIT=1  docker build . --iidfile dockerID

README.md

@@ -1,99 +1,91 @@
-# Pi.Alert
-<!--- --------------------------------------------------------------------- --->
+# 💻🔍 Network security scanner & notification framework
 
-💻🔍 WIFI / LAN intruder detector.
+Get visibility of what's going on on your WIFI/LAN network. Scan for devices, port changes and get alerts if unknown devices or changes are found. Write your own [Plugins](https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins#readme) with auto-generated UI and in-build notification system. 
 
-Scans for devices connected to your WIFI / LAN and alerts you if new and unknown devices are found.
-
-![Main screen][main]
-
-# 🐳 Docker image 
 [![Docker](https://img.shields.io/github/actions/workflow/status/jokob-sk/Pi.Alert/docker_prod.yml?label=Build&logo=GitHub)](https://github.com/jokob-sk/Pi.Alert/actions/workflows/docker_prod.yml)
 [![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/Pi.Alert?color=40ba12&label=Committed&logo=GitHub&logoColor=fff)](https://github.com/jokob-sk/Pi.Alert)
 [![Docker Size](https://img.shields.io/docker/image-size/jokobsk/pi.alert?label=Size&logo=Docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/pi.alert)
 [![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/pi.alert?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/pi.alert)
 [![Docker Pushed](https://img.shields.io/badge/dynamic/json?color=0aa8d2&logoColor=fff&label=Pushed&query=last_updated&url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fjokobsk%2Fpi.alert%2F&logo=docker&link=http://left&link=https://hub.docker.com/repository/docker/jokobsk/pi.alert)](https://hub.docker.com/r/jokobsk/pi.alert)
 
-🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/pi.alert) | 📑 [Docker guide](https://github.com/jokob-sk/Pi.Alert/blob/main/dockerfiles/README.md) | 🆕 [Release notes](https://github.com/jokob-sk/Pi.Alert/releases) | 📚 [All Docs](https://github.com/jokob-sk/Pi.Alert/tree/main/docs)
+  | 🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/pi.alert) |  📑 [Docker guide](https://github.com/jokob-sk/Pi.Alert/blob/main/dockerfiles/README.md) |🆕 [Release notes](https://github.com/jokob-sk/Pi.Alert/releases) | 📚 [All Docs](https://github.com/jokob-sk/Pi.Alert/tree/main/docs) |
+  |----------------------|----------------------| ----------------------|  ----------------------| 
 
-## 🔍 Scan Methods
-The system continuously scans the network for, **New devices**, **New connections** (re-connections), **Disconnections**, **"Always Connected" devices down**, Devices **IP changes** and **Internet IP address changes**. Discovery & scan methods include:
-  - **arp-scan**. The arp-scan system utility is used to search for devices on the network using arp frames.
-  - **Pi-hole - DB import**. The PiHole database is used as a source for events for devices        
-  - **Pi-hole - DHCP leases**. Import of devices from the PiHole dhcp.leases file
-  - **Generic DHCP leases**. Import of devices from the generic dhcp.leases file
-  - **UNIFI import**. Import of devices from the UNIFI controller
-  - **SNMP-enabled router import**. Import of devices from an SNMP-enabled router
+## Why PiAlert❓ 
 
-## 🧩 Integrations 
-   - [Apprise](https://hub.docker.com/r/caronc/apprise), [Pushsafer](https://www.pushsafer.com/), [NTFY](https://ntfy.sh/)
-   - [Webhooks](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/WEBHOOK_N8N.md) 
-   - [Home Assistant](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/HOME_ASSISTANT.md) 
-   - [API endpoint](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/API.md)
-   - [Plugin system](https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins) for custom scripts monitoring and framework for extending the app
+Most of us don't know what's going on on our home network, but we want our family and data to be safe.  _Command-line tools_ are great, but the output can be _hard to understand_ and action if you are not a network specialist.
 
-# 📥 Installation
-<!--- --------------------------------------------------------------------- --->
+PiAlert gives you peace of mind. _Visualize and immediately report 📬_ what is going on in your network - this is the first step to enhance your _network security 🔐_. 
 
- ⚠ Only tested as a [docker container - follow the guide here](dockerfiles/README.md). 
- > Check out [leiweibau's fork](https://github.com/leiweibau/Pi.Alert/) if you want to install Pi.Alert on the server directly or check instructions for [pucherot's original code](https://github.com/pucherot/Pi.Alert/)
+_PiAlert combines several network and other scanning tools 🔍 with notifications 📧 into one user-friendly package 📦_. You get an overview of network device Sessions, Connected devices, Events, Presence, Down alerts, and IPs. You can schedule Nmap scans to detect changes in device ports and visualize your Network topology (even with undetectable, dummy devices).
 
-# 📑 Features   
-  - Display:
-    - Sessions, Connected devices, Favorites, Events, Presence, Concurrent devices, Down alerts, IP's
-    - Manual Nmap scans, Optional speedtest for Device "Internet"
-    - Simple Network relationship display
-  - Maintenance tasks and Settings like:    
-    - Theme Selection (blue, red, green, yellow, black, purple) and Light/Dark-Mode Switch        
-    - DB maintenance, Backup, Restore tools and CSV Export / Import
-    - Simple login Support
-  - 🌟[Plugin system](https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins)
-    - Create custom plugins with automatically generated settings and UI. 
-    - Monitor anything for changes
-    - Check the [instructions](https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins) carefully if you are up for a challenge! Current plugins include:
-      - Detecting Rogue DHCP servers via NMAP
-      - Monitoring HTTP status changes of domains/URLs 
-      - Import devices from DHCP.leases files, a UniFi controller, or an SNMP enabled router
-      - Creation of dummy devices to visualize your [network map](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/NETWORK_TREE.md)
+Setup a _kill switch ☠_ for your network via a smart plug with the available [Home Assistant](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/HOME_ASSISTANT.md) integration. Implement custom automations with the [CSV device Exports 📤](https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins/csv_backup), [Webhooks](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/WEBHOOK_N8N.md), or [API endpoints](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/API.md) features. 
 
-  | ![Screen 1][screen1] | ![Screen 2][screen2] | ![Screen 5][screen5]  |
+Extend the app if you want to create your own scanner [Plugin](https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins#readme) and handle the results and notifications in PiAlert. 
+
+Looking forward to your contributions if you decide to share your work with the community ❤.
+
+  | ![Main screen][main] | ![Screen 1][screen1]  | ![Screen 5][screen5] |
   |----------------------|----------------------| ----------------------| 
   | ![Screen 3][screen3] | ![Screen 4][screen4] | ![Screen 6][screen6]  |  
   | ![Screen 8][screen8] | ![Report 2][report2] | ![Screen 9][screen9]  | 
 
+## Scan Methods, Notifications, Integration, Extension system
 
-### 🔗 Other Alternatives
+| Features    | Details    | 
+|-------------|-------------|
+|      🔍     |   The app scans your network for, **New devices**, **New connections** (re-connections), **Disconnections**, **"Always Connected" devices down**, Devices **IP changes** and **Internet IP address changes**. Discovery & scan methods include: **arp-scan**.  **Pi-hole - DB import**,  **Pi-hole - DHCP leases import**, **Generic DHCP leases import**. **UNIFI controller import**, **SNMP-enabled router import**. Check the [Plugins](https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins#readme) docs for more info on individual scans. |
+|📧           | Send notifications to more than 80+ services, including Telegram via [Apprise](https://hub.docker.com/r/caronc/apprise), or use [Pushsafer](https://www.pushsafer.com/), or [NTFY](https://ntfy.sh/). |
+|🧩           | Feed your data and device changes into [Home Assistant](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/HOME_ASSISTANT.md), read [API endpoints](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/API.md), or use [Webhooks](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/WEBHOOK_N8N.md) to setup custom automation flows.  |
+|➕           | Build your own scanners with the [Plugin system](https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins#readme) |
 
-  - [WatchYourLAN](https://github.com/aceberg/WatchYourLAN) - Lightweight network IP scanner with web GUI (Open source)
-  - [Fing](https://www.fing.com/) - Network scanner app for your Internet security (Commercial, Phone App, Proprietary hardware)
 
-### 📚 Documentation
+## Installation & Documentation
+<!--- --------------------------------------------------------------------- --->
 
-- Initial Docker Setup: [Docker instructions](https://github.com/jokob-sk/Pi.Alert/blob/main/dockerfiles/README.md)
-- App Usage and Configuration: [All Documentation](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/README.md)
+| Docs        | Link    | 
+|-------------|-------------|
+| 📥🐳  | [Docker instructions](https://github.com/jokob-sk/Pi.Alert/blob/main/dockerfiles/README.md) 
+| 📥💻  | [HW install (experimental 🧪)](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/HW_INSTALL.md) |
+| 📚     | [All Documentation](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/README.md) (App Usage and Configuration) |
+ 
+> Other Alternatives
+>
+> - Check out [leiweibau's on HW installed fork](https://github.com/leiweibau/Pi.Alert/) (maintained)
+> - Check instructions for [pucherot's original code](https://github.com/pucherot/Pi.Alert/) (unmaintained)
+> - [WatchYourLAN](https://github.com/aceberg/WatchYourLAN) - Lightweight network IP scanner with web GUI (Open source)
+> - [Fing](https://www.fing.com/) - Network scanner app for your Internet security (Commercial, Phone App, Proprietary hardware)
+
+## ❤ Support me
+
+Get:
+- Regular updates to keep your data and family safe 🔄 
+- Better and more functionality➕
+- I don't get burned out and the app survives longer🔥🤯
+- Quicker and better support with issues 🆘
+- Less grumpy me 😄
+
+| [![GitHub](https://i.imgur.com/emsRCPh.png)](https://github.com/sponsors/jokob-sk) | [![Buy Me A Coffee](https://i.imgur.com/pIM6YXL.png)](https://www.buymeacoffee.com/jokobsk) | [![Patreon](https://i.imgur.com/MuYsrq1.png)](https://www.patreon.com/user?u=84385063) | 
+| --- | --- | --- | 
+
+- Bitcoin: `1N8tupjeCK12qRVU2XrV17WvKK7LCawyZM`
+- Ethereum: `0x6e2749Cb42F4411bc98501406BdcD82244e3f9C7`
+
+> 📧 Email me at [jokob@duck.com](mailto:jokob@duck.com?subject=PiAlert) if you want to get in touch or if I should add other sponsorship platforms.
+
+## Everything else
+<!--- --------------------------------------------------------------------- --->
 
 ### License
-  GPL 3.0 | [Read more here](LICENSE.txt) | Source of the [animated GIF (Loading Animation)](https://commons.wikimedia.org/wiki/File:Loading_Animation.gif) | Source of the [selfhosted Fonts](https://github.com/adobe-fonts/source-sans)
+>  GPL 3.0 | [Read more here](LICENSE.txt) | Source of the [animated GIF (Loading Animation)](https://commons.wikimedia.org/wiki/File:Loading_Animation.gif) | Source of the [selfhosted Fonts](https://github.com/adobe-fonts/source-sans)
   
-### 🥇 Special thanks 
+### Special thanks 
 
-  This code is a collaborative body of work, with special thanks to: 
+This code is a collaborative body of work, with special thanks to: 
 
-   - 🏆 [pucherot/Pi.Alert](https://github.com/pucherot/Pi.Alert) is the original creator od PiAlert
-      - [leiweibau](https://github.com/leiweibau/Pi.Alert): Dark mode (and much more)
-      - [Macleykun](https://github.com/Macleykun): Help with Dockerfile clean-up
-      - [Final-Hawk](https://github.com/Final-Hawk): Help with NTFY, styling and other fixes
-      - [TeroRERO](https://github.com/terorero): Spanish translation
-      - [Data-Monkey](https://github.com/Data-Monkey): Split-up of the python.py file and more     
-      - Please see the [Git contributors](https://github.com/jokob-sk/Pi.Alert/graphs/contributors) for a full list of people and their contributions to the project
-
-## ☕ Support me
-
-<a href="https://github.com/sponsors/jokob-sk" target="_blank"><img src="https://i.imgur.com/X6p5ACK.png" alt="Sponsor Me on GitHub" style="height: 30px !important;width: 117px !important;" width="150px" ></a>
-<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="117px" height="30px" ></a>
-<a href="https://www.patreon.com/user?u=84385063" target="_blank"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Patreon_logo_with_wordmark.svg/512px-Patreon_logo_with_wordmark.svg.png" alt="Support me on patreon" style="height: 30px !important;width: 117px !important;" width="117px" ></a>
-
-BTC: 1N8tupjeCK12qRVU2XrV17WvKK7LCawyZM
+> [pucherot/Pi.Alert](https://github.com/pucherot/Pi.Alert) (the original creator of PiAlert), [leiweibau](https://github.com/leiweibau/Pi.Alert): Dark mode (and much more), [Macleykun](https://github.com/Macleykun) (Help with Dockerfile clean-up) [Final-Hawk](https://github.com/Final-Hawk) (Help with NTFY, styling and other fixes), [TeroRERO](https://github.com/terorero) (Spanish translations), [Data-Monkey](https://github.com/Data-Monkey), (Split-up of the python.py file and more), [cvc90](https://github.com/cvc90) (Spanish translation and various UI work) to name a few...
+>
+> Please see the [Git contributors](https://github.com/jokob-sk/Pi.Alert/graphs/contributors) for a full list of people and their contributions to the project
 
 <!--- --------------------------------------------------------------------- --->
 [main]:    ./docs/img/devices_split.png       "Main screen"

back/pialert.conf

@@ -15,13 +15,13 @@
 #
 # Scan multiple interfaces (eth1 and eth0):
 # SCAN_SUBNETS    = [ '192.168.1.0/24 --interface=eth1', '192.168.1.0/24 --interface=eth0' ]
+
 SCAN_SUBNETS=['192.168.1.0/24 --interface=eth1']
-PRINT_LOG=False
+
 TIMEZONE='Europe/Berlin'
 PIALERT_WEB_PROTECTION=False
 PIALERT_WEB_PASSWORD='8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92'
 INCLUDED_SECTIONS=['internet','new_devices','down_devices','events']
-SCAN_CYCLE_MINUTES=5
 DAYS_TO_KEEP_EVENTS=90
 # Used for generating links in emails. Make sure not to add a trailing slash!
 REPORT_DASHBOARD_URL='http://pi.alert'
@@ -93,25 +93,6 @@ DDNS_PASSWORD='A0000000B0000000C0000000D0000000'
 DDNS_UPDATE_URL='https://api.dynu.com/nic/update?'
 
 
-# PiHole
-#---------------------------
-# if enabled you need to map '/etc/pihole/pihole-FTL.db' in docker-compose.yml
-PIHOLE_ACTIVE=False
-# if enabled you need to map '/etc/pihole/dhcp.leases' in docker-compose.yml
-DHCP_ACTIVE=False
-
-
-# Pholus
-#---------------------------
-PHOLUS_ACTIVE=False
-PHOLUS_TIMEOUT=120
-PHOLUS_FORCE=False
-PHOLUS_DAYS_DATA=7
-PHOLUS_RUN='once'
-PHOLUS_RUN_TIMEOUT=600
-PHOLUS_RUN_SCHD='0 4 * * *'
-
-
 #-------------------IMPORTANT INFO-------------------#
 #   This file is ingested by a python script, so if  #
 #        modified it needs to use python syntax      #

back/report_sample.html

@@ -46,6 +46,7 @@
                                   <th width='120px' style='color:#F0F0F0' bgcolor='#909090'  >Event Type</th>
                                   <th width='120px' style='color:#F0F0F0' bgcolor='#909090'  >Device name</th>
                                   <th width='120px' style='color:#F0F0F0' bgcolor='#909090'  >Comments</th>
+                                  <th width='120px' style='color:#F0F0F0' bgcolor='#909090'  >Device Vendor</th>
                                </tr>
                                <tr>
                                   <td><a href="http://192.168.1.1:20211/deviceDetails.php?mac=00:00:00:ef:a5:6c">00:00:00:ef:a5:6c</a></td>
@@ -54,6 +55,7 @@
                                   <td>New Device</td>
                                   <td>(name not found)</td>
                                   <td></td>
+                                  <td></td>
                                </tr>
                                <tr>
                                   <td><a href="http://192.168.1.1:20211/deviceDetails.php?mac=00:00:00:ef:a5:6c">00:00:00:ef:a5:6c</a></td>
@@ -62,6 +64,7 @@
                                   <td>New Device</td>
                                   <td>(name not found)</td>
                                   <td></td>
+                                  <td></td>
                                </tr>
                             </table>
                          </td>
@@ -83,6 +86,7 @@
                                         <th width='120px' style='color:#F0F0F0' bgcolor='#909090'  >Event Type</th>
                                         <th width='120px' style='color:#F0F0F0' bgcolor='#909090'  >Device name</th>
                                         <th width='120px' style='color:#F0F0F0' bgcolor='#909090'  >Comments</th>
+                                        <th width='120px' style='color:#F0F0F0' bgcolor='#909090'  >Device Vendor</th>
                                      </tr>
                                      <tr>
                                         <td><a href="http://192.168.1.1:20211/deviceDetails.php?mac=00:00:00:ef:a5:6c">00:00:00:ef:a5:6c</a></td>

back/report_template.html

@@ -29,7 +29,7 @@
         <tr>
         <td>
             <table width=100% border=0 bgcolor=#4b99d3 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 15px; text-align:center; color:#ffffff">            <tr>
-                <td width=100%> Report Date: <b><REPORT_DATE></b> </td>
+                <td width=100% bgcolor="#3c8dbc"> Report Date: <b><REPORT_DATE></b> </td>
             </tr>
             </table>
         </td>
@@ -38,7 +38,7 @@
         <tr>
         <td  height=200 valign=top style="padding: 10px">
             
-                <INTERNET_TABLE>
+                
                 <NEW_DEVICES_TABLE>            
                 <DOWN_DEVICES_TABLE>            
                 <EVENTS_TABLE>                            
@@ -51,7 +51,7 @@
         <td>
             <table width=100% bgcolor=#3c8dbc cellpadding=5px cellspacing=0 style="font-size: 13px; font-weight: bold; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px;">
                <tr>
-                    <td width=50% style="text-align:center;color: white;">
+                    <td width=50% style="text-align:center;color: white;" bgcolor="#3c8dbc">
 						<a href="https://github.com/jokob-sk/Pi.Alert" target="_blank" style="color: white">Pi.Alert</a>
 						<a href=".." target="_blank" style="color: white"> (<SERVER_NAME>)</a>
 						<br><span style="display:inline-block;color: white; transform: rotate(180deg)">&copy;</span>2020 Puche (2022+ 

back/report_template.txt

@@ -1,8 +1,7 @@
 Report Date: <REPORT_DATE>
 Server:      <SERVER_NAME>
 
-<SECTION_NEW_DEVICES>
-<SECTION_DEVICES_DOWN>
-<SECTION_EVENTS>
-<SECTION_INTERNET>
+<NEW_DEVICES_TABLE>
+<DOWN_DEVICES_TABLE>
+<EVENTS_TABLE>
 <PLUGINS_TABLE>

back/report_template_new_version.html

@@ -25,11 +25,16 @@
             Pi.Alert Report
         </td>
         </tr>
+        <tr> 
+            <td bgcolor=#2656f1 width=100% align=center style="padding: 20px 10px 10px 10px; font-size: 20px; font-weight: bold; color:#ffffff; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2)">
+                <a style="color:#ffffff;cursor:pointer;" href="https://github.com/jokob-sk/Pi.Alert/releases">🆕 New version available 🆕</a>
+            </td>             
+        </tr>
         
         <tr>
         <td>
             <table width=100% border=0 bgcolor=#4b99d3 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 15px; text-align:center; color:#ffffff">            <tr>
-                <td width=100%> Report Date: <b><REPORT_DATE></b> </td>
+                <td width=100% bgcolor="#3c8dbc"> Report Date: <b><REPORT_DATE></b> </td>
             </tr>
             </table>
         </td>
@@ -38,7 +43,6 @@
         <tr>
         <td  height=200 valign=top style="padding: 10px">            
                 
-                <INTERNET_TABLE>
                 <NEW_DEVICES_TABLE>            
                 <DOWN_DEVICES_TABLE>            
                 <EVENTS_TABLE>                            
@@ -51,7 +55,7 @@
         <td>
             <table width=100% bgcolor=#3c8dbc cellpadding=5px cellspacing=0 style="font-size: 13px; font-weight: bold; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px;">
                <tr>
-                    <td width=50% style="text-align:center;color: white;">
+                    <td width=50% style="text-align:center;color: white;" bgcolor="#3c8dbc">
 						<a href="https://github.com/jokob-sk/Pi.Alert" target="_blank" style="color: white">Pi.Alert</a>
 						<a href=".." target="_blank" style="color: white"> (<SERVER_NAME>)</a>
 						<br><span style="display:inline-block;color: white; transform: rotate(180deg)">&copy;</span>2020 Puche (2022+ 

back/update_vendors.sh

@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
 # ------------------------------------------------------------------------------
 #  Pi.Alert
 #  Open Source Network Guard / WIFI & LAN intrusion detector 
@@ -14,19 +15,21 @@
 #    /usr/share/ieee-data
 #    /var/lib/ieee-data
 # ----------------------------------------------------------------------
-
+echo "---------------------------------------------------------"
+echo "[INSTALL]                           Run update_vendors.sh"
+echo "---------------------------------------------------------"
 
 # ----------------------------------------------------------------------
 echo Updating... /usr/share/ieee-data/
-cd /usr/share/ieee-data/
+cd /usr/share/ieee-data/ || { echo "could not enter /usr/share/ieee-data directory"; exit 1; }
 
 sudo mkdir -p 2_backup
-sudo cp *.txt 2_backup
-sudo cp *.csv 2_backup
+sudo cp -- *.txt 2_backup
+sudo cp -- *.csv 2_backup
 echo ""
 echo Download Start
 echo ""
-sudo curl $1  -LO https://standards-oui.ieee.org/iab/iab.csv \
+sudo curl "$1"  -LO https://standards-oui.ieee.org/iab/iab.csv \
               -LO https://standards-oui.ieee.org/iab/iab.txt \
               -LO https://standards-oui.ieee.org/oui28/mam.csv \
               -LO https://standards-oui.ieee.org/iab/iab.txt \
@@ -42,15 +45,18 @@ echo Download Finished
 # ----------------------------------------------------------------------
 echo ""
 echo Updating... /usr/share/arp-scan/
-cd /usr/share/arp-scan
+cd /usr/share/arp-scan || { echo "could not enter /usr/share/arp-scan directory"; exit 1; }
 
 sudo mkdir -p 2_backup
-sudo cp *.txt 2_backup
+sudo cp -- *.txt 2_backup
 
 # Update from /usb/lib/ieee-data
 sudo get-iab -v
 sudo get-oui -v
 
+# make files readable
+sudo chmod +r /usr/share/arp-scan/ieee-oui.txt
+
 # Update from ieee website
 # sudo get-iab -v -u http://standards-oui.ieee.org/iab/iab.txt
 # sudo get-oui -v -u http://standards-oui.ieee.org/oui/oui.txt

back/webhook_json_sample.json

@@ -1,87 +1,76 @@
 [
-    {
-        "headers": {
-            "host": "192.168.1.82:5678",
-            "user-agent": "curl/7.74.0",
-            "accept": "*/*",
-            "content-type": "application/json",
-            "content-length": "872"
-        },
-        "params": {},
-        "query": {},
-        "body": {
-            "username": "Pi.Alert",
-            "text": "There are new notifications",
-            "attachments": [
-                {
-                    "title": "Pi.Alert Notifications",
-                    "title_link": "",
-                    "text": {
-                      "internet": [],
-                      "new_devices": [{
-                        "MAC": "74:ac:74:ac:74:ac",
-                        "Datetime": "2023-01-30 22:15:09",
-                        "IP": "192.168.1.1",
-                        "Event Type": "New Device",
-                        "Device name": "(name not found)",
-                        "Comments": null
-                      }],
-                      "down_devices": [],
-                      "events": [{
-                        "MAC": "74:ac:74:ac:74:ac",
-                        "Datetime": "2023-01-30 22:15:09",
-                        "IP": "192.168.1.92",
-                        "Event Type": "Disconnected",
-                        "Device name": "(name not found)",
-                        "Comments": null
-                      }, {
-                        "MAC": "74:ac:74:ac:74:ac",
-                        "Datetime": "2023-01-30 22:15:09",
-                        "IP": "192.168.1.150",
-                        "Event Type": "Disconnected",
-                        "Device name": "(name not found)",
-                        "Comments": null
-                      }],
-                      "ports": [{
-                        "new": {
-                          "Name": "New device",
-                          "MAC": "74:ac:74:ac:74:ac",
-                          "Port": "22/tcp",
-                          "State": "open",
-                          "Service": "ssh",
-                          "Extra": ""
-                        }
-                      }, {
-                        "new": {
-                          "Name": "New device",
-                          "MAC": "74:ac:74:ac:74:ac",
-                          "Port": "53/tcp",
-                          "State": "open",
-                          "Service": "domain",
-                          "Extra": ""
-                        }
-                      }, {
-                        "new": {
-                          "Name": "New device",
-                          "MAC": "74:ac:74:ac:74:ac",
-                          "Port": "80/tcp",
-                          "State": "open",
-                          "Service": "http",
-                          "Extra": ""
-                        }
-                      }, {
-                        "new": {
-                          "Name": "New device",
-                          "MAC": "74:ac:74:ac:74:ac",
-                          "Port": "443/tcp",
-                          "State": "open",
-                          "Service": "https",
-                          "Extra": ""
-                        }
-                      }]
-                    }
-                }
+  {
+    "headers": {
+      "host": "192.168.1.82:5678",
+      "user-agent": "curl/7.74.0",
+      "accept": "*/*",
+      "content-type": "application/json",
+      "content-length": "872"
+    },
+    "params": {},
+    "query": {},
+    "body": {
+      "username": "Pi.Alert",
+      "text": "There are new notifications",
+      "attachments": [
+        {
+          "title": "Pi.Alert Notifications",
+          "title_link": "",
+          "text": {
+            "internet": [],
+            "new_devices": [
+              {
+                "MAC": "74:ac:74:ac:74:ac",
+                "Datetime": "2023-01-30 22:15:09",
+                "IP": "192.168.1.1",
+                "Event Type": "New Device",
+                "Device name": "(name not found)",
+                "Comments": null,
+                "Device Vendor": null
+              }
+            ],
+            "down_devices": [],
+            "events": [
+              {
+                "MAC": "74:ac:74:ac:74:ac",
+                "Datetime": "2023-01-30 22:15:09",
+                "IP": "192.168.1.92",
+                "Event Type": "Disconnected",
+                "Device name": "(name not found)",
+                "Comments": null,
+                "Device Vendor": null
+              },
+              {
+                "MAC": "74:ac:74:ac:74:ac",
+                "Datetime": "2023-01-30 22:15:09",
+                "IP": "192.168.1.150",
+                "Event Type": "Disconnected",
+                "Device name": "(name not found)",
+                "Comments": null,
+                "Device Vendor": null
+              }
+            ],
+            "plugins": [
+              {
+                "Index": 138,
+                "Plugin": "INTRSPD",
+                "Object_PrimaryID": "Speedtest",
+                "Object_SecondaryID": "2023-10-08 02:01:16+02:00",
+                "DateTimeCreated": "2023-10-08 02:01:16",
+                "DateTimeChanged": "2023-10-08 02:32:15",
+                "Watched_Value1": "-1",
+                "Watched_Value2": "-1",
+                "Watched_Value3": "null",
+                "Watched_Value4": "null",
+                "Status": "missing-in-last-scan",
+                "Extra": "null",
+                "UserData": "null",
+                "ForeignKey": "null"
+              }
             ]
+          }
         }
+      ]
     }
+  }
 ]

config/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

db/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

docker-compose.yml

@@ -11,28 +11,30 @@ services:
     network_mode: host
     # restart: unless-stopped
     volumes:
-      - ${APP_DATA_LOCATION}/pialert_dev/config:/home/pi/pialert/config
-      # - ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config
-      - ${APP_DATA_LOCATION}/pialert_dev/db:/home/pi/pialert/db      
-      # - ${APP_DATA_LOCATION}/pialert/db:/home/pi/pialert/db           
+      # - ${APP_DATA_LOCATION}/pialert_dev/config:/home/pi/pialert/config
+      - ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config
+      # - ${APP_DATA_LOCATION}/pialert_dev/db:/home/pi/pialert/db      
+      - ${APP_DATA_LOCATION}/pialert/db:/home/pi/pialert/db           
       # (optional) useful for debugging if you have issues setting up the container
       - ${LOGS_LOCATION}:/home/pi/pialert/front/log      
       # ---------------------------------------------------------------------------
       # DELETE START anyone trying to use this file: comment out / delete BELOW lines, they are only for development purposes
       - ${APP_DATA_LOCATION}/pialert/dhcp_samples/dhcp1.leases:/mnt/dhcp1.leases
       - ${APP_DATA_LOCATION}/pialert/dhcp_samples/dhcp2.leases:/mnt/dhcp2.leases      
-      - ${APP_DATA_LOCATION}/pialert/dhcp_samples/dhcp_pihole.leases:/etc/pihole/dhcp.leases      
+      - ${APP_DATA_LOCATION}/pialert/dhcp_samples/pihole_dhcp_full.leases:/etc/pihole/dhcp.leases      
+      - ${APP_DATA_LOCATION}/pialert/dhcp_samples/pihole_dhcp_2.leases:/etc/pihole/dhcp2.leases      
       - ${APP_DATA_LOCATION}/pihole/etc-pihole/pihole-FTL.db:/etc/pihole/pihole-FTL.db    
       - ${DEV_LOCATION}/pialert:/home/pi/pialert/pialert            
-      - ${DEV_LOCATION}/back/report_template.html:/home/pi/pialert/back/report_template.html
-      - ${DEV_LOCATION}/back/report_template_new_version.html:/home/pi/pialert/back/report_template_new_version.html
-      - ${DEV_LOCATION}/back/report_template.txt:/home/pi/pialert/back/report_template.txt      
       - ${DEV_LOCATION}/dockerfiles:/home/pi/pialert/dockerfiles
-      - ${APP_DATA_LOCATION}/pialert/php.ini:/etc/php/7.4/fpm/php.ini      
-      # - ${DEV_LOCATION}/front/api:/home/pi/pialert/front/api
+      - ${APP_DATA_LOCATION}/pialert/php.ini:/etc/php/8.2/fpm/php.ini      
+      - ${DEV_LOCATION}/install:/home/pi/pialert/install
       - ${DEV_LOCATION}/front/css:/home/pi/pialert/front/css
       - ${DEV_LOCATION}/front/lib/AdminLTE:/home/pi/pialert/front/lib/AdminLTE
       - ${DEV_LOCATION}/front/js:/home/pi/pialert/front/js
+      - ${DEV_LOCATION}/dockerfiles/start.sh:/home/pi/pialert/dockerfiles/start.sh
+      - ${DEV_LOCATION}/dockerfiles/user-mapping.sh:/home/pi/pialert/dockerfiles/user-mapping.sh
+      - ${DEV_LOCATION}/install/install.sh:/home/pi/pialert/install/install.sh      
+      - ${DEV_LOCATION}/install/install_dependencies.sh:/home/pi/pialert/install/install_dependencies.sh      
       - ${DEV_LOCATION}/front/api:/home/pi/pialert/front/api
       - ${DEV_LOCATION}/front/php:/home/pi/pialert/front/php      
       - ${DEV_LOCATION}/front/deviceDetails.php:/home/pi/pialert/front/deviceDetails.php

dockerfiles/README.md

@@ -4,9 +4,10 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/pi.alert?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/pi.alert)
 [![Docker Pushed](https://img.shields.io/badge/dynamic/json?color=0aa8d2&logoColor=fff&label=Pushed&query=last_updated&url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fjokobsk%2Fpi.alert%2F&logo=docker&link=http://left&link=https://hub.docker.com/repository/docker/jokobsk/pi.alert)](https://hub.docker.com/r/jokobsk/pi.alert)
 
-# 🐳 A docker image for Pi.Alert 
+# PiAlert 💻🔍 Network security scanner & notification framework
 
-🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/pi.alert) | 📑 [Docker instructions](https://github.com/jokob-sk/Pi.Alert/blob/main/dockerfiles/README.md) | 🆕 [Release notes](https://github.com/jokob-sk/Pi.Alert/releases) | 📚 [All Docs](https://github.com/jokob-sk/Pi.Alert/tree/main/docs)
+  | 🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/pi.alert) |  📑 [Docker guide](https://github.com/jokob-sk/Pi.Alert/blob/main/dockerfiles/README.md) |🆕 [Release notes](https://github.com/jokob-sk/Pi.Alert/releases) | 📚 [All Docs](https://github.com/jokob-sk/Pi.Alert/tree/main/docs) |
+  |----------------------|----------------------| ----------------------|  ----------------------| 
 
 <a href="https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/devices_split.png" target="_blank">
   <img src="https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/devices_split.png" width="300px" />
@@ -15,7 +16,6 @@
   <img src="https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/network.png" width="300px" />
 </a>
 
-
 ## 📕 Basic Usage 
 
 - You will have to run the container on the host network, e.g: 
@@ -35,6 +35,7 @@ docker run -d --rm --network=host \
 | Variable | Description | Default |
 | :------------- |:-------------| -----:|
 | `PORT`      |Port of the web interface  |  `20211` |
+| `LISTEN_ADDR`      |Set the specific IP Address for the listener address for the nginx webserver (web interface). This could be useful when using multiple subnets to hide the web interface from all untrusted networks. |  `0.0.0.0` |
 |`TZ` |Time zone to display stats correctly. Find your time zone [here](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)  |  `Europe/Berlin` |
 |`HOST_USER_GID`    |User ID (UID) to map the user in the container to a server user with sufficient read&write permissions on the mapped files   |  `1000` |
 |`HOST_USER_ID` |User Group ID (GID)  to map the user group in the container to a server user group with sufficient read&write permissions on the mapped files    |    `1000` |
@@ -79,15 +80,32 @@ There are 2 approaches how to get PiHole devices imported. Via the PiHole import
 * `DHCPLSS_RUN`: You need to map `:/etc/pihole/dhcp.leases` in the `docker-compose.yml` file if you enable this setting. 
 * The above setting has to be matched with a corresponding `DHCPLSS_paths_to_check` setting entry (the path in the container must contain `pihole` as PiHole uses a different format of the `dhcp.leases` file).
 
+> [!NOTE]
 > It's recommended to use the same schedule interval for all plugins responsible for discovering new devices.
 
+
+#### 🧭 Community guides
+
+> Primarily use the official installation guides in this document and use community content as suplementary material. Open an issue if you'd like to add your link to the list 🙏 
+
+- 📄 [How to Install Pi.Alert on Your Synology NAS - Marius hosting (English)](https://mariushosting.com/how-to-install-pi-alert-on-your-synology-nas/) (Updated frequently)
+- 📄 [시놀/헤놀에서 네트워크 스캐너 Pi.Alert Docker로 설치 및 사용하기 (Korean)](https://blog.dalso.org/article/%EC%8B%9C%EB%86%80-%ED%97%A4%EB%86%80%EC%97%90%EC%84%9C-%EB%84%A4%ED%8A%B8%EC%9B%8C%ED%81%AC-%EC%8A%A4%EC%BA%90%EB%84%88-pi-alert-docker%EB%A1%9C-%EC%84%A4%EC%B9%98-%EB%B0%8F-%EC%82%AC%EC%9A%A9) (July 2023)
+- ▶ [Pi.Alert auf Synology & Docker by - Jürgen Barth (German)](https://www.youtube.com/watch?v=-ouvA2UNu-A) (March 2023)
+- ▶ [Top Docker Container for Home Server Security - VirtualizationHowto (English)](https://www.youtube.com/watch?v=tY-w-enLF6Q) (March 2023)
+- ▶ [Pi.Alert or WatchYourLAN can alert you to unknown devices appearing on your WiFi or LAN network - Danie van der Merwe (English)](https://www.youtube.com/watch?v=v6an9QG2xF0) (November 2022)
+
+> Ordered by last update time. 
+ 
 ### **Common issues** 
 
 💡 Before creating a new issue, please check if a similar issue was [already resolved](https://github.com/jokob-sk/Pi.Alert/issues?q=is%3Aissue+is%3Aclosed). 
 
 ⚠ Check also common issues and [debugging tips](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/DEBUG_TIPS.md). 
 
-## 📄 Examples
+> [!NOTE]
+> You can bulk-update devices via the [CSV import method](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/DEVICES_BULK_EDITING.md).
+
+## 📄 docker-compose.yml Examples
 
 ### Example 1
 
@@ -217,10 +235,19 @@ Big thanks to <a href="https://github.com/Macleykun">@Macleykun</a> for help and
   <img src="https://avatars.githubusercontent.com/u/26381427?size=50"> 
 </a>
 
-## ☕ Support me
+## ❤ Support me
 
-<a href="https://github.com/sponsors/jokob-sk" target="_blank"><img src="https://i.imgur.com/X6p5ACK.png" alt="Sponsor Me on GitHub" style="height: 30px !important;width: 117px !important;" width="150px" ></a>
-<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="117px" height="30px" ></a>
-<a href="https://www.patreon.com/user?u=84385063" target="_blank"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Patreon_logo_with_wordmark.svg/512px-Patreon_logo_with_wordmark.svg.png" alt="Support me on patreon" style="height: 30px !important;width: 117px !important;" width="117px" ></a>
+Get:
+- Regular updates to keep your data and family safe 🔄 
+- Better and more functionality➕
+- I don't get burned out and the app survives longer🔥🤯
+- Quicker and better support with issues 🆘
+- Less grumpy me 😄
 
-BTC: 1N8tupjeCK12qRVU2XrV17WvKK7LCawyZM
+| [![GitHub](https://i.imgur.com/emsRCPh.png)](https://github.com/sponsors/jokob-sk) | [![Buy Me A Coffee](https://i.imgur.com/pIM6YXL.png)](https://www.buymeacoffee.com/jokobsk) | [![Patreon](https://i.imgur.com/MuYsrq1.png)](https://www.patreon.com/user?u=84385063) | 
+| --- | --- | --- | 
+
+- Bitcoin: `1N8tupjeCK12qRVU2XrV17WvKK7LCawyZM`
+- Ethereum: `0x6e2749Cb42F4411bc98501406BdcD82244e3f9C7`
+
+> 📧 Email me at [jokob@duck.com](mailto:jokob@duck.com?subject=PiAlert) if you want to get in touch or if I should add other sponsorship platforms.

dockerfiles/start.sh

@@ -1,33 +1,141 @@
-#!/bin/sh
-/home/pi/pialert/dockerfiles/user-mapping.sh
+#!/usr/bin/env bash
 
-# # if custom variables not set we do not need to do anything
-# if [ -n "${TZ}" ]; then    
-#   FILECONF=/home/pi/pialert/config/pialert.conf 
-#   if [ -f "$FILECONF" ]; then
-#     sed -ie "s|Europe/Berlin|${TZ}|g" /home/pi/pialert/config/pialert.conf 
-#   else 
-#     sed -ie "s|Europe/Berlin|${TZ}|g" /home/pi/pialert/back/pialert.conf_bak 
-#   fi
-# fi
+echo "---------------------------------------------------------"
+echo "[INSTALL]                                    Run start.sh"
+echo "---------------------------------------------------------"
 
+
+INSTALL_DIR=/home/pi  # Specify the installation directory here
+
+# DO NOT CHANGE ANYTHING BELOW THIS LINE!
+WEB_UI_DIR=/var/www/html/pialert
+NGINX_CONFIG_FILE=/etc/nginx/conf.d/pialert.conf
+OUI_FILE="/usr/share/arp-scan/ieee-oui.txt" # Define the path to ieee-oui.txt and ieee-iab.txt
+# DO NOT CHANGE ANYTHING ABOVE THIS LINE!
+
+# if custom variables not set we do not need to do anything
+if [ -n "${TZ}" ]; then    
+  FILECONF=$INSTALL_DIR/pialert/config/pialert.conf 
+  if [ -f "$FILECONF" ]; then
+    sed -ie "s|Europe/Berlin|${TZ}|g" $INSTALL_DIR/pialert/config/pialert.conf 
+  else 
+    sed -ie "s|Europe/Berlin|${TZ}|g" $INSTALL_DIR/pialert/back/pialert.conf_bak 
+  fi
+fi
+
+# Check if script is run as root
+if [[ $EUID -ne 0 ]]; then
+    echo "This script must be run as root. Please use 'sudo'." 
+    exit 1
+fi
+
+# Run setup scripts
+echo "[INSTALL] Run setup scripts"
+
+"$INSTALL_DIR/pialert/dockerfiles/user-mapping.sh"
+"$INSTALL_DIR/pialert/install/install_dependencies.sh" # if modifying this file transfer the chanegs into the root Dockerfile as well!
+
+echo "[INSTALL] Setup NGINX"
+
+# Remove default NGINX site if it is symlinked, or backup it otherwise
+if [ -L /etc/nginx/sites-enabled/default ] ; then
+  echo "Disabling default NGINX site, removing sym-link in /etc/nginx/sites-enabled"
+  sudo rm /etc/nginx/sites-enabled/default
+elif [ -f /etc/nginx/sites-enabled/default ]; then
+  echo "Disabling default NGINX site, moving config to /etc/nginx/sites-available"
+  sudo mv /etc/nginx/sites-enabled/default /etc/nginx/sites-available/default.bkp_pialert
+fi
+
+# Clear existing directories and files
+if [ -d $WEB_UI_DIR ]; then
+  echo "Removing existing PiAlert web-UI"
+  sudo rm -R $WEB_UI_DIR
+fi
+
+if [ -f $NGINX_CONFIG_FILE ]; then
+  echo "Removing existing PiAlert NGINX config"
+  sudo rm $NGINX_CONFIG_FILE
+fi
+
+# create symbolic link to the pialert install directory
+ln -s $INSTALL_DIR/pialert/front $WEB_UI_DIR
+# create symbolic link to NGINX configuaration coming with PiAlert
+sudo ln -s "$INSTALL_DIR/pialert/install/pialert.conf" /etc/nginx/conf.d/pialert.conf
+
+# Use user-supplied port if set
 if [ -n "${PORT}" ]; then
-  sed -ie 's/listen 20211/listen '${PORT}'/g' /etc/nginx/sites-available/default
+  echo "Setting webserver to user-supplied port ($PORT)"
+  sudo sed -i 's/listen 20211/listen '"$PORT"'/g' /etc/nginx/conf.d/pialert.conf
 fi
 
-# I hope this will fix DB permission issues going forward
-FILEDB=/home/pi/pialert/db/pialert.db
+# Change web interface address if set
+if [ -n "${LISTEN_ADDR}" ]; then
+  echo "Setting webserver to user-supplied address ($LISTEN_ADDR)"
+  sed -ie 's/listen /listen '"${LISTEN_ADDR}":'/g' /etc/nginx/conf.d/pialert.conf
+fi
+
+# Run the hardware vendors update at least once
+echo "[INSTALL] Run the hardware vendors update"
+
+# Check if ieee-oui.txt or ieee-iab.txt exist
+if [ -f "$OUI_FILE" ]; then
+  echo "The file ieee-oui.txt exists. Skipping update_vendors.sh..."
+else
+  echo "The file ieee-oui.txt does not exist. Running update_vendors..."
+
+  # Run the update_vendors.sh script
+  if [ -f "$INSTALL_DIR/pialert/back/update_vendors.sh" ]; then
+    "$INSTALL_DIR/pialert/back/update_vendors.sh"
+  else
+    echo "update_vendors.sh script not found in $INSTALL_DIR."    
+  fi
+fi
+
+# Fixing file permissions
+echo "[INSTALL] Fixing file permissions"
+
+
+chmod -R a+rwx $WEB_UI_DIR
+chmod -R a+rw $INSTALL_DIR/pialert/front/log
+chmod -R a+rwx $INSTALL_DIR
+
+FILEDB=$INSTALL_DIR/pialert/db/pialert.db
+
 if [ -f "$FILEDB" ]; then
-    chown -R www-data:www-data /home/pi/pialert/db/pialert.db
+    chown -R www-data:www-data $INSTALL_DIR/pialert/db/pialert.db
 fi
 
-chmod -R a+rw /home/pi/pialert/front/log
-chmod -R a+rw /home/pi/pialert/config
+echo "[INSTALL] Copy starter pialert.db and pialert.conf if they don't exist"
 
-/etc/init.d/php7.4-fpm start
+# Copy starter pialert.db and pialert.conf if they don't exist
+cp -n "$INSTALL_DIR/pialert/back/pialert.conf" "$INSTALL_DIR/pialert/config/pialert.conf" 
+cp -n "$INSTALL_DIR/pialert/back/pialert.db"  "$INSTALL_DIR/pialert/db/pialert.db" 
+
+
+chmod -R a+rwx $INSTALL_DIR # second time after we copied the files
+chmod -R a+rw $INSTALL_DIR/pialert/config
+sudo chgrp -R www-data  $INSTALL_DIR/pialert
+
+# Check if buildtimestamp.txt doesn't exist
+if [ ! -f "$INSTALL_DIR/pialert/front/buildtimestamp.txt" ]; then
+    # Create buildtimestamp.txt
+    date +%s > "$INSTALL_DIR/pialert/front/buildtimestamp.txt"
+fi
+
+
+# start PHP
+/etc/init.d/php8.2-fpm start
 /etc/init.d/nginx start
 
-# cron -f
-#python /home/pi/pialert/back/pialert.py
-# echo "[DEBUG] DATA MONKEY VERSION ..."
-python /home/pi/pialert/pialert/
+# Start Nginx and your application to start at boot (if needed)
+# systemctl start nginx
+# systemctl enable nginx
+
+# # systemctl enable pi-alert
+# sudo systemctl restart nginx
+
+#  Activate the virtual python environment
+source myenv/bin/activate
+
+# Start the PiAlert python script
+python $INSTALL_DIR/pialert/pialert/

dockerfiles/user-mapping.sh

@@ -1,29 +1,39 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+echo "---------------------------------------------------------"
+echo "[INSTALL]                             Run user-mapping.sh"
+echo "---------------------------------------------------------"
 
 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
+if [ -z "${HOST_USER_ID}" ] && [ -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
+# 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//:/ } )
+array=( "${LINE//:/ }" )
 
 # home is 5th element
 USER_HOME=${array[4]}
 
+# print debug output
+echo  USER_ID"  ": "${USER_ID}";
+echo  USER_GID : "${USER_GID}";
+echo  USER_HOME: "${USER_HOME}";
+echo  TZ"       ": "${TZ}";
+
 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}
+chown -R "${USER_ID}:${USER_GID} ${USER_HOME}"
 
 exec su - "${USER}"

docs/API.md

@@ -28,6 +28,7 @@ You can access the following files:
   | `language_strings.json` | The content of the language_strings table, which in turn is loaded from the plugins `config.json` definitions. |  
   | `table_custom_endpoint.json` | A custom endpoint generated by the SQL query specified by the `API_CUSTOM_SQL` setting. |
   | `table_settings.json` | The content of the settings table. |
+  | `app_state.json` | Contains the current application state. |
   
   Current/latest state of the aforementioned files depends on your settings.
 

docs/DEVICES_BULK_EDITING.md

@@ -0,0 +1,24 @@
+# 📝Bulk-edit devices via CSV Export/Import
+
+> [!NOTE] 
+> As always, backup everything, just in case.
+
+1. In `Maintenance` > `Backup / Restore` click the `CSV Export` button.  
+2. A `devices.csv` is generated in the `/config` folder
+3. Edit the `devices.csv` file however you like. 
+
+![Maintenance > CSV Export](/docs/img/DEVICES_BULK_EDITING/MAINTENANCE_CSV_EXPORT.png)
+
+> [!NOTE] 
+> The file containing a list of Devices including the Network relationships between Network Nodes and connected devices. You can also trigger this by acessing this URL: `<your pialert url>/php/server/devices.php?action=ExportCSV` or via the `CSV Backup` plugin. (💡 You can schedule this)
+
+![Settings > CSV Backup](/docs/img/DEVICES_BULK_EDITING/CSV_BACKUP_SETTINGS.png)
+
+> [!NOTE] 
+> Keep Linux line endings (sugegsted editors: Nano, Notepad++)
+
+![Nodepad++ line endings](/docs/img/DEVICES_BULK_EDITING/NOTEPAD++.png)
+
+
+
+

docs/DEVICE_MANAGEMENT.md

@@ -9,6 +9,11 @@ To edit device information:
   - Press the "Save" button
 
 
+> [!NOTE] 
+>
+> [Bulk-edit devices](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/DEVICES_BULK_EDITING.md) by using the `CSV Export` functionality in the `Maintenance` section.
+
+
 ![Device Details][screen1]
 
 

docs/HW_INSTALL.md

@@ -0,0 +1,49 @@
+# How to install PiAlert on the server hardware
+
+To download and install PiAlert on the hardware/server directly use `curl` or `wget` commands.
+
+> [!NOTE]
+> This is an Experimental feature 🧪 and it relies on community support.
+>
+> There is no guarantee that the install script or any other script will gracefully handle other installed software.
+> Data loss is a possibility, **it is recommended to install PiAlert using the supplied Docker image**.
+
+A warning to the installation method below: Piping to bash is [controversial](https://pi-hole.net/2016/07/25/curling-and-piping-to-bash) and may
+be dangerous, as you cannot see the code that's about to be executed on your system.
+
+Alternatively you can download the installation script `install/install.sh` from the repository and check the code yourself (beware other scripts are
+downloaded too - only from this repo).
+
+PiAlert will be installed in `home/pi/pialert/` and run on port number `20211`.
+
+Some facts about what and where something will be changed/installed by the HW install setup (may not contain everything!):
+
+- `/home/pi/pialert` directory will be deleted and newly created
+- `/home/pi/pialert` will contain the whole repository (downloaded by `install/install.sh`)
+- The default NGINX site `/etc/nginx/sites-enabled/default` will be disabled (sym-link deleted or backed up to `sites-available`)
+- `/var/www/html/pialert` directory will be deleted and newly created
+- `/etc/nginx/conf.d/pialert.conf` will be sym-linked to `/home/pi/pialert/install/pialert.conf`
+- Some files (IEEE device vendors info, ...) will be created in the directory where the installation script is executed
+
+## Limitations
+
+- No system service is provided. PiAlert must be started using `/home/pi/pialert/dockerfiles/start.sh`.
+- No checks for other running software is done.
+- Only tested to work on Debian Bookworm (Debian 12).
+- **EXPERIMENTAL** and not recommended way to install PiAlert.
+
+## CURL
+
+```bash
+curl -o install.sh https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/install/install.sh && sudo chmod +x install.sh && sudo ./install.sh
+```
+
+## WGET
+
+```bash
+wget https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/install/install.sh -O install.sh && sudo chmod +x install.sh && sudo ./install.sh
+```
+
+These commands will download the `install.sh` script from the GitHub repository, make it executable with `chmod`, and then run it using `./install.sh`.
+
+Make sure you have the necessary permissions to execute the script.

docs/ICONS.md

@@ -1,6 +1,6 @@
 ## Icons overview
 
-Icons are used to visually distinguish devices in the app in most of the device listing tables and the [network tree](/docs/NETWORK_TREE.md). Currently only free [Font Awesome](https://fontawesome.com/search?o=r&m=free) icons (up-to v 6.4.0) are supported (I have an unblockable [sponsorship goal](https://github.com/sponsors/jokob-sk) to add the material design icon pack).  
+Icons are used to visually distinguish devices in the app in most of the device listing tables and the [network tree](/docs/NETWORK_TREE.md). Currently only free [Font Awesome](https://fontawesome.com/search?o=r&m=free) icons (up-to v 6.4.0) are supported.
 
 ![Raspberry Pi with a brand icon](/docs/img/ICONS/devices-icons.png)
 
@@ -8,6 +8,8 @@ Icons are used to visually distinguish devices in the app in most of the device
 
 You can assign icons individually on each device in the Details tab.
 
+![preview](/docs/img/ICONS/device_icons_preview.gif)
+
 ![Raspberry Pi device details](/docs/img/ICONS/device-icon.png)
 
 - You can click into the `Icon` field or click the Pencil (2) icon in the above screenshot to enter any text. Only [free Font Awesome](https://fontawesome.com/search?o=r&m=free) icons in the following format will work:

docs/NETWORK_TREE.md

@@ -16,11 +16,15 @@ Make sure you have a root device with the MAC `Internet` (No other MAC addresses
 * If port is empty or 0 a wifi icon is rendered, otherwise a ethernet port icon
 
 
+> [!NOTE] 
+>
+> [Bulk-edit devices](/docs/DEVICES_BULK_EDITING.md) by using the `CSV Export` functionality in the `Maintenance` section. You can use this to fix `Internet` node assignment issues. 
+
 ## 🔍Detailed example:
 
 In this example you will setup a device named `rapberrypi` as a `Switch` in our network. 
 
-### 1) Device details page
+### 1. Device details page
 
 - Go to the `Devices` (1) page:
 
@@ -29,13 +33,13 @@ In this example you will setup a device named `rapberrypi` as a `Switch` in our
 - In the (2) `Details` tab navigate to the the `Type` (3) dropdown and select the type `Switch` (4).
 
 > Note: Only the following device types will show up as selectable Network nodes ( = devices you can connect other devices to):
-> AP, Firewall, Gateway, Hypervisor, PLC, Powerline, Router, Switch, USB LAN Adapter, USB WIFI Adapter and WLAN.
+> AP, Firewall, Gateway, Hypervisor, PLC, Powerline, Router, Switch, USB LAN Adapter, USB WIFI Adapter and WLAN. Custom types can be added via the `NETWORK_DEVICE_TYPES` setting.
 
 - Assign a device to your root device from the `Node` (5) dropdown which has the MAC `Internet` (6) (Your name may differ, but the MAC needs to be set to `Internet` - this is done by default). 
 
 - Save your changes (7)
 
-### 1) Network page
+### 2. Network page
 
 - Navigate to your `Network` (1) page:
 
@@ -45,7 +49,7 @@ In this example you will setup a device named `rapberrypi` as a `Switch` in our
 - As we asssigned the `raspberrypi` in the previous 1) Device details page section to the `Internet` parent network node in step (6), the link is also showing up in the tree diagram (4)
 - We can now assign the device `(AppleTV)` (5) to this `raspberrypi` node, representing a network Switch in this example
 
-### 1) Network page with 2 levels
+### 3. Network page with 2 levels
 
 - After clicking the `Assign` button in the previous section, the `(AppleTV)` (1) device is now connected to our `raspberrypi` (2).
 
@@ -57,3 +61,4 @@ In this example you will setup a device named `rapberrypi` as a `Switch` in our
 
 
 
+

docs/README.md

@@ -22,9 +22,10 @@ There is also an in-app Help / FAQ section that should be answering frequently a
 #### 🔝 Popular/Suggested
 
 - [Network treemap configuration](/docs/NETWORK_TREE.md)
-- [Gmail as SMTP server for sending emails](/docs/SMTP_GMAIL.md)
+- [SMTP server config](/docs/SMTP.md)
 - [Subnets and VLANs configuration for arp-scan](/docs/SUBNETS.md)
 - [Home Assistant](/docs/HOME_ASSISTANT.md)
+- [Bulk edit devices](/docs/DEVICES_BULK_EDITING.md)
 
 #### ⚙ System Management
 
@@ -50,6 +51,7 @@ There is also an in-app Help / FAQ section that should be answering frequently a
 - [Settings system](/docs/SETTINGS_SYSTEM.md)
 - [New Version notifications](/docs/VERSIONS.md)
 - [Frontend development tips](/docs/FRONTEND_DEVELOPMENT.md)
+- [Webhook secrets](/docs/WEBHOOK_SECRET.md)
 
 Feel free to suggest or submit new docs via a PR. 
 

docs/REVERSE_PROXY.md

@@ -346,5 +346,134 @@ location ^~ /pialert/ {
 ```
 
 
+## Traefik
+
+> Submitted by [Isegrimm](https://github.com/Isegrimm) 🙏 (based on this [discussion](https://github.com/jokob-sk/Pi.Alert/discussions/449#discussioncomment-7281442))
+
+Asuming the user already has a working Traefik setup, this is what's needed to make Pi.Alert work at a URL like www.domain.com/pialert/. 
+
+Note: Everything in these configs assumes '**www.domain.com**' as your domainname and '**section31**' as an arbitrary name for your certificate setup. You will have to substitute these with your own.
+
+Also, I use the prefix '**pialert**'. If you want to use another prefix, change it in these files: dynamic.toml and default.
+
+Content of my yaml-file (this is the generic Traefik config, which defines which ports to listen on, redirect http to https and sets up the certificate process).
+It also contains Authelia, which I use for authentication.
+This part contains nothing specific to Pi.Alert.
+
+```yaml
+version: '3.8'
+
+services:
+  traefik:
+    image: traefik
+    container_name: traefik
+    command:
+      - "--api=true"
+      - "--api.insecure=true"
+      - "--api.dashboard=true"
+      - "--entrypoints.web.address=:80"
+      - "--entrypoints.web.http.redirections.entryPoint.to=websecure"
+      - "--entrypoints.web.http.redirections.entryPoint.scheme=https"
+      - "--entrypoints.websecure.address=:443"
+      - "--providers.file.filename=/traefik-config/dynamic.toml"
+      - "--providers.file.watch=true"
+      - "--log.level=ERROR"
+      - "--certificatesresolvers.section31.acme.email=postmaster@domain.com"
+      - "--certificatesresolvers.section31.acme.storage=/traefik-config/acme.json"
+      - "--certificatesresolvers.section31.acme.httpchallenge=true"
+      - "--certificatesresolvers.section31.acme.httpchallenge.entrypoint=web"
+    ports:
+      - "80:80"
+      - "443:443"
+      - "8080:8080"
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+      - /appl/docker/traefik/config:/traefik-config
+    depends_on:
+      - authelia
+    restart: unless-stopped
+  authelia:
+    container_name: authelia
+    image: authelia/authelia:latest
+    ports:
+      - "9091:9091"
+    volumes:
+      - /appl/docker/authelia:/config
+    restart: u
+    nless-stopped
+```
+Snippet of the dynamic.toml file (referenced in the yml-file above) that defines the config for Pi.Alert:
+The following are self-defined keywords, everything else is traefik keywords:
+- pialert-router
+- pialert-service
+- auth
+- pialert-stripprefix
 
 
+```toml
+[http.routers]
+  [http.routers.pialert-router]
+    entryPoints = ["websecure"]
+    rule = "Host(`www.domain.com`) && PathPrefix(`/pialert`)"
+    service = "pialert-service"
+    middlewares = "auth,pialert-stripprefix"
+    [http.routers.pialert-router.tls]
+       certResolver = "section31"
+       [[http.routers.pialert-router.tls.domains]]
+         main = "www.domain.com"
+
+[http.services]
+  [http.services.pialert-service]
+    [[http.services.pialert-service.loadBalancer.servers]]
+      url = "http://internal-ip-address:20211/"
+
+[http.middlewares]
+  [http.middlewares.auth.forwardAuth]
+    address = "http://authelia:9091/api/verify?rd=https://www.domain.com/authelia/"
+    trustForwardHeader = true
+    authResponseHeaders = ["Remote-User", "Remote-Groups", "Remote-Name", "Remote-Email"]
+  [http.middlewares.pialert-stripprefix.stripprefix]
+    prefixes = "/pialert"
+    forceSlash = false
+
+```
+To make Pi.Alert work with this setup I modified the default file at `/etc/nginx/sites-available/default` in the docker container by copying it to my local filesystem, adding the changes as specified by [cvc90](https://github.com/cvc90) and mounting the new file into the docker container, overwriting the original one. By mapping the file instead of changing the file in-place, the changes persist if an updated dockerimage is pulled. This is also a downside when the default file is updated, so I only use this as a temporary solution, until the dockerimage is updated with this change.
+
+Default-file:
+
+```
+server {
+    listen 80 default_server;
+    root /var/www/html;
+    index index.php;
+    #rewrite /pialert/(.*) / permanent;
+    add_header X-Forwarded-Prefix "/pialert" always;
+    proxy_set_header X-Forwarded-Prefix "/pialert";
+
+  location ~* \.php$ {
+    fastcgi_pass unix:/run/php/php8.2-fpm.sock;
+    include         fastcgi_params;
+    fastcgi_param   SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+    fastcgi_param   SCRIPT_NAME        $fastcgi_script_name;
+    fastcgi_connect_timeout 75;
+          fastcgi_send_timeout 600;
+          fastcgi_read_timeout 600;
+  }
+}
+```
+
+Mapping the updated file (on the local filesystem at `/appl/docker/pialert/default`) into the docker container:
+
+
+```bash
+docker run -d --rm --network=host \
+  --name=pi.alert \
+  -v /appl/docker/pialert/config:/home/pi/pialert/config \
+  -v /appl/docker/pialert/db:/home/pi/pialert/db \
+  -v /appl/docker/pialert/default:/etc/nginx/sites-available/default \
+  -e TZ=Europe/Amsterdam \
+  -e PORT=20211 \
+  jokobsk/pi.alert:latest
+
+```
+

docs/SETTINGS_SYSTEM.md

@@ -10,7 +10,7 @@ The source of truth for user-defined values is the `pialert.conf` file. Editing
 
 #### Settings database table
 
-The `Settings` database table contains settings for App run purposes. The table is recreated every time the App restarts. The settings are loaded from the source-of-truth, that is the `pialert.conf` file. A high-level overview on the databse structure can be found in the [database documentation](/docs/DATABASE.md). 
+The `Settings` database table contains settings for App run purposes. The table is recreated every time the App restarts. The settings are loaded from the source-of-truth, that is the `pialert.conf` file. A high-level overview on the database structure can be found in the [database documentation](/docs/DATABASE.md). 
 
 #### table_settings.json
 

docs/SMTP.md

@@ -0,0 +1,41 @@
+# 📧 SMTP guides
+
+## Using the GMX SMTP server
+
+1. Go to your GMX account https://account.gmx.com
+2. Under Security Options enable 2FA (Two-factor authentication)
+3. Under Security Options generate an Application-specific password
+4. Home -> Email Settings -> POP3 & IMAP -> Enable access to this account via POP3 and IMAP
+5. In PiAlert specify these settings:
+
+```python
+    REPORT_MAIL=True
+    SMTP_SERVER='mail.gmx.com'
+    SMTP_PORT=465
+    SMTP_USER='gmx_email@gmx.com'
+    SMTP_PASS='<your Application-specific password>'
+    SMTP_SKIP_TLS=True
+    SMTP_FORCE_SSL=True
+    SMTP_SKIP_LOGIN=False
+    REPORT_FROM='gmx_email@gmx.com' # this has to be the same email as in SMTP_USER
+    REPORT_TO='some_target_email@gmail.com'
+```
+
+
+## Using the Gmail SMTP server
+    
+1. Create an app password by following the instructions from Google, you need to Enable 2FA for this to work.
+[https://support.google.com/accounts/answer/185833](https://support.google.com/accounts/answer/185833)
+
+2. Specify the following settings:
+
+```python
+    REPORT_MAIL=True
+    SMTP_SKIP_TLS=True
+    SMTP_FORCE_SSL=True 
+    SMTP_PORT=465
+    SMTP_SERVER='smtp.gmail.com'
+    SMTP_PASS='16-digit passcode from google'
+    REPORT_TO='some_target_email@gmail.com'
+```
+

docs/SMTP_GMAIL.md

@@ -1,15 +0,0 @@
-## Use the Gmail SMTP server
-    
-1) Create an app password by following the instructions from Google, you need to Enable 2FA for this to work.
-[https://support.google.com/accounts/answer/185833](https://support.google.com/accounts/answer/185833)
-
-2) Specify the following settings:
-
-```python
-    SMTP_SKIP_TLS=True
-    SMTP_FORCE_SSL=True 
-    SMTP_PORT=465
-    SMTP_SERVER='smtp.gmail.com'
-    SMTP_PASS='16-digit passcode from google'
-```
-

docs/SUBNETS.md

@@ -25,7 +25,7 @@ Specify the network filter (which **significantly** speeds up the scan process).
 
 **Example value: `--interface=eth0`**
 
-The adapter will probably be `eth0` or `eth1`. (Run `iwconfig` in the container to find your interface name(s)) 
+The adapter will probably be `eth0` or `eth1`. (Check `System info` > `Network Hardware` or run `iwconfig` in the container to find your interface name(s)) 
 
 > Run `iwconfig` in your container to find your interface name(s) (e.g.: `eth0`, `eth1`). 
 

docs/WEBHOOK_SECRET.md

@@ -0,0 +1,38 @@
+# Webhook Secrets
+
+## How does the signing work?
+
+Pi.Alert will use the configured secret to create a hash signature of the request body. This SHA256-HMAC signature will appear in the `X-Webhook-Signature` header of each request to the webhook target URL. You can use the value of this header to validate the request was sent by Pi.Alert.
+
+## Activating webhook signatures
+
+All you need to do in order to add a signature to the request headers is to set the `WEBHOOK_SECRET` config value to a non-empty string.
+
+## Validating webhook deliveries
+
+There are a few things to keep in mind when validating the webhook delivery:
+
+- Pi.Alert uses an HMAC hex digest to compute the hash
+- The signature in the `X-Webhook-Signature` header always starts with `sha256=`
+- The hash signature is generated using the configured `WEBHOOK_SECRET` and the request body.
+- Never use a plain `==` operator. Instead, consider using a method like [`secure_compare`](https://www.rubydoc.info/gems/rack/Rack%2FUtils:secure_compare) or [`crypto.timingSafeEqual`](https://nodejs.org/api/crypto.html#cryptotimingsafeequala-b), which performs a "constant time" string comparison to help mitigate certain timing attacks against regular equality operators, or regular loops in JIT-optimized languages.
+
+## Testing the webhook payload validation
+
+You can use the following secret and payload to verify that your implementation is working correctly.
+
+`secret`: 'this is my secret'
+
+`payload`: '{"test":"this is a test body"}'
+
+If your implementation is correct, the signature you generated should match the following:
+
+`signature`: bed21fcc34f98e94fd71c7edb75e51a544b4a3b38b069ebaaeb19bf4be8147e9
+
+`X-Webhook-Signature`: sha256=bed21fcc34f98e94fd71c7edb75e51a544b4a3b38b069ebaaeb19bf4be8147e9
+
+## More information
+
+If you want to learn more about webhook security, take a look at [GitHub's webhook documentation](https://docs.github.com/en/webhooks/about-webhooks).
+
+You can find examples for validating a webhook delivery [here](https://docs.github.com/en/webhooks/using-webhooks/validating-webhook-deliveries#examples).

front/css/pialert.css

@@ -173,6 +173,7 @@
 @media (max-width: 767px) {
     .main-header .logo {
         width: 100%;
+        display:none;
     }
 
     .main-header .navbar {
@@ -459,35 +460,7 @@
     border-right: 5px solid #606060;
 }
 
-/* -----------------------------------------------------------------------------
-   Spin
------------------------------------------------------------------------------ */
-.pa_semitransparent-panel {
-    position: absolute;
-    width: 100%; /*calc (100% -40px);*/
-    height: 100%;
-    left: 0;
-    top: 0;
-    display: block;
 
-    opacity: 0.8;
-    background-color: #fff;
-    z-index: 99;
-}
-
-.pa_spinner {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 20px;
-    margin-left: auto;
-    margin-right: auto;
-    padding: 15px;
-    width: 200px;
-
-    background-color: #fff;
-    z-index: 100;
-}
 
 /* -----------------------------------------------------------------------------
    Notification float banner
@@ -612,8 +585,24 @@ height: 50px;
 .infobox_label {
     font-size: 16px !important;
 }
+/* --------------------------------------------------------- */
+/*                         report                            */
+/* --------------------------------------------------------- */
 
-/*settings*/
+#notificationData textarea{
+    width: 100%;
+}
+
+#notificationData pre {outline: 1px solid #ccc; padding: 5px; margin: 5px; }
+.string { color: green; }
+.number { color: darkorange; }
+.boolean { color: blue; }
+.null { color: magenta; }
+.key { color: red; }
+
+/* --------------------------------------------------------- */
+/*                          settings                         */
+/* --------------------------------------------------------- */
 
 @media (max-width: 767px) {
     /* hide on mobile */
@@ -651,6 +640,52 @@ height: 50px;
     display: none;
 }
 
+.settingswrap .enabled-disabled-icon
+{
+    float: right;
+}
+
+.settings-group
+{   
+    font-size: 20px;
+    padding-top: 7px;
+    padding-bottom: 9px;
+}
+
+.overview-section .small-box  .icon
+{
+    font-size: 38px;
+    top:0px;
+}
+
+.overview-section
+{
+    border: solid;
+    border-width: medium;
+    border-width: medium;
+    border-width: 1px;
+    border-radius: 15px;
+    margin-bottom: 3px;
+  
+}
+
+.settings-group i{
+    font-size: 16px;
+}
+
+.overview-group
+{   
+    font-size: 20px;
+    padding-top: 7px;
+    padding-bottom: 9px;
+
+}
+
+.overview-group i{
+    font-size: 16px;
+}
+
+
 .table_row {    
     padding: 3px;    
     width:100%;
@@ -700,6 +735,18 @@ height: 50px;
 
 /* Settings */
 
+#settingsPage .overview-setting-value{    
+    display:unset;    
+}
+#settingsPage .panel-title{
+    /* display: inline-block; */
+    /* width: 120px; */
+    white-space: nowrap;
+    overflow: hidden !important;
+    text-overflow: ellipsis;
+}
+
+
 .settings_content {
     padding: 10px;
     /* background-color: #272c30; */
@@ -746,6 +793,10 @@ input[readonly] {
   }
 
 /* Devices */
+#txtIconFA {
+    min-width: 18px;
+}
+
 .drp-edit
 {
     cursor: pointer;
@@ -824,6 +875,7 @@ input[readonly] {
 {
     float:left;
     display:inline;
+    text-align: center;
 }
 
 #networkTree .portBckgIcon
@@ -845,13 +897,13 @@ input[readonly] {
     width: 25px;;
     float:left;
     display:inline;
+    text-align: center;
 }
 #networkTree .netCollapse
 {
     display: block;
     position: absolute;
     margin-left: 170px;    
-    top: -3px;
     font-size: large;
     left: -15px;
 }
@@ -911,26 +963,90 @@ input[readonly] {
 
 /*Hidden special button*/
 
-@media (max-width: 464px) {
+@media (max-width: 365px) {
   #back-button {
     display: none;
   }
 }
 
-@media (max-width: 432px) {
+@media (max-width: 335px) {
   #next-button {
     display: none;
   }
 }
 
-@media (max-width: 400px) {
+@media (max-width: 300px) {
   #reload-button {
     display: none;
   }
 }
 
-@media (max-width: 365px) {
+@media (max-width: 300px) {
   #fullscreen-button {
     display: none;
   }
 }
+
+@media (max-width: 500px) {
+    .header-server-time {
+      display: none;      
+    }
+  }
+
+#settingsPage .small-box .inner .card-title {
+    overflow: hidden;
+    text-overflow: ellipsis;        
+    white-space: nowrap;
+}
+  
+
+/* -----------------------------------------------------------------------------
+   Spin
+----------------------------------------------------------------------------- */
+.pa_semitransparent-panel {
+    position: absolute;
+    width: 100%; /*calc (100% -40px);*/
+    height: 100%;
+    left: 0;
+    top: 0;
+    display: block;
+
+    opacity: 0.8;
+    background-color: #fff;
+    z-index: 99;
+}
+
+.pa_spinner {
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 100px;
+    margin-left: auto;
+    margin-right: auto;
+    padding: 15px;
+    width: 200px;
+    background-color: #fff;
+    z-index: 100;
+}
+
+#loadingSpinner
+{
+    z-index: 100;
+}
+
+/* -----------------------------------------------------------------------------
+   Donations
+----------------------------------------------------------------------------- */
+.donations .box
+{
+    padding:15px;
+    margin-bottom: 0px;
+}
+.donations .box-header
+{
+    color:15px;
+}
+.donations h3
+{
+    margin-top: 10px;
+}

front/deviceDetails.php

@@ -196,9 +196,9 @@
                         </label>
                         <div class="col-sm-9">
                           <div class="input-group">
-                            <input class="form-control"  id="txtIcon" type="text" value="--">
+                            <span class="input-group-addon"><i class="fa" id="txtIconFA" onclick="editDrp('txtIcon');"></i></span>
+                            <input class="form-control" id="txtIcon" type="text" value="--">
                             <span class="input-group-addon" title='<?= lang('DevDetail_button_OverwriteIcons_Tooltip');?>'><i class="fa fa-copy pointer" onclick="askOverwriteIconType();"></i></span>
-                            <span class="input-group-addon"><i class="fa fa-pencil pointer" onclick="editDrp('txtIcon');"></i></span>
                             <div class="input-group-btn">
                               <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                                 <span class="fa fa-caret-down"></span>
@@ -325,7 +325,7 @@
                       <div class="form-group" title="<?= lang('DevDetail_Network_Node_hover');?>">
                         <label class="col-sm-3 control-label"><?= lang('DevDetail_MainInfo_Network');?></label>
                         <div class="col-sm-9">  
-                          <div class="input-group"> 
+                          <div class="input-group parentNetworkNode"> 
 
                             <input class="form-control" id="txtNetworkNodeMac" type="text" value="--">
                             <span class="input-group-addon"><i title="<?= lang('DevDetail_GoToNetworkNode');?>" class="fa fa-square-up-right pointer" onclick="goToNetworkNode('txtNetworkNodeMac');"></i></span>
@@ -542,14 +542,6 @@
 <!-- tab page 3 ------------------------------------------------------------ -->
               <div class="tab-pane fade table-responsive" id="panPresence">                 
 
-                  <!-- spinner -->
-                  <div id="loading" style="display: none">
-                    <div class="pa_semitransparent-panel"></div>
-                    <div class="panel panel-default pa_spinner">
-                      <table><td width="130px" align="middle"><?= lang("DevDetail_Loading");?></td><td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw"></td></table>
-                    </div>
-                  </div>
-
                   <!-- Calendar -->
                   <div id="calendar">
                   </div>
@@ -652,14 +644,15 @@ if ($ENABLED_DARKMODE === True) {
   // ------------------------------------------------------------
   function getDevicesList()
   {
-    // Read cache
-    devicesList = getCache('devicesList');
+    // Read cache (skip cookie expiry check)
+    devicesList = getCache('devicesListAll_JSON', true);
     
     if (devicesList != '') {
         devicesList = JSON.parse (devicesList);
     } else {
         devicesList = [];
     }
+
     return devicesList;
   }
 
@@ -757,6 +750,11 @@ function main () {
             }
           });
 
+          // Show device icon as it changes
+          $('#txtIcon').on('change input', function() {
+            $('#txtIconFA').removeClass().addClass(`fa fa-${$(this).val()} pointer`)
+          });
+
         });
       });
 
@@ -1136,9 +1134,9 @@ function initializeCalendar () {
       
     loading: function( isLoading, view ) {
         if (isLoading) {
-          $('#loading').show();
+          showSpinner()
         } else {
-          $('#loading').hide();
+          hideSpinner()
         }
     }
 
@@ -1294,6 +1292,7 @@ function getDeviceData (readAllData=false) {
         $('#txtDeviceType').val                      (deviceData['dev_DeviceType']);
         $('#txtVendor').val                          (deviceData['dev_Vendor']);
         $('#txtIcon').val                            (initDefault(deviceData['dev_Icon'], 'laptop'));
+        $('#txtIcon').trigger('change')
   
         if (deviceData['dev_Favorite'] == 1)         {$('#chkFavorite').iCheck('check');}    else {$('#chkFavorite').iCheck('uncheck');}
         $('#txtGroup').val                           (deviceData['dev_Group']);
@@ -1303,8 +1302,8 @@ function getDeviceData (readAllData=false) {
         $('#txtNetworkNodeMac').attr                 ('data-mynodemac', deviceData['dev_Network_Node_MAC_ADDR']);        
         $('#txtNetworkPort').val                     (deviceData['dev_Network_Node_port']);
         // disabling network node configuration if root Internet node
-        $('#txtNetworkNodeMac').prop('readonly', mac == 'Internet' );
-        $('#txtNetworkPort').prop('readonly', mac == 'Internet' );
+        toggleNetworkConfiguration(mac == 'Internet')         
+        
   
         $('#txtFirstConnection').val                 (deviceData['dev_FirstConnection']);
         $('#txtLastConnection').val                  (deviceData['dev_LastConnection']);
@@ -1327,6 +1326,7 @@ function getDeviceData (readAllData=false) {
 
       // Check if device is part of the devicesList      
       pos = devicesList.findIndex(item => item.rowid == deviceData['rowid']);          
+      
       if (pos == -1) {
         devicesList.push({"rowid" : deviceData['rowid'], "mac" : deviceData['dev_MAC'], "name": deviceData['dev_Name'], "type": deviceData['dev_DeviceType']});
         pos=0;
@@ -1400,14 +1400,12 @@ function performSwitch(direction)
   // get new mac from the devicesList. Don't change to the commented out line below, the mac query string in the URL isn't updated yet!
   // mac = params.mac;
   
-  mac = devicesList[pos].mac.toString();
+  mac = devicesList[pos].dev_MAC.toString();
 
   setCache("piaDeviceDetailsMac", mac);
     
   getDeviceData (true); 
 
-  // reload current tab
-  reloadTab()
 }
 
 // -----------------------------------------------------------------------------
@@ -1461,6 +1459,9 @@ function setDeviceData (direction='', refreshCallback='') {
     window.onbeforeunload = null;
     somethingChanged      = false;
 
+    // refresh API
+    updateApi()
+
     // Callback fuction
     if (typeof refreshCallback == 'function') {
       refreshCallback(direction);
@@ -1468,6 +1469,25 @@ function setDeviceData (direction='', refreshCallback='') {
   });
 }
 
+// --------------------------------------------------------
+// Calls a backend function to add a front-end event to an execution queue
+function updateApi()
+{
+
+  // value has to be in format event|param. e.g. run|ARPSCAN
+  action = `update_api|devices`
+
+  $.ajax({
+    method: "POST",
+    url: "php/server/util.php",
+    data: { function: "addToExecutionQueue", action: action  },
+    success: function(data, textStatus) {
+        console.log(data)
+    }
+  })
+}
+
+
 // -----------------------------------------------------------------------------
 function askSkipNotifications () {
   // Check MAC
@@ -1634,36 +1654,10 @@ function deleteDevice () {
 
   // Deactivate controls
   $('#panDetails :input').attr('disabled', true);
+
+  // refresh API
+  updateApi()
 }
-// -----------------------------------------------------------------------------
-function askDeleteDevice () {
-  // Check MAC
-  if (mac == '') {
-    return;
-  }
-
-  // Ask delete device
-  showModalWarning ('Delete Device', 'Are you sure you want to delete this device?<br>(maybe you prefer to archive it)',
-    '<?= lang('Gen_Cancel');?>', '<?= lang('Gen_Delete');?>', 'deleteDevice');
-}
-
-
-// -----------------------------------------------------------------------------
-function deleteDevice () {
-  // Check MAC
-  if (mac == '') {
-    return;
-  }
-
-  // Delete device
-  $.get('php/server/devices.php?action=deleteDevice&mac='+ mac, function(msg) {
-    showMessage (msg);
-  });
-
-  // Deactivate controls
-  $('#panDetails :input').attr('disabled', true);
-}
-
 
 // -----------------------------------------------------------------------------
 function getSessionsPresenceEvents () {
@@ -1710,6 +1704,7 @@ function setTextValue (textElement, textValue) {
     $('#'+textElement).attr ('data-myvalue', textValue);
     $('#'+textElement).val (textValue);  
   }
+  $('#'+textElement).trigger('change')
 }
 
 // -----------------------------------------------------------------------------
@@ -1804,15 +1799,27 @@ window.onload = function async()
 {
   initializeTabsNew();
 
-  reloadTab();
+  
 }
 
 //-----------------------------------------------------------------------------------
-
-function reloadTab()
+// Disables network configuration for the root node
+function toggleNetworkConfiguration(disable)
 {
-  // tab loaded without switching 
+  $('#txtNetworkNodeMac').prop('readonly', true ); // disable direct input as should only be selected via the dropdown
 
+  if(disable)
+  {       
+  //   $('#txtNetworkNodeMac').val(getString('Network_Root_Unconfigurable'));   
+  //   $('#txtNetworkPort').val(getString('Network_Root_Unconfigurable'));     
+    $('#txtNetworkPort').prop('readonly', true );
+    $('.parentNetworkNode .input-group-btn').hide();
+  }
+  else
+  {    
+    $('#txtNetworkPort').prop('readonly', false );
+    $('.parentNetworkNode .input-group-btn').show();
+  }
 }
 
 </script>

front/devices.php

@@ -42,7 +42,7 @@
 <!-- top small box 1 ------------------------------------------------------- -->
       <div class="row">
         <div class="col-lg-2 col-sm-4 col-xs-6">
-          <a href="#" onclick="javascript: getDevicesList('all');">
+          <a href="#" onclick="javascript: initializeDatatable('all');">
           <div class="small-box bg-aqua">
             <div class="inner"><h3 id="devicesAll"> -- </h3>
                 <p class="infobox_label"><?= lang('Device_Shortcut_AllDevices');?></p>
@@ -54,7 +54,7 @@
         
 <!-- top small box 2 ------------------------------------------------------- -->
         <div class="col-lg-2 col-sm-4 col-xs-6">
-          <a href="#" onclick="javascript: getDevicesList('connected');">
+          <a href="#" onclick="javascript: initializeDatatable('connected');">
           <div class="small-box bg-green">
             <div class="inner"><h3 id="devicesConnected"> -- </h3>
                 <p class="infobox_label"><?= lang('Device_Shortcut_Connected');?></p>
@@ -66,7 +66,7 @@
 
 <!-- top small box 3 ------------------------------------------------------- -->
         <div class="col-lg-2 col-sm-4 col-xs-6">
-          <a href="#" onclick="javascript: getDevicesList('favorites');">
+          <a href="#" onclick="javascript: initializeDatatable('favorites');">
           <div class="small-box bg-yellow">
             <div class="inner"><h3 id="devicesFavorites"> -- </h3>
                 <p class="infobox_label"><?= lang('Device_Shortcut_Favorites');?></p>
@@ -78,7 +78,7 @@
 
 <!-- top small box 4 ------------------------------------------------------- -->
         <div class="col-lg-2 col-sm-4 col-xs-6">
-          <a href="#" onclick="javascript: getDevicesList('new');">
+          <a href="#" onclick="javascript: initializeDatatable('new');">
           <div class="small-box bg-yellow">
             <div class="inner"><h3 id="devicesNew"> -- </h3>
                 <p class="infobox_label"><?= lang('Device_Shortcut_NewDevices');?></p>
@@ -90,7 +90,7 @@
 
 <!-- top small box 5 ------------------------------------------------------- -->
         <div class="col-lg-2 col-sm-4 col-xs-6">
-          <a href="#" onclick="javascript: getDevicesList('down');">
+          <a href="#" onclick="javascript: initializeDatatable('down');">
           <div class="small-box bg-red">
             <div class="inner"><h3 id="devicesDown"> -- </h3>
                 <p class="infobox_label"><?= lang('Device_Shortcut_DownAlerts');?></p>
@@ -102,7 +102,7 @@
 
 <!-- top small box 6 ------------------------------------------------------- -->
         <div class="col-lg-2 col-sm-4 col-xs-6">
-          <a href="#" onclick="javascript: getDevicesList('archived');">
+          <a href="#" onclick="javascript: initializeDatatable('archived');">
           <div class="small-box bg-gray top_small_box_gray_text">
             <div class="inner"><h3 id="devicesArchived"> -- </h3>
                 <p class="infobox_label"><?= lang('Device_Shortcut_Archived');?></p>
@@ -198,9 +198,30 @@
   var tableRows       = 10;
   var tableOrder      = [[3,'desc'], [0,'asc']];
   
+  var tableColumnHide = [];
   var columnsStr = '[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]';
   var tableColumnOrder = [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]; 
   var tableColumnVisible = tableColumnOrder;
+  //initialize the table headers in the correct order
+  var headersDefaultOrder = [ getString('Device_TableHead_Name'),
+                                  getString('Device_TableHead_Owner'),
+                                  getString('Device_TableHead_Type'),   
+                                  getString('Device_TableHead_Icon'),
+                                  getString('Device_TableHead_Favorite'),
+                                  getString('Device_TableHead_Group'),
+                                  getString('Device_TableHead_FirstSession'),
+                                  getString('Device_TableHead_LastSession'),
+                                  getString('Device_TableHead_LastIP'),
+                                  getString('Device_TableHead_MAC'),
+                                  getString('Device_TableHead_Status'),
+                                  getString('Device_TableHead_MAC_full'),
+                                  getString('Device_TableHead_LastIPOrder'),
+                                  getString('Device_TableHead_Rowid'),
+                                  getString('Device_TableHead_Parent_MAC'),
+                                  getString('Device_TableHead_Connected_Devices'),
+                                  getString('Device_TableHead_Location'),
+                                  getString('Device_TableHead_Vendor')
+                                ];
 
   // Read parameters & Initialize components
   main();
@@ -209,6 +230,8 @@
 // -----------------------------------------------------------------------------
 function main () {
 
+  handleLoadingDialog()
+
   // get from cookie if available (need to use decodeURI as saved as part of URI in PHP)
   cookieColumnsVisibleStr = decodeURI(getCookie("Front_Devices_Columns_Visible")).replaceAll('%2C',',')  
 
@@ -231,29 +254,6 @@ function main () {
       // save the columns order in the Devices page 
       tableColumnOrder = numberArrayFromString(data);
 
-
-
-      //initialize the table headers in the correct order
-      var headersDefaultOrder = [ '<?= lang('Device_TableHead_Name');?>',
-                                  '<?= lang('Device_TableHead_Owner');?>',
-                                  '<?= lang('Device_TableHead_Type');?>',       
-                                  '<?= lang('Device_TableHead_Icon');?>',
-                                  '<?= lang('Device_TableHead_Favorite');?>',
-                                  '<?= lang('Device_TableHead_Group');?>',
-                                  '<?= lang('Device_TableHead_FirstSession');?>',
-                                  '<?= lang('Device_TableHead_LastSession');?>',
-                                  '<?= lang('Device_TableHead_LastIP');?>',
-                                  '<?= lang('Device_TableHead_MAC');?>',
-                                  '<?= lang('Device_TableHead_Status');?>',
-                                  '<?= lang('Device_TableHead_MAC_full');?>',
-                                  '<?= lang('Device_TableHead_LastIPOrder');?>',
-                                  '<?= lang('Device_TableHead_Rowid');?>',
-                                  '<?= lang('Device_TableHead_Parent_MAC');?>',
-                                  '<?= lang('Device_TableHead_Connected_Devices');?>',
-                                  '<?= lang('Device_TableHead_Location');?>',
-                                  '<?= lang('Device_TableHead_Vendor');?>'
-                                ];
-
       html = '';
                                   
       for(index = 0; index < tableColumnOrder.length; index++)
@@ -289,7 +289,11 @@ function main () {
 
           // query data
           getDevicesTotals();      
-          getDevicesList (deviceStatus);
+          
+          // check if dat outdated and show spinner if so
+          handleLoadingDialog()
+
+
         });
       });
     });
@@ -297,8 +301,6 @@ function main () {
 }
 
 // -----------------------------------------------------------------------------
-var tableColumnHide = [];
-
 // mapping the default order to the user specified one
 function mapIndx(oldIndex)
 {
@@ -312,8 +314,78 @@ function mapIndx(oldIndex)
 }
 
 // -----------------------------------------------------------------------------
+// Define a function to filter data based on deviceStatus
+function filterDataByStatus(data, status) {
+  return data.filter(function(item) {
+    switch (status) {
+      case 'all':
+        return true; // Include all items for 'all' status
+      case 'connected':
+        return item.dev_PresentLastScan === 1;
+      case 'favorites':
+        return item.dev_Favorite === 1;
+      case 'new':
+        return item.dev_NewDevice === 1;
+      case 'down':
+        return item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown  === 1;
+      case 'archived':
+        return item.dev_Archived === 1;
+      default:
+        return true; // Include all items for unknown statuses
+    }
+  });
+}
+
+// -----------------------------------------------------------------------------
+function getDeviceStatus(item)
+{
+    if(item.dev_PresentLastScan === 1)
+    {
+      return 'On-line';
+    }
+    else if(item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown  === 1)
+    {
+      return 'Down';
+    }
+    else if(item.dev_NewDevice === 1)
+    {
+      return 'New';
+    }
+    else if(item.dev_Archived === 1)
+    {
+      return 'Archived';
+    }
+    else if(item.dev_PresentLastScan === 0)
+    {
+      return 'Off-line';
+    }
+
+    return "Unknown status"
+}
+
+// -----------------------------------------------------------------------------
+function initializeDatatable (status) {
+
+  // Save status selected
+  deviceStatus = status;
+
+  // Define color & title for the status selected
+  switch (deviceStatus) {
+    case 'all':        tableTitle = getString('Device_Shortcut_AllDevices');  color = 'aqua';    break;
+    case 'connected':  tableTitle = getString('Device_Shortcut_Connected');   color = 'green';   break;
+    case 'favorites':  tableTitle = getString('Device_Shortcut_Favorites');   color = 'yellow';  break;
+    case 'new':        tableTitle = getString('Device_Shortcut_NewDevices');  color = 'yellow';  break;
+    case 'down':       tableTitle = getString('Device_Shortcut_DownAlerts');  color = 'red';     break;
+    case 'archived':   tableTitle = getString('Device_Shortcut_Archived');    color = 'gray';    break;
+    default:           tableTitle = getString('Device_Shortcut_Devices');     color = 'gray';    break;
+  } 
+
+  // Set title and color
+  $('#tableDevicesTitle')[0].className = 'box-title text-'+ color;
+  $('#tableDevicesBox')[0].className = 'box box-'+ color;
+  $('#tableDevicesTitle').html (tableTitle);
+
 
-function initializeDatatable () {
   for(i = 0; i < tableColumnOrder.length; i++)
   {    
     // hide this column if not in the tableColumnVisible variable (we need to keep the MAC address (index 11) for functionality reasons)    
@@ -323,142 +395,202 @@ function initializeDatatable () {
     }    
   }
 
-  var table=
-  $('#tableDevices').DataTable({
-    'paging'       : true,
-    'lengthChange' : true,
-    'lengthMenu'   : [[10, 25, 50, 100, 500, -1], [10, 25, 50, 100, 500, '<?= lang('Device_Tablelenght_all');?>']],
-    'searching'    : true,
+  $.get('api/table_devices.json?nocache=' + Date.now(), function(result) {           
     
-    'ordering'     : true,
-    'info'         : true,
-    'autoWidth'    : false,
+    // Filter the data based on deviceStatus
+    var filteredData = filterDataByStatus(result.data, deviceStatus);
 
-    // Parameters
-    'pageLength'   : tableRows,
-    'order'        : tableOrder,
-    // 'order'       : [[3,'desc'], [0,'asc']],
+    // Convert JSON data into the desired format
+    var dataArray = {
+        data: filteredData.map(function(item) {
+            var originalRow = [
+                item.dev_Name || "",
+                item.dev_Owner || "",
+                item.dev_DeviceType || "",
+                item.dev_Icon || "",
+                item.dev_Favorite || "",
+                item.dev_Group || "",
+                // ---
+                item.dev_FirstConnection || "",
+                item.dev_LastConnection || "",
+                item.dev_LastIP || "",
+                (["2", "6", "A", "E", "a", "e"].includes(item.dev_MAC[1]) ? 1 : 0) || "", // Check if randomized MAC
+                getDeviceStatus(item) || "",
+                item.dev_MAC || "", // hidden
+                formatIPlong(item.dev_LastIP) || "", // IP orderable
+                item.rowid || "",
+                item.dev_Network_Node_MAC_ADDR || "",
+                item.connected_devices || 0,
+                item.dev_Location || "",
+                item.dev_Vendor || "",
+                item.dev_Network_Node_port || 0
+            ];
 
-    'columnDefs'   : [
-      {visible:   false,         targets: tableColumnHide },      
-      {className: 'text-center', targets: [mapIndx(3), mapIndx(4), mapIndx(9), mapIndx(10), mapIndx(15)] },      
-      {width:     '80px',        targets: [mapIndx(6), mapIndx(7), mapIndx(15)] },      
-      {width:     '30px',        targets: [mapIndx(10), mapIndx(13)] },      
-      {orderData: [mapIndx(12)],          targets: mapIndx(8) },
+            var newRow = [];
 
-      // Device Name
-      {targets: [mapIndx(0)],
-        'createdCell': function (td, cellData, rowData, row, col) {            
-            $(td).html ('<b class="anonymizeDev"><a href="deviceDetails.php?mac='+ rowData[mapIndx(11)] +'" class="">'+ cellData +'</a></b>');
-      } },
+            // reorder data based on user-defined columns order
+            for (index = 0; index < tableColumnOrder.length; index++) {
+                newRow.push(originalRow[tableColumnOrder[index]]);
+            }
 
-      // Connected Devices       
-      {targets: [mapIndx(15)],
-        'createdCell': function (td, cellData, rowData, row, col) {
-            $(td).html ('<b><a href="./network.php?mac='+ rowData[mapIndx(11)] +'" class="">'+ cellData +'</a></b>');
-      } },
+            return newRow;
+        })
+    };
 
-      // Icon      
-      {targets: [mapIndx(3)],
-        'createdCell': function (td, cellData, rowData, row, col) {
-          if (!emptyArr.includes(cellData)){
-            $(td).html ('<i class="fa fa-'+cellData+' " style="font-size:16px"></i>');
-          } else {
-            $(td).html ('');
-          }
-      } },
     
-      // Full MAC      
-      {targets: [mapIndx(11)],
-        'createdCell': function (td, cellData, rowData, row, col) {
-          if (!emptyArr.includes(cellData)){
-            $(td).html ('<span class="anonymizeMac">'+cellData+'</span>');
-          } else {
-            $(td).html ('');
-          }
-      } },
+    // TODO displayed columns
 
-      // IP address      
-      {targets: [mapIndx(12)],
-        'createdCell': function (td, cellData, rowData, row, col) {
-          if (!emptyArr.includes(cellData)){
-            $(td).html ('<span class="anonymizeIp">'+cellData+'</span>');
-          } else {
-            $(td).html ('');
-          }
-      } },
 
-      // Favorite      
-      {targets: [mapIndx(4)],
-        'createdCell': function (td, cellData, rowData, row, col) {
-          if (cellData == 1){
-            $(td).html ('<i class="fa fa-star text-yellow" style="font-size:16px"></i>');
-          } else {
-            $(td).html ('');
-          }
-      } },
-        
-      // Dates      
-      {targets: [mapIndx(6), mapIndx(7)],
-        'createdCell': function (td, cellData, rowData, row, col) {
-          $(td).html (translateHTMLcodes (cellData));
-      } },
-
-      // Random MAC      
-      {targets: [mapIndx(9)],
-        'createdCell': function (td, cellData, rowData, row, col) {
-          if (cellData == 1){
-            $(td).html ('<i data-toggle="tooltip" data-placement="right" title="Random MAC" style="font-size: 16px;" class="text-yellow glyphicon glyphicon-random"></i>');
-          } else {
-            $(td).html ('');
-          }
-      } },
-
-      // Status color      
-      {targets: [mapIndx(10)],
-        'createdCell': function (td, cellData, rowData, row, col) {
-          switch (cellData) {
-            case 'Down':      color='red';              break;
-            case 'New':       color='yellow';           break;
-            case 'On-line':   color='green';            break;
-            case 'Off-line':  color='gray text-white';  break;
-            case 'Archived':  color='gray text-white';  break;
-            default:          color='aqua';             break;
-          };
-      
-          $(td).html ('<a href="deviceDetails.php?mac='+ rowData[mapIndx(11)] +'" class="badge bg-'+ color +'">'+ cellData.replace('-', '') +'</a>');
-      } },
-    ],
-    
-    // Processing
-    'processing'  : true,
-    'language'    : {
-      processing: '<table> <td width="130px" align="middle">Loading...</td><td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw"></td> </table>',
-      emptyTable: 'No data',
-      "lengthMenu": "<?= lang('Device_Tablelenght');?>",
-      "search":     "<?= lang('Device_Searchbox');?>: ",
-      "paginate": {
-          "next":       "<?= lang('Device_Table_nav_next');?>",
-          "previous":   "<?= lang('Device_Table_nav_prev');?>"
-      },
-      "info":           "<?= lang('Device_Table_info');?>",
+    // Check if the DataTable already exists
+    if ($.fn.dataTable.isDataTable('#tableDevices')) {
+      // The DataTable exists, so destroy it
+      var table = $('#tableDevices').DataTable();
+      table.clear().destroy();
     }
+
+    var table=
+    $('#tableDevices').DataTable({
+      'data'         : dataArray["data"],
+      'paging'       : true,
+      'lengthChange' : true,
+      'lengthMenu'   : [[10, 25, 50, 100, 500, -1], [10, 25, 50, 100, 500, getString('Device_Tablelenght_all')]],
+      'searching'    : true,
+
+      'ordering'     : true,
+      'info'         : true,
+      'autoWidth'    : false,
+
+      // Parameters
+      'pageLength'   : tableRows,
+      'order'        : tableOrder,      
+
+      'columnDefs'   : [
+        {visible:   false,         targets: tableColumnHide },      
+        {className: 'text-center', targets: [mapIndx(3), mapIndx(4), mapIndx(9), mapIndx(10), mapIndx(15)] },      
+        {width:     '80px',        targets: [mapIndx(6), mapIndx(7), mapIndx(15)] },      
+        {width:     '30px',        targets: [mapIndx(10), mapIndx(13)] },      
+        {orderData: [mapIndx(12)],          targets: mapIndx(8) },
+
+        // Device Name
+        {targets: [mapIndx(0)],
+          'createdCell': function (td, cellData, rowData, row, col) {      
+              
+              // console.log(cellData)      
+              $(td).html ('<b class="anonymizeDev"><a href="deviceDetails.php?mac='+ rowData[mapIndx(11)] +'" class="">'+ cellData +'</a></b>');
+        } },
+
+        // Connected Devices       
+        {targets: [mapIndx(15)],
+          'createdCell': function (td, cellData, rowData, row, col) {
+              $(td).html ('<b><a href="./network.php?mac='+ rowData[mapIndx(11)] +'" class="">'+ cellData +'</a></b>');
+        } },
+
+        // Icon      
+        {targets: [mapIndx(3)],
+          'createdCell': function (td, cellData, rowData, row, col) {
+            if (!emptyArr.includes(cellData)){
+              $(td).html ('<i class="fa fa-'+cellData+' " style="font-size:16px"></i>');
+            } else {
+              $(td).html ('');
+            }
+        } },
+
+        // Full MAC      
+        {targets: [mapIndx(11)],
+          'createdCell': function (td, cellData, rowData, row, col) {
+            if (!emptyArr.includes(cellData)){
+              $(td).html ('<span class="anonymizeMac">'+cellData+'</span>');
+            } else {
+              $(td).html ('');
+            }
+        } },
+        
+        // IP address      
+        {targets: [mapIndx(12)],
+          'createdCell': function (td, cellData, rowData, row, col) {
+            if (!emptyArr.includes(cellData)){
+              $(td).html ('<span class="anonymizeIp">'+cellData+'</span>');
+            } else {
+              $(td).html ('');
+            }
+        } },
+        
+        // Favorite      
+        {targets: [mapIndx(4)],
+          'createdCell': function (td, cellData, rowData, row, col) {
+            if (cellData == 1){
+              $(td).html ('<i class="fa fa-star text-yellow" style="font-size:16px"></i>');
+            } else {
+              $(td).html ('');
+            }
+        } },
+          
+        // Dates      
+        {targets: [mapIndx(6), mapIndx(7)],
+          'createdCell': function (td, cellData, rowData, row, col) {
+            $(td).html (translateHTMLcodes (cellData));
+        } },
+
+        // Random MAC      
+        {targets: [mapIndx(9)],
+          'createdCell': function (td, cellData, rowData, row, col) {
+            console.log(cellData)
+            if (cellData == 1){
+              $(td).html ('<i data-toggle="tooltip" data-placement="right" title="Random MAC" style="font-size: 16px;" class="text-yellow glyphicon glyphicon-random"></i>');
+            } else {
+              $(td).html ('');
+            }
+        } },
+
+        // Status color      
+        {targets: [mapIndx(10)],
+          'createdCell': function (td, cellData, rowData, row, col) {
+
+            // console.log(cellData)
+            switch (cellData) {
+              case 'Down':      color='red';              break;
+              case 'New':       color='yellow';           break;
+              case 'On-line':   color='green';            break;
+              case 'Off-line':  color='gray text-white';  break;
+              case 'Archived':  color='gray text-white';  break;
+              default:          color='aqua';             break;
+            };
+        
+            $(td).html ('<a href="deviceDetails.php?mac='+ rowData[mapIndx(11)] +'" class="badge bg-'+ color +'">'+ cellData.replace('-', '') +'</a>');
+        } },
+      ],
+      
+      // Processing
+      'processing'  : true,
+      'language'    : {
+        processing: '<table> <td width="130px" align="middle">Loading...</td><td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw"></td> </table>',
+        emptyTable: 'No data',
+        "lengthMenu": "<?= lang('Device_Tablelenght');?>",
+        "search":     "<?= lang('Device_Searchbox');?>: ",
+        "paginate": {
+            "next":       "<?= lang('Device_Table_nav_next');?>",
+            "previous":   "<?= lang('Device_Table_nav_prev');?>"
+        },
+        "info":           "<?= lang('Device_Table_info');?>",
+      }
+    });
+
+    // Save cookie Rows displayed, and Parameters rows & order
+    $('#tableDevices').on( 'length.dt', function ( e, settings, len ) {
+      setParameter (parTableRows, len);
+    } );
+      
+    $('#tableDevices').on( 'order.dt', function () {
+      setParameter (parTableOrder, JSON.stringify (table.order()) );
+      setCache ('devicesList', getDevicesFromTable(table) );
+    } );
+
+    $('#tableDevices').on( 'search.dt', function () {
+      setCache ('devicesList', getDevicesFromTable(table) ); 
+    } );
+
+
   });  
-
-  // Save cookie Rows displayed, and Parameters rows & order
-  $('#tableDevices').on( 'length.dt', function ( e, settings, len ) {
-    setParameter (parTableRows, len);
-  } );
-    
-  $('#tableDevices').on( 'order.dt', function () {
-    setParameter (parTableOrder, JSON.stringify (table.order()) );
-    setCache ('devicesList', getDevicesFromTable(table) );
-  } );
-
-  $('#tableDevices').on( 'search.dt', function () {
-    setCache ('devicesList', getDevicesFromTable(table) ); 
-  } );
-
 };
 
 
@@ -511,36 +643,27 @@ function getDevicesTotals () {
   } );
 }
 
-
 // -----------------------------------------------------------------------------
-function getDeviceColumns () {
+function handleLoadingDialog()
+{
+  $.get('log/execution_queue.log?nocache=' + Date.now(), function(data) {   
+    
+
+    if(data.includes("update_api|devices"))
+    {       
+      showSpinner("devices_old")
+
+      setTimeout("handleLoadingDialog()", 1000);
+
+    } else if ($("#loadingSpinner").is(":visible"))
+    {
+      hideSpinner();     
+      location.reload();    
+    }      
+
+  })
 
 }
-// -----------------------------------------------------------------------------
-function getDevicesList (status) {
-  // Save status selected
-  deviceStatus = status;
-
-  // Define color & title for the status selected
-  switch (deviceStatus) {
-    case 'all':        tableTitle = '<?= lang('Device_Shortcut_AllDevices');?>';  color = 'aqua';    break;
-    case 'connected':  tableTitle = '<?= lang('Device_Shortcut_Connected');?>';   color = 'green';   break;
-    case 'favorites':  tableTitle = '<?= lang('Device_Shortcut_Favorites');?>';   color = 'yellow';  break;
-    case 'new':        tableTitle = '<?= lang('Device_Shortcut_NewDevices');?>';  color = 'yellow';  break;
-    case 'down':       tableTitle = '<?= lang('Device_Shortcut_DownAlerts');?>';  color = 'red';     break;
-    case 'archived':   tableTitle = '<?= lang('Device_Shortcut_Archived');?>';    color = 'gray';    break;
-    default:           tableTitle = '<?= lang('Device_Shortcut_Devices');?>';     color = 'gray';    break;
-  } 
-
-  // Set title and color
-  $('#tableDevicesTitle')[0].className = 'box-title text-'+ color;
-  $('#tableDevicesBox')[0].className = 'box box-'+ color;
-  $('#tableDevicesTitle').html (tableTitle);
-
-  // Define new datasource URL and reload
-  $('#tableDevices').DataTable().ajax.url(
-    'php/server/devices.php?action=getDevicesList&status=' + deviceStatus).load();
-};
 
 </script>
 

front/donations.php

@@ -2,21 +2,69 @@
     require 'php/templates/header.php';
 ?>
 <script src="js/pialert_common.js"></script>
+<div id="donationsPage" class="content-wrapper">
+    <!-- Content header--------------------------------------------------------- -->
+    <section class="content-header">
+        <h1 id="pageTitle">
+            <i class="fa fa-heart"></i>                
+        </h1>
+    </section>
 
+    <!-- Main content ---------------------------------------------------------- -->
+    <section class="content donations">	
+        <div id="donationsText" class="box box-solid"></div> 
+        <div class="content-header">
+            <h3 class="box-title " id="donationsPlatforms"></h3>
+        </div> 
+        <div class="box box-solid">
+            <div class="box-body">
+                <div class="col-sm-2">
+                    <a target="_blank" href="https://github.com/sponsors/jokob-sk">
+                        <img alt="Sponsor Me on GitHub" src="https://i.imgur.com/X6p5ACK.png" width="150px">
+                    </a>
+                </div>
+                <div class="col-sm-2">
+                    <a target="_blank" href="https://www.buymeacoffee.com/jokobsk">
+                        <img alt="Buy Me A Coffee" src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" width="117px" height="30px">
+                    </a>
+                </div>
+                <div class="col-sm-2">
+                    <a target="_blank" href="https://www.patreon.com/user?u=84385063">
+                        <img alt="Support me on patreon" src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Patreon_logo_with_wordmark.svg/512px-Patreon_logo_with_wordmark.svg.png" width="117px">
+                    </a>
+                </div>
+            </div>
+        </div>        
+        <div class="content-header">
+            <h3 class="box-title " id="donationsOthers"></h3>
+        </div>
+        <div class="box box-solid">
+            <div class="box-body">
+                <div class="col-sm-12">
+                    <ul>
+                        <li>Bitcoin: <code>1N8tupjeCK12qRVU2XrV17WvKK7LCawyZM</code></li>
+                        <li>Ethereum: <code>0x6e2749Cb42F4411bc98501406BdcD82244e3f9C7</code></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div>
+    </section>
 
-<div id="settingsPage" class="content-wrapper">
-    <p>
-        <a target="_blank" href="https://github.com/sponsors/jokob-sk">
-            <img alt="Sponsor Me on GitHub" src="https://i.imgur.com/X6p5ACK.png" width="150px">
-        </a>
-        <a target="_blank" href="https://www.buymeacoffee.com/jokobsk">
-            <img alt="Buy Me A Coffee" src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" width="117px" height="30px">
-        </a>
-        <a target="_blank" href="https://www.patreon.com/user?u=84385063">
-            <img alt="Support me on patreon" src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Patreon_logo_with_wordmark.svg/512px-Patreon_logo_with_wordmark.svg.png" width="117px">
-        </a>
-    </p>
-    <p>
-    BTC: 1N8tupjeCK12qRVU2XrV17WvKK7LCawyZM
-    </p>
-</div>
+</div> <!-- End of class="content-wrapper"  -->
+
+<script>
+    function init()
+    {        
+        $("#donationsText").html(getString("Donations_Text"))
+        $("#pageTitle").append(getString("Donations_Title"))
+        $("#donationsPlatforms").append(getString("Donations_Platforms"))
+        $("#donationsOthers").append(getString("Donations_Others"))
+    }
+
+    init();
+</script>
+
+<?php
+        require 'php/templates/footer.php';
+?>

front/js/handle_version.js

@@ -1,80 +1,51 @@
-function handleVersion(){
+//--------------------------------------------------------------
+// Handle the UI changes to show or hide notifications about a new version
+function versionUpdateUI(){
 
-    release_timestamp = getCookie("release_timestamp")
+  isNewVersion = getCookie("isNewVersion")
 
-    if(release_timestamp != "")
-    {
+  console.log(isNewVersion)
 
-      build_timestamp = parseInt($('#version').attr("data-build-time").match(  /\d+/g ).join(''))
-
-      // if the release_timestamp is older by 10 min or more as the build timestamp then there is a new release available 
-      if(release_timestamp > build_timestamp + 600 )
-      {
-        console.log("New release!")
-        // handling the navigation menu icon
-        $('#version').attr("class", $('#version').attr("class").replace("myhidden", ""))
-
-        maintenanceDiv = $('#new-version-text')
-      }
-      else{
-        console.log("All up-to-date!")    
-
-        maintenanceDiv = $('#current-version-text')  
-      }
-
-      // handling the maintenance section message      
-      if(emptyArr.includes(maintenanceDiv) == false && $(maintenanceDiv).length != 0)
-      { 
-        $(maintenanceDiv).attr("class", $(maintenanceDiv).attr("class").replace("myhidden", ""))
-      }
-    } 
-
-  }  
-
-  //--------------------------------------------------------------
-
-  function getVersion()
+  // if the release_timestamp is older by 10 min or more as the build timestamp then there is a new release available 
+  if(isNewVersion != "false")
   {
-    release_timestamp = getCookie("release_timestamp") 
+    console.log("New release!")
+    // handling the navigation menu icon
+    $('#version').attr("class", $('#version').attr("class").replace("myhidden", ""))
 
-    release_timestampNum = Number(release_timestamp)
+    maintenanceDiv = $('#new-version-text')
+  }
+  else{
+    console.log("All up-to-date!")    
 
-    // logging    
-    console.log(`Latest release in cookie: ${new Date(release_timestampNum*1000)}`)
-
-    // no cached value available
-    if(release_timestamp == "")
-    {
-      $.get('https://api.github.com/repos/jokob-sk/Pi.Alert/releases').done(function(response) {
-        // Handle successful response
-        var releases = response;
-
-        console.log(response)
-        
-        if(releases.length > 0)
-        {
-          
-          release_datetime = releases[0].published_at; // get latest release
-          release_timestamp = new Date(release_datetime).getTime() / 1000;          
-
-          // cache value
-          setCookie("release_timestamp", release_timestamp, 30);
-
-          handleVersion();
-        }
-        
-      }).fail(function(jqXHR, textStatus, errorThrown) {        
-       
-        $('.version').append(`<p>Github API: ${errorThrown} (${jqXHR.status}), ${jqXHR.responseJSON.message}</p>`)          
-
-      });
-    } else
-    {
-      // cache is available, just call the handler
-      handleVersion()
-    }
+    maintenanceDiv = $('#current-version-text')  
   }
 
+  // handling the maintenance section message      
+  if(emptyArr.includes(maintenanceDiv) == false && $(maintenanceDiv).length != 0)
+  { 
+    $(maintenanceDiv).attr("class", $(maintenanceDiv).attr("class").replace("myhidden", ""))
+  }    
+
+}  
+
+//--------------------------------------------------------------
+// Checks if a new version is available via the global app_state.json
+function checkIfNewVersionAvailable()
+{
+  $.get('api/app_state.json?nocache=' + Date.now(), function(appState) {   
+    
+    console.log(appState["isNewVersionChecked"])
+    console.log(appState["isNewVersion"])
+    
+    // cache value
+    setCookie("isNewVersion", appState["isNewVersion"], 30);
+    setCookie("isNewVersionChecked", appState["isNewVersionChecked"], 30);
+
+    versionUpdateUI();
+
+  })
+}
 
 // handle the dispaly of the NEW icon
-getVersion()
+checkIfNewVersionAvailable()

front/js/pialert_common.js

@@ -173,6 +173,7 @@ function cacheStrings()
   
 }
 
+// Get translated language string
 function getString (key) {
  
   UI_LANG = getSetting("UI_LANG");
@@ -196,11 +197,7 @@ function getString (key) {
 
   if(isEmpty(result))
   {    
-    console.log(`pia_lang_${key}_${lang_code}`)
-    console.log(key)    
     result = getCache(`pia_lang_${key}_en_us`, true);
-    console.log(result)   
-  
   }
 
   return result;
@@ -307,6 +304,32 @@ function showMessage (textMessage="") {
 }
 
 
+// -----------------------------------------------------------------------------
+// String utilities
+// -----------------------------------------------------------------------------
+function jsonSyntaxHighlight(json) {
+  if (typeof json != 'string') {
+       json = JSON.stringify(json, undefined, 2);
+  }
+  json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+  return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
+      var cls = 'number';
+      if (/^"/.test(match)) {
+          if (/:$/.test(match)) {
+              cls = 'key';
+          } else {
+              cls = 'string';
+          }
+      } else if (/true|false/.test(match)) {
+          cls = 'boolean';
+      } else if (/null/.test(match)) {
+          cls = 'null';
+      }
+      return '<span class="' + cls + '">' + match + '</span>';
+  });
+}
+
+
 // -----------------------------------------------------------------------------
 // General utilities
 // -----------------------------------------------------------------------------
@@ -490,7 +513,21 @@ function getNameByMacAddress(macAddress) {
 }
 
 // -----------------------------------------------------------------------------
-// 
+// A function used to make the IP address orderable
+function formatIPlong(ipAddress) {
+  const parts = ipAddress.split('.');
+  if (parts.length !== 4) {
+      throw new Error('Invalid IP address format');
+  }
+  return (parseInt(parts[0]) << 24) |
+         (parseInt(parts[1]) << 16) |
+         (parseInt(parts[2]) << 8) |
+         parseInt(parts[3]);
+}
+
+// -----------------------------------------------------------------------------
+// A function to get a device property using the mac address as key and DB column nakme as parameter
+//  for the value to be returned
 function getDeviceDataByMacAddress(macAddress, dbColumn) {
 
   const sessionDataKey = 'devicesListAll_JSON';  
@@ -537,7 +574,51 @@ function isEmpty(value)
   return emptyArr.includes(value)
 }
 
+
+// -----------------------------------------------------------------------------
+// Generate a GUID
+function getGuid() {
+  return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, c =>
+    (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+  );
+}
+
+// -----------------------------------------------------------------------------
+//  Loading Spinner overlay
+// -----------------------------------------------------------------------------
+function showSpinner(stringKey='Loading')
+{
+  if($("#loadingSpinner").length)
+  {
+    
+    $("#loadingSpinner").show();
+  }
+  else{    
+    html =  `
+    <!-- spinner -->
+    <div id="loadingSpinner" style="display: block">
+      <div class="pa_semitransparent-panel"></div>
+      <div class="panel panel-default pa_spinner">
+        <table>
+          <td width="130px" align="middle">${getString(stringKey)}</td>
+          <td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw"></td>
+        </table>
+      </div>
+    </div>
+    `
+
+    $(".wrapper").append(html)
+  }
+}
+// -----------------------------------------------------------------------------
+function hideSpinner()
+{
+  $("#loadingSpinner").hide()
+}
+
+// -----------------------------------------------------------------------------
 // initialize
+// -----------------------------------------------------------------------------
 cacheSettings()
 cacheStrings()
 initDeviceListAll_JSON()

front/js/settings_utils.js

@@ -0,0 +1,109 @@
+// -------------------------------------------------------------------
+  // Get all plugin prefixes of a given type 
+  function getPluginsByType(pluginsData, pluginType, onlyEnabled)
+  {
+
+    var result = []
+
+    pluginsData.forEach((plug) => {
+      
+      if(plug.plugin_type == pluginType)
+      {
+        // collect all, or if only enabled, check if NOT disabled 
+        if (onlyEnabled == false || (onlyEnabled && getSetting(plug.unique_prefix + '_RUN') != 'disabled')) {
+          result.push(plug.unique_prefix)         
+        }
+      }
+    });
+
+    return result;
+  }
+
+
+  // -------------------------------------------------------------------
+  // Get plugin type base on prefix
+  function getPluginType(pluginsData, prefix)
+  {
+    var result = "core"
+
+    pluginsData.forEach((plug) => {
+
+      if (plug.unique_prefix == prefix ) {
+        id = plug.plugin_type;
+        
+        // console.log(id)
+        result = plug.plugin_type;        
+      }
+    });
+
+    return result;
+  }
+
+  // -------------------------------------------------------------------
+  // Generate plugin HTML card based on prefixes in an array 
+  function pluginCards(prefixesOfEnabledPlugins, includeSettings)
+  {    
+    html = ""
+
+    prefixesOfEnabledPlugins.forEach((prefix) => {
+
+      includeSettings_html = ''
+
+      includeSettings.forEach((set) => {
+
+        includeSettings_html += `
+            <a href="#${prefix + '_' + set}" onclick="toggleAllSettings()">
+              <div class="overview-setting-value  pointer" title="${prefix + '_' + set}">
+                <code>${getSetting(prefix + '_' + set)}</code>
+              </div> 
+            </a>
+          `
+
+      });
+
+      html += `
+            
+              <div class="col-sm-4 ">
+                <div class="small-box bg-green " >
+                <div class="inner ">
+                    <h5 class="card-title">
+                      ${getString(prefix+"_display_name")}
+                    </h5>
+                    ${includeSettings_html}
+                </div>
+                <div class="icon"> ${getString(prefix+"_icon")} </div> 
+                  
+                </div>
+              </div>
+            `
+    });
+
+    return html;    
+  }
+
+  // -------------------------------------------------------------------
+  // Checks if all schedules are the same
+  function schedulesAreSynchronized(prefixesOfEnabledPlugins, pluginsData)
+  {    
+    plug_schedules = []    
+
+    prefixesOfEnabledPlugins.forEach((prefix) => {
+      pluginsData.forEach((plug) => {
+
+        if (plug.unique_prefix == prefix) {
+          
+          plug_schedules.push(getSetting(prefix+"_RUN_SCHD").replace(/\s/g, "")) // replace all white characters to compare them easier
+
+        }
+
+      });
+    });
+
+    // Check if all plug_schedules are the same
+    if (plug_schedules.length > 0) {
+      const firstSchedule = plug_schedules[0];
+      return plug_schedules.every((schedule) => schedule === firstSchedule);
+    }
+
+    return true; // Return true if no schedules are found
+  }

front/maintenance.php

@@ -174,6 +174,12 @@ $db->close();
                             <?php echo date("Y-m-d", ((int)file_get_contents( "buildtimestamp.txt")));?> 
                         </div>
                     </div>
+                    <div class="db_info_table_row">
+                        <div class="db_info_table_cell" style="min-width: 140px"><?= lang('Maintenance_Running_Version');?></div>
+                        <div class="db_info_table_cell">                               
+                          <?php include 'php/templates/version.php'; ?> 
+                        </div>
+                    </div>
                     <div class="db_info_table_row">
                         <div class="db_info_table_cell" style="min-width: 140px"><?= lang('Maintenance_database_path');?></div>
                         <div class="db_info_table_cell">
@@ -389,7 +395,7 @@ $db->close();
         <!-- ---------------------------Logging-------------------------------------------- -->
         <div class="tab-pane" id="tab_Logging">
                     <div class="db_info_table">
-                        <div class="log-area">
+                        <div class="log-area box box-solid box-primary">
                             <div class="row logs-row">
                               <textarea id="pialert_log" class="logs" cols="70" rows="10" wrap='off' readonly >
                                 <?php                               
@@ -415,7 +421,7 @@ $db->close();
                               </div>
                             </div>
                         </div> 
-                        <div class="log-area">
+                        <div class="log-area box box-solid box-primary">
                             <div class="row logs-row">
                               <textarea id="pialert_front_log" class="logs" cols="70" rows="10" wrap='off' readonly><?php echo file_get_contents( "./log/pialert_front.log" ); ?>
                               </textarea>
@@ -431,7 +437,7 @@ $db->close();
                               </div>
                             </div>
                         </div> 
-                        <div class="log-area">
+                        <div class="log-area box box-solid box-primary">
                             <div class="row logs-row">
                               <textarea id="pialert_php_log" class="logs" cols="70" rows="10" wrap='off' readonly><?php echo file_get_contents( "./log/pialert.php_errors.log" ); ?>
                               </textarea>
@@ -447,44 +453,18 @@ $db->close();
                               </div>
                             </div>
                         </div>         
-                        
-                         <div class="log-area">
-                             
-                             <div class="row logs-row">
-                               <textarea id="pialert_pholus_lastrun_log" class="logs logs-small" cols="70" rows="10" wrap='off' readonly><?php echo file_get_contents( "./log/pialert_pholus_lastrun.log" ); ?>
-                               </textarea>                              
-                             </div>                          
-                             <div class="row logs-row" >
-                               <div> 
-                                 <div class="log-file">pialert_pholus_lastrun.log<div class="logs-size"><?php echo number_format((filesize("./log/pialert_pholus_lastrun.log") / 1000000),2,",",".") . ' MB';?> 
-                                 <span class="span-padding"><a href="./log/pialert_pholus_lastrun.log"><i class="fa fa-download"></i> </a></span>
-                                </div></div>                          
-                                 <div class="log-purge">                                 
-                                   <button class="btn btn-primary" onclick="logManage('pialert_pholus_lastrun.log','cleanLog')"><?= lang('Gen_Purge');?></button> 
-                                 </div>                            
-                               </div>                            
-                             </div>                            
- 
-                         </div>    
-                        <div class="log-area">
-                             
+                        <div class="log-area box box-solid box-primary ">
                             <div class="row logs-row">
-                              <textarea id="IP_changes_log" class="logs logs-small" cols="70" rows="10" readonly><?php echo file_get_contents( "./log/IP_changes.log" ); ?>
+                              <textarea id="nginx_error_log" class="logs logs-small" cols="70" rows="10" wrap='off' readonly><?php echo file_get_contents( "/var/log/nginx/error.log" ); ?>
                               </textarea>
                             </div>
                             <div class="row logs-row" >                            
                               <div>
-                                <div class="log-file">IP_changes.log<div class="logs-size"><?php echo number_format((filesize("./log/IP_changes.log") / 1000000),2,",",".") . ' MB';?> 
-                                <span class="span-padding"><a href="./log/IP_changes.log"><i class="fa fa-download"></i> </a></span>
-                              </div></div>                          
-                                <div class="log-purge">
-                                  <button class="btn btn-primary" onclick="logManage('IP_changes.log','cleanLog')"><?= lang('Gen_Purge');?></button>
-                                </div>                            
+                                <div class="log-file" title="/var/log/nginx/error.log">nginx/error.log</div>
                               </div>
                             </div>
-
                         </div>                                        
-                        <div class="log-area">
+                        <div class="log-area box box-solid box-primary">
                             <div class="row logs-row">
                               <textarea id="stdout_log" class="logs logs-small" cols="70" rows="10" wrap='off' readonly><?php echo file_get_contents( "./log/stdout.log" ); ?>
                               </textarea>
@@ -501,7 +481,7 @@ $db->close();
                           </div>
 
                         </div> 
-                        <div class="log-area">
+                        <div class="log-area box box-solid box-primary">
                             <div class="row logs-row">
                               <textarea id="stderr_log" class="logs logs-small" cols="70" rows="10" wrap='off' readonly><?php echo file_get_contents( "./log/stderr.log" ); ?>
                               </textarea>
@@ -780,7 +760,7 @@ function performLogManage() {
         showModalOk ('Result', data );
     }
   })
-  }
+}
 
 // --------------------------------------------------------
 function scrollDown()

front/network.php

@@ -8,7 +8,6 @@
   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>'); 
   
-  $NETWORKTYPES = getNetworkTypes();  
 ?>
 
 <!-- Page ------------------------------------------------------------------ -->
@@ -268,6 +267,8 @@
     //                          \
     //                          PC (leaf) <------- leafs are not included in this SQL query
 
+    $networkDeviceTypes = str_replace("]", "",(str_replace("[", "", getSettingValue("NETWORK_DEVICE_TYPES"))));
+    
     $sql = "SELECT node_name, node_mac, online, node_type, node_ports_count, parent_mac, node_icon
             FROM 
             (
@@ -278,7 +279,7 @@
                         a.dev_Network_Node_MAC_ADDR as parent_mac,
                         a.dev_Icon as node_icon
                   FROM Devices a 
-                  WHERE a.dev_DeviceType in ('AP', 'Gateway', 'Firewall', 'Hypervisor', 'Powerline', 'Switch', 'WLAN', 'PLC', 'Router','USB LAN Adapter', 'USB WIFI Adapter', 'Internet')					
+                  WHERE a.dev_DeviceType in (".$networkDeviceTypes.")					
             ) t1
             LEFT JOIN
             (
@@ -471,6 +472,10 @@
 
       setCache('devicesListNew', JSON.stringify(devicesListnew))
 
+      // init global variable
+      deviceListGlobal = devicesListnew;
+
+      
       // create tree
       initTree(getHierarchy());
 
@@ -484,20 +489,6 @@
   // ---------------------------------------------------------------------------
   // Tree functionality
   // ---------------------------------------------------------------------------
-  // ---------------------------------------------------------------------------  
-  function getDevicesList()
-  {
-    // Read cache
-    devicesList = getCache('devicesListNew');
-    
-    if (devicesList != '') {
-        devicesList = JSON.parse (devicesList);
-    } else {
-        devicesList = [];
-    }
-    return devicesList;
-  }
-
   
   // ---------------------------------------------------------------------------
   var leafNodesCount = 0;
@@ -505,6 +496,7 @@
   var parentNodesCount = 0;
   var hiddenMacs = []; // hidden children
   var hiddenChildren = [];
+  var deviceListGlobal = null; 
   
 
   
@@ -560,13 +552,12 @@
   
   function getHierarchy()
   { 
-    list = getDevicesList();
 
-    for(i in list)
+    for(i in deviceListGlobal)
     {      
-      if(list[i].mac == 'Internet')
+      if(deviceListGlobal[i].mac == 'Internet')
       { 
-        return (getChildren(list[i], list, ''))
+        return (getChildren(deviceListGlobal[i], deviceListGlobal, ''))
         break;
       }
     }
@@ -587,8 +578,6 @@
       removeItemFromArray(hiddenMacs, parentMac)
     }
 
-    list = getDevicesList();
-
     // updatedTree = myHierarchy;
     updatedTree = getHierarchy()
 
@@ -608,23 +597,25 @@
   }
 
   // --------------------------------------------------------------------------- 
+  // Handle network node click - select correct tab in teh bottom table
   function handleNodeClick(event)
   {
+    console.log(event.target.offsetParent.offsetParent)
 
-    console.log(event.target.offsetParent)
-    
-    const targetTabMAC = $(event.target.offsetParent).attr("data-mytreemacmain");
+    const targetTabMAC = $(event.target.offsetParent.offsetParent).attr("data-mytreemacmain");    
 
     var targetTab = $(`a[data-mytabmac="${targetTabMAC}"]`);
   
     // Simulate a click event on the target tab
     targetTab.click();
   }
+
   // --------------------------------------------------------------------------- 
   var myTree;
   var treeAreaHeight = 800;
   var emSize;
   var nodeHeight;
+  var sizeCoefficient = 1
 
   function initTree(myHierarchy)
   {
@@ -640,7 +631,6 @@
 
     myTree = Treeviz.create({
       htmlId: "networkTree",
-      
       renderNode:  nodeData =>  {
         var fontSize = "font-size:"+emSize+"em;";
 
@@ -649,31 +639,53 @@
         (port == "" || port == 0 ) ? portBckgIcon = `<i class="fa fa-wifi"></i>` : portBckgIcon = `<i class="fa fa-ethernet"></i>`;
 
         // Build HTML for individual nodes in the network diagram        
-        deviceIcon = (!emptyArr.includes(nodeData.data.icon )) ?  "<div class='netIcon ' ><i class='fa fa-"+nodeData.data.icon +"'></i></div>"    : "";
-        devicePort = `<div class='netPort ' style="width:${emSize*2.7}em;height:${emSize*2.7}em" >${port}</div> <div class="portBckgIcon" style="margin-left:-${emSize*2.5}em;">${portBckgIcon}</div>`;
-        collapseExpandIcon = nodeData.data.hiddenChildren ?  "square-plus" :"square-minus";
-        collapseExpandHtml = (nodeData.data.hasChildren) ?  "<div class='netCollapse' style='font-size:"+emSize*2.5+"em;' data-mytreepath='"+nodeData.data.path+"' data-mytreemac='"+nodeData.data.mac+"'><i class='fa fa-"+ collapseExpandIcon +" pointer'></i></div>"    : "";
-        statusCss = " netStatus-" + nodeData.data.status;
+        deviceIcon = (!emptyArr.includes(nodeData.data.icon )) ?  
+                  `<div class="netIcon">
+                        <i class="fa fa-${nodeData.data.icon}"></i>
+                  </div>` : "";
+        devicePort = `<div  class="netPort" 
+                            style="width:${emSize*sizeCoefficient}em;height:${emSize*sizeCoefficient}em">
+                        ${port}</div> 
+                      <div  class="portBckgIcon" 
+                            style="margin-left:-${emSize*sizeCoefficient}em;">
+                            ${portBckgIcon}
+                      </div>`;
+        collapseExpandIcon = nodeData.data.hiddenChildren ? 
+                            "square-plus" : "square-minus";
+                            
+        // generate +/- icon if node has children nodes
+        collapseExpandHtml = nodeData.data.hasChildren ? 
+                      `<div class="netCollapse" 
+                            style="font-size:${emSize*sizeCoefficient}em;top:${1/2*emSize*sizeCoefficient}em" 
+                            data-mytreepath="${nodeData.data.path}" 
+                            data-mytreemac="${nodeData.data.mac}">
+                        <i class="fa fa-${collapseExpandIcon} pointer"></i>
+                      </div>` : "";
 
         selectedNodeMac = $(".nav-tabs-custom .active a").attr('data-mytabmac')
 
-        highlightedCss = nodeData.data.mac == selectedNodeMac ? " highlightedNode" : "";        
+        highlightedCss = nodeData.data.mac == selectedNodeMac ? 
+                      " highlightedNode" : "";
 
-        return result = `<div class='box ${(nodeData.data.hasChildren)? "pointer":""} ${statusCss} ${highlightedCss}'  
-                              data-mytreemacmain='${nodeData.data.mac}' 
-                              style='height:${nodeData.settings.nodeHeight}px;${fontSize}
+        // css indicating online/offline status
+        statusCss = ` netStatus-${nodeData.data.status}`;
+
+        return result = `<div class="box ${nodeData.data.hasChildren ? "pointer":""} ${statusCss} ${highlightedCss}"
+                              data-mytreemacmain="${nodeData.data.mac}"
+                              style="height:${nodeData.settings.nodeHeight}px;${fontSize}"
                           >
-                          <div class='netNodeText '>\
-                            <strong>${devicePort}  ${deviceIcon} 
-                              <span class='spanNetworkTree anonymizeDev'>${nodeData.data.name}</span>\
-                            </strong>
-                            ${collapseExpandHtml}
-                          </div></div>`;
-        },
+                            <div class="netNodeText">
+                              <strong>${devicePort}  ${deviceIcon}
+                                <span class="spanNetworkTree anonymizeDev">${nodeData.data.name}</span>
+                              </strong>
+                              ${collapseExpandHtml}
+                            </div>
+                          </div>`;
+      },
 
       onNodeClick:  nodeData =>  {
-          console.log(this)  
-        },
+        console.log(this)
+      },
       mainAxisNodeSpacing: 'auto',
       // mainAxisNodeSpacing: 3,
       secondaryAxisNodeSpacing: 0.3,
@@ -687,9 +699,11 @@
       linkWidth: (nodeData) => 3,
       linkColor: (nodeData) => "#ffcc80",
       onNodeClick: (nodeData) => handleNodeClick(nodeData),
-      relationnalField: "children",      
+        relationnalField: "children",
       });
 
+      console.log(myHierarchy)
+
       myTree.refresh(myHierarchy);
     }
 
@@ -773,10 +787,18 @@
   // ---------------------------------------------------------------------------
   function updateLeaf(leafMac,nodeMac)
   {
-    console.log(leafMac)
-    console.log(nodeMac)
-    saveData('updateNetworkLeaf', leafMac, nodeMac);
-    setTimeout("location.reload();", 1000); // refresh page after 1s
+    console.log(leafMac) // child
+    console.log(nodeMac) // parent
+
+    // prevent the assignment of the Internet root node avoiding recursion when generating the network tree topology
+    if(leafMac.toLowerCase().includes('internet'))
+    {
+      showMessage(getString('Network_Cant_Assign'))
+    }
+    else{
+      saveData('updateNetworkLeaf', leafMac, nodeMac);
+      setTimeout("location.reload();", 500); // refresh page 
+    }
   }
 
 

front/php/server/devices.php

@@ -646,12 +646,14 @@ function getDevicesList() {
   $tableData = array();
   while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
 
-    $defaultOrder = array ($row['dev_Name'],
+    $defaultOrder = array (
+                            $row['dev_Name'],
                             $row['dev_Owner'],
                             handleNull($row['dev_DeviceType']),
                             handleNull($row['dev_Icon'], "laptop"),
                             $row['dev_Favorite'],
                             $row['dev_Group'],
+                            // ----
                             formatDate ($row['dev_FirstConnection']),
                             formatDate ($row['dev_LastConnection']),
                             $row['dev_LastIP'],
@@ -755,7 +757,12 @@ function getNetworkNodes() {
   global $db;
 
   // Device Data  
-  $sql = 'SELECT * FROM Devices WHERE dev_DeviceType in (  "AP", "Gateway", "Firewall", "Hypervisor", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter")';
+  $networkDeviceTypes = str_replace("]", "",(str_replace("[", "", getSettingValue("NETWORK_DEVICE_TYPES"))));
+  
+
+  $sql = 'SELECT * FROM Devices WHERE dev_DeviceType in ( '. $networkDeviceTypes .' )';
+
+  // echo $sql;
 
   $result = $db->query($sql);
 
@@ -852,8 +859,6 @@ function getDevices() {
 function getDeviceTypes() {
   global $db;
 
-  $networkTypes = getNetworkTypes();
-
   // SQL
   $sql = 'SELECT DISTINCT 9 as dev_Order, dev_DeviceType
           FROM Devices
@@ -1001,8 +1006,8 @@ function getLocations() {
 // ----------------------------------------------------------------------------------------
 function updateNetworkLeaf()
 {
-  $nodeMac = $_REQUEST['value'];
-  $leafMac = $_REQUEST['id'];
+  $nodeMac = $_REQUEST['value']; // parent
+  $leafMac = $_REQUEST['id'];    // child
 
   if ((false === filter_var($nodeMac , FILTER_VALIDATE_MAC) && $nodeMac != "Internet" && $nodeMac != "") || false === filter_var($leafMac , FILTER_VALIDATE_MAC) ) {
     throw new Exception('Invalid mac address');

front/php/server/util.php

@@ -13,28 +13,47 @@ require dirname(__FILE__).'/../templates/skinUI.php';
 
 $FUNCTION = [];
 $SETTINGS = [];
+$ACTION   = "";
 
 // init request params
 if(array_key_exists('function', $_REQUEST) != FALSE)
 {  
   $FUNCTION = $_REQUEST['function']; 
 }
-
 if(array_key_exists('settings', $_REQUEST) != FALSE)
 {
   $SETTINGS = $_REQUEST['settings'];
 }
 
+
 // call functions based on requested params
-if ($FUNCTION  == 'savesettings') 
-{
-  saveSettings();
-} 
-elseif ($FUNCTION  == 'cleanLog')
-{
-  cleanLog($SETTINGS);
+switch ($FUNCTION) {
+  case 'savesettings':
+      
+      saveSettings();
+      break;
+
+  case 'cleanLog':      
+
+      cleanLog($SETTINGS);
+      break;
+
+  case 'addToExecutionQueue':
+
+      if(array_key_exists('action', $_REQUEST) != FALSE)
+      {
+        $ACTION = $_REQUEST['action'];
+      }
+
+      addToExecutionQueue($ACTION);
+      break;
+
+  default:
+      // Handle any other cases or errors if needed
+      break;
 }
 
+
 //------------------------------------------------------------------------------
 // Formatting data functions
 //------------------------------------------------------------------------------
@@ -195,6 +214,25 @@ function displayMessage($message, $logAlert = FALSE, $logConsole = TRUE, $logFil
 
 }
 
+// Adds an action to perform into the execution_queue.log file
+function addToExecutionQueue($action)
+{
+    global $logFolderPath, $timestamp;
+
+    $logFile = 'execution_queue.log';
+    $fullPath = $logFolderPath . $logFile;
+
+    // Open the file or skip if it can't be opened
+    if ($file = fopen($fullPath, 'a')) {
+        fwrite($file, "[" . $timestamp . "]|" . $action . PHP_EOL);
+        fclose($file);
+        displayMessage('Action "'.$action.'" added to the execution queue.', false, true, true, true);
+    } else {
+        displayMessage('Log file not found or couldn\'t be created.', false, true, true, true);
+    }
+}
+
+
 // ----------------------------------------------------------------------------------------
 function cleanLog($logFile)
 {  
@@ -328,13 +366,18 @@ function saveSettings()
   $txt = $txt."#-------------------IMPORTANT INFO-------------------#\n";
 
   // open new file and write the new configuration      
-  $newConfig = fopen($fullConfPath, "w") or die("Unable to open file!"); 
-  fwrite($newConfig, $txt);
-  fclose($newConfig);
+  // Create a temporary file
+  $tempConfPath = $fullConfPath . ".tmp";
 
-  displayMessage("<br/>Settings saved to the <code>".$config_file."</code> file.  
-    <br/><br/>Backup of the previous ".$config_file." created here: <br/><br/><code>".$new_name."</code><br/><br/>
-    <b>Note:</b> Wait at least <b>5s</b> for the changes to reflect in the UI. (longer if for example a <a href='#state'>Scan is running</a>)", 
+  // Write your changes to the temporary file
+  $tempConfig = fopen($tempConfPath, "w") or die("Unable to open file!");
+  fwrite($tempConfig, $txt);
+  fclose($tempConfig);
+
+  // Replace the original file with the temporary file
+  rename($tempConfPath, $fullConfPath);
+
+  displayMessage("<br/>Settings saved to the <code>pialert.conf</code> file.<br/><br/>A time-stamped backup of the previous file created. <br/><br/> Reloading...<br/>", 
     FALSE, TRUE, TRUE, TRUE);    
 
 }
@@ -351,6 +394,38 @@ function getString ($codeName, $default) {
 
   return $default;
 }
+// -------------------------------------------------------------------------------------------
+function getSettingValue($codeName) {
+  // Define the JSON endpoint URL  
+  $url = dirname(__FILE__).'/../../../front/api/table_settings.json';  
+
+  // Fetch the JSON data
+  $json = file_get_contents($url);
+
+  // Check if the JSON data was successfully fetched
+  if ($json === false) {
+      return 'Could not get json data';
+  }
+
+  // Decode the JSON data
+  $data = json_decode($json, true);
+
+  // Check if the JSON decoding was successful
+  if (json_last_error() !== JSON_ERROR_NONE) {
+    return 'Could not decode json data';
+  }
+
+  // Search for the setting by Code_Name
+  foreach ($data['data'] as $setting) {
+      if ($setting['Code_Name'] === $codeName) {
+          return $setting['Value'];
+          // echo $setting['Value'];
+      }
+  }
+
+  // Return false if the setting was not found
+  return 'Could not find setting '.$codeName;
+}
 
 // -------------------------------------------------------------------------------------------
 
@@ -421,16 +496,7 @@ function handleNull ($text, $default = "") {
   
 }
 
-// -------------------------------------------------------------------------------------------
-// Currently unused - should be source of truth for network types (or define somewhere else?)
-function getNetworkTypes(){
 
-  $array = array(
-    "AP", "Gateway", "Firewall", "Hypervisor", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter"
-  );
-
-  return $array;
-}
 
 // -------------------------------------------------------------------------------------------
 function getDevicesColumns(){

front/php/templates/footer.php

@@ -27,9 +27,8 @@
     <div class="pull-right no-hidden-xs">
 
     <!-- Pi.Alert footer with url -->
-    <?php
-      echo '<a href="https://github.com/jokob-sk/Pi.Alert" target="_blank">Pi.Alert</a>';
-    ?>
+    <a href="https://github.com/jokob-sk/Pi.Alert" target="_blank">Pi.Alert</a>
+    
     </div>
   </footer>
 

front/php/templates/header.php

@@ -83,8 +83,13 @@ if ($ENABLED_DARKMODE === True) {
 <script>
 
   function updateState(){
-    getParam("state","Back_App_State", true)
-    setTimeout("updateState()", 5000);
+    $.get('api/app_state.json?nocache=' + Date.now(), function(appState) {    
+
+      document.getElementById('state').innerHTML = appState["currentState"].replaceAll('"', '');
+
+      setTimeout("updateState()", 1000);
+        
+    })
   }
 
   function show_pia_servertime() {
@@ -99,12 +104,6 @@ if ($ENABLED_DARKMODE === True) {
     setTimeout("show_pia_servertime()", 1000);
   }
 
-  // refresh page on focus - adds a lot of SQL queries overhead onto the DB - disabling for now
-  // document.addEventListener("visibilitychange",()=>{
-  //   if(document.visibilityState==="visible"){
-  //       window.location.href = window.location.href.split('#')[0];
-  //   }
-  // })
 
 </script>
 
@@ -262,9 +261,9 @@ if ($ENABLED_DARKMODE === True) {
 	      <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('help_faq.php') ) ){ echo 'active'; } ?>">
           <a href="help_faq.php"><i class="fa fa-question"></i> <span><?= lang('Navigation_HelpFAQ');?></span></a>
         </li>
-        <!-- <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('donations.php') ) ){ echo 'active'; } ?>">
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('donations.php') ) ){ echo 'active'; } ?>">
           <a href="donations.php"><i class="fa fa-heart"></i> <span><?= lang('Navigation_Donations');?></span></a>
-        </li> -->
+        </li>
       </ul>
 
       <!-- /.sidebar-menu -->
@@ -277,26 +276,6 @@ if ($ENABLED_DARKMODE === True) {
 
 //--------------------------------------------------------------
 
-  
-  //--------------------------------------------------------------
-  function getParam(targetId, key, skipCache = false) {  
-
-    skipCacheQuery = "";
-
-    if(skipCache)
-    {
-      skipCacheQuery = "&skipcache";
-    }
-
-    // get parameter value
-    $.get('php/server/parameters.php?action=get&defaultValue=NULL&parameter='+ key + skipCacheQuery, function(data) {
-      var result = data;
-
-      document.getElementById(targetId).innerHTML = result.replaceAll('"', '');    
-
-    });
-  }
-
   //--------------------------------------------------------------
 
   function toggleFullscreen() {

front/php/templates/language/es_es.json

@@ -83,6 +83,7 @@
         "Device_Table_nav_prev" : "Anterior",
         "Presence_Title" : "Historial por dispositivo",
         "Presence_Loading" : "Cargando...",        
+        "Loading" : "Cargando...",        
         "Presence_Shortcut_AllDevices" : "Todos",
         "Presence_Shortcut_Connected" : "Conectado(s)",
         "Presence_Shortcut_Favorites" : "Favorito(s)",
@@ -449,7 +450,7 @@
         "Settings_Title" : "<i class=\"fa fa-cog\"> Configuración</i>",
         "settings_missing" : "Actualiza la página, no todos los ajustes se han cargado. Probablemente sea por una sobrecarga de la base de datos.",
         "settings_missing_block" : "No puedes guardar los ajustes sin establecer todas las claves. Actualiza la página. Problabmente esté causado por una sobrecarga de la base de datos.",
-        "settings_old" : "Los ajustes mostrados en esta página están desactualizados. Probablemente sea por un escaneo en proceso. Los ajustes se guardan en el archivo <code>pialert.conf</code>, pero el proceso en segundo plano no las ha importado todavía a la base de datos. Puedes esperar a que los ajustes se actualicen para evitar sobreescribirlos con los ajustes antiguos. Si te da igual perder los ajustes desde la última vez que guardaste y ahora, siéntete libre de guardarlos de nuevo. También hay copias de seguridad creadas si necesitas comparar tus ajustes más tarde.",
+        "settings_old" : "N/A",
         "settings_imported" : "Última vez que los ajustes fueron importados desde el archivo pialert.conf:",
         "settings_expand_all" : "Expandir todo",
         "Setting_Override" : "Sobreescribir el valor",
@@ -489,7 +490,7 @@
         "REPORT_MAIL_name" : "Habilitar email",
         "REPORT_MAIL_description" : "Si está habilitado, se envía un correo electrónico con una lista de cambios a los que se ha suscrito. Complete también todas las configuraciones restantes relacionadas con la configuración de SMTP a continuación",
         "SMTP_SERVER_name" : "URL del servidor SMTP",
-        "SMTP_SERVER_description" : "La URL del host del servidor SMTP. Por ejemplo, <code>smtp-relay.sendinblue.com</code>. Para utilizar Gmail como servidor SMTP <a target=\"_blank\" href=\"https://github.com/jokob-sk/Pi.Alert/blob/main/docs/SMTP_GMAIL.md\">siga esta guía</a >",
+        "SMTP_SERVER_description" : "La URL del host del servidor SMTP. Por ejemplo, <code>smtp-relay.sendinblue.com</code>. Para utilizar Gmail como servidor SMTP <a target=\"_blank\" href=\"https://github.com/jokob-sk/Pi.Alert/blob/main/docs/SMTP.md\">siga esta guía</a >",
         "SMTP_PORT_name" : "Puerto del servidor SMTP",
         "SMTP_PORT_description" : "Número de puerto utilizado para la conexión SMTP. Establézcalo en <code>0</code> si no desea utilizar un puerto al conectarse al servidor SMTP.",
         "SMTP_SKIP_LOGIN_name" : "Omitir autenticación",
@@ -568,18 +569,6 @@
         "MQTT_QOS_description" : "Configuración de calidad de servicio para el envío de mensajes MQTT. <code>0</code>: baja calidad a <code>2</code>: alta calidad. Cuanto mayor sea la calidad, mayor será el retraso.",
         "MQTT_DELAY_SEC_name" : "Retraso de MQTT por dispositivo",
         "MQTT_DELAY_SEC_description" : "Un pequeño truco: retrase la adición a la cola en caso de que el proceso se reinicie y los procesos de publicación anteriores se anulen (se necesitan ~<code>2</code>s para actualizar la configuración de un sensor en el intermediario). Probado con <code>2</code>-<code>3</code> segundos de retraso. Este retraso solo se aplica cuando se crean dispositivos (durante el primer bucle de notificación). No afecta los escaneos o notificaciones posteriores.",
-        "DynDNS_display_name" : "DynDNS",
-        "DynDNS_icon" : "<i class=\"fa fa-globe\"></i>",
-        "DDNS_ACTIVE_name" : "Habilitar DynDNS",
-        "DDNS_ACTIVE_description" : "Habilitar el servicio DynDNS",
-        "DDNS_DOMAIN_name" : "URL del dominio DynDNS",
-        "DDNS_DOMAIN_description" : "URL del host DynDNS (no incluya http:// o https://).",
-        "DDNS_USER_name" : "Usuario de DynDNS",
-        "DDNS_USER_description" : "El nombre de usuario utilizado para iniciar sesión en el servicio DynDNS (a veces, una dirección de correo electrónico completa).",
-        "DDNS_PASSWORD_name" : "Contraseña de DynDNS",
-        "DDNS_PASSWORD_description" : "La contraseña de acceso al servicio DynDNS.",
-        "DDNS_UPDATE_URL_name" : "URL de actualización de DynDNS",
-        "DDNS_UPDATE_URL_description" : "Actualice la URL que comienza con <code>http://</code> o <code>https://</code>.",
         "API_display_name" : "API",
         "API_icon" : "<i class=\"fa fa-arrow-down-up-across-line\"></i>",									  
         "API_CUSTOM_SQL_name" : "Endpoint personalizado",

front/plugins/README.md

@@ -1,25 +1,55 @@
+## 📚 Docs for individual plugins 
+
+### 🏴 Community translations of this file
+
+> Please note there might be a delay between English and community translations.
+
+* <a href="https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/README_ES.md">
+   <img src="https://github.com/lipis/flag-icons/blob/main/flags/4x3/es.svg" alt="README_ES.md" style="height: 20px !important;width: 20px !important;"> Spanish (Spain)
+  </a> 
+
+* <a href="https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/README_DE.md">
+   <img src="https://github.com/lipis/flag-icons/blob/main/flags/4x3/de.svg" alt="README_DE.md" style="height: 20px !important;width: 20px !important;"> German (Germany)
+  </a> 
+
 ### 🔌 Plugins & 📚 Docs 
 
-| Required    | CurrentScan | Unique Prefix         | Plugin Type            | Link + Docs                                       | 
-|-------------|-------------|-----------------------|------------------------|----------------------------------------------------------|
-|             |    Yes      | ARPSCAN               | Script                 | [arp_scan](/front/plugins/arp_scan/)          |
-|             |             | CSVBCKP               | Script                 | [csv_backup](/front/plugins/csv_backup/)      |
-|             |    Yes      | DHCPLSS               | Script                 | [dhcp_leases](/front/plugins/dhcp_leases/)    |
-|             |             | DHCPSRVS              | Script                 | [dhcp_servers](/front/plugins/dhcp_servers/) |
-|     Yes     |             | NEWDEV                | Template               | [newdev_template](/front/plugins/newdev_template/) |
-|             |             | NMAP                  | Script                 | [nmap_scan](/front/plugins/nmap_scan/)            |
-|             |    Yes      | PIHOLE                | External SQLite DB     | [pihole_scan](/front/plugins/pihole_scan/)    |
-|             |             | SETPWD                | Script                 | [set_password](/front/plugins/set_password/)    |
-|             |             | SNMPDSC               | Script                 | [snmp_discovery](/front/plugins/snmp_discovery/) |
-|             |    Yes*     | UNDIS                 | Script                 | [undiscoverables](/front/plugins/undiscoverables/) |
-|             |    Yes      | UNFIMP                | Script                 | [unifi_import](/front/plugins/unifi_import/)    |
-|             |             | WEBMON                | Script                 | [website_monitor](/front/plugins/website_monitor/) |
-|     N/A     |             | N/A                   | SQL query              | No example available, but the External SQLite based plugins work very similar |
+| Required | CurrentScan | Unique Prefix | Data source        |   Type         | Link + Docs                                                      | 
+|----------|-------------|---------------|--------------------|----------------|------------------------------------------------------------------|
+|          |             | APPRISE       | Script             | 💬 publisher   | 📚[_publisher_apprise](/front/plugins/_publisher_apprise/)      |
+|          |    Yes      | ARPSCAN       | Script             | 🔍dev scanner  | 📚[arp_scan](/front/plugins/arp_scan/)                          |
+|          |             | CSVBCKP       | Script             | ⚙ system       | 📚[csv_backup](/front/plugins/csv_backup/)                      |
+|  Yes*    |             | DBCLNP        | Script             | ⚙ system       | 📚[db_cleanup](/front/plugins/db_cleanup/)                      |
+|          |             | DDNS          | Script             | ⚙ system       | 📚[ddns_update](/front/plugins/ddns_update/)                    |
+|          |    Yes      | DHCPLSS       | Script             | 🔍dev scanner  | 📚[dhcp_leases](/front/plugins/dhcp_leases/)                    |
+|          |             | DHCPSRVS      | Script             | ♻ other        | 📚[dhcp_servers](/front/plugins/dhcp_servers/)                  |
+|          |    Yes      | INTRNT        | Script             | 🔍dev scanner  | 📚[internet_ip](/front/plugins/internet_ip/)                    |
+|          |             | INTRSPD       | Script             | ♻ other        | 📚[internet_speedtest](/front/plugins/internet_speedtest/)      |
+|          |             | MAINT         | Script             | ⚙ system       | 📚[maintenance](/front/plugins/maintenance/)                    |
+|          |             | MQTT          | Script             | 💬 publisher   | 📚[_publisher_mqtt](/front/plugins/_publisher_mqtt/)            |
+|  Yes     |             | NEWDEV        | Template           | ⚙ system       | 📚[newdev_template](/front/plugins/newdev_template/)            |
+|          |             | NMAP          | Script             | ♻ other        | 📚[nmap_scan](/front/plugins/nmap_scan/)                        |
+|          |             | NTFY          | Script             | 💬 publisher   | 📚[_publisher_ntfy](/front/plugins/_publisher_ntfy/)            |
+|          |             | PHOLUS        | Script             | ♻ other        | 📚[pholus_scan](/front/plugins/pholus_scan/)                    |
+|          |    Yes      | PIHOLE        | External SQLite DB | 🔍dev scanner  | 📚[pihole_scan](/front/plugins/pihole_scan/)                    |
+|          |             | PUSHSAFER     | Script             | 💬 publisher   | 📚[_publisher_pushsafer](/front/plugins/_publisher_pushsafer/)  |
+|          |             | SETPWD        | Script             | ⚙ system       | 📚[set_password](/front/plugins/set_password/)                  |
+|          |             | SMTP          | Script             | 💬 publisher   | 📚[_publisher_email](/front/plugins/_publisher_email/)          |
+|          |    Yes      | SNMPDSC       | Script             | 🔍dev scanner  | 📚[snmp_discovery](/front/plugins/snmp_discovery/)              |
+|          |    Yes**    | UNDIS         | Script             | ♻ other        | 📚[undiscoverables](/front/plugins/undiscoverables/)            |
+|          |    Yes      | UNFIMP        | Script             | 🔍dev scanner  | 📚[unifi_import](/front/plugins/unifi_import/)                  |
+|          |             | VNDRPDT       | Script             | ⚙ system       | 📚[vendor_update](/front/plugins/vendor_update/)                |
+|          |             | WEBHOOK       | Script             | 💬 publisher   | 📚[_publisher_webhook](/front/plugins/_publisher_webhook/)      |
+|          |             | WEBMON        | Script             | ♻ other        | 📚[website_monitor](/front/plugins/website_monitor/)            |
+|  N/A     |             | N/A           | SQL query          |                 | N/A, but the External SQLite DB plugins work similar            |
 
->* The Undiscoverables plugin (`UNDIS`) inserts only user-specified dummy devices.
+
+> \* The database cleanup plugin (`DBCLNP`) is not _required_ but the app will become unusable after a while if not executed.
+>
+> \** The Undiscoverables plugin (`UNDIS`) inserts only user-specified dummy devices.
 
 > [!NOTE] 
-> You soft-disable plugins via Settings or completely ignore plugins by placing a `ignore_plugin` file into the plugin directory. The difference is that ignored plugins don't show up anywhere in the UI (Settings, Device details, Plugins pages). The app skips ignored plugins  completely. Device-detecting plugins insert values into the `CurrentScan` database table.  The plugins that are not required are safe to ignore, however it makes sense to have a least some device-detecting plugins (that insert entries into the `CurrentScan` table) enabled, such as ARPSCAN or PIHOLE.  
+> You soft-disable plugins via Settings or completely ignore plugins by placing a `ignore_plugin` file into the plugin directory. The difference is that ignored plugins don't show up anywhere in the UI (Settings, Device details, Plugins pages). The app skips ignored plugins  completely. Device-detecting plugins insert values into the `CurrentScan` database table.  The plugins that are not required are safe to ignore, however it makes sense to have a least some device-detecting plugins (that insert entries into the `CurrentScan` table) enabled, such as `ARPSCAN` or `PIHOLE`.  
 
 > It's recommended to use the same schedule interval for all plugins responsible for discovering new devices.
 
@@ -61,13 +91,13 @@ Follow the below very carefully and check example plugin(s) if you'd like to wri
 * Adding form controls supported to display the data (Currently supported ones are listed in the section "UI settings in database_column_definitions" below)
 * ...
 
-## ❗ Known issues:
+## ❗ Known limitations:
 
 These issues will be hopefully fixed with time, so please don't report them. Instead, if you know how, feel free to investigate and submit a PR to fix the below. Keep the PRs small as it's easier to approve them:
 
-* Existing plugin objects sometimes not interpreted correctly and a new object is created instead, resulting in duplicate entries. (race condition?)
+* Existing plugin objects are sometimes not interpreted correctly and a new object is created instead, resulting in duplicate entries. (race condition?)
 * Occasional (experienced twice) hanging of processing plugin script file.
-UI displays outdated values until the API endpoints get refreshed. 
+* UI displays outdated values until the API endpoints get refreshed. 
 
 ## Plugin file structure overview 
 
@@ -113,6 +143,7 @@ Currently, these data sources are supported (valid `data_source` value).
 | Pialert DB query | `pialert-db-query` | yes | Executes a SQL query on the PiAlert database in the `CMD` setting. |
 | Template | `template` | no | Used to generate internal settings, such as default values. |
 | External SQLite DB query | `sqlite-db-query` | yes | Executes a SQL query from the `CMD` setting on an external SQLite database mapped in the `DB_PATH` setting.  |
+| Plugin type | `plugin_type` | no | Specifies the type of the plugin and in which section the Plugin settings are displayed (`<general|system|scanner|other|publisher>`). | 
 
 
 > 🔎Example
@@ -369,7 +400,7 @@ Plugin results are always inserted into the standard `Plugin_Objects` database t
 >3.  That's it. PiAlert takes care of the rest. It loops thru the objects discovered by the plugin, takes the results line, by line and inserts them into the database table specified in `"mapped_to_table"`. The columns are translated from the generic plugin columns to the target table via the `"mapped_to_column"` property in the column definitions.
 
 > [!NOTE] 
-> You can create a column mapping with a default value via the `mapped_to_column_data` property. This means that the value of the given column will always be this value. Taht also menas that the `"column": "NameDoesntMatter"` is not important as there is no databse source column. 
+> You can create a column mapping with a default value via the `mapped_to_column_data` property. This means that the value of the given column will always be this value. Taht also menas that the `"column": "NameDoesntMatter"` is not important as there is no database source column. 
 
 
 >🔍 Example:
@@ -520,8 +551,8 @@ Required attributes are:
 | `"name"` | Displayed on the Settings page. An array of localized strings. See Localized strings below. |
 | `"description"` | Displayed on the Settings page. An array of localized strings. See Localized strings below. |
 | (optional) `"events"` | Specifies whether to generate an execution button next to the input field of the setting. Supported values: |
-|  | - `test` |
-|  | - `run` |
+|  | - `"test"` - For notification plugins testing |
+|  | - `"run"` - Regular plugins testing |
 | (optional) `"override_value"` | Used to determine a user-defined override for the setting. Useful for template-based plugins, where you can choose to leave the current value or override it with the value defined in the setting. (Work in progress) |
 | (optional) `"events"` | Used to trigger the plugin. Usually used on the `RUN` setting. Not fully tested in all scenarios. Will show a play button next to the setting. After clicking, an event is generated for the backend in the `Parameters` database table to process the front-end event on the next run. |
 
@@ -552,7 +583,6 @@ You can have any `"function": "my_custom_name"` custom name, however, the ones l
 |  | - `missing-in-last-scan` - if the object is missing compared to previous scans |
 
 
-
 > 🔎 Example:
 > 
 > ```json
@@ -598,7 +628,8 @@ The UI will adjust how columns are displayed in the UI based on the resolvers de
 | Supported Types | Description |
 | -------------- | ----------- |
 | `label` | Displays a column only. |
-| `text` | Makes a column editable, and a save icon is displayed next to it. See below for information on `threshold`, `replace`. |
+| `textarea_readonly` | Generates a read only text area and cleans up the text to display it somewhat formatted with new lines preserved. |
+| See below for information on `threshold`, `replace`. | |
 |  |  |
 | `options` Property | Used in conjunction with types like `threshold`, `replace`, `regex`. |
 | `threshold` | The `options` array contains objects ordered from the lowest `maximum` to the highest. The corresponding `hexColor` is used for the value background color if it's less than the specified `maximum` but more than the previous one in the `options` array. |
@@ -612,6 +643,7 @@ The UI will adjust how columns are displayed in the UI based on the resolvers de
 | `url` | The value is considered to be a URL, so a link is generated. |
 | `textbox_save` | Generates an editable and saveable text box that saves values in the database. Primarily intended for the `UserData` database column in the `Plugins_Objects` table. |
 | `url_http_https` | Generates two links with the `https` and `http` prefix as lock icons. |
+| `eval` | Evaluates as JavaScript. Use the variable `value` to use the given column value as input (e.g. `'<b>${value}<b>'` (replace ' with ` in your code) ) |
             
 
 > [!NOTE] 
@@ -703,12 +735,6 @@ The UI will adjust how columns are displayed in the UI based on the resolvers de
         }
 ```
 
-### Community translations of this file
-
-- [Spanish](https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/README_ES.md) 
-
-
-
 [screen1]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins.png                    "Screen 1"
 [screen2]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_settings.png           "Screen 2"
 [screen3]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_json_settings.png      "Screen 3"

front/plugins/README_DE.md

@@ -0,0 +1,722 @@
+## 📚 Dokumente für einzelne Plugins
+
+### 🏴 Community-Übersetzungen dieser Datei
+
+* <a href="https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/README.md">
+   <img src="https://github.com/lipis/flag-icons/blob/main/flags/4x3/us.svg" alt="README.md" style="height: 20px !important;width: 20px !important;"> English (American)
+  </a> 
+
+* <a href="https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/README_ES.md">
+   <img src="https://github.com/lipis/flag-icons/blob/main/flags/4x3/es.svg" alt="README_ES.md" style="height: 20px !important;width: 20px !important;"> Spanish (Spain)
+  </a> 
+
+### 🔌 Plugins und 📚 Dokumente
+
+| Required    | CurrentScan | Unique Prefix         | Plugin Type            | Link + Docs                                       | 
+|-------------|-------------|-----------------------|------------------------|----------------------------------------------------------|
+|             |    Yes      | ARPSCAN               | Script                 | [arp_scan](/front/plugins/arp_scan/)          |
+|             |             | CSVBCKP               | Script                 | [csv_backup](/front/plugins/csv_backup/)      |
+|             |    Yes      | DHCPLSS               | Script                 | [dhcp_leases](/front/plugins/dhcp_leases/)    |
+|             |             | DHCPSRVS              | Script                 | [dhcp_servers](/front/plugins/dhcp_servers/) |
+|     Yes     |             | NEWDEV                | Template               | [newdev_template](/front/plugins/newdev_template/) |
+|             |             | NMAP                  | Script                 | [nmap_scan](/front/plugins/nmap_scan/)            |
+|             |    Yes      | PIHOLE                | External SQLite DB     | [pihole_scan](/front/plugins/pihole_scan/)    |
+|             |             | SETPWD                | Script                 | [set_password](/front/plugins/set_password/)    |
+|             |             | SNMPDSC               | Script                 | [snmp_discovery](/front/plugins/snmp_discovery/) |
+|             |    Yes*     | UNDIS                 | Script                 | [undiscoverables](/front/plugins/undiscoverables/) |
+|             |    Yes      | UNFIMP                | Script                 | [unifi_import](/front/plugins/unifi_import/)    |
+|             |             | WEBMON                | Script                 | [website_monitor](/front/plugins/website_monitor/) |
+|     N/A     |             | N/A                   | SQL query              | No beispiel available, but the External SQLite based plugins work very similar |
+
+>* Das Undiscoverables-Plugin (`UNDIS`) fügt nur vom Benutzer angegebene Dummy-Geräte ein.
+
+> [!NOTE] 
+> Sie können Plugins über die Einstellungen sanft deaktivieren oder Plugins vollständig ignorieren, indem Sie eine „ignore_plugin“-Datei im Plugin-Verzeichnis ablegen. Der Unterschied besteht darin, dass ignorierte Plugins nirgendwo in der Benutzeroberfläche angezeigt werden (Einstellungen, Gerätedetails, Plugins-Seiten). Die App überspringt ignorierte Plugins vollständig. Geräteerkennungs-Plugins fügen Werte in die Datenbanktabelle „CurrentScan“ ein. Die Plugins, die nicht erforderlich sind, können getrost ignoriert werden, es ist jedoch sinnvoll, zumindest einige Plugins zur Geräteerkennung (die Einträge in die Tabelle „CurrentScan“ einfügen) zu aktivieren, wie z. B. ARPSCAN oder PIHOLE.  
+
+> Es wird empfohlen, für alle Plugins, die für die Erkennung neuer Geräte zuständig sind, das gleiche Zeitplanintervall zu verwenden.
+
+## 🌟 Erstellen Sie ein benutzerdefiniertes Plugin: Übersicht
+
+| ![Screen 1][screen1] | ![Screen 2][screen2] | ![Screen 3][screen3] | 
+|----------------------|----------------------| ----------------------| 
+| ![Screen 4][screen4] |  ![Screen 5][screen5] | 
+
+PiAlert verfügt über ein Plugin-System, um Ereignisse aus Skripten von Drittanbietern in die Benutzeroberfläche einzuspeisen und dann bei Bedarf Benachrichtigungen zu senden. Die hervorgehobene Kernfunktionalität, die dieses Plugin-System unterstützt, ist:
+
+* dynamische Erstellung einer einfachen Benutzeroberfläche zur Interaktion mit den entdeckten Objekten,
+* Filterung der angezeigten Werte in der Geräte-Benutzeroberfläche
+* Oberflächeneinstellungen von Plugins in der Benutzeroberfläche,
+* verschiedene Spaltentypen für gemeldete Werte, z.B. Link zurück zu einem Gerät
+* Objekte in vorhandene PiAlert-Datenbanktabellen importieren
+
+> (Derzeit wird das Aktualisieren/Überschreiben vorhandener Objekte nicht unterstützt.)
+
+Beispielanwendungsfälle für Plugins könnten sein:
+
+* Überwachen Sie einen Webdienst und benachrichtigen Sie mich, wenn er nicht verfügbar ist
+* Importieren Sie Geräte aus dhcp.leases-Dateien anstelle/ergänzend zur Verwendung von PiHole oder arp-scans
+* Erstellen von Ad-hoc-UI-Tabellen aus vorhandenen Daten in der PiAlert-Datenbank, z.B. um alle offenen Ports auf Geräten anzuzeigen, um Geräte aufzulisten, die in der letzten Stunde getrennt wurden usw.
+* Verwendung anderer Geräteerkennungsmethoden im Netzwerk und Importieren der Daten als neue Geräte
+* Erstellen eines Skripts zum Erstellen gefälschter Geräte basierend auf Benutzereingaben über benutzerdefinierte Einstellungen
+* ...an diesem Punkt liegt die Einschränkung hauptsächlich in der Kreativität und nicht in der Leistungsfähigkeit (es kann Randfälle geben und die Notwendigkeit, mehr Formularsteuerelemente für Benutzereingaben aus benutzerdefinierten Einstellungen zu unterstützen, aber Sie haben wahrscheinlich schon verstanden, worauf es ankommt)
+
+Wenn Sie ein Plugin entwickeln möchten, prüfen Sie bitte die bestehende Plugin-Struktur. Sobald die Einstellungen vom Benutzer gespeichert wurden, müssen sie manuell aus der Datei `pialert.conf` entfernt werden, wenn Sie sie aus der `config.json` des Plugins neu initialisieren möchten.
+
+Bitte lesen Sie das Folgende noch einmal sorgfältig durch, wenn Sie selbst mit einem Plugin beitragen möchten. Diese Dokumentationsdatei ist möglicherweise veraltet. Überprüfen Sie daher auch die Beispiel-Plugins noch einmal.
+
+## ⚠ Haftungsausschluss
+
+Befolgen Sie die nachstehenden Anweisungen sorgfältig und prüfen Sie Beispiel-Plugins, wenn Sie selbst eines schreiben möchten. Die Plugin-Benutzeroberfläche ist derzeit nicht meine Priorität. Gerne genehmige ich PRs, wenn Sie daran interessiert sind, die Benutzeroberfläche zu erweitern/verbessern (siehe [Frontend-Richtlinien](/docs/FRONTEND_DEVELOPMENT.md)). Beispielhafte Verbesserungen zum Mitnehmen:
+
+* Die Tabellen sortierbar/filterbar machen
+* Verwenden des gleichen Ansatzes zum Anzeigen von Tabellendaten wie im Abschnitt "Geräte" (wird oben gelöst)
+* Hinzufügen unterstützter Formularsteuerelemente zum Anzeigen der Daten (Derzeit unterstützte Steuerelemente sind im Abschnitt "UI-Einstellungen in Datenbankspaltendefinitionen" unten aufgeführt)
+* ...
+
+## ❗ Bekannte Probleme:
+
+These issues will be hopefully fixed with time, so please don't report them. Instead, if you know how, feel free to investigate and submit a PR to fix the below. Keep the PRs small as it's easier to approve them:
+
+* Vorhandene Plugin-Objekte werden manchmal nicht richtig interpretiert und stattdessen wird ein neues Objekt erstellt, was zu doppelten Einträgen führt. (Rennbedingung?)
+* Gelegentliches (zweimal aufgetretenes) Hängenbleiben der Verarbeitungs-Plugin-Skriptdatei.
+Die Benutzeroberfläche zeigt veraltete Werte an, bis die API-Endpunkte aktualisiert werden. 
+
+## Übersicht über die Plugin-Dateistruktur
+
+> ⚠️Der Ordnername muss mit dem Codenamenwert in Folgendem übereinstimmen: `"code_name": "<value>"`
+> Das eindeutige Präfix muss im Vergleich zu den anderen Einstellungspräfixen eindeutig sein, z. B.: Das Präfix `APPRISE` wird bereits verwendet.
+
+  | File | Required (plugin type) | Description | 
+  |----------------------|----------------------|----------------------| 
+  | `config.json` | yes | Contains the plugin configuration (manifest) including the settings available to the user. |
+  | `script.py` |  no | The Python script itself. You may call any valid linux command.  |
+  | `last_result.log` | no | The file used to interface between PiAlert and the plugin. Required for a script plugin if you want to feed data into the app. |
+  | `script.log` | no | Logging output (recommended) |
+  | `README.md` | yes | Any setup considerations or overview  |
+
+Weitere Einzelheiten finden Sie weiter unten.
+
+### Spaltenreihenfolge und Werte
+
+  | Order | Represented Column | Required | Description | 
+  |----------------------|----------------------|----------------------|----------------------| 
+  | 0 | `Object_PrimaryID` | yes | The primary ID used to group Events under. |
+  | 1 | `Object_SecondaryID` | no | Optional secondary ID to create a relationship beween other entities, such as a MAC address |
+  | 2 | `DateTime` | yes | When the event occured in the format `2023-01-02 15:56:30` |
+  | 3 | `Watched_Value1` | yes | A value that is watched and users can receive notifications if it changed compared to the previously saved entry. For beispiel IP address |
+  | 4 | `Watched_Value2` | no | As above |
+  | 5 | `Watched_Value3` | no | As above  |
+  | 6 | `Watched_Value4` | no | As above  |
+  | 7 | `Extra` | no | Any other data you want to pass and display in PiAlert and the notifications |
+  | 8 | `ForeignKey` | no | A foreign key that can be used to link to the parent object (usually a MAC address) |
+
+> [!NOTE] 
+> De-duplication is run once an hour on the `Plugins_Objects` database table and duplicate entries with the same value in columns `Object_PrimaryID`, `Object_SecondaryID`, `Plugin` (auto-filled based on `unique_prefix` of the plugin), `UserData` (can be populated with the `"type": "textbox_save"` column type) are removed.
+
+# config.json structure
+
+## Unterstützte Datenquellen
+
+Currently, these data sources are supported (valid `data_source` value). 
+
+| Name | `data_source` value | Needs to return a "table" | Overview (more details on this page below) | 
+|----------------------|----------------------|----------------------|----------------------| 
+| Script | `script` | no | Executes any linux command in the `CMD` setting. |
+| Pialert DB query | `pialert-db-query` | yes | Executes a SQL query on the PiAlert database in the `CMD` setting. |
+| Template | `template` | no | Used to generate internal settings, such as default values. |
+| External SQLite DB query | `sqlite-db-query` | yes | Executes a SQL query from the `CMD` setting on an external SQLite database mapped in the `DB_PATH` setting.  |
+
+
+> 🔎Beispiel
+>```json
+>"data_source":  "pialert-db-query"
+>```
+If you want to display plugin objects or import devices into the app, data sources have to return a "table" of the exact structure as outlined above.
+
+You can show or hide the UI on the "Plugins" page and "Plugins" tab for a plugin on devices via the `show_ui` property:
+
+> 🔎Beispiel
+>```json
+> "show_ui": true,
+> ```
+
+### "data_source":  "script"
+
+ If the `data_source` is set to `script` the `CMD` setting (that you specify in the `settings` array section in the `config.json`) contains an executable Linux command, that usually generates a `last_result.log` file (not required if you don't import any data into the app). This file needs to be stored in the same folder as the plugin. 
+
+> [!IMPORTANT]
+> A lot of the work is taken care of by the [`plugin_helper.py` library](/front/plugins/plugin_helper.py). You don't need to manage the `last_result.log` file if using the helper objects. Check other `script.py` of other plugins for details (The [Undicoverables plugins `script.py` file](/front/plugins/undiscoverables/script.py) is a good beispiel).
+ 
+ The content of the `last_result.log` file needs to contain the columns as defined in the "Column order and values" section above. The order of columns can't be changed. After every scan it should contain only the results from the latest scan/execution. 
+
+- The format of the `last_result.log` is a `csv`-like file with the pipe `|` as a separator. 
+- 9 (nine) values need to be supplied, so every line needs to contain 8 pipe separators. Empty values are represented by `null`.  
+- Don't render "headers" for these "columns".
+Every scan result/event entry needs to be on a new line.
+- You can find which "columns" need to be present, and if the value is required or optional, in the "Column order and values" section. 
+- The order of these "columns" can't be changed.
+
+#### 🔎 last_result.log beispieles
+
+Valid CSV:
+
+```csv
+
+https://www.google.com|null|2023-01-02 15:56:30|200|0.7898|null|null|null|null
+https://www.duckduckgo.com|192.168.0.1|2023-01-02 15:56:30|200|0.9898|null|null|Best search engine|ff:ee:ff:11:ff:11
+
+```
+
+Invalid CSV with different errors on each line:
+
+```csv
+
+https://www.google.com|null|2023-01-02 15:56:30|200|0.7898||null|null|null
+https://www.duckduckgo.com|null|2023-01-02 15:56:30|200|0.9898|null|null|Best search engine|
+|https://www.duckduckgo.com|null|2023-01-02 15:56:30|200|0.9898|null|null|Best search engine|null
+null|192.168.1.1|2023-01-02 15:56:30|200|0.9898|null|null|Best search engine
+https://www.duckduckgo.com|192.168.1.1|2023-01-02 15:56:30|null|0.9898|null|null|Best search engine
+https://www.google.com|null|2023-01-02 15:56:30|200|0.7898|||
+https://www.google.com|null|2023-01-02 15:56:30|200|0.7898|
+
+```
+
+### "data_source":  "pialert-db-query"
+
+If the `data_source` is set to `pialert-db-query` the `CMD` setting needs to contain a SQL query rendering the columns as defined in the "Column order and values" section above. The order of columns is important. 
+
+This SQL query is executed on the `pialert.db` SQLite database file. 
+
+>  🔎Beispiel
+> 
+> SQL query Beispiel:
+> 
+> ```SQL
+> SELECT  dv.dev_Name as Object_PrimaryID, 
+>     cast(dv.dev_LastIP as VARCHAR(100)) || ':' || cast( SUBSTR(ns.Port ,0, INSTR(ns.Port , '/')) as VARCHAR(100)) as Object_SecondaryID,  
+>     datetime() as DateTime,  
+>     ns.Service as Watched_Value1,        
+>     ns.State as Watched_Value2,
+>     'null' as Watched_Value3,
+>     'null' as Watched_Value4,
+>     ns.Extra as Extra,
+>     dv.dev_MAC as ForeignKey 
+> FROM 
+>     (SELECT * FROM Nmap_Scan) ns 
+> LEFT JOIN 
+>     (SELECT dev_Name, dev_MAC, dev_LastIP FROM Devices) dv 
+> ON ns.MAC = dv.dev_MAC
+> ```
+> 
+> Required `CMD` setting beispiel with above query (you can set `"type": "label"` if you want it to make uneditable in the UI):
+> 
+> ```json
+> {
+>             "function": "CMD",
+>            "type": "text",
+>            "default_value":"SELECT  dv.dev_Name as Object_PrimaryID, cast(dv.dev_LastIP as VARCHAR(100)) || ':' || cast( SUBSTR(ns.Port ,0, INSTR(ns.Port , '/')) as VARCHAR(100)) as Object_SecondaryID,  datetime() as DateTime,  ns.Service as Watched_Value1,        ns.State as Watched_Value2,        'null' as Watched_Value3,        'null' as Watched_Value4,        ns.Extra as Extra        FROM (SELECT * FROM Nmap_Scan) ns LEFT JOIN (SELECT dev_Name, dev_MAC, dev_LastIP FROM Devices) dv   ON ns.MAC = dv.dev_MAC",
+>            "options": [],
+>            "localized": ["name", "description"],
+>            "name" : [{
+>                "language_code":"en_us",
+>                "string" : "SQL to run"
+>            }],
+>             "description": [{
+>                 "language_code":"en_us",
+>                 "string" : "This SQL query is used to populate the coresponding UI tables under the Plugins section."
+>             }]
+>         }
+> ```
+
+### "data_source":  "template"
+
+Used to initialize internal settings. Check the `newdev_template` plugin for details.
+
+### "data_source":  "sqlite-db-query"
+
+You can execute a SQL query on an external database connected to the current PiALert database via a temporary `EXTERNAL_<unique prefix>.` prefix. For beispiel for `PIHOLE` (`"unique_prefix": "PIHOLE"`) it is `EXTERNAL_PIHOLE.`. The external SQLite database file has to be mapped in the container to the path specified in the `DB_PATH` setting:
+
+>  🔎Beispiel
+>
+>```json
+>  ...
+>{
+>        "function": "DB_PATH",
+>        "type": "readonly",
+>        "default_value":"/etc/pihole/pihole-FTL.db",
+>        "options": [],
+>        "localized": ["name", "description"],
+>        "name" : [{
+>            "language_code":"en_us",
+>            "string" : "DB Path"
+>        }],
+>        "description": [{
+>            "language_code":"en_us",
+>            "string" : "Required setting for the <code>sqlite-db-query</code> plugin type. Is used to mount an external SQLite database and execute the SQL query stored in the <code>CMD</code> setting."
+>        }]    
+>    }
+>  ...
+>```
+
+The actual SQL query you want to execute is then stored as a `CMD` setting, similar to the `pialert-db-query` plugin type The format has to adhere to the format outlined in the "Column order and values" section above. 
+
+>  🔎Beispiel
+>
+> Notice the `EXTERNAL_PIHOLE.` prefix.
+>
+>```json
+>{
+>      "function": "CMD",
+>      "type": "text",
+>      "default_value":"SELECT hwaddr as Object_PrimaryID, cast('http://' || (SELECT ip FROM EXTERNAL_PIHOLE.network_addresses WHERE network_id = id ORDER BY lastseen DESC, ip LIMIT 1) as VARCHAR(100)) || ':' || cast( SUBSTR((SELECT name FROM EXTERNAL_PIHOLE.network_addresses WHERE network_id = id ORDER BY lastseen DESC, ip LIMIT 1), 0, INSTR((SELECT name FROM EXTERNAL_PIHOLE.network_addresses WHERE network_id = id ORDER BY lastseen DESC, ip LIMIT 1), '/')) as VARCHAR(100)) as Object_SecondaryID, datetime() as DateTime, macVendor as Watched_Value1, lastQuery as Watched_Value2, (SELECT name FROM EXTERNAL_PIHOLE.network_addresses WHERE network_id = id ORDER BY lastseen DESC, ip LIMIT 1) as Watched_Value3, 'null' as Watched_Value4, '' as Extra, hwaddr as ForeignKey FROM EXTERNAL_PIHOLE.network WHERE hwaddr NOT LIKE 'ip-%' AND hwaddr <> '00:00:00:00:00:00';            ",
+>      "options": [],
+>      "localized": ["name", "description"],
+>      "name" : [{
+>          "language_code":"en_us",
+>          "string" : "SQL to run"
+>      }],
+>      "description": [{
+>          "language_code":"en_us",
+>          "string" : "This SQL query is used to populate the coresponding UI tables under the Plugins section. This particular one selects data from a mapped PiHole SQLite database and maps it to the corresponding Plugin columns."
+>      }]
+>  }
+>  ```
+
+## 🕳 Filter
+
+Plugin-Einträge können in der Benutzeroberfläche basierend auf in Filterfeldern eingegebenen Werten gefiltert werden. Das Textfeld/Feld `txtMacFilter` enthält die Mac-Adresse des aktuell angezeigten Geräts oder einfach eine Mac-Adresse, die in der Abfragezeichenfolge `mac` verfügbar ist.
+
+  | Property | Required | Description | 
+  |----------------------|----------------------|----------------------| 
+  | `compare_column` | yes | Plugin column name that's value is used for comparison (**Left** side of the equation) |
+  | `compare_operator` |  yes | JavaScript comparison operator |
+  | `compare_field_id` | yes | The `id` of a input text field containing a value is used for comparison (**Right** side of the equation)|
+  | `compare_js_template` | yes | JavaScript code used to convert left and right side of the equation. `{value}` is replaced with input values. |
+  | `compare_use_quotes` | yes | If `true` then the end result of the `compare_js_template` i swrapped in `"` quotes. Use to compare strings. |
+  
+  Filters are only applied if a filter is specified and the `txtMacFilter` is not `undefined` or empty (`--`).
+
+> 🔎Beispiel:
+> 
+> ```json
+>     "data_filters": [
+>         {
+>             "compare_column" : "Object_PrimaryID",
+>             "compare_operator" : "==",
+>             "compare_field_id": "txtMacFilter",
+>             "compare_js_template": "'{value}'.toString()", 
+>             "compare_use_quotes": true 
+>         }
+>     ],
+> ```
+>
+>1. On the `pluginsCore.php` page is an input field with the `txtMacFilter` id:
+>
+>```html
+><input class="form-control" id="txtMacFilter" type="text" value="--">
+>```
+>
+>2. This input field is initialized via the `&mac=` query string.
+>
+>3. The app then proceeds to use this Mac value from this field and compares it to the value of the `Object_PrimaryID` database field. The `compare_operator` is `==`.
+>
+>4. Both values, from the database field `Object_PrimaryID` and from the `txtMacFilter` are wrapped and evaluated with the `compare_js_template`, that is `'{value}.toString()'`.
+>
+>5. `compare_use_quotes` is set to `true` so `'{value}'.toString()` is wrappe dinto `"` quotes.
+>
+>6. Daraus ergibt sich beispielsweise dieser code:
+>
+>```javascript
+>    // left part of teh expression coming from compare_column and right from the input field
+>    // notice the added quotes ()") around the left and right part of teh expression
+>    "eval('ac:82:ac:82:ac:82".toString()')" == "eval('ac:82:ac:82:ac:82".toString()')"
+>```
+>
+
+
+### 🗺 Zuordnung der Plugin-Ergebnisse zu einer Datenbanktabelle
+
+Plugin results are always inserted into the standard `Plugin_Objects` database table. Optionally, PiAlert can take the results of the plugin execution and insert these results into an additional database table. This is enabled by with the property `"mapped_to_table"` in the `config.json` file. The mapping of the columns is defined in the `database_column_definitions` array.
+
+> [!NOTE] 
+> If results are mapped to the `CurrentScan` table, the data is then included into the regular scan loop, so for beispiel notification for devices are sent out.  
+
+
+>🔍 Beispiel:
+>
+>For beispiel, this approach is used to implement the `DHCPLSS` plugin. The script parses all supplied "dhcp.leases" files, gets the results in the generic table format outlined in the "Column order and values" section above and takes individual values and inserts them into the `CurrentScan` database table in the PiAlert database. All this is achieved by:
+>
+>1. Specifying the database table into which the results are inserted by defining `"mapped_to_table": "CurrentScan"` in the root of the `config.json` file as shown below:
+>
+>```json
+>{
+>    "code_name": "dhcp_leases",
+>    "unique_prefix": "DHCPLSS",
+>    ...
+>    "data_source":  "script",
+>    "localized": ["display_name", "description", "icon"],
+>    "mapped_to_table": "CurrentScan",    
+>    ...
+>}
+>```
+>2. Defining the target column with the `mapped_to_column` property for individual columns in the `database_column_definitions` array of the `config.json` file. For beispiel in the `DHCPLSS` plugin, I needed to map the value of the `Object_PrimaryID` column returned by the plugin, to the `cur_MAC` column in the PiAlert database `CurrentScan` table. Notice the  `"mapped_to_column": "cur_MAC"` key-value pair in the sample below.
+>
+>```json
+>{
+>            "column": "Object_PrimaryID",
+>            "mapped_to_column": "cur_MAC", 
+>            "css_classes": "col-sm-2",
+>            "show": true,
+>            "type": "device_mac",            
+>            "default_value":"",
+>            "options": [],
+>            "localized": ["name"],
+>            "name":[{
+>                "language_code":"en_us",
+>                "string" : "MAC address"
+>                }]
+>        }
+>```
+>
+>3.  That's it. PiAlert takes care of the rest. It loops thru the objects discovered by the plugin, takes the results line, by line and inserts them into the database table specified in `"mapped_to_table"`. The columns are translated from the generic plugin columns to the target table via the `"mapped_to_column"` property in the column definitions.
+
+> [!NOTE] 
+> You can create a column mapping with a default value via the `mapped_to_column_data` property. This means that the value of the given column will always be this value. Taht also menas that the `"column": "NameDoesntMatter"` is not important as there is no database source column. 
+
+
+>🔍 Beispiel:
+>
+>```json
+>{
+>            "column": "NameDoesntMatter",
+>            "mapped_to_column": "cur_ScanMethod",
+>            "mapped_to_column_data": {
+>                "value": "DHCPLSS"                
+>            },  
+>            "css_classes": "col-sm-2",
+>            "show": true,
+>            "type": "device_mac",            
+>            "default_value":"",
+>            "options": [],
+>            "localized": ["name"],
+>            "name":[{
+>                "language_code":"en_us",
+>                "string" : "MAC address"
+>                }]
+>        }
+>```
+
+#### params
+
+The `params` array in the `config.json` is used to enable the user to change the parameters of the executed script. For beispiel, the user wants to monitor a specific URL. 
+
+> 🔎 Beispiel:
+> Passing user-defined settings to a command. Let's say, you want to have a script, that is called with a user-defined parameter called `urls`: 
+> 
+> ```bash
+> root@server# python3 /home/pi/pialert/front/plugins/website_monitor/script.py urls=https://google.com,https://duck.com
+> ```
+
+* You can allow the user to add URLs to a setting with the `function` property set to a custom name, such as `urls_to_check` (this is not a reserved name from the section "Supported settings `function` values" below). 
+* You specify the parameter `urls` in the `params` section of the `config.json` the following way (`WEBMON_` is the plugin prefix automatically added to all the settings):
+```json
+{
+    "params" : [
+        {
+            "name"  : "urls",
+            "type"  : "setting",
+            "value" : "WEBMON_urls_to_check"
+        }]
+}
+```
+* Then you use this setting as an input parameter for your command in the `CMD` setting. Notice `urls={urls}` in the below json:
+
+```json
+ {
+            "function": "CMD",
+            "type": "text",
+            "default_value":"python3 /home/pi/pialert/front/plugins/website_monitor/script.py urls={urls}",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code":"en_us",
+                "string" : "Command"
+            }],
+            "description": [{
+                "language_code":"en_us",
+                "string" : "Command to run"
+            }]
+        }
+```
+
+During script execution, the app will take the command `"python3 /home/pi/pialert/front/plugins/website_monitor/script.py urls={urls}"`, take the `{urls}` wildcard and replace it with the value from the `WEBMON_urls_to_check` setting. This is because:
+
+1. The app checks the `params` entries
+2. It finds `"name"  : "urls"`
+3. Checks the type of the `urls` params and finds `"type"  : "setting"`
+4. Gets the setting name from  `"value" : "WEBMON_urls_to_check"` 
+   - IMPORTANT: in the `config.json` this setting is identified by `"function":"urls_to_check"`, not `"function":"WEBMON_urls_to_check"`
+   - You can also use a global setting, or a setting from a different plugin  
+5. The app gets the user defined value from the setting with the code name `WEBMON_urls_to_check`
+   - let's say the setting with the code name  `WEBMON_urls_to_check` contains 2 values entered by the user: 
+   - `WEBMON_urls_to_check=['https://google.com','https://duck.com']`
+6. The app takes the value from `WEBMON_urls_to_check` and replaces the `{urls}` wildcard in the setting where `"function":"CMD"`, so you go from:
+   - `python3 /home/pi/pialert/front/plugins/website_monitor/script.py urls={urls}`
+   - to
+   - `python3 /home/pi/pialert/front/plugins/website_monitor/script.py urls=https://google.com,https://duck.com` 
+
+Below are some general additional notes, when defining `params`: 
+
+- `"name":"name_value"` - is used as a wildcard replacement in the `CMD` setting value by using curly brackets `{name_value}`. The wildcard is replaced by the result of the `"value" : "param_value"` and `"type":"type_value"` combo configuration below.
+- `"type":"<sql|setting>"` - is used to specify the type of the params, currently only 2 supported (`sql`,`setting`).
+  - `"type":"sql"` - will execute the SQL query specified in the `value` property. The sql query needs to return only one column. The column is flattened and separated by commas (`,`), e.g: `SELECT dev_MAC from DEVICES` -> `Internet,74:ac:74:ac:74:ac,44:44:74:ac:74:ac`. This is then used to replace the wildcards in the `CMD` setting.  
+  - `"type":"setting"` - The setting code name. A combination of the value from `unique_prefix` + `_` + `function` value, or otherwise the code name you can find in the Settings page under the Setting display name, e.g. `PIHOLE_RUN`. 
+- `"value": "param_value"` - Needs to contain a setting code name or SQL query without wildcards.
+- `"timeoutMultiplier" : true` - used to indicate if the value should multiply the max timeout for the whole script run by the number of values in the given parameter.
+- `"base64": true` - use base64 encoding to pass the value to the script (e.g. if there are spaces)
+
+
+> 🔎Beispiel:
+> 
+> ```json
+> {
+>     "params" : [{
+>            "name"              : "ips",
+>            "type"              : "sql",
+>            "value"             : "SELECT dev_LastIP from DEVICES",
+>            "timeoutMultiplier" : true
+>        },
+>        {
+>            "name"              : "macs",
+>            "type"              : "sql",
+>            "value"             : "SELECT dev_MAC from DEVICES"            
+>        },
+>        {
+>            "name"              : "timeout",
+>            "type"              : "setting",
+>            "value"             : "NMAP_RUN_TIMEOUT"
+>        },
+>        {
+>            "name"              : "args",
+>            "type"              : "setting",
+>            "value"             : "NMAP_ARGS",
+>            "base64"            : true
+>        }]
+> }
+> ```
+
+
+#### ⚙ Objektstruktur festlegen
+
+> [!NOTE] 
+> Der Einstellungsablauf und wann Plugin-spezifische Einstellungen angewendet werden, wird im [Einstellungssystem](/docs/SETTINGS_SYSTEM.md) beschrieben.
+
+Required attributes are:
+
+| Property | Description |
+| -------- | ----------- |
+| `"function"` | Specifies the function the setting drives or a simple unique code name. See Supported settings function values for options. |
+| `"type"` | Specifies the form control used for the setting displayed in the Settings page and what values are accepted. Supported options include: |
+|  | - `text` |
+|  | - `integer` |
+|  | - `boolean` |
+|  | - `password` |
+|  | - `readonly` |
+|  | - `integer.select` |
+|  | - `text.select` |
+|  | - `text.multiselect` |
+|  | - `list` |
+|  | - `integer.checkbox` |
+|  | - `text.template` |
+| `"localized"` | A list of properties on the current JSON level that need to be localized. |
+| `"name"` | Displayed on the Settings page. An array of localized strings. See Localized strings below. |
+| `"description"` | Displayed on the Settings page. An array of localized strings. See Localized strings below. |
+| (optional) `"events"` | Specifies whether to generate an execution button next to the input field of the setting. Supported values: |
+|  | - `test` |
+|  | - `run` |
+| (optional) `"override_value"` | Used to determine a user-defined override for the setting. Useful for template-based plugins, where you can choose to leave the current value or override it with the value defined in the setting. (Work in progress) |
+| (optional) `"events"` | Used to trigger the plugin. Usually used on the `RUN` setting. Not fully tested in all scenarios. Will show a play button next to the setting. After clicking, an event is generated for the backend in the `Parameters` database table to process the front-end event on the next run. |
+
+    
+##### Unterstützte Einstellungen `function` werte
+
+You can have any `"function": "my_custom_name"` custom name, however, the ones listed below have a specific functionality attached to them. If you use a custom name, then the setting is mostly used as an input parameter for the `params` section.
+
+| Setting | Description |
+| ------- | ----------- |
+| `RUN` | (required) Specifies when the service is executed. |
+|  | Supported Options: |
+|  | - "disabled" - not run |
+|  | - "once" - run on app start or on settings saved |
+|  | - "schedule" - if included, then a `RUN_SCHD` setting needs to be specified to determine the schedule |
+|  | - "always_after_scan" - run always after a scan is finished |
+|  | - "on_new_device" - run when a new device is detected |
+|  | - "before_config_save" - run before the config is marked as saved. Useful if your plugin needs to modify the `pialert.conf` file. |
+| `RUN_SCHD` | (required if you include the above `RUN` function) Cron-like scheduling is used if the `RUN` setting is set to `schedule`. |
+| `CMD` | (required) Specifies the command that should be executed. |
+| `API_SQL` | (optional) Generates a `table_` + `code_name` + `.json` file as per [API docs](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/API.md). |
+| `RUN_TIMEOUT` | (optional) Specifies the maximum execution time of the script. If not specified, a default value of 10 seconds is used to prevent hanging. |
+| `WATCH` | (optional) Specifies which database columns are watched for changes for this particular plugin. If not specified, no notifications are sent. |
+| `REPORT_ON` | (optional) Specifies when to send a notification. Supported options are: |
+|  | - `new` means a new unique (unique combination of PrimaryId and SecondaryId) object was discovered. |
+|  | - `watched-changed` - means that selected `Watched_ValueN` columns changed |
+|  | - `watched-not-changed` - reports even on events where selected `Watched_ValueN` did not change |
+|  | - `missing-in-last-scan` - if the object is missing compared to previous scans |
+
+
+
+> 🔎 Beispiel:
+> 
+> ```json
+> {
+>     "function": "RUN",            
+>     "type": "text.select",            
+>     "default_value":"disabled",
+>     "options": ["disabled", "once", "schedule", "always_after_scan", "on_new_device"],
+>     "localized": ["name", "description"],
+>     "name" :[{
+>         "language_code":"en_us",
+>         "string" : "When to run"
+>     }],
+>     "description": [{
+>         "language_code":"en_us",
+>         "string" : "Enable a regular scan of your services. If you select <code>schedule</code> the scheduling settings from below are applied. If you select <code>once</code> the scan is run only once on start of the application (container) for the time specified in <a href=\"#WEBMON_RUN_TIMEOUT\"><code>WEBMON_RUN_TIMEOUT</code> setting</a>."
+>     }]
+> }
+> ```
+
+##### 🌍Lokalisierte Zeichenfolgen
+
+- `"language_code":"<en_us|es_es|de_de>"`  - code name of the language string. Only these three are currently supported. At least the `"language_code":"en_us"` variant has to be defined. 
+- `"string"`  - The string to be displayed in the given language.
+
+> 🔎 Beispiel:
+> 
+> ```json
+> 
+>     {
+>         "language_code":"en_us",
+>         "string" : "When to run"
+>     }
+> 
+> ```
+
+##### UI-Einstellungen in database_column_definitions.
+
+The UI will adjust how columns are displayed in the UI based on the resolvers definition of the `database_column_definitions` object. These are the supported form controls and related functionality:
+
+- Only columns with `"show": true` and also with at least an English translation will be shown in the UI.
+
+| Supported Types | Description |
+| -------------- | ----------- |
+| `label` | Displays a column only. |
+| `text` | Makes a column editable, and a save icon is displayed next to it. See below for information on `threshold`, `replace`. |
+|  |  |
+| `options` Property | Used in conjunction with types like `threshold`, `replace`, `regex`. |
+| `threshold` | The `options` array contains objects ordered from the lowest `maximum` to the highest. The corresponding `hexColor` is used for the value background color if it's less than the specified `maximum` but more than the previous one in the `options` array. |
+| `replace` | The `options` array contains objects with an `equals` property, which is compared to the "value." If the values are the same, the string in `replacement` is displayed in the UI instead of the actual "value". |
+| `regex` | Applies a regex to the value.  The `options` array contains objects with an `type` (must be set to `regex`) and `param` (must contain the regex itself) property. |
+|  |  |
+| Type Definitions |  |
+| `device_mac` | The value is considered to be a MAC address, and a link pointing to the device with the given MAC address is generated. |
+| `device_ip` | The value is considered to be an IP address. A link pointing to the device with the given IP is generated. The IP is checked against the last detected IP address and translated into a MAC address, which is then used for the link itself. |
+| `device_name_mac` | The value is considered to be a MAC address, and a link pointing to the device with the given IP is generated. The link label is resolved as the target device name. |
+| `url` | The value is considered to be a URL, so a link is generated. |
+| `textbox_save` | Generates an editable and saveable text box that saves values in the database. Primarily intended for the `UserData` database column in the `Plugins_Objects` table. |
+| `url_http_https` | Generates two links with the `https` and `http` prefix as lock icons. |
+
+
+> [!NOTE] 
+> Unterstützt Verkettung. Sie können mehrere Resolver mit „.“ verketten. Zum Beispiel `regex.url_http_https`. Dadurch wird der Resolver `regex` und dann der Resolver `url_http_https` angewendet.
+
+
+
+```json
+{
+            "column": "Watched_Value1",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "threshold",            
+            "default_value":"",
+            "options": [
+                {
+                    "maximum": 199,
+                    "hexColor": "#792D86"                
+                },
+                {
+                    "maximum": 299,
+                    "hexColor": "#5B862D"
+                },
+                {
+                    "maximum": 399,
+                    "hexColor": "#7D862D"
+                },
+                {
+                    "maximum": 499,
+                    "hexColor": "#BF6440"
+                },
+                {
+                    "maximum": 599,
+                    "hexColor": "#D33115"
+                }
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Status code"
+                }]
+        },        
+        {
+            "column": "Status",
+            "show": true,
+            "type": "replace",            
+            "default_value":"",
+            "options": [
+                {
+                    "equals": "watched-not-changed",
+                    "replacement": "<i class='fa-solid fa-square-check'></i>"
+                },
+                {
+                    "equals": "watched-changed",
+                    "replacement": "<i class='fa-solid fa-triangle-exclamation'></i>"
+                },
+                {
+                    "equals": "new",
+                    "replacement": "<i class='fa-solid fa-circle-plus'></i>"
+                }
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "Status"
+                }]
+        },
+        {
+            "column": "Watched_Value3",
+            "css_classes": "col-sm-1",
+            "show": true,
+            "type": "regex.url_http_https",            
+            "default_value":"",
+            "options": [
+                {
+                    "type": "regex",
+                    "param": "([\\d.:]+)"
+                }          
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code":"en_us",
+                "string" : "HTTP/s links"
+                },
+	    	    {
+                "language_code":"es_es",
+                "string" : "N/A"
+                }]
+        }
+```
+
+[screen1]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins.png                    "Screen 1"
+[screen2]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_settings.png           "Screen 2"
+[screen3]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_json_settings.png      "Screen 3"
+[screen4]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_json_ui.png            "Screen 4"
+[screen5]: https://raw.githubusercontent.com/jokob-sk/Pi.Alert/main/docs/img/plugins_device_details.png     "Screen 5"

front/plugins/README_ES.md

@@ -1,29 +1,39 @@
 ## 📚 Documentos para plugins individuales 
 
-### Traducciones comunitarias de este archivo
+### 🏴 Traducciones comunitarias de este archivo
 
-- [Ingles](https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/README.md) 
+* <a href="https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/README.md">
+   <img src="https://github.com/lipis/flag-icons/blob/main/flags/4x3/us.svg" alt="README.md" style="height: 20px !important;width: 20px !important;"> Ingles (Americano)
+  </a> 
 
-### Plugins basados en scripts
+* <a href="https://github.com/jokob-sk/Pi.Alert/blob/main/front/plugins/README_DE.md">
+   <img src="https://github.com/lipis/flag-icons/blob/main/flags/4x3/de.svg" alt="README.md" style="height: 20px !important;width: 20px !important;"> Alemán (Alemania)
+  </a> 
 
-- [arp_scan (ARPSCAN)](/front/plugins/arp_scan/) 
-- [website_monitor (WEBMON)](/front/plugins/website_monitor/) 
-- [dhcp_servers (DHCPSRVS)](/front/plugins/dhcp_servers/) 
-- [dhcp_leases (DHCPLSS)](/front/plugins/dhcp_leases/) 
-- [unifi_import (UNFIMP)](/front/plugins/unifi_import/)
-- [snmp_discovery (SNMPDSC)](/front/plugins/snmp_discovery/)
-- [undiscoverables (UNDIS)](/front/plugins/undiscoverables/)
-- [pholus_scan (ARPSCAN)](/front/plugins/pholus_scan/)
-- [set_password (SETPWD)](/front/plugins/set_password/)
+### 🔌 Plugins y 📚 Documentos
 
-### Plugins basados en consultas SQL
-- [nmap_services (NMAPSERV)](/front/plugins/nmap_services/) 
+| Requerido   | CurrentScan | Prefijo único         | Tipo de plugin         | Enlace + Documentos                                      | 
+|-------------|-------------|-----------------------|------------------------|----------------------------------------------------------|
+|             |    Sí       | ARPSCAN               | Script                 | [arp_scan](/front/plugins/arp_scan/)          |
+|             |             | CSVBCKP               | Script                 | [csv_backup](/front/plugins/csv_backup/)      |
+|             |    Sí       | DHCPLSS               | Script                 | [dhcp_leases](/front/plugins/dhcp_leases/)    |
+|             |             | DHCPSRVS              | Script                 | [dhcp_servers](/front/plugins/dhcp_servers/) |
+|     Sí      |             | NEWDEV                | Template               | [newdev_template](/front/plugins/newdev_template/) |
+|             |             | NMAP                  | Script                 | [nmap_scan](/front/plugins/nmap_scan/)            |
+|             |    Sí       | PIHOLE                | External SQLite DB     | [pihole_scan](/front/plugins/pihole_scan/)    |
+|             |             | SETPWD                | Script                 | [set_password](/front/plugins/set_password/)    |
+|             |             | SNMPDSC               | Script                 | [snmp_discovery](/front/plugins/snmp_discovery/) |
+|             |    Sí*      | UNDIS                 | Script                 | [undiscoverables](/front/plugins/undiscoverables/) |
+|             |    Sí       | UNFIMP                | Script                 | [unifi_import](/front/plugins/unifi_import/)    |
+|             |             | WEBMON                | Script                 | [website_monitor](/front/plugins/website_monitor/) |
+|     N/A     |             | N/A                   | SQL query              | No hay ningún ejemplo disponible, pero los complementos basados en SQLite externo funcionan de manera muy similar |
 
-### Plugins basados en plantillas
-- [newdev_template (NEWDEV)](/front/plugins/newdev_template/) 
+>* El complemento Undiscoverables (`UNDIS`) inserta solo dispositivos ficticios especificados por el usuario.
 
-### Plugins externos basados en SQLite
-- [pihole_scan (PIHOLE)](/front/plugins/newdev_template/) 
+> [!NOTE] 
+> Puede desactivar los complementos a través de Configuración o ignorarlos por completo colocando un archivo `ignore_plugin` en el directorio de complementos. La diferencia es que los complementos ignorados no aparecen en ninguna parte de la interfaz de usuario (Configuración, Detalles del dispositivo, páginas de complementos). La aplicación omite por completo los complementos ignorados. Los complementos de detección de dispositivos insertan valores en la tabla de base de datos "CurrentScan". Es seguro ignorar los complementos que no son necesarios; sin embargo, tiene sentido tener habilitados al menos algunos complementos de detección de dispositivos (que insertan entradas en la tabla `CurrentScan`), como ARPSCAN o PIHOLE.  
+
+> Se recomienda utilizar el mismo intervalo de programación para todos los complementos responsables de descubrir nuevos dispositivos.
 
 ## 🌟 Crear un plugin personalizado: Descripción general
 

front/plugins/_publisher_apprise/README.md

@@ -0,0 +1,8 @@
+## Overview
+
+[Apprise](https://hub.docker.com/r/caronc/apprise) is a notification gateway/publisher that allows you to push notifications to 80+ different services. 
+
+### Usage
+
+- Go to settings and fill in relevant details.
+

front/plugins/_publisher_apprise/apprise.py

@@ -0,0 +1,128 @@
+#!/usr/bin/env python
+
+import json
+import subprocess
+import argparse
+import os
+import pathlib
+import sys
+from datetime import datetime
+
+# Replace these paths with the actual paths to your Pi.Alert directories
+sys.path.extend(["/home/pi/pialert/front/plugins", "/home/pi/pialert/pialert"])
+
+import conf
+from plugin_helper import Plugin_Objects
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ, get_setting_value
+from notification import Notification_obj
+from database import DB
+
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+pluginName = 'APPRISE'
+
+def main():
+    
+    mylog('verbose', [f'[{pluginName}](publisher) In script'])    
+    
+    # Check if basic config settings supplied
+    if check_config() == False:
+        mylog('none', [f'[{pluginName}] ⚠ ERROR: Publisher notification gateway not set up correctly. Check your pialert.conf {pluginName}_* variables.'])
+        return
+
+    # Create a database connection
+    db = DB()  # instance of class DB
+    db.open()
+
+    # Initialize the Plugin obj output file
+    plugin_objects = Plugin_Objects(RESULT_FILE)
+
+    # Create a Notification_obj instance
+    notifications = Notification_obj(db)
+
+    # Retrieve new notifications
+    new_notifications = notifications.getNew()
+
+    # Process the new notifications (see the Notifications DB table for structure or check the /api/table_notifications.json endpoint)
+    for notification in new_notifications:
+
+        # Send notification
+        result = send(notification["HTML"], notification["Text"])    
+
+        # Log result
+        plugin_objects.add_object(
+            primaryId   = pluginName,
+            secondaryId = timeNowTZ(),            
+            watched1    = notification["GUID"],
+            watched2    = result,            
+            watched3    = 'null',
+            watched4    = 'null',
+            extra       = 'null',
+            foreignKey  = notification["GUID"]
+        )
+
+    plugin_objects.write_result_file()
+
+#-------------------------------------------------------------------------------
+def check_config():
+        if get_setting_value('APPRISE_URL') == '' or get_setting_value('APPRISE_HOST') == '':            
+            return False
+        else:
+            return True
+
+#-------------------------------------------------------------------------------
+def send(html, text):
+
+    payloadData = ''
+    result = ''
+
+    # limit = 1024 * 1024  # 1MB limit (1024 bytes * 1024 bytes = 1MB)
+    limit = get_setting_value('APPRISE_SIZE')
+
+    #  truncate size
+    if get_setting_value('APPRISE_PAYLOAD') == 'html':                 
+        if len(html) > limit:
+            payloadData = html[:limit] + "<h1>(text was truncated)</h1>"
+        else:
+            payloadData = html
+    if get_setting_value('APPRISE_PAYLOAD') == 'text':            
+        if len(text) > limit:
+            payloadData = text[:limit] + " (text was truncated)"
+        else:
+            payloadData = text
+
+    # Define Apprise compatible payload (https://github.com/caronc/apprise-api#stateless-solution)
+
+    _json_payload = {
+        "urls": get_setting_value('APPRISE_URL'),
+        "title": "Pi.Alert Notifications",
+        "format": get_setting_value('APPRISE_PAYLOAD'),
+        "body": payloadData
+    }
+
+    try:
+        # try runnning a subprocess
+        p = subprocess.Popen(["curl","-i","-X", "POST" ,"-H", "Content-Type:application/json" ,"-d", json.dumps(_json_payload), get_setting_value('APPRISE_HOST')], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        stdout, stderr = p.communicate()
+
+        # write stdout and stderr into .log files for debugging if needed
+        # Log the stdout and stderr
+        mylog('debug', [stdout, stderr])  
+
+        # log result
+        result = stdout
+
+    except subprocess.CalledProcessError as e:
+        # An error occurred, handle it
+        mylog('none', [e.output])
+
+        # log result
+        result = e.output
+
+    return result
+
+if __name__ == '__main__':
+    sys.exit(main())

front/plugins/_publisher_apprise/config.json

@@ -0,0 +1,430 @@
+{
+    "code_name": "_publisher_apprise",
+    "unique_prefix": "APPRISE",
+    "plugin_type": "publisher",
+    "enabled": true,    
+    "data_source":  "script",
+    "show_ui": true,
+    "localized": ["display_name", "description", "icon"],
+	"display_name" : [
+        {
+		  "language_code": "en_us",
+		  "string" : "Apprise publisher"
+		},
+        {
+		  "language_code": "es_es",
+		  "string" : "Habilitar Apprise"
+		}
+    ],
+    "icon":[{
+        "language_code": "en_us",
+        "string" : "<i class=\"fa-solid fa-bullhorn\"></i>"
+		}],     
+    "description": [
+        {
+        "language_code": "en_us",
+        "string" : "A plugin to publish a notification via the Apprise gateway."
+		}
+    ],
+    "params" : [],  
+    "database_column_definitions":
+    [          
+        {
+            "column": "Index",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Plugin",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Object_PrimaryID",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "url",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				}]
+        },
+        {
+            "column": "Object_SecondaryID",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "DateTimeCreated",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Sent when"
+				}]
+        },
+        {
+            "column": "DateTimeChanged",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Changed"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Cambiado"					
+                }]
+        },
+        {
+            "column": "Watched_Value1",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "eval",            
+            "default_value":"",
+            "options": [
+                {
+                    "type": "eval",
+                    "param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
+                }          
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Notification GUID"
+				}]
+        },
+        {
+            "column": "Watched_Value2",
+            "css_classes": "col-sm-8",
+            "show": true,
+            "type": "textarea_readonly",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Result"
+				}]
+        },
+        {
+            "column": "Watched_Value3",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Watched_Value4",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },       
+        {
+            "column": "UserData",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "textbox_save",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Comments"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comentarios"					
+                }]
+        },        
+        {
+            "column": "Status",
+            "css_classes": "col-sm-1",
+            "show": false,
+            "type": "replace",            
+            "default_value":"",
+            "options": [
+                {
+                    "equals": "watched-not-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+                },
+                {
+                    "equals": "watched-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+                },
+                {
+                    "equals": "new",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+                },
+                {
+                    "equals": "missing-in-last-scan",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
+                }
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Status"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Estado"					
+                }]
+        },        
+        {
+            "column": "Extra",
+            "css_classes": "col-sm-3",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Extra"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Extra"					
+                }]
+        }            
+    ],
+    "settings":[
+        {
+            "function": "RUN",         
+            "events": ["test"],   
+            "type": "text.select",            
+            "default_value":"disabled",
+            "options": ["disabled", "on_notification" ],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code": "en_us",
+                "string" : "When to run"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Cuando ejecuta"
+            }],
+            "description": [
+                {
+                "language_code": "en_us",
+                "string" : "Enable sending notifications via <a target=\"_blank\" href=\"https://hub.docker.com/r/caronc/apprise\">Apprise</a>."
+				},
+                {
+                "language_code": "es_es",
+                "string" : "Habilitar el envío de notificaciones a través de <a target=\"_blank\" href=\"https://hub.docker.com/r/caronc/apprise\">Apprise</a>."
+				}
+            ]
+        },
+        {
+            "function": "CMD",
+            "type": "readonly",
+            "default_value":"python3 /home/pi/pialert/front/plugins/_publisher_apprise/apprise.py",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Command"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comando"						
+            }],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Command to run"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comando a ejecutar"	
+            }]
+        },
+        {
+            "function": "RUN_TIMEOUT",
+            "type": "integer",
+            "default_value": 10,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Run timeout"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tiempo de espera de ejecución"				
+				},
+				{
+                "language_code": "de_de",
+                "string" : "Wartezeit"
+            }],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+            }]
+        },
+        {
+            "function": "HOST",
+            "type": "text",
+            "default_value": "",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Apprise host URL"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "URL del host de Apprise"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Apprise host URL starting with <code>http://</code> or <code>https://</code>. (do not forget to include <code>/notify</code> at the end)"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "URL del host de Apprise que comienza con <code>http://</code> o <code>https://</code>. (no olvide incluir <code>/notify</code> al final)"
+            }]
+        },
+        {
+            "function": "URL",
+            "type": "text",
+            "default_value": "",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Apprise notification URL"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "URL de notificación de Apprise"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Apprise notification target URL. For example for Telegram it would be <code>tgram://{bot_token}/{chat_id}</code>."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Informar de la URL de destino de la notificación. Por ejemplo, para Telegram sería <code>tgram://{bot_token}/{chat_id}</code>."
+            }]
+        },
+        {
+            "function": "PAYLOAD",
+            "type": "text.select",
+            "default_value": "html",
+            "options": ["html", "text"],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Payload type"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tipo de carga"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Select the payoad type sent to Apprise. For example <code>html</code> works well with emails, <code>text</code> with chat apps, such as Telegram."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Seleccione el tipo de carga útil enviada a Apprise. Por ejemplo, <code>html</code> funciona bien con correos electrónicos, <code>text</code> con aplicaciones de chat, como Telegram."
+            }]
+        },
+        {
+            "function": "SIZE",
+            "type": "integer",
+            "default_value": 1024,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Max payload size"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tamaño máximo de carga útil"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "The maximum size of the apprise payload as number of characters in the passed string. If above limit, it will be truncated and a <code>(text was truncated)</code> message is appended."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "El tamaño máximo de la carga útil de información como número de caracteres en la cadena pasada. Si supera el límite, se truncará y se agregará un mensaje <code>(text was truncated)</code>."
+            }]
+        }         
+    ]
+}

front/plugins/_publisher_email/README.md

@@ -0,0 +1,8 @@
+## Overview
+
+A simple EMail (SMTP) notification gateway publisher. Check the [SMTP docs](/docs/SMTP.md) for additional help.
+
+### Usage
+
+- Go to settings and fill in relevant details.
+

front/plugins/_publisher_email/config.json

@@ -0,0 +1,689 @@
+{
+    "code_name": "_publisher_email",
+    "unique_prefix": "SMTP",
+    "plugin_type": "publisher",
+    "enabled": true,
+    "data_source": "script",
+    "show_ui": true,
+    "localized": [
+      "display_name",
+      "description",
+      "icon"
+    ],
+    "display_name": [
+      {
+        "language_code": "en_us",
+        "string": "Email publisher (SMTP)"
+      },
+      {
+        "language_code": "es_es",
+        "string": "Habilitar email (SMTP)"
+      }
+    ],
+    "icon": [
+      {
+        "language_code": "en_us",
+        "string": "<i class=\"fa-solid fa-at\"></i>"
+      }
+    ],
+    "description": [
+      {
+        "language_code": "en_us",
+        "string": "A plugin to publish a notification via Email (SMTP) gateway."
+      }
+    ],
+    "params": [],
+    "database_column_definitions": [
+      {
+        "column": "Index",
+        "css_classes": "col-sm-2",
+        "show": false,
+        "type": "label",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "N/A"
+          },
+          {
+            "language_code": "es_es",
+            "string": "N/A"
+          }
+        ]
+      },
+      {
+        "column": "Plugin",
+        "css_classes": "col-sm-2",
+        "show": false,
+        "type": "label",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "N/A"
+          },
+          {
+            "language_code": "es_es",
+            "string": "N/A"
+          }
+        ]
+      },
+      {
+        "column": "Object_PrimaryID",
+        "css_classes": "col-sm-2",
+        "show": false,
+        "type": "url",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "N/A"
+          }
+        ]
+      },
+      {
+        "column": "Object_SecondaryID",
+        "css_classes": "col-sm-2",
+        "show": false,
+        "type": "label",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "N/A"
+          },
+          {
+            "language_code": "es_es",
+            "string": "N/A"
+          }
+        ]
+      },
+      {
+        "column": "DateTimeCreated",
+        "css_classes": "col-sm-2",
+        "show": true,
+        "type": "label",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Sent when"
+          }
+        ]
+      },
+      {
+        "column": "DateTimeChanged",
+        "css_classes": "col-sm-2",
+        "show": false,
+        "type": "label",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Changed"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Cambiado"
+          }
+        ]
+      },
+      {
+        "column": "Watched_Value1",
+        "css_classes": "col-sm-2",
+        "show": true,
+        "type": "eval",            
+        "default_value":"",
+        "options": [
+            {
+                "type": "eval",
+                "param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
+            }          
+        ],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Notification GUID"
+          }
+        ]
+      },
+      {
+        "column": "Watched_Value2",
+        "css_classes": "col-sm-8",
+        "show": true,
+        "type": "textarea_readonly",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Result"
+          }
+        ]
+      },
+      {
+        "column": "Watched_Value3",
+        "css_classes": "col-sm-2",
+        "show": false,
+        "type": "label",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "N/A"
+          },
+          {
+            "language_code": "es_es",
+            "string": "N/A"
+          }
+        ]
+      },
+      {
+        "column": "Watched_Value4",
+        "css_classes": "col-sm-2",
+        "show": false,
+        "type": "label",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "N/A"
+          },
+          {
+            "language_code": "es_es",
+            "string": "N/A"
+          }
+        ]
+      },
+      {
+        "column": "UserData",
+        "css_classes": "col-sm-2",
+        "show": false,
+        "type": "textbox_save",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Comments"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Comentarios"
+          }
+        ]
+      },
+      {
+        "column": "Status",
+        "css_classes": "col-sm-1",
+        "show": false,
+        "type": "replace",
+        "default_value": "",
+        "options": [
+          {
+            "equals": "watched-not-changed",
+            "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+          },
+          {
+            "equals": "watched-changed",
+            "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+          },
+          {
+            "equals": "new",
+            "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+          },
+          {
+            "equals": "missing-in-last-scan",
+            "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
+          }
+        ],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Status"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Estado"
+          }
+        ]
+      },
+      {
+        "column": "Extra",
+        "css_classes": "col-sm-3",
+        "show": false,
+        "type": "label",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Extra"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Extra"
+          }
+        ]
+      }
+    ],
+    "settings": [
+      {
+        "function": "RUN",
+        "events": [
+          "test"
+        ],
+        "type": "text.select",
+        "default_value": "disabled",
+        "options": [
+          "disabled",
+          "on_notification"
+        ],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "When to run"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Cuando ejecuta"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "Enable sending notifications via the Email (SMTP) gateway."
+          },
+          {
+            "language_code": "es_es",
+            "string": "Si está habilitado, se envía un correo electrónico con una lista de cambios a los que se ha suscrito. Complete también todas las configuraciones restantes relacionadas con la configuración de SMTP a continuación"
+          }
+        ]
+      },
+      {
+        "function": "CMD",
+        "type": "readonly",
+        "default_value": "python3 /home/pi/pialert/front/plugins/_publisher_email/email_smtp.py",
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Command"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Comando"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "Command to run"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Comando a ejecutar"
+          }
+        ]
+      },
+      {
+        "function": "RUN_TIMEOUT",
+        "type": "integer",
+        "default_value": 20,
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Run timeout"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Tiempo de espera de ejecución"
+          },
+          {
+            "language_code": "de_de",
+            "string": "Wartezeit"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+          },
+          {
+            "language_code": "es_es",
+            "string": "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+          }
+        ]
+      },
+      {
+        "function": "SERVER",
+        "type": "text",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "SMTP server URL"
+          },
+          {
+            "language_code": "es_es",
+            "string": "URL del servidor SMTP"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "The SMTP server host URL. For example <code>smtp-relay.sendinblue.com</code>. To use Gmail as an SMTP server <a target=\"_blank\" href=\"https://github.com/jokob-sk/Pi.Alert/blob/main/docs/SMTP.md\">follow this guide</a>"
+          },
+          {
+            "language_code": "es_es",
+            "string": "La URL del host del servidor SMTP. Por ejemplo, <code>smtp-relay.sendinblue.com</code>. Para utilizar Gmail como servidor SMTP <a target=\"_blank\" href=\"https://github.com/jokob-sk/Pi.Alert/blob/main/docs/SMTP.md\">siga esta guía</a >"
+          }
+        ]
+      },
+      {
+        "function": "PORT",
+        "type": "integer",
+        "default_value": 587,
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "SMTP server PORT"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Puerto del servidor SMTP"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "Port number used for the SMTP connection. Set to <code>0</code> if you do not want to use a port when connecting to the SMTP server."
+          },
+          {
+            "language_code": "es_es",
+            "string": "Número de puerto utilizado para la conexión SMTP. Establézcalo en <code>0</code> si no desea utilizar un puerto al conectarse al servidor SMTP."
+          }
+        ]
+      },
+      {
+        "function": "SKIP_LOGIN",
+        "type": "boolean",
+        "default_value": false,
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Skip authentication"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Omitir autenticación"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "Do not use authentication when connecting to the SMTP server."
+          },
+          {
+            "language_code": "es_es",
+            "string": "No utilice la autenticación cuando se conecte al servidor SMTP."
+          }
+        ]
+      },
+      {
+        "function": "USER",
+        "type": "text",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "SMTP user"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Nombre de usuario SMTP"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "The user name used to login into the SMTP server (sometimes a full email address)."
+          },
+          {
+            "language_code": "es_es",
+            "string": "El nombre de usuario utilizado para iniciar sesión en el servidor SMTP (a veces, una dirección de correo electrónico completa)."
+          }
+        ]
+      },
+      {
+        "function": "PASS",
+        "type": "password",
+        "default_value": "",
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "SMTP password"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Contraseña de SMTP"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "The SMTP server password."
+          },
+          {
+            "language_code": "es_es",
+            "string": "La contraseña del servidor SMTP."
+          }
+        ]
+      },
+      {
+        "function": "SKIP_TLS",
+        "type": "boolean",
+        "default_value": false,
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Do not use TLS"
+          },
+          {
+            "language_code": "es_es",
+            "string": "No usar TLS"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "Disable TLS when connecting to your SMTP server."
+          },
+          {
+            "language_code": "es_es",
+            "string": "Deshabilite TLS cuando se conecte a su servidor SMTP."
+          }
+        ]
+      },
+      {
+        "function": "FORCE_SSL",
+        "type": "boolean",
+        "default_value": false,
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Force SSL"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Forzar SSL"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "Force SSL when connecting to your SMTP server."
+          },
+          {
+            "language_code": "es_es",
+            "string": "Forzar SSL al conectarse a su servidor SMTP"
+          }
+        ]
+      },
+      {
+        "function": "REPORT_TO",
+        "type": "text",
+        "default_value": "user@gmail.com",
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Send email to"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Enviar el email a"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "Email address to which the notification will be send to."
+          },
+          {
+            "language_code": "es_es",
+            "string": "Dirección de correo electrónico a la que se enviará la notificación."
+          }
+        ]
+      },
+      {
+        "function": "REPORT_FROM",
+        "type": "text",
+        "default_value": "Pi.Alert <user@gmail.com>",
+        "options": [],
+        "localized": [
+          "name",
+          "description"
+        ],
+        "name": [
+          {
+            "language_code": "en_us",
+            "string": "Email subject"
+          },
+          {
+            "language_code": "es_es",
+            "string": "Asunto del email"
+          }
+        ],
+        "description": [
+          {
+            "language_code": "en_us",
+            "string": "Notification email subject line. Some SMTP servers need this to be an email."
+          },
+          {
+            "language_code": "es_es",
+            "string": "Asunto del correo electrónico de notificación."
+          }
+        ]
+      }
+    ]
+  }

front/plugins/_publisher_email/email_smtp.py

@@ -0,0 +1,199 @@
+#!/usr/bin/env python
+import json
+import subprocess
+import argparse
+import os
+import pathlib
+import sys
+import re
+from datetime import datetime
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from email.header import Header
+from email.utils import parseaddr
+import smtplib
+import socket
+import ssl
+
+sys.path.extend(["/home/pi/pialert/front/plugins", "/home/pi/pialert/pialert"])
+
+# PiAlert modules
+import conf
+from plugin_helper import Plugin_Objects
+from logger import mylog, append_line_to_file, print_log
+from helper import timeNowTZ, get_setting_value, hide_email
+from notification import Notification_obj
+from database import DB
+
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+pluginName = 'SMTP'
+
+def main():
+    
+    mylog('verbose', [f'[{pluginName}](publisher) In script'])    
+    
+    # Check if basic config settings supplied
+    if check_config() == False:
+        mylog('none', [f'[{pluginName}] ⚠ ERROR: Publisher notification gateway not set up correctly. Check your pialert.conf {pluginName}_* variables.'])
+        return
+
+    # Create a database connection
+    db = DB()  # instance of class DB
+    db.open()
+
+    # Initialize the Plugin obj output file
+    plugin_objects = Plugin_Objects(RESULT_FILE)
+
+    # Create a Notification_obj instance
+    notifications = Notification_obj(db)
+
+    # Retrieve new notifications
+    new_notifications = notifications.getNew()
+
+    # Process the new notifications (see the Notifications DB table for structure or check the /api/table_notifications.json endpoint)
+    for notification in new_notifications:
+
+        # Send notification
+        result = send(notification["HTML"], notification["Text"])    
+
+        # Log result
+        plugin_objects.add_object(
+            primaryId   = pluginName,
+            secondaryId = timeNowTZ(),            
+            watched1    = notification["GUID"],
+            watched2    = result,            
+            watched3    = 'null',
+            watched4    = 'null',
+            extra       = 'null',
+            foreignKey  = notification["GUID"]
+        )
+
+    plugin_objects.write_result_file()
+
+#-------------------------------------------------------------------------------
+def check_config ():
+
+    server      = get_setting_value('SMTP_SERVER')
+    report_to   = get_setting_value("SMTP_REPORT_TO")
+    report_from = get_setting_value("SMTP_REPORT_FROM")
+    
+    if server == '' or report_from == '' or report_to == '':
+        mylog('none', ['[Email Check Config] ⚠ ERROR: Email service not set up correctly. Check your pialert.conf SMTP_*, SMTP_REPORT_FROM and SMTP_REPORT_TO variables.'])
+        return False
+    else:
+        return True
+    
+#-------------------------------------------------------------------------------
+def send(pHTML, pText):
+
+    mylog('debug', [f'[{pluginName}] SMTP_REPORT_TO: {hide_email(str(get_setting_value("SMTP_REPORT_TO")))} SMTP_USER: {hide_email(str(get_setting_value("SMTP_USER")))}'])
+
+
+    subject, from_email, to_email, message_html, message_text = sanitize_email_content('Pi.Alert Report', get_setting_value("SMTP_REPORT_FROM"), get_setting_value("SMTP_REPORT_TO"), pHTML, pText)
+
+    # Compose email
+    msg             = MIMEMultipart('alternative')
+    msg['Subject']  = subject
+    msg['From']     = from_email
+    msg['To']       = to_email
+    msg.attach (MIMEText (message_text, 'plain'))
+    msg.attach (MIMEText (message_html, 'html'))
+
+    # Set a timeout for the SMTP connection (in seconds)
+    smtp_timeout = 30
+
+    mylog('debug', ['Trying to open connection to ' + str(get_setting_value('SMTP_SERVER')) + ':' + str(get_setting_value('SMTP_PORT'))])
+
+    if get_setting_value("LOG_LEVEL") == 'debug':
+
+        send_email(msg,smtp_timeout)
+
+    else:
+
+        try:
+            send_email(msg,smtp_timeout)
+            
+        except smtplib.SMTPAuthenticationError as e:            
+            mylog('none', ['      ERROR: Couldn\'t connect to the SMTP server (SMTPAuthenticationError)'])
+            mylog('none', ['      ERROR: Double-check your SMTP_USER and SMTP_PASS settings.)'])
+            mylog('none', ['      ERROR: ', str(e)])
+        except smtplib.SMTPServerDisconnected as e:            
+            mylog('none', ['      ERROR: Couldn\'t connect to the SMTP server (SMTPServerDisconnected)'])
+            mylog('none', ['      ERROR: ', str(e)])
+        except socket.gaierror as e:            
+            mylog('none', ['      ERROR: Could not resolve hostname (socket.gaierror)'])
+            mylog('none', ['      ERROR: ', str(e)])      
+        except ssl.SSLError as e:                        
+            mylog('none', ['      ERROR: Could not establish SSL connection (ssl.SSLError)'])
+            mylog('none', ['      ERROR: Are you sure you need SMTP_FORCE_SSL enabled? Check your SMTP provider docs.'])
+            mylog('none', ['      ERROR: ', str(e)])      
+
+# ----------------------------------------------------------------------------------
+def send_email(msg,smtp_timeout):
+    # Send mail
+    if get_setting_value('SMTP_FORCE_SSL'):
+        mylog('debug', ['SMTP_FORCE_SSL == True so using .SMTP_SSL()'])
+        if get_setting_value("SMTP_PORT") == 0:
+            mylog('debug', ['SMTP_PORT == 0 so sending .SMTP_SSL(SMTP_SERVER)'])
+            smtp_connection = smtplib.SMTP_SSL(get_setting_value('SMTP_SERVER'))
+        else:
+            mylog('debug', ['SMTP_PORT == 0 so sending .SMTP_SSL(SMTP_SERVER, SMTP_PORT)'])
+            smtp_connection = smtplib.SMTP_SSL(get_setting_value('SMTP_SERVER'), get_setting_value('SMTP_PORT'), timeout=smtp_timeout)
+
+    else:
+        mylog('debug', ['SMTP_FORCE_SSL == False so using .SMTP()'])
+        if get_setting_value("SMTP_PORT") == 0:
+            mylog('debug', ['SMTP_PORT == 0 so sending .SMTP(SMTP_SERVER)'])
+            smtp_connection = smtplib.SMTP (get_setting_value('SMTP_SERVER'))
+        else:
+            mylog('debug', ['SMTP_PORT == 0 so sending .SMTP(SMTP_SERVER, SMTP_PORT)'])
+            smtp_connection = smtplib.SMTP (get_setting_value('SMTP_SERVER'), get_setting_value('SMTP_PORT'))
+
+    mylog('debug', ['Setting SMTP debug level'])
+
+    # Log level set to debug of the communication between SMTP server and client
+    if get_setting_value('LOG_LEVEL') == 'debug':
+        smtp_connection.set_debuglevel(1)
+
+    mylog('debug', [ 'Sending .ehlo()'])
+    smtp_connection.ehlo()
+
+    if not get_setting_value('SMTP_SKIP_TLS'):
+        mylog('debug', ['SMTP_SKIP_TLS == False so sending .starttls()'])
+        smtp_connection.starttls()
+        mylog('debug', ['SMTP_SKIP_TLS == False so sending .ehlo()'])
+        smtp_connection.ehlo()
+    if not get_setting_value('SMTP_SKIP_LOGIN'):
+        mylog('debug', ['SMTP_SKIP_LOGIN == False so sending .login()'])
+        smtp_connection.login (get_setting_value('SMTP_USER'), get_setting_value('SMTP_PASS'))
+
+    mylog('debug', ['Sending .sendmail()'])
+    smtp_connection.sendmail (get_setting_value("SMTP_REPORT_FROM"), get_setting_value("SMTP_REPORT_TO"), msg.as_string())
+    smtp_connection.quit()
+
+# ----------------------------------------------------------------------------------
+def sanitize_email_content(subject, from_email, to_email, message_html, message_text):
+    # Validate and sanitize subject
+    subject = Header(subject, 'utf-8').encode()
+
+    # Validate and sanitize sender's email address
+    from_name, from_address = parseaddr(from_email)
+    from_email = Header(from_name, 'utf-8').encode() + ' <' + from_address + '>'
+
+    # Validate and sanitize recipient's email address
+    to_name, to_address = parseaddr(to_email)
+    to_email = Header(to_name, 'utf-8').encode() + ' <' + to_address + '>'
+
+    # Validate and sanitize message content
+    # Remove potentially problematic characters
+    message_html = re.sub(r'[^\x00-\x7F]+', ' ', message_html)
+    message_text = re.sub(r'[^\x00-\x7F]+', ' ', message_text)
+
+    return subject, from_email, to_email, message_html, message_text
+
+# ----------------------------------------------------------------------------------
+if __name__ == '__main__':
+    sys.exit(main())

front/plugins/_publisher_mqtt/README.md

@@ -0,0 +1,8 @@
+## Overview
+
+- Feed your data and device changes into [Home Assistant](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/HOME_ASSISTANT.md) via the MQTT Mosquito broker. 
+
+### Usage
+
+- Go to settings and fill in relevant details.
+

front/plugins/_publisher_mqtt/config.json

@@ -0,0 +1,467 @@
+{
+    "code_name": "_publisher_mqtt",
+    "unique_prefix": "MQTT",
+    "plugin_type": "publisher",
+    "enabled": true,    
+    "data_source":  "script",
+    "show_ui": true,
+    "localized": ["display_name", "description", "icon"],
+	"display_name" : [
+        {
+		  "language_code": "en_us",
+		  "string" : "MQTT publisher"
+		},
+        {
+		  "language_code": "es_es",
+		  "string" : "Habilitar MQTT"
+		}
+    ],
+    "icon":[{
+        "language_code": "en_us",
+        "string" : "<i class=\"fa-solid fa-square-rss\"></i>"
+		}],     
+    "description": [
+        {
+        "language_code": "en_us",
+        "string" : "A plugin to publish a notification via the Apprise gateway."
+		}
+    ],
+    "params" : [
+        {
+            "name"              : "devices",
+            "type"              : "sql",
+            "value"             : "SELECT dev_LastIP from DEVICES",
+            "timeoutMultiplier" : true
+        }
+    ],  
+    "database_column_definitions":
+    [          
+        {
+            "column": "Index",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Plugin",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Object_PrimaryID",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "MQTT Device ID"
+				}]
+        },
+        {
+            "column": "Object_SecondaryID",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Sensor Name"
+				}]
+        },
+        {
+            "column": "DateTimeCreated",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Sent when"
+				}]
+        },
+        {
+            "column": "DateTimeChanged",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Changed"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Cambiado"					
+                }]
+        },
+        {
+            "column": "Watched_Value1",
+            "css_classes": "col-sm-3",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Device name"
+				}]
+        },
+        {
+            "column": "Watched_Value2",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Sensor type"
+				}]
+        },
+        {
+            "column": "Watched_Value3",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Hash"
+				}]
+        },
+        {
+            "column": "Watched_Value4",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "device_mac",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Device"
+				}
+				]
+        },       
+        {
+            "column": "UserData",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "textbox_save",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Comments"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comentarios"					
+                }]
+        },        
+        {
+            "column": "Status",
+            "css_classes": "col-sm-1",
+            "show": true,
+            "type": "replace",            
+            "default_value":"",
+            "options": [
+                {
+                    "equals": "watched-not-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+                },
+                {
+                    "equals": "watched-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+                },
+                {
+                    "equals": "new",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+                },
+                {
+                    "equals": "missing-in-last-scan",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
+                }
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Status"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Estado"					
+                }]
+        },        
+        {
+            "column": "Extra",
+            "css_classes": "col-sm-3",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Extra"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Extra"					
+                }]
+        }            
+    ],
+    "settings":[
+        {
+            "function": "RUN",         
+            "events": ["test"],   
+            "type": "text.select",            
+            "default_value":"disabled",
+            "options": ["disabled", "on_notification" ],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code": "en_us",
+                "string" : "When to run"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Cuando ejecuta"
+            }],
+            "description": [
+                {
+                "language_code": "en_us",
+                "string" : "Enable sending notifications via <a target=\"_blank\" href=\"https://www.home-assistant.io/integrations/mqtt/\">MQTT</a> to your Home Assistance instance."
+				},
+                {
+                "language_code": "es_es",
+                "string" : "Habilitar el envío de notificaciones a través de <a target=\"_blank\" href=\"https://www.home-assistant.io/integrations/mqtt/\">MQTT</a> a su Home Assistance."
+				}
+            ]
+        },
+        {
+            "function": "CMD",
+            "type": "readonly",
+            "default_value":"python3 /home/pi/pialert/front/plugins/_publisher_mqtt/mqtt.py devices={devices}",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Command"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comando"						
+            }],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Command to run"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comando a ejecutar"	
+            }]
+        },
+        {
+            "function": "RUN_TIMEOUT",
+            "type": "integer",
+            "default_value": 10,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Run timeout"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tiempo de espera de ejecución"				
+				},
+				{
+                "language_code": "de_de",
+                "string" : "Wartezeit"
+            }],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+            }]
+        },
+        {
+            "function": "BROKER",
+            "type": "text",
+            "default_value": "",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "MQTT broker URL"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "URL del broker MQTT"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "MQTT host URL (do not include <code>http://</code> or <code>https://</code>)."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "URL del host MQTT (no incluya <code>http://</code> o <code>https://</code>)."
+            }]
+        },
+        {
+            "function": "PORT",
+            "type": "integer",
+            "default_value": 1883,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "MQTT broker port"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Puerto del broker MQTT"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Port number where the broker is listening. Usually <code>1883</code>."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Puerto donde escucha el broker MQTT. Normalmente <code>1883</code>."
+                }]
+        },
+        {
+            "function": "USER",
+            "type": "text",
+            "default_value": "",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "MQTT user"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Usuario de MQTT"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "User name used to login into your MQTT broker instance."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Nombre de usuario utilizado para iniciar sesión en su instancia de agente de MQTT."
+            }]
+        },
+        {
+            "function": "PASSWORD",
+            "type": "password",
+            "default_value": "",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "MQTT password"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Contraseña de MQTT"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Password used to login into your MQTT broker instance."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Contraseña utilizada para iniciar sesión en su instancia de agente de MQTT."
+            }]
+        },
+        {
+            "function": "QOS",
+            "type": "integer.select",
+            "default_value": 0,
+            "options": [0, 1, 2],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "MQTT Quality of Service"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Calidad de servicio MQTT"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Quality of service setting for MQTT message sending. <code>0</code> - Low quality to <code>2</code> - High quality. The higher the quality the longer the delay."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Configuración de calidad de servicio para el envío de mensajes MQTT. <code>0</code>: baja calidad a <code>2</code>: alta calidad. Cuanto mayor sea la calidad, mayor será el retraso."
+            }]
+        },
+        {
+            "function": "DELAY_SEC",
+            "type": "integer",
+            "default_value": 2,
+            "options": [2, 3, 4, 5],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "MQTT delay per device"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Retraso de MQTT por dispositivo"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "A little hack - delay adding to the queue in case the process is restarted and previous publish processes aborted (it takes ~<code>2</code>s to update a sensor config on the broker). Tested with <code>2</code>-<code>3</code> seconds of delay. This delay is only applied when devices are created (during the first notification loop). It doesn not affect subsequent scans or notifications."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Un pequeño truco: retrase la adición a la cola en caso de que el proceso se reinicie y los procesos de publicación anteriores se anulen (se necesitan ~<code>2</code>s para actualizar la configuración de un sensor en el intermediario). Probado con <code>2</code>-<code>3</code> segundos de retraso. Este retraso solo se aplica cuando se crean dispositivos (durante el primer bucle de notificación). No afecta los escaneos o notificaciones posteriores."
+            }]
+        }         
+    ]
+}

front/plugins/_publisher_mqtt/mqtt.py

@@ -1,23 +1,76 @@
+#!/usr/bin/env python
 
+import json
+import subprocess
+import argparse
+import os
+import pathlib
+import sys
+from datetime import datetime
 import time
 import re
 from paho.mqtt import client as mqtt_client
+import hashlib
 
+
+# Replace these paths with the actual paths to your Pi.Alert directories
+sys.path.extend(["/home/pi/pialert/front/plugins", "/home/pi/pialert/pialert"])
+
+#  PiAlert modules
 import conf
-from logger import mylog
-from database import get_all_devices, get_device_stats
-from helper import bytes_to_string, sanitize_string
+from const import apiPath
+from plugin_utils import getPluginObject
+from plugin_helper import Plugin_Objects
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ, get_setting_value, bytes_to_string, sanitize_string
+from notification import Notification_obj
+from database import DB, get_all_devices, get_device_stats
+
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+
+# Initialize the Plugin obj output file
+plugin_objects = Plugin_Objects(RESULT_FILE)
+# Create an MD5 hash object
+md5_hash = hashlib.md5()
+
+pluginName = 'MQTT'
+module_name = pluginName
+
+# globals
+
+mqtt_sensors                = []
+mqtt_connected_to_broker    = False
+client                      = None  # mqtt client
+
+def main():
+    
+    mylog('verbose', [f'[{pluginName}](publisher) In script'])    
+    
+    # Check if basic config settings supplied
+    if check_config() == False:
+        mylog('none', [f'[{pluginName}] ⚠ ERROR: Publisher notification gateway not set up correctly. Check your pialert.conf {pluginName}_* variables.'])
+        return
+
+    # Create a database connection
+    db = DB()  # instance of class DB
+    db.open()
+
+    mqtt_start(db)
+
+    plugin_objects.write_result_file()
 
 
 
 #-------------------------------------------------------------------------------
 # MQTT
 #-------------------------------------------------------------------------------
-
 #-------------------------------------------------------------------------------
 def check_config():
-        if conf.MQTT_BROKER == '' or conf.MQTT_PORT == '' or conf.MQTT_USER == '' or conf.MQTT_PASSWORD == '':
-            mylog('none', ['[Check Config] Error: MQTT service not set up correctly. Check your pialert.conf MQTT_* variables.'])
+        if get_setting_value('MQTT_BROKER') == '' or get_setting_value('MQTT_PORT') == '' or get_setting_value('MQTT_USER') == '' or get_setting_value('MQTT_PASSWORD') == '':
+            mylog('none', ['[Check Config] ⚠ ERROR: MQTT service not set up correctly. Check your pialert.conf MQTT_* variables.'])
             return False
         else:
             return True
@@ -25,13 +78,55 @@ def check_config():
 
 #-------------------------------------------------------------------------------
 class sensor_config:
-    def __init__(self, deviceId, deviceName, sensorType, sensorName, icon):
+    def __init__(self, deviceId, deviceName, sensorType, sensorName, icon, mac):
         self.deviceId = deviceId
         self.deviceName = deviceName
         self.sensorType = sensorType
         self.sensorName = sensorName
         self.icon = icon 
-        self.hash = str(hash(str(deviceId) + str(deviceName)+ str(sensorType)+ str(sensorName)+ str(icon)))
+
+        # Define your input string
+        input_string = str(deviceId) + str(deviceName) + str(sensorType) + str(sensorName) + str(icon)
+
+        # Hash the input string and convert the hash to a string
+        # Update the hash object with the bytes of the input string
+        md5_hash.update(input_string.encode('utf-8'))
+
+        # Get the hexadecimal representation of the MD5 hash
+        md5_hash_hex = md5_hash.hexdigest()
+        hash_value = str(md5_hash_hex)
+
+        self.hash = hash_value
+
+        plugObj = getPluginObject({"Plugin":"MQTT", "Watched_Value3":hash_value}) 
+
+        # mylog('verbose', [f"[{pluginName}] Previous plugin object entry: {json.dumps(plugObj)}"])        
+
+        if plugObj == {}:
+            self.isNew = True
+            mylog('verbose', [f"[{pluginName}] New sensor entry mac          : {mac}"])  
+            mylog('verbose', [f"[{pluginName}] New sensor entry input_string : {input_string}"])  
+            mylog('verbose', [f"[{pluginName}] New sensor entry hash_value   : {hash_value}"])  
+        else:
+            self.isNew = False
+
+
+        # Log sensor
+        global plugin_objects
+
+        if mac == '':
+            mac = "N/A"
+
+        plugin_objects.add_object(
+            primaryId   = deviceId,
+            secondaryId = sensorName,            
+            watched1    = deviceName,
+            watched2    = sensorType,            
+            watched3    = hash_value,
+            watched4    = mac,
+            extra       = input_string,
+            foreignKey  = mac
+        )
 
 #-------------------------------------------------------------------------------
 
@@ -41,14 +136,14 @@ def publish_mqtt(client, topic, message):
         result = client.publish(
                 topic=topic,
                 payload=message,
-                qos=conf.MQTT_QOS,
+                qos=get_setting_value('MQTT_QOS'),
                 retain=True,
             )
 
         status = result[0]
 
         if status != 0:            
-            mylog('minimal', ["Waiting to reconnect to MQTT broker"])
+            mylog('minimal', [f"[{pluginName}] Waiting to reconnect to MQTT broker"])
             time.sleep(0.1) 
     return True
 
@@ -67,74 +162,79 @@ def create_generic_device(client):
         
 
 #-------------------------------------------------------------------------------
-def create_sensor(client, deviceId, deviceName, sensorType, sensorName, icon):    
 
-    new_sensor_config = sensor_config(deviceId, deviceName, sensorType, sensorName, icon)
+def create_sensor(client, deviceId, deviceName, sensorType, sensorName, icon, mac=""):    
 
-    # check if config already in list and if not, add it, otherwise skip
-    is_unique = True
+    global mqtt_sensors    
 
-    for sensor in conf.mqtt_sensors:
-        if sensor.hash == new_sensor_config.hash:
-            is_unique = False
-            break
+    new_sensor_config = sensor_config(deviceId, deviceName, sensorType, sensorName, icon, mac) 
            
-    # save if unique
-    if is_unique:             
+    # save if new
+    if new_sensor_config.isNew:   
+        mylog('minimal', [f"[{pluginName}] Publishing sensor number {len(mqtt_sensors)}"])          
         publish_sensor(client, new_sensor_config)        
 
 
 
 
 #-------------------------------------------------------------------------------
-def publish_sensor(client, sensorConf):         
+def publish_sensor(client, sensorConfig):      
+
+    global mqtt_sensors   
 
     message = '{ \
-                "name":"'+ sensorConf.deviceName +' '+sensorConf.sensorName+'", \
-                "state_topic":"system-sensors/'+sensorConf.sensorType+'/'+sensorConf.deviceId+'/state", \
-                "value_template":"{{value_json.'+sensorConf.sensorName+'}}", \
-                "unique_id":"'+sensorConf.deviceId+'_sensor_'+sensorConf.sensorName+'", \
+                "name":"'+sensorConfig.sensorName+'", \
+                "state_topic":"system-sensors/'+sensorConfig.sensorType+'/'+sensorConfig.deviceId+'/state", \
+                "value_template":"{{value_json.'+sensorConfig.sensorName+'}}", \
+                "unique_id":"'+sensorConfig.deviceId+'_sensor_'+sensorConfig.sensorName+'", \
                 "device": \
                     { \
-                        "identifiers": ["'+sensorConf.deviceId+'_sensor"], \
+                        "identifiers": ["'+sensorConfig.deviceId+'_sensor"], \
                         "manufacturer": "PiAlert", \
-                        "name":"'+sensorConf.deviceName+'" \
+                        "name":"'+sensorConfig.deviceName+'" \
                     }, \
-                "icon":"mdi:'+sensorConf.icon+'" \
+                "icon":"mdi:'+sensorConfig.icon+'" \
                 }'
 
-    topic='homeassistant/'+sensorConf.sensorType+'/'+sensorConf.deviceId+'/'+sensorConf.sensorName+'/config'
+    topic='homeassistant/'+sensorConfig.sensorType+'/'+sensorConfig.deviceId+'/'+sensorConfig.sensorName+'/config'
 
     # add the sensor to the global list to keep track of succesfully added sensors
     if publish_mqtt(client, topic, message):        
                                      # hack - delay adding to the queue in case the process is 
-        time.sleep(conf.MQTT_DELAY_SEC)   # restarted and previous publish processes aborted 
+        time.sleep(get_setting_value('MQTT_DELAY_SEC'))   # restarted and previous publish processes aborted 
                                      # (it takes ~2s to update a sensor config on the broker)
-        conf.mqtt_sensors.append(sensorConf)
+        mqtt_sensors.append(sensorConfig)
 
 #-------------------------------------------------------------------------------
 def mqtt_create_client():    
     def on_disconnect(client, userdata, rc):
-        conf.mqtt_connected_to_broker = False
+        
+        global mqtt_connected_to_broker
+
+        mqtt_connected_to_broker = False
         
         # not sure is below line is correct / necessary        
         # client = mqtt_create_client() 
 
     def on_connect(client, userdata, flags, rc):
         
-        if rc == 0: 
-            mylog('verbose', ["        Connected to broker"])            
-            conf.mqtt_connected_to_broker = True     # Signal connection 
-        else: 
-            mylog('none', ["        Connection failed"])
-            conf.mqtt_connected_to_broker = False
+        global mqtt_connected_to_broker
 
+        if rc == 0: 
+            mylog('verbose', [f"[{pluginName}]         Connected to broker"])            
+            mqtt_connected_to_broker = True     # Signal connection 
+        else: 
+            mylog('none', [f"[{pluginName}]         Connection failed"])
+            mqtt_connected_to_broker = False
+
+
+    global client
 
     client = mqtt_client.Client('PiAlert')   # Set Connecting Client ID    
-    client.username_pw_set(conf.MQTT_USER, conf.MQTT_PASSWORD)    
+    client.username_pw_set(get_setting_value('MQTT_USER'), get_setting_value('MQTT_PASSWORD'))    
     client.on_connect = on_connect
     client.on_disconnect = on_disconnect
-    client.connect(conf.MQTT_BROKER, conf.MQTT_PORT)
+    client.connect(get_setting_value('MQTT_BROKER'), get_setting_value('MQTT_PORT'))
     client.loop_start() 
 
     return client
@@ -142,13 +242,12 @@ def mqtt_create_client():
 #-------------------------------------------------------------------------------
 def mqtt_start(db):    
 
-    #global client
+    global client, mqtt_connected_to_broker
 
-    if conf.mqtt_connected_to_broker == False:
-        conf.mqtt_connected_to_broker = True           
-        conf.client = mqtt_create_client() 
+    if mqtt_connected_to_broker == False:
+        mqtt_connected_to_broker = True           
+        client = mqtt_create_client()     
     
-    client = conf.client
     # General stats    
 
     # Create a generic device for overal stats
@@ -178,21 +277,23 @@ def mqtt_start(db):
     # Get all devices
     devices = get_all_devices(db)
 
-    sec_delay = len(devices) * int(conf.MQTT_DELAY_SEC)*5
+    sec_delay = len(devices) * int(get_setting_value('MQTT_DELAY_SEC'))*5
+
+    mylog('minimal', [f"[{pluginName}]         Estimated delay: ", (sec_delay), 's ', '(', round(sec_delay/60,1) , 'min)' ])
 
-    mylog('minimal', ["        Estimated delay: ", (sec_delay), 's ', '(', round(sec_delay/60,1) , 'min)' ])
     
     for device in devices:      
 
+    
         # Create devices in Home Assistant - send config messages
         deviceId = 'mac_' + device["dev_MAC"].replace(" ", "").replace(":", "_").lower()
         deviceNameDisplay = re.sub('[^a-zA-Z0-9-_\s]', '', device["dev_Name"]) 
 
-        create_sensor(client, deviceId, deviceNameDisplay, 'sensor', 'last_ip', 'ip-network')
-        create_sensor(client, deviceId, deviceNameDisplay, 'binary_sensor', 'is_present', 'wifi')
-        create_sensor(client, deviceId, deviceNameDisplay, 'sensor', 'mac_address', 'folder-key-network')
-        create_sensor(client, deviceId, deviceNameDisplay, 'sensor', 'is_new', 'bell-alert-outline')
-        create_sensor(client, deviceId, deviceNameDisplay, 'sensor', 'vendor', 'cog')
+        create_sensor(client, deviceId, deviceNameDisplay, 'sensor', 'last_ip', 'ip-network', device["dev_MAC"])
+        create_sensor(client, deviceId, deviceNameDisplay, 'binary_sensor', 'is_present', 'wifi', device["dev_MAC"])
+        create_sensor(client, deviceId, deviceNameDisplay, 'sensor', 'mac_address', 'folder-key-network', device["dev_MAC"])
+        create_sensor(client, deviceId, deviceNameDisplay, 'sensor', 'is_new', 'bell-alert-outline', device["dev_MAC"])
+        create_sensor(client, deviceId, deviceNameDisplay, 'sensor', 'vendor', 'cog', device["dev_MAC"])
     
         # update device sensors in home assistant              
 
@@ -243,3 +344,13 @@ def to_binary_sensor(input):
         if bytes_to_string(input) == "1":
             result = "ON"
     return result
+
+
+
+
+#  -------------INIT---------------------
+if __name__ == '__main__':
+    sys.exit(main())
+
+
+

front/plugins/_publisher_ntfy/README.md

@@ -0,0 +1,8 @@
+## Overview
+
+A plugin to publish a notification via the NTFY gateway. Enable sending notifications via <a target="_blank" href="https://ntfy.sh/">NTFY</a>. Supports authentication. 
+
+### Usage
+
+- Go to settings and fill in relevant details.
+

front/plugins/_publisher_ntfy/config.json

@@ -0,0 +1,390 @@
+{
+    "code_name": "_publisher_ntfy",
+    "unique_prefix": "NTFY",
+    "plugin_type": "publisher",
+    "enabled": true,    
+    "data_source":  "script",
+    "show_ui": true,
+    "localized": ["display_name", "description", "icon"],
+	"display_name" : [
+        {
+		  "language_code": "en_us",
+		  "string" : "NTFY publisher"
+		},
+        {
+		  "language_code": "es_es",
+		  "string" : "Habilitar NTFY"
+		}
+    ],
+    "icon":[{
+        "language_code": "en_us",
+        "string" : "<i class=\"fa-solid fa-terminal\"></i>"
+		}],     
+    "description": [
+        {
+        "language_code": "en_us",
+        "string" : "A plugin to publish a notification via the NTFY gateway."
+		}
+    ],
+    "params" : [        
+    ],  
+    "database_column_definitions":
+    [          
+        {
+            "column": "Index",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Plugin",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Object_PrimaryID",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				}]
+        },
+        {
+            "column": "Object_SecondaryID",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Sent when"
+				}]
+        },
+        {
+            "column": "Watched_Value1",
+            "css_classes": "col-sm-3",
+            "show": true,
+            "type": "eval",            
+            "default_value":"",
+            "options": [
+                {
+                    "type": "eval",
+                    "param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
+                }          
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Notification GUID"
+				}]
+        },
+        {
+            "column": "Watched_Value2",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "textarea_readonly",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Response"
+				}]
+        },
+        {
+            "column": "Watched_Value3",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Response code"
+				}]
+        },
+        {
+            "column": "Watched_Value4",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "device_mac",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Device"
+				}
+				]
+        },       
+        {
+            "column": "UserData",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "textbox_save",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Comments"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comentarios"					
+                }]
+        },        
+        {
+            "column": "Status",
+            "css_classes": "col-sm-1",
+            "show": false,
+            "type": "replace",            
+            "default_value":"",
+            "options": [
+                {
+                    "equals": "watched-not-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+                },
+                {
+                    "equals": "watched-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+                },
+                {
+                    "equals": "new",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+                },
+                {
+                    "equals": "missing-in-last-scan",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
+                }
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Status"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Estado"					
+                }]
+        },        
+        {
+            "column": "Extra",
+            "css_classes": "col-sm-3",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Extra"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Extra"					
+                }]
+        }            
+    ],
+    "settings":[
+        {
+            "function": "RUN",         
+            "events": ["test"],   
+            "type": "text.select",            
+            "default_value":"disabled",
+            "options": ["disabled", "on_notification" ],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code": "en_us",
+                "string" : "When to run"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Cuando ejecuta"
+            }],
+            "description": [
+                {
+                "language_code": "en_us",
+                "string" : "Enable sending notifications via <a target=\"_blank\" href=\"https://ntfy.sh/\">NTFY</a>."
+				},
+                {
+                "language_code": "es_es",
+                "string" : "Habilitar el envío de notificaciones a través de <a target=\"_blank\" href=\"https://ntfy.sh/\">NTFY</a>."
+				}
+            ]
+        },
+        {
+            "function": "CMD",
+            "type": "readonly",
+            "default_value":"python3 /home/pi/pialert/front/plugins/_publisher_ntfy/ntfy.py",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Command"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comando"						
+            }],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Command to run"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comando a ejecutar"	
+            }]
+        },
+        {
+            "function": "RUN_TIMEOUT",
+            "type": "integer",
+            "default_value": 10,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Run timeout"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tiempo de espera de ejecución"				
+				},
+				{
+                "language_code": "de_de",
+                "string" : "Wartezeit"
+            }],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+            }]
+        },        
+        {
+            "function": "HOST",
+            "type": "text",
+            "default_value": "https://ntfy.sh",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "NTFY host URL"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "URL del host NTFY"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "NTFY host URL starting with <code>http://</code> or <code>https://</code>. You can use the hosted instance on <a target=\"_blank\" href=\"https://ntfy.sh/\">https://ntfy.sh</a> by simply entering <code>https://ntfy.sh</code>."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "URL de host NTFY que comienza con <code>http://</code> o <code>https://</code>. Puede usar la instancia alojada en <a target=\"_blank\" href=\"https://ntfy.sh/\">https://ntfy.sh</a> simplemente ingresando <code>https://ntfy. sh</código>."
+            }]
+        },
+        {
+            "function": "TOPIC",
+            "type": "text",
+            "default_value": "",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "NTFY topic"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tema de NTFY"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Your secret topic."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tu tema secreto."
+                }]
+        },
+        {
+            "function": "USER",
+            "type": "text",
+            "default_value": "",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "NTFY user"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Usuario de NTFY"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Enter user if you need (host) an instance with enabled authetication."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Ingrese usuario si necesita (alojar) una instancia con autenticación habilitada."
+            }]
+        },
+        {
+            "function": "PASSWORD",
+            "type": "password",
+            "default_value": "",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "NTFY password"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Contraseña de NTFY"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Enter password if you need (host) an instance with enabled authetication."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Ingrese la contraseña si necesita (host) una instancia con autenticación habilitada."
+            }]
+        }     
+    ]
+}

front/plugins/_publisher_ntfy/ntfy.py

@@ -0,0 +1,132 @@
+
+#!/usr/bin/env python
+
+import json
+import subprocess
+import argparse
+import os
+import pathlib
+import sys
+import requests
+from datetime import datetime
+from base64 import b64encode
+
+# Replace these paths with the actual paths to your Pi.Alert directories
+sys.path.extend(["/home/pi/pialert/front/plugins", "/home/pi/pialert/pialert"])
+
+import conf
+from plugin_helper import Plugin_Objects, handleEmpty
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ, get_setting_value
+from notification import Notification_obj
+from database import DB
+
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+pluginName = 'NTFY'
+
+def main():
+    
+    mylog('verbose', [f'[{pluginName}](publisher) In script'])    
+    
+    # Check if basic config settings supplied
+    if check_config() == False:
+        mylog('none', [f'[{pluginName}] ⚠ ERROR: Publisher notification gateway not set up correctly. Check your pialert.conf {pluginName}_* variables.'])
+        return
+
+    # Create a database connection
+    db = DB()  # instance of class DB
+    db.open()
+
+    # Initialize the Plugin obj output file
+    plugin_objects = Plugin_Objects(RESULT_FILE)
+
+    # Create a Notification_obj instance
+    notifications = Notification_obj(db)
+
+    # Retrieve new notifications
+    new_notifications = notifications.getNew()
+
+    # Process the new notifications (see the Notifications DB table for structure or check the /api/table_notifications.json endpoint)
+    for notification in new_notifications:
+
+        # Send notification
+        response_text, response_status_code = send(notification["HTML"], notification["Text"])    
+
+        # Log result
+        plugin_objects.add_object(
+            primaryId   = pluginName,
+            secondaryId = timeNowTZ(),            
+            watched1    = notification["GUID"],
+            watched2    = handleEmpty(response_text),            
+            watched3    = response_status_code,
+            watched4    = 'null',
+            extra       = 'null',
+            foreignKey  = notification["GUID"]
+        )
+
+    plugin_objects.write_result_file()
+
+
+
+#-------------------------------------------------------------------------------
+def check_config():
+    if get_setting_value('NTFY_HOST') == '' or get_setting_value('NTFY_TOPIC') == '':        
+        return False
+    else:
+        return True
+    
+#-------------------------------------------------------------------------------
+def send(html, text):
+
+    response_text = ''
+    response_status_code = ''
+
+
+    headers = {
+        "Title": "Pi.Alert Notification",
+        "Actions": "view, Open Dashboard, "+ get_setting_value('REPORT_DASHBOARD_URL'),
+        "Priority": "urgent",
+        "Tags": "warning"
+    }
+    
+    # if username and password are set generate hash and update header
+    if get_setting_value('NTFY_USER') != "" and get_setting_value('NTFY_PASSWORD') != "":
+	# Generate hash for basic auth
+        # usernamepassword = "{}:{}".format(get_setting_value('NTFY_USER'),get_setting_value('NTFY_PASSWORD'))
+        basichash = b64encode(bytes(get_setting_value('NTFY_USER') + ':' + get_setting_value('NTFY_PASSWORD'), "utf-8")).decode("ascii")
+
+	# add authorization header with hash
+        headers["Authorization"] = "Basic {}".format(basichash)
+
+    try:
+        response = requests.post("{}/{}".format(   get_setting_value('NTFY_HOST'), 
+                                        get_setting_value('NTFY_TOPIC')),
+                                        data    = text,
+                                        headers = headers)
+
+        response_status_code = response.status_code
+
+        
+
+        # Check if the request was successful (status code 200)
+        if response_status_code == 200:
+            response_text = response.text  # This captures the response body/message      
+        else:
+            response_text = json.dumps(response.text) 
+
+    except requests.exceptions.RequestException as e:  
+        mylog('none', [f'[{pluginName}] ⚠ ERROR: ', e])
+
+        response_text = e
+
+        return response_text, response_status_code
+
+    return response_text, response_status_code    
+
+
+if __name__ == '__main__':
+    sys.exit(main())
+

front/plugins/_publisher_pushsafer/README.md

@@ -0,0 +1,8 @@
+## Overview
+
+A plugin to publish a notification via the Pushsafer gateway. Enable sending notifications via <a target="_blank" href="https://www.pushsafer.com/">Pushsafer</a>.
+
+### Usage
+
+- Go to settings and fill in relevant details.
+

front/plugins/_publisher_pushsafer/config.json

@@ -0,0 +1,321 @@
+{
+    "code_name": "_publisher_pushsafer",
+    "unique_prefix": "PUSHSAFER",
+    "plugin_type": "publisher",
+    "enabled": true,    
+    "data_source":  "script",
+    "show_ui": true,
+    "localized": ["display_name", "description", "icon"],
+	"display_name" : [
+        {
+		  "language_code": "en_us",
+		  "string" : "Pushsafer publisher"
+		},
+        {
+		  "language_code": "es_es",
+		  "string" : "Habilitar Pushsafer"
+		}
+    ],
+    "icon":[{
+        "language_code": "en_us",
+        "string" : "<i class=\"fa-solid fa-bell\"></i>"
+		}],     
+    "description": [
+        {
+        "language_code": "en_us",
+        "string" : "A plugin to publish a notification via the Pushsafer gateway."
+		}
+    ],
+    "params" : [        
+    ],  
+    "database_column_definitions":
+    [          
+        {
+            "column": "Index",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Plugin",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Object_PrimaryID",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				}]
+        },
+        {
+            "column": "Object_SecondaryID",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Sent when"
+				}]
+        },
+        {
+            "column": "Watched_Value1",
+            "css_classes": "col-sm-3",
+            "show": true,
+            "type": "eval",            
+            "default_value":"",
+            "options": [
+                {
+                    "type": "eval",
+                    "param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
+                }          
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Notification GUID"
+				}]
+        },
+        {
+            "column": "Watched_Value2",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "textarea_readonly",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Response"
+				}]
+        },
+        {
+            "column": "Watched_Value3",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Response code"
+				}]
+        },
+        {
+            "column": "Watched_Value4",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "device_mac",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Device"
+				}
+				]
+        },       
+        {
+            "column": "UserData",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "textbox_save",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Comments"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comentarios"					
+                }]
+        },        
+        {
+            "column": "Status",
+            "css_classes": "col-sm-1",
+            "show": false,
+            "type": "replace",            
+            "default_value":"",
+            "options": [
+                {
+                    "equals": "watched-not-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+                },
+                {
+                    "equals": "watched-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+                },
+                {
+                    "equals": "new",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+                },
+                {
+                    "equals": "missing-in-last-scan",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
+                }
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Status"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Estado"					
+                }]
+        },        
+        {
+            "column": "Extra",
+            "css_classes": "col-sm-3",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Extra"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Extra"					
+                }]
+        }            
+    ],
+    "settings":[
+        {
+            "function": "RUN",         
+            "events": ["test"],   
+            "type": "text.select",            
+            "default_value":"disabled",
+            "options": ["disabled", "on_notification" ],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code": "en_us",
+                "string" : "When to run"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Cuando ejecuta"
+            }],
+            "description": [
+                {
+                "language_code": "en_us",
+                "string" : "Enable sending notifications via <a target=\"_blank\" href=\"https://www.pushsafer.com/\">Pushsafer</a>."
+				},
+                {
+                "language_code": "es_es",
+                "string" : "Habilitar el envío de notificaciones a través de <a target=\"_blank\" href=\"https://www.pushsafer.com/\">Pushsafer</a>."
+				}
+            ]
+        },
+        {
+            "function": "CMD",
+            "type": "readonly",
+            "default_value":"python3 /home/pi/pialert/front/plugins/_publisher_pushsafer/pushsafer.py",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Command"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comando"						
+            }],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Command to run"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comando a ejecutar"	
+            }]
+        },
+        {
+            "function": "RUN_TIMEOUT",
+            "type": "integer",
+            "default_value": 10,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Run timeout"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tiempo de espera de ejecución"				
+				},
+				{
+                "language_code": "de_de",
+                "string" : "Wartezeit"
+            }],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+            }]
+        },        
+        { 
+            "function": "TOKEN",
+            "type": "text",
+            "default_value": "ApiKey",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Pushsafer token"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Token de Pushsafer"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Your secret Pushsafer API key (token)."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Su clave secreta de la API de Pushsafer (token)."
+            }]
+        }   
+    ]
+}

front/plugins/_publisher_pushsafer/pushsafer.py

@@ -0,0 +1,133 @@
+
+#!/usr/bin/env python
+
+import json
+import subprocess
+import argparse
+import os
+import pathlib
+import sys
+import requests
+from datetime import datetime
+from base64 import b64encode
+
+# Replace these paths with the actual paths to your Pi.Alert directories
+sys.path.extend(["/home/pi/pialert/front/plugins", "/home/pi/pialert/pialert"])
+
+import conf
+from plugin_helper import Plugin_Objects, handleEmpty
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ, get_setting_value, hide_string
+from notification import Notification_obj
+from database import DB
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+pluginName = 'PUSHSAFER'
+
+def main():
+    
+    mylog('verbose', [f'[{pluginName}](publisher) In script'])    
+    
+    # Check if basic config settings supplied
+    if check_config() == False:
+        mylog('none', [f'[{pluginName}] ⚠ ERROR: Publisher notification gateway not set up correctly. Check your pialert.conf {pluginName}_* variables.'])
+        return
+
+    # Create a database connection
+    db = DB()  # instance of class DB
+    db.open()
+
+    # Initialize the Plugin obj output file
+    plugin_objects = Plugin_Objects(RESULT_FILE)
+
+    # Create a Notification_obj instance
+    notifications = Notification_obj(db)
+
+    # Retrieve new notifications
+    new_notifications = notifications.getNew()
+
+    # Process the new notifications (see the Notifications DB table for structure or check the /api/table_notifications.json endpoint)
+    for notification in new_notifications:
+
+        # Send notification
+        response_text, response_status_code = send(notification["Text"])    
+
+        # Log result
+        plugin_objects.add_object(
+            primaryId   = pluginName,
+            secondaryId = timeNowTZ(),            
+            watched1    = notification["GUID"],
+            watched2    = handleEmpty(response_text),            
+            watched3    = response_status_code,
+            watched4    = 'null',
+            extra       = 'null',
+            foreignKey  = notification["GUID"]
+        )
+
+    plugin_objects.write_result_file()
+
+
+    
+#-------------------------------------------------------------------------------
+def send(text):
+
+    response_text = ''
+    response_status_code = ''
+
+    token = get_setting_value('PUSHSAFER_TOKEN')
+
+    mylog('verbose', [f'[{pluginName}] PUSHSAFER_TOKEN: "{hide_string(token)}"'])    
+    
+
+    try:
+        url = 'https://www.pushsafer.com/api'
+        post_fields = {
+            "t" : 'Pi.Alert Message',
+            "m" : text,
+            "s" : 11,
+            "v" : 3,
+            "i" : 148,
+            "c" : '#ef7f7f',
+            "d" : 'a',
+            "u" : get_setting_value('REPORT_DASHBOARD_URL'),
+            "ut" : 'Open Pi.Alert',
+            "k" : token,
+            }
+        response = requests.post(url, data=post_fields)
+        
+        response_status_code = response.status_code
+
+
+        # Check if the request was successful (status code 200)
+        if response_status_code == 200:
+            response_text = response.text  # This captures the response body/message      
+        else:
+            response_text = json.dumps(response.text) 
+
+    except requests.exceptions.RequestException as e:  
+        mylog('none', [f'[{pluginName}] ⚠ ERROR: ', e])
+
+        response_text = e
+
+        return response_text, response_status_code
+    
+
+    return response_text, response_status_code    
+
+
+
+
+
+#-------------------------------------------------------------------------------
+def check_config():
+        if get_setting_value('PUSHSAFER_TOKEN') == 'ApiKey':           
+            return False
+        else:
+            return True
+
+#  -------------------------------------------------------
+if __name__ == '__main__':
+    sys.exit(main())
+

front/plugins/_publisher_webhook/README.md

@@ -0,0 +1,8 @@
+## Overview
+
+A plugin to publish a notification via the Webhook gateway. Webhooks help you to connect to a lot of 3rd party tools, such as IFTTT, Zapier or <a href="https://n8n.io/" target="_blank">n8n</a> to name a few. Check out this simple <a href="https://github.com/jokob-sk/Pi.Alert/blob/main/docs/WEBHOOK_N8N.md" target="_blank">n8n guide here</a> to get started. If enabled, configure related settings below.
+
+### Usage
+
+- Go to settings and fill in relevant details.
+

front/plugins/_publisher_webhook/config.json

@@ -0,0 +1,409 @@
+{
+    "code_name": "_publisher_webhook",
+    "unique_prefix": "WEBHOOK",
+    "plugin_type": "publisher",
+    "enabled": true,    
+    "data_source":  "script",
+    "show_ui": true,
+    "localized": ["display_name", "description", "icon"],
+	"display_name" : [
+        {
+		  "language_code": "en_us",
+		  "string" : "Webhook publisher"
+		},
+        {
+		  "language_code": "es_es",
+		  "string" : "Habilitar Webhook"
+		}
+    ],
+    "icon":[{
+        "language_code": "en_us",
+        "string" : "<i class=\"fa-solid fa-circle-nodes\"></i>"
+		}],     
+    "description": [
+        {
+        "language_code": "en_us",
+        "string" : "A plugin to publish a notification via Webhooks."
+		}
+    ],
+    "params" : [        
+    ],  
+    "database_column_definitions":
+    [          
+        {
+            "column": "Index",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Plugin",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "N/A"					
+                }]
+        },
+        {
+            "column": "Object_PrimaryID",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "N/A"
+				}]
+        },
+        {
+            "column": "Object_SecondaryID",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Sent when"
+				}]
+        },
+        {
+            "column": "Watched_Value1",
+            "css_classes": "col-sm-3",
+            "show": true,
+            "type": "eval",            
+            "default_value":"",
+            "options": [
+                {
+                    "type": "eval",
+                    "param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
+                }          
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Notification GUID"
+				}]
+        },
+        {
+            "column": "Watched_Value2",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "textarea_readonly",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Response (stdout)"
+				}]
+        },
+        {
+            "column": "Watched_Value3",
+            "css_classes": "col-sm-2",
+            "show": true,
+            "type": "textarea_readonly",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Response (stderr)"
+				}]
+        },
+        {
+            "column": "Watched_Value4",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "device_mac",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Device"
+				}
+				]
+        },       
+        {
+            "column": "UserData",
+            "css_classes": "col-sm-2",
+            "show": false,
+            "type": "textbox_save",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Comments"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comentarios"					
+                }]
+        },        
+        {
+            "column": "Status",
+            "css_classes": "col-sm-1",
+            "show": false,
+            "type": "replace",            
+            "default_value":"",
+            "options": [
+                {
+                    "equals": "watched-not-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+                },
+                {
+                    "equals": "watched-changed",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+                },
+                {
+                    "equals": "new",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+                },
+                {
+                    "equals": "missing-in-last-scan",
+                    "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
+                }
+            ],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Status"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Estado"					
+                }]
+        },        
+        {
+            "column": "Extra",
+            "css_classes": "col-sm-3",
+            "show": false,
+            "type": "label",            
+            "default_value":"",
+            "options": [],
+            "localized": ["name"],
+            "name":[{
+                "language_code": "en_us",
+                "string" : "Extra"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Extra"					
+                }]
+        }            
+    ],
+    "settings":[
+        {
+            "function": "RUN",         
+            "events": ["test"],   
+            "type": "text.select",            
+            "default_value":"disabled",
+            "options": ["disabled", "on_notification" ],
+            "localized": ["name", "description"],
+            "name" :[{
+                "language_code": "en_us",
+                "string" : "When to run"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Cuando ejecuta"
+            }],
+            "description": [
+                {
+                "language_code": "en_us",
+                "string" : "Enable webhooks for notifications. Webhooks help you to connect to a lot of 3rd party tools, such as IFTTT, Zapier or <a href=\"https://n8n.io/\" target=\"_blank\">n8n</a> to name a few. Check out this simple <a href=\"https://github.com/jokob-sk/Pi.Alert/blob/main/docs/WEBHOOK_N8N.md\" target=\"_blank\">n8n guide here</a> to get started. If enabled, configure related settings below."
+				},
+                {
+                "language_code": "es_es",
+                "string" : "Habilite webhooks para notificaciones. Los webhooks lo ayudan a conectarse a muchas herramientas de terceros, como IFTTT, Zapier o <a href=\"https://n8n.io/\" target=\"_blank\">n8n</a>, por nombrar algunas. Consulte esta sencilla <a href=\"https://github.com/jokob-sk/Pi.Alert/blob/main/docs/WEBHOOK_N8N.md\" target=\"_blank\">guía de n8n aquí</a> para obtener comenzó. Si está habilitado, configure los ajustes relacionados a continuación."
+				}
+            ]
+        },
+        {
+            "function": "CMD",
+            "type": "readonly",
+            "default_value":"python3 /home/pi/pialert/front/plugins/_publisher_webhook/webhook.py",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Command"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comando"						
+            }],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Command to run"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Comando a ejecutar"	
+            }]
+        },
+        {
+            "function": "RUN_TIMEOUT",
+            "type": "integer",
+            "default_value": 10,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Run timeout"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tiempo de espera de ejecución"				
+				},
+				{
+                "language_code": "de_de",
+                "string" : "Wartezeit"
+            }],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+            }]
+        },        
+        { 
+            "function": "URL",
+            "type": "text",
+            "default_value": "",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Target URL"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "URL de destino"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "Target URL starting with <code>http://</code> or <code>https://</code>."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "URL de destino comienza con <code>http://</code> o <code>https://</code>."
+            }]
+        },
+        { 
+            "function": "PAYLOAD",
+            "type": "text.select",
+            "default_value": "json",
+            "options": ["json", "html", "text"],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Payload type"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tipo de carga"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "The Webhook payload data format for the <code>body</code> > <code>attachments</code> > <code>text</code> attribute in the payload json. See an example of the payload <a target=\"_blank\" href=\"https://github.com/jokob-sk/Pi.Alert/blob/main/back/webhook_json_sample.json\">here</a>. (e.g.: for discord use <code>text</code>)"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "El formato de datos de carga de Webhook para el atributo <code>body</code> > <code>attachments</code> > <code>text</code> en el json de carga. Vea un ejemplo de la carga <a target=\"_blank\" href=\"https://github.com/jokob-sk/Pi.Alert/blob/main/back/webhook_json_sample.json\">aquí</a>. (por ejemplo: para discord use <code>text</code>)"
+            }]
+        },
+        { 
+            "function": "REQUEST_METHOD",
+            "type": "text.select",
+            "default_value": "GET",
+            "options": ["GET", "POST", "PUT"],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Request method"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Método de solicitud"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "The HTTP request method to be used for the webhook call."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "El método de solicitud HTTP que se utilizará para la llamada de webhook."
+            }]
+        },
+        { 
+            "function": "SIZE",
+            "type": "integer",
+            "default_value": 1024,
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "Max payload size"
+				},
+				{
+                "language_code": "es_es",
+                "string" : "Tamaño máximo de carga útil"				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "The maximum size of the webhook payload as number of characters in the passed string. If above limit, it will be truncated and a <code>(text was truncated)</code> message is appended."
+				},
+				{
+                "language_code": "es_es",
+                "string" : "El tamaño máximo de la carga útil del webhook como número de caracteres en la cadena pasada. Si supera el límite, se truncará y se agregará un mensaje <code>(text was truncated)</code>."
+            }]
+        },           
+        { 
+            "function": "SECRET",
+            "type": "text",
+            "default_value": "",
+            "options": [],
+            "localized": ["name", "description"],
+            "name" : [{
+                "language_code": "en_us",
+                "string" : "HMAC Secret"
+				},
+				{
+                "language_code": "es_es",
+                "string" : ""				
+				}],
+            "description": [{
+                "language_code": "en_us",
+                "string" : "When set, use this secret to generate the SHA256-HMAC hex digest value of the request body, which will be passed as the <code>X-Webhook-Signature</code> header to the request. You can find more information <a target=\"_blank\" href=\"https://github.com/jokob-sk/Pi.Alert/blob/main/docs/WEBHOOK_SECRET.md\">here</a>."
+				}]
+        }   
+    ]
+}

front/plugins/_publisher_webhook/webhook.py

@@ -0,0 +1,190 @@
+
+#!/usr/bin/env python
+
+import json
+import subprocess
+import argparse
+import os
+import pathlib
+import sys
+import requests
+from datetime import datetime
+from base64 import b64encode
+import hashlib
+import hmac
+
+# Replace these paths with the actual paths to your Pi.Alert directories
+sys.path.extend(["/home/pi/pialert/front/plugins", "/home/pi/pialert/pialert"])
+
+# pialert modules
+import conf
+from const import logPath
+from plugin_helper import Plugin_Objects, handleEmpty
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ, get_setting_value, hide_string, write_file
+from notification import Notification_obj
+from database import DB
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+pluginName = 'WEBHOOK'
+
+def main():
+    
+    mylog('verbose', [f'[{pluginName}](publisher) In script'])    
+    
+    # Check if basic config settings supplied
+    if check_config() == False:
+        mylog('none', [f'[{pluginName}] ⚠ ERROR: Publisher notification gateway not set up correctly. Check your pialert.conf {pluginName}_* variables.'])
+        return
+
+    # Create a database connection
+    db = DB()  # instance of class DB
+    db.open()
+
+    # Initialize the Plugin obj output file
+    plugin_objects = Plugin_Objects(RESULT_FILE)
+
+    # Create a Notification_obj instance
+    notifications = Notification_obj(db)
+
+    # Retrieve new notifications
+    new_notifications = notifications.getNew()
+
+    # Process the new notifications (see the Notifications DB table for structure or check the /api/table_notifications.json endpoint)
+    for notification in new_notifications:
+
+        # Send notification
+        response_stdout, response_stderr = send(notification["Text"], notification["HTML"], notification["JSON"])    
+
+        # Log result
+        plugin_objects.add_object(
+            primaryId   = pluginName,
+            secondaryId = timeNowTZ(),            
+            watched1    = notification["GUID"],
+            watched2    = handleEmpty(response_stdout),            
+            watched3    = handleEmpty(response_stderr),                        
+            watched4    = 'null',
+            extra       = 'null',
+            foreignKey  = notification["GUID"]
+        )
+
+    plugin_objects.write_result_file()
+
+
+#-------------------------------------------------------------------------------
+def check_config():
+        if get_setting_value('WEBHOOK_URL') == '':            
+            return False
+        else:
+            return True
+        
+#-------------------------------------------------------------------------------        
+
+def send (text_data, html_data, json_data):
+
+    response_stderr = ''
+    response_stdout = ''
+
+    # limit = 1024 * 1024  # 1MB limit (1024 bytes * 1024 bytes = 1MB)
+    limit         = get_setting_value('WEBHOOK_SIZE')
+    payloadType   = get_setting_value('WEBHOOK_PAYLOAD')
+    endpointUrl   = get_setting_value('WEBHOOK_URL')
+    secret        = get_setting_value('WEBHOOK_SECRET')
+    requestMethod = get_setting_value('WEBHOOK_REQUEST_METHOD')
+
+    # use data type based on specified payload type
+    if payloadType == 'json':
+        # In this code, the truncate_json function is used to recursively traverse the JSON object 
+        # and remove nodes that exceed the size limit. It checks the size of each node's JSON representation 
+        # using json.dumps and includes only the nodes that are within the limit.        
+        json_str = json.dumps(json_data)
+
+        if len(json_str) <= limit:
+            payloadData = json_data
+        else:
+            def truncate_json(obj):
+                if isinstance(obj, dict):
+                    return {
+                        key: truncate_json(value)
+                        for key, value in obj.items()
+                        if len(json.dumps(value)) <= limit
+                    }
+                elif isinstance(obj, list):
+                    return [
+                        truncate_json(item)
+                        for item in obj
+                        if len(json.dumps(item)) <= limit
+                    ]
+                else:
+                    return obj
+
+            payloadData = truncate_json(json_data)
+    if payloadType == 'html':                 
+        if len(html_data) > limit:
+            payloadData = html_data[:limit] + " <h1>(text was truncated)</h1>"
+        else:
+            payloadData = html_data
+    if payloadType == 'text':            
+        if len(text_data) > limit:
+            payloadData = text_data[:limit] + " (text was truncated)"
+        else:
+            payloadData = text_data
+
+    # Define slack-compatible payload
+    _json_payload = { "text": payloadData } if payloadType == 'text' else {
+    "username": "Pi.Alert",
+    "text": "There are new notifications",
+    "attachments": [{
+      "title": "Pi.Alert Notifications",
+      "title_link": get_setting_value('REPORT_DASHBOARD_URL'),
+      "text": payloadData
+    }]
+    }
+
+    # DEBUG - Write the json payload into a log file for debugging
+    write_file (logPath + '/webhook_payload.json', json.dumps(_json_payload))
+
+    # Using the Slack-Compatible Webhook endpoint for Discord so that the same payload can be used for both
+    #  Consider: curl has the ability to load in data to POST from a file + piping
+    if(endpointUrl.startswith('https://discord.com/api/webhooks/') and not endpointUrl.endswith("/slack")):
+        _WEBHOOK_URL = f"{endpointUrl}/slack"
+        curlParams = ["curl","-i","-H", "Content-Type:application/json" ,"-d", json.dumps(_json_payload), _WEBHOOK_URL]
+    else:
+        _WEBHOOK_URL = endpointUrl
+        curlParams = ["curl","-i","-X", requestMethod , "-H", "Content-Type:application/json", "-d", json.dumps(_json_payload), _WEBHOOK_URL]
+
+    # Add HMAC signature if configured
+    if(secret != ''):
+        h = hmac.new(secret.encode("UTF-8"), json.dumps(_json_payload, separators=(',', ':')).encode(), hashlib.sha256).hexdigest()
+        curlParams.insert(4,"-H")
+        curlParams.insert(5,f"X-Webhook-Signature: sha256={h}")
+
+    try:
+        # Execute CURL call
+        mylog('debug', [f'[{pluginName}] curlParams: ', curlParams])
+        result = subprocess.run(curlParams, capture_output=True, text=True)
+
+        response_stderr = result.stderr
+        response_stdout = result.stdout    
+
+        # Write stdout and stderr into .log files for debugging if needed
+        mylog('debug', [f'[{pluginName}] stdout: ', response_stdout])
+        mylog('debug', [f'[{pluginName}] stderr: ', response_stderr])   
+
+
+
+    except subprocess.CalledProcessError as e:
+        # An error occurred, handle it
+        mylog('none', [f'[{pluginName}] ⚠ ERROR: ', e.output])
+
+        response_stderr = e.output
+
+
+    return response_stdout, response_stderr   
+
+#  -------------------------------------------------------
+if __name__ == '__main__':
+    sys.exit(main())
+

front/plugins/arp_scan/README_DE.md

@@ -0,0 +1,12 @@
+## Übersicht
+
+ARP-Scan ist ein Kommandozeilen-Werkzeug, welches das ARP-Protokoll nutzt, um IP-Hosts im lokalen Netzwerk zu erkennen und identifizieren. Eine Alternative zum ARP-Scan ist die Aktivierung der PiHole-Integration (`PIHOLE_RUN`) in den Einstellungen. Die Dauer des ARP-Scan (und andere Netzwerkscan-Plugins, welche die `SCAN_SUBNETS`-Einstellung nutzen) ist abhängig von der Anzahl der zu prüfenden IP-Adressen. Daher ist es wichtig, dies mit größter Vorsicht und den korrekten Netzwerkmasken und -interfaces zu konfigurieren. Die [Subnetz-Dokumentation](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/SUBNETS.md) ansehen für mehr Hilfe zum Aufsetzen von VLANs, welche VLANs unterstützt werden und zum Herausfinden der Netzwerkmaske und -interfaces.
+
+### Verwendung
+
+- Zur Einstellungen-Seite gehen und die `SCAN_SUBNETS`-Einstellung anhand der [Subnetz-Dokumentation](https://github.com/jokob-sk/Pi.Alert/blob/main/docs/SUBNETS.md) konfigurieren
+- Das Plugin aktivieren, indem der `RUN`-Parameter von `disabled` auf den gewünschten Ausführzeitpunkt gesetzt wird (normalerweise: `schedule`)
+  - Zeitplan in der `ARPSCAN_RUN_SCHD`-Einstellung setzen
+- Zeitlimit nach Bedarf in der `ARPSCAN_RUN_TIMEOUT`-Einstellung setzen
+- SPEICHERN
+- Auf Ausführung des nächsten Scans warten

front/plugins/arp_scan/config.json

@@ -1,21 +1,25 @@
 {
   "code_name": "arp_scan",
   "unique_prefix": "ARPSCAN",
+  "plugin_type": "device_scanner",
   "enabled": true,
   "data_source": "script",
   "mapped_to_table": "CurrentScan",
   "data_filters": [
     {
-        "compare_column" : "Object_PrimaryID",
-        "compare_operator" : "==",
-        "compare_field_id": "txtMacFilter",
-        "compare_js_template": "'{value}'.toString()", 
-        "compare_use_quotes": true 
+      "compare_column": "Object_PrimaryID",
+      "compare_operator": "==",
+      "compare_field_id": "txtMacFilter",
+      "compare_js_template": "'{value}'.toString()",
+      "compare_use_quotes": true
     }
   ],
   "show_ui": true,
-  "localized": ["display_name", "description", "icon"],
-
+  "localized": [
+    "display_name",
+    "description",
+    "icon"
+  ],
   "display_name": [
     {
       "language_code": "en_us",
@@ -24,6 +28,10 @@
     {
       "language_code": "es_es",
       "string": "Arp-Scan (Escaneo de red)"
+    },
+    {
+      "language_code": "de_de",
+      "string": "ARP-Scan  (Netzwerkscan)"
     }
   ],
   "icon": [
@@ -34,6 +42,10 @@
     {
       "language_code": "es_es",
       "string": "<i class=\"fa-solid fa-search\"></i>"
+    },
+    {
+      "language_code": "de_de",
+      "string": "<i class=\"fa-solid fa-search\"></i>"
     }
   ],
   "description": [
@@ -44,48 +56,77 @@
     {
       "language_code": "es_es",
       "string": "Este plugin es para ejecutar un escaneo arp en la red local."
+    },
+    {
+      "language_code": "de_de",
+      "string": "Dieses Plugin wird genutzt, um einen ARP-Scan auf dem lokalen Netzwerk durchzuführen"
     }
   ],
-    "params" : [
+  "params": [
     {
-        "name"  : "subnets",
-        "type"  : "setting",
-        "value" : "SCAN_SUBNETS",
-        "base64": true
-    }],  
-
+      "name": "subnets",
+      "type": "setting",
+      "value": "SCAN_SUBNETS",
+      "base64": true
+    }
+  ],
   "settings": [
     {
       "function": "RUN",
       "type": "text.select",
-      "default_value":"schedule",
-      "options": ["disabled", "once", "schedule", "always_after_scan",  "on_new_device"],
-      "localized": ["name", "description"],
-      "events": ["run"],
-      "name" :[
-	  {
-          "language_code":"en_us",
-          "string" : "When to run"
-      },
-	  {
-          "language_code":"es_es",
-          "string" : "Cuando ejecutar"
-      }],
-      "description": [{
-          "language_code":"en_us",
-          "string" : "Specify when your Network-discovery scan will run. Typical setting would be <code>schedule</code> and then you specify a cron-like schedule in the <a href=\"#ARPSCAN_RUN_SCHD\"><code>ARPSCAN_RUN_SCHD</code>setting</a> "
-      },
-	  {
-          "language_code":"es_es",
-          "string" : "Especifique cuándo se ejecutará su análisis de descubrimiento de red. La configuración típica sería <code>schedule</code> y luego se especifica una programación similar a cron en la configuración <a href=\"#ARPSCAN_RUN_SCHD\"><code>ARPSCAN_RUN_SCHD</code></a> "
-      }]
-  },    
+      "default_value": "schedule",
+      "options": [
+        "disabled",
+        "once",
+        "schedule",
+        "always_after_scan",
+        "on_new_device"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "events": [
+        "run"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "When to run"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Cuando ejecutar"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Wann ausführen"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Specify when your Network-discovery scan will run. Typical setting would be <code>schedule</code> and then you specify a cron-like schedule in the <a href=\"#ARPSCAN_RUN_SCHD\"><code>ARPSCAN_RUN_SCHD</code>setting</a> "
+        },
+        {
+          "language_code": "es_es",
+          "string": "Especifique cuándo se ejecutará su análisis de descubrimiento de red. La configuración típica sería <code>schedule</code> y luego se especifica una programación similar a cron en la configuración <a href=\"#ARPSCAN_RUN_SCHD\"><code>ARPSCAN_RUN_SCHD</code></a> "
+        },
+        {
+          "language_code": "de_de",
+          "string": "Auswählen wann der Netzwerkscan laufen soll. Typischerweise wird <code>schedule</code> ausgewählt und ein cron-Intervall in der <a href=\"#ARPSCAN_RUN_SCHD\"><code>ARPSCAN_RUN_SCHD</code>Einstellung</a> gesetzt."
+        }
+      ]
+    },
     {
       "function": "CMD",
       "type": "readonly",
       "default_value": "python3 /home/pi/pialert/front/plugins/arp_scan/script.py userSubnets={subnets}",
       "options": [],
-      "localized": ["name", "description"],
+      "localized": [
+        "name",
+        "description"
+      ],
       "name": [
         {
           "language_code": "en_us",
@@ -94,6 +135,10 @@
         {
           "language_code": "es_es",
           "string": "Comando"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Befehl"
         }
       ],
       "description": [
@@ -104,16 +149,22 @@
         {
           "language_code": "es_es",
           "string": "Comando para ejecutar. Esto no debe ser cambiado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Auszuführender Befehl. Dieser sollte nicht geändert werden"
         }
       ]
     },
-    
     {
       "function": "RUN_TIMEOUT",
       "type": "integer",
       "default_value": 300,
       "options": [],
-      "localized": ["name", "description"],
+      "localized": [
+        "name",
+        "description"
+      ],
       "name": [
         {
           "language_code": "en_us",
@@ -122,6 +173,10 @@
         {
           "language_code": "es_es",
           "string": "Tiempo límite de ejecución"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Zeitlimit"
         }
       ],
       "description": [
@@ -132,69 +187,125 @@
         {
           "language_code": "es_es",
           "string": "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, se cancela el script."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Maximale Zeit in Sekunden, die auf den Abschluss des Skripts gewartet werden soll. Bei Überschreitung dieser Zeit wird das Skript abgebrochen."
         }
       ]
     },
     {
-        "function": "RUN_SCHD",
-        "type": "text",
-        "default_value":"*/3 * * * *",
-        "options": [],
-        "localized": ["name", "description"],
-        "name" : [{
-            "language_code":"en_us",
-            "string" : "Schedule"
+      "function": "RUN_SCHD",
+      "type": "text",
+      "default_value": "*/5 * * * *",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Schedule"
         },
-		{
-            "language_code":"es_es",
-            "string" : "Schedule"
-        }],
-        "description": [{
-            "language_code":"en_us",
-            "string" : "Only enabled if you select <code>schedule</code> in the <a href=\"#ARPSCAN_RUN\"><code>ARPSCAN_RUN</code> setting</a>. Make sure you enter the schedule in the correct cron-like format (e.g. validate at <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). For example entering <code>*/3 * * * *</code> will run the scan every 3 minutes. Will be run NEXT time the time passes. <br/> It's recommended to use the same schedule interval for all plugins responsible for discovering new devices."
+        {
+          "language_code": "es_es",
+          "string": "Schedule"
         },
-		{
-            "language_code":"es_es",
-            "string" : "Solo está habilitado si selecciona <code>schedule</code> en la configuración <a href=\"#ARPSCAN_RUN\"><code>ARPSCAN_RUN</code></a>. Asegúrese de ingresar la programación en el formato similar a cron correcto (por ejemplo, valide en <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). Por ejemplo, ingresar <code>*/3 * * * *</code> ejecutará el escaneo cada 3 minutos. Se ejecutará la PRÓXIMA vez que pase el tiempo. <br/> Se recomienda utilizar el mismo intervalo de programación para todos los complementos que analizan su red."
-        }]
+        {
+          "language_code": "de_de",
+          "string": "Zeitplan"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Only enabled if you select <code>schedule</code> in the <a href=\"#ARPSCAN_RUN\"><code>ARPSCAN_RUN</code> setting</a>. Make sure you enter the schedule in the correct cron-like format (e.g. validate at <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). For example entering <code>*/3 * * * *</code> will run the scan every 3 minutes. Will be run NEXT time the time passes. <br/> It's recommended to use the same schedule interval for all plugins responsible for discovering new devices."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Solo está habilitado si selecciona <code>schedule</code> en la configuración <a href=\"#ARPSCAN_RUN\"><code>ARPSCAN_RUN</code></a>. Asegúrese de ingresar la programación en el formato similar a cron correcto (por ejemplo, valide en <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). Por ejemplo, ingresar <code>*/3 * * * *</code> ejecutará el escaneo cada 3 minutos. Se ejecutará la PRÓXIMA vez que pase el tiempo. <br/> Se recomienda utilizar el mismo intervalo de programación para todos los complementos que analizan su red."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Nur aktiv, wenn <code>schedule</code> in der <a href=\"#ARPSCAN_RUN\"><code>ARPSCAN_RUN</code> Einstellung</a> ausgewählt wurde. Sichergehen, dass das Intervall in einem korrekten cron-ähnlichen Format angegeben wurde (z.B. auf <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a> testen). <code>*/3 * * * *</code> würde den Scan alle 3 Minuten starten. Wird erst beim NÄCHSTEN Intervall ausgeführt. <br/>Es wird empfohlen, das Intervall aller Plugins, welche nach neuen Geräten suchen, auf den gleichen Wert zu setzen."
+        }
+      ]
     },
     {
-        "function": "WATCH",
-        "type": "text.multiselect",
-        "default_value":["Watched_Value1", "Watched_Value2"],
-        "options": ["Watched_Value1","Watched_Value2","Watched_Value3","Watched_Value4"],
-        "localized": ["name", "description"],
-        "name" :[{
-            "language_code":"en_us",
-            "string" : "Watched"
+      "function": "WATCH",
+      "type": "text.multiselect",
+      "default_value": [
+        "Watched_Value1",
+        "Watched_Value2"
+      ],
+      "options": [
+        "Watched_Value1",
+        "Watched_Value2",
+        "Watched_Value3",
+        "Watched_Value4"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Watched"
         },
-		{
-            "language_code":"es_es",
-            "string" : "Watched"
-        }] ,
-        "description":[{
-            "language_code":"en_us",
-            "string" : "Send a notification if selected values change. Use <code>CTRL + Click</code> to select/deselect. <ul> <li><code>Watched_Value1</code> is IP</li><li><code>Watched_Value2</code> is Vendor</li><li><code>Watched_Value3</code> is Interface </li><li><code>Watched_Value4</code> is N/A </li></ul>"
+        {
+          "language_code": "es_es",
+          "string": "Watched"
         },
-		{
-            "language_code":"es_es",
-            "string" : "Envía una notificación si los valores seleccionados cambian. Utilice <code>CTRL + clic</code> para seleccionar/deseleccionar. <ul> <li><code>Valor_observado1</code> es IP</li><li><code>Valor_observado2</code> es Proveedor</li><li><code>Valor_observado3</code> es Interfaz </li><li><code>Valor_observado4</code> es N/A </li></ul>"
-        }] 
+        {
+          "language_code": "de_de",
+          "string": "Überwacht"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Send a notification if selected values change. Use <code>CTRL + Click</code> to select/deselect. <ul> <li><code>Watched_Value1</code> is IP</li><li><code>Watched_Value2</code> is Vendor</li><li><code>Watched_Value3</code> is Interface </li><li><code>Watched_Value4</code> is N/A </li></ul>"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Envía una notificación si los valores seleccionados cambian. Utilice <code>CTRL + clic</code> para seleccionar/deseleccionar. <ul> <li><code>Valor_observado1</code> es IP</li><li><code>Valor_observado2</code> es Proveedor</li><li><code>Valor_observado3</code> es Interfaz </li><li><code>Valor_observado4</code> es N/A </li></ul>"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Sende eine Benachrichtigung, wenn ein ausgwählter Wert sich ändert. <code>STRG + klicken</code> zum aus-/abwählen. <ul> <li><code>Watched_Value1</code> ist die IP</li><li><code>Watched_Value2</code> ist der Hersteller</li><li><code>Watched_Value3</code> ist das Interface </li><li><code>Watched_Value4</code> ist nicht in Verwendung </li></ul>"
+        }
+      ]
     },
     {
       "function": "REPORT_ON",
       "type": "text.multiselect",
-      "default_value": ["new"],
-      "options": ["new", "watched-changed", "watched-not-changed", "missing-in-last-scan"],
-      "localized": ["name", "description"],
+      "default_value": [
+        "new"
+      ],
+      "options": [
+        "new",
+        "watched-changed",
+        "watched-not-changed",
+        "missing-in-last-scan"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
       "name": [
         {
           "language_code": "en_us",
           "string": "Report on"
         },
-	    {
+        {
           "language_code": "es_es",
           "string": "Informar sobre"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Benachrichtige wenn"
         }
       ],
       "description": [
@@ -205,67 +316,115 @@
         {
           "language_code": "es_es",
           "string": "Cuándo debe enviarse una notificación."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Wann Benachrichtigungen gesendet werden sollen."
+        }
+      ]
+    },
+    {
+      "function": "ARGS",
+      "type": "text",
+      "default_value": "sudo arp-scan --ignoredups --retry=6",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Arguments"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Arguments to run arps-scan with. Recommended and tested only with the setting: <br/> <code>sudo arp-scan --ignoredups --retry=6</code>."
         }
       ]
     }
   ],
-
-  "database_column_definitions": 
-  [          
+  "database_column_definitions": [
     {
       "column": "Object_PrimaryID",
       "mapped_to_column": "cur_MAC",
       "css_classes": "col-sm-2",
       "show": true,
       "type": "device_name_mac",
-      "default_value":"",
+      "default_value": "",
       "options": [],
-      "localized": ["name"],
-      "name":[{
-          "language_code":"en_us",
-          "string" : "MAC"
-          },
-		  {
-          "language_code":"es_es",
-          "string" : "MAC"
-          }]
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "MAC"
+        },
+        {
+          "language_code": "es_es",
+          "string": "MAC"
+        },
+        {
+          "language_code": "de_de",
+          "string": "MAC"
+        }
+      ]
     },
     {
-        "column": "Watched_Value1",
-        "mapped_to_column": "cur_IP", 
-        "css_classes": "col-sm-2",
-        "show": true,
-        "type": "device_ip",            
-        "default_value":"",
-        "options": [],
-        "localized": ["name"],
-        "name":[{
-            "language_code":"en_us",
-            "string" : "IP"
-            },
-			{
-            "language_code":"es_es",
-            "string" : "IP"
-            }]
+      "column": "Watched_Value1",
+      "mapped_to_column": "cur_IP",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "device_ip",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "IP"
+        },
+        {
+          "language_code": "es_es",
+          "string": "IP"
+        },
+        {
+          "language_code": "de_de",
+          "string": "IP"
+        }
+      ]
     },
     {
-        "column": "Watched_Value2",
-        "mapped_to_column": "cur_Vendor", 
-        "css_classes": "col-sm-2",
-        "show": true,
-        "type": "label",            
-        "default_value":"",
-        "options": [],
-        "localized": ["name"],
-        "name":[{
-            "language_code":"en_us",
-            "string" : "Vendor"
-            },
-			{
-            "language_code":"es_es",
-            "string" : "Proveedor"
-            }]
-    } ,
+      "column": "Watched_Value2",
+      "mapped_to_column": "cur_Vendor",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Vendor"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Proveedor"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Hersteller"
+        }
+      ]
+    },
     {
       "column": "Dummy",
       "mapped_to_column": "cur_ScanMethod",
@@ -275,87 +434,117 @@
       "css_classes": "col-sm-2",
       "show": true,
       "type": "label",
-      "default_value":"",
+      "default_value": "",
       "options": [],
-      "localized": ["name"],
-      "name":[{
-          "language_code":"en_us",
-          "string" : "Scan method"
-          },
-          {
-          "language_code":"es_es",
-          "string" : "Método de escaneo"
-          }]
-    } ,
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Scan method"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Método de escaneo"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Scanmethode"
+        }
+      ]
+    },
     {
       "column": "DateTimeCreated",
       "css_classes": "col-sm-2",
       "show": true,
       "type": "label",
-      "default_value":"",
+      "default_value": "",
       "options": [],
-      "localized": ["name"],
-      "name":[{
-          "language_code":"en_us",
-          "string" : "Created"
-          },
-		  {
-          "language_code":"es_es",
-          "string" : "Creado"
-          }]
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Created"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Creado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Erstellt"
+        }
+      ]
     },
     {
-        "column": "DateTimeChanged",        
-        "css_classes": "col-sm-2",
-        "show": true,
-        "type": "label",            
-        "default_value":"",
-        "options": [],
-        "localized": ["name"],
-        "name":[
-          {
-            "language_code":"en_us",
-            "string" : "Changed"
-          },
-          {
-            "language_code":"es_es",
-            "string" : "Cambiado"
-          }
-        ]
+      "column": "DateTimeChanged",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Changed"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Cambiado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Geändert"
+        }
+      ]
     },
     {
-        "column": "Status",
-        "css_classes": "col-sm-1",
-        "show": true,
-        "type": "replace",            
-        "default_value":"",
-        "options": [
-            {
-                "equals": "watched-not-changed",
-                "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
-            },
-            {
-                "equals": "watched-changed",
-                "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
-            },
-            {
-                "equals": "new",
-                "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
-            },
-            {
-                "equals": "missing-in-last-scan",
-                "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
-            }
-        ],
-        "localized": ["name"],
-        "name":[{
-            "language_code":"en_us",
-            "string" : "Status"
-            },
-    {
-            "language_code":"es_es",
-            "string" : "Estado"
-            }]
+      "column": "Status",
+      "css_classes": "col-sm-1",
+      "show": true,
+      "type": "replace",
+      "default_value": "",
+      "options": [
+        {
+          "equals": "watched-not-changed",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+        },
+        {
+          "equals": "watched-changed",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+        },
+        {
+          "equals": "new",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+        },
+        {
+          "equals": "missing-in-last-scan",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
+        }
+      ],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Status"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Estado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Status"
+        }
+      ]
     }
   ]
 }

front/plugins/arp_scan/script.py

@@ -12,9 +12,11 @@ from time import strftime
 sys.path.append("/home/pi/pialert/front/plugins")
 sys.path.append('/home/pi/pialert/pialert') 
 
-from plugin_helper import Plugin_Object, Plugin_Objects
+# pialert modules
+from database import DB
+from plugin_helper import Plugin_Object, Plugin_Objects, handleEmpty
 from logger import mylog, append_line_to_file
-from helper import timeNowTZ
+from helper import timeNowTZ, get_setting_value
 from const import logPath, pialertPath
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
@@ -63,6 +65,11 @@ def main():
     else:
         subnets_list = [userSubnetsParam]
 
+
+    # Create a database connection
+    db = DB()  # instance of class DB
+    db.open()
+    
     # Execute the ARP scanning process on the list of subnets (whether it's one or multiple subnets).
     # The function 'execute_arpscan' is assumed to be defined elsewhere in the code.
     unique_devices = execute_arpscan(subnets_list)
@@ -70,14 +77,14 @@ def main():
 
     for device in unique_devices:
         plugin_objects.add_object(
-            primaryId=device['mac'],  # MAC (Device Name)
-            secondaryId=device['ip'],  # IP Address            
-            watched1=device['ip'],    # Device Name
-            watched2=device.get('hw', ''),  # Vendor (assuming it's in the 'hw' field)
-            watched3=device.get('interface', ''),  # Add the interface             
-            watched4='',
-            extra='arp-scan', 
-            foreignKey="")
+            primaryId   = handleEmpty(device['mac']),  # MAC (Device Name)
+            secondaryId = handleEmpty(device['ip']),  # IP Address            
+            watched1    = handleEmpty(device['ip']),    # Device Name
+            watched2    = handleEmpty(device.get('hw', '')),  # Vendor (assuming it's in the 'hw' field)
+            watched3    = handleEmpty(device.get('interface', '')),  # Add the interface             
+            watched4    = '',
+            extra       = 'arp-scan', 
+            foreignKey  = "")
 
     plugin_objects.write_result_file()
 
@@ -132,7 +139,7 @@ def execute_arpscan(userSubnets):
 
 def execute_arpscan_on_interface(interface):
     # Prepare command arguments
-    arpscan_args = ['sudo', 'arp-scan', '--ignoredups', '--retry=6'] + interface.split()
+    arpscan_args = get_setting_value('ARPSCAN_ARGS').split() + interface.split()
 
     # Execute command
     try:

front/plugins/csv_backup/config.json

@@ -1,6 +1,7 @@
 {
   "code_name": "csv_backup",
   "unique_prefix": "CSVBCKP",
+  "plugin_type": "system",
   "enabled": true,
   "data_source": "script",  
   "show_ui": false,
@@ -24,14 +25,6 @@
     {
       "language_code": "en_us",
       "string": "<i class=\"fa-solid fa-save\"></i>"
-    },
-    {
-      "language_code": "es_es",
-      "string": "<i class=\"fa-solid fa-save\"></i>"
-    },
-    {
-      "language_code": "de_de",
-      "string": "<i class=\"fa-solid fa-save\"></i>"
     }
   ],
   "description": [
@@ -63,6 +56,7 @@
   "settings": [
     {
       "function": "RUN",      
+      "events": ["run"],      
       "type": "text.select",            
       "default_value":"schedule",
       "options": ["disabled", "once", "schedule", "always_after_scan", "on_new_device"],
@@ -109,7 +103,7 @@
         },
         {
           "language_code": "de_de",
-          "string": "Kommando"
+          "string": "Befehl"
         }	        
       ],
       "description": [

front/plugins/db_cleanup/README.md

@@ -0,0 +1,7 @@
+## Overview
+
+Plugin to run regular database cleanup tasks. It is strongly recommended to have an hourly or at least daily schedule running.
+
+### Usage
+
+- Check the Settings page for details.

front/plugins/db_cleanup/config.json

@@ -0,0 +1,182 @@
+{
+  "code_name": "db_cleanup",
+  "unique_prefix": "DBCLNP",
+  "plugin_type": "system",
+  "enabled": true,
+  "data_source": "script",  
+  "show_ui": false,
+  "localized": ["display_name", "description", "icon"],
+
+  "display_name": [
+    {
+      "language_code": "en_us",
+      "string": "DB cleanup"
+    }
+  ],
+  "icon": [
+    {
+      "language_code": "en_us",
+      "string": "<i class=\"fa-solid fa-broom\"></i>"
+    }
+  ],
+  "description": [
+    {
+      "language_code": "en_us",
+      "string": "A plugin to schedule database cleanup & upkeep tasks."
+    }  
+  ],
+    "params" : [{
+      "name"  : "pluginskeephistory",
+      "type"  : "setting",
+      "value" : "PLUGINS_KEEP_HIST"
+    },
+    {
+      "name"  : "daystokeepevents",
+      "type"  : "setting",
+      "value" : "DAYS_TO_KEEP_EVENTS"    
+    },
+    {
+      "name"  : "hourstokeepnewdevice",
+      "type"  : "setting",
+      "value" : "HRS_TO_KEEP_NEWDEV"
+    },
+    {
+      "name"  : "pholuskeepdays",
+      "type"  : "setting",
+      "value" : "PHOLUS_DAYS_DATA"
+    }
+  ],  
+
+  "settings": [
+    {
+      "function": "RUN",   
+      "events": ["run"],         
+      "type": "text.select",            
+      "default_value":"schedule",
+      "options": ["disabled", "once", "schedule", "always_after_scan"],
+      "localized": ["name", "description"],
+      "name" :[{
+          "language_code":"en_us",
+          "string" : "When to run"
+      },
+      {
+          "language_code":"es_es",
+          "string" : "Cuándo ejecutar"
+      },
+      {
+          "language_code":"de_de",
+          "string" : "Wann laufen"
+      }],
+      "description": [{
+          "language_code":"en_us",
+          "string" : "When the cleanup should be performed. An hourly or daily <code>SCHEDULE</code> is a good option."
+      }]
+  },    
+    {
+      "function": "CMD",
+      "type": "readonly",
+      "default_value": "python3 /home/pi/pialert/front/plugins/db_cleanup/script.py pluginskeephistory={pluginskeephistory} hourstokeepnewdevice={hourstokeepnewdevice} daystokeepevents={daystokeepevents} pholuskeepdays={pholuskeepdays}",
+      "options": [],
+      "localized": ["name", "description"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Command"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Comando"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Befehl"
+        }	        
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Command to run. This can not be changed"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Comando a ejecutar. Esto no se puede cambiar"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Befehl zum Ausführen. Dies kann nicht geändert werden"
+        }	        
+      ]
+    },
+    {
+      "function": "RUN_SCHD",
+      "type": "text",
+      "default_value":"*/30 * * * *",
+      "options": [],
+      "localized": ["name", "description"],
+      "name" : [{
+          "language_code":"en_us",
+          "string" : "Schedule"
+      },
+      {
+          "language_code":"es_es",
+          "string" : "Schedule"
+      },
+      {
+          "language_code":"de_de",
+          "string" : "Schedule"
+      }],
+      "description": [{
+          "language_code":"en_us",
+          "string" : "Only enabled if you select <code>schedule</code> in the <a href=\"#DBCLNP_RUN\"><code>DBCLNP_RUN</code> setting</a>. Make sure you enter the schedule in the correct cron-like format (e.g. validate at <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). For example entering <code>0 4 * * *</code> will run the scan after 4 am in the <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</code> you set above</a>. Will be run NEXT time the time passes."
+      },
+      {
+          "language_code":"es_es",
+          "string" : "Solo está habilitado si selecciona <code>schedule</code> en la configuración <a href=\"#DBCLNP_RUN\"><code>DBCLNP_RUN</code></a>. Asegúrese de ingresar la programación en el formato similar a cron correcto (por ejemplo, valide en <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). Por ejemplo, ingresar <code>0 4 * * *</code> ejecutará el escaneo después de las 4 a.m. en el <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</ código> que configuró arriba</a>. Se ejecutará la PRÓXIMA vez que pase el tiempo."
+      },
+      {
+          "language_code":"de_de",
+          "string" : "Nur aktiviert, wenn Sie <code>schedule</code> in der <a href=\"#DBCLNP_RUN\"><code>DBCLNP_RUN</code>-Einstellung</a> auswählen. Stellen Sie sicher, dass Sie den Zeitplan im richtigen Cron-ähnlichen Format eingeben (z. B. validieren unter <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). Wenn Sie beispielsweise <code>0 4 * * *</code> eingeben, wird der Scan nach 4 Uhr morgens in der <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</ ausgeführt. Code> den Sie oben festgelegt haben</a>. Wird das NÄCHSTE Mal ausgeführt, wenn die Zeit vergeht."
+      }]
+  },    
+    {
+      "function": "RUN_TIMEOUT",
+      "type": "integer",
+      "default_value": 30,
+      "options": [],
+      "localized": ["name", "description"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Run timeout"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Tiempo límite de ejecución"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Zeitüberschreitung"
+        }	        
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Maximale Zeit in Sekunden, die auf den Abschluss des Skripts gewartet werden soll. Bei Überschreitung dieser Zeit wird das Skript abgebrochen."
+        }        
+      ]
+    }
+  ],
+
+  "database_column_definitions": 
+  [          
+           
+  ]
+}

front/plugins/db_cleanup/script.py

@@ -0,0 +1,168 @@
+#!/usr/bin/env python
+# test script by running:
+# /home/pi/pialert/front/plugins/db_cleanup/script.py pluginskeephistory=250 hourstokeepnewdevice=48 daystokeepevents=90 pholuskeepdays=30
+
+import os
+import pathlib
+import argparse
+import sys
+import hashlib
+import csv
+import sqlite3
+from io import StringIO
+from datetime import datetime
+
+sys.path.append("/home/pi/pialert/front/plugins")
+sys.path.append('/home/pi/pialert/pialert') 
+
+from plugin_helper import Plugin_Object, Plugin_Objects, decodeBase64
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ, get_setting_value
+from const import logPath, pialertPath
+
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+LOG_FILE = os.path.join(CUR_PATH, 'script.log')
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+def main():
+    
+    parser = argparse.ArgumentParser(description='DB cleanup tasks')
+    parser.add_argument('pluginskeephistory', action="store", help="TBC")
+    parser.add_argument('hourstokeepnewdevice', action="store", help="TBC")
+    parser.add_argument('daystokeepevents', action="store", help="TBC")
+    parser.add_argument('pholuskeepdays', action="store", help="TBC")
+    
+    values = parser.parse_args()
+
+    PLUGINS_KEEP_HIST     = int(values.pluginskeephistory.split('=')[1])
+    HRS_TO_KEEP_NEWDEV    = int(values.hourstokeepnewdevice.split('=')[1])
+    DAYS_TO_KEEP_EVENTS   = int(values.daystokeepevents.split('=')[1])
+    PHOLUS_DAYS_DATA      = int(values.pholuskeepdays.split('=')[1])
+
+    mylog('verbose', ['[DBCLNP] In script'])     
+
+
+    # Execute cleanup/upkeep    
+    cleanup_database('/home/pi/pialert/db/pialert.db', DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP_NEWDEV, PLUGINS_KEEP_HIST)
+    
+    mylog('verbose', ['[DBCLNP] Cleanup complete file '])   
+    
+    return 0
+
+#===============================================================================
+# Cleanup / upkeep database
+#===============================================================================
+def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP_NEWDEV, PLUGINS_KEEP_HIST):
+    """
+    Cleaning out old records from the tables that don't need to keep all data.
+    """
+
+    mylog('verbose', ['[DBCLNP] Upkeep Database:' ])
+
+    # Connect to the PiAlert SQLite database
+    conn    = sqlite3.connect(dbPath)
+    cursor  = conn.cursor()
+
+    # Cleanup Online History
+    mylog('verbose', ['[DBCLNP] Online_History: Delete all but keep latest 150 entries'])
+    cursor.execute ("""DELETE from Online_History where "Index" not in (
+                            SELECT "Index" from Online_History 
+                            order by Scan_Date desc limit 150)""")
+    mylog('verbose', ['[DBCLNP] Optimize Database'])
+    # Cleanup Events
+    mylog('verbose', [f'[DBCLNP] Events: Delete all older than {str(DAYS_TO_KEEP_EVENTS)} days (DAYS_TO_KEEP_EVENTS setting)'])
+    cursor.execute (f"""DELETE FROM Events 
+                            WHERE eve_DateTime <= date('now', '-{str(DAYS_TO_KEEP_EVENTS)} day')""")
+                            
+    # Trim Plugins_History entries to less than PLUGINS_KEEP_HIST setting per unique "Plugin" column entry
+    mylog('verbose', [f'[DBCLNP] Plugins_History: Trim Plugins_History entries to less than {str(PLUGINS_KEEP_HIST)} per Plugin (PLUGINS_KEEP_HIST setting)'])
+
+    # Build the SQL query to delete entries that exceed the limit per unique "Plugin" column entry
+    delete_query = f"""DELETE FROM Plugins_History 
+                            WHERE "Index" NOT IN (
+                                SELECT "Index"
+                                FROM (
+                                    SELECT "Index", 
+                                        ROW_NUMBER() OVER(PARTITION BY "Plugin" ORDER BY DateTimeChanged DESC) AS row_num
+                                    FROM Plugins_History
+                                ) AS ranked_objects
+                                WHERE row_num <= {str(PLUGINS_KEEP_HIST)}
+                            );"""
+
+    cursor.execute(delete_query)
+
+    
+    # Trim Notifications entries to less than DBCLNP_NOTIFI_HIST setting
+
+    histCount = get_setting_value('DBCLNP_NOTIFI_HIST')
+
+    mylog('verbose', [f'[DBCLNP] Plugins_History: Trim Notifications entries to less than {histCount}'])
+
+    # Build the SQL query to delete entries 
+    delete_query = f"""DELETE FROM Notifications 
+                            WHERE "Index" NOT IN (
+                               SELECT "Index"
+                                        FROM (
+                                            SELECT "Index", 
+                                                ROW_NUMBER() OVER(PARTITION BY "Notifications" ORDER BY DateTimeCreated DESC) AS row_num
+                                            FROM Notifications
+                                        ) AS ranked_objects
+                                        WHERE row_num <= {histCount}
+                            );"""
+
+    cursor.execute(delete_query)
+
+    # Cleanup Pholus_Scan
+    if PHOLUS_DAYS_DATA != 0:
+        mylog('verbose', ['[DBCLNP] Pholus_Scan: Delete all older than ' + str(PHOLUS_DAYS_DATA) + ' days (PHOLUS_DAYS_DATA setting)'])
+        # todo: improvement possibility: keep at least N per mac
+        cursor.execute (f"""DELETE FROM Pholus_Scan 
+                                WHERE Time <= date('now', '-{str(PHOLUS_DAYS_DATA)} day')""") 
+    # Cleanup New Devices
+    if HRS_TO_KEEP_NEWDEV != 0:
+        mylog('verbose', [f'[DBCLNP] Devices: Delete all New Devices older than {str(HRS_TO_KEEP_NEWDEV)} hours (HRS_TO_KEEP_NEWDEV setting)'])            
+        cursor.execute (f"""DELETE FROM Devices 
+                                WHERE dev_NewDevice = 1 AND dev_FirstConnection < date('now', '+{str(HRS_TO_KEEP_NEWDEV)} hour')""") 
+
+
+    # De-dupe (de-duplicate) from the Plugins_Objects table 
+    # TODO This shouldn't be necessary - probably a concurrency bug somewhere in the code :(        
+    mylog('verbose', ['[DBCLNP] Plugins_Objects: Delete all duplicates'])
+    cursor.execute("""
+        DELETE FROM Plugins_Objects
+        WHERE rowid > (
+            SELECT MIN(rowid) FROM Plugins_Objects p2
+            WHERE Plugins_Objects.Plugin = p2.Plugin
+            AND Plugins_Objects.Object_PrimaryID = p2.Object_PrimaryID
+            AND Plugins_Objects.Object_SecondaryID = p2.Object_SecondaryID
+            AND Plugins_Objects.UserData = p2.UserData
+        )
+    """)
+
+    # De-Dupe (de-duplicate - remove duplicate entries) from the Pholus_Scan table
+    mylog('verbose', ['[DBCLNP] Pholus_Scan: Delete all duplicates'])
+    cursor.execute ("""DELETE  FROM Pholus_Scan
+                    WHERE rowid > (
+                    SELECT MIN(rowid) FROM Pholus_Scan p2
+                    WHERE Pholus_Scan.MAC = p2.MAC
+                    AND Pholus_Scan.Value = p2.Value
+                    AND Pholus_Scan.Record_Type = p2.Record_Type
+                    );""")
+
+    conn.commit()
+
+    # Shrink DB
+    mylog('verbose', ['[DBCLNP] Shrink Database'])
+    cursor.execute ("VACUUM;")
+
+    # Close the database connection
+    conn.close()
+    
+    
+
+#===============================================================================
+# BEGIN
+#===============================================================================
+if __name__ == '__main__':
+    main()

front/plugins/ddns_update/README.md

@@ -0,0 +1,7 @@
+## Overview
+
+Plugin to run regular DDNS update tasks.
+
+### Usage
+
+- Check the Settings page for details.

front/plugins/ddns_update/README_DE.md

@@ -0,0 +1,7 @@
+## Übersicht
+
+Ein Plugin zur regelmäßigen Aktualisierung eines DynDNS-Eintrags.
+
+### Verwendung
+
+- Einstellungen-Seite für Details ansehen.

front/plugins/ddns_update/config.json

@@ -0,0 +1,669 @@
+{
+  "code_name": "ddns_update",
+  "unique_prefix": "DDNS",
+  "plugin_type": "system",
+  "enabled": true,
+  "data_filters": [
+    {
+      "compare_column": "Object_PrimaryID",
+      "compare_operator": "==",
+      "compare_field_id": "txtMacFilter",
+      "compare_js_template": "'{value}'.toString()",
+      "compare_use_quotes": true
+    }
+  ],
+  "data_source": "script",
+  "show_ui": true,
+  "localized": [
+    "display_name",
+    "description",
+    "icon"
+  ],
+  "display_name": [
+    {
+      "language_code": "en_us",
+      "string": "DDNS update"
+    },
+    {
+      "language_code": "de_de",
+      "string": "DDNS-Aktualisierung"
+    }
+  ],
+  "icon": [
+    {
+      "language_code": "en_us",
+      "string": "<i class=\"fa-solid fa-globe\"></i>"
+    },
+    {
+      "language_code": "de_de",
+      "string": "<i class=\"fa-solid fa-globe\"></i>"
+    }
+  ],
+  "description": [
+    {
+      "language_code": "en_us",
+      "string": "A plugin update the DDNS record."
+    },
+    {
+      "language_code": "de_de",
+      "string": "Ein Plugin zur regelmäßigen Aktualisierung eines DynDNS-Eintrags."
+    }
+  ],
+  "params": [
+    {
+      "name": "prev_ip",
+      "type": "sql",
+      "value": "SELECT dev_LastIP FROM Devices WHERE dev_MAC = 'Internet' "
+    },
+    {
+      "name": "DDNS_UPDATE_URL",
+      "type": "setting",
+      "value": "DDNS_UPDATE_URL"
+    },
+    {
+      "name": "DDNS_USER",
+      "type": "setting",
+      "value": "DDNS_USER"
+    },
+    {
+      "name": "DDNS_PASSWORD",
+      "type": "setting",
+      "value": "DDNS_PASSWORD"
+    },
+    {
+      "name": "DDNS_DOMAIN",
+      "type": "setting",
+      "value": "DDNS_DOMAIN"
+    }
+  ],
+  "settings": [
+    {
+      "function": "RUN",
+      "events": [
+        "run"
+      ],
+      "type": "text.select",
+      "default_value": "disabled",
+      "options": [
+        "disabled",
+        "once",
+        "schedule",
+        "always_after_scan"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "When to run"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Cuándo ejecutar"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Wann ausführen"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "When the plugin should run. An hourly or daily <code>SCHEDULE</code> is a good option."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Wann das Plugin ausgeführt werden soll. Eine stündliche oder tägliche <code>SCHEDULE</code> wird empfohlen."
+        }
+      ]
+    },
+    {
+      "function": "CMD",
+      "type": "readonly",
+      "default_value": "python3 /home/pi/pialert/front/plugins/ddns_update/script.py prev_ip={prev_ip}  DDNS_UPDATE_URL={DDNS_UPDATE_URL} DDNS_USER={DDNS_USER} DDNS_PASSWORD={DDNS_PASSWORD} DDNS_DOMAIN={DDNS_DOMAIN} ",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Command"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Comando"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Befehl"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Command to run. This can not be changed"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Comando a ejecutar. Esto no se puede cambiar"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Befehl zum Ausführen. Dies kann nicht geändert werden"
+        }
+      ]
+    },
+    {
+      "function": "RUN_SCHD",
+      "type": "text",
+      "default_value": "*/5 * * * *",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Schedule"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Schedule"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Zeitplan"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Only enabled if you select <code>schedule</code> in the <a href=\"#DDNS_RUN\"><code>DDNS_RUN</code> setting</a>. Make sure you enter the schedule in the correct cron-like format (e.g. validate at <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). For example entering <code>0 4 * * *</code> will run the scan after 4 am in the <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</code> you set above</a>. Will be run NEXT time the time passes."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Solo está habilitado si selecciona <code>schedule</code> en la configuración <a href=\"#DDNS_RUN\"><code>DDNS_RUN</code></a>. Asegúrese de ingresar la programación en el formato similar a cron correcto (por ejemplo, valide en <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). Por ejemplo, ingresar <code>0 4 * * *</code> ejecutará el escaneo después de las 4 a.m. en el <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</ código> que configuró arriba</a>. Se ejecutará la PRÓXIMA vez que pase el tiempo."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Nur aktiv, wenn <code>schedule</code> in der <a href=\"#DDNS_RUN\"><code>DDNS_RUN</code> Einstellung</a> ausgewählt wurde. Sichergehen, dass das Intervall in einem korrekten cron-ähnlichen Format angegeben wurde (z.B. auf <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a> testen). <code>0 4 * * *</code> würde den Scan täglich um 4 Uhr in der <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\">oben ausgewählten <code>TIMEZONE</code></a> starten. Wird erst beim NÄCHSTEN Intervall ausgeführt."
+        }
+      ]
+    },
+    {
+      "function": "RUN_TIMEOUT",
+      "type": "integer",
+      "default_value": 30,
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Run timeout"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Tiempo límite de ejecución"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Zeitlimit"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Maximale Zeit in Sekunden, die auf den Abschluss des Skripts gewartet werden soll. Bei Überschreitung dieser Zeit wird das Skript abgebrochen."
+        }
+      ]
+    },
+    {
+      "function": "DOMAIN",
+      "type": "text",
+      "default_value": "your_domain.freeddns.org",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "DynDNS domain URL"
+        },
+        {
+          "language_code": "es_es",
+          "string": "URL del dominio DynDNS"
+        },
+        {
+          "language_code": "de_de",
+          "string": "DynDNS Domain URL"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "DynDNS host URL (do not include http:// or https://)."
+        },
+        {
+          "language_code": "es_es",
+          "string": "URL del host DynDNS (no incluya http:// o https://)."
+        },
+        {
+          "language_code": "de_de",
+          "string": "DynDNS Host URL (do not include http:// or https://)."
+        }
+      ]
+    },
+    {
+      "function": "USER",
+      "type": "text",
+      "default_value": "dynu_user",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "DynDNS user"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Usuario de DynDNS"
+        },
+        {
+          "language_code": "de_de",
+          "string": "DynDNS Benutzer"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The username used to login to the DynDNS service (sometimes a full email address)."
+        },
+        {
+          "language_code": "es_es",
+          "string": "El nombre de usuario utilizado para iniciar sesión en el servicio DynDNS (a veces, una dirección de correo electrónico completa)."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Benutzername, welcher zum Login beim DynDNS-Service verwendet wird (manchmal die E-Mail-Adresse)."
+        }
+      ]
+    },
+    {
+      "function": "PASSWORD",
+      "type": "password",
+      "default_value": "A0000000B0000000C0000000D0000000",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "DynDNS password"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Contraseña de DynDNS"
+        },
+        {
+          "language_code": "de_de",
+          "string": "DynDNS Passwort"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The DynDNS service access password"
+        },
+        {
+          "language_code": "es_es",
+          "string": "La contraseña de acceso al servicio DynDNS."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Passwort, welches zum Login beim DynDNS-Service verwendet wird."
+        }
+      ]
+    },
+    {
+      "function": "UPDATE_URL",
+      "type": "text",
+      "default_value": "https://api.dynu.com/nic/update?",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "DynDNS update URL"
+        },
+        {
+          "language_code": "es_es",
+          "string": "URL de actualización de DynDNS"
+        },
+        {
+          "language_code": "de_de",
+          "string": "DynDNS Aktualisierungs-URL"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Update URL starting with <code>http://</code> or <code>https://</code>."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Actualice la URL que comienza con <code>http://</code> o <code>https://</code>."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Aktualisierungs-URL beginnend mit <code>http://</code> oder <code>https://</code>."
+        }
+      ]
+    },
+    {
+      "function": "WATCH",
+      "type": "text.multiselect",
+      "default_value": [
+        "Watched_Value1"
+      ],
+      "options": [
+        "Watched_Value1",
+        "Watched_Value2",
+        "Watched_Value3",
+        "Watched_Value4"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Watched"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Visto"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Überwacht"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Send a notification if selected values change. Use <code>CTRL + Click</code> to select/deselect. <ul> <li><code>Watched_Value1</code> is Previous IP (not recommended)</li><li><code>Watched_Value2</code> unused</li><li><code>Watched_Value3</code> unused </li><li><code>Watched_Value4</code> unused </li></ul>"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Sende eine Benachrichtigung, wenn ein ausgwählter Wert sich ändert. <code>STRG + klicken</code> zum aus-/abwählen. <ul> <li><code>Watched_Value1</code> ist die Vorige IP (nicht empfohlen)</li><li><code>Watched_Value2</code> ist nicht in Verwendung</li><li><code>Watched_Value3</code> ist nicht in Verwendung </li><li><code>Watched_Value4</code> ist nicht in Verwendung </li></ul>"
+        }
+      ]
+    },
+    {
+      "function": "REPORT_ON",
+      "type": "text.multiselect",
+      "default_value": [
+        "new",
+        "watched-changed"
+      ],
+      "options": [
+        "new",
+        "watched-changed",
+        "watched-not-changed",
+        "missing-in-last-scan"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Report on"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Informar sobre"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Benachrichtige wenn"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Send a notification only on these statuses. <code>new</code> means a new unique (unique combination of PrimaryId and SecondaryId) object was discovered. <code>watched-changed</code> means that selected <code>Watched_ValueN</code> columns changed."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Envíe una notificación solo en estos estados. <code>new</code> significa que se descubrió un nuevo objeto único (una combinación única de PrimaryId y SecondaryId). <code>watched-changed</code> significa que las columnas <code>Watched_ValueN</code> seleccionadas cambiaron."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Benachrichtige nur bei diesen Status. <code>new</code> bedeutet ein neues eindeutiges (einzigartige Kombination aus PrimaryId und SecondaryId) Objekt wurde erkennt. <code>watched-changed</code> bedeutet eine ausgewählte <code>Watched_ValueN</code>-Spalte hat sich geändert."
+        }
+      ]
+    }
+  ],
+  "database_column_definitions": [
+    {
+      "column": "Object_PrimaryID",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "device_name_mac",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "MAC"
+        },
+        {
+          "language_code": "es_es",
+          "string": "MAC"
+        },
+        {
+          "language_code": "de_de",
+          "string": "MAC"
+        }
+      ]
+    },
+    {
+      "column": "Object_SecondaryID",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "device_ip",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "IP"
+        },
+        {
+          "language_code": "es_es",
+          "string": "IP"
+        },
+        {
+          "language_code": "de_de",
+          "string": "IP"
+        }
+      ]
+    },
+    {
+      "column": "Watched_Value1",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Extra"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Extra"
+        }
+      ]
+    },
+    {
+      "column": "Dummy",
+      "mapped_to_column_data": {
+        "value": "DDNS"
+      },
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Scan method"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Método de escaneo"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Scanmethode"
+        }
+      ]
+    },
+    {
+      "column": "DateTimeCreated",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Created"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Creado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Erstellt"
+        }
+      ]
+    },
+    {
+      "column": "DateTimeChanged",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Changed"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Cambiado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Geändert"
+        }
+      ]
+    },
+    {
+      "column": "Status",
+      "css_classes": "col-sm-1",
+      "show": true,
+      "type": "replace",
+      "default_value": "",
+      "options": [
+        {
+          "equals": "watched-not-changed",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+        },
+        {
+          "equals": "watched-changed",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+        },
+        {
+          "equals": "new",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+        },
+        {
+          "equals": "missing-in-last-scan",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
+        }
+      ],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Status"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Estado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Status"
+        }
+      ]
+    }
+  ]
+}

front/plugins/ddns_update/script.py

@@ -0,0 +1,148 @@
+#!/usr/bin/env python
+# test script by running:
+# /home/pi/pialert/front/plugins/internet_ip/script.py TBD
+
+import os
+import pathlib
+import argparse
+import sys
+import hashlib
+import csv
+import subprocess
+import re
+import base64
+import sqlite3
+from io import StringIO
+from datetime import datetime
+
+sys.path.append("/home/pi/pialert/front/plugins")
+sys.path.append('/home/pi/pialert/pialert') 
+
+from plugin_helper import Plugin_Object, Plugin_Objects, decodeBase64
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ, check_IP_format
+from const import logPath, pialertPath, fullDbPath
+
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+LOG_FILE = os.path.join(CUR_PATH, 'script.log')
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+pluginName = 'DDNS'
+
+def main():
+
+    mylog('verbose', [f'[{pluginName}] In script'])     
+    
+    parser = argparse.ArgumentParser(description='Check internet connectivity and IP')
+    
+    parser.add_argument('prev_ip', action="store", help="Previous IP address to compare against the current IP")    
+    parser.add_argument('DDNS_UPDATE_URL', action="store", help="URL for updating Dynamic DNS (DDNS)")
+    parser.add_argument('DDNS_USER', action="store", help="Username for Dynamic DNS (DDNS) authentication")
+    parser.add_argument('DDNS_PASSWORD', action="store", help="Password for Dynamic DNS (DDNS) authentication")
+    parser.add_argument('DDNS_DOMAIN', action="store", help="Dynamic DNS (DDNS) domain name")
+    
+
+    values = parser.parse_args()
+
+    PREV_IP         = values.prev_ip.split('=')[1]         
+    DDNS_UPDATE_URL = values.DDNS_UPDATE_URL.split('=')[1]
+    DDNS_USER       = values.DDNS_USER.split('=')[1]
+    DDNS_PASSWORD   = values.DDNS_PASSWORD.split('=')[1]
+    DDNS_DOMAIN     = values.DDNS_DOMAIN.split('=')[1]       
+
+    # perform the new IP lookup and DDNS tasks if enabled
+    ddns_update( DDNS_UPDATE_URL, DDNS_USER, DDNS_PASSWORD, DDNS_DOMAIN, PREV_IP)   
+
+    mylog('verbose', [f'[{pluginName}] Finished '])   
+    
+    return 0
+  
+    
+#===============================================================================
+# INTERNET IP CHANGE
+#===============================================================================
+def ddns_update ( DDNS_UPDATE_URL, DDNS_USER, DDNS_PASSWORD, DDNS_DOMAIN, PREV_IP ):   
+    
+    # Update DDNS record if enabled and IP is different
+    # Get Dynamic DNS IP
+    
+    mylog('verbose', [f'[{pluginName}]    Retrieving Dynamic DNS IP'])
+    dns_IP = get_dynamic_DNS_IP(DDNS_DOMAIN)
+
+    # Check Dynamic DNS IP
+    if dns_IP == "" or dns_IP == "0.0.0.0" :
+        mylog('none', [f'[{pluginName}]     Error retrieving Dynamic DNS IP'])       
+
+    mylog('none', [f'[{pluginName}]    ', dns_IP])
+
+    # Check DNS Change
+    if dns_IP != PREV_IP :
+        mylog('none', [f'[{pluginName}]     Updating Dynamic DNS IP'])
+        message = set_dynamic_DNS_IP (DDNS_UPDATE_URL, DDNS_USER, DDNS_PASSWORD, DDNS_DOMAIN)
+        mylog('none', [f'[{pluginName}]        ', message])            
+
+    # plugin_objects = Plugin_Objects(RESULT_FILE)    
+    
+    # plugin_objects.add_object(
+    #     primaryId   = 'Internet',       # MAC (Device Name)
+    #     secondaryId = new_internet_IP,  # IP Address 
+    #     watched1    = f'Previous IP: {PREV_IP}',
+    #     watched2    = '',
+    #     watched3    = '',  
+    #     watched4    = '',
+    #     extra       = f'Previous IP: {PREV_IP}', 
+    #     foreignKey  = 'Internet')
+
+    # plugin_objects.write_result_file()    
+    
+
+#-------------------------------------------------------------------------------
+def get_dynamic_DNS_IP (DDNS_DOMAIN):
+
+    # Using supplied DNS server
+    dig_args = ['dig', '+short', DDNS_DOMAIN]
+
+    try:
+        # try runnning a subprocess
+        dig_output = subprocess.check_output (dig_args, universal_newlines=True)
+        mylog('none', [f'[{pluginName}] DIG output :', dig_output])
+    except subprocess.CalledProcessError as e:
+        # An error occured, handle it
+        mylog('none', [f'[{pluginName}] ⚠ ERROR - ', e.output])
+        dig_output = '' # probably no internet
+
+    # Check result is an IP
+    IP = check_IP_format (dig_output)
+
+    # Handle invalid response
+    if IP == '':
+        IP = '0.0.0.0'
+
+    return IP
+
+#-------------------------------------------------------------------------------
+def set_dynamic_DNS_IP (DDNS_UPDATE_URL, DDNS_USER, DDNS_PASSWORD, DDNS_DOMAIN):
+    try:
+        # try runnning a subprocess
+        # Update Dynamic IP
+        curl_output = subprocess.check_output (['curl', 
+                                                '-s',
+                                                DDNS_UPDATE_URL +
+                                                'username='  + DDNS_USER +
+                                                '&password=' + DDNS_PASSWORD +
+                                                '&hostname=' + DDNS_DOMAIN],
+                                                universal_newlines=True)
+    except subprocess.CalledProcessError as e:
+        # An error occured, handle it
+        mylog('none', [f'[{pluginName}] ⚠ ERROR - ',e.output])
+        curl_output = ""    
+    
+    return curl_output
+
+
+#===============================================================================
+# BEGIN
+#===============================================================================
+if __name__ == '__main__':
+    main()

front/plugins/dhcp_leases/README_DE.md

@@ -0,0 +1,51 @@
+## Übersicht
+
+Ein Plugin zum Importieren von Geräten aus dhcp.leases-Dateien.
+
+### Verwendung
+
+- Absolute Pfade der `dhcp.leases`-Dateien, welche importiert werden sollen, in der `DHCPLSS_paths_to_check`-Einstellung angeben.
+- Angegebene Pfade in der `DHCPLSS_paths_to_check`-Einstellung in der `docker-compose.yml`-Datei mapppen.
+
+#### Beispiel
+
+Auszug aus `docker-compose.yml`:
+
+```yaml
+    volumes:
+      ...
+      # mapping different dhcp.leases files
+      - /first/location/dhcp.leases:/mnt/dhcp1.leases
+      - /second/location/dhcp.leases:/mnt/dhcp2.leases      
+      ...
+```
+
+`DHCPLSS_paths_to_check`-Einstellung:
+
+```python
+DHCPLSS_paths_to_check = ['/mnt/dhcp1.leases','/mnt/dhcp2.leases']
+```
+
+### Notizen
+
+- Keine spezifische Konfiguration benötigt.
+
+- Dieses Plugin erwartet dhcp.leases-Dateien im **dhcp.leases**-Format, welches sich vom von PiHole genutzten Format unterscheidet. [dhcpd.leases(5) - Linux man page]( https://linux.die.net/man/5/dhcpd.leases#:~:text=This%20database%20is%20a%20free,file%20is%20the%20current%20one.)
+
+Beispiel Dateiformat:  _(nicht alle Zeilen werden benötigt)_
+
+```text
+lease 192.168.79.15 {
+  starts 0 2016/08/21 13:25:45;
+  ends 0 2016/08/21 19:25:45;
+  cltt 0 2016/08/21 13:25:45;
+  binding state active;
+  next binding state free;
+  rewind binding state free;
+  hardware ethernet 8c:1a:bf:11:00:ea;
+  uid "\001\214\032\277\021\000\352";
+  option agent.circuit-id 0:17;
+  option agent.remote-id c0:a8:9:5;
+  client-hostname "android-8182e21c852776e7";
+}  
+```

front/plugins/dhcp_leases/script.py

@@ -6,11 +6,12 @@ import subprocess
 import argparse
 import os
 import sys
+import chardet  
 
 sys.path.append("/home/pi/pialert/front/plugins")
 sys.path.append('/home/pi/pialert/pialert') 
 
-from plugin_helper import Plugin_Object, Plugin_Objects
+from plugin_helper import Plugin_Object, Plugin_Objects, handleEmpty, is_mac
 from logger import mylog
 from dhcp_leases import DhcpLeases
 
@@ -18,8 +19,12 @@ CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 LOG_FILE = os.path.join(CUR_PATH, 'script.log')
 RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
 
+
+pluginName= 'DHCPLSS'
+
+# -------------------------------------------------------------
 def main():    
-    mylog('verbose', ['[DHCPLSS] In script'])
+    mylog('verbose', [f'[{pluginName}] In script'])
     last_run_logfile = open(RESULT_FILE, 'a') 
     last_run_logfile.write("")
 
@@ -32,42 +37,59 @@ def main():
     if values.paths:
         for path in values.paths.split('=')[1].split(','): 
             plugin_objects = get_entries(path, plugin_objects)
-            mylog('verbose', [f'[DHCPLSS] {len(plugin_objects)} Entries found in "{path}"'])        
+            mylog('verbose', [f'[{pluginName}] {len(plugin_objects)} Entries found in "{path}"'])        
             
     plugin_objects.write_result_file()
 
+# -------------------------------------------------------------
 def get_entries(path, plugin_objects):
-    if 'pihole' in path:
 
-        
-        with open(path, 'r') as f:
-            for line in f:                
-                row = line.rstrip().split()
-                if len(row) == 5:
-                    plugin_objects.add_object(
-                        primaryId=row[1],    
-                        secondaryId=row[2],  
-                        watched1='True',   
-                        watched2=row[3],
-                        watched3=row[4],
-                        watched4='True',
-                        extra=path,
-                        foreignKey=row[1]
-                    )
+    # Check if the path exists
+    if not os.path.exists(path):
+        mylog('none', [f'[{pluginName}] ⚠ ERROR: "{path}" does not exist.'])
     else:
-        leases = DhcpLeases(path)
-        leasesList = leases.get()
-        for lease in leasesList:
-            plugin_objects.add_object(
-                primaryId=lease.ethernet,    
-                secondaryId=lease.ip,  
-                watched1=lease.active,   
-                watched2=lease.hostname,
-                watched3=lease.hardware,
-                watched4=lease.binding_state,
-                extra=path,
-                foreignKey=lease.ethernet
-            )
+        # Detect file encoding
+        with open(path, 'rb') as f:
+            result = chardet.detect(f.read())
+
+        # Use the detected encoding
+        encoding = result['encoding']
+
+        # Handle pihole-specific dhcp.leases files
+        if 'pihole' in path:
+            with open(path, 'r', encoding=encoding, errors='replace') as f:
+                for line in f:
+                    row = line.rstrip().split()
+                    if len(row) == 5:
+                        plugin_objects.add_object(
+                            primaryId   = handleEmpty(row[1]),
+                            secondaryId = handleEmpty(row[2]),
+                            watched1    = handleEmpty('True'),
+                            watched2    = handleEmpty(row[3]),
+                            watched3    = handleEmpty(row[4]),
+                            watched4    = handleEmpty('True'),
+                            extra       = handleEmpty(path),
+                            foreignKey  = handleEmpty(row[1])
+                        )
+        else:
+            #  Handle generic dhcp.leases files
+            leases = DhcpLeases(path)
+            leasesList = leases.get()
+            for lease in leasesList:
+
+                # filter out irrelevant entries (e.g. from OPNsense dhcp.leases files)
+                if is_mac(lease.ethernet):
+
+                    plugin_objects.add_object(
+                        primaryId   = handleEmpty(lease.ethernet),    
+                        secondaryId = handleEmpty(lease.ip),  
+                        watched1    = handleEmpty(lease.active),   
+                        watched2    = handleEmpty(lease.hostname),
+                        watched3    = handleEmpty(lease.hardware),
+                        watched4    = handleEmpty(lease.binding_state),
+                        extra       = handleEmpty(path),
+                        foreignKey  = handleEmpty(lease.ethernet)
+                    )
     return plugin_objects
 
 if __name__ == '__main__':    

front/plugins/dhcp_servers/config.json

@@ -1,6 +1,7 @@
 {
     "code_name": "dhcp_servers",
     "unique_prefix": "DHCPSRVS",
+    "plugin_type": "other",
     "enabled": true,    
     "data_source":  "script",
     "show_ui": true,
@@ -274,6 +275,7 @@
     "settings":[
         {
             "function": "RUN",     
+            "events": ["run"],       
             "type": "text.select",            
             "default_value":"disabled",
             "options": ["disabled", "once", "schedule", "always_after_scan", "on_new_device"],
@@ -344,7 +346,7 @@
         {
             "function": "RUN_TIMEOUT",
             "type": "integer",
-            "default_value":5,
+            "default_value":10,
             "options": [],
             "localized": ["name", "description"],
             "name" : [{

front/plugins/dhcp_servers/script.py

@@ -15,8 +15,10 @@ from logger import mylog
 def main():
 
     mylog('verbose', ['[DHCPSRVS] In script'])
-
     RESULT_FILE = 'last_result.log'
+    last_run_logfile = open(RESULT_FILE, 'a') 
+    last_run_logfile.write("")
+    
     plugin_objects = Plugin_Objects(RESULT_FILE)
     timeoutSec = 10
 

front/plugins/events_notifications/config.json

@@ -0,0 +1,838 @@
+{
+  "code_name": "events_notifications",
+  "plugin_type": "flow",
+  "template_type": "database-entry",
+  "unique_prefix": "EVNTNTF",
+  "enabled": true,
+  "data_source": "template",
+  "show_ui": false,
+  "localized": [
+    "display_name",
+    "description",
+    "icon"
+  ],
+  "display_name": [
+    {
+      "language_code": "en_us",
+      "string": "Known Devices"
+    }
+  ],
+  "description": [
+    {
+      "language_code": "en_us",
+      "string": "The template used for known devices."
+    }
+  ],
+  "icon": [
+    {
+      "language_code": "en_us",
+      "string": "<i class=\"fa fa-check\"></i>"
+    }
+  ],
+  "params": [
+    {
+      "name": "target_macs",
+      "type": "setting",
+      "value": "KNWN_target_macs"
+    },
+    {
+      "name": "dev_AlertDeviceDown",
+      "type": "setting",
+      "value": "KNWN_dev_AlertDeviceDown"
+    },
+    {
+      "name": "dev_AlertEvents",
+      "type": "setting",
+      "value": "KNWN_dev_AlertEvents"
+    },
+    {
+      "name": "trigger_ids",
+      "type": "array",
+      "value": "trigger.Object_PrimaryID"
+    },
+    {
+      "name": "trigger_objects",
+      "type": "array",
+      "value": "trigger"
+    }
+  ],
+  "settings": [
+    {
+      "function": "FLOW",
+      "type": "json",
+      "default_value": [
+        {
+          "name": "send_notification",
+          "trigger": [
+            {
+              "object_event": "new",
+              "object_filter": "",
+              "object": "Events_Notifications"
+            }
+          ],
+          "steps": [
+            {
+              "step_type": "wait",
+              "params": [
+                {
+                  "days": 0,
+                  "hours": 0,
+                  "minutes": 0,
+                  "seconds": 30
+                }
+              ]
+            },
+            {
+              "step_type": "condition",
+              "params": [
+                {
+                  "left": {
+                    "value": "triggers[0].object['dev_DeviceID']",
+                    "use_quotes": true,
+                    "js_template": "'{value}'.toString()"
+                  },
+                  "operator": {
+                    "value": "==",
+                    "data_type": "string"
+                  },
+                  "right": {
+                    "value": "device_id_param",
+                    "use_quotes": false,
+                    "js_template": "'{value}'.toString()"
+                  }
+                }
+              ]
+            },
+            {
+              "step_type": "condition",
+              "params": [
+                {
+                  "left": {
+                    "value": "check_event_repetition(device_id_param, event_type_param, repetition_count_param)",
+                    "use_quotes": false,
+                    "js_template": "{value}"
+                  },
+                  "operator": {
+                    "value": "==",
+                    "data_type": "boolean"
+                  },
+                  "right": {
+                    "value": true,
+                    "use_quotes": false,
+                    "js_template": "{value}"
+                  }
+                }
+              ]
+            },
+            {
+              "step_type": "action",
+              "params": [
+                {
+                  "type": "run_plugin",
+                  "params": {
+                    "unique_prefix": "webhook"
+                  }
+                }
+              ]
+            },
+            {
+              "step_type": "action",
+              "params": [
+                {
+                  "type": "run_plugin",
+                  "params": {
+                    "unique_prefix": "mqtt"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ],
+      "options": [
+        {
+          "name": [
+            {
+              "language_code": "en_us",
+              "string": "Device ID Parameter"
+            }
+          ],
+          "type": "string",
+          "default_value": "1",
+          "localized": [
+            "name"
+          ]
+        },
+        {
+          "name": [
+            {
+              "language_code": "en_us",
+              "string": "Event Type Parameter"
+            }
+          ],
+          "type": "string",
+          "default_value": "device_down",
+          "localized": [
+            "name"
+          ]
+        },
+        {
+          "name": [
+            {
+              "language_code": "en_us",
+              "string": "Repetition Count Parameter"
+            }
+          ],
+          "type": "integer",
+          "default_value": 3,
+          "localized": [
+            "name"
+          ]
+        }
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Plugin flow"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "This flow sends a notification after 30s every time a new event is logged."
+        }
+      ]
+    },
+    {
+      "function": "target_macs",
+      "type": "list.readonly",
+      "maxLength": 50,
+      "default_value": [],
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Target devices"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The MAC address of the devices to update. Uneditable. This parameter is dynamically updated via a Flow."
+        }
+      ]
+    },
+    {
+      "function": "CMD",
+      "type": "text",
+      "default_value": "UPDATE Devices SET dev_AlertDeviceDown = {KNWN_dev_AlertDeviceDown}, dev_AlertEvents = {KNWN_dev_AlertEvents} WHERE dev_MAC in ({target_macs})",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "UPDATE SQL"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "This SQL query is used to update target devices."
+        }
+      ]
+    },
+    {
+      "function": "dev_Name",
+      "type": "readonly",
+      "maxLength": 50,
+      "default_value": "(unknown)",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Device Name"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The name of the device. Uneditable as internal functionality is dependent on specific new device names."
+        }
+      ]
+    },
+    {
+      "function": "dev_Owner",
+      "type": "string",
+      "maxLength": 30,
+      "default_value": "House",
+      "override_value": {
+        "override": false
+      },
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Device Owner"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The owner of the device."
+        }
+      ]
+    },
+    {
+      "function": "dev_DeviceType",
+      "type": "string",
+      "maxLength": 30,
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Device Type"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The type of the device."
+        }
+      ]
+    },
+    {
+      "function": "dev_Vendor",
+      "type": "readonly",
+      "maxLength": 250,
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Device Vendor"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The vendor of the device. Uneditable - Autodetected."
+        }
+      ]
+    },
+    {
+      "function": "dev_Favorite",
+      "type": "integer.checkbox",
+      "default_value": 0,
+      "override_value": {
+        "override": false
+      },
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Favorite Device"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Indicates whether the device is marked as a favorite."
+        }
+      ]
+    },
+    {
+      "function": "dev_Group",
+      "type": "string",
+      "maxLength": 10,
+      "default_value": "",
+      "override_value": {
+        "override": false
+      },
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Device Group"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The group to which the device belongs."
+        }
+      ]
+    },
+    {
+      "function": "dev_Comments",
+      "type": "string",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Device Comments"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Additional comments or notes about the device."
+        }
+      ]
+    },
+    {
+      "function": "dev_FirstConnection",
+      "type": "readonly",
+      "format": "date-time",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "First Connection"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The date and time of the first connection with the device. Uneditable - Autodetected."
+        }
+      ]
+    },
+    {
+      "function": "dev_LastConnection",
+      "type": "readonly",
+      "format": "date-time",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Last Connection"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The date and time of the last connection with the device. Uneditable - Autodetected."
+        }
+      ]
+    },
+    {
+      "function": "dev_LastIP",
+      "type": "readonly",
+      "maxLength": 50,
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Last IP"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The last known IP address of the device. Uneditable - Autodetected."
+        }
+      ]
+    },
+    {
+      "function": "dev_StaticIP",
+      "type": "integer.checkbox",
+      "default_value": 1,
+      "override_value": {
+        "override": true
+      },
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Static IP"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Indicates whether the device has a static IP address."
+        }
+      ]
+    },
+    {
+      "function": "dev_ScanCycle",
+      "type": "integer.checkbox",
+      "default_value": 1,
+      "override_value": {
+        "override": true
+      },
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Scan Cycle"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The default value of the <code>Scan device</code> dropdown. Enable if newly discovered devices should be scanned."
+        }
+      ]
+    },
+    {
+      "function": "dev_LogEvents",
+      "type": "integer.checkbox",
+      "default_value": 0,
+      "override_value": {
+        "override": false
+      },
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Log Events"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Indicates whether events related to the device shouldbe logged."
+        }
+      ]
+    },
+    {
+      "function": "dev_AlertEvents",
+      "type": "integer.checkbox",
+      "default_value": 0,
+      "override_value": {
+        "override": true
+      },
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Alert Events"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Indicates whether events related to the device should trigger alerts. The default value of the <code>Alert All Events</code> checkbox."
+        }
+      ]
+    },
+    {
+      "function": "dev_AlertDeviceDown",
+      "type": "integer.checkbox",
+      "default_value": 0,
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Alert Device Down"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Indicates whether an alert should be triggered when the device goes down. The default value of the <code>Alert Down</code> checkbox."
+        }
+      ]
+    },
+    {
+      "function": "dev_SkipRepeated",
+      "type": "integer",
+      "default_value": 0,
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Skip Repeated"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The default value of the <code>Skip repeated notifications for</code> dropdown. Enter number of <b>hours</b> for which repeated notifications should be ignored for. If you enter <code>0</code> then you get notified on all events."
+        }
+      ]
+    },
+    {
+      "function": "dev_LastNotification",
+      "type": "readonly",
+      "format": "date-time",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Last Notification"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The date and time of the last notification sent for the device. Uneditable - Autodetected."
+        }
+      ]
+    },
+    {
+      "function": "dev_PresentLastScan",
+      "type": "integer.checkbox",
+      "default_value": 1,
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Present Last Scan"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Indicates whether the device should be marked as present after detected in a scan."
+        }
+      ]
+    },
+    {
+      "function": "dev_NewDevice",
+      "type": "integer.checkbox",
+      "default_value": true,
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "New Device"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Indicates whether the device is considered a new device. The default value of the <code>New Device</code> checkbox."
+        }
+      ]
+    },
+    {
+      "function": "dev_Location",
+      "type": "string",
+      "maxLength": 250,
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Device Location"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The location of the device."
+        }
+      ]
+    },
+    {
+      "function": "dev_Archived",
+      "type": "integer.checkbox",
+      "default_value": 0,
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Archived"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Indicates whether the device is archived. The default value of the <code>Archived</code> checkbox."
+        }
+      ]
+    },
+    {
+      "function": "dev_Network_Node_MAC_ADDR",
+      "type": "string",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Network Node MAC Address"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The MAC address of the network node."
+        }
+      ]
+    },
+    {
+      "function": "dev_Network_Node_port",
+      "type": "readonly",
+      "default_value": 0,
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Network Node Port"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The port number of the network node. Uneditable."
+        }
+      ]
+    },
+    {
+      "function": "dev_Icon",
+      "type": "string",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Device Icon"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The icon associated with the device. Check the <a href=\"https://github.com/jokob-sk/Pi.Alert/blob/main/docs/ICONS.md\" target=\"_blank\">documentation on icons</a> for more details."
+        }
+      ]
+    }
+  ],
+  "required": [
+    "dev_MAC",
+    "dev_Name",
+    "dev_Owner",
+    "dev_FirstConnection",
+    "dev_LastConnection",
+    "dev_LastIP",
+    "dev_StaticIP",
+    "dev_ScanCycle",
+    "dev_LogEvents",
+    "dev_AlertEvents",
+    "dev_AlertDeviceDown",
+    "dev_SkipRepeated",
+    "dev_LastNotification",
+    "dev_PresentLastScan",
+    "dev_NewDevice",
+    "dev_Location",
+    "dev_Archived",
+    "dev_Network_Node_MAC_ADDR",
+    "dev_Network_Node_port",
+    "dev_Icon"
+  ],
+  "additionalProperties": false
+}

front/plugins/events_notifications/ignore_plugin

@@ -0,0 +1 @@
+This plugin will not be loaded

front/plugins/internet_ip/README.md

@@ -0,0 +1,7 @@
+## Overview
+
+Plugin to run regular Internet connectivity and IP checks. 
+
+### Usage
+
+- Check the Settings page for details.

front/plugins/internet_ip/README_DE.md

@@ -0,0 +1,7 @@
+## Übersicht
+
+Ein Plugin zur regelmäßigen Prüfung der Internetverbindung und externen IP.
+
+### Verwendung
+
+- Einstellungen-Seite für Details ansehen.

front/plugins/internet_ip/config.json

@@ -0,0 +1,523 @@
+{
+  "code_name": "internet_ip",
+  "unique_prefix": "INTRNT",
+  "plugin_type": "device_scanner",
+  "enabled": true,
+  "mapped_to_table": "CurrentScan",
+  "data_filters": [
+    {
+      "compare_column": "Object_PrimaryID",
+      "compare_operator": "==",
+      "compare_field_id": "txtMacFilter",
+      "compare_js_template": "'{value}'.toString()",
+      "compare_use_quotes": true
+    }
+  ],
+  "data_source": "script",
+  "show_ui": true,
+  "localized": [
+    "display_name",
+    "description",
+    "icon"
+  ],
+  "display_name": [
+    {
+      "language_code": "en_us",
+      "string": "Internet check"
+    },
+    {
+      "language_code": "en_us",
+      "string": "Internet-Check"
+    }
+  ],
+  "icon": [
+    {
+      "language_code": "en_us",
+      "string": "<i class=\"fa-solid fa-globe\"></i>"
+    },
+    {
+      "language_code": "de_de",
+      "string": "<i class=\"fa-solid fa-globe\"></i>"
+    }
+  ],
+  "description": [
+    {
+      "language_code": "en_us",
+      "string": "A plugin to check your internet connectivity and IP."
+    },
+    {
+      "language_code": "de_de",
+      "string": "Ein Plugin zur Prüfung der Internetverbindung und externen IP."
+    }
+  ],
+  "params": [
+    {
+      "name": "prev_ip",
+      "type": "sql",
+      "value": "SELECT dev_LastIP FROM Devices WHERE dev_MAC = 'Internet' "
+    },
+    {
+      "name": "DIG_GET_IP_ARG",
+      "type": "setting",
+      "value": "DIG_GET_IP_ARG",
+      "base64": true
+    }
+  ],
+  "settings": [
+    {
+      "function": "RUN",
+      "events": [
+        "run"
+      ],
+      "type": "text.select",
+      "default_value": "schedule",
+      "options": [
+        "disabled",
+        "once",
+        "schedule",
+        "always_after_scan"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "When to run"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Cuándo ejecutar"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Wann ausführen"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "When the plugin should run. An hourly or daily <code>SCHEDULE</code> is a good option."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Wann das Plugin ausgeführt werden soll. Eine stündliche oder tägliche <code>SCHEDULE</code> wird empfohlen."
+        }
+      ]
+    },
+    {
+      "function": "CMD",
+      "type": "readonly",
+      "default_value": "python3 /home/pi/pialert/front/plugins/internet_ip/script.py prev_ip={prev_ip} DIG_GET_IP_ARG={DIG_GET_IP_ARG}",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Command"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Comando"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Befehl"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Command to run. This can not be changed"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Comando a ejecutar. Esto no se puede cambiar"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Befehl zum Ausführen. Dies kann nicht geändert werden"
+        }
+      ]
+    },
+    {
+      "function": "RUN_SCHD",
+      "type": "text",
+      "default_value": "*/5 * * * *",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Schedule"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Schedule"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Zeitplan"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Only enabled if you select <code>schedule</code> in the <a href=\"#INTRNT_RUN\"><code>INTRNT_RUN</code> setting</a>. Make sure you enter the schedule in the correct cron-like format (e.g. validate at <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). For example entering <code>0 4 * * *</code> will run the scan after 4 am in the <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</code> you set above</a>. Will be run NEXT time the time passes. It's recommended to use the same schedule interval for all plugins responsible for discovering new devices."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Solo está habilitado si selecciona <code>schedule</code> en la configuración <a href=\"#INTRNT_RUN\"><code>INTRNT_RUN</code></a>. Asegúrese de ingresar la programación en el formato similar a cron correcto (por ejemplo, valide en <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). Por ejemplo, ingresar <code>0 4 * * *</code> ejecutará el escaneo después de las 4 a.m. en el <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</ código> que configuró arriba</a>. Se ejecutará la PRÓXIMA vez que pase el tiempo."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Nur aktiv, wenn <code>schedule</code> in der <a href=\"#INTRNT_RUN\"><code>INTRNT_RUN</code>Einstellung</a> ausgewählt wurde. Sichergehen, dass das Intervall in einem korrekten cron-ähnlichen Format angegeben wurde (z.B. auf <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a> testen). <code>0 4 * * *</code> würde den Scan täglich um 4 Uhr in der <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\">oben ausgewählten <code>TIMEZONE</code></a> starten. Wird erst beim NÄCHSTEN Intervall ausgeführt. <br/>Es wird empfohlen, das Intervall aller Plugins, welche nach neuen Geräten suchen, auf den gleichen Wert zu setzen."
+        }
+      ]
+    },
+    {
+      "function": "RUN_TIMEOUT",
+      "type": "integer",
+      "default_value": 30,
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Run timeout"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Tiempo límite de ejecución"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Zeitlimit"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Maximale Zeit in Sekunden, die auf den Abschluss des Skripts gewartet werden soll. Bei Überschreitung dieser Zeit wird das Skript abgebrochen."
+        }
+      ]
+    },
+    {
+      "function": "WATCH",
+      "type": "text.multiselect",
+      "default_value": [
+        "Watched_Value1"
+      ],
+      "options": [
+        "Watched_Value1",
+        "Watched_Value2",
+        "Watched_Value3",
+        "Watched_Value4"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Watched"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Visto"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Überwacht"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Send a notification if selected values change. Use <code>CTRL + Click</code> to select/deselect. <ul> <li><code>Watched_Value1</code> is Previous IP (not recommended)</li><li><code>Watched_Value2</code> unused</li><li><code>Watched_Value3</code> unused </li><li><code>Watched_Value4</code> unused </li></ul>"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Sende eine Benachrichtigung, wenn ein ausgwählter Wert sich ändert. <code>STRG + klicken</code> zum aus-/abwählen. <ul> <li><code>Watched_Value1</code> ist die Vorige IP (nicht empfohlen)</li><li><code>Watched_Value2</code> ist nicht in Verwendung</li><li><code>Watched_Value3</code> ist nicht in Verwendung </li><li><code>Watched_Value4</code> ist nicht in Verwendung </li></ul>"
+        }
+      ]
+    },
+    {
+      "function": "REPORT_ON",
+      "type": "text.multiselect",
+      "default_value": [
+        "new",
+        "watched-changed"
+      ],
+      "options": [
+        "new",
+        "watched-changed",
+        "watched-not-changed",
+        "missing-in-last-scan"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Report on"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Informar sobre"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Benachrichtige wenn"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Send a notification only on these statuses. <code>new</code> means a new unique (unique combination of PrimaryId and SecondaryId) object was discovered. <code>watched-changed</code> means that selected <code>Watched_ValueN</code> columns changed."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Envíe una notificación solo en estos estados. <code>new</code> significa que se descubrió un nuevo objeto único (una combinación única de PrimaryId y SecondaryId). <code>watched-changed</code> significa que las columnas <code>Watched_ValueN</code> seleccionadas cambiaron."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Benachrichtige nur bei diesen Status. <code>new</code> bedeutet ein neues eindeutiges (einzigartige Kombination aus PrimaryId und SecondaryId) Objekt wurde erkennt. <code>watched-changed</code> bedeutet eine ausgewählte <code>Watched_ValueN</code>-Spalte hat sich geändert."
+        }
+      ]
+    }
+  ],
+  "database_column_definitions": [
+    {
+      "column": "Object_PrimaryID",
+      "mapped_to_column": "cur_MAC",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "device_name_mac",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "MAC"
+        },
+        {
+          "language_code": "es_es",
+          "string": "MAC"
+        },
+        {
+          "language_code": "de_de",
+          "string": "MAC"
+        }
+      ]
+    },
+    {
+      "column": "Object_SecondaryID",
+      "mapped_to_column": "cur_IP",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "device_ip",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "IP"
+        },
+        {
+          "language_code": "es_es",
+          "string": "IP"
+        },
+        {
+          "language_code": "de_de",
+          "string": "IP"
+        }
+      ]
+    },
+    {
+      "column": "Watched_Value1",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Extra"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Extra"
+        }
+      ]
+    },
+    {
+      "column": "Watched_Value2",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "textarea_readonly",            
+      "default_value":"",
+      "options": [],
+      "localized": ["name"],
+      "name":[
+        {
+          "language_code": "en_us",
+          "string" : "Response"
+        }
+      ]
+    },
+    {
+      "column": "Dummy",
+      "mapped_to_column": "cur_ScanMethod",
+      "mapped_to_column_data": {
+        "value": "INTRNT"
+      },
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Scan method"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Método de escaneo"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Scanmethode"
+        }
+      ]
+    },
+    {
+      "column": "DateTimeCreated",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Created"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Creado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Erstellt"
+        }
+      ]
+    },
+    {
+      "column": "DateTimeChanged",
+      "mapped_to_column": "cur_DateTime",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Changed"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Cambiado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Geändert"
+        }
+      ]
+    },
+    {
+      "column": "Status",
+      "css_classes": "col-sm-1",
+      "show": true,
+      "type": "replace",
+      "default_value": "",
+      "options": [
+        {
+          "equals": "watched-not-changed",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+        },
+        {
+          "equals": "watched-changed",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+        },
+        {
+          "equals": "new",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+        },
+        {
+          "equals": "missing-in-last-scan",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
+        }
+      ],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Status"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Estado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Status"
+        }
+      ]
+    }
+  ]
+}

front/plugins/internet_ip/script.py

@@ -0,0 +1,128 @@
+#!/usr/bin/env python
+# test script by running:
+# /home/pi/pialert/front/plugins/internet_ip/script.py TBD
+
+import os
+import pathlib
+import argparse
+import sys
+import hashlib
+import csv
+import subprocess
+import re
+import base64
+import sqlite3
+from io import StringIO
+from datetime import datetime
+
+sys.path.append("/home/pi/pialert/front/plugins")
+sys.path.append('/home/pi/pialert/pialert') 
+
+from plugin_helper import Plugin_Object, Plugin_Objects, decodeBase64
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ, check_IP_format
+from const import logPath, pialertPath, fullDbPath
+
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+LOG_FILE = os.path.join(CUR_PATH, 'script.log')
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+pluginName = 'INTRNT'
+
+def main():
+
+    mylog('verbose', [f'[{pluginName}] In script'])     
+    
+    parser = argparse.ArgumentParser(description='Check internet connectivity and IP')
+    
+    parser.add_argument('prev_ip', action="store", help="Previous IP address to compare against the current IP")
+    parser.add_argument('DIG_GET_IP_ARG', action="store", help="Arguments for the 'dig' command to retrieve the IP address")
+
+    values = parser.parse_args()
+
+    PREV_IP         = values.prev_ip.split('=')[1]        
+    DIG_GET_IP_ARG  = values.DIG_GET_IP_ARG.split('=b')[1]   # byte64 encoded
+
+    mylog('verbose', [f'[{pluginName}] DIG_GET_IP_ARG: ', DIG_GET_IP_ARG])     
+
+    # Decode the base64-encoded value to get the actual value in ASCII format.
+    DIG_GET_IP_ARG = base64.b64decode(DIG_GET_IP_ARG).decode('ascii')
+    
+    mylog('verbose', [f'[{pluginName}] DIG_GET_IP_ARG resolved: {DIG_GET_IP_ARG} ']) 
+
+    # perform the new IP lookup
+    new_internet_IP, cmd_output = check_internet_IP( PREV_IP, DIG_GET_IP_ARG)   
+
+    plugin_objects = Plugin_Objects(RESULT_FILE)    
+    
+    plugin_objects.add_object(
+        primaryId   = 'Internet',       # MAC (Device Name)
+        secondaryId = new_internet_IP,  # IP Address 
+        watched1    = f'Previous IP: {PREV_IP}',
+        watched2    = cmd_output.replace('\n',''),
+        watched3    = '',  
+        watched4    = '',
+        extra       = f'Previous IP: {PREV_IP}', 
+        foreignKey  = 'Internet')
+
+    plugin_objects.write_result_file() 
+
+    mylog('verbose', [f'[{pluginName}] Finished '])   
+    
+    return 0
+  
+    
+#===============================================================================
+# INTERNET IP CHANGE
+#===============================================================================
+def check_internet_IP ( PREV_IP, DIG_GET_IP_ARG ):   
+    
+    # Get Internet IP
+    mylog('verbose', [f'[{pluginName}] - Retrieving Internet IP'])
+    internet_IP, cmd_output = get_internet_IP(DIG_GET_IP_ARG)
+
+    mylog('verbose', [f'[{pluginName}]  Current internet_IP : {internet_IP}'])        
+    
+    # Check previously stored IP    
+    previous_IP = '0.0.0.0'
+
+    if  PREV_IP is not None and len(PREV_IP) > 0 :
+        previous_IP = PREV_IP
+
+    mylog('verbose', [f'[{pluginName}]          previous_IP : {previous_IP}']) 
+
+    #  logging
+    append_line_to_file (logPath + '/IP_changes.log', '['+str(timeNowTZ()) +']\t'+ internet_IP +'\n')          
+
+    return internet_IP, cmd_output
+    
+
+#-------------------------------------------------------------------------------
+def get_internet_IP (DIG_GET_IP_ARG):
+
+    cmd_output = ''
+    
+    # Using 'dig'
+    dig_args = ['dig', '+short'] + DIG_GET_IP_ARG.strip().split()
+    try:
+        cmd_output = subprocess.check_output (dig_args, universal_newlines=True)
+        mylog('verbose', [f'[{pluginName}]  DIG result : {cmd_output}'])    
+    except subprocess.CalledProcessError as e:
+        mylog('verbose', [e.output])
+        cmd_output = '' # no internet
+
+    # Check result is an IP
+    IP = check_IP_format (cmd_output)
+
+    # Handle invalid response
+    if IP == '':
+        IP = '0.0.0.0'
+
+    return IP, cmd_output
+
+#===============================================================================
+# BEGIN
+#===============================================================================
+if __name__ == '__main__':
+    main()

front/plugins/internet_speedtest/README.md

@@ -0,0 +1,11 @@
+## Overview
+
+A simple plugin allowing for executing regular internet speed tests. 
+
+### Usage
+
+- N/A
+
+### Notes
+
+- N/A

front/plugins/internet_speedtest/README_DE.md

@@ -0,0 +1,3 @@
+## Übersicht
+
+Ein Plugin zur periodischen Durchführung von Internetgeschwindigkeitstests.

front/plugins/internet_speedtest/config.json

@@ -0,0 +1,646 @@
+{
+  "code_name": "internet_speedtest",
+  "unique_prefix": "INTRSPD",
+  "plugin_type": "other",
+  "enabled": true,
+  "data_source": "script",
+  "show_ui": true,
+  "localized": [
+    "display_name",
+    "description",
+    "icon"
+  ],
+  "display_name": [
+    {
+      "language_code": "en_us",
+      "string": "Internet speedtest"
+    },
+    {
+      "language_code": "de_de",
+      "string": "Internetgeschwindigkeitstest"
+    }
+  ],
+  "icon": [
+    {
+      "language_code": "en_us",
+      "string": "<i class=\"fa-solid fa-gauge-high\"></i>"
+    },
+    {
+      "language_code": "de_de",
+      "string": "<i class=\"fa-solid fa-gauge-high\"></i>"
+    }
+  ],
+  "description": [
+    {
+      "language_code": "en_us",
+      "string": "A plugin to perform a scheduled internet speedtest."
+    },
+    {
+      "language_code": "de_de",
+      "string": "Ein Plugin zur periodischen Durchführung von Internetgeschwindigkeitstests."
+    }
+  ],
+  "params": [],
+  "database_column_definitions": [
+    {
+      "column": "Index",
+      "css_classes": "col-sm-2",
+      "show": false,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "N/A"
+        },
+        {
+          "language_code": "es_es",
+          "string": "N/A"
+        },
+        {
+          "language_code": "de_de",
+          "string": "N/A"
+        }
+      ]
+    },
+    {
+      "column": "Plugin",
+      "css_classes": "col-sm-2",
+      "show": false,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "N/A"
+        },
+        {
+          "language_code": "es_es",
+          "string": "N/A"
+        },
+        {
+          "language_code": "de_de",
+          "string": "N/A"
+        }
+      ]
+    },
+    {
+      "column": "Object_PrimaryID",
+      "css_classes": "col-sm-2",
+      "show": false,
+      "type": "url",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "N/A"
+        },
+        {
+          "language_code": "de_de",
+          "string": "N/A"
+        }
+      ]
+    },
+    {
+      "column": "Object_SecondaryID",
+      "css_classes": "col-sm-2",
+      "show": false,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "N/A"
+        },
+        {
+          "language_code": "es_es",
+          "string": "N/A"
+        },
+        {
+          "language_code": "de_de",
+          "string": "N/A"
+        }
+      ]
+    },
+    {
+      "column": "DateTimeCreated",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Test run on"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Test durchgeführt am"
+        }
+      ]
+    },
+    {
+      "column": "DateTimeChanged",
+      "css_classes": "col-sm-2",
+      "show": false,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Changed"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Cambiado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Geändert"
+        }
+      ]
+    },
+    {
+      "column": "Watched_Value1",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "threshold",
+      "default_value": "",
+      "options": [
+        {
+          "maximum": 1,
+          "hexColor": "#D33115"
+        },
+        {
+          "maximum": 5,
+          "hexColor": "#792D86"
+        },
+        {
+          "maximum": 10,
+          "hexColor": "#7D862D"
+        },
+        {
+          "maximum": 100,
+          "hexColor": "#05483C"
+        }
+      ],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Download"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Download"
+        }
+      ]
+    },
+    {
+      "column": "Watched_Value2",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "threshold",
+      "default_value": "",
+      "options": [
+        {
+          "maximum": 1,
+          "hexColor": "#D33115"
+        },
+        {
+          "maximum": 5,
+          "hexColor": "#792D86"
+        },
+        {
+          "maximum": 10,
+          "hexColor": "#7D862D"
+        },
+        {
+          "maximum": 100,
+          "hexColor": "#05483C"
+        }
+      ],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Upload"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Upload"
+        }
+      ]
+    },
+    {
+      "column": "Watched_Value3",
+      "css_classes": "col-sm-2",
+      "show": false,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "N/A"
+        },
+        {
+          "language_code": "es_es",
+          "string": "N/A"
+        },
+        {
+          "language_code": "de_de",
+          "string": "N/A"
+        }
+      ]
+    },
+    {
+      "column": "Watched_Value4",
+      "css_classes": "col-sm-2",
+      "show": false,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "N/A"
+        },
+        {
+          "language_code": "es_es",
+          "string": "N/A"
+        },
+        {
+          "language_code": "de_de",
+          "string": "N/A"
+        }
+      ]
+    },
+    {
+      "column": "UserData",
+      "css_classes": "col-sm-2",
+      "show": false,
+      "type": "textbox_save",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Comments"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Comentarios"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Kommentare"
+        }
+      ]
+    },
+    {
+      "column": "Status",
+      "css_classes": "col-sm-1",
+      "show": false,
+      "type": "replace",
+      "default_value": "",
+      "options": [
+        {
+          "equals": "watched-not-changed",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-square-check'></i><div></div>"
+        },
+        {
+          "equals": "watched-changed",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-triangle-exclamation'></i></div>"
+        },
+        {
+          "equals": "new",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-circle-plus'></i></div>"
+        },
+        {
+          "equals": "missing-in-last-scan",
+          "replacement": "<div style='text-align:center'><i class='fa-solid fa-question'></i></div>"
+        }
+      ],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Status"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Estado"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Status"
+        }
+      ]
+    },
+    {
+      "column": "Extra",
+      "css_classes": "col-sm-3",
+      "show": false,
+      "type": "label",
+      "default_value": "",
+      "options": [],
+      "localized": [
+        "name"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Extra"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Extra"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Extra"
+        }
+      ]
+    }
+  ],
+  "settings": [
+    {
+      "function": "RUN",
+      "events": [
+        "run"
+      ],
+      "type": "text.select",
+      "default_value": "disabled",
+      "options": [
+        "disabled",
+        "once",
+        "schedule",
+        "always_after_scan"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "When to run"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Cuando ejecuta"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Wann ausführen"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Enable a regular internet speedtest. If you select <code>schedule</code> the scheduling settings from below are applied. If you select <code>once</code> the scan is run only once on start of the application (container) for the time specified in <a href=\"#INTRSPD_RUN_TIMEOUT\"><code>INTRSPD_RUN_TIMEOUT</code> setting</a>."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Aktiviere periodische Internetgeschwindigkeitstests. Wenn <code>schedule</code> ausgewählt ist, werden die Einstellungen von unten genutzt. Bei <code>once</code> wird der Test nur einmal beim Start der Applikation (Container) für die unten in der <a href=\"#INTRSPD_RUN_TIMEOUT\"><code>INTRSPD_RUN_TIMEOUT</code> Einstellung</a> gesetzten Zeit durchgeführt."
+        }
+      ]
+    },
+    {
+      "function": "CMD",
+      "type": "readonly",
+      "default_value": "python3 /home/pi/pialert/front/plugins/internet_speedtest/script.py",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Command"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Comando"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Befehl"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Command to run"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Comando a ejecutar"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Auszuführender Befehl"
+        }
+      ]
+    },
+    {
+      "function": "RUN_SCHD",
+      "type": "text",
+      "default_value": "*/30 * * * *",
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Schedule"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Schedule"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Zeitplan"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Only enabled if you select <code>schedule</code> in the <a href=\"#INTRSPD_RUN\"><code>INTRSPD_RUN</code> setting</a>. Make sure you enter the schedule in the correct cron-like format (e.g. validate at <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). For example entering <code>0 4 * * *</code> will run the scan after 4 am in the <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</code> you set above</a>. Will be run NEXT time the time passes."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Solo habilitado si selecciona <code>schedule</code> en la configuración <a href=\"#INTRSPD_RUN\"><code>INTRSPD_RUN</code></a>. Asegúrese de ingresar el schedule en el formato similar a cron correcto (por ejemplo, valide en <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a>). Por ejemplo, ingrese <code >0 4 * * *</code> ejecutará el escaneo después de las 4 am en el <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\"><code>TIMEZONE</code> que configuró arriba </a>. Se ejecutará la PRÓXIMA vez que pase el tiempo."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Nur aktiv, wenn <code>schedule</code> in der <a href=\"#INTRSPD_RUN\"><code>INTRSPD_RUN</code> Einstellung</a> ausgewählt wurde. Sichergehen, dass das Intervall in einem korrekten cron-ähnlichen Format angegeben wurde (z.B. auf <a href=\"https://crontab.guru/\" target=\"_blank\">crontab.guru</a> testen). <code>0 4 * * *</code> würde den Scan täglich um 4 Uhr in der <a onclick=\"toggleAllSettings()\" href=\"#TIMEZONE\">oben ausgewählten <code>TIMEZONE</code></a> starten. Wird erst beim NÄCHSTEN Intervall ausgeführt. <br/>Es wird empfohlen, das Intervall aller Plugins, welche nach neuen Geräten suchen, auf den gleichen Wert zu setzen."
+        }
+      ]
+    },
+    {
+      "function": "RUN_TIMEOUT",
+      "type": "integer",
+      "default_value": 60,
+      "options": [],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Run timeout"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Tiempo de espera de ejecución"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Zeitlimit"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Maximale Zeit in Sekunden, die auf den Abschluss des Skripts gewartet werden soll. Bei Überschreitung dieser Zeit wird das Skript abgebrochen."
+        }
+      ]
+    },
+    {
+      "function": "WATCH",
+      "type": "text.multiselect",
+      "default_value": [],
+      "options": [
+        "Watched_Value1",
+        "Watched_Value2",
+        "Watched_Value3",
+        "Watched_Value4"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Watched"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Visto"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Überwacht"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Send a notification if selected values change. Use <code>CTRL + Click</code> to select/deselect. <ul> <li><code>Watched_Value1</code> is Download speed (not recommended)</li><li><code>Watched_Value2</code> is Upload speed (not recommended)</li><li><code>Watched_Value3</code> unused </li><li><code>Watched_Value4</code> unused </li></ul>"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Sende eine Benachrichtigung, wenn ein ausgwählter Wert sich ändert. <code>STRG + klicken</code> zum aus-/abwählen. <ul> <li><code>Watched_Value1</code> ist die Download-Geschwindigkeit (nicht empfohlen)</li><li><code>Watched_Value2</code> ist die Upload-Geschwindigkeit (nicht empfohlen)</li><li><code>Watched_Value3</code> ist nicht in Verwendung </li><li><code>Watched_Value4</code> ist nicht in Verwendung </li></ul>"
+        }
+      ]
+    },
+    {
+      "function": "REPORT_ON",
+      "type": "text.multiselect",
+      "default_value": [],
+      "options": [
+        "new",
+        "watched-changed",
+        "watched-not-changed",
+        "missing-in-last-scan"
+      ],
+      "localized": [
+        "name",
+        "description"
+      ],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Report on"
+        },
+        {
+          "language_code": "es_es",
+          "string": "Informar sobre"
+        },
+        {
+          "language_code": "de_de",
+          "string": "Benachrichtige wenn"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Send a notification only on these statuses. <code>new</code> means a new unique (unique combination of PrimaryId and SecondaryId) object was discovered. <code>watched-changed</code> means that selected <code>Watched_ValueN</code> columns changed."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Envíe una notificación solo en estos estados. <code>new</code> significa que se descubrió un nuevo objeto único (combinación única de PrimaryId y SecondaryId). <code>watched-changed</code> significa que seleccionó <code>Watched_ValueN Las columnas </code> cambiaron."
+        },
+        {
+          "language_code": "de_de",
+          "string": "Benachrichtige nur bei diesen Status. <code>new</code> bedeutet ein neues eindeutiges (einzigartige Kombination aus PrimaryId und SecondaryId) Objekt wurde erkennt. <code>watched-changed</code> bedeutet eine ausgewählte <code>Watched_ValueN</code>-Spalte hat sich geändert."
+        }
+      ]
+    }
+  ]
+}

front/plugins/internet_speedtest/script.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+
+import argparse
+import os
+import pathlib
+import sys
+from datetime import datetime
+import speedtest
+
+# Replace these paths with the actual paths to your Pi.Alert directories
+sys.path.extend(["/home/pi/pialert/front/plugins", "/home/pi/pialert/pialert"])
+
+from plugin_helper import Plugin_Objects
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+def main():
+    
+    mylog('verbose', ['[INTRSPD] In script'])    
+
+    parser = argparse.ArgumentParser(description='Speedtest Plugin for Pi.Alert')
+    values = parser.parse_args()
+
+    plugin_objects = Plugin_Objects(RESULT_FILE)
+    speedtest_result = run_speedtest()
+    plugin_objects.add_object(
+        primaryId   = 'Speedtest',
+        secondaryId = timeNowTZ(),            
+        watched1    = speedtest_result['download_speed'],
+        watched2    = speedtest_result['upload_speed'],
+        watched3    = 'null',
+        watched4    = 'null',
+        extra       = 'null',
+        foreignKey  = 'null'
+    )
+    plugin_objects.write_result_file()
+
+def run_speedtest():
+    try:
+        st = speedtest.Speedtest()
+        st.get_best_server()
+        download_speed = round(st.download() / 10**6, 2)  # Convert to Mbps
+        upload_speed = round(st.upload() / 10**6, 2)  # Convert to Mbps
+
+        return {
+            'download_speed': download_speed,
+            'upload_speed': upload_speed,
+        }
+    except Exception as e:
+        mylog('verbose', [f"Error running speedtest: {str(e)}"]) 
+        return {
+            'download_speed': -1,
+            'upload_speed': -1,
+        }
+
+if __name__ == '__main__':
+    sys.exit(main())