[🤖Automation] Update README with sponsors information

Update MQTT to send model as device name - thanks to @NightMean 🙏

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -9,20 +9,6 @@ body:
     options:
     - label: I have searched the existing open and closed issues
       required: true
-- type: checkboxes
-  attributes:
-    label: Am I willing to test this? 🧪
-    description: I rely on the community to test unreleased features. If you are requesting a feature, please be willing to test it within 48h of test request. Otherwise, the feature might be pulled from the code base. 
-    options:
-    - label: I will do my best to test this feature on the `netlertx-dev` image when requested within 48h and report bugs to help deliver a great user experience for everyone and not to break existing installations.
-      required: true
-- type: checkboxes
-  attributes:
-    label: Can I help implement this? 👩‍💻👨‍💻 
-    description: The maintainer will provide guidance and help. The implementer will read the PR guidelines https://github.com/jokob-sk/NetAlertX/tree/main/docs#-pull-requests-prs
-    options:
-    - label: "Yes"
-    - label: "No"
 - type: textarea
   attributes:
     label: Is your feature request related to a problem? Please describe
@@ -50,3 +36,17 @@ body:
       Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
   validations:
     required: true
+- type: checkboxes
+  attributes:
+    label: Am I willing to test this? 🧪
+    description: I rely on the community to test unreleased features. If you are requesting a feature, please be willing to test it within 48h of test request. Otherwise, the feature might be pulled from the code base. 
+    options:
+    - label: I will do my best to test this feature on the `netlertx-dev` image when requested within 48h and report bugs to help deliver a great user experience for everyone and not to break existing installations.
+      required: true
+- type: checkboxes
+  attributes:
+    label: Can I help implement this? 👩‍💻👨‍💻 
+    description: The maintainer will provide guidance and help. The implementer will read the PR guidelines https://github.com/jokob-sk/NetAlertX/tree/main/docs#-pull-requests-prs
+    options:
+    - label: "Yes"
+    - label: "No"

.gitignore

@@ -19,4 +19,13 @@ __pycache__/
 **/last_result.log
 **/script.log
 **/pialert.conf_bak
-**/pialert.db_bak
+**/pialert.db_bak
+.*.swp
+
+front/img/account/*
+**/account.php
+**/account.js
+front/css/account.css
+
+docker-compose.yml.ffsb42
+.env.omada.ffsb42

Dockerfile

@@ -1,8 +1,8 @@
-FROM alpine:3.20 as builder
+FROM alpine:3.20 AS builder
 
 ARG INSTALL_DIR=/app
 
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONUNBUFFERED=1
 
 # Install build dependencies
 RUN apk add --no-cache bash python3 python3-dev gcc musl-dev libffi-dev openssl-dev \
@@ -15,13 +15,13 @@ ENV PATH="/opt/venv/bin:$PATH"
 COPY . ${INSTALL_DIR}/
 
 
-RUN pip install netifaces tplink-omada-client pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython   \
+RUN pip install netifaces tplink-omada-client pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros  \
     && bash -c "find ${INSTALL_DIR} -type d -exec chmod 750 {} \;" \
     && bash -c "find ${INSTALL_DIR} -type f -exec chmod 640 {} \;" \
     && bash -c "find ${INSTALL_DIR} -type f \( -name '*.sh' -o -name '*.py'  -o -name 'speedtest-cli' \) -exec chmod 750 {} \;"
 
 # second stage
-FROM alpine:3.20 as runner
+FROM alpine:3.20 AS runner
 
 ARG INSTALL_DIR=/app
 

Dockerfile.debian

@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim
 
 # default UID and GID
-ENV USER=pi USER_ID=1000 USER_GID=1000  PORT=20211 
+ENV USER=pi USER_ID=1000 USER_GID=1000 PORT=20211 
 #TZ=Europe/London
 
 # Todo, figure out why using a workdir instead of full paths don't work
@@ -43,7 +43,7 @@ RUN phpenmod -v 8.2 sqlite3
 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 tplink-omada-client pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython cryptography "
+RUN /bin/bash -c "source myenv/bin/activate && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && pip3 install tplink-omada-client pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros "
 
 # Create a buildtimestamp.txt to later check if a new version was released
 RUN date +%s > ${INSTALL_DIR}/front/buildtimestamp.txt

README.md

@@ -1,12 +1,13 @@
-# 💻🔍 Network scanner & notification framework
+[![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/NetAlertX?color=40ba12&label=Pushed&logo=GitHub&logoColor=fff&style=for-the-badge)](https://github.com/jokob-sk/NetAlertX)
+[![Docker Size](https://img.shields.io/docker/image-size/jokobsk/netalertx?label=Size&logo=Docker&color=0aa8d2&logoColor=fff&style=for-the-badge)](https://hub.docker.com/r/jokobsk/netalertx)
+[![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/netalertx?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff&style=for-the-badge)](https://hub.docker.com/r/jokobsk/netalertx)
+[![GitHub Release](https://img.shields.io/github/v/release/jokob-sk/NetAlertX?color=0aa8d2&logoColor=fff&logo=GitHub&style=for-the-badge)](https://github.com/jokob-sk/NetAlertX/releases)
+[![Discord](https://img.shields.io/discord/1274490466481602755?color=0aa8d2&logoColor=fff&logo=Discord&style=for-the-badge)](https://discord.gg/UQnnHNYV)
+
+# 🖧🔍 Network scanner & notification framework
 
 Get visibility of what's going on on your WIFI/LAN network. Schedule scans for devices, port changes and get alerts if unknown devices or changes are found. Write your own [Plugins](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins#readme) with auto-generated UI and in-build notification system. Build out and easily maintain your network source of truth (NSoT).
 
-[![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/NetAlertX?color=40ba12&label=Committed&logo=GitHub&logoColor=fff)](https://github.com/jokob-sk/NetAlertX)
-[![Docker Size](https://img.shields.io/docker/image-size/jokobsk/netalertx?label=Size&logo=Docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/netalertx)
-[![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/netalertx?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/netalertx)
-[![GitHub Release](https://img.shields.io/github/v/release/jokob-sk/NetAlertX?color=0aa8d2&logoColor=fff&logo=GitHub)](https://github.com/jokob-sk/NetAlertX/releases)
-[![GitHub Sponsors](https://img.shields.io/github/sponsors/jokob-sk?style=social)](https://github.com/sponsors/jokob-sk)
 
   | 🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/netalertx) |  📑 [Docker guide](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md) |🆕 [Release notes](https://github.com/jokob-sk/NetAlertX/releases) | 📚 [All Docs](https://github.com/jokob-sk/NetAlertX/tree/main/docs) | 
   |----------------------|----------------------| ----------------------|  ----------------------| 
@@ -64,7 +65,7 @@ Head to [https://netalertx.com/](https://netalertx.com/) for more gifs and scree
 | Docs        | Link    | 
 |-------------|-------------|
 | 📥🐳  | [Docker instructions](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md) 
-| 📥💻  | [HW install (experimental 🧪)](https://github.com/jokob-sk/NetAlertX/blob/main/docs/HW_INSTALL.md) |
+| 📥🗄️  | [HW install (experimental 🧪)](https://github.com/jokob-sk/NetAlertX/blob/main/docs/HW_INSTALL.md) |
 | 📥🟧  | [Unraid App](https://unraid.net/community/apps) |
 | 📚     | [All Documentation](https://github.com/jokob-sk/NetAlertX/blob/main/docs/README.md) (App Usage and Configuration) |
  
@@ -92,7 +93,7 @@ Thank you to all the wonderful people who are sponsoring this project.
 <!-- SPONSORS-LIST DO NOT MODIFY BELOW -->
 | All Sponsors |
 |---|
-| [iptvcld](https://github.com/iptvcld) |
+| [joel72265](https://github.com/joel72265) |
 
 <!-- SPONSORS-LIST DO NOT MODIFY ABOVE -->
 

back/app.conf

@@ -17,7 +17,7 @@
 # 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']
+SCAN_SUBNETS=['192.168.1.0/24 --interface=eth0']
 TIMEZONE='Europe/Berlin'
 LOADED_PLUGINS = ['ARPSCAN','CSVBCKP','DBCLNP', 'INTRNT','MAINT','NEWDEV','NSLOOKUP','NTFPRCS', 'PHOLUS','SETPWD','SMTP', 'SYNC', 'VNDRPDT', 'WORKFLOWS']
 

docker-compose.yml

@@ -54,6 +54,7 @@ services:
       - ${DEV_LOCATION}/front/presence.php:/app/front/presence.php
       - ${DEV_LOCATION}/front/settings.php:/app/front/settings.php      
       - ${DEV_LOCATION}/front/systeminfo.php:/app/front/systeminfo.php      
+      - ${DEV_LOCATION}/front/account.php:/app/front/account.php      
       - ${DEV_LOCATION}/front/report.php:/app/front/report.php      
       - ${DEV_LOCATION}/front/workflows.php:/app/front/workflows.php      
       - ${DEV_LOCATION}/front/appEventsCore.php:/app/front/appEventsCore.php      
@@ -63,7 +64,9 @@ services:
       # DELETE END anyone trying to use this file: comment out / delete ABOVE lines, they are only for development purposes
       # ---------------------------------------------------------------------------
     environment:
+      # - APP_CONF_OVERRIDE={"SCAN_SUBNETS":"['192.168.1.0/24 --interface=eth1']","UI_dark_mode":"True"}
       - TZ=${TZ}
-      - PORT=${PORT}
+      - PORT=${PORT}      
       # ❗ DANGER ZONE BELOW - Setting ALWAYS_FRESH_INSTALL=true will delete the content of the /db & /config folders
       - ALWAYS_FRESH_INSTALL=${ALWAYS_FRESH_INSTALL}
+      

dockerfiles/README.md

@@ -1,10 +1,11 @@
-[![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/NetAlertX?color=40ba12&label=Committed&logo=GitHub&logoColor=fff)](https://github.com/jokob-sk/NetAlertX)
-[![Docker Size](https://img.shields.io/docker/image-size/jokobsk/netalertx?label=Size&logo=Docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/netalertx)
-[![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/netalertx?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff)](https://hub.docker.com/r/jokobsk/netalertx)
-![GitHub Release](https://img.shields.io/github/v/release/jokob-sk/NetAlertX?color=0aa8d2&logoColor=fff&logo=GitHub)
-[![GitHub Sponsors](https://img.shields.io/github/sponsors/jokob-sk?style=social)](https://github.com/sponsors/jokob-sk)
+[![GitHub Committed](https://img.shields.io/github/last-commit/jokob-sk/NetAlertX?color=40ba12&label=Committed&logo=GitHub&logoColor=fff&style=for-the-badge)](https://github.com/jokob-sk/NetAlertX)
+[![Docker Size](https://img.shields.io/docker/image-size/jokobsk/netalertx?label=Size&logo=Docker&color=0aa8d2&logoColor=fff&style=for-the-badge)](https://hub.docker.com/r/jokobsk/netalertx)
+[![Docker Pulls](https://img.shields.io/docker/pulls/jokobsk/netalertx?label=Pulls&logo=docker&color=0aa8d2&logoColor=fff&style=for-the-badge)](https://hub.docker.com/r/jokobsk/netalertx)
+[![GitHub Release](https://img.shields.io/github/v/release/jokob-sk/NetAlertX?color=0aa8d2&logoColor=fff&logo=GitHub&style=for-the-badge)](https://github.com/jokob-sk/NetAlertX/releases)
+[![Discord](https://img.shields.io/discord/1274490466481602755?color=0aa8d2&logoColor=fff&logo=Discord&style=for-the-badge)](https://discord.gg/UQnnHNYV)
 
-# NetAlertX 💻🔍 Network scanner & notification framework
+
+# NetAlertX 🖧🔍 Network scanner & notification framework
 
   | 🐳 [Docker hub](https://registry.hub.docker.com/r/jokobsk/netalertx) |  📑 [Docker guide](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md) |🆕 [Release notes](https://github.com/jokob-sk/NetAlertX/releases) | 📚 [All Docs](https://github.com/jokob-sk/NetAlertX/tree/main/docs) |
   |----------------------|----------------------| ----------------------|  ----------------------| 
@@ -40,7 +41,8 @@ docker run -d --rm --network=host \
 | `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` |
-|`ALWAYS_FRESH_INSTALL` | Setting  to `true` will delete the content of the `/db` & `/config` folders. For testing purposes. Can be coupled with [watchtower](https://github.com/containrrr/watchtower) to have an always freshly installed `netalertx`/`-dev` image.   |    `N/A` |
+|`APP_CONF_OVERRIDE` | JSON override for settings, e.g. `{"SCAN_SUBNETS":"['192.168.1.0/24 --interface=eth1']","UI_dark_mode":"True"}` (Experimental 🧪)  |  `N/A` |
+|`ALWAYS_FRESH_INSTALL` | If `true` will delete the content of the `/db` & `/config` folders. For testing purposes. Can be coupled with [watchtower](https://github.com/containrrr/watchtower) to have an always freshly installed `netalertx`/`netalertx-dev` image.   |    `N/A` |
 
 ### Docker paths
 
@@ -89,9 +91,10 @@ Use the official installation guides at first and use community content as suppl
 - 📄 [How to Install NetAlertX on Your Synology NAS - Marius hosting](https://mariushosting.com/how-to-install-pi-alert-on-your-synology-nas/) (Updated frequently)
 - 📄 [Using the PiAlert Network Security Scanner on a Raspberry Pi - PiMyLifeUp](https://pimylifeup.com/raspberry-pi-pialert/)
 - ▶ [How to Setup Pi.Alert on Your Synology NAS - Digital Aloha](https://www.youtube.com/watch?v=M4YhpuRFaUg) 
-- 📄 [시놀/헤놀에서 네트워크 스캐너 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)
+- 📄 [防蹭网神器，网络安全助手 | 极空间部署网络扫描和通知系统『NetAlertX』](https://blog.csdn.net/qq_63499861/article/details/141105273)
+- 📄 [시놀/헤놀에서 네트워크 스캐너 Pi.Alert Docker로 설치 및 사용하기](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 (Chinese)](https://codeantenna.com/a/VgUvIAjZ7J) (May 2023)
-- ▶ [Pi.Alert auf Synology & Docker by - Jürgen Barth (German)](https://www.youtube.com/watch?v=-ouvA2UNu-A) (March 2023)
+- ▶ [Pi.Alert auf Synology & Docker by - Jürgen Barth](https://www.youtube.com/watch?v=-ouvA2UNu-A) (March 2023)
 - ▶ [Top Docker Container for Home Server Security - VirtualizationHowto](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](https://www.youtube.com/watch?v=v6an9QG2xF0) (November 2022)
 

dockerfiles/setup.sh

@@ -41,6 +41,16 @@ if [ "$ALWAYS_FRESH_INSTALL" = true ]; then
   rm -rf "$INSTALL_DIR_OLD/db/"*
 fi
 
+# OVERRIDE settings: Handling APP_CONF_OVERRIDE
+# Check if APP_CONF_OVERRIDE is set
+if [ -z "$APP_CONF_OVERRIDE" ]; then
+  echo "APP_CONF_OVERRIDE is not set. Skipping config file creation."
+else
+  # Save the APP_CONF_OVERRIDE env variable as a JSON file
+  echo "$APP_CONF_OVERRIDE" > "${INSTALL_DIR}/config/app_conf_override.json"
+  echo "Config file saved to ${INSTALL_DIR}/config/app_conf_override.json"
+fi
+
 # 🔻 FOR BACKWARD COMPATIBILITY - REMOVE AFTER 12/12/2024
 
 # Check if pialert.db exists, then create a symbolic link to app.db

docs/AUTHELIA.md

@@ -0,0 +1,275 @@
+(DRAFT) Authelia support
+
+
+
+```yaml
+theme: dark
+
+default_2fa_method: "totp"
+
+server:
+  address: 0.0.0.0:9091
+  endpoints:
+    enable_expvars: false
+    enable_pprof: false
+    authz:
+      forward-auth:
+        implementation: 'ForwardAuth'
+        authn_strategies:
+          - name: 'HeaderAuthorization'
+            schemes:
+              - 'Basic'
+          - name: 'CookieSession'
+      ext-authz:
+        implementation: 'ExtAuthz'
+        authn_strategies:
+          - name: 'HeaderAuthorization'
+            schemes:
+              - 'Basic'
+          - name: 'CookieSession'
+      auth-request:
+        implementation: 'AuthRequest'
+        authn_strategies:
+          - name: 'HeaderAuthRequestProxyAuthorization'
+            schemes:
+              - 'Basic'
+          - name: 'CookieSession'
+      legacy:
+        implementation: 'Legacy'
+        authn_strategies:
+          - name: 'HeaderLegacy'
+          - name: 'CookieSession'
+  disable_healthcheck: false
+  tls:
+    key: ""
+    certificate: ""
+    client_certificates: []
+  headers:
+    csp_template: ""
+
+log:
+  ## Level of verbosity for logs: info, debug, trace.
+  level: info
+
+###############################################################
+# The most important section
+###############################################################
+access_control:
+  ## Default policy can either be 'bypass', 'one_factor', 'two_factor' or 'deny'.
+  default_policy: deny
+  networks:
+    - name: internal
+      networks:
+        - '192.168.0.0/18'
+        - '10.10.10.0/8' # Zerotier
+    - name: private
+      networks:
+        - '172.16.0.0/12'
+  rules:
+    - networks:
+        - private
+      domain:
+        - '*'
+      policy: bypass
+    - networks:
+        - internal
+      domain:
+        - '*'
+      policy: bypass
+    - domain:
+        # exclude itself from auth, should not happen as we use Traefik middleware on a case-by-case screnario
+        - 'auth.MYDOMAIN1.TLD'
+        - 'authelia.MYDOMAIN1.TLD'
+        - 'auth.MYDOMAIN2.TLD'
+        - 'authelia.MYDOMAIN2.TLD'
+      policy: bypass
+    - domain:
+        #All subdomains match
+        - 'MYDOMAIN1.TLD'
+        - '*.MYDOMAIN1.TLD'
+      policy: two_factor
+    - domain:
+        # This will not work yet as Authelio does not support multi-domain authentication
+        - 'MYDOMAIN2.TLD'
+        - '*.MYDOMAIN2.TLD'
+      policy: two_factor
+
+
+############################################################
+identity_validation:
+  reset_password:
+    jwt_secret: "[REDACTED]"
+
+identity_providers:
+  oidc:
+    enable_client_debug_messages: true
+    enforce_pkce: public_clients_only
+    hmac_secret: [REDACTED]
+    lifespans:
+      authorize_code: 1m
+      id_token: 1h
+      refresh_token: 90m
+      access_token: 1h
+    cors:
+      endpoints:
+        - authorization
+        - token
+        - revocation
+        - introspection
+        - userinfo
+      allowed_origins:
+        - "*"
+      allowed_origins_from_client_redirect_uris: false
+    jwks:
+      - key: [REDACTED]
+        certificate_chain:
+    clients:
+      - client_id: portainer
+        client_name: Portainer
+        # generate secret with "authelia crypto hash generate pbkdf2 --random --random.length 32 --random.charset alphanumeric"
+        # Random Password: [REDACTED]
+        # Digest: [REDACTED]
+        client_secret: [REDACTED]
+        token_endpoint_auth_method: 'client_secret_post'
+        public: false
+        authorization_policy: two_factor
+        consent_mode: pre-configured #explicit
+        pre_configured_consent_duration: '6M' #Must be re-authorised every 6 Months
+        scopes:
+          - openid
+          #- groups #Currently not supported in Authelia V
+          - email
+          - profile
+        redirect_uris:
+          - https://portainer.MYDOMAIN1.LTD
+        userinfo_signed_response_alg: none
+
+      - client_id: openproject
+        client_name: OpenProject
+        # generate secret with "authelia crypto hash generate pbkdf2 --random --random.length 32 --random.charset alphanumeric"
+        # Random Password: [REDACTED]
+        # Digest: [REDACTED]
+        client_secret: [REDACTED]
+        token_endpoint_auth_method: 'client_secret_basic'
+        public: false
+        authorization_policy: two_factor
+        consent_mode: pre-configured #explicit
+        pre_configured_consent_duration: '6M' #Must be re-authorised every 6 Months
+        scopes:
+          - openid
+          #- groups #Currently not supported in Authelia V
+          - email
+          - profile
+        redirect_uris:
+          - https://op.MYDOMAIN.TLD
+        #grant_types:
+        #  - refresh_token
+        #  - authorization_code
+        #response_types:
+        #  - code
+        #response_modes:
+        #  - form_post
+        #  - query
+        #  - fragment
+        userinfo_signed_response_alg: none
+##################################################################
+
+
+telemetry:
+  metrics:
+    enabled: false
+    address: tcp://0.0.0.0:9959
+
+totp:
+  disable: false
+  issuer: authelia.com
+  algorithm: sha1
+  digits: 6
+  period: 30 ## The period in seconds a one-time password is valid for.
+  skew: 1
+  secret_size: 32
+
+webauthn:
+  disable: false
+  timeout: 60s ## Adjust the interaction timeout for Webauthn dialogues.
+  display_name: Authelia
+  attestation_conveyance_preference: indirect
+  user_verification: preferred
+
+ntp:
+  address: "pool.ntp.org"
+  version: 4
+  max_desync: 5s
+  disable_startup_check: false
+  disable_failure: false
+
+authentication_backend:
+  password_reset:
+    disable: false
+    custom_url: ""
+  refresh_interval: 5m
+  file:
+    path: /config/users_database.yml
+    watch: true
+    password:
+      algorithm: argon2
+      argon2:
+        variant: argon2id
+        iterations: 3
+        memory: 65536
+        parallelism: 4
+        key_length: 32
+        salt_length: 16
+
+password_policy:
+  standard:
+    enabled: false
+    min_length: 8
+    max_length: 0
+    require_uppercase: true
+    require_lowercase: true
+    require_number: true
+    require_special: true
+  ## zxcvbn is a well known and used password strength algorithm. It does not have tunable settings.
+  zxcvbn:
+    enabled: false
+    min_score: 3
+
+regulation:
+  max_retries: 3
+  find_time: 2m
+  ban_time: 5m
+
+session:
+  name: authelia_session
+  secret: [REDACTED]
+  expiration: 60m
+  inactivity: 15m
+  cookies:
+    - domain: 'MYDOMAIN1.LTD'
+      authelia_url: 'https://auth.MYDOMAIN1.LTD'
+      name: 'authelia_session'
+      default_redirection_url: 'https://MYDOMAIN1.LTD'
+    - domain: 'MYDOMAIN2.LTD'
+      authelia_url: 'https://auth.MYDOMAIN2.LTD'
+      name: 'authelia_session_other'
+      default_redirection_url: 'https://MYDOMAIN2.LTD'
+
+storage:
+  encryption_key: [REDACTED]
+  local:
+    path: /config/db.sqlite3
+
+notifier:
+  disable_startup_check: true
+  smtp:
+    address: MYOTHERDOMAIN.LTD:465
+    timeout: 5s
+    username: "USER@DOMAIN"
+    password: "[REDACTED]"
+    sender: "Authelia <postmaster@MYOTHERDOMAIN.LTD>"
+    identifier: NAME@MYOTHERDOMAIN.LTD
+    subject: "[Authelia] {title}"
+    startup_check_address: postmaster@MYOTHERDOMAIN.LTD
+
+```

docs/BACKUPS.md

@@ -8,10 +8,10 @@ There are 3 artifacts that can be used to backup the application:
 | File                  | Description                   | Limitations                   |
 |-----------------------|-------------------------------|-------------------------------|
 | `/db/app.db`       | Database file(s)  | The database file might be in an uncommitted state or corrupted |
-| `/config/app.conf` | Configuration file |   Doesn't contain settings from the Maintenance section        |
+| `/config/app.conf` | Configuration file |  Can be overridden with the [`APP_CONF_OVERRIDE` env variable](https://github.com/jokob-sk/NetAlertX/tree/main/dockerfiles#docker-environment-variables).  |
 | `/config/devices.csv`  | CSV file containing device information |     Doesn't contain historical data        |
 
-## Data and cackup storage
+## Data and backup storage
 
 To decide on a backup strategy, check where the data is stored:
 

docs/DATABASE.md

@@ -17,7 +17,7 @@
   | Pholus_Scan      | Scan results of the Pholus python network penetration script. | ![Screen8][screen8]  |   
   | Plugins_Events   | For capturing events exposed by a plugin via the `last_result.log` file. If unique then saved into the `Plugins_Objects` table. Entries are deleted once processed and stored in the `Plugins_History` and/or `Plugins_Objects` tables.  | ![Screen10][screen10]  | 
   | Plugins_History  | History of all entries from the `Plugins_Events` table | ![Screen11][screen11]  | 
-  | Plugins_Language_Strings  | Language strings colelcted from the plugin `config.json` files used for string resolution in the frontend. | ![Screen12][screen12]  | 
+  | Plugins_Language_Strings  | Language strings collected from the plugin `config.json` files used for string resolution in the frontend. | ![Screen12][screen12]  | 
   | Plugins_Objects  | Unique objects detected by individual plugins. | ![Screen13][screen13]  | 
   | Sessions  | Used to display sessions in the charts | ![Screen15][screen15]  | 
   | Settings  | Database representation of the sum of all settings from `app.conf` and plugins coming from `config.json` files. | ![Screen16][screen16]  | 

docs/DEV_ENV_SETUP.md

@@ -1,4 +1,4 @@
-## Development environemnt set up
+## Development environment set up
 
 >[!NOTE]
 > Replace `/development` with the path where your code files will be stored. The default container name is `netalertx` so there might be a conflict with your running containers.
@@ -52,13 +52,19 @@ A command to stop, remove the container and the image (replace `netalertx` and `
 
 - `sudo docker container stop netalertx ; sudo docker container rm netalertx ; sudo docker image rm netalertx-netalertx`
 
-### Restart hanging python script
+### Restart the server backend
 
-SSH into the container and kill & restart the main script loop 
+Most code changes can be tetsed without rebuilding the container. When working on the python server backend, you only need to restart the server.
+
+1. You can usually restart the backend via Maintenance > Logs > Restart server
+
+![image](/docs/img/DEV_ENV_SETUP/Maintenance_Logs_Restart_server.png)
+
+2. If above doesn't work, SSH into the container and kill & restart the main script loop 
 
 - `sudo docker exec -it netalertx /bin/bash`
 - `pkill -f "python /app/server" && python /app/server & `
 
-
+3. If none of the above work, restart the docker image. This is usually the last resort as sometimes the Docker engine becomes unresponsive and the whole engine needs to be restarted. 
 
 

docs/HOME_ASSISTANT.md

@@ -6,6 +6,7 @@ NetAlertX comes with MQTT support, allowing you to show all detected devices as
 
 - Please note that discovery takes about ~10s per device.
 - Deleting of devices is not handled automatically. Please use [MQTT Explorer](https://mqtt-explorer.com/) to delete devices in the broker (Home Assistant), if needed. 
+- For optimization reasons, the devices are not always fully synchronized. You can delete Plugin objects as described in the [MQTT plugin](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/_publisher_mqtt#forcing-an-update) docs to force a full synchronization.
 
 
 ## 🧭 Guide

docs/PLUGINS_DEV.md

@@ -33,24 +33,9 @@ Example use cases for plugins could be:
 
 If you wish to develop a plugin, please check the existing plugin structure. Once the settings are saved by the user they need to be removed from the `app.conf` file manually if you want to re-initialize them from the `config.json` of the plugin. 
 
-Again, please read the below carefully if you'd like to contribute with a plugin yourself. This documentation file might be outdated, so double-check the sample plugins as well. 
-
 ## ⚠ Disclaimer
 
-Follow the below very carefully and check example plugin(s) if you'd like to write one yourself. Plugin UI is not my priority right now, happy to approve PRs if you are interested in extending/improving the UI experience (See [Frontend guidelines](/docs/FRONTEND_DEVELOPMENT.md)). Example improvements for the taking:
-
-* Making the tables sortable/filterable
-* Using the same approach to display table data as in the Devices section (solves above)
-* Adding form controls supported to display the data (Currently supported ones are listed in the section "UI settings in database_column_definitions" below)
-* ...
-
-## ❗ 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 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. 
+Please read the below carefully if you'd like to contribute with a plugin yourself. This documentation file might be outdated, so double-check the sample plugins as well. 
 
 ## Plugin file structure overview 
 
@@ -67,10 +52,10 @@ These issues will be hopefully fixed with time, so please don't report them. Ins
 
 More on specifics below.
 
-### Column order and values
+### Column order and values (plugins interface contract)
 
 > [!IMPORTANT] 
-> Spend some time reading and trying to understand the below table. This is the interface between the Plugins and the core application.  
+> Spend some time reading and trying to understand the below table. This is the interface between the Plugins and the core application. The application expets 9 or 13 values The first 9 values are mandatory. The next 4 values (`HelpVal1` to `HelpVal4`) are optional. However, if you use any of these optional values (e.g., `HelpVal1`), you need to supply all optional values (e.g., `HelpVal2`, `HelpVal3`, and `HelpVal4`). If a value is not used, it should be padded with `null`.
 
   | Order | Represented Column | Value Required | Description | 
   |----------------------|----------------------|----------------------|----------------------| 
@@ -83,6 +68,11 @@ More on specifics below.
   | 6 | `Watched_Value4` | no | As above  |
   | 7 | `Extra` | no | Any other data you want to pass and display in NetAlertX and the notifications |
   | 8 | `ForeignKey` | no | A foreign key that can be used to link to the parent object (usually a MAC address) |
+  | 9 | `HelpVal1` | no | (optional) A helper value |
+  | 10 | `HelpVal2` | no | (optional) A helper value |
+  | 11 | `HelpVal3` | no | (optional) A helper value |
+  | 12 | `HelpVal4` | no | (optional) A helper value |
+  
 
 > [!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.
@@ -528,6 +518,60 @@ Required attributes are:
 | (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. |
 
+### UI Component Types Documentation
+
+This section outlines the structure and types of UI components, primarily used to build HTML forms or interactive elements dynamically. Each UI component has a `"type"` which defines its structure, behavior, and rendering options.
+
+#### UI Component JSON Structure
+The UI component is defined as a JSON object containing a list of `elements`. Each element specifies how it should behave, with properties like `elementType`, `elementOptions`, and any associated `transformers` to modify the data. The example below demonstrates how a component with two elements (`span` and `select`) is structured:
+
+```json
+{
+      "function": "dev_Icon",
+      "type": {
+        "dataType": "string",
+        "elements": [
+          {
+            "elementType": "span",
+            "elementOptions": [
+              { "cssClasses": "input-group-addon iconPreview" },
+              { "getStringKey": "Gen_SelectToPreview" },
+              { "customId": "NEWDEV_dev_Icon_preview" }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "select",
+            "elementHasInputValue": 1,
+            "elementOptions": [
+              { "cssClasses": "col-xs-12" },
+              {
+                "onChange": "updateIconPreview(this)"
+              },
+              { "customParams": "NEWDEV_dev_Icon,NEWDEV_dev_Icon_preview" }
+            ],
+            "transformers": []
+          }          
+        ]
+      }
+}
+
+```
+
+### Rendering Logic
+
+The code snippet provided demonstrates how the elements are iterated over to generate their corresponding HTML. Depending on the `elementType`, different HTML tags (like `<select>`, `<input>`, `<textarea>`, `<button>`, etc.) are created with the respective attributes such as `onChange`, `my-data-type`, and `class` based on the provided `elementOptions`. Events can also be attached to elements like buttons or select inputs.
+
+### Key Element Types
+
+- **`select`**: Renders a dropdown list. Additional options like `isMultiSelect` and event handlers (e.g., `onChange`) can be attached.
+- **`input`**: Handles various types of input fields, including checkboxes, text, and others, with customizable attributes like `readOnly`, `placeholder`, etc.
+- **`button`**: Generates clickable buttons with custom event handlers (`onClick`), icons, or labels.
+- **`textarea`**: Creates a multi-line input box for text input.
+- **`span`**: Used for inline text or content with customizable classes and data attributes.
+
+Each element may also have associated events (e.g., running a scan or triggering a notification) defined under `Events`.
+
     
 ##### Supported settings `function` values
 

docs/README.md

@@ -63,6 +63,7 @@ There is also an in-app Help / FAQ section that should be answering frequently a
 
 - [Version history (legacy)](/docs/VERSIONS_HISTORY.md)
 - [Reverse proxy (Nginx, Apache, SWAG)](/docs/REVERSE_PROXY.md)
+- [Setting up Authelia](/docs/AUTHELIA.md) (DRAFT)
 
 #### 👩‍💻For Developers👨‍💻
 

docs/REVERSE_DNS.md

@@ -27,6 +27,29 @@ If you are running a DNS server, such as **AdGuard**, set up **Private reverse D
 5. Click **Apply** to save your settings.
 
 
+### Specifying the DNS in the container
+
+You can specify the DNS server in the docker-compose to improve name resolution on your network. 
+
+```yaml
+services:
+  netalertx:
+    container_name: netalertx
+    image: "jokobsk/netalertx:latest"
+    restart: unless-stopped
+    volumes:
+      -  /home/netalertx/config:/app/config
+      -  /home/netalertx/db:/app/db
+      -  /home/netalertx/log:/app/front/log
+    environment:
+      - TZ=Europe/Berlin
+      - PORT=20211
+    network_mode: host
+    dns:
+      - 10.8.0.1
+      - 10.8.0.17
+```
+
 ### Using a custom resolv.conf file
 
 You can configure a custom **/etc/resolv.conf** file in **docker-compose.yml** and set the nameserver to your LAN DNS server (e.g.: Pi-Hole). See the relevant [resolv.conf man](https://www.man7.org/linux/man-pages/man5/resolv.conf.5.html) entry for details. 

docs/SUBNETS.md

@@ -1,107 +1,112 @@
-# Subnets configuration
+# Subnets Configuration
 
-You need to specify the network interface and the network mask. You can also configure multiple subnets and specify VLANS (see exceptions below).
+You need to specify the network interface and the network mask. You can also configure multiple subnets and specify VLANs (see VLAN exceptions below).
 
-> [!TIP]
-> You may need to increase the time between scans `ARPSCAN_RUN_SCHD` and the timeout `ARPSCAN_RUN_TIMEOUT` (and similar setting on related plugins) when adding more subnets. If the timeout setting is exceeded, the scan is cancelled to prevent application hanging from rogue plugins. Check [debugging plugins](/docs/DEBUG_PLUGINS.md) for more tips.
+`ARPSCAN` can scan multiple networks if the network allows it. To scan networks directly, the subnets must be accessible from the network where NetAlertX is running. This means NetAlertX needs to have access to the interface attached to that subnet. You can verify this by running the following command in the container:
 
-## Examples
+`sudo arp-scan --interface=eth0 192.168.1.0/24`
+
+In this example, `--interface=eth0 192.168.1.0/24` represents a neighboring subnet. If this command returns no results, the network is not accessible due to your network or firewall restrictions.
+
+If direct scans are not possible, you can use [supplementing plugins](https://github.com/jokob-sk/NetAlertX/blob/main/front/plugins/README.md) that use alternate methods. Protocols used by the `SNMPDSC` or `DHCPLSS` plugins have good support and usually can be used as a workaround.
+
+Alternatively, you can set up separate NetAlertX instances running on the subnets and synchronize the results into one instance with the [`SYNC` plugin](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/sync).
+
+> [!TIP] 
+> You may need to increase the time between scans `ARPSCAN_RUN_SCHD` and the timeout `ARPSCAN_RUN_TIMEOUT` (and similar settings for related plugins) when adding more subnets. If the timeout setting is exceeded, the scan is canceled to prevent the application from hanging due to rogue plugins.  
+> Check [debugging plugins](/docs/DEBUG_PLUGINS.md) for more tips.
+
+## Example Values
 
 > [!NOTE] 
-> Please use the UI to configure settings as that ensures that the config file is in the correct format. Edit `app.conf` directly only when really necessary.
-> ![settings](/docs/img/SUBNETS/subnets-setting-location.png)
+> Please use the UI to configure settings as it ensures the config file is in the correct format. Edit `app.conf` directly only when really necessary.  
+> ![Settings location](/docs/img/SUBNETS/subnets-setting-location.png)
 
-* Examples for one and two subnets  (❗ Note the `['...','...']` format):
-   * One subnet:   `SCAN_SUBNETS = ['192.168.1.0/24 --interface=eth0']`
-   * Two subnets:  `SCAN_SUBNETS = ['192.168.1.0/24 --interface=eth0','192.168.1.0/24 --interface=eth1 -vlan=107']` 
+* **Examples for one and two subnets:**
+  * One subnet: `SCAN_SUBNETS = ['192.168.1.0/24 --interface=eth0']`
+  * Two subnets: `SCAN_SUBNETS = ['192.168.1.0/24 --interface=eth0','192.168.1.0/24 --interface=eth1 -vlan=107']`
 
+If you get timeout messages, decrease the network mask (e.g.: from `/16` to `/24`) or increase the `TIMEOUT` setting (e.g.: `ARPSCAN_RUN_TIMEOUT` to `300` (5-minute timeout)) for the plugin and the interval between scans (e.g.: `ARPSCAN_RUN_SCHD` to `*/10 * * * *` (scans every 10 minutes)).
+
+---
 
 ## Explanation
 
-### Network mask
+### Network Mask
 
-**Example value: `192.168.1.0/24`**
+**Example value:** `192.168.1.0/24`
 
-The arp-scan time itself depends on the number of IP addresses to check. 
+The `arp-scan` time itself depends on the number of IP addresses to check.
 
-> The number of IPs to check depends on the [network mask](https://www.calculator.net/ip-subnet-calculator.html) you set on the `SCAN_SUBNETS` setting. 
-> For example, a `/24` mask results in 256 IPs to check, whereas a `/16` mask checks around 65,536. Every IP takes a couple of seconds. This means that with an incorrect configuration, the arp-scan will take hours to complete instead of seconds.
+> The number of IPs to check depends on the [network mask](https://www.calculator.net/ip-subnet-calculator.html) you set in the `SCAN_SUBNETS` setting.  
+> For example, a `/24` mask results in 256 IPs to check, whereas a `/16` mask checks around 65,536 IPs. Each IP takes a couple of seconds, so an incorrect configuration could make `arp-scan` take hours instead of seconds.
 
-Specify the network filter (which **significantly** speeds up the scan process). For example, the filter `192.168.1.0/24` covers IP ranges `192.168.1.0` to `192.168.1.255`.
+Specify the network filter, which **significantly** speeds up the scan process. For example, the filter `192.168.1.0/24` covers IP ranges from `192.168.1.0` to `192.168.1.255`.
 
-### Network interface (adapter)
+### Network Interface (Adapter)
 
-**Example value: `--interface=eth0`**
+**Example value:** `--interface=eth0`
 
-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)) 
+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)).
 
 ![Network hardware](/docs/img/SUBNETS/system_info-network_hardware.png)
 
-> [!TIP]
-> Alterantive to `iwconfig` run `ip -o link show | awk -F': ' '!/lo|vir|docker/ {print $2}'` in your container to find your interface name(s) (e.g.: `eth0`, `eth1`).
+> [!TIP]  
+> As an alternative to `iwconfig`, run `ip -o link show | awk -F': ' '!/lo|vir|docker/ {print $2}'` in your container to find your interface name(s) (e.g.: `eth0`, `eth1`).
 
 ### VLANs
 
-**Example value: `-vlan=107`**
+**Example value:** `-vlan=107`
 
-- Append e.g.: ` -vlan=107` to the interface field (e.g.: `eth0 -vlan=107`) for multiple vlans. More details in this [comment in this issue](https://github.com/jokob-sk/NetAlertX/issues/170#issuecomment-1419902988)
+- Append `-vlan=107` to the interface field (e.g.: `eth0 -vlan=107`) for multiple VLANs. More details are available in this [comment](https://github.com/jokob-sk/NetAlertX/issues/170#issuecomment-1419902988).
+
+#### VLANs on a Hyper-V Setup
+
+> Community-sourced content by [mscreations](https://github.com/mscreations) from this [discussion](https://github.com/jokob-sk/NetAlertX/discussions/404).
+
+**Tested Setup:** Bare Metal → Hyper-V on Win Server 2019 → Ubuntu 22.04 VM → Docker → NetAlertX.
+
+**Approach 1 (may cause issues):**  
+Configure multiple network adapters in Hyper-V with distinct VLANs connected to each one using Hyper-V's network setup. However, this action can potentially lead to the Docker host's inability to handle network traffic correctly. This might interfere with other applications such as Authentik.
+
+**Approach 2 (working example):**
+
+Network connections to switches are configured as trunk and allow all VLANs access to the server.
+
+By default, Hyper-V only allows untagged packets through to the VM interface, blocking VLAN-tagged packets. To fix this, follow these steps:
+
+1. Run the following command in PowerShell on the Hyper-V machine:
+
+   ```powershell
+   Set-VMNetworkAdapterVlan -VMName <Docker VM Name> -Trunk -NativeVlanId 0 -AllowedVlanIdList "<comma separated list of vlans>"
+   ```
 
 
-#### VLANs on a Hyper-V setup
+2. Within the VM, set up sub-interfaces for each VLAN to enable scanning. On Ubuntu 22.04, Netplan can be used. In /etc/netplan/00-installer-config.yaml, add VLAN definitions:
 
-> Community sourced content by [mscreations](https://github.com/mscreations) from this [discussion](https://github.com/jokob-sk/NetAlertX/discussions/404).
+  ```yaml
 
-> [!NOTE] 
-> The setup this was tested on: Bare Metal -> Hyper-V on Win Server 2019 -> Ubuntu 22.04 VM -> Docker -> NetAlertX. 
+      network:
+        ethernets:
+          eth0:
+            dhcp4: yes
+        vlans:
+          eth0.2:
+            id: 2
+            link: eth0
+            addresses: [ "192.168.2.2/24" ]
+            routes:
+              - to: 192.168.2.0/24
+                via: 192.168.1.1
+  ```
 
-**Approach 1 (may cause issues):**
+3. Run `sudo netplan apply` to activate the interfaces for scanning in NetAlertX.
 
-Configure multiple network adapters in Hyper-V with distinct VLANs connected to each one using Hyper-V's network setup. However, this action can potentially lead to the Docker host's inability to handle network traffic correctly. The issue may stem from the creation of routes for network time servers or domain controllers on every interface, thereby preventing proper synchronization of the underlying Ubuntu VM. This interference can affect the performance of other applications such as Authentik.
+In this case, use `192.168.2.0/24 --interface=eth0.2` in NetAlertX.
 
-**Approach 2 (working example)**
+#### VLAN Support & Exceptions
 
-Network connections to switches are configured as trunk and allow all VLANs access to the server. 
-
-By default Hyper-V only allows untagged packets through to the VM interface and no VLAN tagged packets get through. In order to fix this follow these steps:
-
-1) Run the following command in Powershell on the Hyper-V machine: 
-
-```shell
-Set-VMNetworkAdapterVlan -VMName <Docker VM Name> -Trunk -NativeVlanId 0 -AllowedVlanIdList "<comma separated list of vlans>"
-```
-
-(There might be other ways how adjust this.)
-
-2) Within the VM, set up sub-interfaces for each of the VLANs so they can be scanned. On Ubuntu 22.04 Netplan can be used.
-
-In /etc/netplan/00-installer-config.yaml, add vlan definitions:
-
-```
-network:
-  ethernets:
-    eth0:
-      dhcp4: yes
-  vlans:
-    eth0.2:
-      id: 2
-      link: eth0
-      addresses: [ "192.168.2.2/24" ]
-      routes:
-        - to: 192.168.2.0/24
-          via: 192.168.1.1 
-```
-
-3) Run `sudo netplan apply` and the interfaces are then available to scan in NetAlertX. 
-4) In this case, use `192.168.2.0/24 --interface=eth0.2` in NetAlertX
-
-#### VLAN 🔍Example:
-
-![Vlan configuration example](/docs/img/SUBNETS/subnets_vlan.png)
-
-#### Support for VLANS (& exceptions)
-
-Please note the accessibility of the macvlans when they are configured on the same computer. My understanding this is a general networking behavior, but feel free to clarify via a PR/issue.
+Please note the accessibility of macvlans when configured on the same computer. This is a general networking behavior, but feel free to clarify via a PR/issue.
 
 - NetAlertX does not detect the macvlan container when it is running on the same computer.
 - NetAlertX recognizes the macvlan container when it is running on a different computer.
-

front/appEventsCore.php

@@ -17,7 +17,7 @@ showSpinner()
 $(document).ready(function() {
 
     // Load JSON data from the provided URL
-    $.getJSON('/api/table_appevents.json', function(data) {
+    $.getJSON('api/table_appevents.json', function(data) {
         // Process the JSON data and generate UI dynamically        
         processData(data)
 

front/css/app.css

@@ -261,7 +261,7 @@
     .main-sidebar {
         padding-top: 50px;
     }
-    .content-header {
+    .content-header #pageTitle{
         display: none;
     }
 }
@@ -745,6 +745,18 @@ height: 50px;
 .infobox_label {
     font-size: 16px !important;
 }
+
+.deviceSelector 
+{
+    display: block;
+}
+
+.deviceSelector  input
+{
+    width: 100% !important;
+    display: inline-grid;
+}
+
 /* --------------------------------------------------------- */
 /*                         report                            */
 /* --------------------------------------------------------- */
@@ -1079,11 +1091,67 @@ input[readonly] {
     margin-bottom:20px;
 }
 
+#settingsPage .select2-selection 
+{
+    width: initial;
+    display: inline-block;
+}
+
+#settingsPage  .form-control
+{
+    min-height: 42px;
+}
+
+#settingsPage  .select2-selection
+{
+    background-color: rgb(96, 96, 96);
+} 
+#settingsPage  .select2-container 
+{
+    width: 100% !important;
+}
+
+#settingsPage  .select2-container  .selection
+{
+    width: 100% !important;
+    display: inline-grid;
+}
+
+
+/* Basic style for the div elements */
+#settingsPage  .setting_overriden_by_env {
+    position: relative;
+    /* width: 300px;
+    height: 200px; */
+    background-color: #f3f3f3;
+    border: 1px solid #ccc;
+    margin: 20px;
+    z-index: 10;
+  }
+
+  /* Style for the overlay */
+  #settingsPage .setting_overriden_by_env::after {
+    content: "Overridden with ENV variable";
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.6); /* semi-transparent black overlay */
+    color: white;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 16px;
+    font-weight: 700;
+    z-index: 11;
+  }
+
 /* ----------------------------------------------------------------- */
 /*                    Devices page                                   */
 /* ----------------------------------------------------------------- */
 
-#txtIconFA {
+.iconPreview {
     min-width: 40px;
 }
 
@@ -1110,18 +1178,18 @@ input[readonly] {
     cursor: -webkit-grab;
 }
 
-.db_info_table_row .select2-container--default .select2-selection--multiple .select2-selection__choice
+.select2-container--default .select2-selection--multiple .select2-selection__choice
 {
-    background-color:#258744;
+    background-color:#258744 !important;
 }
-.db_info_table_row .select2-container--default .select2-selection--multiple
+.select2-container--default .select2-selection--multiple
 {
-    background-color:#606060;
+    background-color:#606060 !important;
 }
 
 .select2-container .select2-dropdown
 {
-    background-color:#606060;
+    background-color:#606060 !important;
 }
 
 .networkPageHelp{
@@ -1390,7 +1458,7 @@ input[readonly] {
 
     opacity: 0.8;
     background-color: #fff;
-    z-index: 99;
+    z-index: 800;
 }
 
 .pa_spinner {
@@ -1403,7 +1471,7 @@ input[readonly] {
     padding: 15px;
     width: 200px;
     background-color: #fff;
-    z-index: 100;
+    z-index: 801;
 }
 
 #loadingSpinner

front/deviceDetails.php

@@ -100,7 +100,7 @@
         <div class="col-lg-12 col-sm-12 col-xs-12">
         <!-- <div class="box-transparent"> -->
           <div id="navDevice" class="nav-tabs-custom">
-            <ul class="nav nav-tabs" style="fon t-size:16px;">
+            <ul class="nav nav-tabs" style="font-size:16px;">
               <li> <a id="tabDetails"  href="#panDetails"  data-toggle="tab"> <?= lang('DevDetail_Tab_Details');?>  </a></li>
               <li> <a id="tabTools"    href="#panTools"    data-toggle="tab"> <?= lang('DevDetail_Tab_Tools');?>    </a></li>
               <li> <a id="tabSessions" href="#panSessions" data-toggle="tab"> <?= lang('DevDetail_Tab_Sessions');?> </a></li>
@@ -197,8 +197,8 @@
                         </label>
                         <div class="col-sm-9">
                           <div class="input-group">
-                            <span class="input-group-addon" id="txtIconFA"></span>
-                            <input class="form-control" id="txtIcon" type="text" value="--" readonly>
+                            <span class="input-group-addon iconPreview" id="txtIconPreview" my-customid="txtIconPreview"></span>
+                            <input class="form-control" id="txtIcon"  my-customid="txtIcon" my-customparams="txtIcon,txtIconPreview" type="text" value="--" readonly>
                             <span class="input-group-addon" title='<?= lang('DevDetail_button_AddIcon_Tooltip');?>'><i class="fa fa-square-plus pointer" onclick="askAddIcon();"></i></span>
                             <span class="input-group-addon" title='<?= lang('DevDetail_button_OverwriteIcons_Tooltip');?>'><i class="fa fa-copy pointer" onclick="askOverwriteIconType();"></i></span>
                             <div class="input-group-btn">
@@ -693,7 +693,6 @@ if ($ENABLED_DARKMODE === True) {
 
   var pos                 = -1;  
   var parPeriod           = 'Front_Details_Period';
-  var parTab              = 'Front_Details_Tab';
   var parSessionsRows     = 'Front_Details_Sessions_Rows';
   var parEventsRows       = 'Front_Details_Events_Rows';
   var parEventsHide       = 'Front_Details_Events_Hide';
@@ -736,7 +735,7 @@ function main () {
   $('#chkHideConnectionEvents')[0].checked = eval(eventsHide == 'true');  
 
   // Initialize components with parameters
-  initializeTabs();
+  initializeTabsNew();
   initializeiCheck();
   initializeCombos();
   initializeDatatables();
@@ -756,24 +755,13 @@ function main () {
 
     // Show device icon as it changes
   $('#txtIcon').on('change input', function() {
-    updateIconPreview('#txtIcon')
+    updateIconPreview(this)
   });
   
        
 }
 
 
-// -----------------------------------------------------------------------------
-function initializeTabs () {
-  // Activate panel
-  $('.nav-tabs a[id='+ tab +']').tab('show');
-
-  // When changed save new current tab
-  $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-    setParameter (parTab, $(e.target).attr('id'));
-  });
-}
-
 // -----------------------------------------------------------------------------
 function initializeiCheck () {
    // Blue
@@ -802,7 +790,6 @@ function initializeiCheck () {
     // Hide / Show Events
     if (event.currentTarget.id == 'chkHideConnectionEvents') {
       getDeviceEvents();
-      setParameter (parEventsHide, event.currentTarget.checked);
     } else {
       // Activate save & restore
       // activateSaveRestoreData();
@@ -1026,25 +1013,6 @@ function initializeDatatables () {
       "info":           "<?= lang('Events_Table_info');?>",
     }
   });
-
-  // Save Parameters rows & order when changed
-  $('#tableSessions').on( 'length.dt', function ( e, settings, len ) {
-    setParameter (parSessionsRows, len);
-
-    // Sync Rows in both datatables
-    // if ( $('#tableEvents').DataTable().page.len() != len) {
-    //   $('#tableEvents').DataTable().page.len( len ).draw();
-    // }
-  } );
-  
-  $('#tableEvents').on( 'length.dt', function ( e, settings, len ) {
-    setParameter (parEventsRows, len);
-
-    // Sync Rows in both datatables
-    // if ( $('#tableSessions').DataTable().page.len() != len) {
-    //   $('#tableSessions').DataTable().page.len( len ).draw();
-    // }
-  } );
 };
 
 
@@ -1148,8 +1116,8 @@ function initializeCalendar () {
           showSpinner()
         } else {
           setTimeout(() => {
-            updateIconPreview('#txtIcon')  
-          }, 100);
+            updateIconPreview($('#txtIcon'))  
+          }, 500);
           
           hideSpinner()
         }
@@ -1161,10 +1129,6 @@ function initializeCalendar () {
 
 // -----------------------------------------------------------------------------
 function periodChanged () {
-  // Save Parameter Period
-  period = $('#period').val();
-  setParameter (parPeriod, period);
-
   // Requery Device data
   getDeviceData(true);
   getSessionsPresenceEvents();
@@ -1324,7 +1288,7 @@ function getDeviceData (readAllData=false) {
         if (deviceData['dev_Favorite'] == 1)         {$('#chkFavorite').iCheck('check');}    else {$('#chkFavorite').iCheck('uncheck');}
         $('#txtGroup').val                           (deviceData['dev_Group']);
         $('#txtLocation').val                        (deviceData['dev_Location']);
-        $('#txtComments').val                        (deviceData['dev_Comments']);        
+        $('#txtComments').val                        (decodeSpecialChars(deviceData['dev_Comments']));        
         $('#txtNetworkNodeMac').val                  ( networkParentMacName) ;
         $('#txtNetworkNodeMac').attr                 ('data-mynodemac', deviceData['dev_Network_Node_MAC_ADDR']);        
         $('#txtNetworkPort').val                     (deviceData['dev_Network_Node_port']);
@@ -1457,15 +1421,15 @@ function setDeviceData (direction='', refreshCallback='') {
 
   // update data to server
   $.get('php/server/devices.php?action=setDeviceData&mac='+ mac
-    + '&name='           + encodeURIComponent($('#txtName').val())
-    + '&owner='          + encodeURIComponent($('#txtOwner').val())
+    + '&name='           + encodeURIComponent($('#txtName').val().replace(/'/g, ""))
+    + '&owner='          + encodeURIComponent($('#txtOwner').val().replace(/'/g, ""))
     + '&type='           + $('#txtDeviceType').val()
-    + '&vendor='         + encodeURIComponent($('#txtVendor').val())
+    + '&vendor='         + encodeURIComponent($('#txtVendor').val().replace(/'/g, ""))
     + '&icon='           + encodeURIComponent($('#txtIcon').val())
     + '&favorite='       + ($('#chkFavorite')[0].checked * 1)
     + '&group='          + encodeURIComponent($('#txtGroup').val())
     + '&location='       + encodeURIComponent($('#txtLocation').val())
-    + '&comments='       + encodeURIComponent($('#txtComments').val())
+    + '&comments='       + encodeURIComponent(encodeSpecialChars($('#txtComments').val()))
     + '&networknode='    + $('#txtNetworkNodeMac').attr('data-mynodemac')
     + '&networknodeport=' + $('#txtNetworkPort').val()
     + '&ssid='            + $('#txtSSID').val()
@@ -1494,7 +1458,7 @@ function setDeviceData (direction='', refreshCallback='') {
       somethingChanged      = false;
 
       // refresh API
-      updateApi()
+      updateApi("devices,appevents")
 
       hideSpinner()
 
@@ -1679,7 +1643,7 @@ function addAsBase64 () {
 
   $('#txtIcon').val(iconHtmlBase64); 
 
-  updateIconPreview('#txtIcon')
+  updateIconPreview($('#txtIcon'))  
 
 }
 
@@ -1714,7 +1678,7 @@ function deleteDevice () {
   $('#panDetails :input').attr('disabled', true);
 
   // refresh API
-  updateApi()
+  updateApi("devices,appevents")
 }
 
 // -----------------------------------------------------------------------------
@@ -1843,12 +1807,6 @@ function initTable(tableId, mac){
 
   $("#"+tableId).attr("data-mac", mac)
 
-  // Save Parameters rows & order when changed
-  $('#'+tableId).on( 'length.dt', function ( e, settings, len ) {
-    setParameter (parSessionsRows, len);
-
-  } );
-
 }
 
 //-----------------------------------------------------------------------------------

front/devices.php

@@ -15,8 +15,6 @@
 <?php
 
   require 'php/templates/header.php';
-  require 'php/templates/graph.php';
-  
 
   // check permissions
   $dbPath = "../db/app.db";
@@ -66,19 +64,37 @@
       </div>
       <script src="js/graph_online_history.js"></script>
       <script>
-        var pia_js_online_history_time = [<?php pia_graph_devices_data($Pia_Graph_Device_Time); ?>];
-        var pia_js_online_history_ondev = [<?php pia_graph_devices_data($Pia_Graph_Device_Online); ?>];
-        var pia_js_online_history_dodev = [<?php pia_graph_devices_data($Pia_Graph_Device_Down); ?>];
-        var pia_js_online_history_ardev = [<?php pia_graph_devices_data($Pia_Graph_Device_Arch); ?>];
-        
-        setTimeout(() => {
-          pia_draw_graph_online_history(
-          pia_js_online_history_time, 
-          pia_js_online_history_ondev, 
-          pia_js_online_history_dodev, 
-          pia_js_online_history_ardev);
-        }, 500);
+        $.get('api/table_online_history.json?nocache=' + Date.now(), function(res) {
+              // Extracting data from the JSON response
+              var timeStamps = [];
+              var onlineCounts = [];
+              var downCounts = [];
+              var offlineCounts = [];
+              var archivedCounts = [];
 
+              res.data.forEach(function(entry) {
+                  var dateObj = new Date(entry.Scan_Date);
+                  var formattedTime = dateObj.toLocaleTimeString([], {hour: '2-digit', minute: '2-digit', hour12: false});
+
+                  timeStamps.push(formattedTime);
+                  onlineCounts.push(entry.Online_Devices);
+                  downCounts.push(entry.Down_Devices);
+                  offlineCounts.push(entry.Offline_Devices);
+                  archivedCounts.push(entry.Archived_Devices);
+              });
+
+              // Call your presenceOverTime function after data is ready
+              presenceOverTime(
+                  timeStamps,
+                  onlineCounts,
+                  offlineCounts,
+                  archivedCounts,
+                  downCounts
+              );
+          }).fail(function() {
+              // Handle any errors in fetching the data
+              console.error('Error fetching online history data.');
+          });
       </script>
 
 <!-- datatable ------------------------------------------------------------- -->
@@ -137,130 +153,70 @@
 <!-- page script ----------------------------------------------------------- -->
 <script>
   var deviceStatus    = 'all';
-  var parTableRows    = 'Front_Devices_Rows';
-  var parTableOrder   = 'Front_Devices_Order';
-  var tableRows       = 10;
-  var tableOrder      = [[3,'desc'], [0,'asc']];
+  var tableRows       = getCookie ("nax_parTableRows") == "" ? 10 : getCookie ("nax_parTableRows") ;
+  var tableOrder      = getCookie ("nax_parTableOrder") == "" ? [[3,'desc'], [0,'asc']] : JSON.parse(getCookie ("nax_parTableOrder")) ;
   
   var tableColumnHide = [];
-
-  //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'),
-                              getString('Device_TableHead_Port'),
-                              getString('Device_TableHead_GUID'),
-                              getString('Device_TableHead_SyncHubNodeName'),
-                              getString('Device_TableHead_NetworkSite'),
-                              getString('Device_TableHead_SSID')
-                            ];
-
-  // generate default order lists of given length
-  var columnsStr = JSON.stringify(Array.from({ length: headersDefaultOrder.length }, (_, i) => i));
-  var tableColumnOrder = Array.from({ length: headersDefaultOrder.length }, (_, i) => i);
-  var tableColumnVisible = tableColumnOrder;
+  var tableColumnOrder = [];
+  var tableColumnVisible = [];
 
   // Read parameters & Initialize components
+  callAfterAppInitialized(main)
   showSpinner();
-  main();
-
 
 // -----------------------------------------------------------------------------
 function main () {
 
-  handleLoadingDialog()
+  //initialize the table headers in the correct order
+  var availableColumns = getSettingOptions("UI_device_columns").split(",");
+  var headersDefaultOrder = availableColumns.map(val => getString(val));
+  var selectedColumns = JSON.parse(getSetting("UI_device_columns").replace(/'/g, '"'));
+
+  // generate default order lists of given length
+  var columnsStr = JSON.stringify(Array.from({ length: headersDefaultOrder.length }, (_, i) => i));
+  tableColumnOrder = Array.from({ length: headersDefaultOrder.length }, (_, i) => i);
+  tableColumnVisible = [];
+
+  // Initialize tableColumnVisible by including all columns from selectedColumns, preserving their order.
+  tableColumnVisible = selectedColumns.map(column => availableColumns.indexOf(column)).filter(index => index !== -1);
+
+  // Add any columns from availableColumns that are not in selectedColumns to the end.
+  const remainingColumns = availableColumns.map((column, index) => index).filter(index => !tableColumnVisible.includes(index));
+
+  // Combine both arrays.
+  tableColumnOrder = tableColumnVisible.concat(remainingColumns);
+
+  // Generate the full array of numbers from 0 to totalLength - 1 of tableColumnOrder
+  const fullArray = Array.from({ length: tableColumnOrder.length }, (_, i) => i);
+
+  // Filter out the elements already present in inputArray
+  const missingNumbers = fullArray.filter(num => !tableColumnVisible.includes(num));
+
+  // Concatenate the inputArray with the missingNumbers
+  tableColumnOrder = [...tableColumnVisible, ...missingNumbers];
+
+  // render table headers
+  html = '';
+                                  
+  for(index = 0; index < tableColumnOrder.length; index++)
+  {
+    html += '<th>' + headersDefaultOrder[tableColumnOrder[index]] + '</th>';
+  }
+
+  $('#tableDevices tr').html(html);  
 
   // Hide UI elements as per settings
   // setTimeout(() => {
     hideUIelements("UI_DEV_SECTIONS")
     
   // }, 10);
+
+  // Initialize components with parameters
+  initializeDatatable(getUrlAnchor('my_devices'));
+  
+  // check if data outdated and show spinner if so
+  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',',')  
-
-  defaultValue = cookieColumnsVisibleStr == "" ? columnsStr : cookieColumnsVisibleStr;
-
-  // get visible columns
-  $.get('php/server/parameters.php?action=get&expireMinutes=525600&defaultValue='+defaultValue+'&parameter=Front_Devices_Columns_Visible&skipcache', function(data) {
-
-    handle_locked_DB(data)
-    
-    // save which columns are in the Devices page visible
-    tableColumnVisible = numberArrayFromString(data);
-
-    // get from cookie if available (need to use decodeURI as saved as part of URI in PHP)
-    cookieColumnsOrderStr = decodeURI(getCookie("Front_Devices_Columns_Order")).replaceAll('%2C',',')
-
-    defaultValue = cookieColumnsOrderStr == "" ? columnsStr : cookieColumnsOrderStr;    
-
-    // get the custom order specified by the user
-    $.get('php/server/parameters.php?action=get&expireMinutes=525600&defaultValue='+defaultValue+'&parameter=Front_Devices_Columns_Order&skipcache', function(data) {
-
-      handle_locked_DB(data)
-    
-      // save the columns order in the Devices page 
-      tableColumnOrder = numberArrayFromString(data);
-
-      html = '';
-                                  
-      for(index = 0; index < tableColumnOrder.length; index++)
-      {
-        html += '<th>' + headersDefaultOrder[tableColumnOrder[index]] + '</th>';
-      }
-
-      $('#tableDevices tr').html(html);   
-
-      // get parameter value
-      $.get('php/server/parameters.php?action=get&defaultValue=50&parameter='+ parTableRows, function(data) {
-        var result = JSON.parse(data);
-
-        result = parseInt(result, 10)
-
-        if (Number.isInteger (result) ) {
-            tableRows = result;  
-        }
-
-        // get parameter value
-        $.get('php/server/parameters.php?action=get&defaultValue=[[3,"desc"],[0,"asc"]]&parameter='+ parTableOrder, function(data) {
-          var result = JSON.parse(data);
-          result = JSON.parse(result);
-
-          
-
-          if (Array.isArray (result) ) {
-            tableOrder = result;
-          }
-
-          // Initialize components with parameters
-
-          initializeDatatable(getUrlAnchor('my_devices'));
-          
-          // check if data outdated and show spinner if so
-          handleLoadingDialog()
-
-
-        });
-      });
-    });
-   });
 }
 
 // -----------------------------------------------------------------------------
@@ -461,6 +417,11 @@ function initializeDatatable (status) {
   }
 
   $.get('api/table_devices.json?nocache=' + Date.now(), function(result) {      
+
+    //  refresh devices cache 
+    devicesListAll_JSON = result["data"]
+    devicesListAll_JSON_str = JSON.stringify(devicesListAll_JSON)
+    setCache('devicesListAll_JSON', devicesListAll_JSON_str)
     
     // query data
     getDevicesTotals(result.data);      
@@ -509,10 +470,6 @@ function initializeDatatable (status) {
         })
     };
 
-    
-    // TODO displayed columns
-
-
     // Check if the DataTable already exists
     if ($.fn.dataTable.isDataTable('#tableDevices')) {
       // The DataTable exists, so destroy it
@@ -520,12 +477,12 @@ function initializeDatatable (status) {
       table.clear().destroy();
     }
 
-    var table=
+    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')]],
+      'lengthMenu'   : [[10, 25, 50, 100, 500, 100000], [10, 25, 50, 100, 500, getString('Device_Tablelenght_all')]],
       'searching'    : true,
 
       'ordering'     : true,
@@ -673,11 +630,11 @@ function initializeDatatable (status) {
 
     // Save cookie Rows displayed, and Parameters rows & order
     $('#tableDevices').on( 'length.dt', function ( e, settings, len ) {
-      setParameter (parTableRows, len);
+      setCookie ("nax_parTableRows", len);
     } );
       
     $('#tableDevices').on( 'order.dt', function () {
-      setParameter (parTableOrder, JSON.stringify (table.order()) );
+      setCookie ("nax_parTableOrder", JSON.stringify (table.order()) );
       setCache ('devicesList', getDevicesFromTable(table) );
     } );
 
@@ -697,8 +654,6 @@ function initializeDatatable (status) {
           // Check if any row is selected
           var anyRowSelected = $('#tableDevices tr.selected').length > 0;
 
-          console.log(anyRowSelected);
-
           // Toggle visibility of element with ID 'multiEdit'
           $('#multiEdit').toggle(anyRowSelected);
       }, 200);

front/events.php

@@ -183,43 +183,31 @@
 
 <!-- page script ----------------------------------------------------------- -->
 <script>
-  var parPeriod       = 'Front_Events_Period';
-  var parTableRows    = 'Front_Events_Rows';
+  var parPeriod       = 'nax_parPeriod';
+  var parTableRows    = 'nax_parTableRows';
 
   var eventsType      = 'all';
-  var period          = '';
-  var tableRows       = 10;
+  var period          = '1 day';
+  var tableRows       = 25;
   
   // Read parameters & Initialize components
   main();
 
 
 // -----------------------------------------------------------------------------
-function main () {
-  // get parameter value
-  $.get('php/server/parameters.php?action=get&defaultValue=1 day&parameter='+ parPeriod, function(data) {
-    var result = JSON.parse(data);
-    if (result) {
-      period = result;
-      $('#period').val(period);
-    }
+function main() {
+  // Get parameter value from cookies instead of server
+  period = getCookie(parPeriod) === "" ? "1 day" : getCookie(parPeriod);
+  $('#period').val(period);
 
-    // get parameter value
-    $.get('php/server/parameters.php?action=get&defaultValue=50&parameter='+ parTableRows, function(data) {
-      var result = JSON.parse(data);
-      result = parseInt(result, 10)
-      if (Number.isInteger (result) ) {
-          tableRows = result;
-      }
+  tableRows = getCookie(parTableRows) === "" ? 50 : parseInt(getCookie(parTableRows), 10);
 
-      // Initialize components
-      initializeDatatable();
+  // Initialize components
+  initializeDatatable();
 
-      // query data
-      getEventsTotals();
-      getEvents (eventsType);
-    });
-  });
+  // Query data
+  getEventsTotals();
+  getEvents(eventsType);
 }
 
 
@@ -281,7 +269,7 @@ function initializeDatatable () {
 
   // Save Parameter rows when changed
   $('#tableEvents').on( 'length.dt', function ( e, settings, len ) {
-    setParameter (parTableRows, len);
+    setCookie(parTableRows, len)
   } );
 };
 
@@ -290,7 +278,8 @@ function initializeDatatable () {
 function periodChanged () {
   // Save Parameter Period
   period = $('#period').val();
-  setParameter (parPeriod, period);
+
+  setCookie(parTableRows, period)
 
   // Requery totals and events
   getEventsTotals();

front/img/svg/netalertx_red_1_backup_cleaned.svg

@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="200"
+   height="200"
+   viewBox="0 0 52.916667 52.916668"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   sodipodi:docname="netalertx_red_1_backup_clened.svg"
+   inkscape:export-filename="C:\Users\jokob\netalertx_red_1.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="true"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="132.22897"
+     inkscape:cy="118.44039"
+     inkscape:window-width="3440"
+     inkscape:window-height="1377"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer6"
+     units="px"
+     width="50px" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect51283"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect51283"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect51278"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect51278"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect51273"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect51273"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect48754"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect48754"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath48972">
+      <path
+         style="fill:#000000;stroke-width:0.280643"
+         id="path48974"
+         width="56.128242"
+         height="56.128246"
+         x="-18.924671"
+         y="-56.198174"
+         transform="rotate(45.438374)"
+         mask="none"
+         sodipodi:type="rect" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask49405">
+      <text
+         xml:space="preserve"
+         style="font-size:60.8695px;line-height:1.25;font-family:Amiri;-inkscape-font-specification:Amiri;display:inline;stroke-width:1.52174"
+         x="66.930733"
+         y="78.642288"
+         id="text49409"
+         transform="scale(1.4861626,0.67287388)"><tspan
+           sodipodi:role="line"
+           id="tspan49407"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Tw Cen MT';-inkscape-font-specification:'Tw Cen MT';fill:#ffffff;stroke-width:1.52174"
+           x="66.930733"
+           y="78.642288">A</tspan></text>
+    </mask>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath50306">
+      <circle
+         style="mix-blend-mode:normal;fill:#d40000;stroke-width:0.176318"
+         id="circle50308"
+         cy="26.458334"
+         cx="26.458334"
+         r="26.458334"
+         clip-path="url(#clipPath48972)"
+         transform="matrix(1.0038771,0,0.00391255,1.0073928,-0.04603368,-0.1228191)" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath48972-7">
+      <path
+         style="fill:#000000;stroke-width:0.280643"
+         id="path48974-5"
+         width="56.128242"
+         height="56.128246"
+         x="-18.924671"
+         y="-56.198174"
+         transform="rotate(45.438374)"
+         mask="none"
+         sodipodi:type="rect" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath50306-6">
+      <circle
+         style="mix-blend-mode:normal;fill:#d40000;stroke-width:0.176318"
+         id="circle50308-5"
+         cy="26.458334"
+         cx="26.458334"
+         r="26.458334"
+         clip-path="url(#clipPath48972)"
+         transform="matrix(1.0038771,0,0.00391255,1.0073928,-0.04603368,-0.1228191)" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect51273">
+      <path
+         id="mask-powermask-path-effect51273_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 71.788348,33.677177 h 2.00083 v 2.173766 h -2.00083 z" />
+      <path
+         style="fill:#000000"
+         id="path51263"
+         sodipodi:type="arc"
+         sodipodi:cx="66.211845"
+         sodipodi:cy="37.490814"
+         sodipodi:rx="3.9464016"
+         sodipodi:ry="1.4616301"
+         sodipodi:start="0"
+         sodipodi:end="0.031086059"
+         sodipodi:open="true"
+         sodipodi:arc-type="arc"
+         d="m 70.158247,37.490814 a 3.9464016,1.4616301 0 0 1 -0.0019,0.04543" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect51278">
+      <path
+         style="fill:#000000"
+         id="path51267"
+         sodipodi:type="arc"
+         sodipodi:cx="66.211845"
+         sodipodi:cy="37.490814"
+         sodipodi:rx="3.9464016"
+         sodipodi:ry="1.4616301"
+         sodipodi:start="0"
+         sodipodi:end="0.031086059"
+         sodipodi:open="true"
+         sodipodi:arc-type="arc" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect51283">
+      <path
+         style="fill:#000000"
+         id="path51271"
+         sodipodi:type="arc"
+         sodipodi:cx="66.211845"
+         sodipodi:cy="37.490814"
+         sodipodi:rx="3.9464016"
+         sodipodi:ry="1.4616301"
+         sodipodi:start="0"
+         sodipodi:end="0.031086059"
+         sodipodi:open="true"
+         sodipodi:arc-type="arc" />
+    </mask>
+    <filter
+       id="mask-powermask-path-effect51273_inverse"
+       inkscape:label="filtermask-powermask-path-effect51273"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect51273_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect51273_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Red 1"
+     style="display:none">
+    <circle
+       style="fill:#ff2a2a;stroke-width:0.176318"
+       id="path31-8"
+       cy="26.458334"
+       cx="26.458334"
+       r="26.458334" />
+  </g>
+  <g
+     inkscape:label="Black"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <ellipse
+       style="fill:#000000;stroke-width:0.176146"
+       id="path31"
+       cy="26.51001"
+       cx="26.458334"
+       rx="26.458334"
+       ry="26.406658" />
+    <circle
+       style="display:inline;fill:#ffffff;stroke-width:0.176318"
+       id="path31-89"
+       mask="url(#mask49405)"
+       transform="translate(-99.990036,0.02979629)"
+       r="26.458334"
+       cy="26.458334"
+       cx="126.45834" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="A - Layer 2"
+     style="display:none">
+    <rect
+       style="fill:#ffffff;stroke-width:0.328992"
+       id="rect48998"
+       width="26.0966"
+       height="6.0620313"
+       x="13.255443"
+       y="41.262722" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="g48055"
+     inkscape:label="Red top"
+     style="display:none;mix-blend-mode:normal">
+    <circle
+       style="mix-blend-mode:normal;fill:#d40000;stroke-width:0.176318"
+       id="circle48752"
+       cy="26.458334"
+       cx="26.458334"
+       r="26.458334"
+       clip-path="url(#clipPath48972)"
+       transform="matrix(1.0038771,0,0.00391255,1.0073928,-0.04603368,-0.1228191)" />
+    <ellipse
+       style="display:inline;mix-blend-mode:normal;fill:#000000;stroke-width:0.43638"
+       id="path50080"
+       clip-path="url(#clipPath50306)"
+       ry="13.739323"
+       rx="16.735666"
+       cy="22.874514"
+       cx="26.36149"
+       transform="translate(0,0.09980904)" />
+    <path
+       style="fill:#000000"
+       id="path51325"
+       sodipodi:type="arc"
+       sodipodi:cx="16.772207"
+       sodipodi:cy="26.090099"
+       sodipodi:rx="4.1291056"
+       sodipodi:ry="7.6004772"
+       sodipodi:start="0"
+       sodipodi:end="0.031086059"
+       sodipodi:arc-type="slice"
+       d="m 20.901313,26.090099 a 4.1291056,7.6004772 0 0 1 -0.002,0.236231 l -4.127111,-0.236231 z" />
+    <path
+       style="fill:#d40000"
+       id="path51717"
+       sodipodi:type="arc"
+       sodipodi:cx="26.441042"
+       sodipodi:cy="-26.531424"
+       sodipodi:rx="10.418671"
+       sodipodi:ry="9.5820541"
+       sodipodi:start="0.82219863"
+       sodipodi:end="2.3054129"
+       sodipodi:arc-type="slice"
+       d="m 33.532115,-19.511189 a 10.418671,9.5820541 0 0 1 -14.074736,0.09049 l 6.983663,-7.110726 z"
+       transform="matrix(1,0,0.0048047,-0.99998846,0,0)" />
+    <path
+       style="fill:#ffffff;stroke-width:0.276214"
+       d="M 145.28835,50.354872 C 127.01317,34.62734 98.057144,30.012421 73.710372,38.947003 c -6.518003,2.391924 -14.288822,6.834002 -19.265958,11.01311 -1.198654,1.006465 -2.270358,1.829935 -2.381565,1.829935 -0.111206,0 -5.210052,-5.102002 -11.33077,-11.337781 L 29.603503,29.114489 30.822139,27.851613 c 0.670251,-0.69458 2.51592,-2.384634 4.101489,-3.755674 C 50.725112,10.43241 69.462577,2.3767456 90.736164,0.10085492 95.380582,-0.39601422 106.33043,-0.31105699 111.03786,0.25837091 133.04363,2.9202648 151.46536,11.26468 167.83762,25.986722 l 3.30701,2.97369 -2.29392,2.320103 c -1.26165,1.276057 -6.58213,6.517685 -11.82329,11.648065 l -9.52936,9.327957 z"
+       id="path52311"
+       transform="scale(0.26458333)" />
+    <path
+       style="fill:#ffffff;stroke-width:0.276214"
+       d="M 86.538548,86.634546 74.145111,73.25799 74.899337,72.758689 c 4.93766,-3.268754 10.138703,-6.508578 16.602198,-7.437693 5.484021,-0.788317 12.228205,-0.984814 16.377135,-0.09119 6.77689,1.459652 11.87156,4.340971 17.02452,7.792011 l 0.97468,0.652765 -1.37124,1.269268 c -0.86863,0.804036 -6.82647,6.676301 -13.34742,13.259175 L 99.423152,99.796276 Z"
+       id="path52350"
+       transform="scale(0.26458333)"
+       inkscape:export-filename="C:\Users\jokob\path52350.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96"
+       sodipodi:nodetypes="ccsssscsscc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Circle"
+     style="display:inline">
+    <path
+       style="fill:#000000"
+       id="path50026"
+       sodipodi:type="arc"
+       sodipodi:cx="71.071762"
+       sodipodi:cy="34.677177"
+       sodipodi:rx="1.7174155"
+       sodipodi:ry="5.5907354"
+       sodipodi:start="0"
+       sodipodi:end="0.031086059"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       mask="url(#mask-powermask-path-effect51273)"
+       d="m 72.789178,34.677177 a 1.7174155,5.5907354 0 0 1 -8.3e-4,0.173766"
+       inkscape:path-effect="#path-effect51273" />
+    <path
+       style="fill:#ffffff;stroke-width:0.276214"
+       d="m 151.08883,181.46994 -2.76213,-2.60427 -48.802077,-0.009 -48.802075,-0.009 -2.292573,2.48592 c -1.260915,1.36726 -2.431589,2.48592 -2.601499,2.48592 -0.869396,0 -9.118995,-6.36599 -13.713669,-10.58246 l -2.688104,-2.46684 34.973647,-35.11455 c 19.235503,-19.313 34.922993,-35.39075 35.029879,-35.39075 0.106889,0 16.231201,16.10588 35.663001,35.45326 l 35.33055,35.17705 -2.48592,2.35505 c -3.08951,2.92687 -7.41515,6.40509 -11.09719,8.92319 -1.54594,1.05725 -2.85105,1.91728 -2.90024,1.9112 -0.0492,-0.006 -1.33242,-1.183 -2.8516,-2.61535 z m -38.4631,-38.32188 -13.050732,-13.05073 -13.050727,13.05073 -13.050725,13.05072 h 26.101452 26.101452 z"
+       id="path52389"
+       transform="scale(0.26458333)"
+       inkscape:export-filename="C:\Users\jokob\path52389.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96"
+       sodipodi:nodetypes="ccccssscssscsscccccccccc" />
+    <path
+       style="fill:#d40000;stroke-width:0.276214"
+       d="M 86.416478,86.793237 C 73.427951,73.815968 73.387119,73.801376 73.387119,73.801376 c 3.874197,-3.341721 11.025508,-6.981646 17.312424,-8.529335 2.339787,-0.576001 4.881362,-1.25628 8.810591,-1.259564 4.438736,-0.0037 8.292516,0.857843 13.253396,2.535104 4.59135,1.552325 7.8315,3.224336 11.49958,5.934101 l 1.61476,1.192897 -2.31005,2.336325 c -1.27053,1.284978 -7.22284,7.16236 -13.22736,13.060849 L 99.423152,99.796276 C 95.128284,95.409033 87.282899,87.658907 86.416478,86.793237 Z"
+       id="path52465"
+       transform="scale(0.26458333)"
+       sodipodi:nodetypes="sssssscsscs" />
+    <path
+       style="fill:#d40000;stroke-width:0.074168"
+       d="M 38.412677,13.39572 C 34.322163,9.945267 28.437517,8.4874766 22.684204,9.4993379 19.419721,10.073478 16.752307,11.410793 13.835187,13.872492 l -0.14691,0.126732 -0.587936,-0.661605 c -0.268568,-0.30222 -1.619514,-1.65761 -2.963235,-3.048642 L 7.7265561,7.8632145 7.9975963,7.5868118 C 9.8344314,5.713635 13.005888,3.476019 15.380049,2.3878744 20.659765,-0.03196726 26.24205,-0.73479764 31.856076,0.42838695 36.599757,1.4112419 40.746004,3.5106537 44.46876,7.1557672 l 0.709881,0.6950753 -0.663694,0.69037 C 44.080041,8.9935983 42.672626,10.391271 41.3963,11.655819 L 39.075708,13.955 Z"
+       id="path52504"
+       inkscape:export-filename="C:\Users\jokob\path52504.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96"
+       sodipodi:nodetypes="ssscsccsssscsscs" />
+  </g>
+</svg>

front/index.php

@@ -3,11 +3,13 @@
 
 <?php
 require dirname(__FILE__).'/php/server/init.php';
-require 'php/templates/security.php';
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
 
 $CookieSaveLoginName = 'NetAlertX_SaveLogin';
 
-if ($Pia_WebProtection != 'true')
+if ($nax_WebProtection != 'true')
 {
     header('Location: devices.php');
     $_SESSION["login"] = 1;
@@ -24,7 +26,7 @@ if (isset ($_GET["action"]) && $_GET["action"] == 'logout')
 }
 
 // Password without Cookie check -> pass and set initial cookie
-if (isset ($_POST["loginpassword"]) && $Pia_Password == hash('sha256',$_POST["loginpassword"]))
+if (isset ($_POST["loginpassword"]) && $nax_Password == hash('sha256',$_POST["loginpassword"]))
 {
     header('Location: devices.php');
     $_SESSION["login"] = 1;
@@ -32,7 +34,7 @@ if (isset ($_POST["loginpassword"]) && $Pia_Password == hash('sha256',$_POST["lo
 }
 
 // active Session or valid cookie (cookie not extends)
-if (( isset ($_SESSION["login"]) && ($_SESSION["login"] == 1)) || (isset ($_COOKIE[$CookieSaveLoginName]) && $Pia_Password == $_COOKIE[$CookieSaveLoginName]))
+if (( isset ($_SESSION["login"]) && ($_SESSION["login"] == 1)) || (isset ($_COOKIE[$CookieSaveLoginName]) && $nax_Password == $_COOKIE[$CookieSaveLoginName]))
 {
     header('Location: devices.php');
     $_SESSION["login"] = 1;
@@ -40,7 +42,7 @@ if (( isset ($_SESSION["login"]) && ($_SESSION["login"] == 1)) || (isset ($_COOK
 }
 
 $login_headline = lang('Login_Toggle_Info_headline');
-$login_info = "";
+$login_info = lang('Login_Info');
 $login_mode = 'danger';
 $login_display_mode = 'display: block;';
 $login_icon = 'fa-info';
@@ -48,7 +50,7 @@ $login_icon = 'fa-info';
 // no active session, cookie not checked
 if (isset ($_SESSION["login"]) == FALSE || $_SESSION["login"] != 1)
 {
-  if ($Pia_Password == '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92') 
+  if ($nax_Password == '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92') 
   {
     $login_info = lang('Login_Default_PWD');
     $login_mode = 'danger';
@@ -78,7 +80,7 @@ if (isset ($_SESSION["login"]) == FALSE || $_SESSION["login"] != 1)
   <meta http-equiv="Pragma" content="no-cache" />
   <meta http-equiv="Expires" content="0" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>Net Alert X | Log in</title>
+  <title>NetAlert X | Log in</title>
   <!-- Tell the browser to be responsive to screen width -->
   <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
   <!-- Bootstrap 3.3.7 -->
@@ -91,6 +93,13 @@ if (isset ($_SESSION["login"]) == FALSE || $_SESSION["login"] != 1)
   <link rel="stylesheet" href="lib/AdminLTE/dist/css/AdminLTE.min.css">
   <!-- iCheck -->
   <link rel="stylesheet" href="lib/AdminLTE/plugins/iCheck/square/blue.css">
+  <!-- Font Awesome -->
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/font-awesome/css/fontawesome.min.css">
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/font-awesome/css/solid.css">
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/font-awesome/css/brands.css">
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/font-awesome/css/v5-font-face.css">
+  <!-- Favicon -->
+  <link id="favicon" rel="icon" type="image/x-icon" href="img/NetAlertX_logo.png">
 
   <!-- Dark-Mode Patch -->
 <?php
@@ -104,7 +113,7 @@ if ($ENABLED_DARKMODE === True) {
 <body class="hold-transition login-page">
 <div class="login-box login-custom">
   <div class="login-logo">
-    <a href="/index2.php">Net <b>Alert</b><sup>x</sup></a>
+    <a href="/index2.php">Net<b>Alert</b><sup>x</sup></a>
   </div>
   <!-- /.login-logo -->
   <div class="login-box-body">
@@ -140,11 +149,9 @@ if ($ENABLED_DARKMODE === True) {
   </div>
   <!-- /.login-box-body -->
 
-
-
   <div id="myDIV" class="box-body" style="margin-top: 50px; <?php echo $login_display_mode;?>">
       <div class="alert alert-<?php echo $login_mode;?> alert-dismissible">
-          <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><EFBFBD></button>
+          <button type="button" class="close" onclick="Passwordhinfo()" aria-hidden="true">X</button>
           <h4><i class="icon fa <?php echo $login_icon;?>"></i><?php echo $login_headline;?></h4>
           <p><?php echo $login_info;?></p>
       </div>

front/js/common.js

@@ -10,9 +10,10 @@
 // -----------------------------------------------------------------------------
 var timerRefreshData = ''
 
-var emptyArr            = ['undefined', "", undefined, null, 'null'];
-var UI_LANG = "English";
-var settingsJSON = {}
+var   emptyArr      = ['undefined', "", undefined, null, 'null'];
+var   UI_LANG       = "English";
+const allLanguages  = ["en_us", "es_es", "de_de", "fr_fr", "it_it", "ru_ru", "nb_no", "pl_pl", "pt_br", "tr_tr", "zh_cn", "cs_cz"]; // needs to be same as in lang.php
+var   settingsJSON  = {}
 
 
 // -----------------------------------------------------------------------------
@@ -207,101 +208,142 @@ function getSetting (key) {
 // -----------------------------------------------------------------------------
 // Get language string
 // -----------------------------------------------------------------------------
-function cacheStrings()
-{  
+function cacheStrings() {
   return new Promise((resolve, reject) => {
-    if(!getCache('completedCalls').includes('cacheStrings'))
-    {
-      // handle core strings and translations
-      var allLanguages = ["en_us", "es_es", "de_de", "fr_fr", "it_it", "ru_ru", "nb_no", "pl_pl", "zh_cn"]; // needs to be same as in lang.php
-
-      allLanguages.forEach(function (language_code) {
-        $.get(`php/templates/language/${language_code}.json?nocache=${Date.now()}`, function (res) {
-          // Iterate over each language
-          Object.entries(res).forEach(([key, value]) => {
-            // Store translations for each key-value pair
-            setCache(`pia_lang_${key}_${language_code}`, value)
-          });
-
-          // handle strings and translations from plugins
-          $.get(`api/table_plugins_language_strings.json?nocache=${Date.now()}`, function(res) {    
-                
-            data = res["data"];       
-
-            data.forEach((langString) => {      
-              setCache(`pia_lang_${langString.String_Key}_${langString.Language_Code}`, langString.String_Value) 
-            });        
-          }).then(() => handleSuccess('cacheStrings', resolve())).catch(() => handleFailure('cacheStrings', reject("cacheStrings already completed"))); // handle AJAX synchronization
+    
+      // Create a promise for each language
+      languagesToLoad = ['en_us', getLangCode()]
+      const languagePromises = languagesToLoad.map((language_code) => {
+        return new Promise((resolveLang, rejectLang) => {
+          // Fetch core strings and translations
           
+          $.get(`php/templates/language/${language_code}.json?nocache=${Date.now()}`)
+            .done((res) => {
+              // Iterate over each key-value pair and store the translations
+              Object.entries(res).forEach(([key, value]) => {
+                setCache(`pia_lang_${key}_${language_code}`, value);
+              });
+
+              // Fetch strings and translations from plugins
+              $.get(`api/table_plugins_language_strings.json?nocache=${Date.now()}`)
+                .done((pluginRes) => {
+                  const data = pluginRes["data"];
+                  
+                  // Store plugin translations
+                  data.forEach((langString) => {
+                    setCache(`pia_lang_${langString.String_Key}_${langString.Language_Code}`, langString.String_Value);
+                  });
+
+                  // Handle successful completion of language processing
+                  handleSuccess(`cacheStrings[${language_code}]`, resolveLang);
+                })
+                .fail((pluginError) => {
+                  // Handle failure in plugin strings fetching
+                  rejectLang(pluginError);
+                });
+            })
+            .fail((error) => {
+              // Handle failure in core strings fetching
+              rejectLang(error);
+            });
         });
       });
-    }
+
+      // Wait for all language promises to complete
+      Promise.all(languagePromises)
+        .then(() => {
+          // All languages processed successfully
+          resolve();
+        })
+        .catch((error) => {
+          // Handle failure in any of the language processing
+          handleFailure('cacheStrings', reject);
+        });
+    
   });
 }
 
+// -----------------------------------------------------------------------------
 // Get translated language string
-function getString (key) {
+function getString(key) {
 
-  // handle initial load to make sure everything is set-up and cached
-  handleFirstLoad(getString)
- 
-  UI_LANG = getSetting("UI_LANG");
+  function fetchString(key) {
+    
+    lang_code = getLangCode();
 
-  lang_code = 'en_us';
+    let result = getCache(`pia_lang_${key}_${lang_code}`, true);
 
-  switch(UI_LANG)
-  {
-    case 'English': 
-      lang_code = 'en_us';
-      break;
-    case 'Spanish': 
-      lang_code = 'es_es';
-      break;
-    case 'German': 
-      lang_code = 'de_de';
-      break;
-    case 'French': 
-      lang_code = 'fr_fr';
-      break;
-    case 'Norwegian': 
-      lang_code = 'nb_no';
-      break;
-    case 'Polish (pl_pl)': 
-      lang_code = 'pl_pl';
-      break;
-    case 'Portuguese (pt_br)': 
-      lang_code = 'pt_br';
-      break;
-    case 'Turkish (tr_tr)': 
-      lang_code = 'tr_tr';
-      break;
-    case 'Italian (it_it)': 
-      lang_code = 'it_it';
-      break;
-    case 'Russian': 
-      lang_code = 'ru_ru';
-      break;
-    case 'Chinese (zh_cn)': 
-      lang_code = 'zh_cn';
-      break;
-  }
-  result = getCache(`pia_lang_${key}_${lang_code}`, true);
+    if (isEmpty(result)) {
+      result = getCache(`pia_lang_${key}_en_us`, true);
+    }
 
-
-  if(isEmpty(result))
-  {    
-    result = getCache(`pia_lang_${key}_en_us`, true);
+    return result;
   }
 
-  return result;
+  if (isAppInitialized()) {
+    return fetchString(key);
+  } else {
+    callAfterAppInitialized(() => fetchString(key));
+  }
 }
 
+// -----------------------------------------------------------------------------
+// Get current language ISO code
+function getLangCode() {
+
+    UI_LANG = getSetting("UI_LANG");
+
+    let lang_code = 'en_us';
+
+    switch (UI_LANG) {
+      case 'English':
+        lang_code = 'en_us';
+        break;
+      case 'Spanish':
+        lang_code = 'es_es';
+        break;
+      case 'German':
+        lang_code = 'de_de';
+        break;
+      case 'French':
+        lang_code = 'fr_fr';
+        break;
+      case 'Norwegian':
+        lang_code = 'nb_no';
+        break;
+      case 'Polish (pl_pl)':
+        lang_code = 'pl_pl';
+        break;
+      case 'Portuguese (pt_br)':
+        lang_code = 'pt_br';
+        break;
+      case 'Turkish (tr_tr)':
+        lang_code = 'tr_tr';
+        break;
+      case 'Italian (it_it)':
+        lang_code = 'it_it';
+        break;
+      case 'Russian':
+        lang_code = 'ru_ru';
+        break;
+      case 'Chinese (zh_cn)':
+        lang_code = 'zh_cn';
+        break;
+      case 'Czech (cs_cz)':
+        lang_code = 'cs_cz';
+        break;
+    }
+
+    return lang_code;
+}
 
 
 
 // -----------------------------------------------------------------------------
 // String utilities
 // -----------------------------------------------------------------------------
+
+// ----------------------------------------------------
 function jsonSyntaxHighlight(json) {
   if (typeof json != 'string') {
        json = JSON.stringify(json, undefined, 2);
@@ -324,6 +366,7 @@ function jsonSyntaxHighlight(json) {
   });
 }
 
+// ----------------------------------------------------
 function isValidBase64(str) {
   // Base64 characters set
   var base64CharacterSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -333,6 +376,46 @@ function isValidBase64(str) {
   return invalidCharacters === '';
 }
 
+// ----------------------------------------------------
+function isValidJSON(jsonString) {
+  try {
+      JSON.parse(jsonString);
+      return true;
+  } catch (e) {
+      return false;
+  }
+}
+
+// ----------------------------------------------------
+// method to sanitize input so that HTML and other things don't break
+function encodeSpecialChars(str) {
+  return str
+      .replace(/&/g, '&')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#039;');
+}
+// ----------------------------------------------------
+function decodeSpecialChars(str) {
+  return str
+      .replace(/&amp;/g, '&')
+      .replace(/&lt;/g, '<')
+      .replace(/&gt;/g, '>')
+      .replace(/&quot;/g, '"')
+      .replace(/&#039;/g, '\'');
+}
+
+// ----------------------------------------------------
+// base64 conversion of UTF8 chars
+function utf8ToBase64(str) {
+  // Convert the string to a Uint8Array using TextEncoder
+  const utf8Bytes = new TextEncoder().encode(str);
+  
+  // Convert the Uint8Array to a base64-encoded string
+  return btoa(String.fromCharCode(...utf8Bytes));
+}
+
 
 // -----------------------------------------------------------------------------
 // General utilities
@@ -361,6 +444,7 @@ function handle_locked_DB(data)
     showSpinner()
 
     setTimeout(function() {
+      console.warn("Database locked - reload")
       location.reload(); 
     }, 5000);
   }
@@ -373,29 +457,6 @@ function numberArrayFromString(data)
   return data.replace(/\[|\]/g, '').split(',').map(Number);
 }
 
-// -----------------------------------------------------------------------------
-function setParameter (parameter, value) {
-  // Retry
-  $.get('php/server/parameters.php?action=set&parameter=' + parameter +
-    '&value='+ value,
-  function(data) {
-    if (data != "OK") {
-      // Retry
-      sleep (200);
-      $.get('php/server/parameters.php?action=set&parameter=' + parameter +
-        '&value='+ value,
-        function(data) {
-          if (data != "OK") {
-          // alert (data);
-          } else {
-          // alert ("OK. Second attempt");
-          };
-      } );
-    };
-  } );
-}
-
-
 // -----------------------------------------------------------------------------  
 function saveData(functionName, id, value) {
   $.ajax({
@@ -580,17 +641,11 @@ function debugTimer () {
 
 // -----------------------------------------------------------------------------
 function secondsSincePageLoad() {
-  // Get the current time
-  var currentTime = Date.now();
-
-  // Get the time when the page was loaded
-  var pageLoadTime = performance.timeOrigin;
-
-  // Calculate the difference in milliseconds
-  var timeDifference = currentTime - pageLoadTime;
+  // Get the current time since the page was loaded
+  var timeSincePageLoad = performance.now();
 
   // Convert milliseconds to seconds
-  var secondsAgo = Math.floor(timeDifference / 1000);
+  var secondsAgo = Math.floor(timeSincePageLoad / 1000);
 
   return secondsAgo;
 }
@@ -631,7 +686,7 @@ function openUrl(urls) {
 // -----------------------------------------------------------------------------
 function navigateToDeviceWithIp (ip) {
 
-  $.get('api/table_devices.json', function(res) {    
+  $.get('api/table_devices.json?nocache=' + Date.now(), function(res) {    
         
     devices = res["data"];
 
@@ -835,15 +890,15 @@ function getDeviceDataByMac(macAddress, dbColumn) {
 }
 
 // -----------------------------------------------------------------------------
-// Cache teh devices as one JSON
+// Cache the devices as one JSON
 function cacheDevices()
 { 
 
   return new Promise((resolve, reject) => {
 
-    if(!getCache('completedCalls').includes('cacheDevices'))
-    {
-      $.get('api/table_devices.json', function(data) {    
+    // if(!getCache('completedCalls').includes('cacheDevices'))
+    // {
+      $.get('api/table_devices.json?nocache=' + Date.now(), function(data) {    
         
         // console.log(data)
 
@@ -866,7 +921,8 @@ function cacheDevices()
         // console.log(getCache('devicesListAll_JSON'))
       }).then(() => handleSuccess('cacheDevices', resolve())).catch(() => handleFailure('cacheDevices', reject("cacheDevices already completed"))); // handle AJAX synchronization
     } 
-  });
+  // }
+);
 }
 
 var devicesListAll_JSON      = [];   // this will contain a list off all devices 
@@ -918,6 +974,8 @@ function showSpinner(stringKey='Loading')
     text = getString(stringKey)
   }
 
+  text = isEmpty(text) ?  "Loading" : text;
+
   if($("#loadingSpinner").length)
   {    
     $("#loadingSpinner").show();
@@ -948,11 +1006,11 @@ function hideSpinner()
 
 // --------------------------------------------------------
 // Calls a backend function to add a front-end event to an execution queue
-function updateApi()
+function updateApi(apiEndpoints)
 {
 
   // value has to be in format event|param. e.g. run|ARPSCAN
-  action = `${getGuid()}|update_api|devices,appevents`
+  action = `${getGuid()}|update_api|${apiEndpoints}`
 
 
   $.ajax({
@@ -1093,6 +1151,54 @@ function arraysContainSameValues(arr1, arr2) {
   }
 }
 
+// -----------------------------------------------------------------------------
+// Hide elements on the page based on the supplied setting
+function hideUIelements(settingKey) {
+
+  hiddenSectionsSetting = getSetting(settingKey)
+  
+  if(hiddenSectionsSetting != "") // handle if settings not yet initialized
+  {
+
+    sectionsArray = createArray(hiddenSectionsSetting)
+
+    // remove spaces to get IDs
+    var newArray = $.map(sectionsArray, function(value) {
+        return value.replace(/\s/g, '');
+    });
+
+    $.each(newArray, function(index, hiddenSection) {
+
+      if($('#' + hiddenSection))
+      {
+        $('#' + hiddenSection).hide()      
+      }    
+      
+    });
+  }
+
+}
+
+
+
+// -----------------------------------------------------------------------------
+// apply dark mode
+
+$(document).ready(function() {
+  // Assume getSetting is a function that returns true or false for dark mode
+  if (getSetting("UI_dark_mode") === "True") {
+    // Add the dark mode stylesheet
+    setCookie("UI_dark_mode", "True")
+    $('head').append('<link rel="stylesheet" href="css/dark-patch.css">');
+    // Set the background image for dark mode
+    $('body').attr('style', 'background-image: url(\'img/boxed-bg-dark.png\');');
+  } else {
+    setCookie("UI_dark_mode", "False")
+    // Set the background image for light mode
+    $('body').attr('style', 'background-image: url(\'img/background.png\');');
+  }
+});
+
 // -----------------------------------------------------------------------------
 // initialize
 // -----------------------------------------------------------------------------
@@ -1102,6 +1208,8 @@ function arraysContainSameValues(arr1, arr2) {
 const sessionStorageKey = "myScriptExecuted_common_js";
 var completedCalls = []
 var completedCalls_final = ['cacheSettings', 'cacheStrings', 'cacheDevices'];
+var completedCallsCount  = 0; 
+var completedCallsCount_final;
 
 // -----------------------------------------------------------------------------
 // Clearing all the caches
@@ -1110,8 +1218,9 @@ function clearCache() {
   sessionStorage.clear();
   localStorage.clear();
   setTimeout(() => {
-  window.location.reload();
-}, 500);
+    console.warn("clearChache called");
+    window.location.reload();
+  }, 500);
 }
 
 // -----------------------------------------------------------------------------
@@ -1139,10 +1248,28 @@ async function handleFirstLoad(callback) {
   }
 }
 
+// -----------------------------------------------------------------------------
+// Execute callback once app initialized
+function callAfterAppInitialized(callback) {
+  if (!isAppInitialized()) {
+    setTimeout(() => {
+      callAfterAppInitialized(callback)
+    }, 500);
+  } else
+  {
+    callback();
+  }
+}
+
 // -----------------------------------------------------------------------------
 // Check if the code has been executed before by checking sessionStorage
 function isAppInitialized() {
-   return arraysContainSameValues(getCache("completedCalls").split(',').filter(Boolean), completedCalls_final);
+  //  return arraysContainSameValues(getCache("completedCalls").split(',').filter(Boolean), completedCalls_final);
+
+  // loading settings + 1 (or 2 language files if not english) + device cache.
+  completedCallsCount_final = getLangCode() == 'en_us' ? 3  : 4 ;
+
+  return (parseInt(getCache("completedCallsCount")) >=  completedCallsCount_final);
 }
 
 // Define a function that will execute the code only once
@@ -1151,9 +1278,10 @@ async function executeOnce() {
 
   if (!isAppInitialized()) {
     try {
-      await cacheStrings();
-      await cacheSettings();
       await cacheDevices();
+      await cacheSettings();
+      await cacheStrings();     
+      
       console.log("✅ All AJAX callbacks have completed");
       onAllCallsComplete();
     } catch (error) {
@@ -1166,8 +1294,20 @@ async function executeOnce() {
 // Function to handle successful completion of an AJAX call
 const handleSuccess = (callName) => {
   console.log(`AJAX call successful: ${callName}`);
-  completedCalls.push(callName);
-  setCache('completedCalls', mergeUniqueArrays(getCache('completedCalls').split(','), [callName]));
+  // completedCalls.push(callName);
+  // setCache('completedCalls', mergeUniqueArrays(getCache('completedCalls').split(','), [callName]));
+
+  val = getCache('completedCallsCount');
+
+  if(val == "")
+  {
+    val = 0;
+  } else
+  {
+    val = parseInt(val)
+  }
+
+  setCache('completedCallsCount', val + 1)
 };
 
 // -----------------------------------------------------------------------------
@@ -1190,6 +1330,10 @@ const onAllCallsComplete = () => {
     sessionStorage.setItem(sessionStorageKey + '_time', millisecondsNow);
 
     console.log('✔ Cache initialized');
+    // setTimeout(() => {
+    //   location.reload()
+    // }, 10);
+   
   } else {
     // If not all strings are initialized, retry initialization
     console.log('❌ Not all strings are initialized. Retrying...');
@@ -1199,25 +1343,25 @@ const onAllCallsComplete = () => {
 
   // Call any other initialization functions here if needed
 
-  // No need for location.reload() here
 };
 
 // Function to check if all necessary strings are initialized
 const areAllStringsInitialized = () => {
   // Implement logic to check if all necessary strings are initialized
   // Return true if all strings are initialized, false otherwise
-  return getString('UI_LANG') != ""
+  return getString('UI_LANG_name') != ""
 };
 
 // Call the function to execute the code
 executeOnce();
 
-// Set timer for regular checks 
+// Set timer for regular UI refresh if enabled 
 setTimeout(() => {
 
   // page refresh if configured
   const refreshTime = getSetting("UI_REFRESH");
   if (refreshTime && refreshTime !== "0" && refreshTime !== "") {
+    console.log("Refreshing page becasue UI_REFRESH setting enabled.");
     newTimerRefreshData(clearCache, parseInt(refreshTime)*1000);
   }
 

front/js/db_methods.js

@@ -89,7 +89,7 @@ function checkDbLock() {
     type: "GET",
 
     success: function (response) {
-      console.log(response);
+      // console.log(response);
       if (response == 0) {
         // console.log('Database is not locked');
         $(".header-status-locked-db").hide();

front/js/graph_online_history.js

@@ -1,13 +1,17 @@
-function pia_draw_graph_online_history(pia_js_graph_online_history_time, pia_js_graph_online_history_ondev, pia_js_graph_online_history_dodev, pia_js_graph_online_history_ardev) {
-        var xValues = pia_js_graph_online_history_time;
-
-        // alert("dev presence")
+function presenceOverTime(
+    timeStamp, 
+    onlineCount, 
+    offlineCount, 
+    archivedCount,
+    downCount
+  ) {
+        var xValues = timeStamp;
 
         // Data object for online status
         onlineData = {
           label: 'Online',
-          data: pia_js_graph_online_history_ondev,
-          borderColor: "rgba(0, 166, 89)",
+          data: onlineCount,
+          borderColor: "#00000",
           fill: true,
           backgroundColor: "rgba(0, 166, 89, .6)",
           pointStyle: 'circle',
@@ -15,20 +19,29 @@ function pia_draw_graph_online_history(pia_js_graph_online_history_time, pia_js_
           pointHoverRadius: 3
         };
 
+        // Data object for down status
+        downData = {          
+          label: 'Down',
+          data: downCount,
+          borderColor: "#00000",
+          fill: true,
+          backgroundColor: "#dd4b39",          
+        };
+
         // Data object for offline status
         offlineData = {          
-          label: 'Offline/Down',
-          data: pia_js_graph_online_history_dodev,
-          borderColor: "rgba(222, 74, 56)",
+          label: 'Offline',
+          data: offlineCount,
+          borderColor: "#00000",
           fill: true,
-          backgroundColor: "rgba(222, 74, 56, .6)",          
+          backgroundColor: "#b2b6be",          
         };
 
         // Data object for archived status
         archivedData = {
           label: 'Archived',
-          data: pia_js_graph_online_history_ardev,
-          borderColor: "rgba(220,220,220)",
+          data: archivedCount,
+          borderColor: "#00000",
           fill: true,
           backgroundColor: "rgba(220,220,220, .6)",
         };
@@ -42,23 +55,27 @@ function pia_draw_graph_online_history(pia_js_graph_online_history_time, pia_js_
         // Check if 'online' status should be displayed
         if(showStats.includes("online"))
         {
-          datasets.push(onlineData); // Add onlineData to datasets array
+          datasets.push(onlineData); 
+        }
+
+        // Check if 'down' status should be displayed
+        if(showStats.includes("down"))
+        {
+          datasets.push(downData); 
         }
 
         // Check if 'offline' status should be displayed
         if(showStats.includes("offline"))
         {
-          datasets.push(offlineData); // Add offlineData to datasets array
+          datasets.push(offlineData); 
         }
 
         // Check if 'archived' status should be displayed
         if(showStats.includes("archived"))
         {
-          datasets.push(archivedData); // Add archivedData to datasets array
+          datasets.push(archivedData); 
         }
 
-
-
         new Chart("OnlineChart", {
           type: "bar",
           scaleIntegersOnly: true,

front/js/modal.js

@@ -242,6 +242,18 @@ $(document).ready(function () {
 });
 
 
+// -----------------------------------------------------------------------------
+// Escape text
+function safeDecodeURIComponent(content) {
+    try {
+      return decodeURIComponent(content);
+    } catch (error) {
+      console.warn('Failed to decode URI component:', error);
+      return content;  // Return the original content if decoding fails
+    }
+  }
+  
+
 // -----------------------------------------------------------------------------
 // Backend notification Polling 
 // -----------------------------------------------------------------------------
@@ -266,7 +278,9 @@ function checkNotification() {
                 if (oldestInterruptNotification) {
                     // Show modal dialog with the oldest unread notification
 
-                    const decodedContent = decodeURIComponent(oldestInterruptNotification.content);
+                    console.log(oldestInterruptNotification.content);
+
+                    const decodedContent = safeDecodeURIComponent(oldestInterruptNotification.content);
 
                     showModalOK("Notification", decodedContent, function() {
                         // Mark the notification as read
@@ -281,6 +295,7 @@ function checkNotification() {
                                 console.log(response);
                                 // After marking the notification as read, check for the next one
                                 checkNotification();
+                                hideSpinner();
                             },
                             error: function(xhr, status, error) {
                                 console.error("Error marking notification as read:", status, error);

front/js/settings_utils.js

@@ -259,7 +259,8 @@ function addList(element, clearInput = true) {
     .attr("value", input)
     .text(input);
 
-  const el = $(`#${toId}`).append(newOption);
+  // add new option
+  $(`#${toId}`).append(newOption);
 
   // clear input
   if (clearInput) {
@@ -269,6 +270,7 @@ function addList(element, clearInput = true) {
   // Initialize interaction options only for the newly added option
   initListInteractionOptions(newOption);
 
+  // flag something changes to prevent navigating from page
   settingsChanged();
 }
 
@@ -279,31 +281,6 @@ function removeFromList(element) {
     .find("option:last")
     .remove();
 }
-// ---------------------------------------------------------
-function addInterface() {
-  ipMask = $("#ipMask").val();
-  ipInterface = $("#ipInterface").val();
-
-  full = ipMask + " --interface=" + ipInterface;
-
-  console.log(full);
-
-  if (ipMask == "" || ipInterface == "") {
-    showModalOk(
-      "Validation error",
-      "Specify both, the network mask and the interface"
-    );
-  } else {
-    $("#SCAN_SUBNETS").append(
-      $("<option disabled></option>").attr("value", full).text(full)
-    );
-
-    $("#ipMask").val("");
-    $("#ipInterface").val("");
-
-    settingsChanged();
-  }
-}
 
 // -------------------------------------------------------------------
 // Function to remove an item from the select element
@@ -327,6 +304,54 @@ function removeAllOptions(element) {
   $(`#${$(element).attr("my-input-to")}`).empty();
 }
 
+// -------------------------------------------------------------------
+// Add all options
+function selectAll(element) {
+  settingsChanged();
+
+  // Get the <select> element with the class 'deviceSelector'
+  // var selectElement = $('.deviceSelector select');
+  var selectElement = $(`#${$(element).attr("my-input-to")}`);
+  
+  // Iterate over each option within the select element
+  selectElement.find('option').each(function() {
+    // Mark each option as selected
+    $(this).prop('selected', true);
+  });
+
+  // Trigger the 'change' event to notify Bootstrap Select of the changes
+  selectElement.trigger('change');
+}
+
+// -----------------------------------------------------------------------------
+// UN-Select All
+function unselectAll(element) {
+  settingsChanged();
+  // Get the <select> element with the class 'deviceSelector'
+  // var selectElement = $('.deviceSelector select');
+  var selectElement = $(`#${$(element).attr("my-input-to")}`);
+  
+  // Iterate over each option within the select element
+  selectElement.find('option').each(function() {
+    // Unselect each option
+    $(this).prop('selected', false);
+  });
+  
+  // Trigger the 'change' event to notify Bootstrap Select of the changes
+  selectElement.trigger('change');
+}
+
+// -----------------------------------------------------------------------------
+// Trigger change to open up the dropdown filed
+function selectChange(element) {
+  settingsChanged();
+  // Get the <select> element with the class 'deviceSelector'
+  // var selectElement = $('.deviceSelector select');
+  var selectElement = $(`#${$(element).attr("my-input-to")}`);
+  
+  selectElement.parent().find("input").focus().click();
+}
+
 // -------------------------------------------------------------------
 // Function to initialize remove functionality on select options
 
@@ -460,8 +485,6 @@ function filterRows(inputText) {
 }
 
 
-
-
 setTimeout(() => {
   // Event listener for input change
   $("#settingsSearch").on("input", function () {
@@ -479,33 +502,6 @@ setTimeout(() => {
   });
 }, 1000);
 
-// -----------------------------------------------------------------------------
-// handling events on the backend initiated by the front end END
-// -----------------------------------------------------------------------------
-
-// ---------------------------------------------------------
-// UNUSED?
-function getParam(targetId, key, skipCache = false) {
-  skipCacheQuery = "";
-
-  if (skipCache) {
-    skipCacheQuery = "&skipcache";
-  }
-
-  // get parameter value
-  $.get(
-    "php/server/parameters.php?action=get&defaultValue=0&parameter=" +
-      key +
-      skipCacheQuery,
-    function (data) {
-      var result = data;
-
-      result = result.replaceAll('"', "");
-
-      document.getElementById(targetId).innerHTML = result.replaceAll('"', "");
-    }
-  );
-}
 
 // -----------------------------------------------------------------------------
 // Show/hide the metadata settings
@@ -555,7 +551,7 @@ function generateOptionsOrSetOptions(
   transformers = [] // Transformers to be applied to the values
 ) {
 
-  console.log(codeName);
+  // console.log(codeName);
 
   // NOTE {value} options to replace with a setting or SQL value are handled in the cacheSettings() function
   options = arrayToObject(createArray(getSettingOptions(codeName)))
@@ -591,6 +587,10 @@ function applyTransformers(val, transformers) {
           val = btoa(val);
         }
         break;
+      case "getString":
+        // no change
+        val = val;        
+        break;
       default:
         console.warn(`Unknown transformer: ${transformer}`);
     }
@@ -613,6 +613,10 @@ function reverseTransformers(val, transformers) {
           val = atob(val);
         }
         break;
+      case "getString":
+        // retrieve string
+        val = getString(val);        
+        break;
       default:
         console.warn(`Unknown transformer: ${transformer}`);
     }
@@ -627,6 +631,7 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => {
   let inputType = "text";
   let readOnly = "";
   let isMultiSelect = false;
+  let isOrdeable = false;
   let cssClasses = "";
   let placeholder = "";
   let suffix = "";
@@ -635,7 +640,11 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => {
   let valRes = val;
   let sourceIds = [];
   let getStringKey = "";
-  let onClick = "alert('Not implemented');";
+  let onClick = "console.log('onClick - Not implemented');";
+  let onChange = "console.log('onChange - Not implemented');";
+  let customParams = "";
+  let customId = "";
+
 
   elementOptions.forEach((option) => {
     if (option.prefillValue) {
@@ -650,6 +659,9 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => {
     if (option.multiple === "true") {
       isMultiSelect = true;
     }
+    if (option.ordeable === "true") {
+      isOrdeable = true;
+    }
     if (option.editable === "true") {
       editable = true;
     }
@@ -676,6 +688,15 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => {
     if (option.onClick) {
       onClick = option.onClick;
     }
+    if (option.onChange) {
+      onChange = option.onChange;
+    }
+    if (option.customParams) {
+      customParams = option.customParams;
+    }
+    if (option.customId) {
+      customId = option.customId;
+    }
   });
 
   if (transformers.includes("sha256")) {
@@ -686,6 +707,7 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => {
     inputType,
     readOnly,
     isMultiSelect,
+    isOrdeable,
     cssClasses,
     placeholder,
     suffix,
@@ -695,6 +717,9 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => {
     valRes,
     getStringKey,
     onClick,
+    onChange,
+    customParams,
+    customId
   };
 };
 
@@ -721,8 +746,9 @@ function generateOptions(options, valuesArray, targetField, transformers, placeh
   resultArray    = []
   selectedArray  = []
   cssClass       = ""
+  
 
-  // determine if options or values are used in teh listing
+  // determine if options or values are used in the listing
   if (valuesArray.length > 0 && options.length > 0){
 
     // multiselect list ->  options only + selected the ones in valuesArray 
@@ -740,21 +766,31 @@ function generateOptions(options, valuesArray, targetField, transformers, placeh
     resultArray   = options;
   }
 
+ 
+  // Create a map to track the index of each item in valuesArray
+  const orderMap = new Map(valuesArray.map((item, index) => [item, index]));
+
+  // Sort resultArray based on the order in valuesArray
+  resultArray.sort((a, b) => {
+    const indexA = orderMap.has(a.id) ? orderMap.get(a.id) : valuesArray.length;
+    const indexB = orderMap.has(b.id) ? orderMap.get(b.id) : valuesArray.length;
+    return indexA - indexB;
+  });
+
   resultArray.forEach(function(item) {
+    let labelName = item.name;
 
-    labelName = item.name
-
-    if(labelName != '❌None')
-    {
-      labelName = reverseTransformers(labelName, transformers)
+    if (labelName !== '❌None') {
+      labelName = reverseTransformers(labelName, transformers);
     }
 
-    // needs to happen always if options ued as source
-    let selected = options.length != 0 && valuesArray.includes(item.id) ? 'selected' : '';
+    // Always include selected if options are used as a source
+    let selected = options.length !== 0 && valuesArray.includes(item.id) ? 'selected' : '';
 
     optionsHtml += `<option class="${cssClass}" value="${item.id}" ${selected}>${labelName}</option>`;
   });
 
+
   // Place the resulting HTML into the specified placeholder div
   $("#" + placeholder).replaceWith(optionsHtml);
 }

front/js/ui_components.js

@@ -11,16 +11,7 @@
 // -----------------------------------------------------------------------------
 // Initialize device selectors / pickers fields
 // -----------------------------------------------------------------------------
-function initDeviceSelectors() {
-
-  // console.log(devicesList)
-  // Retrieve device list from session variable
-  var devicesListAll_JSON = getCache('devicesListAll_JSON');
-
-  var devicesList = JSON.parse(devicesListAll_JSON);
-
-  // console.log(devicesList);
-
+function initDeviceSelectors(devicesListAll_JSON) {
 
   // Check if both device list exists
   if (devicesListAll_JSON) {
@@ -77,100 +68,65 @@ function initDeviceSelectors() {
 }
 
 
+// ----------------------------------------------
+// Updates the icon preview  
+function updateIconPreview(elem) {
+  // Retrieve and parse custom parameters from the element
+  let params = $(elem).attr("my-customparams")?.split(',').map(param => param.trim());
 
-// // -----------------------------------------------------------------------------
-// // (ASYNC) Initiate dropdown
-// function generateSetOptions(settingKey,       // Identifier for the setting
-//                             valuesArray,       // Array of values to be pre-selected in the dropdown
-//                             targetLocation,    // ID of the HTML element where dropdown should be rendered (will be replaced)
-//                             callbackToGenerateEntries,  // Callback function to generate entries based on options
-//                             targetField,      // Target field or element where selected value should be applied or updated
-//                             nameTransformer)      // callback to transform the name (e.g. base64)
-// {
+  // console.log(params);
 
-//   var optionsHtml = ""
- 
-//   // NOTE {value} options to replace with a setting or SQL value are handled in the cacheSettings() function
-//   optionsArray = createArray(getSettingOptions(settingKey))  
-
-
-//   // check if the result is a SQL query
-//   if(optionsArray.length > 0 && isSQLQuery(optionsArray[0]))
-//   {    
-
-//     if (settingKey == "NEWDEV_dev_Network_Node_MAC_ADDR") {
-//       console.log("isSQLQuery in generateSetOptions");
-
-//     }
-//     readData(optionsArray[0], callbackToGenerateEntries, valuesArray, targetLocation, targetField, nameTransformer);
-
-//   } else // this should be already an array, e.g. from a setting or pre-defined
-//   {     
-//     optionsArray.forEach(option => {
-//       let selected = valuesArray.includes(option) ? 'selected' : '';
-//       optionsHtml += `<option value="${option}" ${selected}>${option}</option>`;
-//     });   
-
-//     // Replace the specified placeholder div with the resulting HTML 
-//     setTimeout(() => {
-
-//       $("#" + targetLocation).replaceWith(optionsHtml);
-      
-//       }, 50); 
-//   }
-
-
-  
-// }
-
-
-// -----------------------------------------------------------------------------
-// Hide elements on the page based on the supplied setting
-function hideUIelements(settingKey) {
-
-  hiddenSectionsSetting = getSetting(settingKey)
-  
-  if(hiddenSectionsSetting != "") // handle if settings not yet initialized
-  {
-
-    sectionsArray = createArray(hiddenSectionsSetting)
-
-    // remove spaces to get IDs
-    var newArray = $.map(sectionsArray, function(value) {
-        return value.replace(/\s/g, '');
-    });
-
-    $.each(newArray, function(index, hiddenSection) {
-
-      if($('#' + hiddenSection))
-      {
-        $('#' + hiddenSection).hide()      
-      }    
-      
-    });
+  if (params && params.length >= 2) {
+    var inputElementID = params[0];
+    var targetElementID = params[1];
+  } else {
+    console.error("Invalid parameters passed to updateIconPreview function");
+    return;
   }
 
+  // Get the input element using the inputElementID
+  let iconInput = $("#" + inputElementID);
+
+  if (iconInput.length === 0) {
+    console.error("Icon input element not found");
+    return;
+  }
+
+  // Get the initial value and update the target element
+  let value = iconInput.val();
+  if (!value) {
+    console.error("Input value is empty or not defined");
+    return;
+  }
+
+  if (!targetElementID) {
+    targetElementID = "txtIcon";
+  }
+
+  // Check if the target element exists, if not find an element with matching custom attribute
+  let targetElement = $('#' + targetElementID);
+  if (targetElement.length === 0) {
+    // Look for an element with my-custom-id attribute equal to targetElementID
+    targetElement = $('[my-customid="' + targetElementID + '"]');
+    if (targetElement.length === 0) {
+      console.error("Neither target element with ID nor element with custom attribute found");
+      return;
+    }
+  }
+
+  // Update the target element with decoded base64 value
+  targetElement.html(atob(value));
+
+  // Add event listener to update the icon on input change
+  iconInput.on('change input', function () {
+    let newValue = $(this).val();
+    $('#' + targetElementID).html(atob(newValue));
+  });
 }
 
 
 
 
-// -----------------------------------------------------------------------------
-// Updates the icon preview  
-function updateIconPreview (inputId) {
-  // update icon
-  iconInput = $(inputId) 
-
-  value = iconInput.val()
-
-  iconInput.on('change input', function() {
-    $('#txtIconFA').html(atob(value))
-  });    
-
-  $('#txtIconFA').html(atob(value))
-  
-}
-
 
 // -----------------------------------------------------------------------------
 // Generic function to copy text to clipboard
@@ -290,43 +246,64 @@ function getCellValue(row, index) {
 // initialize
 // -----------------------------------------------------------------------------
 
+function initSelect2() {
 
-setTimeout(() => {
+  // Retrieve device list from session variable
+  var devicesListAll_JSON = getCache('devicesListAll_JSON');
 
-  initDeviceSelectors();
+  //  check if cache ready
+  if(isValidJSON(devicesListAll_JSON))
+  {
+    // prepare HTML DOM before initializing the frotend
+    initDeviceSelectors(devicesListAll_JSON)
 
-
-  // --------------------------------------------------------
-  //Initialize Select2 Elements and make them sortable
-
-  $(function () {
-    // Iterate over each Select2 dropdown
-    $('.select2').each(function() {
-        var selectEl = $(this).select2();
-  
-        // Apply sortable functionality to the dropdown's dropdown-container
-        selectEl.next().children().children().children().sortable({
-            containment: 'parent',
-            update: function () {
-                var sortedValues = $(this).children().map(function() {
-                    return $(this).attr('title');
-                }).get();
-  
-                var sortedOptions = selectEl.find('option').sort(function(a, b) {
-                    return sortedValues.indexOf($(a).text()) - sortedValues.indexOf($(b).text());
-                });
-  
-                // Replace all options in selectEl
-                selectEl.empty().append(sortedOptions);
-  
-                // Trigger change event on Select2
-                selectEl.trigger('change');
-            }
-        });
+    
+    // --------------------------------------------------------
+    //Initialize Select2 Elements and make them sortable
+    
+    $(function () {
+      // Iterate over each Select2 dropdown
+      $('.select2').each(function() {
+          var selectEl = $(this).select2();
+    
+          // Apply sortable functionality to the dropdown's dropdown-container
+          selectEl.next().children().children().children().sortable({
+              containment: 'parent',
+              update: function () {
+                  var sortedValues = $(this).children().map(function() {
+                      return $(this).attr('title');
+                  }).get();
+    
+                  var sortedOptions = selectEl.find('option').sort(function(a, b) {
+                      return sortedValues.indexOf($(a).text()) - sortedValues.indexOf($(b).text());
+                  });
+    
+                  // Replace all options in selectEl
+                  selectEl.empty().append(sortedOptions);
+    
+                  // Trigger change event on Select2
+                  selectEl.trigger('change');
+              }
+          });
+      });
     });
-  });
-  
-}, 500);
+  } else // cache not ready try later
+  {
+    setTimeout(() => {
+      initSelect2()
+    }, 1000);
+  }  
+}
+
+// init select2 after dom laoded
+window.addEventListener("load", function() {
+  // try to initialize select2
+  setTimeout(() => {
+    initSelect2()
+  }, 1000);
+});
+
+
 
 
 console.log("init ui_components.js")

front/lib/AdminLTE/plugins/jQueryUI/jquery-ui.js

@@ -1034,7 +1034,7 @@ var mouse = $.widget("ui.mouse", {
 		return this.mouseDelayMet;
 	},
 
-	// These are placeholder methods, to be overriden by extending plugin
+	// These are placeholder methods, to be overridden by extending plugin
 	_mouseStart: function(/* event */) {},
 	_mouseDrag: function(/* event */) {},
 	_mouseStop: function(/* event */) {},

front/maintenance.php

@@ -11,25 +11,7 @@
 #    cvc90      2023        https://github.com/cvc90         GNU GPLv3            #
 #---------------------------------------------------------------------------------#
 
-// Skin selector config ----------------------------------------------------
-//
-// For security reasons, new language files must be entered into this array.
-// The files in the language directory are compared with this array and only 
-// then accepted.
-//
-$pia_installed_skins = array('skin-black-light', 
-                             'skin-black', 
-                             'skin-blue-light', 
-                             'skin-blue', 
-                             'skin-green-light', 
-                             'skin-green', 
-                             'skin-purple-light', 
-                             'skin-purple', 
-                             'skin-red-light', 
-                             'skin-red', 
-                             'skin-yellow-light', 
-                             'skin-yellow');
-  
+ 
 
 //------------------------------------------------------------------------------
 ?>
@@ -38,7 +20,7 @@ $pia_installed_skins = array('skin-black-light',
   require 'php/templates/header.php';
 ?>
 <!-- Page ------------------------------------------------------------------ -->
-<div class="content-wrapper">
+<div class="content-wrapper" id="maintenancePage">
 
 <!-- Content header--------------------------------------------------------- -->
     <section class="content-header">
@@ -57,74 +39,17 @@ $pia_installed_skins = array('skin-black-light',
 
 // Size and last mod of DB ------------------------------------------------------
 
-$pia_db = str_replace('front', 'db', getcwd()).'/app.db';
-$pia_db_size = number_format((filesize($pia_db) / 1000000),2,",",".") . ' MB';
-$pia_db_mod = date ("F d Y H:i:s", filemtime($pia_db));
+$nax_db = str_replace('front', 'db', getcwd()).'/app.db';
+$nax_db_size = number_format((filesize($nax_db) / 1000000),2,",",".") . ' MB';
+$nax_db_mod = date ("F d Y H:i:s", filemtime($nax_db));
 
 
-// Count and Calc Backups -------------------------------------------------------
-
-$Pia_Archive_Path = str_replace('front', 'db', getcwd()).'/';
-$Pia_Archive_count = 0;
-$Pia_Archive_diskusage = 0;
-$files = glob($Pia_Archive_Path."appdb_*.zip");
-if ($files){
- $Pia_Archive_count = count($files);
-}
-foreach ($files as $result) {
-    $Pia_Archive_diskusage = $Pia_Archive_diskusage + filesize($result);
-}
-$Pia_Archive_diskusage = number_format(($Pia_Archive_diskusage / 1000000),2,",",".") . ' MB';
-
-// Find latest Backup for restore -----------------------------------------------
-
-$latestfiles = glob($Pia_Archive_Path."appdb_*.zip");
-natsort($latestfiles);
-$latestfiles = array_reverse($latestfiles,False);
-
-$latestbackup = 'none';
-$latestbackup_date = 'no backup';
-
-if (count($latestfiles) > 0)
-{
-  $latestbackup = $latestfiles[0];
-  $latestbackup_date = date ("Y-m-d H:i:s", filemtime($latestbackup));
-}
-
-
-// Skin selector -----------------------------------------------------------------
-
-if (isset($_POST['submit']) && submit && isset($_POST['skinselector_set'])) {
-  $pia_skin_set_dir = '../db/';
-  $pia_skin_selector = htmlspecialchars($_POST['skinselector']);
-  if (in_array($pia_skin_selector, $pia_installed_skins)) {
-    foreach ($pia_installed_skins as $file) {
-      unlink ($pia_skin_set_dir.'/setting_'.$file);
-    }
-    foreach ($pia_installed_skins as $file) {
-      if (file_exists($pia_skin_set_dir.'/setting_'.$file)) {
-          $pia_skin_error = True;
-          break;
-      } else {
-          $pia_skin_error = False;
-      }
-    }
-    if ($pia_skin_error == False) {
-      $testskin = fopen($pia_skin_set_dir.'setting_'.$pia_skin_selector, 'w');
-      $pia_skin_test = '';
-      echo("<meta http-equiv='refresh' content='1'>"); 
-    } else {
-      $pia_skin_test = '';
-      echo("<meta http-equiv='refresh' content='1'>");
-    }    
-  }
-}
 // Table sizes -----------------------------------------------------------------
 
 $tableSizesHTML = "";
                         
 // Open a connection to the SQLite database
-$db = new SQLite3($pia_db);
+$db = new SQLite3($nax_db);
 
 // Retrieve the table names from sqlite_master
 $query = "SELECT name FROM sqlite_master WHERE type='table'";
@@ -142,10 +67,6 @@ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
 $db->close();
                             
 
-                        
-
-// Language selector -----------------------------------------------------------------
-
 ?>
 
       <div class="row">
@@ -183,13 +104,13 @@ $db->close();
                     <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">
-                            <?php echo $pia_db;?>
+                            <?php echo $nax_db;?>
                         </div>
                     </div>
                     <div class="db_info_table_row">
                         <div class="db_info_table_cell"><?= lang('Maintenance_database_size');?></div>
                         <div class="db_info_table_cell">
-                            <?php echo $pia_db_size;?>
+                            <?php echo $nax_db_size;?>
                         </div>                        
                     </div>
                     <div class="db_info_table_row">
@@ -201,15 +122,9 @@ $db->close();
                     <div class="db_info_table_row">
                         <div class="db_info_table_cell"><?= lang('Maintenance_database_lastmod');?></div>
                         <div class="db_info_table_cell">
-                            <?php echo $pia_db_mod;?>
+                            <?php echo $nax_db_mod;?>
                         </div>
-                    </div>
-                    <div class="db_info_table_row">
-                        <div class="db_info_table_cell"><?= lang('Maintenance_database_backup');?></div>
-                        <div class="db_info_table_cell">
-                            <?php echo $Pia_Archive_count.' '.lang('Maintenance_database_backup_found').' / '.lang('Maintenance_database_backup_total').': '.$Pia_Archive_diskusage;?>
-                        </div>
-                    </div>                    
+                    </div>           
                 </div>                
               </div>
               <!-- /.box-body -->
@@ -219,13 +134,7 @@ $db->close();
 
     <div class="nav-tabs-custom">
     <ul class="nav nav-tabs">
-        <li class="active">          
-          <a id="tab_Settings_id" href="#tab_Settings" data-toggle="tab">
-            <i class="fa fa-cogs"></i> 
-            <?= lang('Maintenance_Tools_Tab_UISettings');?>
-          </a>
-        </li>
-        <li>
+        <li class="active">
           <a id="tab_DBTools_id" href="#tab_DBTools" data-toggle="tab">
             <i class="fa fa-toolbox"></i> 
             <?= lang('Maintenance_Tools_Tab_Tools');?>
@@ -251,84 +160,7 @@ $db->close();
         </li>
     </ul>
     <div class="tab-content">
-        <div class="tab-pane active" id="tab_Settings">
-                <div class="db_info_table">
-                    <div class="db_info_table_row">
-                        <div class="db_tools_table_cell_a" style="text-align: center;">
-                            <form method="post" action="maintenance.php">
-                            <div style="display: inline-block; text-align: center;">
-                                <select name="skinselector" class="form-control bg-green" style="width:160px; margin-bottom:5px;">
-                                    <option value=""><?= lang('Maintenance_themeselector_empty');?></option>
-                                    <option value="skin-black-light">black light</option>
-                                    <option value="skin-black">black</option>
-                                    <option value="skin-blue-light">blue light</option>
-                                    <option value="skin-blue">blue</option>
-                                    <option value="skin-green-light">green light</option>
-                                    <option value="skin-green">green</option>
-                                    <option value="skin-purple-light">purple light</option>
-                                    <option value="skin-purple">purple</option>
-                                    <option value="skin-red-light">red light</option>
-                                    <option value="skin-red">red</option>
-                                    <option value="skin-yellow-light">yellow light</option>
-                                    <option value="skin-yellow">yellow</option>
-                                </select></div>
-                            <div style="display: block;"><input type="submit" name="skinselector_set" value="<?= lang('Maintenance_themeselector_apply');?>" class="btn bg-green" style="width:160px;">
-                                <?php // echo $pia_skin_test; ?>
-                            </div>
-                            </form>
-                        </div>
-                        <div class="db_info_table_cell" style="padding: 10px; height:40px; text-align:left; vertical-align: middle;">
-                            <?= lang('Maintenance_themeselector_text'); ?>
-                        </div>    
-                    </div>
-                    <div class="db_info_table_row">
-                        <div class="db_tools_table_cell_a">
-                            <button type="button" class="btn bg-green dbtools-button" id="btnToggleDarkmode" onclick="askToggleDarkmode()"><?= lang('Maintenance_Tool_darkmode');?></button>
-                        </div>
-                        <div class="db_tools_table_cell_b"><?= lang('Maintenance_Tool_darkmode_text');?></div>
-                    </div>   
-                    <div class="db_info_table_row">
-                        <div class="db_tools_table_cell_a">
-                          <div class="form-group" > 
-                            <div class="input-group" > 
-                              <select id="columnsSelect" class="form-control select2 select2-hidden-accessible" multiple=""   style="width: 100%;"  tabindex="-1" aria-hidden="true">
-                                <option value="0"><?= lang('Device_TableHead_Name');?></option>
-                                <option value="1"><?= lang('Device_TableHead_Owner');?></option>
-                                <option value="2"><?= lang('Device_TableHead_Type');?></option>
-                                <option value="3"><?= lang('Device_TableHead_Icon');?></option>
-                                <option value="4"><?= lang('Device_TableHead_Favorite');?></option>
-                                <option value="5"><?= lang('Device_TableHead_Group');?></option>
-                                <option value="6"><?= lang('Device_TableHead_FirstSession');?></option>
-                                <option value="7"><?= lang('Device_TableHead_LastSession');?></option>
-                                <option value="8"><?= lang('Device_TableHead_LastIP');?></option>
-                                <option value="9"><?= lang('Device_TableHead_MAC');?></option>
-                                <option value="10"><?= lang('Device_TableHead_Status');?></option>                            
-                                <option value="11"><?= lang('Device_TableHead_MAC_full');?></option>                            
-                                <option value="12"><?= lang('Device_TableHead_LastIPOrder');?></option>
-                                <option value="13"><?= lang('Device_TableHead_Rowid');?></option>
-                                <option value="14"><?= lang('Device_TableHead_Parent_MAC');?></option>
-                                <option value="15"><?= lang('Device_TableHead_Connected_Devices');?></option>
-                                <option value="16"><?= lang('Device_TableHead_Location');?></option>
-                                <option value="17"><?= lang('Device_TableHead_Vendor');?></option>
-                                <option value="18"><?= lang('Device_TableHead_Port');?></option>
-                                <option value="19"><?= lang('Device_TableHead_GUID');?></option>
-                                <option value="20"><?= lang('Device_TableHead_SyncHubNodeName');?></option>
-                                <option value="21"><?= lang('Device_TableHead_NetworkSite');?></option>
-                                <option value="22"><?= lang('Device_TableHead_SSID');?></option>
-                              </select>
-                              <span class="input-group-addon"><i title="<?= lang('Gen_Save');?>" class="fa fa-save  pointer" onclick="saveSelectedColumns();"></i></span>   
-                            </div>
-                          </div>
-
-                        </div>
-                        
-                        <div class="db_tools_table_cell_b"><?= lang('Maintenance_Tool_displayed_columns_text');?></div>
-                    </div>  
-                    
-                    
-                </div>
-        </div>
-        <div class="tab-pane" id="tab_DBTools">
+        <div class="tab-pane active" id="tab_DBTools">
                 <div class="db_info_table">
                     <div class="db_info_table_row">
                         <div class="db_tools_table_cell_a" >
@@ -387,25 +219,7 @@ $db->close();
                             <button type="button" class="btn btn-default pa-btn pa-btn-delete bg-red dbtools-button" id="btnImportPastedCSV" onclick="askImportPastedCSV()"><?= lang('Maintenance_Tool_ImportPastedCSV');?></button>
                         </div>
                         <div class="db_tools_table_cell_b"><?= lang('Maintenance_Tool_ImportPastedCSV_text');?></div>
-                    </div>
-                    <div class="db_info_table_row">
-                        <div class="db_tools_table_cell_a" >
-                            <button type="button" class="btn btn-default pa-btn bg-green dbtools-button" id="btnPiaBackupDBtoArchive" onclick="askPiaBackupDBtoArchive()"><?= lang('Maintenance_Tool_backup');?></button>
-                        </div>
-                        <div class="db_tools_table_cell_b"><?= lang('Maintenance_Tool_backup_text');?></div>
-                    </div>
-                    <div class="db_info_table_row">
-                        <div class="db_tools_table_cell_a" >
-                            <button type="button" class="btn btn-default pa-btn pa-btn-delete bg-red dbtools-button" id="btnPiaRestoreDBfromArchive" onclick="askPiaRestoreDBfromArchive()"><?= lang('Maintenance_Tool_restore');?><br><?php echo $latestbackup_date;?></button>
-                        </div>
-                        <div class="db_tools_table_cell_b"><?= lang('Maintenance_Tool_restore_text');?></div>
-                    </div>
-                    <div class="db_info_table_row">
-                        <div class="db_tools_table_cell_a" >
-                            <button type="button" class="btn btn-default pa-btn pa-btn-delete bg-red dbtools-button" id="btnPiaPurgeDBBackups" onclick="askPiaPurgeDBBackups()"><?= lang('Maintenance_Tool_purgebackup');?></button>
-                        </div>
-                        <div class="db_tools_table_cell_b"><?= lang('Maintenance_Tool_purgebackup_text');?></div>
-                    </div>
+                    </div>                    
                  </div>
         </div>
         <!-- ---------------------------Logging-------------------------------------------- -->
@@ -487,7 +301,7 @@ $db->close();
 <script>
 
 var emptyArr = ['undefined', "", undefined, null];
-var selectedTab                 = 'tab_Settings_id';
+var selectedTab                 = 'tab_DBTools_id';
 
 initializeTabs();
 
@@ -591,51 +405,6 @@ function deleteActHistory()
   });
 }
 
-// -----------------------------------------------------------
-// Backup DB to Archive 
-function askPiaBackupDBtoArchive () {
-  // Ask 
-  showModalWarning('<?= lang('Maintenance_Tool_backup_noti');?>', '<?= lang('Maintenance_Tool_backup_noti_text');?>',
-    '<?= lang('Gen_Cancel');?>', '<?= lang('Gen_Backup');?>', 'PiaBackupDBtoArchive');
-}
-function PiaBackupDBtoArchive()
-{ 
-  // Execute
-  $.get('php/server/devices.php?action=PiaBackupDBtoArchive', function(msg) {
-    showMessage (msg);
-  });
-}
-
-// -----------------------------------------------------------
-// Restore DB from Archive 
-function askPiaRestoreDBfromArchive () {
-  // Ask 
-  showModalWarning('<?= lang('Maintenance_Tool_restore_noti');?>', '<?= lang('Maintenance_Tool_restore_noti_text');?>',
-    '<?= lang('Gen_Cancel');?>', '<?= lang('Gen_Restore');?>', 'PiaRestoreDBfromArchive');
-}
-function PiaRestoreDBfromArchive()
-{ 
-  // Execute
-  $.get('php/server/devices.php?action=PiaRestoreDBfromArchive', function(msg) {
-    showMessage (msg);
-  });
-}
-
-// -----------------------------------------------------------
-// Purge Backups 
-function askPiaPurgeDBBackups() {
-  // Ask 
-  showModalWarning('<?= lang('Maintenance_Tool_purgebackup_noti');?>', '<?= lang('Maintenance_Tool_purgebackup_noti_text');?>',
-    '<?= lang('Gen_Cancel');?>', '<?= lang('Gen_Purge');?>', 'PiaPurgeDBBackups');
-}
-function PiaPurgeDBBackups()
-{ 
-  // Execute
-  $.get('php/server/devices.php?action=PiaPurgeDBBackups', function(msg) {
-    showMessage (msg);
-  });
-}
-
 // -----------------------------------------------------------
 // Restart Backend Python Server
 
@@ -704,51 +473,18 @@ function askImportPastedCSV() {
 function ImportPastedCSV()
 {   
   var csv = $('#modal-input-textarea').val();
-  csvBase64 = btoa(csv)
-  // Execute
+
+  csvBase64 = utf8ToBase64(csv);   
+
   $.post('php/server/devices.php?action=ImportCSV', { content: csvBase64 }, function(msg) {
-    showMessage(msg);
-    write_notification(`[Maintenance] Devices imported from pasted content`, 'info');
+      showMessage(msg);
+      write_notification(`[Maintenance] Devices imported from pasted content`, 'info');
   });
+
+
 }
 
 
-// --------------------------------------------------------
-// Switch Darkmode 
-function askToggleDarkmode() {
-  // Ask 
-  showModalWarning('<?= lang('Maintenance_Tool_darkmode_noti');?>', '<?= lang('Maintenance_Tool_darkmode_noti_text');?>',
-    '<?= lang('Gen_Cancel');?>', '<?= lang('Gen_Switch');?>', 'ToggleDarkmode');
-}
-
-// --------------------------------------------------------
-function ToggleDarkmode()
-{   
-  // get parameter Front_Dark_Mode_Enabled value
-  $.get('php/server/parameters.php?action=get&defaultValue=false&expireMinutes=525600&parameter=Front_Dark_Mode_Enabled', function(data) {
-  var result = JSON.parse(data);
-  if (result) {
-      darkModeEnabled = result == 'true';      
-
-      // invert value
-      darkModeEnabled = !darkModeEnabled;      
-
-      // save inverted value
-      $.get('php/server/parameters.php?action=set&parameter=Front_Dark_Mode_Enabled&expireMinutes=525600&value='+ darkModeEnabled,
-        function(data) {
-          if (data != "OK") {
-            showMessage (data);
-            setTimeout(function (){location.reload()}, 1000);
-            
-          } else {
-            showMessage (data);
-          };
-      } );
-      
-  }
-  });
-}
-
 // --------------------------------------------------------
 
 // Clean log file 
@@ -801,122 +537,56 @@ function scrollDown() {
 }
 
 
-// --------------------------------------------------------
-// Manage displayed columns
-// --------------------------------------------------------
-colDefaultOrder = ['0','1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17'];
-colDefaultOrderTxt = '[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]';
-
-
-function saveSelectedColumns () { 
-  $.get('php/server/parameters.php?action=set&expireMinutes=525600&value=['+ $('#columnsSelect').val().toString() +']&parameter=Front_Devices_Columns_Visible', function(data) {
-    // save full order of all columns to simplify mapping later on
-    
-    colDisplayed = $('#columnsSelect').val();
-    
-    colNewOrder = colDisplayed;
-
-    // append the remaining columns in the previous order
-    for(i = 0; i < colDefaultOrder.length; i++)
-    {
-      if(!colDisplayed.includes(colDefaultOrder[i]))
-      {
-        colNewOrder.push(colDefaultOrder[i])
-      }
-    }    
-
-    // save the setting in the DB
-    $.get('php/server/parameters.php?action=set&expireMinutes=525600&value=['+ colNewOrder.toString() +']&parameter=Front_Devices_Columns_Order', function(data) {
-
-      showMessage(data);
-
-    });
-  });
-}
-
-// --------------------------------------------------------
-function initializeSelectedColumns () { 
-  $.get('php/server/parameters.php?action=get&expireMinutes=525600&defaultValue='+colDefaultOrderTxt+'&parameter=Front_Devices_Columns_Visible', function(data) {
-
-    handle_locked_DB(data)
-    
-    tableColumnShow = numberArrayFromString(data);
-
-    for(i=0; i < tableColumnShow.length; i++)
-    {
-      // create the option and append to Select2
-      var option = new Option($('#columnsSelect option[value='+tableColumnShow[i]+']').html(), tableColumnShow[i] , true, true);
-      
-      $("#columnsSelect").append(option).trigger('change');
-
-    }
-    
-  });
-} 
-
-
-
-
 // --------------------------------------------------------
 // General initialization
 // --------------------------------------------------------
-function initializeTabs () {  
-
-  setTimeout(function() {
-
-    key = "activeMaintenanceTab"
+function initializeTabs() {  
+  setTimeout(() => {
+    const key = "activeMaintenanceTab";
 
     // default selection
-    selectedTab = "tab_Settings"
+    let selectedTab = "tab_DBTools_id";
 
-    // the #target from the url
-    target = window.location.hash.substr(1) 
+    // the #target from the URL
+    let target = window.location.hash.substr(1);
 
-    
+    console.log(selectedTab);
 
     // get only the part between #...?
-    if(target.includes('?'))
-    {
-      target = target.split('?')[0]
+    if (target.includes('?')) {
+      target = target.split('?')[0];
     }
 
-    console.log(target);
-
     // update cookie if target specified
-    if(target != "")
-    {    
-
-      if (!selectedTab.endsWith("_id")) {
-        selectedTab = target + "_id";
-      } 
-
-      setCache(key, selectedTab) // _id is added so it doesn't conflict with AdminLTE tab behavior
+    if (target) {    
+      selectedTab = target.endsWith("_id") ? target : `${target}_id`;
+      setCache(key, selectedTab); // _id is added so it doesn't conflict with AdminLTE tab behavior
     }
 
-    // get the tab id from the cookie (already overriden by the target)
-    if(!emptyArr.includes(getCache(key)))
-    {
-      selectedTab = getCache(key);
+    // get the tab id from the cookie (already overridden by the target)
+    const cachedTab = getCache(key);
+    if (cachedTab && !emptyArr.includes(cachedTab)) {
+      selectedTab = cachedTab;
     }
 
     // Activate panel
     $('.nav-tabs a[id='+ selectedTab +']').tab('show');
 
     // When changed save new current tab
-    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-      setCache(key, $(e.target).attr('id'))
+    $('a[data-toggle="tab"]').on('shown.bs.tab', (e) => {
+      const newTabId = $(e.target).attr('id');
+      setCache(key, newTabId);
     });
 
     // events on tab change
-    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-      var target = $(e.target).attr("href") // activated tab
+    $('a[data-toggle="tab"]').on('shown.bs.tab', (e) => {
+      const newTarget = $(e.target).attr("href"); // activated tab
     });
 
     hideSpinner();
-     
   }, 50);
-  
 }
+
 //------------------------------------------------------------------------------
 //  Logs render functionality
 //------------------------------------------------------------------------------
@@ -936,7 +606,7 @@ function toggleAutoRefresh() {
 }
 
 //------------------------------------------------------------------------------
-// Manages thefilter application
+// Manages the filter application on the logs
 function applyFilter() {
       const filterText = $("#logsFilter").val().toLowerCase();
       
@@ -982,19 +652,20 @@ function renderLogs(customData) {
 
 //------------------------------------------------------------------------------
 // Init
-window.onload = function asyncFooter()
-{
-  initializeSelectedColumns();
+window.onload = function asyncFooter() {
   renderLogs();
 
   // initializeTabs();
 
-  $("#lastCommit").append('<a href="https://github.com/jokob-sk/NetAlertX/commits" target="_blank"><img  alt="GitHub last commit" src="https://img.shields.io/github/last-commit/jokob-sk/netalertx/main?logo=github"></a>');
+  try {
+    $("#lastCommit").append('<a href="https://github.com/jokob-sk/NetAlertX/commits" target="_blank"><img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/jokob-sk/netalertx/main?logo=github"></a>');
 
-  $("#lastDockerUpdate").append(
-    '<a href="https://github.com/jokob-sk/NetAlertX/releases" target="_blank"><img alt="Docker last pushed" src="https://img.shields.io/github/v/release/jokob-sk/NetAlertX?color=0aa8d2&logoColor=fff&logo=GitHub&label=Latest"></a>');
-
-}
+    $("#lastDockerUpdate").append(
+      '<a href="https://github.com/jokob-sk/NetAlertX/releases" target="_blank"><img alt="Docker last pushed" src="https://img.shields.io/github/v/release/jokob-sk/NetAlertX?color=0aa8d2&logoColor=fff&logo=GitHub&label=Latest"></a>');
+  } catch (error) {
+    console.error('Failed to load GitHub badges:', error);
+  }
+};
 
 </script>
 

front/multiEditCore.php

@@ -13,7 +13,7 @@
         <h3 class="box-title"><?= lang('Gen_Selected_Devices');?></h3>
 
       </div>
-    <div class="deviceSelector col-md-9" style="z-index:5"></div> 
+    <div class="deviceSelector col-md-9 col-sm-12" style="z-index:5"></div> 
 
     <div class="col-md-3"> 
       <button type="button" class="btn btn-default" onclick="markAllSelected()"> 
@@ -101,14 +101,25 @@
                 for (let j = i * elementsPerColumn; j < Math.min((i + 1) * elementsPerColumn, columns.length); j++) {
 
                   const setTypeObject  = JSON.parse(columns[j].Type.replace(/'/g, '"'));         
-                  // console.log(setTypeObject);         
-                  const lastElementObj = setTypeObject.elements[setTypeObject.elements.length - 1]
 
-                  const { elementType, elementOptions = [], transformers = [] } = lastElementObj;
+                  // get the element with the input value(s)
+                  let elements = setTypeObject.elements.filter(element => element.elementHasInputValue === 1);
+
+                  //  if none found, take last
+                  if(elements.length == 0)
+                  {
+                    elementWithInputValue = setTypeObject.elements[setTypeObject.elements.length - 1]
+                  } else
+                  {
+                    elementWithInputValue = elements[0]
+                  }
+
+                  const { elementType, elementOptions = [], transformers = [] } = elementWithInputValue;
                   const { 
                     inputType,
                     readOnly,
                     isMultiSelect,
+                    isOrdeable,
                     cssClasses,
                     placeholder,
                     suffix,
@@ -117,26 +128,28 @@
                     editable,
                     valRes,
                     getStringKey,
-                    onClick
+                    onClick,
+                    onChange,
+                    customParams,
+                    customId
                   } = handleElementOptions('none', elementOptions, transformers, val = "");
 
-                  // console.log(setTypeObject);
-                  // console.log(inputType);
-
-                  //  render based on element type
-                  if (lastElementObj.elementType === 'select') {
+                  //  render based on element type 
+                  if (elementType === 'select') {
 
                     targetLocation = columns[j].Code_Name + "_generateSetOptions"
 
                     generateOptionsOrSetOptions(columns[j].Code_Name, [], targetLocation, generateOptions)
 
-                    //  Handle Icons as tehy need a preview                 
+                    console.log(columns[j].Code_Name)
+                    //  Handle Icons as they need a preview                 
                     if(columns[j].Code_Name == 'NEWDEV_dev_Icon')
                     {
                       input = `
-                            <span class="input-group-addon" id="txtIconFA"></span>
+                            <span class="input-group-addon iconPreview" my-customid="NEWDEV_dev_Icon_preview"></span>
                             <select  class="form-control"
-                                      onChange="updateIconPreview('#NEWDEV_dev_Icon')"
+                                      onChange="updateIconPreview(this)"
+                                      my-customparams="NEWDEV_dev_Icon,NEWDEV_dev_Icon_preview"
                                       id="${columns[j].Code_Name}"
                                       data-my-column="${columns[j].Code_Name}" 
                                       data-my-targetColumns="${columns[j].Code_Name.replace('NEWDEV_','')}" >
@@ -154,7 +167,7 @@
                     }
 
 
-                  } else if (lastElementObj.elementType === 'input'){ 
+                  } else if (elementType === 'input'){ 
                     
                     // Add classes specifically for checkboxes
                     inputType === 'checkbox' ?  inputClass = 'checkbox' : inputClass = 'form-control';
@@ -162,6 +175,7 @@
 
                     input =  `<input  class="${inputClass}" 
                                       id="${columns[j].Code_Name}"  
+                                      my-customid="${columns[j].Code_Name}"  
                                       data-my-column="${columns[j].Code_Name}" 
                                       data-my-targetColumns="${columns[j].Code_Name.replace('NEWDEV_','')}" 
                                       type="${inputType}">`
@@ -291,7 +305,7 @@ function executeAction(action, whereColumnName, key, targetColumns, newTargetCol
             window.onbeforeunload = null;
 
             // update API endpoints to refresh the UI
-            updateApi()
+            updateApi("devices,appevents")
 
             write_notification(`[Multi edit] Executed "${action}" on Columns "${targetColumns}" matching "${key}"`, 'info')
 

front/network.php

@@ -359,12 +359,17 @@
   <?php   
 
     // Get all Unassigned / unconnected nodes 
-    $func_sql = 'SELECT dev_MAC as mac,  
-                        dev_PresentLastScan as online, 
-                        dev_Name as name,                        
-                        dev_LastIP as last_ip,
-                        dev_Network_Node_MAC_ADDR
-                    FROM Devices WHERE (dev_Network_Node_MAC_ADDR is null or dev_Network_Node_MAC_ADDR = "" or dev_Network_Node_MAC_ADDR = " " or dev_Network_Node_MAC_ADDR = "undefined") and dev_MAC not like "%internet%" order by name asc'; 
+    $func_sql = 'SELECT 
+                  dev_MAC AS mac,
+                  dev_PresentLastScan AS online,
+                  dev_Name AS name,
+                  dev_LastIP AS last_ip,
+                  dev_Network_Node_MAC_ADDR
+                FROM Devices
+                WHERE dev_Network_Node_MAC_ADDR IS NULL 
+                  OR dev_Network_Node_MAC_ADDR IN ("", " ", "undefined", "null")
+                  AND dev_MAC NOT LIKE "%internet%"
+                ORDER BY name ASC;'; 
 
     global $db;
     $func_result = $db->query($func_sql);  
@@ -673,7 +678,9 @@
 
         (!emptyArr.includes(nodeData.data.port )) ? port =  nodeData.data.port : port = "";
 
-        (port == "" || port == 0 ) ? portBckgIcon = `<i class="fa fa-wifi"></i>` : portBckgIcon = `<i class="fa fa-ethernet"></i>`;
+        (port == "" || port == 0 || port == 'None' ) ? portBckgIcon = `<i class="fa fa-wifi"></i>` : portBckgIcon = `<i class="fa fa-ethernet"></i>`;
+
+        portHtml = (port == "" || port == 0 || port == 'None' ) ? "" : port
 
         // Build HTML for individual nodes in the network diagram        
         deviceIcon = (!emptyArr.includes(nodeData.data.icon )) ?  
@@ -682,7 +689,7 @@
                   </div>` : "";
         devicePort = `<div  class="netPort" 
                             style="width:${emSize*sizeCoefficient}em;height:${emSize*sizeCoefficient}em">
-                        ${port}</div> 
+                        ${portHtml}</div> 
                       <div  class="portBckgIcon" 
                             style="margin-left:-${emSize*sizeCoefficient}em;">
                             ${portBckgIcon}
@@ -776,7 +783,7 @@
       setCache(key, target.replaceAll(":","_")+'_id') // _id is added so it doesn't conflict with AdminLTE tab behavior
     }
 
-    // get the tab id from the cookie (already overriden by the target)
+    // get the tab id from the cookie (already overridden by the target)
     if(!emptyArr.includes(getCache(key)))
     {
       selectedTab = getCache(key);

front/php/components/logs.php

@@ -2,6 +2,10 @@
 
 require '../server/init.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 // Function to render the log area component
 function renderLogArea($params) {
     $fileName = isset($params['fileName']) ? $params['fileName'] : '';

front/php/components/tile_cards.php

@@ -1,4 +1,9 @@
 <?php
+
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 function renderInfobox($params) {
   $onclickEvent = isset($params['onclickEvent']) ? $params['onclickEvent'] : '';
   $color = isset($params['color']) ? $params['color'] : '';

front/php/server/cache-bottom.php

@@ -1,7 +0,0 @@
-<?php
-// Cache the contents to a cache file
-$cached = fopen($cachefile, 'w');
-fwrite($cached, ob_get_contents());
-fclose($cached);
-ob_end_flush(); // Send the output to the browser
-?>

front/php/server/cache-top.php

@@ -1,15 +0,0 @@
-<?php
-$url = $_SERVER["SCRIPT_NAME"];
-$break = Explode('/', $url);
-$file = $break[count($break) - 1];
-$cachefile = 'cached-'.substr_replace($file ,"",-4).'.html';
-$cachetime = 18000;
-
-// Serve from the cache if it is younger than $cachetime
-if (file_exists($cachefile) && time() - $cachetime < filemtime($cachefile)) {
-    echo "<!-- Cached copy, generated ".date('H:i', filemtime($cachefile))." -->\n";
-    readfile($cachefile);
-    exit;
-}
-ob_start(); // Start the output buffer
-?>

front/php/server/db.php

@@ -13,6 +13,10 @@
 $DBFILE = dirname(__FILE__).'/../../../db/app.db';
 $DBFILE_LOCKED_FILE = dirname(__FILE__).'/../../../front/log/db_is_locked.log';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 $db_locked = false;
 
 //------------------------------------------------------------------------------

front/php/server/dbHelper.php

@@ -3,16 +3,18 @@
 //  NetAlertX
 //  Open Source Network Guard / WIFI & LAN intrusion detector 
 //
-//  parameters.php - Front module. Server side. Manage Parameters
 //------------------------------------------------------------------------------
 #  Puche 2022+ jokob             jokob@duck.com                GNU GPLv3
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
-  // External files
-  require dirname(__FILE__).'/init.php';
- 
+// External files
+require dirname(__FILE__).'/init.php';
+
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
 
 //------------------------------------------------------------------------------
 //  Action selector

front/php/server/devices.php

@@ -11,6 +11,10 @@
   // External files
   require dirname(__FILE__).'/init.php';
 
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
   //------------------------------------------------------------------------------
   //  Action selector
   //------------------------------------------------------------------------------
@@ -424,41 +428,39 @@ function ExportCSV() {
   $func_result = $db->query("SELECT * FROM Devices");        
 
   // prepare CSV header row
-  // header array with column names 
   $columns = getDevicesColumns();
 
   // wrap the headers with " (quotes) 
-  $resultCSV = '"'.implode('","', $columns).'"';  
-
-  //and append a new line
-  $resultCSV = $resultCSV."\n";
+  $resultCSV = '"'.implode('","', $columns).'"'."\n";
 
   // retrieve the devices from the DB
-  while ($row = $func_result -> fetchArray (SQLITE3_ASSOC)) {   
+  while ($row = $func_result->fetchArray(SQLITE3_ASSOC)) {   
 
     // loop through columns and add values to the string 
     $index = 0;
     foreach ($columns as $columnName) {
+      // Escape special chars (e.g.quotes) inside fields by replacing them with html definitions
+      $fieldValue = encodeSpecialChars($row[$columnName]);
 
       // add quotes around the value to prevent issues with commas in fields
-      $resultCSV = $resultCSV.'"'.$row[$columnName].'"';
+      $resultCSV .= '"'.$fieldValue.'"';
 
       // detect last loop - skip as no comma needed
-      if ($index != count($columns) - 1  )
-      {
-        $resultCSV = $resultCSV.',';
+      if ($index != count($columns) - 1) {
+        $resultCSV .= ',';
       }
       $index++;
     } 
 
-    //$resultCSV = $resultCSV.implode(",", [$row["dev_MAC"], $row["dev_Name"]]);
-    $resultCSV = $resultCSV."\n";
+    // add a new line for the next row
+    $resultCSV .= "\n";
   }
 
   //write the built CSV string
   echo $resultCSV;    
 }
 
+
 //------------------------------------------------------------------------------
 //  Import CSV of devices
 //------------------------------------------------------------------------------
@@ -474,7 +476,11 @@ function ImportCSV() {
   if(isset ($_POST['content']) && !empty ($_POST['content']))
   {
     // Decode the Base64 string
-    $data = base64_decode($_POST['content']);
+    // $data = base64_decode($_POST['content']);
+    $data = base64_decode($_POST['content'], true);  // The second parameter ensures safe decoding
+
+    // // Ensure the decoded data is treated as UTF-8 text
+    // $data = mb_convert_encoding($data, 'UTF-8', 'UTF-8');
 
   } else if (file_exists($file)) { // try to get the data form the file
 
@@ -486,6 +492,12 @@ function ImportCSV() {
 
   if($data != "")
   {
+    // data cleanup - new lines breaking the CSV
+    $data = preg_replace_callback('/"([^"]*)"/', function($matches) {
+      // Replace all \n within the quotes with a space
+      return str_replace("\n", " ", $matches[0]); // Replace with a space
+    }, $data);
+
     $lines = explode("\n", $data); 
 
     // Get the column headers from the first line of the CSV

front/php/server/events.php

@@ -8,9 +8,12 @@
 #  Puche 2021 / 2022+ jokob             jokob@duck.com                GNU GPLv3
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
-  // External files
-  require dirname(__FILE__).'/init.php';
+// External files
+require dirname(__FILE__).'/init.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
 
 //------------------------------------------------------------------------------
 //  Action selector
@@ -72,7 +75,7 @@ function getEventsTotals() {
     $resultJSON = getCache("getEventsTotals".$days);
   } else
   {
-    // one query to get all numbers, whcih is quicker than multiple queries
+    // one query to get all numbers, which is quicker than multiple queries
     $sql = "select 
               (SELECT Count(*) FROM Events  WHERE eve_DateTime >=  date('now', '".$periodDateSQL."')) as all_events, 
               (SELECT Count(*) FROM Sessions as sessions WHERE (  ses_DateTimeConnection >= date('now', '".$periodDateSQL."') OR ses_DateTimeDisconnection >= date('now', '".$periodDateSQL."') OR ses_StillConnected = 1 ))  as sessions,
@@ -334,24 +337,40 @@ function getEventsCalendar() {
   $endDate    = '"'. $_REQUEST ['end'] .'"';
 
   // SQL 
-  $SQL = 'SELECT ses_MAC, ses_EventTypeConnection, ses_DateTimeConnection,
-                 ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_IP, ses_AdditionalInfo, ses_StillConnected,
-            
-                 CASE
-                   WHEN ses_EventTypeConnection = "<missing event>" THEN
-                        IFNULL ((SELECT MAX(ses_DateTimeDisconnection) FROM Sessions AS SES2 WHERE SES2.ses_MAC = SES1.ses_MAC AND SES2.ses_DateTimeDisconnection < SES1.ses_DateTimeDisconnection),  DATETIME(ses_DateTimeDisconnection, "-1 hour"))
-                   ELSE ses_DateTimeConnection
-                 END AS ses_DateTimeConnectionCorrected,
+  $SQL = 'SELECT SES1.ses_MAC, SES1.ses_EventTypeConnection, SES1.ses_DateTimeConnection,
+          SES1.ses_EventTypeDisconnection, SES1.ses_DateTimeDisconnection, SES1.ses_IP,
+          SES1.ses_AdditionalInfo, SES1.ses_StillConnected,
+          
+          CASE
+            WHEN SES1.ses_EventTypeConnection = "<missing event>" THEN
+              IFNULL (
+                (SELECT MAX(SES2.ses_DateTimeDisconnection) 
+                  FROM Sessions AS SES2 
+                  WHERE SES2.ses_MAC = SES1.ses_MAC 
+                    AND SES2.ses_DateTimeDisconnection < SES1.ses_DateTimeDisconnection
+                    AND SES2.ses_DateTimeDisconnection BETWEEN Date('. $startDate .') AND Date('. $endDate .')
+                ), 
+                DATETIME(SES1.ses_DateTimeDisconnection, "-1 hour")
+              )
+            ELSE SES1.ses_DateTimeConnection
+          END AS ses_DateTimeConnectionCorrected,
 
-                 CASE
-                   WHEN ses_EventTypeDisconnection = "<missing event>" THEN
-                        (SELECT MIN(ses_DateTimeConnection) FROM Sessions AS SES2 WHERE SES2.ses_MAC = SES1.ses_MAC AND SES2.ses_DateTimeConnection > SES1.ses_DateTimeConnection)
-                   ELSE ses_DateTimeDisconnection
-                 END AS ses_DateTimeDisconnectionCorrected
+          CASE
+            WHEN SES1.ses_EventTypeDisconnection = "<missing event>" THEN
+              (SELECT MIN(SES2.ses_DateTimeConnection) 
+                FROM Sessions AS SES2 
+                WHERE SES2.ses_MAC = SES1.ses_MAC 
+                  AND SES2.ses_DateTimeConnection > SES1.ses_DateTimeConnection
+                  AND SES2.ses_DateTimeConnection BETWEEN Date('. $startDate .') AND Date('. $endDate .')
+              )
+            ELSE SES1.ses_DateTimeDisconnection
+          END AS ses_DateTimeDisconnectionCorrected
+
+        FROM Sessions AS SES1 
+        WHERE (SES1.ses_DateTimeConnection BETWEEN Date('. $startDate .') AND Date('. $endDate .'))
+        OR (SES1.ses_DateTimeDisconnection BETWEEN Date('. $startDate .') AND Date('. $endDate .'))
+        OR SES1.ses_StillConnected = 1';
 
-          FROM Sessions AS SES1 
-          WHERE (     ses_DateTimeConnectionCorrected <= Date('. $endDate .')
-                 AND (ses_DateTimeDisconnectionCorrected >= Date('. $startDate .') OR ses_StillConnected = 1 )) ';
   $result = $db->query($SQL);
 
   // arrays of rows

front/php/server/internetinfo.php

@@ -15,6 +15,10 @@
 // Get init.php 
 require dirname(__FILE__).'/../server/init.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 // Perform a test with the PING command
 $output = shell_exec("curl ipinfo.io");
 

front/php/server/nmap_scan.php

@@ -2,6 +2,10 @@
 
 require 'util.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 $PIA_HOST_IP = $_REQUEST['scan'];
 $PIA_SCAN_MODE = $_REQUEST['mode'];
 

front/php/server/nslookup.php

@@ -15,6 +15,11 @@
 // Get init.php 
 require dirname(__FILE__).'/../server/init.php';
 
+
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 // Get IP
 $ip = $_GET['ip'];
 

front/php/server/parameters.php

@@ -1,144 +0,0 @@
-<?php
-//------------------------------------------------------------------------------
-//  NetAlertX
-//  Open Source Network Guard / WIFI & LAN intrusion detector 
-//
-//  parameters.php - Front module. Server side. Manage Parameters
-//------------------------------------------------------------------------------
-#  Puche 2021 / 2022+ jokob             jokob@duck.com                GNU GPLv3
-//------------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------------
-  // External files
-  require dirname(__FILE__).'/init.php';
- 
-
-//------------------------------------------------------------------------------
-//  Action selector
-//------------------------------------------------------------------------------
-  // Set maximum execution time to 15 seconds
-  ini_set ('max_execution_time','15');
-
-  $skipCache = FALSE;
-  $expireMinutes = 5;
-  $defaultValue = '';
-  
-
-  if (isset ($_REQUEST['skipcache'])) {
-    $skipCache = TRUE;    
-  }
-
-  if (isset ($_REQUEST['defaultValue'])) {
-    $defaultValue = $_REQUEST['defaultValue'];    
-  }
-
-  if (isset ($_REQUEST['expireMinutes'])) {
-    $expireMinutes = $_REQUEST['expireMinutes'];    
-  }
-
-  // Action functions
-  if (isset ($_REQUEST['action']) && !empty ($_REQUEST['action'])) {
-    $action = $_REQUEST['action'];
-    switch ($action) {
-      case 'get':  getParameter($skipCache, $defaultValue, $expireMinutes); break;
-      case 'set':  setParameter($expireMinutes);                          break;
-      default:     logServerConsole ('Action: '. $action);  break;
-    }
-  }
-
-
-//------------------------------------------------------------------------------
-//  Get Parameter Value
-//------------------------------------------------------------------------------
-function getParameter($skipCache, $defaultValue, $expireMinutes) {
-
-  $parameter = $_REQUEST['parameter'];
-  $value = "";
-
-  // get the value from the cache if available
-  $cachedValue = getCache($parameter);
-  if($cachedValue != "")
-  {
-    $value  = $cachedValue;
-  }
-
-  // query the database if no cache entry found or requesting live data (skipping cache)
-  if($skipCache || $value == "" )
-  {
-    global $db;
-    
-    $sql = 'SELECT par_Value FROM Parameters
-            WHERE par_ID="'. quotes($parameter) .'"';
-    
-    $result = $db->query($sql);
-    $row = $result -> fetchArray (SQLITE3_NUM);  
-
-    if($row != NULL && count($row) == 1)
-    {
-      $value = $row[0];
-    } else{
-      $value = $defaultValue;
-
-      // Nothing found in the DB, Insert new value
-      insertNew($parameter, $value);
-    }
-
-    // update cache  
-    setCache($parameter, $value, $expireMinutes);
-  }
-  // return value
-  echo (json_encode ($value));  
-}
-
-
-//------------------------------------------------------------------------------
-//  Set Parameter Value
-//------------------------------------------------------------------------------
-function setParameter($expireMinutes) {
-
-  $parameter = $_REQUEST['parameter'];
-  $value = $_REQUEST['value'];  
-    
-  global $db;
- 
-  // Update value
-  $sql = 'UPDATE Parameters SET par_Value="'. quotes ($value) .'"
-          WHERE par_ID="'. quotes($parameter) .'"';
-  $result = $db->query($sql);
-
-  if (! $result == TRUE) {
-    echo "Error updating parameter\n\n$sql \n\n". $db->lastErrorMsg();
-    return;
-  }
-
-  $changes = $db->changes();
-  if ($changes == 0) {
-    // Insert new value
-    insertNew($parameter, $value);
-  }
-
-  // update cache  
-  setCache($parameter, $value, $expireMinutes);
-
-  echo 'OK';
-}
-
-function insertNew($parameter, $value)
-{
-  global $db;
-
-  // Insert new value
-  $sql = 'INSERT INTO Parameters (par_ID, par_Value)
-          VALUES ("'. quotes($parameter) .'",
-                  "'. quotes($value)     .'")';
-  $result = $db->query($sql);
-
-  if (! $result == TRUE) {
-    echo "Error creating parameter\n\n$sql \n\n". $db->lastErrorMsg();
-    return;
-  }
-}
-
-
-?>

front/php/server/speedtestcli.php

@@ -1,5 +1,10 @@
 <?php
 require dirname(__FILE__).'/../server/init.php';
+
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 exec('../../../back/speedtest-cli --secure --simple', $output);
 
 echo '<h4>'. lang('Speedtest_Results') .'</h4>';

front/php/server/traceroute.php

@@ -15,6 +15,10 @@
 // Get init.php 
 require dirname(__FILE__).'/../server/init.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 // Get IP
 $ip = $_GET['ip'];
 

front/php/server/util.php

@@ -11,6 +11,10 @@
 require dirname(__FILE__).'/../templates/timezone.php';
 require dirname(__FILE__).'/../templates/skinUI.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 $FUNCTION = [];
 $SETTINGS = [];
 $ACTION   = "";
@@ -484,7 +488,7 @@ function getDateFromPeriod () {
       $days = "3650"; //10 years
       break;
     default:
-    $days = "1";    
+      $days = "1";    
   }  
 
   $periodDateSQL = "-".$days." day"; 
@@ -520,6 +524,25 @@ function handleNull ($text, $default = "") {
   
 }
 
+// -------------------------------------------------------------------------------------------
+// Encode special chars
+function encodeSpecialChars($str) {
+  return str_replace(
+      ['&', '<', '>', '"', "'"],
+      ['&amp;', '&lt;', '&gt;', '&quot;', '&#039;'],
+      $str
+  );
+}
+
+// -------------------------------------------------------------------------------------------
+// Decode special chars
+function decodeSpecialChars($str) {
+  return str_replace(
+      ['&amp;', '&lt;', '&gt;', '&quot;', '&#039;'],
+      ['&', '<', '>', '"', "'"],
+      $str
+  );
+}
 
 
 // -------------------------------------------------------------------------------------------

front/php/server/utilDB.php

@@ -1,13 +0,0 @@
-<!-- utils needing a DB connection -->
-
-<?php
-
-require dirname(__FILE__).'/init.php';
-
-// Action functions
-if (isset ($_REQUEST['key']))
-{
-  echo lang($_REQUEST['key']);
-}
-
-?>

front/php/server/utilNotification.php

@@ -1,8 +1,11 @@
 <?php
 
-
 require dirname(__FILE__).'/../templates/timezone.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 // ----------------------------------------------------------------------------------------
 // Check if the action parameter is set in the GET request
 if (isset($_GET['action'])) {

front/php/templates/auth.php

@@ -1,5 +1,7 @@
 <?php
-session_start();
+if (session_status() == PHP_SESSION_NONE) {
+    session_start();
+}
 
 $isAuthenticated = false;
 
@@ -17,9 +19,9 @@ $config_file = "../../../config/app.conf"; // depends on where this file is call
 $config_file_lines = file($config_file);
 $config_file_lines = array_values(preg_grep('/^SETPWD_password.*=/', $config_file_lines));
 $password_line = explode("'", $config_file_lines[0]);
-$Pia_Password = $password_line[1];
+$nax_Password = $password_line[1];
 
-if (isset($_COOKIE[$CookieSaveLoginName]) && $Pia_Password == $_COOKIE[$CookieSaveLoginName]) {
+if (isset($_COOKIE[$CookieSaveLoginName]) && $nax_Password == $_COOKIE[$CookieSaveLoginName]) {
     $isAuthenticated = true;
 }
 

front/php/templates/footer.php

@@ -12,6 +12,12 @@
 #---------------------------------------------------------------------------------#
 -->
 
+<?php 
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+?>
+
   <!-- Main Footer -->
   <footer class="main-footer">
     <!-- Default to the left -->
@@ -53,7 +59,7 @@
 <link rel="stylesheet" href="lib/AdminLTE/bower_components/select2/dist/css/select2.min.css">
 
 <!-- NetAlertX -->
-<script src="js/handle_version.js"></script>
+<script defer src="js/handle_version.js"></script>
 <script src="js/ui_components.js?v=<?php include 'php/templates/version.php'; ?>"></script>
 
 

front/php/templates/graph.php

@@ -1,55 +0,0 @@
-<?php
-
-global $db;
-
-$Pia_Graph_Device_Time = array();
-$Pia_Graph_Device_All = array();
-$Pia_Graph_Device_Online = array();
-$Pia_Graph_Device_Down = array();
-$Pia_Graph_Device_Arch = array();
-
-$statusesToShow = "'online', 'offline', 'archived'";
-
-$statQuery = $db->query("SELECT * FROM Settings WHERE Code_Name = 'UI_PRESENCE'");
-
-while($r = $statQuery->fetchArray(SQLITE3_ASSOC))
-{
-  $statusesToShow =  $r['Value'];
-}
-
-$results = $db->query('SELECT * FROM Online_History ORDER BY Scan_Date DESC LIMIT 144');
-
-while ($row = $results->fetchArray()) 
-{
-    $time_raw = explode(' ', $row['Scan_Date']);
-    $time = explode(':', $time_raw[1]);
-    array_push($Pia_Graph_Device_Time, $time[0].':'.$time[1]);
-    
-    //  Offline
-    if(strpos($statusesToShow, 'offline') !== false) 
-    {
-      array_push($Pia_Graph_Device_Down, $row['Down_Devices']);
-    }
-
-    //  All
-    array_push($Pia_Graph_Device_All, $row['All_Devices']);
-
-    // Online
-    if(strpos($statusesToShow, 'online') !== false)
-    {
-      array_push($Pia_Graph_Device_Online, $row['Online_Devices']);
-    }
-    
-    // Archived
-    if(strpos($statusesToShow, 'archived') !== false)
-    {   
-      array_push($Pia_Graph_Device_Arch, $row['Archived_Devices']);
-    }
-}
-function pia_graph_devices_data($Pia_Graph_Array) {
-  $Pia_Graph_Array_rev = array_reverse($Pia_Graph_Array);
-  foreach ($Pia_Graph_Array_rev as $result) {
-      echo "'".$result."'";
-      echo ",";
-  }
-}

front/php/templates/header.php

@@ -8,8 +8,10 @@
 #--------------------------------------------------------------------------- -->
 
 <?php
-require dirname(__FILE__).'/../server/init.php';
-require dirname(__FILE__).'/security.php';
+  require dirname(__FILE__).'/../server/init.php';
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
 
 ?>
 
@@ -67,14 +69,16 @@ require dirname(__FILE__).'/security.php';
   <link id="favicon" rel="icon" type="image/x-icon" href="img/NetAlertX_logo.png">
 
   <!-- For better UX on Mobile Devices using the Shortcut on the Homescreen -->
-  <link rel="manifest" href="img/manifest.json">  
+  <link rel="manifest" href="img/manifest.json" crossorigin="use-credentials">  
   <!-- Dark-Mode Patch -->
-<?php
-if ($ENABLED_DARKMODE === True) {
-   echo '<link rel="stylesheet" href="css/dark-patch.css">';
-   $BACKGROUND_IMAGE_PATCH='style="background-image: url(\'img/boxed-bg-dark.png\');"';
-} else { $BACKGROUND_IMAGE_PATCH='style="background-image: url(\'img/background.png\');"';}
-?>
+
+  <?php
+  if ($ENABLED_DARKMODE === True) {
+    echo '<link rel="stylesheet" href="css/dark-patch.css">';
+    $BACKGROUND_IMAGE_PATCH='style="background-image: url(\'img/boxed-bg-dark.png\');"';
+  } else { $BACKGROUND_IMAGE_PATCH='style="background-image: url(\'img/background.png\');"';}
+  ?>
+
 
 
 <!-- Servertime to the right of the hostname -->
@@ -312,9 +316,6 @@ if ($ENABLED_DARKMODE === True) {
             </span>
           </a>
           <ul class="treeview-menu" style="display: <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'block'; } else {echo 'none';} ?>;">
-            <li>
-              <a href="maintenance.php#tab_Settings" onclick="initializeTabs()">  <?= lang("Maintenance_Tools_Tab_UISettings");?> </a>
-            </li>
             <li>
               <a href="maintenance.php#tab_DBTools" onclick="initializeTabs()">  <?= lang("Maintenance_Tools_Tab_Tools");?> </a>
             </li>

front/php/templates/language/cs_cz.json

@@ -0,0 +1,702 @@
+{
+    "API_CUSTOM_SQL_description": "",
+    "API_CUSTOM_SQL_name": "",
+    "API_display_name": "",
+    "API_icon": "",
+    "About_Design": "",
+    "About_Exit": "",
+    "About_Title": "",
+    "AppEvents_DateTimeCreated": "",
+    "AppEvents_Extra": "",
+    "AppEvents_GUID": "",
+    "AppEvents_Helper1": "",
+    "AppEvents_Helper2": "",
+    "AppEvents_Helper3": "",
+    "AppEvents_ObjectForeignKey": "",
+    "AppEvents_ObjectIndex": "",
+    "AppEvents_ObjectIsArchived": "",
+    "AppEvents_ObjectIsNew": "",
+    "AppEvents_ObjectPlugin": "",
+    "AppEvents_ObjectPrimaryID": "",
+    "AppEvents_ObjectSecondaryID": "",
+    "AppEvents_ObjectStatus": "",
+    "AppEvents_ObjectStatusColumn": "",
+    "AppEvents_ObjectType": "",
+    "AppEvents_Plugin": "",
+    "AppEvents_Type": "",
+    "BackDevDetail_Actions_Ask_Run": "",
+    "BackDevDetail_Actions_Not_Registered": "",
+    "BackDevDetail_Actions_Title_Run": "",
+    "BackDevDetail_Copy_Ask": "",
+    "BackDevDetail_Copy_Title": "",
+    "BackDevDetail_Tools_WOL_error": "",
+    "BackDevDetail_Tools_WOL_okay": "",
+    "BackDevices_Arpscan_disabled": "",
+    "BackDevices_Arpscan_enabled": "",
+    "BackDevices_Backup_CopError": "",
+    "BackDevices_Backup_Failed": "",
+    "BackDevices_Backup_okay": "",
+    "BackDevices_DBTools_DelDevError_a": "",
+    "BackDevices_DBTools_DelDevError_b": "",
+    "BackDevices_DBTools_DelDev_a": "",
+    "BackDevices_DBTools_DelDev_b": "",
+    "BackDevices_DBTools_DelEvents": "",
+    "BackDevices_DBTools_DelEventsError": "",
+    "BackDevices_DBTools_ImportCSV": "",
+    "BackDevices_DBTools_ImportCSVError": "",
+    "BackDevices_DBTools_ImportCSVMissing": "",
+    "BackDevices_DBTools_Purge": "",
+    "BackDevices_DBTools_UpdDev": "",
+    "BackDevices_DBTools_UpdDevError": "",
+    "BackDevices_DBTools_Upgrade": "",
+    "BackDevices_DBTools_UpgradeError": "",
+    "BackDevices_Device_UpdDevError": "",
+    "BackDevices_Restore_CopError": "",
+    "BackDevices_Restore_Failed": "",
+    "BackDevices_Restore_okay": "",
+    "BackDevices_darkmode_disabled": "",
+    "BackDevices_darkmode_enabled": "",
+    "CLEAR_NEW_FLAG_description": "",
+    "CLEAR_NEW_FLAG_name": "",
+    "DAYS_TO_KEEP_EVENTS_description": "",
+    "DAYS_TO_KEEP_EVENTS_name": "",
+    "DevDetail_Copy_Device_Title": "",
+    "DevDetail_Copy_Device_Tooltip": "",
+    "DevDetail_EveandAl_AlertAllEvents": "",
+    "DevDetail_EveandAl_AlertDown": "",
+    "DevDetail_EveandAl_Archived": "",
+    "DevDetail_EveandAl_NewDevice": "",
+    "DevDetail_EveandAl_NewDevice_Tooltip": "",
+    "DevDetail_EveandAl_RandomMAC": "",
+    "DevDetail_EveandAl_ScanCycle": "",
+    "DevDetail_EveandAl_ScanCycle_a": "",
+    "DevDetail_EveandAl_ScanCycle_z": "",
+    "DevDetail_EveandAl_Skip": "",
+    "DevDetail_EveandAl_Title": "",
+    "DevDetail_Events_CheckBox": "",
+    "DevDetail_GoToNetworkNode": "",
+    "DevDetail_Icon": "",
+    "DevDetail_Icon_Descr": "",
+    "DevDetail_Loading": "",
+    "DevDetail_MainInfo_Comments": "",
+    "DevDetail_MainInfo_Favorite": "",
+    "DevDetail_MainInfo_Group": "",
+    "DevDetail_MainInfo_Location": "",
+    "DevDetail_MainInfo_Name": "",
+    "DevDetail_MainInfo_Network": "",
+    "DevDetail_MainInfo_Network_Port": "",
+    "DevDetail_MainInfo_Network_Site": "",
+    "DevDetail_MainInfo_Network_Title": "",
+    "DevDetail_MainInfo_Owner": "",
+    "DevDetail_MainInfo_SSID": "",
+    "DevDetail_MainInfo_Title": "",
+    "DevDetail_MainInfo_Type": "",
+    "DevDetail_MainInfo_Vendor": "",
+    "DevDetail_MainInfo_mac": "",
+    "DevDetail_Network_Node_hover": "",
+    "DevDetail_Network_Port_hover": "",
+    "DevDetail_Nmap_Scans": "",
+    "DevDetail_Nmap_Scans_desc": "",
+    "DevDetail_Nmap_buttonDefault": "",
+    "DevDetail_Nmap_buttonDefault_text": "",
+    "DevDetail_Nmap_buttonDetail": "",
+    "DevDetail_Nmap_buttonDetail_text": "",
+    "DevDetail_Nmap_buttonFast": "",
+    "DevDetail_Nmap_buttonFast_text": "",
+    "DevDetail_Nmap_buttonSkipDiscovery": "",
+    "DevDetail_Nmap_buttonSkipDiscovery_text": "",
+    "DevDetail_Nmap_resultsLink": "",
+    "DevDetail_Owner_hover": "",
+    "DevDetail_Periodselect_All": "",
+    "DevDetail_Periodselect_LastMonth": "",
+    "DevDetail_Periodselect_LastWeek": "",
+    "DevDetail_Periodselect_LastYear": "",
+    "DevDetail_Periodselect_today": "",
+    "DevDetail_Run_Actions_Title": "",
+    "DevDetail_Run_Actions_Tooltip": "",
+    "DevDetail_SessionInfo_FirstSession": "",
+    "DevDetail_SessionInfo_LastIP": "",
+    "DevDetail_SessionInfo_LastSession": "",
+    "DevDetail_SessionInfo_StaticIP": "",
+    "DevDetail_SessionInfo_Status": "",
+    "DevDetail_SessionInfo_Title": "",
+    "DevDetail_SessionTable_Additionalinfo": "",
+    "DevDetail_SessionTable_Connection": "",
+    "DevDetail_SessionTable_Disconnection": "",
+    "DevDetail_SessionTable_Duration": "",
+    "DevDetail_SessionTable_IP": "",
+    "DevDetail_SessionTable_Order": "",
+    "DevDetail_Shortcut_CurrentStatus": "",
+    "DevDetail_Shortcut_DownAlerts": "",
+    "DevDetail_Shortcut_Presence": "",
+    "DevDetail_Shortcut_Sessions": "",
+    "DevDetail_Tab_Details": "",
+    "DevDetail_Tab_Events": "",
+    "DevDetail_Tab_EventsTableDate": "",
+    "DevDetail_Tab_EventsTableEvent": "",
+    "DevDetail_Tab_EventsTableIP": "",
+    "DevDetail_Tab_EventsTableInfo": "",
+    "DevDetail_Tab_Nmap": "",
+    "DevDetail_Tab_NmapEmpty": "",
+    "DevDetail_Tab_NmapTableExtra": "",
+    "DevDetail_Tab_NmapTableHeader": "",
+    "DevDetail_Tab_NmapTableIndex": "",
+    "DevDetail_Tab_NmapTablePort": "",
+    "DevDetail_Tab_NmapTableService": "",
+    "DevDetail_Tab_NmapTableState": "",
+    "DevDetail_Tab_NmapTableText": "",
+    "DevDetail_Tab_NmapTableTime": "",
+    "DevDetail_Tab_Plugins": "",
+    "DevDetail_Tab_Presence": "",
+    "DevDetail_Tab_Sessions": "",
+    "DevDetail_Tab_Tools": "",
+    "DevDetail_Tab_Tools_Internet_Info_Description": "",
+    "DevDetail_Tab_Tools_Internet_Info_Error": "",
+    "DevDetail_Tab_Tools_Internet_Info_Start": "",
+    "DevDetail_Tab_Tools_Internet_Info_Title": "",
+    "DevDetail_Tab_Tools_Nslookup_Description": "",
+    "DevDetail_Tab_Tools_Nslookup_Error": "",
+    "DevDetail_Tab_Tools_Nslookup_Start": "",
+    "DevDetail_Tab_Tools_Nslookup_Title": "",
+    "DevDetail_Tab_Tools_Speedtest_Description": "",
+    "DevDetail_Tab_Tools_Speedtest_Start": "",
+    "DevDetail_Tab_Tools_Speedtest_Title": "",
+    "DevDetail_Tab_Tools_Traceroute_Description": "",
+    "DevDetail_Tab_Tools_Traceroute_Error": "",
+    "DevDetail_Tab_Tools_Traceroute_Start": "",
+    "DevDetail_Tab_Tools_Traceroute_Title": "",
+    "DevDetail_Tools_WOL": "",
+    "DevDetail_Tools_WOL_noti": "",
+    "DevDetail_Tools_WOL_noti_text": "",
+    "DevDetail_Type_hover": "",
+    "DevDetail_Vendor_hover": "",
+    "DevDetail_WOL_Title": "",
+    "DevDetail_button_AddIcon": "",
+    "DevDetail_button_AddIcon_Help": "",
+    "DevDetail_button_AddIcon_Tooltip": "",
+    "DevDetail_button_Delete": "",
+    "DevDetail_button_DeleteEvents": "",
+    "DevDetail_button_DeleteEvents_Warning": "",
+    "DevDetail_button_OverwriteIcons": "",
+    "DevDetail_button_OverwriteIcons_Tooltip": "",
+    "DevDetail_button_OverwriteIcons_Warning": "",
+    "DevDetail_button_Reset": "",
+    "DevDetail_button_Save": "",
+    "Device_MultiEdit": "",
+    "Device_MultiEdit_Backup": "",
+    "Device_MultiEdit_Fields": "",
+    "Device_MultiEdit_MassActions": "",
+    "Device_MultiEdit_Tooltip": "",
+    "Device_Searchbox": "",
+    "Device_Shortcut_AllDevices": "",
+    "Device_Shortcut_Archived": "",
+    "Device_Shortcut_Connected": "",
+    "Device_Shortcut_Devices": "",
+    "Device_Shortcut_DownAlerts": "",
+    "Device_Shortcut_DownOnly": "",
+    "Device_Shortcut_Favorites": "",
+    "Device_Shortcut_NewDevices": "",
+    "Device_Shortcut_OnlineChart": "",
+    "Device_TableHead_Connected_Devices": "",
+    "Device_TableHead_Favorite": "",
+    "Device_TableHead_FirstSession": "",
+    "Device_TableHead_GUID": "",
+    "Device_TableHead_Group": "",
+    "Device_TableHead_Icon": "",
+    "Device_TableHead_LastIP": "",
+    "Device_TableHead_LastIPOrder": "",
+    "Device_TableHead_LastSession": "",
+    "Device_TableHead_Location": "",
+    "Device_TableHead_MAC": "",
+    "Device_TableHead_MAC_full": "",
+    "Device_TableHead_Name": "",
+    "Device_TableHead_NetworkSite": "",
+    "Device_TableHead_Owner": "",
+    "Device_TableHead_Parent_MAC": "",
+    "Device_TableHead_Port": "",
+    "Device_TableHead_RowID": "",
+    "Device_TableHead_Rowid": "",
+    "Device_TableHead_SSID": "",
+    "Device_TableHead_Status": "",
+    "Device_TableHead_SyncHubNodeName": "",
+    "Device_TableHead_Type": "",
+    "Device_TableHead_Vendor": "",
+    "Device_Table_Not_Network_Device": "",
+    "Device_Table_info": "",
+    "Device_Table_nav_next": "",
+    "Device_Table_nav_prev": "",
+    "Device_Tablelenght": "",
+    "Device_Tablelenght_all": "",
+    "Device_Title": "",
+    "Donations_Others": "",
+    "Donations_Platforms": "",
+    "Donations_Text": "",
+    "Donations_Title": "",
+    "ENABLE_PLUGINS_description": "",
+    "ENABLE_PLUGINS_name": "",
+    "Email_display_name": "",
+    "Email_icon": "",
+    "Events_Loading": "",
+    "Events_Periodselect_All": "",
+    "Events_Periodselect_LastMonth": "",
+    "Events_Periodselect_LastWeek": "",
+    "Events_Periodselect_LastYear": "",
+    "Events_Periodselect_today": "",
+    "Events_Searchbox": "",
+    "Events_Shortcut_AllEvents": "",
+    "Events_Shortcut_DownAlerts": "",
+    "Events_Shortcut_Events": "",
+    "Events_Shortcut_MissSessions": "",
+    "Events_Shortcut_NewDevices": "",
+    "Events_Shortcut_Sessions": "",
+    "Events_Shortcut_VoidSessions": "",
+    "Events_TableHead_AdditionalInfo": "",
+    "Events_TableHead_Connection": "",
+    "Events_TableHead_Date": "",
+    "Events_TableHead_Device": "",
+    "Events_TableHead_Disconnection": "",
+    "Events_TableHead_Duration": "",
+    "Events_TableHead_DurationOrder": "",
+    "Events_TableHead_EventType": "",
+    "Events_TableHead_IP": "",
+    "Events_TableHead_IPOrder": "",
+    "Events_TableHead_Order": "",
+    "Events_TableHead_Owner": "",
+    "Events_TableHead_PendingAlert": "",
+    "Events_Table_info": "",
+    "Events_Table_nav_next": "",
+    "Events_Table_nav_prev": "",
+    "Events_Tablelenght": "",
+    "Events_Tablelenght_all": "",
+    "Events_Title": "",
+    "Gen_Action": "",
+    "Gen_Add": "",
+    "Gen_Add_All": "",
+    "Gen_All_Devices": "",
+    "Gen_AreYouSure": "",
+    "Gen_Backup": "",
+    "Gen_Cancel": "",
+    "Gen_Change": "",
+    "Gen_Copy": "",
+    "Gen_DataUpdatedUITakesTime": "",
+    "Gen_Delete": "",
+    "Gen_DeleteAll": "",
+    "Gen_Error": "",
+    "Gen_Filter": "",
+    "Gen_LockedDB": "",
+    "Gen_Offline": "",
+    "Gen_Okay": "",
+    "Gen_Purge": "",
+    "Gen_ReadDocs": "",
+    "Gen_Remove_All": "",
+    "Gen_Remove_Last": "",
+    "Gen_Restore": "",
+    "Gen_Run": "",
+    "Gen_Save": "",
+    "Gen_Saved": "",
+    "Gen_Search": "",
+    "Gen_SelectToPreview": "",
+    "Gen_Selected_Devices": "",
+    "Gen_Switch": "",
+    "Gen_Upd": "",
+    "Gen_Upd_Fail": "",
+    "Gen_Update": "",
+    "Gen_Update_Value": "",
+    "Gen_Warning": "",
+    "Gen_Work_In_Progress": "",
+    "General_display_name": "",
+    "General_icon": "",
+    "HRS_TO_KEEP_NEWDEV_description": "",
+    "HRS_TO_KEEP_NEWDEV_name": "",
+    "HelpFAQ_Cat_Detail": "",
+    "HelpFAQ_Cat_Detail_300_head": "",
+    "HelpFAQ_Cat_Detail_300_text_a": "",
+    "HelpFAQ_Cat_Detail_300_text_b": "",
+    "HelpFAQ_Cat_Detail_301_head_a": "",
+    "HelpFAQ_Cat_Detail_301_head_b": "",
+    "HelpFAQ_Cat_Detail_301_text": "",
+    "HelpFAQ_Cat_Detail_302_head_a": "",
+    "HelpFAQ_Cat_Detail_302_head_b": "",
+    "HelpFAQ_Cat_Detail_302_text": "",
+    "HelpFAQ_Cat_Detail_303_head": "",
+    "HelpFAQ_Cat_Detail_303_text": "",
+    "HelpFAQ_Cat_Device_200_head": "",
+    "HelpFAQ_Cat_Device_200_text": "",
+    "HelpFAQ_Cat_General": "",
+    "HelpFAQ_Cat_General_100_head": "",
+    "HelpFAQ_Cat_General_100_text_a": "",
+    "HelpFAQ_Cat_General_100_text_b": "",
+    "HelpFAQ_Cat_General_100_text_c": "",
+    "HelpFAQ_Cat_General_101_head": "",
+    "HelpFAQ_Cat_General_101_text": "",
+    "HelpFAQ_Cat_General_102_head": "",
+    "HelpFAQ_Cat_General_102_text": "",
+    "HelpFAQ_Cat_General_102docker_head": "",
+    "HelpFAQ_Cat_General_102docker_text": "",
+    "HelpFAQ_Cat_General_103_head": "",
+    "HelpFAQ_Cat_General_103_text": "",
+    "HelpFAQ_Cat_Network_600_head": "",
+    "HelpFAQ_Cat_Network_600_text": "",
+    "HelpFAQ_Cat_Network_601_head": "",
+    "HelpFAQ_Cat_Network_601_text": "",
+    "HelpFAQ_Cat_Presence_400_head": "",
+    "HelpFAQ_Cat_Presence_400_text": "",
+    "HelpFAQ_Cat_Presence_401_head": "",
+    "HelpFAQ_Cat_Presence_401_text": "",
+    "HelpFAQ_Title": "",
+    "LOADED_PLUGINS_description": "",
+    "LOADED_PLUGINS_name": "",
+    "LOG_LEVEL_description": "",
+    "LOG_LEVEL_name": "",
+    "Loading": "",
+    "Login_Box": "",
+    "Login_Default_PWD": "",
+    "Login_Info": "",
+    "Login_Psw-box": "",
+    "Login_Psw_alert": "",
+    "Login_Psw_folder": "",
+    "Login_Psw_new": "",
+    "Login_Psw_run": "",
+    "Login_Remember": "",
+    "Login_Remember_small": "",
+    "Login_Submit": "",
+    "Login_Toggle_Alert_headline": "",
+    "Login_Toggle_Info": "",
+    "Login_Toggle_Info_headline": "",
+    "Maint_PurgeLog": "",
+    "Maint_RestartServer": "",
+    "Maint_Restart_Server_noti_text": "",
+    "Maintenance_Running_Version": "",
+    "Maintenance_Status": "",
+    "Maintenance_Title": "",
+    "Maintenance_Tool_ExportCSV": "",
+    "Maintenance_Tool_ExportCSV_noti": "",
+    "Maintenance_Tool_ExportCSV_noti_text": "",
+    "Maintenance_Tool_ExportCSV_text": "",
+    "Maintenance_Tool_ImportCSV": "",
+    "Maintenance_Tool_ImportCSV_noti": "",
+    "Maintenance_Tool_ImportCSV_noti_text": "",
+    "Maintenance_Tool_ImportCSV_text": "",
+    "Maintenance_Tool_ImportPastedCSV": "",
+    "Maintenance_Tool_ImportPastedCSV_noti_text": "",
+    "Maintenance_Tool_ImportPastedCSV_text": "",
+    "Maintenance_Tool_arpscansw": "",
+    "Maintenance_Tool_arpscansw_noti": "",
+    "Maintenance_Tool_arpscansw_noti_text": "",
+    "Maintenance_Tool_arpscansw_text": "",
+    "Maintenance_Tool_backup": "",
+    "Maintenance_Tool_backup_noti": "",
+    "Maintenance_Tool_backup_noti_text": "",
+    "Maintenance_Tool_backup_text": "",
+    "Maintenance_Tool_check_visible": "",
+    "Maintenance_Tool_darkmode": "",
+    "Maintenance_Tool_darkmode_noti": "",
+    "Maintenance_Tool_darkmode_noti_text": "",
+    "Maintenance_Tool_darkmode_text": "",
+    "Maintenance_Tool_del_ActHistory": "",
+    "Maintenance_Tool_del_ActHistory_noti": "",
+    "Maintenance_Tool_del_ActHistory_noti_text": "",
+    "Maintenance_Tool_del_ActHistory_text": "",
+    "Maintenance_Tool_del_alldev": "",
+    "Maintenance_Tool_del_alldev_noti": "",
+    "Maintenance_Tool_del_alldev_noti_text": "",
+    "Maintenance_Tool_del_alldev_text": "",
+    "Maintenance_Tool_del_allevents": "",
+    "Maintenance_Tool_del_allevents30": "",
+    "Maintenance_Tool_del_allevents30_noti": "",
+    "Maintenance_Tool_del_allevents30_noti_text": "",
+    "Maintenance_Tool_del_allevents30_text": "",
+    "Maintenance_Tool_del_allevents_noti": "",
+    "Maintenance_Tool_del_allevents_noti_text": "",
+    "Maintenance_Tool_del_allevents_text": "",
+    "Maintenance_Tool_del_empty_macs": "",
+    "Maintenance_Tool_del_empty_macs_noti": "",
+    "Maintenance_Tool_del_empty_macs_noti_text": "",
+    "Maintenance_Tool_del_empty_macs_text": "",
+    "Maintenance_Tool_del_selecteddev": "",
+    "Maintenance_Tool_del_selecteddev_text": "",
+    "Maintenance_Tool_del_unknowndev": "",
+    "Maintenance_Tool_del_unknowndev_noti": "",
+    "Maintenance_Tool_del_unknowndev_noti_text": "",
+    "Maintenance_Tool_del_unknowndev_text": "",
+    "Maintenance_Tool_displayed_columns_text": "",
+    "Maintenance_Tool_drag_me": "",
+    "Maintenance_Tool_order_columns_text": "",
+    "Maintenance_Tool_purgebackup": "",
+    "Maintenance_Tool_purgebackup_noti": "",
+    "Maintenance_Tool_purgebackup_noti_text": "",
+    "Maintenance_Tool_purgebackup_text": "",
+    "Maintenance_Tool_restore": "",
+    "Maintenance_Tool_restore_noti": "",
+    "Maintenance_Tool_restore_noti_text": "",
+    "Maintenance_Tool_restore_text": "",
+    "Maintenance_Tool_upgrade_database_noti": "",
+    "Maintenance_Tool_upgrade_database_noti_text": "",
+    "Maintenance_Tool_upgrade_database_text": "",
+    "Maintenance_Tools_Tab_BackupRestore": "",
+    "Maintenance_Tools_Tab_Logging": "",
+    "Maintenance_Tools_Tab_Settings": "",
+    "Maintenance_Tools_Tab_Tools": "",
+    "Maintenance_Tools_Tab_UISettings": "",
+    "Maintenance_arp_status": "",
+    "Maintenance_arp_status_off": "",
+    "Maintenance_arp_status_on": "",
+    "Maintenance_built_on": "",
+    "Maintenance_current_version": "",
+    "Maintenance_database_backup": "",
+    "Maintenance_database_backup_found": "",
+    "Maintenance_database_backup_total": "",
+    "Maintenance_database_lastmod": "",
+    "Maintenance_database_path": "",
+    "Maintenance_database_rows": "",
+    "Maintenance_database_size": "",
+    "Maintenance_lang_selector_apply": "",
+    "Maintenance_lang_selector_empty": "",
+    "Maintenance_lang_selector_lable": "",
+    "Maintenance_lang_selector_text": "",
+    "Maintenance_new_version": "",
+    "Maintenance_themeselector_apply": "",
+    "Maintenance_themeselector_empty": "",
+    "Maintenance_themeselector_lable": "",
+    "Maintenance_themeselector_text": "",
+    "Maintenance_version": "",
+    "NETWORK_DEVICE_TYPES_description": "",
+    "NETWORK_DEVICE_TYPES_name": "",
+    "Navigation_About": "",
+    "Navigation_Devices": "",
+    "Navigation_Donations": "",
+    "Navigation_Events": "",
+    "Navigation_HelpFAQ": "",
+    "Navigation_Integrations": "",
+    "Navigation_Maintenance": "",
+    "Navigation_Monitoring": "",
+    "Navigation_Network": "",
+    "Navigation_Notifications": "",
+    "Navigation_Plugins": "",
+    "Navigation_Presence": "",
+    "Navigation_Report": "",
+    "Navigation_Settings": "",
+    "Navigation_SystemInfo": "",
+    "Navigation_Workflows": "",
+    "Network_Assign": "",
+    "Network_Cant_Assign": "",
+    "Network_Configuration_Error": "",
+    "Network_Connected": "",
+    "Network_ManageAdd": "",
+    "Network_ManageAdd_Name": "",
+    "Network_ManageAdd_Name_text": "",
+    "Network_ManageAdd_Port": "",
+    "Network_ManageAdd_Port_text": "",
+    "Network_ManageAdd_Submit": "",
+    "Network_ManageAdd_Type": "",
+    "Network_ManageAdd_Type_text": "",
+    "Network_ManageAssign": "",
+    "Network_ManageDel": "",
+    "Network_ManageDel_Name": "",
+    "Network_ManageDel_Name_text": "",
+    "Network_ManageDel_Submit": "",
+    "Network_ManageDevices": "",
+    "Network_ManageEdit": "",
+    "Network_ManageEdit_ID": "",
+    "Network_ManageEdit_ID_text": "",
+    "Network_ManageEdit_Name": "",
+    "Network_ManageEdit_Name_text": "",
+    "Network_ManageEdit_Port": "",
+    "Network_ManageEdit_Port_text": "",
+    "Network_ManageEdit_Submit": "",
+    "Network_ManageEdit_Type": "",
+    "Network_ManageEdit_Type_text": "",
+    "Network_ManageLeaf": "",
+    "Network_ManageUnassign": "",
+    "Network_NoAssignedDevices": "",
+    "Network_NoDevices": "",
+    "Network_Node": "",
+    "Network_Node_Name": "",
+    "Network_Parent": "",
+    "Network_Root": "",
+    "Network_Root_Not_Configured": "",
+    "Network_Root_Unconfigurable": "",
+    "Network_Table_Hostname": "",
+    "Network_Table_IP": "",
+    "Network_Table_State": "",
+    "Network_Title": "",
+    "Network_UnassignedDevices": "",
+    "Notifications_All": "",
+    "Notifications_Mark_All_Read": "",
+    "PIALERT_WEB_PASSWORD_description": "",
+    "PIALERT_WEB_PASSWORD_name": "",
+    "PIALERT_WEB_PROTECTION_description": "",
+    "PIALERT_WEB_PROTECTION_name": "",
+    "PLUGINS_KEEP_HIST_description": "",
+    "PLUGINS_KEEP_HIST_name": "",
+    "Plugins_DeleteAll": "",
+    "Plugins_Filters_Mac": "",
+    "Plugins_History": "",
+    "Plugins_Obj_DeleteListed": "",
+    "Plugins_Objects": "",
+    "Plugins_Out_of": "",
+    "Plugins_Unprocessed_Events": "",
+    "Plugins_no_control": "",
+    "Presence_CalHead_day": "",
+    "Presence_CalHead_lang": "",
+    "Presence_CalHead_month": "",
+    "Presence_CalHead_quarter": "",
+    "Presence_CalHead_week": "",
+    "Presence_CalHead_year": "",
+    "Presence_CallHead_Devices": "",
+    "Presence_Loading": "",
+    "Presence_Shortcut_AllDevices": "",
+    "Presence_Shortcut_Archived": "",
+    "Presence_Shortcut_Connected": "",
+    "Presence_Shortcut_Devices": "",
+    "Presence_Shortcut_DownAlerts": "",
+    "Presence_Shortcut_Favorites": "",
+    "Presence_Shortcut_NewDevices": "",
+    "Presence_Title": "",
+    "REPORT_DASHBOARD_URL_description": "",
+    "REPORT_DASHBOARD_URL_name": "",
+    "REPORT_ERROR": "",
+    "REPORT_MAIL_description": "",
+    "REPORT_MAIL_name": "",
+    "REPORT_TITLE": "",
+    "RandomMAC_hover": "",
+    "Reports_Sent_Log": "",
+    "SCAN_SUBNETS_description": "",
+    "SCAN_SUBNETS_name": "",
+    "SYSTEM_TITLE": "",
+    "Setting_Override": "",
+    "Setting_Override_Description": "",
+    "Settings_Metadata_Toggle": "",
+    "Settings_device_Scanners_desync": "",
+    "Settings_device_Scanners_desync_popup": "",
+    "Speedtest_Results": "",
+    "Systeminfo_CPU": "",
+    "Systeminfo_CPU_Cores": "",
+    "Systeminfo_CPU_Name": "",
+    "Systeminfo_CPU_Speed": "",
+    "Systeminfo_CPU_Temp": "",
+    "Systeminfo_CPU_Vendor": "",
+    "Systeminfo_Client_Resolution": "",
+    "Systeminfo_Client_User_Agent": "",
+    "Systeminfo_General": "",
+    "Systeminfo_General_Date": "",
+    "Systeminfo_General_Date2": "",
+    "Systeminfo_General_Full_Date": "",
+    "Systeminfo_General_TimeZone": "",
+    "Systeminfo_Memory": "",
+    "Systeminfo_Memory_Total_Memory": "",
+    "Systeminfo_Memory_Usage": "",
+    "Systeminfo_Memory_Usage_Percent": "",
+    "Systeminfo_Motherboard": "",
+    "Systeminfo_Motherboard_BIOS": "",
+    "Systeminfo_Motherboard_BIOS_Date": "",
+    "Systeminfo_Motherboard_BIOS_Vendor": "",
+    "Systeminfo_Motherboard_Manufactured": "",
+    "Systeminfo_Motherboard_Name": "",
+    "Systeminfo_Motherboard_Revision": "",
+    "Systeminfo_Network": "",
+    "Systeminfo_Network_Accept_Encoding": "",
+    "Systeminfo_Network_Accept_Language": "",
+    "Systeminfo_Network_Connection_Port": "",
+    "Systeminfo_Network_HTTP_Host": "",
+    "Systeminfo_Network_HTTP_Referer": "",
+    "Systeminfo_Network_HTTP_Referer_String": "",
+    "Systeminfo_Network_Hardware": "",
+    "Systeminfo_Network_Hardware_Interface_Mask": "",
+    "Systeminfo_Network_Hardware_Interface_Name": "",
+    "Systeminfo_Network_Hardware_Interface_RX": "",
+    "Systeminfo_Network_Hardware_Interface_TX": "",
+    "Systeminfo_Network_IP": "",
+    "Systeminfo_Network_IP_Connection": "",
+    "Systeminfo_Network_IP_Server": "",
+    "Systeminfo_Network_MIME": "",
+    "Systeminfo_Network_Request_Method": "",
+    "Systeminfo_Network_Request_Time": "",
+    "Systeminfo_Network_Request_URI": "",
+    "Systeminfo_Network_Secure_Connection": "",
+    "Systeminfo_Network_Secure_Connection_String": "",
+    "Systeminfo_Network_Server_Name": "",
+    "Systeminfo_Network_Server_Name_String": "",
+    "Systeminfo_Network_Server_Query": "",
+    "Systeminfo_Network_Server_Query_String": "",
+    "Systeminfo_Network_Server_Version": "",
+    "Systeminfo_Services": "",
+    "Systeminfo_Services_Description": "",
+    "Systeminfo_Services_Name": "",
+    "Systeminfo_Storage": "",
+    "Systeminfo_Storage_Device": "",
+    "Systeminfo_Storage_Mount": "",
+    "Systeminfo_Storage_Size": "",
+    "Systeminfo_Storage_Type": "",
+    "Systeminfo_Storage_Usage": "",
+    "Systeminfo_Storage_Usage_Free": "",
+    "Systeminfo_Storage_Usage_Mount": "",
+    "Systeminfo_Storage_Usage_Total": "",
+    "Systeminfo_Storage_Usage_Used": "",
+    "Systeminfo_System": "",
+    "Systeminfo_System_AVG": "",
+    "Systeminfo_System_Architecture": "",
+    "Systeminfo_System_Kernel": "",
+    "Systeminfo_System_OSVersion": "",
+    "Systeminfo_System_Running_Processes": "",
+    "Systeminfo_System_System": "",
+    "Systeminfo_System_Uname": "",
+    "Systeminfo_System_Uptime": "",
+    "Systeminfo_This_Client": "",
+    "Systeminfo_USB_Devices": "",
+    "TICKER_MIGRATE_TO_NETALERTX": "",
+    "TIMEZONE_description": "",
+    "TIMEZONE_name": "",
+    "UI_DEV_SECTIONS_description": "",
+    "UI_DEV_SECTIONS_name": "",
+    "UI_ICONS_description": "",
+    "UI_ICONS_name": "",
+    "UI_LANG_description": "",
+    "UI_LANG_name": "",
+    "UI_MY_DEVICES_description": "",
+    "UI_MY_DEVICES_name": "",
+    "UI_NOT_RANDOM_MAC_description": "",
+    "UI_NOT_RANDOM_MAC_name": "",
+    "UI_PRESENCE_description": "",
+    "UI_PRESENCE_name": "",
+    "UI_REFRESH_description": "",
+    "UI_REFRESH_name": "",
+    "VERSION_description": "",
+    "VERSION_name": "",
+    "devices_old": "",
+    "general_event_description": "",
+    "general_event_title": "",
+    "report_guid": "",
+    "report_guid_missing": "",
+    "report_select_format": "",
+    "report_time": "",
+    "run_event_icon": "",
+    "run_event_tooltip": "",
+    "settings_core_icon": "",
+    "settings_core_label": "",
+    "settings_device_scanners": "",
+    "settings_device_scanners_icon": "",
+    "settings_device_scanners_info": "",
+    "settings_device_scanners_label": "",
+    "settings_enabled": "",
+    "settings_enabled_icon": "",
+    "settings_expand_all": "",
+    "settings_imported": "",
+    "settings_imported_label": "",
+    "settings_missing": "",
+    "settings_missing_block": "",
+    "settings_old": "",
+    "settings_other_scanners": "",
+    "settings_other_scanners_icon": "",
+    "settings_other_scanners_label": "",
+    "settings_publishers": "",
+    "settings_publishers_icon": "",
+    "settings_publishers_info": "",
+    "settings_publishers_label": "",
+    "settings_saved": "",
+    "settings_system_icon": "",
+    "settings_system_label": "",
+    "settings_update_item_warning": "",
+    "test_event_icon": "",
+    "test_event_tooltip": ""
+}

front/php/templates/language/de_de.json

@@ -28,7 +28,7 @@
     "AppEvents_ObjectPrimaryID": "Primär ID",
     "AppEvents_ObjectSecondaryID": "Sekundär ID",
     "AppEvents_ObjectStatus": "",
-    "AppEvents_ObjectStatusColumn": "",
+    "AppEvents_ObjectStatusColumn": "Statusspalte",
     "AppEvents_ObjectType": "Objekttyp",
     "AppEvents_Plugin": "Plugin",
     "AppEvents_Type": "Typ",
@@ -68,6 +68,8 @@
     "BackDevices_Restore_okay": "Die Wiederherstellung wurde erfolgreich ausgeführt.",
     "BackDevices_darkmode_disabled": "Heller Modus aktiviert.",
     "BackDevices_darkmode_enabled": "Dunkler Modus aktiviert.",
+    "CLEAR_NEW_FLAG_description": "",
+    "CLEAR_NEW_FLAG_name": "",
     "DAYS_TO_KEEP_EVENTS_description": "Dies ist eine Wartungseinstellung. Spezifiziert wie viele Tage Events gespeichert bleiben. Alle älteren Events werden periodisch gelöscht. Wird auch auf die Plugins History angewendet.",
     "DAYS_TO_KEEP_EVENTS_name": "Lösche Events älter als",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Details von Gerät kopieren",
@@ -98,7 +100,7 @@
     "DevDetail_MainInfo_Network_Site": "",
     "DevDetail_MainInfo_Network_Title": "<i class=\"fa fa-network-wired\"></i> Network",
     "DevDetail_MainInfo_Owner": "Eigen&shy;tümer",
-    "DevDetail_MainInfo_SSID": "",
+    "DevDetail_MainInfo_SSID": "SSID",
     "DevDetail_MainInfo_Title": "<i class=\"fa fa-pencil\"></i> Hauptinformation",
     "DevDetail_MainInfo_Type": "Typ",
     "DevDetail_MainInfo_Vendor": "Hersteller",
@@ -126,7 +128,7 @@
     "DevDetail_Run_Actions_Tooltip": "Eine Aktion aus der Dropdown-Liste auf dem aktuellen Gerät ausführen.",
     "DevDetail_SessionInfo_FirstSession": "Erste Sitzung",
     "DevDetail_SessionInfo_LastIP": "Letzte IP",
-    "DevDetail_SessionInfo_LastSession": "Letzte Sitzung",
+    "DevDetail_SessionInfo_LastSession": "Zuletzt offline",
     "DevDetail_SessionInfo_StaticIP": "Statische IP",
     "DevDetail_SessionInfo_Status": "Status",
     "DevDetail_SessionInfo_Title": "<i class=\"fa fa-calendar\"></i> Sitzungsinformation",
@@ -202,7 +204,7 @@
     "Device_Shortcut_Archived": "Archiviert",
     "Device_Shortcut_Connected": "Verbunden",
     "Device_Shortcut_Devices": "Geräte",
-    "Device_Shortcut_DownAlerts": "Offline & Nicht erreichbar",
+    "Device_Shortcut_DownAlerts": "Nicht erreichbar & offline",
     "Device_Shortcut_DownOnly": "Offline",
     "Device_Shortcut_Favorites": "Favoriten",
     "Device_Shortcut_NewDevices": "Neue Geräte",
@@ -210,12 +212,12 @@
     "Device_TableHead_Connected_Devices": "Verbundene Geräte",
     "Device_TableHead_Favorite": "Favorit",
     "Device_TableHead_FirstSession": "Erste Sitzung",
-    "Device_TableHead_GUID": "",
+    "Device_TableHead_GUID": "GUID",
     "Device_TableHead_Group": "Gruppe",
     "Device_TableHead_Icon": "Icon",
     "Device_TableHead_LastIP": "Letzte IP",
     "Device_TableHead_LastIPOrder": "Last IP Order",
-    "Device_TableHead_LastSession": "Letzte Sitzung",
+    "Device_TableHead_LastSession": "Zuletzt offline",
     "Device_TableHead_Location": "Standort",
     "Device_TableHead_MAC": "MAC",
     "Device_TableHead_MAC_full": "Gesamte MAC",
@@ -226,9 +228,9 @@
     "Device_TableHead_Port": "Port",
     "Device_TableHead_RowID": "Zeilen ID",
     "Device_TableHead_Rowid": "Zeilennummer",
-    "Device_TableHead_SSID": "",
+    "Device_TableHead_SSID": "SSID",
     "Device_TableHead_Status": "Status",
-    "Device_TableHead_SyncHubNodeName": "",
+    "Device_TableHead_SyncHubNodeName": "Synchronisationsknoten",
     "Device_TableHead_Type": "Typ",
     "Device_TableHead_Vendor": "Hersteller",
     "Device_Table_Not_Network_Device": "Nicht konfiguriert als Netzwerkgerät",
@@ -272,7 +274,7 @@
     "Events_TableHead_IPOrder": "IP Order",
     "Events_TableHead_Order": "Order",
     "Events_TableHead_Owner": "Eigentümer",
-    "Events_TableHead_PendingAlert": "",
+    "Events_TableHead_PendingAlert": "Ausstehender Alarm",
     "Events_Table_info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
     "Events_Table_nav_next": "Nächste",
     "Events_Table_nav_prev": "Zurück",
@@ -280,36 +282,38 @@
     "Events_Tablelenght_all": "Alle",
     "Events_Title": "Ereignisse",
     "Gen_Action": "Action",
-    "Gen_Add": "",
-    "Gen_Add_All": "",
-    "Gen_All_Devices": "",
+    "Gen_Add": "Hinzufügen",
+    "Gen_Add_All": "Alle hinzufügen",
+    "Gen_All_Devices": "Alle Geräte",
     "Gen_AreYouSure": "Sind Sie sich sicher?",
     "Gen_Backup": "Sichern",
     "Gen_Cancel": "Abbrechen",
+    "Gen_Change": "",
     "Gen_Copy": "Run",
     "Gen_DataUpdatedUITakesTime": "OK - It may take a while for the UI to update if a scan is runnig",
     "Gen_Delete": "Löschen",
     "Gen_DeleteAll": "Delete all",
     "Gen_Error": "Fehler",
-    "Gen_Filter": "",
+    "Gen_Filter": "Filter",
     "Gen_LockedDB": "ERROR - DB eventuell gesperrt - Nutze die Konsole in den Entwickler Werkzeugen (F12) zur Überprüfung oder probiere es später erneut.",
-    "Gen_Offline": "",
+    "Gen_Offline": "Offline",
     "Gen_Okay": "Ok",
     "Gen_Purge": "Aufräumen",
     "Gen_ReadDocs": "Mehr in der Dokumentation",
-    "Gen_Remove_All": "",
-    "Gen_Remove_Last": "",
+    "Gen_Remove_All": "Alle entfernen",
+    "Gen_Remove_Last": "Letzte entfernen",
     "Gen_Restore": "Wiederherstellen",
     "Gen_Run": "Run",
     "Gen_Save": "Speichern",
     "Gen_Saved": "Gespeichert",
-    "Gen_Search": "",
+    "Gen_Search": "Suchen",
+    "Gen_SelectToPreview": "",
     "Gen_Selected_Devices": "Ausgewählte Geräte:",
     "Gen_Switch": "Umschalten",
     "Gen_Upd": "Aktualisierung erfolgreich",
     "Gen_Upd_Fail": "Aktualisierung fehlgeschlagen",
-    "Gen_Update": "",
-    "Gen_Update_Value": "",
+    "Gen_Update": "Aktualisieren",
+    "Gen_Update_Value": "Wert aktualisieren",
     "Gen_Warning": "Warnung",
     "Gen_Work_In_Progress": "Keine Finalversion, feedback bitte unter: https://github.com/jokob-sk/NetAlertX/issues",
     "General_display_name": "Allgemein",
@@ -353,12 +357,13 @@
     "HelpFAQ_Cat_Presence_401_text": "Wenn dies geschieht hast du die Möglickeit, bei dem betreffenden Gerät (Detailsansicht) die Events zu löschen. Eine andere Möglichkeit wäre, das Gerät einzuschalten und zu warten, bis NetAlertX mit dem nächsten Scan das Gerät als \"Online\" erkennt und anschließend das Gerät einfach wieder ausschalten. Nun sollte NetAlertX mit dem nächsten Scan den Zustand des Gerätes ordentlich in der Datenbank vermerken.",
     "HelpFAQ_Title": "Hilfe / FAQ",
     "LOADED_PLUGINS_description": "",
-    "LOADED_PLUGINS_name": "",
+    "LOADED_PLUGINS_name": "Geladene Plugins",
     "LOG_LEVEL_description": "Diese Einstellung aktiviert die erweiterte Protokollierung. Nützlich fürs Debuggen von in die Datenbank geschriebenen Events.",
     "LOG_LEVEL_name": "Erweiterte Protokollierung",
     "Loading": "Laden...",
     "Login_Box": "Passwort eingeben",
     "Login_Default_PWD": "Standardpasswort \"123456\" noch immer aktiv.",
+    "Login_Info": "",
     "Login_Psw-box": "Passwort",
     "Login_Psw_alert": "Sicherheitshinweis!",
     "Login_Psw_folder": "im Ordner /app/config",
@@ -384,8 +389,8 @@
     "MQTT_USER_name": "MQTT user",
     "MQTT_display_name": "MQTT",
     "MQTT_icon": "<i class=\"fa fa-square-rss\"></i>",
-    "Maint_PurgeLog": "",
-    "Maint_RestartServer": "",
+    "Maint_PurgeLog": "Protokoll bereinigen",
+    "Maint_RestartServer": "Server neu starten",
     "Maint_Restart_Server_noti_text": "",
     "Maintenance_Running_Version": "Installierte Version",
     "Maintenance_Status": "Status",
@@ -398,7 +403,7 @@
     "Maintenance_Tool_ImportCSV_noti": "CSV Import",
     "Maintenance_Tool_ImportCSV_noti_text": "Sind Sie sich sicher, dass Sie die CSV-Datei importieren wollen? Dies wird <b>alle Geräte in der Datenbank überschreiben</b>.",
     "Maintenance_Tool_ImportCSV_text": "Machen Sie ein Backup, bevor Sie diese Funk­tion nutzen. Importiere eine CSV-Datei (comma separated values) mit einer Liste aller Geräte und deren Beziehungen zwischen Netzwerkknoten und verbundenen Geräten. Um dies zu tun platziere die <b>devices.csv</b> benannte CSV-Datei in deinen <b>/config</b> Ordner.",
-    "Maintenance_Tool_ImportPastedCSV": "",
+    "Maintenance_Tool_ImportPastedCSV": "CSV-Import (Einfügen)",
     "Maintenance_Tool_ImportPastedCSV_noti_text": "",
     "Maintenance_Tool_ImportPastedCSV_text": "",
     "Maintenance_Tool_arpscansw": "arp-Scan stoppen/starten",
@@ -493,7 +498,7 @@
     "NTFY_USER_name": "NTFY user",
     "NTFY_display_name": "NTFY",
     "NTFY_icon": "<i class=\"fa fa-terminal\"></i>",
-    "Navigation_About": "",
+    "Navigation_About": "Über",
     "Navigation_Devices": "Geräte",
     "Navigation_Donations": "Donations",
     "Navigation_Events": "Ereignisse",
@@ -503,10 +508,10 @@
     "Navigation_Maintenance": "Wartung",
     "Navigation_Monitoring": "Überwachung",
     "Navigation_Network": "Netzwerk",
-    "Navigation_Notifications": "",
+    "Navigation_Notifications": "Benachrichtigungen",
     "Navigation_Plugins": "Plugins",
     "Navigation_Presence": "Anwesenheit",
-    "Navigation_Report": "Bericht",
+    "Navigation_Report": "Gesendete Berichte",
     "Navigation_Settings": "Einstellungen",
     "Navigation_SystemInfo": "Systeminfo",
     "Navigation_Workflows": "Arbeitsabläufe",
@@ -545,7 +550,7 @@
     "Network_Node": "Netzwerkknoten",
     "Network_Node_Name": "Knotenname",
     "Network_Parent": "Übergeordnetes Netzwerkgerät",
-    "Network_Root": "",
+    "Network_Root": "Wurzelknoten",
     "Network_Root_Not_Configured": "",
     "Network_Root_Unconfigurable": "Nicht konfigurierbare Wurzel",
     "Network_Table_Hostname": "Gerätename",
@@ -553,8 +558,8 @@
     "Network_Table_State": "Status",
     "Network_Title": "Netzwerkübersicht",
     "Network_UnassignedDevices": "Nicht zugewiesene Geräte",
-    "Notifications_All": "",
-    "Notifications_Mark_All_Read": "",
+    "Notifications_All": "Alle Benachrichtigungen",
+    "Notifications_Mark_All_Read": "Alle als gelesen markieren",
     "PIALERT_WEB_PASSWORD_description": "Das Standardpasswort ist <code>123456</code>. Um das Passwort zu ändern, entweder <code>/app/back/pialert-cli</code> im Container starten oder <a onclick=\"toggleAllSettings()\" href=\"#SETPWD_RUN\"><code>SETPWD_RUN</code> Set password plugin</a> nutzen.",
     "PIALERT_WEB_PASSWORD_name": "Login-Passwort",
     "PIALERT_WEB_PROTECTION_description": "Ein Loginfenster wird angezeigt wenn aktiviert. Untere Beschreibung genau durchlesen falls Sie sich aus Ihrer Instanz aussperren.",
@@ -568,6 +573,7 @@
     "Plugins_DeleteAll": "Delete all (filters are ignored)",
     "Plugins_Filters_Mac": "Mac Filter",
     "Plugins_History": "Events History",
+    "Plugins_Obj_DeleteListed": "",
     "Plugins_Objects": "Plugin Objects",
     "Plugins_Out_of": "von",
     "Plugins_Unprocessed_Events": "Unprocessed Events",
@@ -609,8 +615,9 @@
     "REPORT_WEBHOOK_description": "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/NetAlertX/blob/main/docs/WEBHOOK_N8N.md\" target=\"_blank\">n8n guide here</a> to get started. If enabled, configure related settings below.",
     "REPORT_WEBHOOK_name": "Enable Webhooks",
     "RandomMAC_hover": "Autodetected - indicates if the device randomizes it's MAC address.",
-    "Reports_Sent_Log": "",
-    "SCAN_SUBNETS_description": "Arp-scan is a command-line tool that uses the ARP protocol to discover and fingerprint IP hosts on the local network. An alternative to ARP scan is to enable the <a onclick=\"toggleAllSettings()\" href=\"#PIHOLE_RUN\"><code>PIHOLE_RUN</code>PiHole integration settings</a>. The arp-scan time itself depends on the number of IP addresses to check so set this up carefully with the appropriate network mask and interface. Check the <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/SUBNETS.md\" target=\"_blank\">subnets documentation</a> for help on setting up VLANs, what VLANs are supported, or how to figure out the network mask and your interface.",
+    "Reports_Sent_Log": "Protokoll gesendeter Berichte",
+    "SCAN_SUBNETS_description": "",
+    "SCAN_SUBNETS_name": "",
     "SMTP_FORCE_SSL_description": "Force SSL when connecting to your SMTP server.",
     "SMTP_FORCE_SSL_name": "Force SSL",
     "SMTP_PASS_description": "The SMTP server password. ",
@@ -629,7 +636,7 @@
     "Setting_Override": "Override value",
     "Setting_Override_Description": "Enabling this option will override an App supplied default value with the value specified above.",
     "Settings_Metadata_Toggle": "Show/hide metadata for the given setting.",
-    "Settings_device_Scanners_desync": "",
+    "Settings_device_Scanners_desync": "⚠ Die Zeitpläne des Gerätescanners sind nicht synchronisiert.",
     "Settings_device_Scanners_desync_popup": "",
     "Speedtest_Results": "Ergebnisse des Geschwindigkeitstests",
     "Systeminfo_CPU": "CPU",
@@ -723,6 +730,8 @@
     "UI_PRESENCE_name": "Anzeige im Präsenzdiagramm",
     "UI_REFRESH_description": "",
     "UI_REFRESH_name": "Automatisch Aktualisieren",
+    "VERSION_description": "",
+    "VERSION_name": "",
     "WEBHOOK_PAYLOAD_description": "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/NetAlertX/blob/main/front/report_templates/webhook_json_sample.json\">here</a>. (e.g.: for discord use <code>text</code>)",
     "WEBHOOK_PAYLOAD_name": "Payload type",
     "WEBHOOK_REQUEST_METHOD_description": "The HTTP request method to be used for the webhook call.",
@@ -744,31 +753,31 @@
     "report_time": "Benachrichtigungszeit:",
     "run_event_icon": "fa-play",
     "run_event_tooltip": "Enable the setting and save your changes at first before you run it.",
-    "settings_core_icon": "fa-solid fa-gem",
-    "settings_core_label": "",
+    "settings_core_icon": "",
+    "settings_core_label": "Kern",
     "settings_device_scanners": "",
-    "settings_device_scanners_icon": "fa-solid fa-magnifying-glass-plus",
+    "settings_device_scanners_icon": "",
     "settings_device_scanners_info": "",
     "settings_device_scanners_label": "Gerätescanner",
     "settings_enabled": "Aktive Einstellungen",
-    "settings_enabled_icon": "fa-solid fa-toggle-on",
+    "settings_enabled_icon": "",
     "settings_expand_all": "Expand all",
     "settings_imported": "Last time settings were imported from the app.conf file:",
     "settings_imported_label": "Einstellungen importiert",
-    "settings_missing": "Not all settings loaded, refresh the page! This is probably caused by a high load on the database or app startup sequence.",
-    "settings_missing_block": "You can not save your settings without specifying all setting keys. Refresh the page. This is probably caused by a high load on the database.",
+    "settings_missing": "",
+    "settings_missing_block": "",
     "settings_old": "Importing settings and re-initializing...",
     "settings_other_scanners": "",
-    "settings_other_scanners_icon": "fa-solid fa-recycle",
+    "settings_other_scanners_icon": "",
     "settings_other_scanners_label": "Andere Scanner",
     "settings_publishers": "",
     "settings_publishers_icon": "fa-solid fa-paper-plane",
     "settings_publishers_info": "",
     "settings_publishers_label": "Veröffentlicher",
-    "settings_saved": "<br/>Settings saved to the <code>app.conf</code> file.<br/><br/>A time-stamped backup of the previous file created. <br/><br/> Reloading...<br/>",
-    "settings_system_icon": "fa-solid fa-gear",
+    "settings_saved": "",
+    "settings_system_icon": "",
     "settings_system_label": "System",
     "settings_update_item_warning": "",
     "test_event_icon": "fa-vial-circle-check",
     "test_event_tooltip": "Save your changes at first before you test your settings."
-}
+}

front/php/templates/language/en_us.json

@@ -56,6 +56,8 @@
     "BackDevices_Restore_okay": "Restore executed successfully.",
     "BackDevices_darkmode_disabled": "Darkmode Disabled",
     "BackDevices_darkmode_enabled": "Darkmode Enabled",
+    "CLEAR_NEW_FLAG_description": "If enabled (<code>0</code> is disabled), devices flagged as <b>New Device</b> will be unflagged if the time limit (specified in hours) exceeds their <b>First Session</b> time.",
+    "CLEAR_NEW_FLAG_name": "Clear new flag",
     "DAYS_TO_KEEP_EVENTS_description": "This is a maintenance setting. This specifies the number of days worth of event entries that will be kept. All older events will be deleted periodically. Also applies on Plugin Events History.",
     "DAYS_TO_KEEP_EVENTS_name": "Delete events older than",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Copy details from device",
@@ -274,6 +276,7 @@
     "Gen_AreYouSure": "Are you sure?",
     "Gen_Backup": "Run Backup",
     "Gen_Cancel": "Cancel",
+    "Gen_Change": "Change",
     "Gen_Copy": "Run",
     "Gen_DataUpdatedUITakesTime": "OK - It may take a while for the UI to update if a scan is running.",
     "Gen_Delete": "Delete",
@@ -292,6 +295,7 @@
     "Gen_Save": "Save",
     "Gen_Saved": "Saved",
     "Gen_Search": "Search",
+    "Gen_SelectToPreview": "Select to preview",
     "Gen_Selected_Devices": "Selected Devices:",
     "Gen_Switch": "Switch",
     "Gen_Upd": "Updated successfully",
@@ -302,8 +306,8 @@
     "Gen_Work_In_Progress": "Work in progress, good time to feedback on https://github.com/jokob-sk/NetAlertX/issues",
     "General_display_name": "General",
     "General_icon": "<i class=\"fa fa-gears\"></i>",
-    "HRS_TO_KEEP_NEWDEV_description": "This is a maintenance setting. If enabled (<code>0</code> is disabled), devices marked as <b>New Device</b> will be deleted if their <b>First Session</b> time was older than the specified hours in this setting. Use this setting if you want to auto-delete <b>New Devices</b> after <code>X</code> hours.",
-    "HRS_TO_KEEP_NEWDEV_name": "Keep new devices for",
+    "HRS_TO_KEEP_NEWDEV_description": "This is a maintenance setting <b>DELETING devices</b>. If enabled (<code>0</code> is disabled), devices marked as <b>New Device</b> will be deleted if their <b>First Session</b> time was older than the specified hours in this setting. Use this setting if you want to auto-delete <b>New Devices</b> after <code>X</code> hours.",
+    "HRS_TO_KEEP_NEWDEV_name": "Delete new devices after",
     "HelpFAQ_Cat_Detail": "Details",
     "HelpFAQ_Cat_Detail_300_head": "What means ",
     "HelpFAQ_Cat_Detail_300_text_a": "means a network device (a device of the type AP, Gateway, Firewall, Hypervisor, Powerline, Switch, WLAN, PLC, Router,USB LAN Adapter, USB WIFI Adapter, or Internet). Custom types can be added via the <code>NETWORK_DEVICE_TYPES</code> setting.",
@@ -347,6 +351,7 @@
     "Loading": "Loading...",
     "Login_Box": "Enter your password",
     "Login_Default_PWD": "Default password \"123456\" is still active.",
+    "Login_Info": "Passwords are set via the Set Password plugin. Check the <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/set_password\">SETPWD docs</a> if you have issues logging in.",
     "Login_Psw-box": "Password",
     "Login_Psw_alert": "Password Alert!",
     "Login_Psw_folder": "in the config folder.",
@@ -527,6 +532,7 @@
     "Plugins_DeleteAll": "Delete all (filters are ignored)",
     "Plugins_Filters_Mac": "Mac Filter",
     "Plugins_History": "Events History",
+    "Plugins_Obj_DeleteListed": "Delete Listed Objects",
     "Plugins_Objects": "Plugin Objects",
     "Plugins_Out_of": "out of",
     "Plugins_Unprocessed_Events": "Unprocessed Events",
@@ -556,6 +562,7 @@
     "RandomMAC_hover": "Autodetected - indicates if the device randomizes it's MAC address.",
     "Reports_Sent_Log": "Sent Reports Log",
     "SCAN_SUBNETS_description": "Most on-network scanners (ARP-SCAN, NMAP, NSLOOKUP, DIG, PHOLUS) rely on scanning specific network interfaces and subnets. Check the <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/SUBNETS.md\" target=\"_blank\">subnets documentation</a> for help on this setting, especially VLANs, what VLANs are supported, or how to figure out the network mask and your interface. <br/> <br/> An alternative to on-network scanners is to enable some other Device scanners/importers that don't rely on NetAlert<sup>X</sup> having access to the network (UNIFI, dhcp.leases, PiHole, etc.). <br/> <br/> Note: The scan time itself depends on the number of IP addresses to check, so set this up carefully with the appropriate network mask and interface.",
+    "SCAN_SUBNETS_name": "Networks to scan",
     "SYSTEM_TITLE": "System Information",
     "Setting_Override": "Override value",
     "Setting_Override_Description": "Enabling this option will override an App supplied default value with the value specified above.",
@@ -654,6 +661,8 @@
     "UI_PRESENCE_name": "Show in presence chart",
     "UI_REFRESH_description": "Enter number of seconds after which the UI reloads. Set to <code>0</code> to disable.",
     "UI_REFRESH_name": "Auto-refresh UI",
+    "VERSION_description": "Version or timestamp helper value to check if app was upgraded.",
+    "VERSION_name": "Version or timestamp",
     "devices_old": "Refreshing...",
     "general_event_description": "The event you have triggered might take a while until background processes finish. The execution ended once the below execution queue empties (Check the <a href='/maintenance.php#tab_Logging'>error log</a> if you encounter issues). <br/> <br/> Execution queue:",
     "general_event_title": "Executing an ad-hoc event",
@@ -690,4 +699,4 @@
     "settings_update_item_warning": "Update the value below. Be careful to follow the previous format. <b>Validation is not performed.</b>",
     "test_event_icon": "fa-vial-circle-check",
     "test_event_tooltip": "Save your changes at first before you test your settings."
-}
+}

front/php/templates/language/es_es.json

@@ -66,6 +66,8 @@
     "BackDevices_Restore_okay": "Restauración ejecutado con éxito.",
     "BackDevices_darkmode_disabled": "Darkmode Desactivado",
     "BackDevices_darkmode_enabled": "Darkmode Activado",
+    "CLEAR_NEW_FLAG_description": "Si está habilitado (<code>0</code> está desactivado), los dispositivos marcados como <b>Nuevo dispositivo</b> se desmarcarán si el límite de tiempo (especificado en horas) excede su tiempo de <b>primera sesión</b>.",
+    "CLEAR_NEW_FLAG_name": "Eliminar la nueva bandera",
     "DAYS_TO_KEEP_EVENTS_description": "Esta es una configuración de mantenimiento. Esto especifica el número de días de entradas de eventos que se guardarán. Todos los eventos anteriores se eliminarán periódicamente.",
     "DAYS_TO_KEEP_EVENTS_name": "Eliminar eventos anteriores a",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Copiar detalles del dispositivo",
@@ -284,6 +286,7 @@
     "Gen_AreYouSure": "¿Estás seguro?",
     "Gen_Backup": "Ejecutar copia de seguridad",
     "Gen_Cancel": "Cancelar",
+    "Gen_Change": "Cambiar",
     "Gen_Copy": "Ejecutar",
     "Gen_DataUpdatedUITakesTime": "Correcto - La interfaz puede tardar en actualizarse si se está ejecutando un escaneo.",
     "Gen_Delete": "Eliminar",
@@ -302,6 +305,7 @@
     "Gen_Save": "Guardar",
     "Gen_Saved": "Guardado",
     "Gen_Search": "Buscar",
+    "Gen_SelectToPreview": "Seleccionar para previsualizar",
     "Gen_Selected_Devices": "Dispositivos seleccionados:",
     "Gen_Switch": "Cambiar",
     "Gen_Upd": "Actualizado correctamente",
@@ -312,8 +316,8 @@
     "Gen_Work_In_Progress": "Trabajo en curso, un buen momento para hacer comentarios en https://github.com/jokob-sk/NetAlertX/issues",
     "General_display_name": "General",
     "General_icon": "<i class=\"fa fa-gears\"></i>",
-    "HRS_TO_KEEP_NEWDEV_description": "Esta es una configuración de mantenimiento. Si está habilitado (<code>0</code> está deshabilitado), los dispositivos marcados como <b>Nuevo dispositivo</b> se eliminarán si su <b>Primera sesión</b> el tiempo era anterior a las horas especificadas en esta configuración. Utilice esta configuración si desea eliminar automáticamente <b>Nuevos dispositivos</b> después de <code>X</code> horas.",
-    "HRS_TO_KEEP_NEWDEV_name": "Guardar nuevos dispositivos para",
+    "HRS_TO_KEEP_NEWDEV_description": "Se trata de una configuración de mantenimiento <b>BORRAR dispositivos</b>. Si está activado (<code>0</code> está desactivado), los dispositivos marcados como <b>Nuevo dispositivo</b> se eliminarán si su fecha de <b>primera sesión</b> es anterior a las horas especificadas en este ajuste. Use este ajuste si desea eliminar automáticamente <b>Nuevos dispositivos</b> después de <code>X</code> horas.",
+    "HRS_TO_KEEP_NEWDEV_name": "Eliminar nuevos dispositivos después",
     "HelpFAQ_Cat_Detail": "Detalles",
     "HelpFAQ_Cat_Detail_300_head": "¿Qué significa? ",
     "HelpFAQ_Cat_Detail_300_text_a": "significa un dispositivo de red (un dispositivo del tipo AP, Gateway, Firewall, Hypervisor, Powerline, Switch, WLAN, PLC, Router,Adaptador LAN USB, Adaptador WIFI USB o Internet). Los tipos personalizados pueden añadirse mediante el ajuste <code>NETWORK_DEVICE_TYPES</code>.",
@@ -357,6 +361,7 @@
     "Loading": "Cargando...",
     "Login_Box": "Ingrese su contraseña",
     "Login_Default_PWD": "La contraseña por defecto \"123456\" sigue activa.",
+    "Login_Info": "Las contraseñas se establecen a través del plugin Establecer contraseña. Compruebe la <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/set_password\">documentación SETPWD</a> si tiene problemas para iniciar sesión.",
     "Login_Psw-box": "Contraseña",
     "Login_Psw_alert": "¡Alerta de Contraseña!",
     "Login_Psw_folder": "en la carpeta config.",
@@ -394,11 +399,11 @@
     "Maintenance_Tool_ExportCSV_text": "Genere un archivo CSV (valor separado por comas) que contenga la lista de Dispositivos incluyendo las relaciones de red entre los Nodos de red y los dispositivos conectados. También puedes activarlo accediendo a esta URL <code>your NetAlertX url/php/server/devices.php?action=ExportCSV</code> o activando el plugin <a href=\"settings.php#CSVBCKP_header\">Copia de seguridad CSV</a>.",
     "Maintenance_Tool_ImportCSV": "Importación CSV",
     "Maintenance_Tool_ImportCSV_noti": "Importación CSV",
-    "Maintenance_Tool_ImportCSV_noti_text": "¿Está seguro de que quiere importar el archivo CSV? Esto sobrescribirá completamente los dispositivos de su base de datos.",
+    "Maintenance_Tool_ImportCSV_noti_text": "¿Estás seguro de que quieres importar el archivo CSV? Esto <b>sobrescribirá</b> completamente los dispositivos en su base de datos.",
     "Maintenance_Tool_ImportCSV_text": "Antes de usar esta función, haga una copia de seguridad. Importe un archivo CSV (valor separado por comas) que contiene la lista de dispositivos, incluidas las relaciones de red entre nodos de red y dispositivos conectados. Para hacer eso, coloque el archivo CSV llamado <b> devices.csv </b> en su carpeta <b>/config </b>.",
-    "Maintenance_Tool_ImportPastedCSV": "",
-    "Maintenance_Tool_ImportPastedCSV_noti_text": "",
-    "Maintenance_Tool_ImportPastedCSV_text": "",
+    "Maintenance_Tool_ImportPastedCSV": "Importar CSV (Pegar)",
+    "Maintenance_Tool_ImportPastedCSV_noti_text": "¿Seguro que desea importar el CSV pegado? Esto <b>sobrescribirá</b> completamente los dispositivos en su base de datos.",
+    "Maintenance_Tool_ImportPastedCSV_text": "Antes de usar esta función, por favor haga una copia de seguridad. Importar un archivo CSV (valor separado por comas) que contiene la lista de Dispositivos incluyendo las relaciones de red entre los Nodos de red y los dispositivos conectados.",
     "Maintenance_Tool_arpscansw": "Activar arp-scan (on/off)",
     "Maintenance_Tool_arpscansw_noti": "Activar arp-scan on or off",
     "Maintenance_Tool_arpscansw_noti_text": "Cuando el escaneo se ha apagado, permanece apagado hasta que se active nuevamente.",
@@ -566,6 +571,7 @@
     "Plugins_DeleteAll": "Eliminar todo (se ignoran los filtros)",
     "Plugins_Filters_Mac": "Filtro MAC",
     "Plugins_History": "Historial de eventos",
+    "Plugins_Obj_DeleteListed": "",
     "Plugins_Objects": "Objetos del Plugin",
     "Plugins_Out_of": "de",
     "Plugins_Unprocessed_Events": "Eventos sin procesar",
@@ -723,6 +729,8 @@
     "UI_PRESENCE_name": "Mostrar en el gráfico de presencia",
     "UI_REFRESH_description": "Ingrese el número de segundos después de los cuales se recarga la interfaz de usuario. Ajustado a <code> 0 </code> para desactivar.",
     "UI_REFRESH_name": "Actualización automática de la interfaz de usuario",
+    "VERSION_description": "Valor de ayuda de versión o marca de tiempo para comprobar si la aplicación se ha actualizado.",
+    "VERSION_name": "Versión o marca de tiempo",
     "WEBHOOK_PAYLOAD_description": "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/NetAlertX/blob/main/front/report_templates/webhook_json_sample.json\">aquí</a>. (por ejemplo: para discord use <code>text</code>)",
     "WEBHOOK_PAYLOAD_name": "Tipo de carga",
     "WEBHOOK_REQUEST_METHOD_description": "El método de solicitud HTTP que se utilizará para la llamada de webhook.",
@@ -735,7 +743,7 @@
     "Webhooks_icon": "<i class=\"fa fa-circle-nodes\"></i>",
     "Webhooks_settings_group": "<i class=\"fa fa-circle-nodes\"></i> Webhooks",
     "devices_old": "Volviendo a actualizar....",
-    "general_event_description": "El evento que has activado puede tardar un poco hasta que finalicen los procesos en segundo plano. La ejecución finalizó una vez que se vació la cola de ejecución de abajo (Compruebe el <a href='/mantenimiento.php#tab_Logging'>registro de errores</a> si encuentra problemas). <br/> <br/> Cola de ejecución:",
+    "general_event_description": "El evento que ha activado puede tardar un poco hasta que finalicen los procesos en segundo plano. La ejecución finalizó una vez que se vacía la cola de ejecución a continuación (consulte el <a href='/maintenance.php#tab_Logging'>registro de errores</a> si encuentra problemas). <br/> <br/> Cola de ejecución:",
     "general_event_title": "Ejecutar un evento ad-hoc",
     "report_guid": "Guía de las notificaciones:",
     "report_guid_missing": "No se ha encontrado la notificación vinculada. Hay un pequeño retraso entre las notificaciones enviadas recientemente y su disponibilidad. Actualiza tu página y la caché después de unos segundos. También es posible que la notificación seleccionada se haya eliminado durante el mantenimiento, tal y como se especifica en la configuración <code>de DBCLNP_NOTIFI_HIST</code>. <br/> <br/>En su lugar, se muestra la notificación más reciente. La notificación que falta tiene el siguiente GUID:",
@@ -770,4 +778,4 @@
     "settings_update_item_warning": "Actualice el valor a continuación. Tenga cuidado de seguir el formato anterior. <b>O la validación no se realiza.</b>",
     "test_event_icon": "fa-vial-circle-check",
     "test_event_tooltip": "Guarda tus cambios antes de probar nuevos ajustes."
-}
+}

front/php/templates/language/it_it.json

@@ -56,6 +56,8 @@
     "BackDevices_Restore_okay": "Ripristino eseguito correttamente.",
     "BackDevices_darkmode_disabled": "Modalità scura disabilitata",
     "BackDevices_darkmode_enabled": "Modalità scura abilitata",
+    "CLEAR_NEW_FLAG_description": "",
+    "CLEAR_NEW_FLAG_name": "",
     "DAYS_TO_KEEP_EVENTS_description": "Questa è un'impostazione di manutenzione. Specifica il numero di giorni delle voci degli eventi che verranno conservati. Tutti gli eventi più vecchi verranno eliminati periodicamente. Si applica anche alla cronologia degli eventi del plugin (Plugin Events History).",
     "DAYS_TO_KEEP_EVENTS_name": "Elimina eventi più vecchi di",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Copia dettagli dal dispositivo",
@@ -274,6 +276,7 @@
     "Gen_AreYouSure": "Sei sicuro?",
     "Gen_Backup": "Esegui backup",
     "Gen_Cancel": "Annulla",
+    "Gen_Change": "Modifica",
     "Gen_Copy": "Esegui",
     "Gen_DataUpdatedUITakesTime": "OK: l'aggiornamento dell'interfaccia utente potrebbe richiedere del tempo se è in esecuzione una scansione.",
     "Gen_Delete": "Elimina",
@@ -292,6 +295,7 @@
     "Gen_Save": "Salva",
     "Gen_Saved": "Salvato",
     "Gen_Search": "Cerca",
+    "Gen_SelectToPreview": "",
     "Gen_Selected_Devices": "Dispositivi selezionati:",
     "Gen_Switch": "Cambia",
     "Gen_Upd": "Aggiornato correttamente",
@@ -347,6 +351,7 @@
     "Loading": "Caricamento...",
     "Login_Box": "Inserisci la tua password",
     "Login_Default_PWD": "La password predefinita \"123456\" è ancora attiva.",
+    "Login_Info": "",
     "Login_Psw-box": "Password",
     "Login_Psw_alert": "Avviso password!",
     "Login_Psw_folder": "nella cartella di configurazione.",
@@ -370,11 +375,11 @@
     "Maintenance_Tool_ExportCSV_text": "Genera un file CSV (comma separated value) contenente la lista dei dispositivi incluse le relazioni di rete tra i nodi di rete e i dispositivi connessi. Puoi anche eseguire questa azione accedendo all'URL <code>il_tuo_NetAlertX/php/server/devices.php?action=ExportCSV</code> o abilitando il plugin <a href=\"settings.php#CSVBCKP_header\">Backup CSV</a>.",
     "Maintenance_Tool_ImportCSV": "Importa CSV",
     "Maintenance_Tool_ImportCSV_noti": "Importa CSV",
-    "Maintenance_Tool_ImportCSV_noti_text": "Sei sicuro di voler importare il file CSV? Questa operazione sovrascriverà tutti i dispositivi presenti nel database.",
+    "Maintenance_Tool_ImportCSV_noti_text": "Sei sicuro di voler importare il file CSV? Questa operazione <b>sovrascriverà</b> tutti i dispositivi presenti nel database.",
     "Maintenance_Tool_ImportCSV_text": "Prima di utilizzare questa funzione, esegui un backup. Importa un file CSV (comma separated value) contenente la lista dei dispositivi incluse le relazioni di rete tra i nodi di rete e i dispositivi connessi. Per far ciò posiziona il file CSV denominato <b>devices.csv</b> nella cartella <b>/config</b>.",
-    "Maintenance_Tool_ImportPastedCSV": "",
-    "Maintenance_Tool_ImportPastedCSV_noti_text": "",
-    "Maintenance_Tool_ImportPastedCSV_text": "",
+    "Maintenance_Tool_ImportPastedCSV": "Importazione CSV (incolla)",
+    "Maintenance_Tool_ImportPastedCSV_noti_text": "Sei sicuro di voler importare il CSV incollato? Questo <b>sovrascriverà</b> completamente i dispositivi nel tuo database.",
+    "Maintenance_Tool_ImportPastedCSV_text": "Prima di utilizzare questa funzione, esegui un backup. Importa un file CSV (valori separati da virgole) contenente l'elenco dei dispositivi, comprese le relazioni di rete tra i nodi di rete e i dispositivi collegati.",
     "Maintenance_Tool_arpscansw": "Attiva/disattiva arp-Scan",
     "Maintenance_Tool_arpscansw_noti": "Attiva o disattiva arp-Scan",
     "Maintenance_Tool_arpscansw_noti_text": "Una volta disattivata la scansione rimane disattivata finché non viene nuovamente attivata.",
@@ -527,6 +532,7 @@
     "Plugins_DeleteAll": "Elimina tutti (i filtri vengono ignorati)",
     "Plugins_Filters_Mac": "Filtro MAC",
     "Plugins_History": "Storico eventi",
+    "Plugins_Obj_DeleteListed": "",
     "Plugins_Objects": "Oggetti plugin",
     "Plugins_Out_of": "fuori da",
     "Plugins_Unprocessed_Events": "Eventi non processati",
@@ -556,6 +562,7 @@
     "RandomMAC_hover": "Rilevato automaticamente: indica se il dispositivo genera il suo indirizzo MAC casualmente.",
     "Reports_Sent_Log": "Log rapporti inviati",
     "SCAN_SUBNETS_description": "La maggior parte degli scanner di rete (ARP-SCAN, NMAP, NSLOOKUP, DIG, PHOLUS) si basano sulla scansione di interfacce di rete e sottoreti specifiche. Consulta la <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/SUBNETS.md\" target=\"_blank\">documentazione sulle sottoreti</a> per assistenza su questa impostazione, in particolare VLAN, quali VLAN sono supportate o come individuare la maschera di rete e l'interfaccia. <br/> <br/> Un'alternativa agli scanner in rete è abilitare altri scanner/importatori di dispositivi che non si affidano a NetAlert<sup>X</sup> che hanno accesso alla rete (UNIFI, dhcp.leases , PiHole, ecc.). <br/> <br/> Nota: il tempo di scansione stesso dipende dal numero di indirizzi IP da controllare, quindi impostalo attentamente con la maschera di rete e l'interfaccia appropriate.",
+    "SCAN_SUBNETS_name": "",
     "SYSTEM_TITLE": "Informazioni sistema",
     "Setting_Override": "Sovrascrivi valore",
     "Setting_Override_Description": "L'abilitazione di questa opzione sovrascriverà il valore predefinito fornito dall'app con il valore specificato sopra.",
@@ -654,8 +661,10 @@
     "UI_PRESENCE_name": "Mostra nel grafico delle presenze",
     "UI_REFRESH_description": "Inserisci il numero di secondi dopo il quale la UI si ricarica. Imposta a <code>0</code> per disabilitare.",
     "UI_REFRESH_name": "Aggiorna automaticamente la UI",
+    "VERSION_description": "Valore di supporto della versione o della marca temporale per verificare se l'app è stata aggiornata.",
+    "VERSION_name": "Versione o marca temporale",
     "devices_old": "Aggiornamento...",
-    "general_event_description": "L'evento che hai attivato potrebbe richiedere del tempo prima che i processi in background vengano completati. L'esecuzione è terminata una volta che la coda di esecuzione sottostante si è svuotata (controlla il <a href='/maintenance.php#tab_Logging'>log degli errori</a> se riscontri problemi). <br/> <br/>  Coda di esecuzione:",
+    "general_event_description": "L'evento che hai attivato potrebbe richiedere del tempo prima che i processi in background vengano completati. L'esecuzione è terminata una volta che la coda di esecuzione sottostante si è svuotata (controlla il <a href='/maintenance.php#tab_Logging'>log degli errori</a> se riscontri problemi). <br/> <br/> Coda di esecuzione:",
     "general_event_title": "Esecuzione di un evento ad-hoc",
     "report_guid": "GUID notifica:",
     "report_guid_missing": "Notifica collegata non trovata. C'è un piccolo ritardo tra la disponibilità delle notifiche inviate di recente e la loro disponibilità. Aggiorna la pagina e la cache dopo alcuni secondi. È anche possibile che la notifica selezionata sia stata eliminata durante la manutenzione come specificato nell'impostazione <code>DBCLNP_NOTIFI_HIST</code>. <br/> <br/>Viene invece visualizzata l'ultima notifica. La notifica mancante ha il seguente GUID:",
@@ -690,4 +699,4 @@
     "settings_update_item_warning": "Aggiorna il valore qui sotto. Fai attenzione a seguire il formato precedente. <b>La convalida non viene eseguita.</b>",
     "test_event_icon": "fa-vial-circle-check",
     "test_event_tooltip": "Salva le modifiche prima di provare le nuove impostazioni."
-}
+}

front/php/templates/language/lang.php

@@ -5,7 +5,8 @@
 // ###################################
 
 $defaultLang = "en_us";
-$allLanguages = ["en_us","es_es","de_de", "nb_no", "pl_pl", "pt_br", "ru_ru", "fr_fr", "it_it", "zh_cn"];
+$allLanguages = ["en_us", "es_es", "de_de", "fr_fr", "it_it", "ru_ru", "nb_no", "pl_pl", "pt_br", "tr_tr", "zh_cn", "cs_cz"];
+
 
 global $db;
 
@@ -21,13 +22,12 @@ switch($result){
   case 'Turkish (tr_tr)': $pia_lang_selected = 'tr_tr'; break;
   case 'French': $pia_lang_selected = 'fr_fr'; break;
   case 'Chinese (zh_cn)': $pia_lang_selected = 'zh_cn'; break;
+  case 'Czech (cs_cz)': $pia_lang_selected = 'cs_cz'; break;
   default: $pia_lang_selected = 'en_us'; break;
 }
 
 if (isset($pia_lang_selected) == FALSE or (strlen($pia_lang_selected) == 0)) {$pia_lang_selected = $defaultLang;}
 
-require dirname(__FILE__).'/../skinUI.php';
-
 $result = $db->query("SELECT * FROM Plugins_Language_Strings");
 $strings = array();
 while ($row = $result->fetchArray(SQLITE3_ASSOC)) {

front/php/templates/language/merge_translations.py

@@ -33,6 +33,6 @@ def merge_translations(main_file, other_files):
 if __name__ == "__main__":
     current_path = os.path.dirname(os.path.abspath(__file__))
     # language codes can be found here: http://www.lingoes.net/en/translator/langcode.htm
-    json_files = ["en_us.json", "de_de.json", "es_es.json", "fr_fr.json", "nb_no.json", "ru_ru.json", "it_it.json", "pt_br.json", "pl_pl.json", "zh_cn.json", "tr_tr.json"]
+    json_files = ["en_us.json", "de_de.json", "es_es.json", "fr_fr.json", "nb_no.json", "ru_ru.json", "it_it.json", "pt_br.json", "pl_pl.json", "zh_cn.json", "tr_tr.json", "cs_cz.json"]
     file_paths = [os.path.join(current_path, file) for file in json_files]
     merge_translations(file_paths[0], file_paths[1:])

front/php/templates/language/nb_no.json

@@ -56,6 +56,8 @@
     "BackDevices_Restore_okay": "Gjenoppretting utført.",
     "BackDevices_darkmode_disabled": "Mørk modus Deaktivert",
     "BackDevices_darkmode_enabled": "Mørk modus Aktivert",
+    "CLEAR_NEW_FLAG_description": "",
+    "CLEAR_NEW_FLAG_name": "",
     "DAYS_TO_KEEP_EVENTS_description": "Dette er en vedlikeholdsinnstilling. Dette spesifiserer antall dager verdt med hendelsesoppføringer som vil beholdes. Alle eldre hendelser vil bli slettet med jevne mellomrom. Gjelder også for plugin-hendelseshistorikk.",
     "DAYS_TO_KEEP_EVENTS_name": "Slett hendelser eldre enn",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Kopier detaljer fra enhet",
@@ -274,6 +276,7 @@
     "Gen_AreYouSure": "Er du sikker?",
     "Gen_Backup": "Kjør sikkerhetskopiering",
     "Gen_Cancel": "Avbryt",
+    "Gen_Change": "",
     "Gen_Copy": "Kjør",
     "Gen_DataUpdatedUITakesTime": "OK - Det kan ta litt tid før brukergrensesnittet oppdateres hvis en skanning kjøres.",
     "Gen_Delete": "Slett",
@@ -292,6 +295,7 @@
     "Gen_Save": "Lagre",
     "Gen_Saved": "Lagret",
     "Gen_Search": "Søk",
+    "Gen_SelectToPreview": "",
     "Gen_Selected_Devices": "Valgte Enheter:",
     "Gen_Switch": "Bytt",
     "Gen_Upd": "Oppdatering vellykket",
@@ -347,6 +351,7 @@
     "Loading": "Laster...",
     "Login_Box": "Skriv inn passordet ditt",
     "Login_Default_PWD": "Standard passordet \"123456\" er fortsatt aktivt.",
+    "Login_Info": "",
     "Login_Psw-box": "Passord",
     "Login_Psw_alert": "Passord varsling!",
     "Login_Psw_folder": "i config-mappen.",
@@ -527,6 +532,7 @@
     "Plugins_DeleteAll": "Slett alle (filtre blir ignorert)",
     "Plugins_Filters_Mac": "Mac filter",
     "Plugins_History": "Hendelses historikk",
+    "Plugins_Obj_DeleteListed": "",
     "Plugins_Objects": "Plugin-objekter",
     "Plugins_Out_of": "ut av",
     "Plugins_Unprocessed_Events": "Uprosesserte hendelser",
@@ -556,6 +562,7 @@
     "RandomMAC_hover": "Autodetektert - indikerer om enheten randomiserer MAC-adressen sin.",
     "Reports_Sent_Log": "Sendte rapport logger",
     "SCAN_SUBNETS_description": "De fleste skannere på nettet (ARP-Scan, NMAP, NSlookup, Dig, Pholus) er avhengige av å skanne spesifikke nettverksgrensesnitt og undernett. Sjekk <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/SUBNETS.md\" target=\"_blank\">subnett dokumentasjonen</a> for hjelp på denne innstillingen, spesielt VLAN-er, hvilke VLAN-er som støttes, eller hvordan du kan finne ut nettverksmasken og grensesnittet ditt. <br/> <br/> Et alternativ til skannere på nettet er å aktivere noen andre enhetsskannere/importører som ikke er avhengige av Netalert<sup>X</sup> med tilgang til nettverket (UniFi, DHCP-Leaser, Pihole, osv.). <br/> <br/> Merk: Selve skanningstiden avhenger av antall IP -adresser som skal sjekkes, så sett dette opp nøye med riktig nettverksmaske og grensesnitt.",
+    "SCAN_SUBNETS_name": "",
     "SYSTEM_TITLE": "Systeminformasjon",
     "Setting_Override": "Overstyr verdi",
     "Setting_Override_Description": "Aktivering av dette alternativet vil overstyre en App som leveres standard-verdi med verdien som er spesifisert ovenfor.",
@@ -654,6 +661,8 @@
     "UI_PRESENCE_name": "Vis i tilstedeværelse-diagrammet",
     "UI_REFRESH_description": "Skriv inn antall sekunder før UI laster inn på nytt. Sett til <code>0</code> for å deaktivere.",
     "UI_REFRESH_name": "Oppdater UI automatisk",
+    "VERSION_description": "",
+    "VERSION_name": "",
     "devices_old": "Oppdaterer...",
     "general_event_description": "Hendelsen du har utløst kan ta en stund til før bakgrunnsprosesser er ferdig. Utførelsen ble avsluttet når utførelseskøen nedenfor tømmes (sjekk <a  href='/maintenance.php#tab_Logging'>Feillogg</a> Hvis du møter problemer). <br/> <br/> Utførelseskø:",
     "general_event_title": "Utfører en ad-hoc hendelse",
@@ -690,4 +699,4 @@
     "settings_update_item_warning": "Oppdater verdien nedenfor. Pass på å følge forrige format. <b>Validering etterpå utføres ikke.</b>",
     "test_event_icon": "fa-vial-circle-check",
     "test_event_tooltip": "Lagre endringene først, før du tester innstillingene dine."
-}
+}

front/php/templates/language/pl_pl.json

@@ -56,6 +56,8 @@
     "BackDevices_Restore_okay": "Przywracanie wykonane z sukcesem.",
     "BackDevices_darkmode_disabled": "Tryb ciemny Wyłączony",
     "BackDevices_darkmode_enabled": "Tryb ciemny Włączony",
+    "CLEAR_NEW_FLAG_description": "",
+    "CLEAR_NEW_FLAG_name": "",
     "DAYS_TO_KEEP_EVENTS_description": "To jest ustawienie konserwacji. Określa ile dni mają być utrzymywane wpisy wydarzeń. Wszystkie starsze wpisy wydarzeń zostaną usunięte okresowo. Dotyczy także Historii Wydarzeń Pluginów.",
     "DAYS_TO_KEEP_EVENTS_name": "Usuń wydarzenia starsze niż",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i>Kopiuj opis z urządzenia",
@@ -274,6 +276,7 @@
     "Gen_AreYouSure": "Jesteś pewien?",
     "Gen_Backup": "Wykonaj Kopie Zapasową",
     "Gen_Cancel": "Anuluj",
+    "Gen_Change": "",
     "Gen_Copy": "Wykonaj",
     "Gen_DataUpdatedUITakesTime": "OK - Aktualizacja UI może chwile potrwać jeżeli wykonywany jest skan.",
     "Gen_Delete": "Usuń",
@@ -292,6 +295,7 @@
     "Gen_Save": "Zapisz",
     "Gen_Saved": "Zapisano",
     "Gen_Search": "Szukaj",
+    "Gen_SelectToPreview": "",
     "Gen_Selected_Devices": "Wybierz Urządzenia:",
     "Gen_Switch": "Switch",
     "Gen_Upd": "Zaktualizowane poprawnie",
@@ -347,6 +351,7 @@
     "Loading": "Wczytywanie...",
     "Login_Box": "Wprowadź hasło",
     "Login_Default_PWD": "Podstawowe hasło \"123456\" jest aktywne.",
+    "Login_Info": "",
     "Login_Psw-box": "Hasło",
     "Login_Psw_alert": "Alert HASŁA!",
     "Login_Psw_folder": "w folderze konfiguracji.",
@@ -527,6 +532,7 @@
     "Plugins_DeleteAll": "Usuń wszystkie (filtry są ignorowane)",
     "Plugins_Filters_Mac": "Filtr MAC",
     "Plugins_History": "Historia Wydarzeń",
+    "Plugins_Obj_DeleteListed": "",
     "Plugins_Objects": "Obiekty Wtyczek",
     "Plugins_Out_of": "brakujące",
     "Plugins_Unprocessed_Events": "Nieprzeprocesowane Wydarzenia",
@@ -556,6 +562,7 @@
     "RandomMAC_hover": "Auto wykrywanie - oznacza czy urządzenie randomizuje swój adres MAC.",
     "Reports_Sent_Log": "Wyślij zgłoszenie logów",
     "SCAN_SUBNETS_description": "Większość skanerów sieciowych (ARP-SCAN, NMAP, NSLOOKUP, DIG, PHOLUS) opiera się na konkretnych interfejsach sieciowych oraz podsieci. Sprawdź <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/SUBNETS.md\" target=\"_blank\"> dokumentacji podsieci</a> jeżeli potrzebujesz pomocy w ustawieniach, a szczególnie z VLAN'ami, jakie VLAN'y są wspierane oraz jak rozgryźć maskę podsieci twojego interfejsu.<br/><br/> Alternatywą do skanerów sieciowych jest uruchomienie innego Skanera Urządzeń/Importera który nie polega by NetAlert<sup>X</sup> miał dostęp do sieci (UNIFI, dhcp.leases, PiHole, itp.).<br/><br/> Notatka: Czas skanu zależy od liczby adresów IP do sprawdzenia, więc ustaw go tak by skanował odpowiedni interfejs i maskę sieciową.",
+    "SCAN_SUBNETS_name": "",
     "SYSTEM_TITLE": "Informacje o Systemie",
     "Setting_Override": "Nadpisz wartość",
     "Setting_Override_Description": "Włączanie tej opcji nadpisze podstawową wartość na wartość podaną powyżej.",
@@ -654,6 +661,8 @@
     "UI_PRESENCE_name": "Pokaż w tabeli obecności",
     "UI_REFRESH_description": "Wprowadź liczbę sekund po której UI ma się przeładować. Ustaw na <code>0</code> by wyłączyć.",
     "UI_REFRESH_name": "Automatycznie odświeżaj UI",
+    "VERSION_description": "",
+    "VERSION_name": "",
     "devices_old": "Odświeżanie...",
     "general_event_description": "Wydarzenie które wyzwoliłeś może chwilę zająć dopóki procesy w tle nie zakończą się. Wykonanie zakończy się kiedy kolejka się opróżni (Sprawdź <a  href='/maintenance.php#tab_Logging'>logi błędów</a> jeżeli napotkasz błędy).<br/><br/> Kolejka wykonywania:",
     "general_event_title": "Wykonywanie wydarzeń ad-hoc",
@@ -690,4 +699,4 @@
     "settings_update_item_warning": "Zaktualizuj poniższą wartość. Zachowaj ostrożność i postępuj zgodnie z poprzednim formatem. <b>Walidacja nie jest wykonywana.</b>",
     "test_event_icon": "fa-vial-circle-check",
     "test_event_tooltip": "Zapisz zmiany zanim będziesz testować swoje ustawienia."
-}
+}

front/php/templates/language/pt_br.json

@@ -3,7 +3,7 @@
     "API_CUSTOM_SQL_name": "Endpoint customizado",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
-    "About_Design": "Desenhado por:",
+    "About_Design": "Desenvolvido por:",
     "About_Exit": "Sair",
     "About_Title": "Analisador de segurança de rede & framework de notificação",
     "AppEvents_DateTimeCreated": "Registrado em",
@@ -56,15 +56,17 @@
     "BackDevices_Restore_okay": "Restauração executada com sucesso.",
     "BackDevices_darkmode_disabled": "Modo Noturno Desabilitado",
     "BackDevices_darkmode_enabled": "Modo Noturno Habilitado",
-    "DAYS_TO_KEEP_EVENTS_description": "",
+    "CLEAR_NEW_FLAG_description": "",
+    "CLEAR_NEW_FLAG_name": "",
+    "DAYS_TO_KEEP_EVENTS_description": "Esta é uma definição de manutenção. Especifica o número de dias de entradas de eventos que serão mantidas. Todos os eventos mais antigos serão eliminados periodicamente. Também se aplica ao Histórico de eventos do plug-in.",
     "DAYS_TO_KEEP_EVENTS_name": "Excluir eventos mais antigos que",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Copiar detalhes do dispositivo",
-    "DevDetail_Copy_Device_Tooltip": "",
+    "DevDetail_Copy_Device_Tooltip": "Copiar detalhes do dispositivo a partir da lista pendente. Tudo o que se encontra nesta página será substituído",
     "DevDetail_EveandAl_AlertAllEvents": "Alerte Todos os Eventos",
     "DevDetail_EveandAl_AlertDown": "Alerta Desligado",
     "DevDetail_EveandAl_Archived": "Arquivado",
     "DevDetail_EveandAl_NewDevice": "Novo Dispositivo",
-    "DevDetail_EveandAl_NewDevice_Tooltip": "",
+    "DevDetail_EveandAl_NewDevice_Tooltip": "Mostra o estado Novo do dispositivo e inclui-o nas listas quando o filtro Novos dispositivos está ativo. Não afecta as notificações.",
     "DevDetail_EveandAl_RandomMAC": "MAC Aleatório",
     "DevDetail_EveandAl_ScanCycle": "Rastrear dispositivo",
     "DevDetail_EveandAl_ScanCycle_a": "Rastrear Dispositivo",
@@ -72,258 +74,260 @@
     "DevDetail_EveandAl_Skip": "Pular notificações repetidas para",
     "DevDetail_EveandAl_Title": "<i class=\"fa fa-bolt\"></i> Configuração de Eventos & Alertas",
     "DevDetail_Events_CheckBox": "Esconder Eventos de Conexão",
-    "DevDetail_GoToNetworkNode": "",
+    "DevDetail_GoToNetworkNode": "Navega para a página Rede do nó indicado.",
     "DevDetail_Icon": "Icone",
-    "DevDetail_Icon_Descr": "",
-    "DevDetail_Loading": "",
-    "DevDetail_MainInfo_Comments": "",
-    "DevDetail_MainInfo_Favorite": "",
-    "DevDetail_MainInfo_Group": "",
-    "DevDetail_MainInfo_Location": "",
-    "DevDetail_MainInfo_Name": "",
-    "DevDetail_MainInfo_Network": "",
-    "DevDetail_MainInfo_Network_Port": "",
-    "DevDetail_MainInfo_Network_Site": "",
-    "DevDetail_MainInfo_Network_Title": "",
-    "DevDetail_MainInfo_Owner": "",
-    "DevDetail_MainInfo_SSID": "",
-    "DevDetail_MainInfo_Title": "",
-    "DevDetail_MainInfo_Type": "",
-    "DevDetail_MainInfo_Vendor": "",
-    "DevDetail_MainInfo_mac": "",
-    "DevDetail_Network_Node_hover": "",
-    "DevDetail_Network_Port_hover": "",
-    "DevDetail_Nmap_Scans": "",
-    "DevDetail_Nmap_Scans_desc": "",
-    "DevDetail_Nmap_buttonDefault": "",
-    "DevDetail_Nmap_buttonDefault_text": "",
-    "DevDetail_Nmap_buttonDetail": "",
-    "DevDetail_Nmap_buttonDetail_text": "",
-    "DevDetail_Nmap_buttonFast": "",
-    "DevDetail_Nmap_buttonFast_text": "",
-    "DevDetail_Nmap_buttonSkipDiscovery": "",
-    "DevDetail_Nmap_buttonSkipDiscovery_text": "",
-    "DevDetail_Nmap_resultsLink": "",
-    "DevDetail_Owner_hover": "",
-    "DevDetail_Periodselect_All": "",
-    "DevDetail_Periodselect_LastMonth": "",
-    "DevDetail_Periodselect_LastWeek": "",
-    "DevDetail_Periodselect_LastYear": "",
-    "DevDetail_Periodselect_today": "",
-    "DevDetail_Run_Actions_Title": "",
-    "DevDetail_Run_Actions_Tooltip": "",
-    "DevDetail_SessionInfo_FirstSession": "",
-    "DevDetail_SessionInfo_LastIP": "",
-    "DevDetail_SessionInfo_LastSession": "",
-    "DevDetail_SessionInfo_StaticIP": "",
-    "DevDetail_SessionInfo_Status": "",
-    "DevDetail_SessionInfo_Title": "",
-    "DevDetail_SessionTable_Additionalinfo": "",
-    "DevDetail_SessionTable_Connection": "",
-    "DevDetail_SessionTable_Disconnection": "",
-    "DevDetail_SessionTable_Duration": "",
-    "DevDetail_SessionTable_IP": "",
-    "DevDetail_SessionTable_Order": "",
-    "DevDetail_Shortcut_CurrentStatus": "",
-    "DevDetail_Shortcut_DownAlerts": "",
-    "DevDetail_Shortcut_Presence": "",
-    "DevDetail_Shortcut_Sessions": "",
-    "DevDetail_Tab_Details": "",
-    "DevDetail_Tab_Events": "",
-    "DevDetail_Tab_EventsTableDate": "",
-    "DevDetail_Tab_EventsTableEvent": "",
-    "DevDetail_Tab_EventsTableIP": "",
-    "DevDetail_Tab_EventsTableInfo": "",
-    "DevDetail_Tab_Nmap": "",
-    "DevDetail_Tab_NmapEmpty": "",
-    "DevDetail_Tab_NmapTableExtra": "",
-    "DevDetail_Tab_NmapTableHeader": "",
-    "DevDetail_Tab_NmapTableIndex": "",
-    "DevDetail_Tab_NmapTablePort": "",
-    "DevDetail_Tab_NmapTableService": "",
-    "DevDetail_Tab_NmapTableState": "",
-    "DevDetail_Tab_NmapTableText": "",
-    "DevDetail_Tab_NmapTableTime": "",
-    "DevDetail_Tab_Plugins": "",
-    "DevDetail_Tab_Presence": "",
-    "DevDetail_Tab_Sessions": "",
-    "DevDetail_Tab_Tools": "",
-    "DevDetail_Tab_Tools_Internet_Info_Description": "",
-    "DevDetail_Tab_Tools_Internet_Info_Error": "",
-    "DevDetail_Tab_Tools_Internet_Info_Start": "",
-    "DevDetail_Tab_Tools_Internet_Info_Title": "",
-    "DevDetail_Tab_Tools_Nslookup_Description": "",
-    "DevDetail_Tab_Tools_Nslookup_Error": "",
-    "DevDetail_Tab_Tools_Nslookup_Start": "",
-    "DevDetail_Tab_Tools_Nslookup_Title": "",
-    "DevDetail_Tab_Tools_Speedtest_Description": "",
-    "DevDetail_Tab_Tools_Speedtest_Start": "",
-    "DevDetail_Tab_Tools_Speedtest_Title": "",
-    "DevDetail_Tab_Tools_Traceroute_Description": "",
-    "DevDetail_Tab_Tools_Traceroute_Error": "",
-    "DevDetail_Tab_Tools_Traceroute_Start": "",
-    "DevDetail_Tab_Tools_Traceroute_Title": "",
-    "DevDetail_Tools_WOL": "",
-    "DevDetail_Tools_WOL_noti": "",
-    "DevDetail_Tools_WOL_noti_text": "",
-    "DevDetail_Type_hover": "",
-    "DevDetail_Vendor_hover": "",
-    "DevDetail_WOL_Title": "",
-    "DevDetail_button_AddIcon": "",
-    "DevDetail_button_AddIcon_Help": "",
-    "DevDetail_button_AddIcon_Tooltip": "",
-    "DevDetail_button_Delete": "",
-    "DevDetail_button_DeleteEvents": "",
-    "DevDetail_button_DeleteEvents_Warning": "",
-    "DevDetail_button_OverwriteIcons": "",
-    "DevDetail_button_OverwriteIcons_Tooltip": "",
-    "DevDetail_button_OverwriteIcons_Warning": "",
-    "DevDetail_button_Reset": "",
-    "DevDetail_button_Save": "",
-    "Device_MultiEdit": "",
-    "Device_MultiEdit_Backup": "",
-    "Device_MultiEdit_Fields": "",
-    "Device_MultiEdit_MassActions": "",
-    "Device_MultiEdit_Tooltip": "",
-    "Device_Searchbox": "",
-    "Device_Shortcut_AllDevices": "",
-    "Device_Shortcut_Archived": "",
-    "Device_Shortcut_Connected": "",
-    "Device_Shortcut_Devices": "",
-    "Device_Shortcut_DownAlerts": "",
-    "Device_Shortcut_DownOnly": "",
-    "Device_Shortcut_Favorites": "",
-    "Device_Shortcut_NewDevices": "",
-    "Device_Shortcut_OnlineChart": "",
-    "Device_TableHead_Connected_Devices": "",
-    "Device_TableHead_Favorite": "",
-    "Device_TableHead_FirstSession": "",
-    "Device_TableHead_GUID": "",
-    "Device_TableHead_Group": "",
-    "Device_TableHead_Icon": "",
-    "Device_TableHead_LastIP": "",
-    "Device_TableHead_LastIPOrder": "",
-    "Device_TableHead_LastSession": "",
-    "Device_TableHead_Location": "",
-    "Device_TableHead_MAC": "",
-    "Device_TableHead_MAC_full": "",
-    "Device_TableHead_Name": "",
-    "Device_TableHead_NetworkSite": "",
-    "Device_TableHead_Owner": "",
-    "Device_TableHead_Parent_MAC": "",
-    "Device_TableHead_Port": "",
-    "Device_TableHead_RowID": "",
-    "Device_TableHead_Rowid": "",
-    "Device_TableHead_SSID": "",
-    "Device_TableHead_Status": "",
-    "Device_TableHead_SyncHubNodeName": "",
-    "Device_TableHead_Type": "",
-    "Device_TableHead_Vendor": "",
-    "Device_Table_Not_Network_Device": "",
-    "Device_Table_info": "",
-    "Device_Table_nav_next": "",
-    "Device_Table_nav_prev": "",
-    "Device_Tablelenght": "",
-    "Device_Tablelenght_all": "",
-    "Device_Title": "",
-    "Donations_Others": "",
-    "Donations_Platforms": "",
-    "Donations_Text": "",
-    "Donations_Title": "",
-    "ENABLE_PLUGINS_description": "",
-    "ENABLE_PLUGINS_name": "",
-    "Email_display_name": "",
-    "Email_icon": "",
-    "Events_Loading": "",
-    "Events_Periodselect_All": "",
-    "Events_Periodselect_LastMonth": "",
-    "Events_Periodselect_LastWeek": "",
-    "Events_Periodselect_LastYear": "",
-    "Events_Periodselect_today": "",
-    "Events_Searchbox": "",
-    "Events_Shortcut_AllEvents": "",
-    "Events_Shortcut_DownAlerts": "",
-    "Events_Shortcut_Events": "",
-    "Events_Shortcut_MissSessions": "",
-    "Events_Shortcut_NewDevices": "",
-    "Events_Shortcut_Sessions": "",
-    "Events_Shortcut_VoidSessions": "",
-    "Events_TableHead_AdditionalInfo": "",
-    "Events_TableHead_Connection": "",
-    "Events_TableHead_Date": "",
-    "Events_TableHead_Device": "",
-    "Events_TableHead_Disconnection": "",
-    "Events_TableHead_Duration": "",
-    "Events_TableHead_DurationOrder": "",
-    "Events_TableHead_EventType": "",
-    "Events_TableHead_IP": "",
-    "Events_TableHead_IPOrder": "",
-    "Events_TableHead_Order": "",
-    "Events_TableHead_Owner": "",
-    "Events_TableHead_PendingAlert": "",
-    "Events_Table_info": "",
-    "Events_Table_nav_next": "",
-    "Events_Table_nav_prev": "",
-    "Events_Tablelenght": "",
-    "Events_Tablelenght_all": "",
-    "Events_Title": "",
-    "Gen_Action": "",
-    "Gen_Add": "",
-    "Gen_Add_All": "",
-    "Gen_All_Devices": "",
-    "Gen_AreYouSure": "",
-    "Gen_Backup": "",
-    "Gen_Cancel": "",
-    "Gen_Copy": "",
-    "Gen_DataUpdatedUITakesTime": "",
-    "Gen_Delete": "",
-    "Gen_DeleteAll": "",
-    "Gen_Error": "",
-    "Gen_Filter": "",
-    "Gen_LockedDB": "",
-    "Gen_Offline": "",
-    "Gen_Okay": "",
-    "Gen_Purge": "",
-    "Gen_ReadDocs": "",
-    "Gen_Remove_All": "",
-    "Gen_Remove_Last": "",
-    "Gen_Restore": "",
-    "Gen_Run": "",
-    "Gen_Save": "",
-    "Gen_Saved": "",
-    "Gen_Search": "",
-    "Gen_Selected_Devices": "",
-    "Gen_Switch": "",
-    "Gen_Upd": "",
-    "Gen_Upd_Fail": "",
-    "Gen_Update": "",
-    "Gen_Update_Value": "",
-    "Gen_Warning": "",
-    "Gen_Work_In_Progress": "",
-    "General_display_name": "",
-    "General_icon": "",
-    "HRS_TO_KEEP_NEWDEV_description": "",
-    "HRS_TO_KEEP_NEWDEV_name": "",
-    "HelpFAQ_Cat_Detail": "",
-    "HelpFAQ_Cat_Detail_300_head": "",
-    "HelpFAQ_Cat_Detail_300_text_a": "",
-    "HelpFAQ_Cat_Detail_300_text_b": "",
-    "HelpFAQ_Cat_Detail_301_head_a": "",
+    "DevDetail_Icon_Descr": "Introduza o nome de um ícone fantástico do tipo de letra sem o prefixo fa- ou com a classe completa, por exemplo: fa fa-brands fa-apple.",
+    "DevDetail_Loading": "A carregar...",
+    "DevDetail_MainInfo_Comments": "Comentários",
+    "DevDetail_MainInfo_Favorite": "Favorito",
+    "DevDetail_MainInfo_Group": "Grupo",
+    "DevDetail_MainInfo_Location": "Localização",
+    "DevDetail_MainInfo_Name": "Nome",
+    "DevDetail_MainInfo_Network": "<i class=\"fa fa-server\"> </i> Node (MAC)",
+    "DevDetail_MainInfo_Network_Port": "<i class=\"fa fa-ethernet\"></i>Porta",
+    "DevDetail_MainInfo_Network_Site": "Site",
+    "DevDetail_MainInfo_Network_Title": "<i class=\"fa fa-network-wired\"></i> Rede",
+    "DevDetail_MainInfo_Owner": "Proprietário",
+    "DevDetail_MainInfo_SSID": "SSID",
+    "DevDetail_MainInfo_Title": "<i class=\"fa fa-pencil\"></i> Informações principais",
+    "DevDetail_MainInfo_Type": "Tipo",
+    "DevDetail_MainInfo_Vendor": "Vendedor",
+    "DevDetail_MainInfo_mac": "MAC",
+    "DevDetail_Network_Node_hover": "Selecione o dispositivo de rede principal ao qual o dispositivo atual está conectado, para preencher a árvore Rede.",
+    "DevDetail_Network_Port_hover": "A porta a que este dispositivo está ligado no dispositivo de rede principal. Se for deixado vazio, é apresentado um ícone wifi na árvore Rede.",
+    "DevDetail_Nmap_Scans": "Varreduras manuais do Nmap",
+    "DevDetail_Nmap_Scans_desc": "Aqui você pode executar varreduras manuais NMAP. Você também pode agendar varreduras automáticas regulares de NMAP através do plugin Serviços & Ports (NMAP). Cabeça para <a href='/settings.php' target='_blank'>Configurações</a> para descobrir mais",
+    "DevDetail_Nmap_buttonDefault": "Verificação predefinida",
+    "DevDetail_Nmap_buttonDefault_text": "Scan padrão: Nmap verifica as 1.000 portas superiores para cada protocolo de digitalização solicitado. Isto atinge cerca de 93% das portas TCP e 49% das portas UDP. (cerca de 5 segundos)",
+    "DevDetail_Nmap_buttonDetail": "Verificação Detalhada",
+    "DevDetail_Nmap_buttonDetail_text": "Verificação detalhada: Verificação predefinida com deteção de SO activada, deteção de versão, verificação de scripts e traceroute (até 30 segundos ou mais)",
+    "DevDetail_Nmap_buttonFast": "Verificação rápida",
+    "DevDetail_Nmap_buttonFast_text": "Verificação rápida: Verifica menos portas (100) do que a verificação predefinida (alguns segundos)",
+    "DevDetail_Nmap_buttonSkipDiscovery": "Saltar descoberta do host",
+    "DevDetail_Nmap_buttonSkipDiscovery_text": "Ignorar a descoberta do host (-Pn opção): Verificação padrão sem descoberta do host",
+    "DevDetail_Nmap_resultsLink": "Você pode deixar esta página depois de iniciar uma varredura. Os resultados também estarão disponíveis no arquivo <code>app_front.log</code>.",
+    "DevDetail_Owner_hover": "Quem é o dono deste dispositivo. Campo de texto gratuito.",
+    "DevDetail_Periodselect_All": "Todas as informações",
+    "DevDetail_Periodselect_LastMonth": "Último mês",
+    "DevDetail_Periodselect_LastWeek": "Semana passada",
+    "DevDetail_Periodselect_LastYear": "Ano passado",
+    "DevDetail_Periodselect_today": "Hoje",
+    "DevDetail_Run_Actions_Title": "<i class=\"fa fa-play\"></i> Executar ação no dispositivo",
+    "DevDetail_Run_Actions_Tooltip": "Execute uma ação no dispositivo atual da lista suspensa.",
+    "DevDetail_SessionInfo_FirstSession": "Primeira sessão",
+    "DevDetail_SessionInfo_LastIP": "Último IP",
+    "DevDetail_SessionInfo_LastSession": "Último offline",
+    "DevDetail_SessionInfo_StaticIP": "IP estático",
+    "DevDetail_SessionInfo_Status": "Estado",
+    "DevDetail_SessionInfo_Title": "<i class=\"fa fa-calendar\"></i> Informações de Sessão",
+    "DevDetail_SessionTable_Additionalinfo": "Informações adicionais",
+    "DevDetail_SessionTable_Connection": "Conexão",
+    "DevDetail_SessionTable_Disconnection": "Desconexão",
+    "DevDetail_SessionTable_Duration": "Duração",
+    "DevDetail_SessionTable_IP": "IP",
+    "DevDetail_SessionTable_Order": "Ordem",
+    "DevDetail_Shortcut_CurrentStatus": "Estado atual",
+    "DevDetail_Shortcut_DownAlerts": "Alertas para baixo",
+    "DevDetail_Shortcut_Presence": "Presença",
+    "DevDetail_Shortcut_Sessions": "Sessões",
+    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Detalhes",
+    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Eventos",
+    "DevDetail_Tab_EventsTableDate": "Data",
+    "DevDetail_Tab_EventsTableEvent": "Tipo de evento",
+    "DevDetail_Tab_EventsTableIP": "IP",
+    "DevDetail_Tab_EventsTableInfo": "Informações adicionais",
+    "DevDetail_Tab_Nmap": "<i class=\"fa fa-ethernet\"> </i>",
+    "DevDetail_Tab_NmapEmpty": "Nenhuma porta detectada com Nmap neste dispositivo.",
+    "DevDetail_Tab_NmapTableExtra": "Adicional",
+    "DevDetail_Tab_NmapTableHeader": "Resultados da verificação programada",
+    "DevDetail_Tab_NmapTableIndex": "Índice",
+    "DevDetail_Tab_NmapTablePort": "Porta",
+    "DevDetail_Tab_NmapTableService": "Serviço",
+    "DevDetail_Tab_NmapTableState": "Estado",
+    "DevDetail_Tab_NmapTableText": "Configure uma programação em <a href=\"/settings.php#NMAP_ACTIVE\">Configurações</a>",
+    "DevDetail_Tab_NmapTableTime": "Tempo",
+    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"> </i> Plugins",
+    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Presença",
+    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sessões",
+    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Ferramentas",
+    "DevDetail_Tab_Tools_Internet_Info_Description": "A ferramenta info Internet exibe informações sobre a conexão com a Internet, como endereço IP, cidade, país, código de área e fuso horário.",
+    "DevDetail_Tab_Tools_Internet_Info_Error": "Um erro ocorreu",
+    "DevDetail_Tab_Tools_Internet_Info_Start": "Iniciar informações da Internet",
+    "DevDetail_Tab_Tools_Internet_Info_Title": "Info Internet",
+    "DevDetail_Tab_Tools_Nslookup_Description": "Nslookup é uma ferramenta de linha de comando usada para consultar o Sistema de Nomes de Domínio (DNS). DNS é um sistema que traduz nomes de domínio, como www.google.com, em endereços IP, como 172.217.0.142.",
+    "DevDetail_Tab_Tools_Nslookup_Error": "Erro: O endereço IP não é válido",
+    "DevDetail_Tab_Tools_Nslookup_Start": "Iniciar Nslookup",
+    "DevDetail_Tab_Tools_Nslookup_Title": "Nslookup",
+    "DevDetail_Tab_Tools_Speedtest_Description": "A ferramenta Speedtest mede a velocidade de download, velocidade de upload e latência da conexão de internet.",
+    "DevDetail_Tab_Tools_Speedtest_Start": "Iniciar Speedtest",
+    "DevDetail_Tab_Tools_Speedtest_Title": "Speedtest Online",
+    "DevDetail_Tab_Tools_Traceroute_Description": "Traceroute é um comando de diagnóstico de rede usado para rastrear o caminho que os pacotes de dados levam de um host para outro.<br><br> O comando usa o Protocolo de Mensagem de Controle da Internet (ICMP) para enviar pacotes para nós intermediários na rota, cada nó intermediário responde com um pacote ICMP time-out (TTL timed out) .<br><br> A saída do comando traceroute exibe o endereço IP de cada nó intermediário na rota.<br><br> O comando traceroute pode ser usado para diagnosticar problemas de rede, como atrasos, perda de pacotes e rotas bloqueadas.<br><br> Também pode ser usado para identificar a localização de um nó intermediário em uma rede.",
+    "DevDetail_Tab_Tools_Traceroute_Error": "Erro: O endereço IP não é válido",
+    "DevDetail_Tab_Tools_Traceroute_Start": "Iniciar Traceroute",
+    "DevDetail_Tab_Tools_Traceroute_Title": "Rastreamento",
+    "DevDetail_Tools_WOL": "Enviar comando WoL ",
+    "DevDetail_Tools_WOL_noti": "Wake-on-LAN",
+    "DevDetail_Tools_WOL_noti_text": "O comando Wake-on-LAN é enviado para o endereço de transmissão. Se o alvo não estiver na sub-rede/VLAN do NetAlertX, o dispositivo de destino não responderá.",
+    "DevDetail_Type_hover": "O tipo do dispositivo. Se você selecionar qualquer um dos dispositivos de rede pré-definidos (por exemplo: AP, Firewall, Router, Switch...) eles aparecerão na configuração da árvore de rede como possíveis nós de rede pai.",
+    "DevDetail_Vendor_hover": "O fornecedor deve ser auto-detectado. Você pode substituir ou adicionar seu valor personalizado.",
+    "DevDetail_WOL_Title": "<i class=\"fa fa-power-off\"></i>",
+    "DevDetail_button_AddIcon": "Adicionar novo ícone",
+    "DevDetail_button_AddIcon_Help": "Cole uma tag HTML SVG ou um ícone de tag HTML Font Awesome. Leia a <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/ICONS.md\" target=\"_blank\">documentação sobre ícones</a> para obter detalhes.",
+    "DevDetail_button_AddIcon_Tooltip": "Adicione um novo ícone a este dispositivo que ainda não esteja disponível no menu suspenso.",
+    "DevDetail_button_Delete": "Excluir dispositivo",
+    "DevDetail_button_DeleteEvents": "Excluir eventos",
+    "DevDetail_button_DeleteEvents_Warning": "Tem certeza de que deseja excluir todos os eventos deste dispositivo?<br><br>(isso limpará o <b>Histórico de eventos</b> e as <b>sessões</b> e poderá ajudar com constantes (persistentes) notificações)",
+    "DevDetail_button_OverwriteIcons": "Substituir ícones",
+    "DevDetail_button_OverwriteIcons_Tooltip": "Substituir ícones de todos os dispositivos pelo mesmo tipo de dispositivo",
+    "DevDetail_button_OverwriteIcons_Warning": "Tem certeza de que deseja substituir todos os ícones de todos os dispositivos pelo mesmo tipo de dispositivo do tipo de dispositivo atual?",
+    "DevDetail_button_Reset": "Redefinir alterações",
+    "DevDetail_button_Save": "Salvar",
+    "Device_MultiEdit": "Edição múltipla",
+    "Device_MultiEdit_Backup": "Cuidado, inserir valores errados abaixo interromperá sua configuração. Faça backup do seu banco de dados ou da configuração dos dispositivos primeiro (<a href=\"php/server/devices.php?action=ExportCSV\">clique para baixar <i class=\"fa-solid fa-download fa-bounce\"></i> </a>). Leia como recuperar dispositivos deste arquivo no <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/BACKUPS.md#scenario-2-corrupted-database\" target=\" _blank\">Documentação de backups</a>.",
+    "Device_MultiEdit_Fields": "Editar campos:",
+    "Device_MultiEdit_MassActions": "Ações em massa:",
+    "Device_MultiEdit_Tooltip": "Cuidadoso. Clicar aqui aplicará o valor à esquerda a todos os dispositivos selecionados acima.",
+    "Device_Searchbox": "Procurar",
+    "Device_Shortcut_AllDevices": "Meus dispositivos",
+    "Device_Shortcut_Archived": "Arquivado",
+    "Device_Shortcut_Connected": "Conectado",
+    "Device_Shortcut_Devices": "Dispositivos",
+    "Device_Shortcut_DownAlerts": "Inativo e off-line",
+    "Device_Shortcut_DownOnly": "Inativo",
+    "Device_Shortcut_Favorites": "Favoritos",
+    "Device_Shortcut_NewDevices": "Novos dispositivos",
+    "Device_Shortcut_OnlineChart": "Presença do dispositivo",
+    "Device_TableHead_Connected_Devices": "Conexões",
+    "Device_TableHead_Favorite": "Favorito",
+    "Device_TableHead_FirstSession": "Primeira sessão",
+    "Device_TableHead_GUID": "GUID",
+    "Device_TableHead_Group": "Grupo",
+    "Device_TableHead_Icon": "Ícone",
+    "Device_TableHead_LastIP": "Último IP",
+    "Device_TableHead_LastIPOrder": "Último pedido de IP",
+    "Device_TableHead_LastSession": "Último off-line",
+    "Device_TableHead_Location": "Localização",
+    "Device_TableHead_MAC": "MAC aleatório",
+    "Device_TableHead_MAC_full": "MAC completo",
+    "Device_TableHead_Name": "Nome",
+    "Device_TableHead_NetworkSite": "Site da rede",
+    "Device_TableHead_Owner": "Proprietário",
+    "Device_TableHead_Parent_MAC": "Nó pai MAC",
+    "Device_TableHead_Port": "Porta",
+    "Device_TableHead_RowID": "ID da linha",
+    "Device_TableHead_Rowid": "ID da linha",
+    "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_Status": "Status",
+    "Device_TableHead_SyncHubNodeName": "Nó de sincronização",
+    "Device_TableHead_Type": "Tipo",
+    "Device_TableHead_Vendor": "Fornecedor",
+    "Device_Table_Not_Network_Device": "Não configurado como um dispositivo de rede",
+    "Device_Table_info": "Mostrando _START_ de _END_ do _TOTAL_ entradas",
+    "Device_Table_nav_next": "Próximo",
+    "Device_Table_nav_prev": "Anterior",
+    "Device_Tablelenght": "Mostrar entradas do _MENU_",
+    "Device_Tablelenght_all": "Todos",
+    "Device_Title": "Dispositivos",
+    "Donations_Others": "Outros",
+    "Donations_Platforms": "Plataformas de patrocinadores",
+    "Donations_Text": "Ei 👋! </br> Obrigado por clicar neste item de menu 😅 </br> </br> Estou tentando coletar algumas doações para melhorar o software. Além disso, isso me ajudaria a não ficar exausto, para que eu pudesse oferecer suporte a este aplicativo por mais tempo. Qualquer pequeno patrocínio (recorrente ou não) me faz querer colocar mais esforço neste aplicativo. </br> Eu adoraria encurtar minha semana de trabalho e no tempo restante focar totalmente no NetAlertX. Você obteria mais funcionalidades, um aplicativo mais sofisticado e menos bugs. </br> </br> Obrigado pela leitura - sou grato por qualquer apoio ❤🙏 </br> </br> TL;DR: Ao me apoiar, você obtém: </br> </br> <ul> <li>Atualizações regulares para manter seus dados e sua família seguros 🔄</li><li>Menos bugs 🐛🔫</li><li>Melhor e mais funcionalidade➕</li><li>Eu não fico exausto 🔥🤯</li><li>Lançamentos menos apressados 💨</li><li>Documentos melhores📚</li><li>Suporte melhor e mais rápido com problemas 🆘</li></ul> </br> 📧 Envie-me um e-mail para <a href='mailto:jokob@duck.com?subject=NetAlertX'>jokob@duck.com</a> se quiser entrar em contato ou se devo adicionar outras plataformas de patrocínio. </br>",
+    "Donations_Title": "Doações",
+    "ENABLE_PLUGINS_description": "Ativa a funcionalidade de <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins\">plugins</a>. Carregar plug-ins requer mais recursos de hardware, então você pode querer desativá-los em sistemas de baixa potência.",
+    "ENABLE_PLUGINS_name": "Habilitar plug-ins",
+    "Email_display_name": "Email",
+    "Email_icon": "<i class=\"fa fa-at\"></i>",
+    "Events_Loading": "Carregando...",
+    "Events_Periodselect_All": "Todas as informações",
+    "Events_Periodselect_LastMonth": "Mês passado",
+    "Events_Periodselect_LastWeek": "Semana passada",
+    "Events_Periodselect_LastYear": "Ano passado",
+    "Events_Periodselect_today": "Hoje",
+    "Events_Searchbox": "Procurar",
+    "Events_Shortcut_AllEvents": "Todos os eventos",
+    "Events_Shortcut_DownAlerts": "Alertas de queda",
+    "Events_Shortcut_Events": "Eventos",
+    "Events_Shortcut_MissSessions": "Sessões ausentes",
+    "Events_Shortcut_NewDevices": "Novos dispositivos",
+    "Events_Shortcut_Sessions": "Sessões",
+    "Events_Shortcut_VoidSessions": "Sessões anuladas",
+    "Events_TableHead_AdditionalInfo": "Informação adicional",
+    "Events_TableHead_Connection": "Conexão",
+    "Events_TableHead_Date": "Data",
+    "Events_TableHead_Device": "Dispositivo",
+    "Events_TableHead_Disconnection": "Desconexão",
+    "Events_TableHead_Duration": "Duração",
+    "Events_TableHead_DurationOrder": "Duração do pedido",
+    "Events_TableHead_EventType": "Tipo de evento",
+    "Events_TableHead_IP": "IP",
+    "Events_TableHead_IPOrder": "Pedido de IP",
+    "Events_TableHead_Order": "Ordem",
+    "Events_TableHead_Owner": "Proprietário",
+    "Events_TableHead_PendingAlert": "Alerta Pendente",
+    "Events_Table_info": "Mostrando_START_ to _END_ of _TOTAL_ entradas",
+    "Events_Table_nav_next": "Próxima",
+    "Events_Table_nav_prev": "Anterior",
+    "Events_Tablelenght": "Mostrar entradas do _MENU_",
+    "Events_Tablelenght_all": "Todos",
+    "Events_Title": "Eventos",
+    "Gen_Action": "Ação",
+    "Gen_Add": "Adicionar",
+    "Gen_Add_All": "Adicionar todos",
+    "Gen_All_Devices": "Todos os Dispositivos",
+    "Gen_AreYouSure": "Tem certeza?",
+    "Gen_Backup": "Executar backup",
+    "Gen_Cancel": "Cancelar",
+    "Gen_Change": "",
+    "Gen_Copy": "Executar",
+    "Gen_DataUpdatedUITakesTime": "OK - Pode levar um tempo para a interface do usuário ser atualizada se uma verificação estiver em execução.",
+    "Gen_Delete": "Excluir",
+    "Gen_DeleteAll": "Excluir todos",
+    "Gen_Error": "Erro",
+    "Gen_Filter": "Filtro",
+    "Gen_LockedDB": "ERRO - O banco de dados pode estar bloqueado - Verifique F12 Ferramentas de desenvolvimento -> Console ou tente mais tarde.",
+    "Gen_Offline": "Offline",
+    "Gen_Okay": "Ok",
+    "Gen_Purge": "Purge",
+    "Gen_ReadDocs": "Leia mais em documentos.",
+    "Gen_Remove_All": "Remover tudo",
+    "Gen_Remove_Last": "Remover o último",
+    "Gen_Restore": "Executar restauração",
+    "Gen_Run": "Executar",
+    "Gen_Save": "Salvar",
+    "Gen_Saved": "Salvo",
+    "Gen_Search": "Procurar",
+    "Gen_SelectToPreview": "",
+    "Gen_Selected_Devices": "Dispositivos selecionados:",
+    "Gen_Switch": "Trocar",
+    "Gen_Upd": "Atualizado com sucesso",
+    "Gen_Upd_Fail": "A atualização falhou",
+    "Gen_Update": "Atualizar",
+    "Gen_Update_Value": "Atualizar valor",
+    "Gen_Warning": "Aviso",
+    "Gen_Work_In_Progress": "Trabalho em andamento, um bom momento para enviar feedback em https://github.com/jokob-sk/NetAlertX/issues",
+    "General_display_name": "Geral",
+    "General_icon": "<i class=\"fa fa-gears\"></i>",
+    "HRS_TO_KEEP_NEWDEV_description": "Esta é uma configuração de manutenção. Se habilitada (<code>0</code> is disabled), dispositivos marcados como <b>Novo Dispositivo</b> serão excluídos se o tempo de <b>Primeira Sessão</b> for mais antigo que as horas especificadas nesta configuração. Use esta configuração se quiser excluir automaticamente <b>Novos Dispositivos</b> após <code>X</code> horas.",
+    "HRS_TO_KEEP_NEWDEV_name": "Manter novos dispositivos por",
+    "HelpFAQ_Cat_Detail": "Detalhes",
+    "HelpFAQ_Cat_Detail_300_head": "O que significa ",
+    "HelpFAQ_Cat_Detail_300_text_a": "Significa um dispositivo de rede (um dispositivo do tipo AP, Gateway, Firewall, Hypervisor, Powerline, Switch, WLAN, PLC, Roteador, Adaptador LAN USB, Adaptador Wi-Fi USB ou Internet). Tipos personalizados podem ser adicionados através da configuração <code>NETWORK_DEVICE_TYPES</code>.",
+    "HelpFAQ_Cat_Detail_300_text_b": "Indica o número da porta onde o dispositivo atualmente em edição está conectado a este dispositivo de rede. Leia <a target='_blank' href='https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md'>este guia</a> para mais informações.",
+    "HelpFAQ_Cat_Detail_301_head_a": "Quando está escaneando agora? ",
     "HelpFAQ_Cat_Detail_301_head_b": "",
-    "HelpFAQ_Cat_Detail_301_text": "",
+    "HelpFAQ_Cat_Detail_301_text": "O intervalo de tempo entre as verificações é definido pelo 'Cronjob', que está configurado para 5min por padrão. A designação '1min' refere-se à duração esperada da verificação. Dependendo da configuração da rede, esse tempo pode variar. Para editar o cronjob, você pode usar o seguinte comando no terminal/console <span class='text-danger help_faq_code'>crontab -e</span> e alterar o intervalo.",
     "HelpFAQ_Cat_Detail_302_head_a": "",
-    "HelpFAQ_Cat_Detail_302_head_b": "",
-    "HelpFAQ_Cat_Detail_302_text": "",
-    "HelpFAQ_Cat_Detail_303_head": "",
-    "HelpFAQ_Cat_Detail_303_text": "",
-    "HelpFAQ_Cat_Device_200_head": "",
-    "HelpFAQ_Cat_Device_200_text": "",
-    "HelpFAQ_Cat_General": "",
-    "HelpFAQ_Cat_General_100_head": "",
-    "HelpFAQ_Cat_General_100_text_a": "",
-    "HelpFAQ_Cat_General_100_text_b": "",
-    "HelpFAQ_Cat_General_100_text_c": "",
-    "HelpFAQ_Cat_General_101_head": "",
+    "HelpFAQ_Cat_Detail_302_head_b": "E por que não posso selecionar isso?",
+    "HelpFAQ_Cat_Detail_302_text": "Alguns dispositivos modernos geram endereços MAC aleatórios por razões de privacidade, que não podem mais ser associados a nenhum fabricante e que mudam a cada nova conexão. O NetAlertX detecta se é um endereço MAC aleatório e ativa este 'campo' automaticamente. Para desativar esse comportamento, você deve verificar no seu dispositivo como desativar a randomização do endereço MAC.",
+    "HelpFAQ_Cat_Detail_303_head": "O que é o Nmap e para que serve?",
+    "HelpFAQ_Cat_Detail_303_text": "Nmap é um scanner de rede com múltiplas capacidades.<br>Quando um novo dispositivo aparece na sua lista, você tem a possibilidade de obter informações mais detalhadas sobre o dispositivo através da varredura do Nmap.",
+    "HelpFAQ_Cat_Device_200_head": "Eu tenho dispositivos na minha lista dos quais não sei nada. Após excluí-los, eles sempre reaparecem.",
+    "HelpFAQ_Cat_Device_200_text": "Se você usar o Pi-hole, observe que o NetAlertX recupera informações do Pi-hole. Pause o NetAlertX, vá até a página de configurações no Pi-hole e exclua o lease DHCP, se necessário. Em seguida, também no Pi-hole, vá em Ferramentas -> Rede para ver se consegue encontrar os hosts recorrentes lá. Se encontrar, exclua-os também. Agora você pode iniciar o NetAlertX novamente. Os dispositivos não devem mais aparecer.",
+    "HelpFAQ_Cat_General": "Geral",
+    "HelpFAQ_Cat_General_100_head": "O relógio no canto superior direito e os horários dos eventos/presença não estão corretos (diferença de horário).",
+    "HelpFAQ_Cat_General_100_text_a": "No seu PC, o seguinte fuso horário está configurado para o ambiente PHP:",
+    "HelpFAQ_Cat_General_100_text_b": "Se este não for o fuso horário em que você está, você deve alterar o fuso horário no arquivo de configuração do PHP. Você pode encontrá-lo neste diretório:",
+    "HelpFAQ_Cat_General_100_text_c": "Pesquise neste arquivo pela entrada \"date.timezone\", remova o ponto e vírgula inicial \";\" se necessário, e insira o fuso horário desejado. Uma lista com os fusos horários suportados pode ser encontrada aqui (<a href='https://www.php.net/manual/en/timezones.php' target='blank'>Link</a>)",
+    "HelpFAQ_Cat_General_101_head": "Minha rede parece estar lenta, o streaming fica \"congelado\".",
     "HelpFAQ_Cat_General_101_text": "",
     "HelpFAQ_Cat_General_102_head": "",
     "HelpFAQ_Cat_General_102_text": "",
@@ -347,6 +351,7 @@
     "Loading": "",
     "Login_Box": "",
     "Login_Default_PWD": "",
+    "Login_Info": "",
     "Login_Psw-box": "",
     "Login_Psw_alert": "",
     "Login_Psw_folder": "",
@@ -527,6 +532,7 @@
     "Plugins_DeleteAll": "",
     "Plugins_Filters_Mac": "",
     "Plugins_History": "",
+    "Plugins_Obj_DeleteListed": "",
     "Plugins_Objects": "",
     "Plugins_Out_of": "",
     "Plugins_Unprocessed_Events": "",
@@ -556,6 +562,7 @@
     "RandomMAC_hover": "",
     "Reports_Sent_Log": "",
     "SCAN_SUBNETS_description": "",
+    "SCAN_SUBNETS_name": "",
     "SYSTEM_TITLE": "",
     "Setting_Override": "",
     "Setting_Override_Description": "",
@@ -654,6 +661,8 @@
     "UI_PRESENCE_name": "",
     "UI_REFRESH_description": "",
     "UI_REFRESH_name": "",
+    "VERSION_description": "",
+    "VERSION_name": "",
     "devices_old": "",
     "general_event_description": "",
     "general_event_title": "",

front/php/templates/language/ru_ru.json

@@ -56,6 +56,8 @@
     "BackDevices_Restore_okay": "Восстановление выполнено успешно.",
     "BackDevices_darkmode_disabled": "Темный режим отключен",
     "BackDevices_darkmode_enabled": "Темный режим включен",
+    "CLEAR_NEW_FLAG_description": "",
+    "CLEAR_NEW_FLAG_name": "",
     "DAYS_TO_KEEP_EVENTS_description": "Это настройка обслуживания. Здесь указывается количество дней, в течение которых будут храниться записи о событиях. Все старые события будут периодически удаляться. Также применимо к истории событий плагина.",
     "DAYS_TO_KEEP_EVENTS_name": "Удалить события старше",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Скопировать данные с устройства",
@@ -274,6 +276,7 @@
     "Gen_AreYouSure": "Вы уверены?",
     "Gen_Backup": "Запустить резервное копирование",
     "Gen_Cancel": "Отмена",
+    "Gen_Change": "Изменить",
     "Gen_Copy": "Запустить",
     "Gen_DataUpdatedUITakesTime": "ОК - Обновление UI может занять некоторое время, если сканирование выполняется.",
     "Gen_Delete": "Удалить",
@@ -292,6 +295,7 @@
     "Gen_Save": "Сохранить",
     "Gen_Saved": "Сохранено",
     "Gen_Search": "Поиск",
+    "Gen_SelectToPreview": "",
     "Gen_Selected_Devices": "Выбранные устройства:",
     "Gen_Switch": "Переключить",
     "Gen_Upd": "Успешное обновление",
@@ -347,6 +351,7 @@
     "Loading": "Загрузка...",
     "Login_Box": "Введите пароль",
     "Login_Default_PWD": "Пароль по умолчанию «123456» все еще активен.",
+    "Login_Info": "",
     "Login_Psw-box": "Пароль",
     "Login_Psw_alert": "Предупреждение о пароле!",
     "Login_Psw_folder": "в папке конфигурации.",
@@ -370,11 +375,11 @@
     "Maintenance_Tool_ExportCSV_text": "Создайте файл CSV (значения, разделенные запятыми), содержащий список устройств, включая сетевые отношения между сетевыми узлами и подключенными устройствами. Вы также можете открыть этот URL-адрес <code> URL Вашего NetAlertX/php/server/devices.php?action=ExportCSV</code> или включить плагин <a href=\"settings.php#CSVBCKP_header\">Резервное копирование в CSV</a>.",
     "Maintenance_Tool_ImportCSV": "CSV Импорт",
     "Maintenance_Tool_ImportCSV_noti": "CSV Импорт",
-    "Maintenance_Tool_ImportCSV_noti_text": "Вы уверены, что хотите импортировать файл CSV? Это полностью перезапишет устройства в вашей базе данных.",
+    "Maintenance_Tool_ImportCSV_noti_text": "Вы уверены, что хотите импортировать файл CSV? Это полностью <b>перезапишет</b> устройства в вашей базе данных.",
     "Maintenance_Tool_ImportCSV_text": "Прежде чем использовать эту функцию, сделайте резервную копию. Импортируйте файл CSV (значения, разделенные запятыми), содержащий список устройств, включая сетевые отношения между сетевыми узлами и подключенными устройствами. Для этого поместите файл CSV с именем <b>devices.csv</b> в папку <b>/config</b>.",
-    "Maintenance_Tool_ImportPastedCSV": "",
-    "Maintenance_Tool_ImportPastedCSV_noti_text": "",
-    "Maintenance_Tool_ImportPastedCSV_text": "",
+    "Maintenance_Tool_ImportPastedCSV": "Импорт CSV (вставка)",
+    "Maintenance_Tool_ImportPastedCSV_noti_text": "Вы уверены, что хотите импортировать вставленный CSV? Это полностью <b>перезапишет</b> устройства в вашей базе данных.",
+    "Maintenance_Tool_ImportPastedCSV_text": "Перед использованием этой функции, пожалуйста, создайте резервную копию. Импортируйте файл формата CSV (значения, разделенные запятыми), содержащий список устройств, включая сетевые связи между узлами сети и подключенными устройствами.",
     "Maintenance_Tool_arpscansw": "Переключить arp-скан (ВКЛ./ВЫКЛ.)",
     "Maintenance_Tool_arpscansw_noti": "Включить или выключить arp-скан",
     "Maintenance_Tool_arpscansw_noti_text": "Когда сканирование было выключено, оно остается выключенным до тех пор, пока не будет активировано снова.",
@@ -416,7 +421,7 @@
     "Maintenance_Tool_del_unknowndev_text": "Прежде чем использовать эту функцию, сделайте резервную копию. Удаление невозможно отменить. Все названные устройства (неизвестные) будут удалены из базы данных.",
     "Maintenance_Tool_displayed_columns_text": "Измените видимость и порядок столбцов на странице <a href=\"devices.php\"><b> <i class=\"fa fa-laptop\"></i> Устройства</b></a>.",
     "Maintenance_Tool_drag_me": "Перетащите элемент, чтобы изменить порядок столбцов.",
-    "Maintenance_Tool_order_columns_text": "",
+    "Maintenance_Tool_order_columns_text": "Maintenance_Tool_order_columns_text",
     "Maintenance_Tool_purgebackup": "Очистить резервные копии",
     "Maintenance_Tool_purgebackup_noti": "Очистить резервные копии",
     "Maintenance_Tool_purgebackup_noti_text": "Вы уверены, что хотите удалить все резервные копии, кроме трех последних?",
@@ -527,6 +532,7 @@
     "Plugins_DeleteAll": "Удалить все (фильтры игнорируются)",
     "Plugins_Filters_Mac": "Фильтр MAC-адреса",
     "Plugins_History": "История событий",
+    "Plugins_Obj_DeleteListed": "",
     "Plugins_Objects": "Объекты плагина",
     "Plugins_Out_of": "из",
     "Plugins_Unprocessed_Events": "Необработанные события",
@@ -556,6 +562,7 @@
     "RandomMAC_hover": "Автоматически обнаружено — указывает, рандомизирует ли устройство свой MAC-адрес.",
     "Reports_Sent_Log": "Отправить журнал логов",
     "SCAN_SUBNETS_description": "Большинство сетевых сканеров (ARP-SCAN, NMAP, NSLOOKUP, DIG, PHOLUS) полагаются на сканирование определенных сетевых интерфейсов и подсетей. Дополнительную информацию по этому параметру можно найти в <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/SUBNETS.md\" target=\"_blank\">документации по подсетям</a>, особенно VLAN, какие VLAN поддерживаются или как разобраться в маске сети и своем интерфейсе. <br/> <br/> Альтернативой сетевым сканерам является включение некоторых других сканеров/импортеров устройств, которые не полагаются на NetAlert<sup>X</sup>, имеющий доступ к сети (UNIFI, dhcp.leases , PiHole и др.). <br/> <br/> Примечание. Само время сканирования зависит от количества проверяемых IP-адресов, поэтому тщательно настройте его, указав соответствующую маску сети и интерфейс.",
+    "SCAN_SUBNETS_name": "",
     "SYSTEM_TITLE": "Системная информация",
     "Setting_Override": "Переопределить значение",
     "Setting_Override_Description": "Включение этой опции приведет к переопределению значения по умолчанию, предоставленного приложением, на значение, указанное выше.",
@@ -654,6 +661,8 @@
     "UI_PRESENCE_name": "Показать в диаграмме присутствия",
     "UI_REFRESH_description": "Введите количество секунд, по истечении которых пользовательский интерфейс перезагружается. Установите значение <code>0</code>, чтобы отключить.",
     "UI_REFRESH_name": "Автоматическое обновление интерфейса",
+    "VERSION_description": "Вспомогательное значение версии или метки времени, позволяющее проверить, было ли приложение обновлено.",
+    "VERSION_name": "Версия или временная метка",
     "devices_old": "Актуализируется...",
     "general_event_description": "Событие, которое вы инициировали, может занять некоторое время, прежде чем фоновые процессы завершатся. Выполнение завершится, как только очередь выполнения, указанная ниже, опустеет (Проверьте <a href='/maintenance.php#tab_Logging'>журнал ошибок</a> при возникновении проблем). <br/> <br/>· · Очередь выполнения:",
     "general_event_title": "Выполнение специального события",
@@ -690,4 +699,4 @@
     "settings_update_item_warning": "Обновить значение ниже. Будьте осторожны, следуя предыдущему формату. <b>Проверка не выполняется.</b>",
     "test_event_icon": "fa-vial-circle-check",
     "test_event_tooltip": "Сначала сохраните изменения, прежде чем проверять настройки."
-}
+}

front/php/templates/language/tr_tr.json

@@ -4,14 +4,14 @@
     "API_display_name": "",
     "API_icon": "",
     "About_Design": "",
-    "About_Exit": "",
+    "About_Exit": "Oturum kapat",
     "About_Title": "",
     "AppEvents_DateTimeCreated": "",
-    "AppEvents_Extra": "",
+    "AppEvents_Extra": "Ekstra",
     "AppEvents_GUID": "",
-    "AppEvents_Helper1": "",
-    "AppEvents_Helper2": "",
-    "AppEvents_Helper3": "",
+    "AppEvents_Helper1": "Yardımcı 1",
+    "AppEvents_Helper2": "Yardımcı 2",
+    "AppEvents_Helper3": "Yardımcı 3",
     "AppEvents_ObjectForeignKey": "",
     "AppEvents_ObjectIndex": "",
     "AppEvents_ObjectIsArchived": "",
@@ -24,38 +24,40 @@
     "AppEvents_ObjectType": "",
     "AppEvents_Plugin": "",
     "AppEvents_Type": "",
-    "BackDevDetail_Actions_Ask_Run": "",
+    "BackDevDetail_Actions_Ask_Run": "Komutları çalıştırmak istiyor musunuz?",
     "BackDevDetail_Actions_Not_Registered": "",
-    "BackDevDetail_Actions_Title_Run": "",
+    "BackDevDetail_Actions_Title_Run": "Komutu çalıştır",
     "BackDevDetail_Copy_Ask": "",
-    "BackDevDetail_Copy_Title": "",
-    "BackDevDetail_Tools_WOL_error": "",
-    "BackDevDetail_Tools_WOL_okay": "",
+    "BackDevDetail_Copy_Title": "Ayrıntıları kopyala",
+    "BackDevDetail_Tools_WOL_error": "Komut çalıştırılmadı.",
+    "BackDevDetail_Tools_WOL_okay": "Komut çalıştırıldı.",
     "BackDevices_Arpscan_disabled": "",
     "BackDevices_Arpscan_enabled": "",
     "BackDevices_Backup_CopError": "",
     "BackDevices_Backup_Failed": "",
     "BackDevices_Backup_okay": "",
-    "BackDevices_DBTools_DelDevError_a": "",
-    "BackDevices_DBTools_DelDevError_b": "",
-    "BackDevices_DBTools_DelDev_a": "",
-    "BackDevices_DBTools_DelDev_b": "",
+    "BackDevices_DBTools_DelDevError_a": "Cihaz silinirken hata oluştu",
+    "BackDevices_DBTools_DelDevError_b": "Cihazlar silinirken hata oluştu",
+    "BackDevices_DBTools_DelDev_a": "Cihaz silindi",
+    "BackDevices_DBTools_DelDev_b": "Cihazlar silindi",
     "BackDevices_DBTools_DelEvents": "",
     "BackDevices_DBTools_DelEventsError": "",
     "BackDevices_DBTools_ImportCSV": "",
     "BackDevices_DBTools_ImportCSVError": "",
     "BackDevices_DBTools_ImportCSVMissing": "",
     "BackDevices_DBTools_Purge": "",
-    "BackDevices_DBTools_UpdDev": "",
-    "BackDevices_DBTools_UpdDevError": "",
-    "BackDevices_DBTools_Upgrade": "",
-    "BackDevices_DBTools_UpgradeError": "",
-    "BackDevices_Device_UpdDevError": "",
+    "BackDevices_DBTools_UpdDev": "Cihaz başarılı bir şekilde güncellendi",
+    "BackDevices_DBTools_UpdDevError": "Cihaz güncellenirken hata oluştu",
+    "BackDevices_DBTools_Upgrade": "Veritabanı başarılı bir şekilde güncellendi",
+    "BackDevices_DBTools_UpgradeError": "Veritabanı güncellenemedi",
+    "BackDevices_Device_UpdDevError": "Cihazlar güncellenirken hata oluştu, daha sonra tekrar deneyiz. Veritabanı, devam eden bir komut nedeniyle kilitli olabilir.",
     "BackDevices_Restore_CopError": "",
     "BackDevices_Restore_Failed": "",
     "BackDevices_Restore_okay": "",
     "BackDevices_darkmode_disabled": "",
     "BackDevices_darkmode_enabled": "",
+    "CLEAR_NEW_FLAG_description": "",
+    "CLEAR_NEW_FLAG_name": "",
     "DAYS_TO_KEEP_EVENTS_description": "",
     "DAYS_TO_KEEP_EVENTS_name": "",
     "DevDetail_Copy_Device_Title": "",
@@ -63,7 +65,7 @@
     "DevDetail_EveandAl_AlertAllEvents": "",
     "DevDetail_EveandAl_AlertDown": "",
     "DevDetail_EveandAl_Archived": "",
-    "DevDetail_EveandAl_NewDevice": "",
+    "DevDetail_EveandAl_NewDevice": "Yeni Cihaz",
     "DevDetail_EveandAl_NewDevice_Tooltip": "",
     "DevDetail_EveandAl_RandomMAC": "",
     "DevDetail_EveandAl_ScanCycle": "",
@@ -75,17 +77,17 @@
     "DevDetail_GoToNetworkNode": "",
     "DevDetail_Icon": "",
     "DevDetail_Icon_Descr": "",
-    "DevDetail_Loading": "",
-    "DevDetail_MainInfo_Comments": "",
+    "DevDetail_Loading": "YÜkleniyor...",
+    "DevDetail_MainInfo_Comments": "Yorumlar",
     "DevDetail_MainInfo_Favorite": "",
-    "DevDetail_MainInfo_Group": "",
-    "DevDetail_MainInfo_Location": "",
-    "DevDetail_MainInfo_Name": "",
+    "DevDetail_MainInfo_Group": "Grup",
+    "DevDetail_MainInfo_Location": "Konum",
+    "DevDetail_MainInfo_Name": "İsim",
     "DevDetail_MainInfo_Network": "",
     "DevDetail_MainInfo_Network_Port": "",
     "DevDetail_MainInfo_Network_Site": "",
     "DevDetail_MainInfo_Network_Title": "",
-    "DevDetail_MainInfo_Owner": "",
+    "DevDetail_MainInfo_Owner": "Sahip",
     "DevDetail_MainInfo_SSID": "",
     "DevDetail_MainInfo_Title": "",
     "DevDetail_MainInfo_Type": "",
@@ -97,70 +99,70 @@
     "DevDetail_Nmap_Scans_desc": "",
     "DevDetail_Nmap_buttonDefault": "",
     "DevDetail_Nmap_buttonDefault_text": "",
-    "DevDetail_Nmap_buttonDetail": "",
+    "DevDetail_Nmap_buttonDetail": "Detaylı Tarama",
     "DevDetail_Nmap_buttonDetail_text": "",
-    "DevDetail_Nmap_buttonFast": "",
+    "DevDetail_Nmap_buttonFast": "Hızlı Tarama",
     "DevDetail_Nmap_buttonFast_text": "",
     "DevDetail_Nmap_buttonSkipDiscovery": "",
     "DevDetail_Nmap_buttonSkipDiscovery_text": "",
-    "DevDetail_Nmap_resultsLink": "",
+    "DevDetail_Nmap_resultsLink": "Tarama başlattıktan sonra bu sayfadan çıkabilirsiniz. Sonuçlara <code>app_front.log</code> dosyasından da ulaşılabilir.",
     "DevDetail_Owner_hover": "",
-    "DevDetail_Periodselect_All": "",
-    "DevDetail_Periodselect_LastMonth": "",
-    "DevDetail_Periodselect_LastWeek": "",
-    "DevDetail_Periodselect_LastYear": "",
-    "DevDetail_Periodselect_today": "",
-    "DevDetail_Run_Actions_Title": "",
+    "DevDetail_Periodselect_All": "Tüm Bilgi",
+    "DevDetail_Periodselect_LastMonth": "Geçen Ay",
+    "DevDetail_Periodselect_LastWeek": "Geçen Hafta",
+    "DevDetail_Periodselect_LastYear": "Geçen Yıl",
+    "DevDetail_Periodselect_today": "Bugün",
+    "DevDetail_Run_Actions_Title": "<i class=\"fa fa-play\"></i>Komutu cihazda çalıştır",
     "DevDetail_Run_Actions_Tooltip": "",
-    "DevDetail_SessionInfo_FirstSession": "",
-    "DevDetail_SessionInfo_LastIP": "",
+    "DevDetail_SessionInfo_FirstSession": "İlk Oturum",
+    "DevDetail_SessionInfo_LastIP": "Son IP",
     "DevDetail_SessionInfo_LastSession": "",
     "DevDetail_SessionInfo_StaticIP": "",
-    "DevDetail_SessionInfo_Status": "",
-    "DevDetail_SessionInfo_Title": "",
-    "DevDetail_SessionTable_Additionalinfo": "",
-    "DevDetail_SessionTable_Connection": "",
+    "DevDetail_SessionInfo_Status": "Durum",
+    "DevDetail_SessionInfo_Title": "<i class=\"fa fa-calendar\"></i> Oturum Bİlgisi",
+    "DevDetail_SessionTable_Additionalinfo": "Ek bilgi",
+    "DevDetail_SessionTable_Connection": "Bağlantı",
     "DevDetail_SessionTable_Disconnection": "",
-    "DevDetail_SessionTable_Duration": "",
-    "DevDetail_SessionTable_IP": "",
-    "DevDetail_SessionTable_Order": "",
-    "DevDetail_Shortcut_CurrentStatus": "",
+    "DevDetail_SessionTable_Duration": "Süre",
+    "DevDetail_SessionTable_IP": "IP",
+    "DevDetail_SessionTable_Order": "Sıra",
+    "DevDetail_Shortcut_CurrentStatus": "Mevcut Durum",
     "DevDetail_Shortcut_DownAlerts": "",
     "DevDetail_Shortcut_Presence": "",
-    "DevDetail_Shortcut_Sessions": "",
-    "DevDetail_Tab_Details": "",
+    "DevDetail_Shortcut_Sessions": "Oturumlar",
+    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Detaylar",
     "DevDetail_Tab_Events": "",
-    "DevDetail_Tab_EventsTableDate": "",
+    "DevDetail_Tab_EventsTableDate": "Tarih",
     "DevDetail_Tab_EventsTableEvent": "",
-    "DevDetail_Tab_EventsTableIP": "",
-    "DevDetail_Tab_EventsTableInfo": "",
+    "DevDetail_Tab_EventsTableIP": "IP",
+    "DevDetail_Tab_EventsTableInfo": "Ek bilgi",
     "DevDetail_Tab_Nmap": "",
     "DevDetail_Tab_NmapEmpty": "",
-    "DevDetail_Tab_NmapTableExtra": "",
-    "DevDetail_Tab_NmapTableHeader": "",
+    "DevDetail_Tab_NmapTableExtra": "Ekstra",
+    "DevDetail_Tab_NmapTableHeader": "Planlanmış tarama sonuçları",
     "DevDetail_Tab_NmapTableIndex": "",
     "DevDetail_Tab_NmapTablePort": "",
     "DevDetail_Tab_NmapTableService": "",
     "DevDetail_Tab_NmapTableState": "",
     "DevDetail_Tab_NmapTableText": "",
-    "DevDetail_Tab_NmapTableTime": "",
+    "DevDetail_Tab_NmapTableTime": "Zaman",
     "DevDetail_Tab_Plugins": "",
     "DevDetail_Tab_Presence": "",
-    "DevDetail_Tab_Sessions": "",
+    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Oturumlar",
     "DevDetail_Tab_Tools": "",
     "DevDetail_Tab_Tools_Internet_Info_Description": "",
-    "DevDetail_Tab_Tools_Internet_Info_Error": "",
+    "DevDetail_Tab_Tools_Internet_Info_Error": "Bir hata oluştu",
     "DevDetail_Tab_Tools_Internet_Info_Start": "",
     "DevDetail_Tab_Tools_Internet_Info_Title": "",
     "DevDetail_Tab_Tools_Nslookup_Description": "",
-    "DevDetail_Tab_Tools_Nslookup_Error": "",
+    "DevDetail_Tab_Tools_Nslookup_Error": "Hata: Geçersiz IP adresi.",
     "DevDetail_Tab_Tools_Nslookup_Start": "",
     "DevDetail_Tab_Tools_Nslookup_Title": "",
     "DevDetail_Tab_Tools_Speedtest_Description": "",
     "DevDetail_Tab_Tools_Speedtest_Start": "",
     "DevDetail_Tab_Tools_Speedtest_Title": "",
     "DevDetail_Tab_Tools_Traceroute_Description": "",
-    "DevDetail_Tab_Tools_Traceroute_Error": "",
+    "DevDetail_Tab_Tools_Traceroute_Error": "Hata: Geçersiz IP adresi",
     "DevDetail_Tab_Tools_Traceroute_Start": "",
     "DevDetail_Tab_Tools_Traceroute_Title": "",
     "DevDetail_Tools_WOL": "",
@@ -169,45 +171,45 @@
     "DevDetail_Type_hover": "",
     "DevDetail_Vendor_hover": "",
     "DevDetail_WOL_Title": "",
-    "DevDetail_button_AddIcon": "",
+    "DevDetail_button_AddIcon": "Yeni İkon Ekle",
     "DevDetail_button_AddIcon_Help": "",
     "DevDetail_button_AddIcon_Tooltip": "",
-    "DevDetail_button_Delete": "",
+    "DevDetail_button_Delete": "Cihazı Sil",
     "DevDetail_button_DeleteEvents": "",
     "DevDetail_button_DeleteEvents_Warning": "",
     "DevDetail_button_OverwriteIcons": "",
     "DevDetail_button_OverwriteIcons_Tooltip": "",
     "DevDetail_button_OverwriteIcons_Warning": "",
-    "DevDetail_button_Reset": "",
-    "DevDetail_button_Save": "",
+    "DevDetail_button_Reset": "Değişiklikleri Sıfırla",
+    "DevDetail_button_Save": "Kaydet",
     "Device_MultiEdit": "",
     "Device_MultiEdit_Backup": "",
     "Device_MultiEdit_Fields": "",
-    "Device_MultiEdit_MassActions": "",
+    "Device_MultiEdit_MassActions": "Toplu komutlar:",
     "Device_MultiEdit_Tooltip": "",
     "Device_Searchbox": "",
-    "Device_Shortcut_AllDevices": "",
+    "Device_Shortcut_AllDevices": "Cihazlarım",
     "Device_Shortcut_Archived": "",
-    "Device_Shortcut_Connected": "",
-    "Device_Shortcut_Devices": "",
+    "Device_Shortcut_Connected": "Bağlandı",
+    "Device_Shortcut_Devices": "Cihazlar",
     "Device_Shortcut_DownAlerts": "",
     "Device_Shortcut_DownOnly": "",
-    "Device_Shortcut_Favorites": "",
-    "Device_Shortcut_NewDevices": "",
+    "Device_Shortcut_Favorites": "Favoriler",
+    "Device_Shortcut_NewDevices": "Yeni Cİhazlar",
     "Device_Shortcut_OnlineChart": "",
-    "Device_TableHead_Connected_Devices": "",
+    "Device_TableHead_Connected_Devices": "Bağlantılar",
     "Device_TableHead_Favorite": "",
-    "Device_TableHead_FirstSession": "",
+    "Device_TableHead_FirstSession": "İlk Oturum",
     "Device_TableHead_GUID": "",
-    "Device_TableHead_Group": "",
+    "Device_TableHead_Group": "Grup",
     "Device_TableHead_Icon": "",
     "Device_TableHead_LastIP": "",
     "Device_TableHead_LastIPOrder": "",
     "Device_TableHead_LastSession": "",
-    "Device_TableHead_Location": "",
+    "Device_TableHead_Location": "Konum",
     "Device_TableHead_MAC": "",
     "Device_TableHead_MAC_full": "",
-    "Device_TableHead_Name": "",
+    "Device_TableHead_Name": "İsim",
     "Device_TableHead_NetworkSite": "",
     "Device_TableHead_Owner": "",
     "Device_TableHead_Parent_MAC": "",
@@ -215,96 +217,98 @@
     "Device_TableHead_RowID": "",
     "Device_TableHead_Rowid": "",
     "Device_TableHead_SSID": "",
-    "Device_TableHead_Status": "",
+    "Device_TableHead_Status": "Durum",
     "Device_TableHead_SyncHubNodeName": "",
     "Device_TableHead_Type": "",
     "Device_TableHead_Vendor": "",
-    "Device_Table_Not_Network_Device": "",
+    "Device_Table_Not_Network_Device": "Ağ cihazı olarak ayarlanmadı",
     "Device_Table_info": "",
-    "Device_Table_nav_next": "",
-    "Device_Table_nav_prev": "",
+    "Device_Table_nav_next": "Sonraki",
+    "Device_Table_nav_prev": "Önceki",
     "Device_Tablelenght": "",
     "Device_Tablelenght_all": "",
-    "Device_Title": "",
-    "Donations_Others": "",
+    "Device_Title": "Cihazlar",
+    "Donations_Others": "Diğerleri",
     "Donations_Platforms": "",
     "Donations_Text": "",
     "Donations_Title": "",
     "ENABLE_PLUGINS_description": "",
     "ENABLE_PLUGINS_name": "",
-    "Email_display_name": "",
-    "Email_icon": "",
-    "Events_Loading": "",
+    "Email_display_name": "Eposta",
+    "Email_icon": "<i class=\"fa fa-at\"></i>",
+    "Events_Loading": "Yükleniyor...",
     "Events_Periodselect_All": "",
-    "Events_Periodselect_LastMonth": "",
-    "Events_Periodselect_LastWeek": "",
-    "Events_Periodselect_LastYear": "",
-    "Events_Periodselect_today": "",
+    "Events_Periodselect_LastMonth": "Geçen Ay",
+    "Events_Periodselect_LastWeek": "Geçen Hafta",
+    "Events_Periodselect_LastYear": "Geçen Yıl",
+    "Events_Periodselect_today": "Bugün",
     "Events_Searchbox": "",
     "Events_Shortcut_AllEvents": "",
     "Events_Shortcut_DownAlerts": "",
     "Events_Shortcut_Events": "",
     "Events_Shortcut_MissSessions": "",
-    "Events_Shortcut_NewDevices": "",
-    "Events_Shortcut_Sessions": "",
+    "Events_Shortcut_NewDevices": "Yeni Cİhazlar",
+    "Events_Shortcut_Sessions": "Oturumlar",
     "Events_Shortcut_VoidSessions": "",
-    "Events_TableHead_AdditionalInfo": "",
-    "Events_TableHead_Connection": "",
-    "Events_TableHead_Date": "",
-    "Events_TableHead_Device": "",
+    "Events_TableHead_AdditionalInfo": "Ek Bilgi",
+    "Events_TableHead_Connection": "Bağlantı",
+    "Events_TableHead_Date": "Tarih",
+    "Events_TableHead_Device": "Cihaz",
     "Events_TableHead_Disconnection": "",
-    "Events_TableHead_Duration": "",
+    "Events_TableHead_Duration": "Süre",
     "Events_TableHead_DurationOrder": "",
     "Events_TableHead_EventType": "",
     "Events_TableHead_IP": "",
     "Events_TableHead_IPOrder": "",
-    "Events_TableHead_Order": "",
+    "Events_TableHead_Order": "Sıra",
     "Events_TableHead_Owner": "",
     "Events_TableHead_PendingAlert": "",
     "Events_Table_info": "",
     "Events_Table_nav_next": "",
-    "Events_Table_nav_prev": "",
+    "Events_Table_nav_prev": "Önceki",
     "Events_Tablelenght": "",
     "Events_Tablelenght_all": "",
     "Events_Title": "",
-    "Gen_Action": "",
-    "Gen_Add": "",
-    "Gen_Add_All": "",
-    "Gen_All_Devices": "",
-    "Gen_AreYouSure": "",
+    "Gen_Action": "Komut",
+    "Gen_Add": "Ekle",
+    "Gen_Add_All": "Tümünü ekle",
+    "Gen_All_Devices": "Tüm Cihazlar",
+    "Gen_AreYouSure": "Emin misiniz?",
     "Gen_Backup": "",
-    "Gen_Cancel": "",
-    "Gen_Copy": "",
-    "Gen_DataUpdatedUITakesTime": "",
-    "Gen_Delete": "",
-    "Gen_DeleteAll": "",
-    "Gen_Error": "",
-    "Gen_Filter": "",
+    "Gen_Cancel": "İptal",
+    "Gen_Change": "",
+    "Gen_Copy": "Çalıştır",
+    "Gen_DataUpdatedUITakesTime": "TAMAM - Eğer bir tarama çalışıyorsa arayüzün güncellenmesi biraz zaman alabilir",
+    "Gen_Delete": "Sil",
+    "Gen_DeleteAll": "Tümünü sil",
+    "Gen_Error": "Hata",
+    "Gen_Filter": "Filtre",
     "Gen_LockedDB": "",
-    "Gen_Offline": "",
-    "Gen_Okay": "",
-    "Gen_Purge": "",
+    "Gen_Offline": "Çevrimdışı",
+    "Gen_Okay": "Tamam",
+    "Gen_Purge": "Çıkar",
     "Gen_ReadDocs": "",
-    "Gen_Remove_All": "",
+    "Gen_Remove_All": "Tümünü kaldır",
     "Gen_Remove_Last": "",
     "Gen_Restore": "",
-    "Gen_Run": "",
-    "Gen_Save": "",
-    "Gen_Saved": "",
+    "Gen_Run": "Çalıştır",
+    "Gen_Save": "Kaydet",
+    "Gen_Saved": "Kaydedildi",
     "Gen_Search": "",
-    "Gen_Selected_Devices": "",
+    "Gen_SelectToPreview": "",
+    "Gen_Selected_Devices": "Seçilmiş Cihazlar:",
     "Gen_Switch": "",
-    "Gen_Upd": "",
+    "Gen_Upd": "Başarılı bir şekilde güncellendi",
     "Gen_Upd_Fail": "",
     "Gen_Update": "",
     "Gen_Update_Value": "",
-    "Gen_Warning": "",
+    "Gen_Warning": "Uyarı",
     "Gen_Work_In_Progress": "",
-    "General_display_name": "",
-    "General_icon": "",
+    "General_display_name": "Genel",
+    "General_icon": "<i class=\"fa fa-gears\"></i>",
     "HRS_TO_KEEP_NEWDEV_description": "",
     "HRS_TO_KEEP_NEWDEV_name": "",
-    "HelpFAQ_Cat_Detail": "",
+    "HelpFAQ_Cat_Detail": "Detaylar",
     "HelpFAQ_Cat_Detail_300_head": "",
     "HelpFAQ_Cat_Detail_300_text_a": "",
     "HelpFAQ_Cat_Detail_300_text_b": "",
@@ -314,24 +318,24 @@
     "HelpFAQ_Cat_Detail_302_head_a": "",
     "HelpFAQ_Cat_Detail_302_head_b": "",
     "HelpFAQ_Cat_Detail_302_text": "",
-    "HelpFAQ_Cat_Detail_303_head": "",
-    "HelpFAQ_Cat_Detail_303_text": "",
-    "HelpFAQ_Cat_Device_200_head": "",
+    "HelpFAQ_Cat_Detail_303_head": "Nmap nedir ve ne içindir?",
+    "HelpFAQ_Cat_Detail_303_text": "Nmap birden fazla fonksiyona sahip bir ağ tarayıcısıdır..<br>Listenizde yeni bir cihaz belirdiği zaman, Nmap taraması sayesinde o cihaz hakkında daha çok bilgi alabilme olanağınız var.",
+    "HelpFAQ_Cat_Device_200_head": "Listemde bilmediğim cihazlar var. Sildiğim zaman yeniden ortaya çıkıyorlar.",
     "HelpFAQ_Cat_Device_200_text": "",
-    "HelpFAQ_Cat_General": "",
+    "HelpFAQ_Cat_General": "Genel",
     "HelpFAQ_Cat_General_100_head": "",
     "HelpFAQ_Cat_General_100_text_a": "",
     "HelpFAQ_Cat_General_100_text_b": "",
     "HelpFAQ_Cat_General_100_text_c": "",
     "HelpFAQ_Cat_General_101_head": "",
     "HelpFAQ_Cat_General_101_text": "",
-    "HelpFAQ_Cat_General_102_head": "",
+    "HelpFAQ_Cat_General_102_head": "Veritabanının salt okunur olduğu mesajını alıyorum.",
     "HelpFAQ_Cat_General_102_text": "",
     "HelpFAQ_Cat_General_102docker_head": "",
     "HelpFAQ_Cat_General_102docker_text": "",
     "HelpFAQ_Cat_General_103_head": "",
     "HelpFAQ_Cat_General_103_text": "",
-    "HelpFAQ_Cat_Network_600_head": "",
+    "HelpFAQ_Cat_Network_600_head": "Bu sayfa ne işe yarar?",
     "HelpFAQ_Cat_Network_600_text": "",
     "HelpFAQ_Cat_Network_601_head": "",
     "HelpFAQ_Cat_Network_601_text": "",
@@ -339,34 +343,35 @@
     "HelpFAQ_Cat_Presence_400_text": "",
     "HelpFAQ_Cat_Presence_401_head": "",
     "HelpFAQ_Cat_Presence_401_text": "",
-    "HelpFAQ_Title": "",
+    "HelpFAQ_Title": "Yardım / SSS",
     "LOADED_PLUGINS_description": "",
     "LOADED_PLUGINS_name": "",
     "LOG_LEVEL_description": "",
     "LOG_LEVEL_name": "",
-    "Loading": "",
-    "Login_Box": "",
-    "Login_Default_PWD": "",
-    "Login_Psw-box": "",
+    "Loading": "Yükleniyor...",
+    "Login_Box": "Şifrenizi giriniz",
+    "Login_Default_PWD": "Varsayılan şifre \"123456\" hâlâ aktif.",
+    "Login_Info": "",
+    "Login_Psw-box": "Şİfre",
     "Login_Psw_alert": "",
     "Login_Psw_folder": "",
-    "Login_Psw_new": "",
+    "Login_Psw_new": "yeni_sifre",
     "Login_Psw_run": "",
-    "Login_Remember": "",
-    "Login_Remember_small": "",
-    "Login_Submit": "",
+    "Login_Remember": "Hatırla",
+    "Login_Remember_small": "(7 gün geçerli)",
+    "Login_Submit": "Oturum aç",
     "Login_Toggle_Alert_headline": "",
     "Login_Toggle_Info": "",
     "Login_Toggle_Info_headline": "",
     "Maint_PurgeLog": "",
     "Maint_RestartServer": "",
     "Maint_Restart_Server_noti_text": "",
-    "Maintenance_Running_Version": "",
-    "Maintenance_Status": "",
+    "Maintenance_Running_Version": "Yüklenmiş sürüm",
+    "Maintenance_Status": "Durum",
     "Maintenance_Title": "",
     "Maintenance_Tool_ExportCSV": "",
     "Maintenance_Tool_ExportCSV_noti": "",
-    "Maintenance_Tool_ExportCSV_noti_text": "",
+    "Maintenance_Tool_ExportCSV_noti_text": "Bir CSV dosyası oluşturmak istediğinize emin misiniz?",
     "Maintenance_Tool_ExportCSV_text": "",
     "Maintenance_Tool_ImportCSV": "",
     "Maintenance_Tool_ImportCSV_noti": "",
@@ -392,9 +397,9 @@
     "Maintenance_Tool_del_ActHistory_noti": "",
     "Maintenance_Tool_del_ActHistory_noti_text": "",
     "Maintenance_Tool_del_ActHistory_text": "",
-    "Maintenance_Tool_del_alldev": "",
+    "Maintenance_Tool_del_alldev": "Tüm Cihazları Sil",
     "Maintenance_Tool_del_alldev_noti": "",
-    "Maintenance_Tool_del_alldev_noti_text": "",
+    "Maintenance_Tool_del_alldev_noti_text": "Tüm cihazları silmek istediğinize emin misiniz?",
     "Maintenance_Tool_del_alldev_text": "",
     "Maintenance_Tool_del_allevents": "",
     "Maintenance_Tool_del_allevents30": "",
@@ -405,12 +410,12 @@
     "Maintenance_Tool_del_allevents_noti_text": "",
     "Maintenance_Tool_del_allevents_text": "",
     "Maintenance_Tool_del_empty_macs": "",
-    "Maintenance_Tool_del_empty_macs_noti": "",
+    "Maintenance_Tool_del_empty_macs_noti": "Cihazları Sil",
     "Maintenance_Tool_del_empty_macs_noti_text": "",
     "Maintenance_Tool_del_empty_macs_text": "",
-    "Maintenance_Tool_del_selecteddev": "",
+    "Maintenance_Tool_del_selecteddev": "Seçilmiş cihazları sil",
     "Maintenance_Tool_del_selecteddev_text": "",
-    "Maintenance_Tool_del_unknowndev": "",
+    "Maintenance_Tool_del_unknowndev": "(bilinmeyen) Cihazları Sil",
     "Maintenance_Tool_del_unknowndev_noti": "",
     "Maintenance_Tool_del_unknowndev_noti_text": "",
     "Maintenance_Tool_del_unknowndev_text": "",
@@ -430,59 +435,59 @@
     "Maintenance_Tool_upgrade_database_text": "",
     "Maintenance_Tools_Tab_BackupRestore": "",
     "Maintenance_Tools_Tab_Logging": "",
-    "Maintenance_Tools_Tab_Settings": "",
-    "Maintenance_Tools_Tab_Tools": "",
-    "Maintenance_Tools_Tab_UISettings": "",
-    "Maintenance_arp_status": "",
-    "Maintenance_arp_status_off": "",
-    "Maintenance_arp_status_on": "",
+    "Maintenance_Tools_Tab_Settings": "Ayarlar",
+    "Maintenance_Tools_Tab_Tools": "Araçlar",
+    "Maintenance_Tools_Tab_UISettings": "Arayüz Ayarları",
+    "Maintenance_arp_status": "Tarama Durumu",
+    "Maintenance_arp_status_off": "şu anda devre dışı",
+    "Maintenance_arp_status_on": "tarama(lar) şu anda çalışıyor",
     "Maintenance_built_on": "",
     "Maintenance_current_version": "",
     "Maintenance_database_backup": "",
-    "Maintenance_database_backup_found": "",
+    "Maintenance_database_backup_found": "yedekler bulundu",
     "Maintenance_database_backup_total": "",
     "Maintenance_database_lastmod": "",
     "Maintenance_database_path": "",
     "Maintenance_database_rows": "",
     "Maintenance_database_size": "",
-    "Maintenance_lang_selector_apply": "",
+    "Maintenance_lang_selector_apply": "Uygula",
     "Maintenance_lang_selector_empty": "",
     "Maintenance_lang_selector_lable": "",
     "Maintenance_lang_selector_text": "",
     "Maintenance_new_version": "",
-    "Maintenance_themeselector_apply": "",
+    "Maintenance_themeselector_apply": "Uygula",
     "Maintenance_themeselector_empty": "",
     "Maintenance_themeselector_lable": "",
     "Maintenance_themeselector_text": "",
     "Maintenance_version": "",
     "NETWORK_DEVICE_TYPES_description": "",
     "NETWORK_DEVICE_TYPES_name": "",
-    "Navigation_About": "",
-    "Navigation_Devices": "",
+    "Navigation_About": "Hakkında",
+    "Navigation_Devices": "Cihazlar",
     "Navigation_Donations": "",
     "Navigation_Events": "",
-    "Navigation_HelpFAQ": "",
+    "Navigation_HelpFAQ": "Yardım / SSS",
     "Navigation_Integrations": "",
     "Navigation_Maintenance": "",
     "Navigation_Monitoring": "",
     "Navigation_Network": "",
-    "Navigation_Notifications": "",
+    "Navigation_Notifications": "Bildirimler",
     "Navigation_Plugins": "",
     "Navigation_Presence": "",
     "Navigation_Report": "",
-    "Navigation_Settings": "",
+    "Navigation_Settings": "Ayarlar",
     "Navigation_SystemInfo": "",
     "Navigation_Workflows": "",
     "Network_Assign": "",
     "Network_Cant_Assign": "",
-    "Network_Configuration_Error": "",
-    "Network_Connected": "",
-    "Network_ManageAdd": "",
-    "Network_ManageAdd_Name": "",
-    "Network_ManageAdd_Name_text": "",
+    "Network_Configuration_Error": "Kurulum Hatası",
+    "Network_Connected": "Bağlanmış cihazlar",
+    "Network_ManageAdd": "Cihaz Ekle",
+    "Network_ManageAdd_Name": "Cihaz İsmi",
+    "Network_ManageAdd_Name_text": "Özel karakterler olmadan isim veriniz",
     "Network_ManageAdd_Port": "",
     "Network_ManageAdd_Port_text": "",
-    "Network_ManageAdd_Submit": "",
+    "Network_ManageAdd_Submit": "Cihaz Ekle",
     "Network_ManageAdd_Type": "",
     "Network_ManageAdd_Type_text": "",
     "Network_ManageAssign": "",
@@ -490,15 +495,15 @@
     "Network_ManageDel_Name": "",
     "Network_ManageDel_Name_text": "",
     "Network_ManageDel_Submit": "",
-    "Network_ManageDevices": "",
+    "Network_ManageDevices": "Cihazları Yönet",
     "Network_ManageEdit": "",
     "Network_ManageEdit_ID": "",
     "Network_ManageEdit_ID_text": "",
-    "Network_ManageEdit_Name": "",
+    "Network_ManageEdit_Name": "Yeni Cihaz İsmi",
     "Network_ManageEdit_Name_text": "",
     "Network_ManageEdit_Port": "",
     "Network_ManageEdit_Port_text": "",
-    "Network_ManageEdit_Submit": "",
+    "Network_ManageEdit_Submit": "Ayarları Kaydet",
     "Network_ManageEdit_Type": "",
     "Network_ManageEdit_Type_text": "",
     "Network_ManageLeaf": "",
@@ -516,7 +521,7 @@
     "Network_Table_State": "",
     "Network_Title": "",
     "Network_UnassignedDevices": "",
-    "Notifications_All": "",
+    "Notifications_All": "Tüm Bildirimler",
     "Notifications_Mark_All_Read": "",
     "PIALERT_WEB_PASSWORD_description": "",
     "PIALERT_WEB_PASSWORD_name": "",
@@ -527,25 +532,26 @@
     "Plugins_DeleteAll": "",
     "Plugins_Filters_Mac": "",
     "Plugins_History": "",
+    "Plugins_Obj_DeleteListed": "",
     "Plugins_Objects": "",
     "Plugins_Out_of": "",
     "Plugins_Unprocessed_Events": "",
     "Plugins_no_control": "",
-    "Presence_CalHead_day": "",
+    "Presence_CalHead_day": "gün",
     "Presence_CalHead_lang": "",
     "Presence_CalHead_month": "",
-    "Presence_CalHead_quarter": "",
-    "Presence_CalHead_week": "",
-    "Presence_CalHead_year": "",
-    "Presence_CallHead_Devices": "",
-    "Presence_Loading": "",
-    "Presence_Shortcut_AllDevices": "",
+    "Presence_CalHead_quarter": "çeyrek",
+    "Presence_CalHead_week": "hafta",
+    "Presence_CalHead_year": "yıl",
+    "Presence_CallHead_Devices": "Cihazlar",
+    "Presence_Loading": "Yükleniyor...",
+    "Presence_Shortcut_AllDevices": "Cihazlarım",
     "Presence_Shortcut_Archived": "",
     "Presence_Shortcut_Connected": "",
-    "Presence_Shortcut_Devices": "",
+    "Presence_Shortcut_Devices": "Cihazlar",
     "Presence_Shortcut_DownAlerts": "",
-    "Presence_Shortcut_Favorites": "",
-    "Presence_Shortcut_NewDevices": "",
+    "Presence_Shortcut_Favorites": "Favoriler",
+    "Presence_Shortcut_NewDevices": "Yeni Cihazlar",
     "Presence_Title": "",
     "REPORT_DASHBOARD_URL_description": "",
     "REPORT_DASHBOARD_URL_name": "",
@@ -556,6 +562,7 @@
     "RandomMAC_hover": "",
     "Reports_Sent_Log": "",
     "SCAN_SUBNETS_description": "",
+    "SCAN_SUBNETS_name": "",
     "SYSTEM_TITLE": "",
     "Setting_Override": "",
     "Setting_Override_Description": "",
@@ -571,21 +578,21 @@
     "Systeminfo_CPU_Vendor": "",
     "Systeminfo_Client_Resolution": "",
     "Systeminfo_Client_User_Agent": "",
-    "Systeminfo_General": "",
-    "Systeminfo_General_Date": "",
+    "Systeminfo_General": "Genel",
+    "Systeminfo_General_Date": "Tarih:",
     "Systeminfo_General_Date2": "",
     "Systeminfo_General_Full_Date": "",
-    "Systeminfo_General_TimeZone": "",
+    "Systeminfo_General_TimeZone": "Zaman dilimi:",
     "Systeminfo_Memory": "",
     "Systeminfo_Memory_Total_Memory": "",
     "Systeminfo_Memory_Usage": "",
     "Systeminfo_Memory_Usage_Percent": "",
-    "Systeminfo_Motherboard": "",
+    "Systeminfo_Motherboard": "Anakart",
     "Systeminfo_Motherboard_BIOS": "",
     "Systeminfo_Motherboard_BIOS_Date": "",
     "Systeminfo_Motherboard_BIOS_Vendor": "",
     "Systeminfo_Motherboard_Manufactured": "",
-    "Systeminfo_Motherboard_Name": "",
+    "Systeminfo_Motherboard_Name": "İsim:",
     "Systeminfo_Motherboard_Revision": "",
     "Systeminfo_Network": "",
     "Systeminfo_Network_Accept_Encoding": "",
@@ -596,7 +603,7 @@
     "Systeminfo_Network_HTTP_Referer_String": "",
     "Systeminfo_Network_Hardware": "",
     "Systeminfo_Network_Hardware_Interface_Mask": "",
-    "Systeminfo_Network_Hardware_Interface_Name": "",
+    "Systeminfo_Network_Hardware_Interface_Name": "Arayüz İsmi",
     "Systeminfo_Network_Hardware_Interface_RX": "",
     "Systeminfo_Network_Hardware_Interface_TX": "",
     "Systeminfo_Network_IP": "",
@@ -617,35 +624,35 @@
     "Systeminfo_Services_Description": "",
     "Systeminfo_Services_Name": "",
     "Systeminfo_Storage": "",
-    "Systeminfo_Storage_Device": "",
+    "Systeminfo_Storage_Device": "Cihaz:",
     "Systeminfo_Storage_Mount": "",
-    "Systeminfo_Storage_Size": "",
+    "Systeminfo_Storage_Size": "Boyut:",
     "Systeminfo_Storage_Type": "",
     "Systeminfo_Storage_Usage": "",
     "Systeminfo_Storage_Usage_Free": "",
     "Systeminfo_Storage_Usage_Mount": "",
     "Systeminfo_Storage_Usage_Total": "",
     "Systeminfo_Storage_Usage_Used": "",
-    "Systeminfo_System": "",
+    "Systeminfo_System": "Sistem",
     "Systeminfo_System_AVG": "",
     "Systeminfo_System_Architecture": "",
     "Systeminfo_System_Kernel": "",
     "Systeminfo_System_OSVersion": "",
     "Systeminfo_System_Running_Processes": "",
-    "Systeminfo_System_System": "",
+    "Systeminfo_System_System": "Sistem:",
     "Systeminfo_System_Uname": "",
     "Systeminfo_System_Uptime": "",
     "Systeminfo_This_Client": "",
-    "Systeminfo_USB_Devices": "",
+    "Systeminfo_USB_Devices": "USB Aygıtları",
     "TICKER_MIGRATE_TO_NETALERTX": "",
     "TIMEZONE_description": "",
-    "TIMEZONE_name": "",
+    "TIMEZONE_name": "Zaman dilimi",
     "UI_DEV_SECTIONS_description": "",
     "UI_DEV_SECTIONS_name": "",
     "UI_ICONS_description": "",
     "UI_ICONS_name": "",
     "UI_LANG_description": "",
-    "UI_LANG_name": "",
+    "UI_LANG_name": "Arayüz Dili",
     "UI_MY_DEVICES_description": "",
     "UI_MY_DEVICES_name": "",
     "UI_NOT_RANDOM_MAC_description": "",
@@ -654,13 +661,15 @@
     "UI_PRESENCE_name": "",
     "UI_REFRESH_description": "",
     "UI_REFRESH_name": "",
-    "devices_old": "",
+    "VERSION_description": "",
+    "VERSION_name": "",
+    "devices_old": "Yenileniyor...",
     "general_event_description": "",
     "general_event_title": "",
     "report_guid": "",
     "report_guid_missing": "",
     "report_select_format": "",
-    "report_time": "",
+    "report_time": "Bildirim zamanı:",
     "run_event_icon": "",
     "run_event_tooltip": "",
     "settings_core_icon": "",
@@ -679,14 +688,14 @@
     "settings_old": "",
     "settings_other_scanners": "",
     "settings_other_scanners_icon": "",
-    "settings_other_scanners_label": "",
+    "settings_other_scanners_label": "Diğer tarayıcılar",
     "settings_publishers": "",
     "settings_publishers_icon": "",
     "settings_publishers_info": "",
     "settings_publishers_label": "",
     "settings_saved": "",
     "settings_system_icon": "",
-    "settings_system_label": "",
+    "settings_system_label": "Sistem",
     "settings_update_item_warning": "",
     "test_event_icon": "",
     "test_event_tooltip": ""

front/php/templates/migrationCheck.php

@@ -1,4 +1,10 @@
-<?php require 'php/templates/notification.php'; ?>
+<?php 
+
+  require 'php/templates/notification.php'; 
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+?>
 
 <script>
 

front/php/templates/security.php

@@ -1,67 +1,75 @@
 <?php
 
-$url = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
-$isLogonPage = FALSE;
+// Constants
+define('CONFIG_PATH', $_SERVER['DOCUMENT_ROOT'] . "/../config/app.conf");
+define('COOKIE_SAVE_LOGIN_NAME', "NetAlertX_SaveLogin");
 
-$CookieSaveLoginName = "NetAlertX_SaveLogin";
+// Utility Functions
+function getConfigLine($pattern, $config_lines) {
+    $matches = preg_grep($pattern, $config_lines);
+    return !empty($matches) ? explode("=", array_values($matches)[0]) : null;
+}
 
+function getConfigValue($pattern, $config_lines, $delimiter = "'") {
+    $line = preg_grep($pattern, $config_lines);
+    return !empty($line) ? explode($delimiter, array_values($line)[0])[1] : '';
+}
 
-if (strpos($url,'index.php') !== false) {
-    $isLogonPage = TRUE;
-} 
+function redirect($url) {
+    header("Location: $url");
+    exit();
+}
 
-session_start();
+// Initialization
+$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https://' : 'http://';
+$url = $protocol . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
+$isLogonPage = strpos($url, 'index.php') !== false;
+$authHeader = apache_request_headers()['Authorization'] ?? '';
+$sessionLogin = isset($_SESSION['login']) ? $_SESSION['login'] : 0;
 
-if(array_search('action', $_REQUEST) != FALSE)
-{
-  if ($_REQUEST['action'] == 'logout') {
+// Start session if not already started
+if (session_status() == PHP_SESSION_NONE) {
+    session_start();
+}
+
+// Handle logout
+if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'logout') {
     session_destroy();
-    setcookie($CookieSaveLoginName, "", time() - 3600);
-    header('Location: index.php');
-  }    
+    setcookie(COOKIE_SAVE_LOGIN_NAME, "", time() - 3600);
+    redirect('index.php');
 }
 
-// ##################################################
-// ## Login Processing start
-// ##################################################
-$config_file = "../config/app.conf";
-$config_file_lines = file($config_file);
-$CookieSaveLoginName = "NetAlertX_SaveLogin";
+// Load configuration
+if (!file_exists(CONFIG_PATH)) {
+    die("Configuration file not found.");
+}
+$configLines = file(CONFIG_PATH);
 
-// ###################################
-// ## SETPWD_enable_password FALSE
-// ###################################
+// Handle web protection and password
+$nax_WebProtection = strtolower(trim(getConfigLine('/^SETPWD_enable_password.*=/', $configLines)[1] ?? 'false'));
+$nax_Password = getConfigValue('/^SETPWD_password.*=/', $configLines);
+$api_token = getConfigValue('/^SYNC_api_token.*=/', $configLines, "'");
 
-$config_file_lines_bypass = array_values(preg_grep('/^SETPWD_enable_password.*=/', $config_file_lines));
-$protection_line = explode("=", $config_file_lines_bypass[0]);
-$Pia_WebProtection = strtolower(trim($protection_line[1]));
+$expectedToken = 'Bearer ' . $api_token;
 
-// ###################################
-// ## SETPWD_enable_password TRUE
-// ###################################
+// Authentication Handling
+if ($nax_WebProtection == 'true') {
+    if ($authHeader === $expectedToken) {
+        $_SESSION['login'] = 1; // User authenticated with bearer token
+    } elseif (!empty($authHeader)) {
+        echo "[Security] Incorrect Bearer Token";
+    }
 
-$config_file_lines = array_values(preg_grep('/^SETPWD_password.*=/', $config_file_lines));
-$password_line = explode("'", $config_file_lines[0]);
-$Pia_Password = $password_line[1];
-
-// active Session or valid cookie (cookie not extends)
-if($Pia_WebProtection == 'true')
-{
-    if(isset ($_SESSION["login"]) == FALSE )
-    {
-        $_SESSION["login"] = 0;
-    }     
-
-    if ( ($_SESSION["login"] == 1) || $isLogonPage ||  (( isset($_COOKIE[$CookieSaveLoginName]) && $Pia_Password == $_COOKIE[$CookieSaveLoginName ])))
-    {
-        //Logged in or stay on this page if we are on the index.php already   
-        
-    } else 
-    {
-        // we need to redirect        
-        header('Location: index.php');
-    } 
+    // Safely check if the session login exists before checking its value
+    $isLoggedIn = isset($_SESSION['login']) && $_SESSION['login'] == 1;
 
+    // Determine if the user should be redirected
+    if ($isLoggedIn || $isLogonPage || (isset($_COOKIE[COOKIE_SAVE_LOGIN_NAME]) && $nax_Password == $_COOKIE[COOKIE_SAVE_LOGIN_NAME])) {
+        // Logged in or stay on this page if we are on the index.php already
+    } else {
+        // We need to redirect
+        redirect('/index.php');
+    }
 }
 
-?>
+?>

front/php/templates/skinUI.php

@@ -4,18 +4,15 @@
 // ## GUI settings processing start
 // ###################################
 
-if( isset($_COOKIE['Front_Dark_Mode_Enabled']))
+if( isset($_COOKIE['UI_dark_mode']))
 {
-    $ENABLED_DARKMODE = $_COOKIE['Front_Dark_Mode_Enabled'] == "true";
+    $ENABLED_DARKMODE = $_COOKIE['UI_dark_mode'] == "True";
 }else
 {
     $ENABLED_DARKMODE = False;
 }
 
-foreach (glob("/app/db/setting_skin*") as $filename) {
-    $pia_skin_selected = str_replace('setting_','',basename($filename));
-}
-if (isset($pia_skin_selected) == FALSE or (strlen($pia_skin_selected) == 0)) {$pia_skin_selected = 'skin-blue';}
+$pia_skin_selected = 'skin-blue';
 
 // ###################################
 // ## GUI settings processing end

front/php/templates/version.php

@@ -12,6 +12,7 @@
 #---------------------------------------------------------------------------------#
 
 $filename = "/app/.VERSION";
+
 if(file_exists($filename)) {
     $fileContents = file_get_contents($filename);
     if(trim($fileContents) === 'Dev') {
@@ -22,5 +23,6 @@ if(file_exists($filename)) {
 }
 else {
     echo date('H:i:s') . " - N/A";
-}           
+}          
+ 
 ?>

front/plugins/README.md

@@ -11,16 +11,16 @@ NetAlertX supports additional plugins to extend its functionality, each with its
 > You can load additional Plugins via the General -> `LOADED_PLUGINS` setting. Use `Ctrl + Click` to select/deselect. 
 
 1. Pick your `🔍 dev scanner` plugin (e.g. `ARPSCAN` or `NMAPDEV`), or import devices into the application with an `📥 importer` plugin. (See **✅Enabling plugins** below)
-1. Pick a `▶️ publisher` plugin, if you want to send notifications. If you don't see a publisher you'd like to use, look at the  [📚_publisher_apprise](/front/plugins/_publisher_apprise/) plugin which is a proxy for over 80 notification services. 
-1. Setup your [Network topology diagram](/docs/NETWORK_TREE.md)
-1. Fine-tune [Notifications](/docs/NOTIFICATIONS.md)
-1. [Backup your setup](/docs/BACKUPS.md)
-1. Contribute and [Create custom plugins](/docs/PLUGINS_DEV.md)
-1. Consider [donating](https://github.com/jokob-sk/NetAlertX?tab=readme-ov-file#-sponsors) to keep me going
+2. Pick a `▶️ publisher` plugin, if you want to send notifications. If you don't see a publisher you'd like to use, look at the  [📚_publisher_apprise](/front/plugins/_publisher_apprise/) plugin which is a proxy for over 80 notification services. 
+3. Setup your [Network topology diagram](/docs/NETWORK_TREE.md)
+4. Fine-tune [Notifications](/docs/NOTIFICATIONS.md)
+5. [Backup your setup](/docs/BACKUPS.md)
+6. Contribute and [Create custom plugins](/docs/PLUGINS_DEV.md)
+7. Consider [donating](https://github.com/jokob-sk/NetAlertX?tab=readme-ov-file#-sponsors) to keep me going
 
 
 ## 📑 Available Plugins
-
+ 
 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 at least some device-detecting plugins enabled, such as `ARPSCAN` or `NMAPDEV`. 
 
 
@@ -44,7 +44,7 @@ Device-detecting plugins insert values into the `CurrentScan` database table.  T
 | `NSLOOKUP`    | ♻       | NSLookup (DNS-based) name resolution      |           |          | Script       | [nslookup_scan](/front/plugins/nslookup_scan/)                    |
 | `NTFPRCS`     | ⚙       | Notification processing                   |           |  Yes     | Template     | [notification_processing](/front/plugins/notification_processing/)|
 | `NTFY`        | ▶️      | NTFY notifications                        |           |          | Script       | [_publisher_ntfy](/front/plugins/_publisher_ntfy/)                |
-| `OMDSDN`      | 📥      | OMADA TP-Link import                      |   📊🔄   |          | Script       | [omada_sdn_imp](/front/plugins/omada_sdn_imp/)                    |
+| `OMDSDN`      | 📥      | OMADA TP-Link import                      |   🖧 🔄   |          | Script       | [omada_sdn_imp](/front/plugins/omada_sdn_imp/)                    |
 | `PHOLUS`      | ♻       | Pholus name resolution                    |           |          | Script       | [pholus_scan](/front/plugins/pholus_scan/)                        |
 | `PIHOLE`      | 🔍/📥   | Pi-hole device import & sync              |           |          | SQLite DB    | [pihole_scan](/front/plugins/pihole_scan/)                        |
 | `PUSHSAFER`   | ▶️      | Pushsafer notifications                   |           |          | Script       | [_publisher_pushsafer](/front/plugins/_publisher_pushsafer/)      |
@@ -52,9 +52,10 @@ Device-detecting plugins insert values into the `CurrentScan` database table.  T
 | `SETPWD`      | ⚙       | Set password                              |           |  Yes     | Template     | [set_password](/front/plugins/set_password/)                      |
 | `SMTP`        | ▶️      | Email notifications                       |           |          | Script       | [_publisher_email](/front/plugins/_publisher_email/)              |
 | `SNMPDSC`     | 🔍/📥   | SNMP device import & sync                 |           |          | Script       | [snmp_discovery](/front/plugins/snmp_discovery/)                  |
-| `SYNC`        | 🔍/⚙/📥| Sync & import from NetAlertX instances    |   📊🔄    |          | Script       | [sync](/front/plugins/sync/)                                     |
+| `SYNC`        | 🔍/⚙/📥| Sync & import from NetAlertX instances    |   🖧 🔄    |          | Script       | [sync](/front/plugins/sync/)                                     |
+| `TELEGRAM`    | ▶️      | Telegram notifications                    |          |          | Script    | [_publisher_telegram](/front/plugins/_publisher_telegram/)             |
 | `UNDIS`       | 🔍/📥   | Create dummy devices                      |           |          | Script       | [undiscoverables](/front/plugins/undiscoverables/)                |
-| `UNFIMP`      | 🔍/📥   | UniFi device import & sync                |           |          | Script       | [unifi_import](/front/plugins/unifi_import/)                      |
+| `UNFIMP`      | 🔍/📥   | UniFi device import & sync                |  🖧       |          | Script       | [unifi_import](/front/plugins/unifi_import/)                      |
 | `VNDRPDT`     | ⚙       | Vendor database update                    |           |          | Script       | [vendor_update](/front/plugins/vendor_update/)                    |
 | `WEBHOOK`     | ▶️      | Webhook notifications                     |           |          | Script       | [_publisher_webhook](/front/plugins/_publisher_webhook/)          |
 | `WEBMON`      | ♻       | Website down monitoring                   |           |          | Script       | [website_monitor](/front/plugins/website_monitor/)                |
@@ -81,7 +82,7 @@ Device-detecting plugins insert values into the `CurrentScan` database table.  T
 
 | Icon  | Description                                                  | 
 |------|---------------------------------------------------------------|
-| 📊   | Auto-imports the network topology diagram                     |
+| 🖧    | Auto-imports the network topology diagram                     |
 | 🔄   | Has the option to sync some data back into the plugin source  |
 
 

front/plugins/__template/config.json

@@ -173,6 +173,16 @@
             ],
             "transformers": []
           },
+          {
+            "elementType": "select",
+            "elementHasInputValue": 1,
+            "elementOptions": [
+              { "multiple": "true" },
+              { "readonly": "true" },
+              { "editable": "true" }
+            ],
+            "transformers": []
+          },
           {
             "elementType": "button",
             "elementOptions": [
@@ -194,15 +204,6 @@
               { "getStringKey": "Gen_Remove_Last" }
             ],
             "transformers": []
-          },
-          {
-            "elementType": "select",
-            "elementOptions": [
-              { "multiple": "true" },
-              { "readonly": "true" },
-              { "editable": "true" }
-            ],
-            "transformers": []
           }
         ]
       },

front/plugins/__template/rename_me.py

@@ -5,6 +5,7 @@ import pathlib
 import sys
 import json
 import sqlite3
+from pytz import timezone
 
 # Define the installation path and extend the system path for plugin imports
 INSTALL_PATH = "/app"
@@ -16,6 +17,10 @@ from logger import mylog
 from const import pluginsPath, fullDbPath
 from helper import timeNowTZ, get_setting_value 
 from notification import write_notification
+import conf
+
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 # Define the current path and log file paths
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
@@ -57,7 +62,12 @@ def main():
                     watched3    = device['device_type'],
                     watched4    = device['last_seen'],
                     extra       = '',
-                    foreignKey  = device['mac_address'])
+                    foreignKey  = device['mac_address']
+                    # helpVal1  = "Something1",  # Optional Helper values to be passed for mapping into the app 
+                    # helpVal2  = "Something1",  # If you need to use even only 1, add the remaining ones too 
+                    # helpVal3  = "Something1",  # and set them to 'null'. Check the the docs for details:
+                    # helpVal4  = "Something1",  # https://github.com/jokob-sk/NetAlertX/blob/main/docs/PLUGINS_DEV.md
+                    )
 
         mylog('verbose', [f'[{pluginName}] New entries: "{len(device_data)}"'])
 

front/plugins/_publisher_apprise/apprise.py

@@ -19,8 +19,10 @@ from logger import mylog, append_line_to_file
 from helper import timeNowTZ, get_setting_value
 from notification import Notification_obj
 from database import DB
+from pytz import timezone
 
-
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')

front/plugins/_publisher_email/email_smtp.py

@@ -27,7 +27,10 @@ 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
+from pytz import timezone
 
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')

front/plugins/_publisher_mqtt/README.md

@@ -7,6 +7,24 @@
 - Go to settings and fill in relevant details. There are 2 types of "devices" generated and sent to the broker. A generic overview device that contains online/down/archived device stats and then the actual devices detected by the application. 
 
 
+## Forcing an update
+
+In order to speed up the processing, device configs are only pushed to the broker if a change occurs. The plugin compares the previous data with the current device state, and the following fields are checked:
+
+- icon
+- device name
+- mac
+
+You can force an update of all devices by deleting plugin objects of the MQTT plugin. For example, navigate to:
+
+`Device -> Plugins -> MQTT -> Delete all`
+
+Filters will be ignored, and this will delete all objects associated with the plugin. The next time the MQTT plugin is processed, all data is re-sent to the broker.
+
+![image](./Deleting_MQTT_Plugin_Objects.png)
+
+This is not the case for the online/offline state of the device, which is always updated absed on the scan result and if it changed from the previous value. 
+
 
 # Sample Payloads
 

front/plugins/_publisher_mqtt/config.json

@@ -5,6 +5,15 @@
   "enabled": true,
   "data_source": "script",
   "show_ui": true,
+  "data_filters": [
+    {
+      "compare_column": "Watched_Value4",
+      "compare_operator": "==",
+      "compare_field_id": "txtMacFilter",
+      "compare_js_template": "'{value}'.toString()",
+      "compare_use_quotes": true
+    }
+  ],
   "localized": ["display_name", "description", "icon"],
   "display_name": [
     {
@@ -499,6 +508,38 @@
         }
       ]
     },
+    {
+      "function": "TLS",
+      "type": {
+        "dataType": "boolean",
+        "elements": [
+          {
+            "elementType": "input",
+            "elementOptions": [{ "type": "checkbox" }],
+            "transformers": []
+          }
+        ]
+      },
+      "default_value": false,
+      "options": [],
+      "localized": ["name", "description"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "MQTT TLS"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Enable TLS support."
+        },
+        {
+          "language_code": "es_es",
+          "string": "Habilitar soporte TLS."
+        }
+      ]
+    },
     {
       "function": "USER",
       "type": {
@@ -615,7 +656,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "The root path of the stats overview sensor. Inserted into the <code>system-sensors/sensor/{DEVICE_ID}/state</code> topic."
+          "string": "The root path of the stats overview sensor. Inserted into the <code>{MQTT_topic_root}/sensor/{MQTT_DEVICE_ID}/state</code> topic."
         }
       ]
     },
@@ -671,6 +712,30 @@
         }
       ]
     },
+    {
+      "function": "topic_root",
+      "type": {
+        "dataType": "string",
+        "elements": [
+          { "elementType": "input", "elementOptions": [], "transformers": [] }
+        ]
+      },
+      "default_value": "system-sensors",
+      "options": [],
+      "localized": ["name", "description"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "MQTT topic root"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "The topic root of the devices sensors. Inserted into the <code>{MQTT_topic_root}/sensor/{DEVICE_ID}/state</code> topic."
+        }
+      ]
+    },
     {
       "function": "DEVICES_SQL",
       "type": {
@@ -735,8 +800,8 @@
           { "elementType": "select", "elementOptions": [], "transformers": [] }
         ]
       },
-      "default_value": 1,
-      "options": [1, 2],
+      "default_value": 5,
+      "options": [3, 5],
       "localized": ["name", "description"],
       "name": [
         {
@@ -747,7 +812,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "Paho MQTT API version. Depends on the MQTT <a href=\"https://eclipse.dev/paho/files/paho.mqtt.python/html/index.html#callbacks\" target=\"_blank\">version supported by the MQTT broker</a>. Usually set to <code>1</code>."
+          "string": "MQTT Protocol version. Depends on the MQTT broker</a>. Usually set to <code>5</code>, or <code>3</code> for backwards compatibility."
         }
       ]
     },

front/plugins/_publisher_mqtt/mqtt.py

@@ -9,6 +9,7 @@ import sys
 from datetime import datetime
 import time
 import re
+import unicodedata
 import paho.mqtt.client as mqtt
 # from paho.mqtt import client as mqtt_client
 # from paho.mqtt import CallbackAPIVersion as mqtt_CallbackAPIVersion
@@ -26,15 +27,17 @@ from const import apiPath, confFileName
 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 helper import timeNowTZ, get_setting_value, bytes_to_string, sanitize_string, normalize_string
 from notification import Notification_obj
 from database import DB, get_device_stats
+from pytz import timezone
 
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 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
@@ -43,10 +46,10 @@ md5_hash = hashlib.md5()
 pluginName = 'MQTT'
 
 # globals
-
 mqtt_sensors                = []
 mqtt_connected_to_broker    = False
 mqtt_client                 = None  # mqtt client
+topic_root                  = get_setting_value('MQTT_topic_root')
 
 def main():
     
@@ -83,117 +86,153 @@ def check_config():
 # Sensor configs are tracking which sensors in NetAlertX exist and if a config has changed
 class sensor_config:
     def __init__(self, deviceId, deviceName, sensorType, sensorName, icon, mac):
+        """
+        Initialize the sensor_config object with provided parameters. Sets up sensor configuration
+        and generates necessary MQTT topics and messages based on the sensor type.
+        """
+        # Assign initial attributes
         self.deviceId        = deviceId
         self.deviceName      = deviceName
         self.sensorType      = sensorType
         self.sensorName      = sensorName
         self.icon            = icon 
-        self.mac             = mac 
+        self.mac             = mac
+        self.model           = deviceName   
+        self.hash            = ''     
         self.state_topic     = ''
         self.json_attr_topic = ''
         self.topic           = ''
-        self.message         = ''
+        self.message         = {}  # Initialize message as an empty dictionary
         self.unique_id       = ''
 
-        # binary sensor only sensor
-        if self.sensorType == 'binary_sensor' or self.sensorType == 'sensor':   
+        # Call helper functions to initialize the message, generate a hash, and handle plugin object
+        self.initialize_message()
+        self.generate_hash()
+        self.handle_plugin_object()
 
+    def initialize_message(self):
+        """
+        Initialize the MQTT message payload based on the sensor type. This method handles sensors of types:
+        - 'timestamp'
+        - 'binary_sensor'
+        - 'sensor'
+        - 'device_tracker'
+        """
+        # Ensure self.message is initialized as a dictionary if not already done
+        if not isinstance(self.message, dict):
+            self.message = {}
+
+        # Handle sensors with a 'timestamp' device class
+        if self.sensorName in ['last_connection', 'first_connection']:
+            self.message.update({
+                "device_class": "timestamp"
+            })
+
+        # Handle 'binary_sensor' or 'sensor' types
+        if self.sensorType in ['binary_sensor', 'sensor']:
             self.topic          = f'homeassistant/{self.sensorType}/{self.deviceId}/{self.sensorName}/config'
-            self.state_topic    = f'system-sensors/{self.sensorType}/{self.deviceId}/state'
-            self.unique_id      = self.deviceId+'_sensor_'+self.sensorName            
+            self.state_topic    = f'{topic_root}/{self.sensorType}/{self.deviceId}/state'
+            self.unique_id      = f'{self.deviceId}_sensor_{self.sensorName}'
 
-            self.message = { 
-                                "name" : self.sensorName, 
-                                "state_topic" : self.state_topic, 
-                                "value_template" : "{{value_json."+self.sensorName+"}}", 
-                                "unique_id" : self.unique_id, 
-                                "device": 
-                                    { 
-                                        "identifiers" : [self.deviceId+"_sensor"], 
-                                        "manufacturer" : "NetAlertX", 
-                                        "name" : self.deviceName
-                                    }, 
-                                "icon": f'mdi:{self.icon}'
-                            }        
-            
+            # Update the message dictionary, expanding it without overwriting
+            self.message.update({
+                "name": self.sensorName,
+                "state_topic": self.state_topic,
+                "value_template": f"{{{{value_json.{self.sensorName}}}}}",
+                "unique_id": self.unique_id,
+                "device": {
+                    "identifiers": [f"{self.deviceId}_sensor"],
+                    "manufacturer": "NetAlertX",
+                    "name": self.deviceName
+                },
+                "icon": f'mdi:{self.icon}'
+            })
 
+
+        # Handle 'device_tracker' sensor type
         elif self.sensorType == 'device_tracker':
-
             self.topic           = f'homeassistant/device_tracker/{self.deviceId}/config'
-            self.state_topic     = f'system-sensors/device_tracker/{self.deviceId}/state'
-            self.json_attr_topic = f'system-sensors/device_tracker/{self.deviceId}/attributes'
+            self.state_topic     = f'{topic_root}/device_tracker/{self.deviceId}/state'
+            self.json_attr_topic = f'{topic_root}/device_tracker/{self.deviceId}/attributes'
             self.unique_id       = f'{self.deviceId}_{self.sensorType}_{self.sensorName}'
 
-            payload_home = 'home'
-            payload_away = 'away'
+            # Construct the message dictionary for device_tracker
+            self.message = {
+                "state_topic": self.state_topic,
+                "json_attributes_topic": self.json_attr_topic,
+                "name": self.sensorName,
+                "payload_home": 'home',
+                "payload_not_home": 'away',
+                "unique_id": self.unique_id,
+                "icon": f'mdi:{self.icon}',
+                "device": {
+                    "identifiers": [f"{self.deviceId}_sensor", self.unique_id],
+                    "manufacturer": "NetAlertX",
+                    "model": self.model or "Unknown",  # Use model if available, else set to 'Unknown'
+                    "name": self.deviceName
+                }
+            }
 
-            self.message =  {
-                                "state_topic": self.state_topic, 
-                                "json_attributes_topic": self.json_attr_topic,
-                                "name": self.sensorName,
-                                "payload_home": payload_home, 
-                                "payload_not_home": payload_away,
-                                "unique_id" : self.unique_id, 
-                                "icon": f'mdi:{self.icon}',
-                                "device": 
-                                        { 
-                                            "identifiers" : [self.deviceId+"_sensor", self.unique_id], 
-                                            "manufacturer" : "NetAlertX", 
-                                            "name" : self.deviceName
-                                        }, 
-                            }
+    def generate_hash(self):
+        """
+        Generate an MD5 hash based on the combined string of deviceId, deviceName, sensorType, sensorName, and icon.
+        This hash will uniquely identify the sensor configuration.
+        """
+        # Concatenate all relevant attributes into a single string
+        input_string = f"{self.deviceId}{self.deviceName}{self.sensorType}{self.sensorName}{self.icon}"
+        md5_hash = hashlib.md5()  # Initialize the MD5 hash object
+        md5_hash.update(input_string.encode('utf-8'))  # Update hash with input string
+        self.hash = md5_hash.hexdigest()  # Store the hex representation of the hash
 
-        # Define your input string
-        input_string = str(self.deviceId) + str(self.deviceName) + str(self.sensorType) + str(self.sensorName) + str(self.icon)
+    def handle_plugin_object(self):
+        """
+        Fetch the plugin object from the system based on the generated hash. If the object exists, it logs that the sensor is
+        already known. If not, it marks the sensor as new and logs relevant information.
+        """
+        # Retrieve the plugin object based on the sensor's hash
+        plugObj = getPluginObject({"Plugin": "MQTT", "Watched_Value3": self.hash})
 
-        # 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 == {}:
+        # Check if the plugin object is new
+        if not plugObj:
             self.isNew = True
-            mylog('verbose', [f"[{pluginName}] New sensor entry name         : {self.deviceName}"])  
-            mylog('verbose', [f"[{pluginName}] New sensor entry mac          : {self.mac}"])  
-            mylog('verbose', [f"[{pluginName}] New sensor entry hash_value   : {hash_value}"])  
+            mylog('verbose', [f"[{pluginName}] New sensor entry (name|mac|hash) : ({self.deviceName}|{self.mac}|{self.hash}"])
         else:
             device_name = plugObj.get("Watched_Value1", "Unknown")
-            mylog('verbose', [f"[{pluginName}] Existing, skip Device Name    : {device_name}"])
+            mylog('verbose', [f"[{pluginName}] Existing, skip Device Name: {device_name}"])
             self.isNew = False
 
+        # Store the sensor configuration in global plugin_objects
+        self.store_plugin_object()
 
-        # Log sensor
+    def store_plugin_object(self):
+        """
+        Store the sensor configuration in the global plugin_objects, which tracks sensors based on a unique combination
+        of attributes including deviceId, sensorName, hash, and MAC.
+        """
         global plugin_objects
 
-        if mac == '':
-            mac = "N/A"
-
+        # Add the sensor to the global plugin_objects
         plugin_objects.add_object(
-            primaryId   = deviceId,
-            secondaryId = sensorName,            
-            watched1    = deviceName,
-            watched2    = sensorType,            
-            watched3    = hash_value,
-            watched4    = mac,
-            extra       = input_string,
-            foreignKey  = mac
+            primaryId=self.deviceId,
+            secondaryId=self.sensorName,
+            watched1=self.deviceName,
+            watched2=self.sensorType,
+            watched3=self.hash,
+            watched4=self.mac,
+            extra=f"{self.deviceId}{self.deviceName}{self.sensorType}{self.sensorName}{self.icon}",
+            foreignKey=self.mac
         )
 
+
 #-------------------------------------------------------------------------------
 
 def publish_mqtt(mqtt_client, topic, message):
     status = 1
 
-    message = json.dumps(message).replace("'",'"')
+    # convert anything but a simple string to json
+    if not isinstance(message, str):
+        message = json.dumps(message).replace("'",'"')
+
     qos = get_setting_value('MQTT_QOS')
 
     mylog('verbose', [f"[{pluginName}] Sending MQTT topic: {topic}"])
@@ -265,40 +304,89 @@ def create_sensor(mqtt_client, deviceId, deviceName, sensorType, sensorName, ico
     return sensorConfig
 
 #-------------------------------------------------------------------------------
-def mqtt_create_client():    
-    def on_disconnect(mqtt_client, userdata, reason_code):
+def mqtt_create_client():
+
+    # attempt reconnections on failure, ref https://www.emqx.com/en/blog/how-to-use-mqtt-in-python
+    FIRST_RECONNECT_DELAY = 1
+    RECONNECT_RATE = 2
+    MAX_RECONNECT_COUNT = 12
+    MAX_RECONNECT_DELAY = 60
+    
+    mytransport = 'tcp' # or 'websockets'
+
+    def on_disconnect(mqtt_client, userdata, rc):
         
         global mqtt_connected_to_broker
 
+        mylog('verbose', [f"[{pluginName}]         Connection terminated, reason_code: {rc}"])
+        reconnect_count, reconnect_delay = 0, FIRST_RECONNECT_DELAY
+        while reconnect_count < MAX_RECONNECT_COUNT:
+            mylog('verbose', [f"[{pluginName}]         Reconnecting in {reconnect_delay} seconds..."])
+            time.sleep(reconnect_delay)
+
+            try:
+                mqtt_client.reconnect()
+                mqtt_connected_to_broker = True     # Signal connection 
+                mylog('verbose', [f"[{pluginName}]         Reconnected successfully"])
+                return
+            except Exception as err:
+                mylog('verbose', [f"[{pluginName}]         {err} Reconnect failed. Retrying..."])
+                pass
+
+            reconnect_delay *= RECONNECT_RATE
+            reconnect_delay = min(reconnect_delay, MAX_RECONNECT_DELAY)
+            reconnect_count += 1
+            
         mqtt_connected_to_broker = False
         
-        # not sure is below line is correct / necessary        
-        # client = mqtt_create_client() 
 
-    def on_connect(mqtt_client, userdata, flags, reason_code):
+    def on_connect(mqtt_client, userdata, flags, rc, properties):
         
         global mqtt_connected_to_broker
 
-        if reason_code == 0: 
+        # REF: Good docu on reason codes: https://www.emqx.com/en/blog/mqtt5-new-features-reason-code-and-ack
+        if rc == 0: 
             mylog('verbose', [f"[{pluginName}]         Connected to broker"])            
             mqtt_connected_to_broker = True     # Signal connection 
         else: 
-            mylog('verbose', [f"[{pluginName}]         Connection failed, reason_code: {reason_code}"])
+            mylog('verbose', [f"[{pluginName}]         Connection failed, reason_code: {rc}"])
             mqtt_connected_to_broker = False
 
-
     global mqtt_client
+    global mqtt_connected_to_broker
 
-    if get_setting_value('MQTT_VERSION') == 1:
-        mqtt_client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION1)  
+    # Paho will be soon not supporting V1 anymore, so this really should not be a user choice to start with
+    # This code now uses V2 by default
+    # Ref: https://eclipse.dev/paho/files/paho.mqtt.python/html/migrations.html
+
+    if get_setting_value('MQTT_VERSION') == 3:
+        version = mqtt.MQTTv311
     else:
-        mqtt_client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)  
+        version = mqtt.MQTTv5
 
-         
-    mqtt_client.username_pw_set(get_setting_value('MQTT_USER'), get_setting_value('MQTT_PASSWORD'))    
+    # we now hardcode the client id into here.
+    # TODO: Add config ffor client id
+    mqtt_client = mqtt.Client(
+        client_id='netalertx',
+        callback_api_version = mqtt.CallbackAPIVersion.VERSION2,
+        transport=mytransport,
+        protocol=version)
     mqtt_client.on_connect = on_connect
     mqtt_client.on_disconnect = on_disconnect
-    mqtt_client.connect(get_setting_value('MQTT_BROKER'), get_setting_value('MQTT_PORT'))
+
+    if get_setting_value('MQTT_TLS'):
+        mqtt_client.tls_set()
+
+    mqtt_client.username_pw_set(username = get_setting_value('MQTT_USER'), password = get_setting_value('MQTT_PASSWORD'))    
+    err_code = mqtt_client.connect(host = get_setting_value('MQTT_BROKER'), port = get_setting_value('MQTT_PORT'))
+    if (err_code == mqtt.MQTT_ERR_SUCCESS):
+        # We (prematurely) set the connection state to connected
+        # the callback may be delayed
+        mqtt_connected_to_broker = True
+    # the client connects but connect callbacks will be called async and there may be a waiting time
+    # Mosquitto works straight away
+    # EMQX has a delay and does not update in loop below, so we cannot rely on it, we wait 1 sec
+    time.sleep(1)
     mqtt_client.loop_start() 
 
     return mqtt_client
@@ -327,7 +415,7 @@ def mqtt_start(db):
         row = get_device_stats(db)   
 
         # Publish (wrap into {} and remove last ',' from above)
-        publish_mqtt(mqtt_client, f"system-sensors/sensor/{deviceId}/state",              
+        publish_mqtt(mqtt_client, f"{topic_root}/sensor/{deviceId}/state",              
                 { 
                     "online": row[0],
                     "down": row[1],
@@ -354,28 +442,32 @@ def mqtt_start(db):
         
         for device in devices:      
 
-            # debug statement
-            # if 'Moto' in device["dev_Name"]:
+            # # debug statement START 🔻
+            # if 'Moto' not in device["dev_Name"]:
+            #     continue
+            # # debug statement END   🔺
             
             # Create devices in Home Assistant - send config messages
             deviceId        = 'mac_' + device["dev_MAC"].replace(" ", "").replace(":", "_").lower()
-            devDisplayName  = re.sub('[^a-zA-Z0-9-_\s]', '', device["dev_Name"]) 
+            # Normalize the string and remove unwanted characters
+            devDisplayName = re.sub('[^a-zA-Z0-9-_\\s]', '', normalize_string(device["dev_Name"]))            
 
             sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'last_ip', 'ip-network', device["dev_MAC"])
             sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'mac_address', 'folder-key-network', device["dev_MAC"])
             sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'is_new', 'bell-alert-outline', device["dev_MAC"])
-            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'vendor', 'cog', device["dev_MAC"])
+            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'vendor', 'cog', device["dev_MAC"])            
             sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'first_connection', 'calendar-start', device["dev_MAC"])
             sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'last_connection', 'calendar-end', device["dev_MAC"])
+        
 
             devJson = { 
                         "last_ip": device["dev_LastIP"], 
                         "is_new": str(device["dev_NewDevice"]), 
                         "vendor": sanitize_string(device["dev_Vendor"]), 
                         "mac_address": str(device["dev_MAC"]),
-                        "last_connection": str(device["dev_LastConnection"]),
-                        "first_connection": str(device["dev_FirstConnection"])
-                    }
+                        "model": devDisplayName,
+                        "last_connection": prepTimeStamp(str(device["dev_LastConnection"])),
+                        "first_connection": prepTimeStamp(str(device["dev_FirstConnection"]))                    }
         
             # bulk update device sensors in home assistant      
             publish_mqtt(mqtt_client, sensorConfig.state_topic, devJson) 
@@ -425,8 +517,24 @@ def to_binary_sensor(input):
             result = "ON"
     return result
 
+#  -------------------------------------
+# Convert to format that is interpretable by Home Assistant
+def prepTimeStamp(datetime_str):
+    try:
+        # Attempt to parse the input string to ensure it's a valid datetime
+        parsed_datetime = datetime.fromisoformat(datetime_str)
 
+        # If the parsed datetime is naive (i.e., does not contain timezone info), add UTC timezone
+        if parsed_datetime.tzinfo is None:
+            parsed_datetime = parsed_datetime.replace(tzinfo=conf.tz)
 
+    except ValueError:
+        mylog('verbose', [f"[{pluginName}]  Timestamp conversion failed of string '{datetime_str}'"])
+        # Use the current time if the input format is invalid
+        parsed_datetime = timeNowTZ()  # Assuming this function returns the current time with timezone
+
+    # Convert to the required format with 'T' between date and time and ensure the timezone is included
+    return parsed_datetime.isoformat()  # This will include the timezone offset
 
 #  -------------INIT---------------------
 if __name__ == '__main__':

front/plugins/_publisher_ntfy/ntfy.py

@@ -22,7 +22,10 @@ from logger import mylog, append_line_to_file
 from helper import timeNowTZ, get_setting_value
 from notification import Notification_obj
 from database import DB
+from pytz import timezone
 
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')

front/plugins/_publisher_pushover/pushover.py

@@ -16,6 +16,10 @@ from notification import Notification_obj  # noqa: E402
 from database import DB  # noqa: E402
 import conf
 from const import confFileName
+from pytz import timezone
+
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 RESULT_FILE = os.path.join(CUR_PATH, "last_result.log")

front/plugins/_publisher_pushsafer/pushsafer.py

@@ -22,6 +22,10 @@ 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
+from pytz import timezone
+
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')

front/plugins/_publisher_telegram/README.md

@@ -0,0 +1,10 @@
+## Overview
+
+You can send notifications via Telegram
+## Notes
+
+You need Telegram bot to send notifications
+
+### Usage
+
+- Go to settings and fill in relevant details.

front/plugins/_publisher_telegram/config.json

@@ -0,0 +1,470 @@
+{
+  "code_name": "_publisher_telegram",
+  "unique_prefix": "TELEGRAM",
+  "plugin_type": "publisher",
+  "enabled": true,
+  "data_source": "script",
+  "show_ui": true,
+  "localized": ["display_name", "description", "icon"],
+  "display_name": [
+    {
+      "language_code": "en_us",
+      "string": "Telegram publisher"
+    }
+  ],
+  "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 Telegram."
+    }
+  ],
+  "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": {
+        "dataType": "string",
+        "elements": [
+          { "elementType": "select", "elementOptions": [], "transformers": [] }
+        ]
+      },
+      "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 Telegram messanger"
+        }
+      ]
+    },
+    {
+      "function": "CMD",
+      "type": {
+        "dataType": "string",
+        "elements": [
+          {
+            "elementType": "input",
+            "elementOptions": [{ "readonly": "true" }],
+            "transformers": []
+          }
+        ]
+      },
+      "default_value": "python3 /app/front/plugins/_publisher_telegram/tg.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": {
+        "dataType": "integer",
+        "elements": [
+          {
+            "elementType": "input",
+            "elementOptions": [{ "type": "number" }],
+            "transformers": []
+          }
+        ]
+      },
+      "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": {
+        "dataType": "string",
+        "elements": [
+          { "elementType": "input", "elementOptions": [], "transformers": [] }
+        ]
+      },
+      "default_value": "",
+      "options": [],
+      "localized": ["name", "description"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Telegram chat id"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Telegram chat id. If you want to send messages to user, paste user id (Example: <code>1234123412</code>)"
+        }
+      ]
+    },
+    {
+      "function": "URL",
+      "type": {
+        "dataType": "string",
+        "elements": [
+          { "elementType": "input", "elementOptions": [], "transformers": [] }
+        ]
+      },
+      "default_value": "",
+      "options": [],
+      "localized": ["name", "description"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Telegram bot token"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Telegram bot token. You cat get at from <a target=\"_blank\" href=\"https://t.me/BotFather\">BotFather</a>"
+        }
+      ]
+    },
+    {
+      "function": "SIZE",
+      "type": {
+        "dataType": "integer",
+        "elements": [
+          {
+            "elementType": "input",
+            "elementOptions": [{ "type": "number" }],
+            "transformers": []
+          }
+        ]
+      },
+      "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 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."
+        }
+      ]
+    }
+  ]
+}

front/plugins/_publisher_telegram/tg.py

@@ -0,0 +1,124 @@
+#!/usr/bin/env python
+
+import json
+import subprocess
+import argparse
+import os
+import pathlib
+import sys
+from datetime import datetime
+
+# Register NetAlertX directories
+INSTALL_PATH = "/app"
+sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"])
+
+import conf
+from const import confFileName
+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
+from pytz import timezone
+
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+pluginName = 'TELEGRAM'
+
+
+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 {confFileName} {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["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():
+    return True
+
+
+# -------------------------------------------------------------------------------
+def send(text):
+    # limit = 1024 * 1024  # 1MB limit (1024 bytes * 1024 bytes = 1MB)
+    limit = get_setting_value('TELEGRAM_SIZE')
+
+    if len(text) > limit:
+        payloadData = text[:limit] + " (text was truncated)"
+    else:
+        payloadData = text
+
+    try:
+        # try runnning a subprocess
+
+        req = """curl --location 'https://api.telegram.org/bot%s/sendMessage' \\
+        --header 'Content-Type: application/json' \\
+        --data '{
+            "chat_id": "%s",
+            "text": "%s",
+            "disable_notification": false
+        }'""" % (get_setting_value('TELEGRAM_URL'), get_setting_value('TELEGRAM_HOST'), payloadData)
+
+        mylog('debug', [req])
+
+        p = subprocess.Popen(req, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
+        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_webhook/README.md

@@ -6,3 +6,7 @@ A plugin to publish a notification via the Webhook gateway. Webhooks help you to
 
 - Go to settings and fill in relevant details.
 
+#### Sample Discord Setup
+
+![image](Discord_Config.png)
+

front/plugins/_publisher_webhook/webhook.py

@@ -25,6 +25,10 @@ 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
+from pytz import timezone
+
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')

front/plugins/arp_scan/script.py

@@ -18,6 +18,11 @@ from plugin_helper import Plugin_Object, Plugin_Objects, handleEmpty
 from logger import mylog, append_line_to_file
 from helper import timeNowTZ, get_setting_value
 from const import logPath, applicationPath
+import conf
+from pytz import timezone
+
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 LOG_FILE = os.path.join(CUR_PATH, 'script.log')

front/plugins/csv_backup/script.py

@@ -16,9 +16,13 @@ sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"])
 
 from plugin_helper import Plugin_Object, Plugin_Objects, decodeBase64
 from logger import mylog, append_line_to_file
-from helper import timeNowTZ
+from helper import timeNowTZ, get_setting_value 
 from const import logPath, applicationPath, fullDbPath
+import conf
+from pytz import timezone
 
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 LOG_FILE = os.path.join(CUR_PATH, 'script.log')

front/plugins/db_cleanup/script.py

@@ -18,7 +18,11 @@ 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, applicationPath, fullDbPath
+import conf
+from pytz import timezone
 
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 LOG_FILE = os.path.join(CUR_PATH, 'script.log')
@@ -40,12 +44,13 @@ def main():
     HRS_TO_KEEP_NEWDEV      = int(values.hourstokeepnewdevice.split('=')[1])
     DAYS_TO_KEEP_EVENTS     = int(values.daystokeepevents.split('=')[1])
     PHOLUS_DAYS_DATA        = get_setting_value("PHOLUS_DAYS_DATA")
+    CLEAR_NEW_FLAG          = get_setting_value("CLEAR_NEW_FLAG")
 
     mylog('verbose', [f'[{pluginName}] In script'])     
 
 
     # Execute cleanup/upkeep    
-    cleanup_database(fullDbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP_NEWDEV, PLUGINS_KEEP_HIST)
+    cleanup_database(fullDbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP_NEWDEV, PLUGINS_KEEP_HIST, CLEAR_NEW_FLAG)
     
     mylog('verbose', [f'[{pluginName}] Cleanup complete'])   
     
@@ -54,7 +59,7 @@ def main():
 #===============================================================================
 # Cleanup / upkeep database
 #===============================================================================
-def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP_NEWDEV, PLUGINS_KEEP_HIST):
+def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP_NEWDEV, PLUGINS_KEEP_HIST, CLEAR_NEW_FLAG):
     """
     Cleaning out old records from the tables that don't need to keep all data.
     """
@@ -143,8 +148,20 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP
     # Cleanup New Devices
     if HRS_TO_KEEP_NEWDEV != 0:
         mylog('verbose', [f'[{pluginName}] 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')""") 
+        query = f"""DELETE FROM Devices WHERE dev_NewDevice = 1 AND dev_FirstConnection < date('now', '-{str(HRS_TO_KEEP_NEWDEV)} hour')"""
+        mylog('verbose', [f'[{pluginName}] Query: {query} '])            
+        cursor.execute (query) 
+
+    # -----------------------------------------------------
+    # Clear New Flag
+    if CLEAR_NEW_FLAG != 0:
+        mylog('verbose', [f'[{pluginName}] Devices: Clear "New Device" flag for all devices older than {str(CLEAR_NEW_FLAG)} hours (CLEAR_NEW_FLAG setting)'])            
+        query = f"""UPDATE Devices SET dev_NewDevice = 0 WHERE dev_NewDevice = 1 AND date(dev_FirstConnection, '+{str(CLEAR_NEW_FLAG)} hour') < date('now')"""
+        #  select * from Devices where dev_NewDevice = 1 AND date(dev_FirstConnection, '+3 hour' ) < date('now') 
+        mylog('verbose', [f'[{pluginName}] Query: {query} '])            
+        cursor.execute(query)
+
+
 
     # -----------------------------------------------------
     # Cleanup Pholus_Scan

front/plugins/ddns_update/script.py

@@ -19,9 +19,13 @@ sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"])
 
 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 helper import timeNowTZ, get_setting_value, check_IP_format
 from const import logPath, applicationPath, fullDbPath
+import conf
+from pytz import timezone
 
+# Make sure the TIMEZONE for logging is correct
+conf.tz = timezone(get_setting_value('TIMEZONE'))
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 LOG_FILE = os.path.join(CUR_PATH, 'script.log')

front/plugins/dhcp_leases/config.json

@@ -525,6 +525,16 @@
             ],
             "transformers": []
           },
+          {
+            "elementType": "select",
+            "elementHasInputValue": 1,
+            "elementOptions": [
+              { "multiple": "true" },
+              { "readonly": "true" },
+              { "editable": "true" }
+            ],
+            "transformers": []
+          },
           {
             "elementType": "button",
             "elementOptions": [
@@ -546,15 +556,6 @@
               { "getStringKey": "Gen_Remove_Last" }
             ],
             "transformers": []
-          },
-          {
-            "elementType": "select",
-            "elementOptions": [
-              { "multiple": "true" },
-              { "readonly": "true" },
-              { "editable": "true" }
-            ],
-            "transformers": []
           }
         ]
       },